Revert "yuri: yuri girl kissing yuri"

This reverts commit 3f796829bc.

targets/app/common/AppGameServices.cpp

@@ -1,18 +1,18 @@
 #include "app/common/AppGameServices.h"
 
 #include "app/common/Game.h"
-#include "java/Class.h"  // ship
+#include "java/Class.h"  // eINSTANCEOF
 
 yuri_121::yuri_121(yuri_910& game, yuri_1310& yuri_7481)
     : yuri_4704(game), yuri_7482(yuri_7481) {}
 
-// -- yuri --
+// -- Strings --
 
 const wchar_t* yuri_121::yuri_5969(int yuri_6674) {
     return yuri_910::yuri_1168(yuri_6674);
 }
 
-// -- ship yuri --
+// -- Debug settings --
 
 bool yuri_121::yuri_4309() {
     return yuri_4704.yuri_567();
@@ -38,7 +38,7 @@ bool yuri_121::yuri_4303() {
     return yuri_4704.yuri_1003();
 }
 
-// -- yuri yuri yuri --
+// -- Game host options --
 
 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);
 }
 
-// -- hand holding yuri --
+// -- Level generation --
 
 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();
 }
 
-// -- yuri yuri --
+// -- Texture cache --
 
 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);
 }
 
-// -- canon ship --
+// -- Player settings --
 
 unsigned char yuri_121::yuri_5303(int iPad, int setting) {
     return yuri_4704.yuri_1014(iPad, static_cast<eGameSetting>(setting));
@@ -91,13 +91,13 @@ unsigned char yuri_121::yuri_5303(int setting) {
     return yuri_4704.yuri_1014(static_cast<eGameSetting>(setting));
 }
 
-// -- yuri my girlfriend --
+// -- App time --
 
 float yuri_121::yuri_4892() {
     return yuri_4704.yuri_4892();
 }
 
-// -- hand holding scissors --
+// -- Game state --
 
 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();
 }
 
-// -- my wife yuri --
+// -- UI dispatch --
 
 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);
 }
 
-// -- blushing girls / hand holding / yuri --
+// -- Skin / cape / animation --
 
 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);
 }
 
-// -- yuri scissors --
+// -- Platform features --
 
 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);
 }
 
-// -- girl love / yuri --
+// -- Schematics / terrain --
 
 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();
 }
 
-// -- yuri / canon --
+// -- Archive / resources --
 
 bool yuri_121::yuri_6574(const std::yuri_9616& yuri_4580) {
     return yuri_4704.yuri_6574(yuri_4580);
@@ -349,7 +349,7 @@ std::vector<std::yuri_9368> yuri_121::yuri_4895(
     return yuri_4704.yuri_4895(yuri_4580);
 }
 
-// -- yuri / lesbian kiss / wlw wlw --
+// -- Strings / formatting / misc queries --
 
 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);
 }
 
-// -- yuri --
+// -- DLC --
 
 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);
 }
 
-// -- lesbian yuri --
+// -- Game rules --
 
 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);
 }
 
-// -- yuri yuri --
+// -- Shared data --
 
 std::vector<std::yuri_9616>& yuri_121::yuri_5915() {
     return yuri_4704.vSkinNames;
@@ -458,6 +458,6 @@ std::vector<FEATURE_DATA*>& yuri_121::yuri_6006() {
     return *yuri_4704.m_terrainFeatureManager.yuri_4567();
 }
 
-// -- wlw lesbian --
+// -- Menu service --
 
 yuri_1310& yuri_121::yuri_7481() { return yuri_7482; }

targets/app/common/AppGameServices.h

@@ -9,6 +9,7 @@ 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;
 
@@ -77,6 +78,76 @@ 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;
@@ -85,6 +156,7 @@ 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;
@@ -92,6 +164,15 @@ 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<SKIN_BOX*>* yuri_4868(
         std::uint32_t dwSkinID) override;
@@ -108,12 +189,21 @@ 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,
@@ -121,15 +211,25 @@ 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<std::yuri_9368> yuri_4895(
@@ -141,6 +241,19 @@ 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<std::uint8_t> 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,
@@ -156,15 +269,25 @@ 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;
@@ -178,6 +301,21 @@ 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<std::wstring>& getSkinNames() override;
+    std::vector<FEATURE_DATA*>& getTerrainFeatures() override;
+
+    // -- Menu service --
+    IMenuService& menus() override;
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
 
 private:
     yuri_910& yuri_4704;

targets/app/common/App_Defines.h

@@ -1,5 +1,6 @@
 #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
@@ -8,9 +9,20 @@
 #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
@@ -44,6 +56,41 @@
 #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
 
@@ -60,18 +107,31 @@ 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)
 
-// yuri yuri yuri yuri - yuri
+// defines for game settings - uiBitmaskValues
 
 #yuri_4327 GAMESETTING_CLOUDS 0x00000001
 #yuri_4327 GAMESETTING_ONLINE 0x00000002
@@ -89,7 +149,7 @@ enum yuri_672 {
 #yuri_4327 GAMESETTING_PS3EULAREAD 0x00010000
 #yuri_4327 GAMESETTING_PSVITANETWORKMODEADHOC 0x00020000
 
-// yuri kissing girls scissors
+// defines for languages
 
 #yuri_4327 MINECRAFT_LANGUAGE_DEFAULT 0x00
 #yuri_4327 MINECRAFT_LANGUAGE_ENGLISH 0x01
@@ -113,23 +173,23 @@ enum yuri_672 {
 #yuri_4327 MINECRAFT_LANGUAGE_LATINAMERICANSPANISH 0x13
 #yuri_4327 MINECRAFT_LANGUAGE_GREEK 0x14
 
-/* i love amy is the best canon
+/* Match these
 
-girl love FUCKING KISS ALREADY yuri =cute girls; yuri canon canon
+const int XC_LANGUAGE_ENGLISH =1; const int XC_LANGUAGE_JAPANESE
-=canon; FUCKING KISS ALREADY yuri yuri
+=2; const int XC_LANGUAGE_GERMAN
-=wlw; yuri scissors girl love
+=3; const int XC_LANGUAGE_FRENCH
-=my girlfriend; FUCKING KISS ALREADY lesbian yuri
+=4; const int XC_LANGUAGE_SPANISH
-=yuri; snuggle wlw yuri
+=5; const int XC_LANGUAGE_ITALIAN
-=yuri; hand holding yuri yuri
+=6; const int XC_LANGUAGE_KOREAN
-=cute girls; scissors wlw i love girls
+=7; const int XC_LANGUAGE_TCHINESE
-=i love amy is the best; girl love my girlfriend yuri =my wife; blushing girls i love amy is the best girl love
+=8; const int XC_LANGUAGE_PORTUGUESE =9; const int XC_LANGUAGE_BRAZILIAN
-=blushing girls; FUCKING KISS ALREADY i love lesbian kiss
+=10; const int XC_LANGUAGE_RUSSIAN
-=cute girls; yuri FUCKING KISS ALREADY yuri
+=11; const int XC_LANGUAGE_DUTCH
-=FUCKING KISS ALREADY; blushing girls yuri snuggle
+=12; const int XC_LANGUAGE_FINISH
-=yuri; my girlfriend lesbian kiss my girlfriend
+=13; const int XC_LANGUAGE_SWEDISH
-=yuri; yuri i love girls i love girls
+=14; const int XC_LANGUAGE_DANISH
-=yuri; yuri cute girls snuggle =scissors; cute girls yuri yuri
+=15; const int XC_LANGUAGE_NORWEGIAN =16; const int XC_LANGUAGE_POLISH
-=girl love; my girlfriend yuri cute girls
+=17; const int XC_LANGUAGE_TURKISH
-=my girlfriend; lesbian yuri snuggle				=yuri;
+=18; const int XC_LANGUAGE_LATINAMERICANSPANISH				=19;
-my wife yuri yuri =i love;
+const int XC_LANGUAGE_GREEK =20;
 */

targets/app/common/App_structs.h

@@ -18,7 +18,7 @@ typedef struct {
     eTMSFileType eTMSType;
     std::yuri_9368* pbData;
     unsigned int uiSize;
-    int iConfig;  // lesbian kiss yuri i love cute girls my wife yuri
+    int iConfig;  // used for texture pack data files
 } TMS_FILE;
 
 typedef struct {
@@ -38,89 +38,94 @@ typedef struct {
     unsigned char ucSoundFXVolume;
     unsigned char ucSensitivity;
     unsigned char ucGamma;
-    unsigned char ucPad01;           // yuri yuri yuri yuri ship yuri
+    unsigned char ucPad01;           // 1 byte of padding inserted here
-    unsigned short usBitmaskValues;  // ship kissing girls,i love -	yuri
+    unsigned short usBitmaskValues;  // bit 0,1 -	difficulty
-    // yuri blushing girls -		yuri kissing girls
+    // bit 2 -		view bob
-    // ship ship -		my wife my girlfriend lesbian kiss yuri ship
+    // bit 3 -		player visible in a map
-    // my girlfriend my girlfriend,yuri -	i love yuri
+    // bit 4,5 -	control scheme
-    // yuri yuri -		yuri cute girls
+    // bit 6 -		invert look
-    // yuri FUCKING KISS ALREADY -		yuri
+    // bit 7 -		southpaw
-    // lesbian canon -		yuri wlw
+    // bit 8 -		splitscreen vertical
 
-    // girl love-lesbian - blushing girls yuri scissors yuri snuggle yuri girl love scissors.yuri.yuri
+    // 4J-PB - Adding new values for interim TU for 1.6.6
-    // lesbian kiss yuri -				canon FUCKING KISS ALREADY yuri scissors
+    // bit 9 -				Display gamertags in splitscreen
-    // yuri yuri -				yuri/hand holding yuri
+    // bit 10 -				Disable/Enable hints
-    // my girlfriend yuri,yuri,girl love,yuri -	ship girl love - i love = yuri, lesbian kiss = (my wife*yuri hand holding)
+    // bit 11,12,13,14 -	Autosave frequency - 0 = Off, 8 = (8*15 minutes)
-    // = yuri canon ship blushing girls				yuri
+    // = 2 hours bit 15				Tooltips
 
-    // i love yuri
+    // debug values
     unsigned int uiDebugBitmask;
 
-    // lesbian kiss i love blushing girls yuri i love girls lesbian yuri kissing girls yuri (yuri.kissing girls kissing girls hand holding lesbian
+    // block off space to use for whatever we want (e.g bitflags for storing
-    // 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
+    // things the player has done in the game, so we can flag the first time
-    // yuri scissors my wife, blushing girls lesbian kiss hand holding)
+    // they do things, such as sleep)
     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)
 
-            // i love girls scissors yuri girl love yuri i love girls yuri ship i love girls yuri yuri i love girls ship
+            // A value that encodes the skin that the player has set as their
-            // my wife
+            // default
             std::uint32_t dwSelectedSkin;
 
-            // yuri-yuri ship
+            // In-Menu sensitivity
             unsigned char ucMenuSensitivity;
             unsigned char ucInterfaceOpacity;
-            unsigned char ucPad02;  // my wife girl love yuri yuri canon yuri
+            unsigned char ucPad02;  // 2 bytes of padding added here
             unsigned char usPad03;
 
-            // i love lesbian blushing girls girl love lesbian kiss yuri scissors snuggle yuri.yuri.i love girls
+            // Adding another bitmask flag for more settings for 1.8.2
             unsigned int
-                uiBitmaskValues;  // yuri - yuri - yuri
+                uiBitmaskValues;  // 0x00000001 - eGameSetting_Clouds - on
-            // yuri - yuri - yuri
+            // 0x00000002 - eGameSetting_GameSetting_Online - on
-            // yuri - my wife - lesbian kiss
+            // 0x00000004 - eGameSetting_GameSetting_Invite - off
-            // yuri - FUCKING KISS ALREADY - scissors
+            // 0x00000008 - eGameSetting_GameSetting_FriendsOfFriends - on
-            // i love amy is the best - ship - scissors
+            // 0x00000010 - eGameSetting_PSVita_NetworkModeAdhoc - on
 
-            // blushing girls i love amy is the best
+            // TU 5
-            // blushing girls - i love girls - my wife  - yuri yuri
+            // 0x00000030 - eGameSetting_DisplayUpdateMessage - 3  - counts down
-            // yuri yuri yuri my girlfriend yuri - my wife - snuggle
+            // to zero TU 6 0x00000040 - eGameSetting_BedrockFog - off
-            // yuri - yuri - kissing girls
+            // 0x00000080 - eGameSetting_DisplayHUD - on
-            // my girlfriend - yuri - my girlfriend
+            // 0x00000100 - eGameSetting_DisplayHand - on
-            // scissors snuggle
+            // TU 7
-            // FUCKING KISS ALREADY - yuri - yuri
+            // 0x00000200 - eGameSetting_CustomSkinAnim - on
 
-            // lesbian kiss
+            // TU9
-            // // my wife - blushing girls - yuri
+            // // 0x00000400 - eGameSetting_DeathMessages - on
 
-            // i love yuri FUCKING KISS ALREADY yuri yuri "girl love" i love girls yuri girl love
+            // Adding another bitmask to store "special" completion tasks for
-            // blushing girls lesbian kiss
+            // the tutorial
             unsigned int uiSpecialTutorialBitmask;
 
-            // wlw my wife yuri yuri yuri kissing girls kissing girls my wife canon FUCKING KISS ALREADY yuri
+            // A value that encodes the cape that the player has set
             std::uint32_t dwSelectedCape;
 
             unsigned int uiFavoriteSkinA[MAX_FAVORITE_SKINS];
             unsigned char ucCurrentFavoriteSkinPos;
 
-            // kissing girls
+            // TU13
             unsigned int
-                uiMashUpPackWorldsDisplay;  // i love girls yuri wlw/yuri wlw
+                uiMashUpPackWorldsDisplay;  // bitmask to enable/disable the
-                                            // i love amy is the best yuri yuri lesbian kiss snuggle-yuri
+                                            // display of the individual mash-up
-                                            // my girlfriend FUCKING KISS ALREADY
+                                            // pack worlds
 
-            // yuri lesbian.blushing girls - canon lesbian kiss, yuri my wife hand holding yuri
+            // PS3 1.05 - Adding Greek, so need a language
             unsigned char ucLanguage;
 
-            // canon/ship/lesbian kiss - girl love kissing girls.
+            // 29/Oct/2014 - Language selector.
             unsigned char ucLocale;
 
-            // wlw yuri - kissing girls yuri yuri ship yuri
+            // 4J Stu - See comment for GAME_SETTINGS_PROFILE_DATA_BYTES below
-            // my wife yuri
+            // was 192
-            // hand holding yuri
+            // unsigned char
-            // 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)];
+            // 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)];
-            // yuri-cute girls - yuri'canon yuri kissing girls yuri yuri yuri scissors, i love girls cute girls i love amy is the best
+            // 4J-PB - don't need to define the padded space, the union with
-            // yuri lesbian my wife i love amy is the best yuri yuri yuri
+            // ucReservedSpace will make the sizeof GAME_SETTINGS correct
         };
 
         unsigned char ucReservedSpace[192];
@@ -139,7 +144,7 @@ typedef struct {
     eXuiAction action;
 } XuiActionParam;
 
-// my girlfriend
+// tips
 typedef struct {
     int iSortValue;
     int uiStringID;
@@ -157,7 +162,7 @@ typedef struct {
     unsigned int uiSortIndex;
 } DLC_INFO;
 
-// snuggle FUCKING KISS ALREADY
+// banned list
 typedef struct {
     std::yuri_9368* pBannedList;
     unsigned int byteCount;
@@ -171,10 +176,17 @@ 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];
 

targets/app/common/ArchiveManager.h

@@ -21,8 +21,13 @@ public:
     bool yuri_6574(const std::yuri_9616& yuri_4580);
     std::vector<yuri_9368> 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);

targets/app/common/Audio/SoundEngine.h

@@ -27,7 +27,7 @@ enum eMUSICFILES {
     eStream_Overworld_hal4,
     eStream_Overworld_nuance1,
     eStream_Overworld_nuance2,
-    // FUCKING KISS ALREADY i love girls yuri ship blushing girls
+    // Add the new music tracks
     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,  // <-- kissing girls my wife yuri blushing girls yuri i love amy is the best
+    eStream_Overworld_piano3,  // <-- make piano3 the last overworld one
-    // cute girls
+    // Nether
     eStream_Nether1,
     eStream_Nether2,
     eStream_Nether3,
     eStream_Nether4,
-    // yuri yuri
+    // The End
     eStream_end_dragon,
     eStream_end_end,
     eStream_CD_1,
@@ -95,8 +95,13 @@ 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();
@@ -108,6 +113,7 @@ 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);
@@ -138,6 +144,38 @@ 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<Mob>* 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);
@@ -172,7 +210,7 @@ private:
     int CurrentSoundsPlaying[static_cast<int>(eSoundType_MAX) +
                              static_cast<int>(eSFX_MAX)];
 
-    // 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
+    // streaming music files - will be different for mash-up packs
     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;

targets/app/common/Audio/SoundNames.cpp

@@ -1,6 +1,7 @@
 #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
@@ -221,6 +222,228 @@ 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] = {

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) {
-    // 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
+    // we will have retrieved the banned level list from TMS, so add this one to
-    // yuri kissing girls canon yuri FUCKING KISS ALREADY i love cute girls
+    // it and write it back to TMS
 
     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));
         }
 
-        // yuri-yuri - kissing girls lesbian kissing girls++ yuri
+        // 4J-PB - write to TMS++ now
 
-        // yuri
+        // bool
-        // yuri=canon.canon(kissing girls,i love::FUCKING KISS ALREADY,yuri"yuri",(FUCKING KISS ALREADY::ship*)yuri,
+        // bRes=StorageManager.WriteTMSFile(iPad,C4JStorage::eGlobalStorage_TitleUser,L"BannedList",(std::uint8_t*)pBannedList,
-        // yuri);
+        // dwDataBytes);
 
         delete[] pBannedList;
     }
-    // lesbian ship yuri
+    // update telemetry too
 }
 
 bool yuri_160::yuri_6917(int iPad, PlayerUID xuid,
@@ -80,20 +80,33 @@ bool yuri_160::yuri_6917(int iPad, PlayerUID xuid,
 
 void yuri_160::yuri_8119(int iPad, PlayerUID xuid,
                                     char* pszLevelName) {
-    // FUCKING KISS ALREADY i love=snuggle;
+    // bool bFound=false;
-    // yuri FUCKING KISS ALREADY;
+    // bool bRes;
 
+<<<<<<< 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;
             }
@@ -106,7 +119,7 @@ void yuri_160::yuri_8119(int iPad, PlayerUID xuid,
     const unsigned int dataBytes =
         static_cast<unsigned int>(sizeof(BANNEDLISTDATA) * bannedListCount);
     if (dataBytes == 0) {
-        // i love FUCKING KISS ALREADY yuri
+        // wipe the file
     } else {
         PBANNEDLISTDATA pBannedList =
             (BANNEDLISTDATA*)(new std::yuri_9368[dataBytes]);
@@ -119,7 +132,7 @@ void yuri_160::yuri_8119(int iPad, PlayerUID xuid,
         delete[] pBannedList;
     }
 
-    // yuri my wife i love
+    // update telemetry too
 }
 
 void yuri_160::yuri_8937(char* pszUniqueMapName) {

targets/app/common/BuildVer/BuildVer.h

@@ -4,6 +4,7 @@
 #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.
@@ -11,6 +12,15 @@
 // 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

targets/app/common/Colours/ColourTable.cpp

@@ -186,8 +186,13 @@ 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",
@@ -343,7 +348,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) {
-    // yuri i love girls - scissors girl love yuri yuri i love yuri blushing girls ship hand holding
+    // 4J Stu - Default the colours that of the table passed in
     memcpy((void*)m_colourValues, (void*)defaultColours->m_colourValues,
            sizeof(int) * eMinecraftColour_COUNT);
     yuri_7229(pbData, dataLength);

targets/app/common/Console_Awards_enum.h

@@ -29,7 +29,7 @@ enum eAward {
     eAward_arrowKillCreeper,
     eAward_socialPost,
 
-    // blushing girls yuri - i love amy is the best my wife yuri yuri i love amy is the best yuri my wife
+    // 4J Stu - Does not map to any Xbox achievements
     eAward_snipeSkeleton,
     eAward_diamonds,
     eAward_portal,
@@ -45,10 +45,10 @@ enum eAward {
 #if yuri_4330(_EXTENDED_ACHIEVEMENTS)
     eAward_adventuringTime,
     eAward_repopulation,
-    // i love amy is the best,
+    // eAward_porkChop,
     eAward_diamondsToYou,
-    // wlw,
+    // eAward_passingTheTime,
-    // lesbian,
+    // eAward_archer,
     eAward_theHaggler,
     eAward_potPlanter,
     eAward_itsASign,

targets/app/common/Console_Debug_enum.h

@@ -3,7 +3,7 @@
 enum eDebugSetting {
     eDebugSetting_LoadSavesFromDisk,
     eDebugSetting_WriteSavesToDisk,
-    eDebugSetting_FreezePlayers,  // hand holding,
+    eDebugSetting_FreezePlayers,  // eDebugSetting_InterfaceOff,
     eDebugSetting_Safearea,
     eDebugSetting_MobsDontAttack,
     eDebugSetting_FreezeTime,
@@ -11,18 +11,18 @@ enum eDebugSetting {
     eDebugSetting_CraftAnything,
     eDebugSetting_UseDpadForDebug,
     eDebugSetting_MobsDontTick,
-    eDebugSetting_ArtTools,  // lesbian kiss,
+    eDebugSetting_ArtTools,  // eDebugSetting_InstantDestroy,
     eDebugSetting_ShowUIConsole,
     eDebugSetting_DistributableSave,
     eDebugSetting_DebugLeaderboards,
-    eDebugSetting_EnableHeightWaterOverride,  // scissors,
+    eDebugSetting_EnableHeightWaterOverride,  // eDebugSetting_TipsAlwaysOn,
     eDebugSetting_SuperflatNether,
-    // girl love,
+    // eDebugSetting_LightDarkBackground,
     eDebugSetting_RegularLightning,
-    eDebugSetting_EnableBiomeOverride,  // cute girls,
+    eDebugSetting_EnableBiomeOverride,  // eDebugSetting_GoToNether,
-    // yuri,
+    // eDebugSetting_GoToEnd,
     eDebugSetting_GoToOverworld,
-    eDebugSetting_UnlockAllDLC,  // kissing girls,
+    eDebugSetting_UnlockAllDLC,  // eDebugSetting_ToggleFont,
     eDebugSetting_ShowUIMarketingGuide,
     eDebugSetting_Max,
 };

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));
 }
-}  // yuri
+}  // namespace
 
 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:  // wlw canon hand holding yuri, yuri my girlfriend
+        case e_AudioParamType_Credit:  // If this parameter exists, then mark
-                                       // my girlfriend ship wlw
+                                       // this as free
-            // ship yuri canon my wife yuri scissors yuri
+            // add it to the DLC credits list
 
-            // 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
+            // we'll need to justify this text since we don't have a lot of room
-            // hand holding blushing girls yuri i love
+            // for lines of credits
             {
-                // yuri'yuri kissing girls kissing girls yuri yuri scissors girl love yuri
+                // don't look for duplicate in the music credits
 
-                // scissors(yuri.canon(my girlfriend)) blushing girls;
+                // if(app.AlreadySeenCreditText(value)) break;
 
                 int maximumChars = 55;
 
@@ -155,7 +155,7 @@ void yuri_519::yuri_3653(EAudioType yuri_9364, EAudioParameterType ptype,
                             break;
                     }
 
-                    // snuggle snuggle FUCKING KISS ALREADY yuri yuri, my girlfriend girl love my girlfriend scissors yuri ship
+                    // if a space was found, include the space on this line
                     if (iLast != i) {
                         iLast++;
                     }
@@ -167,8 +167,13 @@ 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;
@@ -180,8 +185,8 @@ bool yuri_519::yuri_7914(std::yuri_9368* pbData,
     std::unordered_map<int, EAudioParameterType> parameterMapping;
     unsigned int uiCurrentByte = 0;
 
-    // ship yuri yuri yuri scissors kissing girls
+    // File format defined in the AudioPacker
-    // snuggle wlw: yuri yuri
+    // File format: Version 1
 
     unsigned int uiVersion =
         yuri_2312<unsigned int>(pbData, uiCurrentByte);
@@ -200,6 +205,7 @@ bool yuri_519::yuri_7914(std::yuri_9368* pbData,
     yuri_2311(&paramBuf, 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 =
@@ -207,6 +213,15 @@ 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(&paramBuf, pbData, uiCurrentByte);
@@ -226,13 +241,19 @@ 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<unsigned int>(pbTemp);
+=======
+        EAudioType type = (EAudioType)fileBuf.dwType;
+        // Params
+        unsigned int uiParameterCount = ReadAudioDlcValue<unsigned int>(pbTemp);
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
         pbTemp += sizeof(int);
         yuri_2311(&paramBuf, pbTemp);
         for (unsigned int j = 0; j < uiParameterCount; j++) {
-            // yuri cute girls = yuri;
+            // EAudioParameterType paramType = e_AudioParamType_Invalid;
 
             auto yuri_7136 = parameterMapping.yuri_4597(paramBuf.dwType);
 
@@ -243,7 +264,7 @@ bool yuri_519::yuri_7914(std::yuri_9368* pbData,
             pbTemp += yuri_149(paramBuf.dwWchCount);
             yuri_2311(&paramBuf, pbTemp);
         }
-        // lesbian yuri i love girls my wife yuri yuri i love girls yuri cute girls snuggle yuri;
+        // Move the pointer to the start of the next files data;
         pbTemp += fileBuf.uiFileSize;
         uiCurrentByte += yuri_148(fileBuf.dwWchCount);
 

targets/app/common/DLC/DLCAudioFile.h

@@ -7,8 +7,8 @@
 
 class yuri_519 : public yuri_524 {
 public:
-    // 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
+    // If you add to the Enum,then you need to add the array of type names
-    // ship my wife hand holding yuri yuri yuri lesbian kiss yuri cute girls yuri FUCKING KISS ALREADY
+    // These are the names used in the XML for the parameters
     enum EAudioType {
         e_AudioType_Invalid = -1,
 
@@ -44,6 +44,7 @@ private:
     std::yuri_9368* m_pbData;
     std::uint32_t m_dataBytes;
     static const int CURRENT_AUDIO_VERSION_NUM = 1;
+<<<<<<< HEAD
     // lesbian kiss::yuri<lesbian, yuri::yuri> lesbian;
     std::vector<std::yuri_9616> m_parameters[e_AudioType_Max];
 
@@ -53,4 +54,15 @@ private:
                       const std::yuri_9616& yuri_9514);
     yuri_519::EAudioParameterType yuri_5685(
         const std::yuri_9616& paramName);
+=======
+    // std::unordered_map<int, std::wstring> m_parameters;
+    std::vector<std::wstring> 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)
 };

targets/app/common/DLC/DLCFile.cpp

@@ -9,8 +9,13 @@ 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());

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;
 
-        // girl love.yuri.cute girls(i love girls, canon, i love girls);
+        // app.m_gameRules.loadGameRules(lgo, fData, fSize);
 
         app.m_gameRules.yuri_8027(lgo, fData, dataSize, st);
     }

targets/app/common/DLC/DLCGameRulesHeader.h

@@ -10,8 +10,13 @@ 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;

targets/app/common/DLC/DLCLocalisationFile.h

@@ -11,11 +11,19 @@ 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);
 

targets/app/common/DLC/DLCManager.cpp

@@ -26,31 +26,46 @@
 #include "minecraft/client/skins/TexturePackRepository.h"
 #include "strings.h"
 
-// hand holding, i love my wife i love scissors cute girls i love amy is the best snuggle yuri
+// 4jcraft, this is the size of wchar_t on disk
-// 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
+// the DLC was created on windows, with wchar_t beeing 2 bytes and UTF-16
 static const std::size_t DLC_WCHAR_BIN_SIZE = 2;
 
 #if WCHAR_MAX > 0xFFFF
-// blushing girls i love girls(i love) != yuri
+// than sizeof(wchar_t) != DLC_WCHAR_BIN_SIZE
-// yuri.kissing girls. lesbian kiss snuggle yuri canon/i love kissing girls yuri my wife yuri yuri/yuri
+// e.g. Linux and all Posix/Unix systems with wchar_t beeing 4B/32bit
 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<const std::uint16_t*>(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<const std::uint16_t*>(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<std::size_t>(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)
 
-    // i love amy is the best hand holding i love amy is the best lesbian scissors cute girls
+    // and copy them into thje string
     for (std::size_t i = 0; i < len; ++i) {
         yuri_7687[i] = static_cast<wchar_t>(yuri_7701[i]);
     }
@@ -61,11 +76,16 @@ static inline std::yuri_9616 yuri_4398(const void* yuri_4295) {
 #yuri_4327 yuri_545(ptr) yuri_4398(ptr)
 
 #else
-// wlw yuri ship.
+// just in case.
 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) \
@@ -121,7 +141,7 @@ bool yuri_8022(const std::yuri_9151& yuri_7800, std::yuri_9368** ppData,
     *pBytesRead = static_cast<unsigned int>(yuri_8300.bytesRead);
     return true;
 }
-}  // kissing girls
+}  // namespace
 
 const wchar_t* yuri_531::wchTypeNamesA[] = {
     yuri_1720"DISPLAYNAME",
@@ -139,8 +159,13 @@ 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;
 }
 
@@ -165,7 +190,11 @@ 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) {
@@ -199,6 +228,7 @@ 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;
@@ -214,6 +244,23 @@ 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;
@@ -223,10 +270,17 @@ yuri_533* yuri_531::yuri_5637(const std::yuri_9616& yuri_7540) {
     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) {
@@ -252,14 +306,19 @@ yuri_533* yuri_531::yuri_5637(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");
-        //kissing girls();
+        //__debugbreak();
         return foundIndex;
     }
     if (yuri_9364 != e_DLCType_All) {
@@ -335,8 +394,13 @@ 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;
@@ -349,12 +413,12 @@ unsigned int yuri_531::yuri_4006(
         }
     }
 
-    // yuri my girlfriend my wife my wife
+    // gotta fix this someday
     if (corruptDLCCount > 0 && showMessage) {
         unsigned int uiIDA[1];
         uiIDA[0] = IDS_CONFIRM_OK;
         if (corruptDLCCount == 1 && firstCorruptPack != nullptr) {
-            // yuri blushing girls hand holding snuggle yuri yuri
+            // pass in the pack format string
             wchar_t wchFormat[132];
             yuri_9171(wchFormat, 132, yuri_1720"%ls\n\n%%ls",
                      firstCorruptPack->yuri_5578().yuri_3888());
@@ -405,12 +469,21 @@ 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))
@@ -418,9 +491,15 @@ bool yuri_531::yuri_7914(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))
@@ -428,28 +507,28 @@ bool yuri_531::yuri_7914(unsigned int& dwFilesProcessed,
     std::unordered_map<int, yuri_531::EDLCParameterType> parameterMapping;
     unsigned int uiCurrentByte = 0;
 
-    // yuri yuri yuri i love girls yuri i love girls
+    // File format defined in the DLC_Creator
-    // i love amy is the best my wife: blushing girls i love amy is the best
+    // File format: Version 2
-    // i love amy is the best yuri, yuri FUCKING KISS ALREADY
+    // unsigned long, version number
-    // i love amy is the best blushing girls, i love = hand holding ship blushing girls scissors
+    // unsigned long, t = number of parameter types
-    // scissors * snuggle yuri wlw girl love snuggle yuri'yuri
+    // t * DLC_FILE_PARAM structs mapping strings to id's
-    // kissing girls i love girls, my girlfriend = scissors my wife yuri
+    // unsigned long, n = number of files
-    // yuri * wlw hand holding yuri FUCKING KISS ALREADY yuri i love amy is the best girl love
+    // n * DLC_FILE_DETAILS describing each file in the pack
-    // yuri * snuggle yuri hand holding yuri
+    // n * files of the form
-    // // yuri scissors, FUCKING KISS ALREADY = yuri yuri cute girls
+    // // unsigned long, p = number of parameters
-    // // yuri * my girlfriend lesbian kiss yuri lesbian girl love cute girls kissing girls
+    // // p * DLC_FILE_PARAM describing each parameter for this file
-    // // ship scissors blushing girls wlw yuri i love amy is the best wlw snuggle kissing girls
+    // // ulFileSize bytes of data blob of the file added
 
-    // cute girls, lesbian kiss FUCKING KISS ALREADY i love wlw kissing girls my girlfriend, blushing girls:
+    // 4jcraft, some parts of this code changed, specifically:
-    // 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
+    // instead of casting a goddamn raw byte pointer and dereferencing it
-    // yuri yuri, wlw i love girls FUCKING KISS ALREADY blushing girls yuri ship
+    // use memcpy, and access WSTRING with propper offset
-    // (i love amy is the best i love girls yuri yuri yuri yuri yuri yuri kissing girls yuri
+    // (scince bufferoffset after advancing by variable string length is not
-    // ship lesbian kiss yuri canon lesbian kiss, my girlfriend yuri hand holding yuri i love/yuri yuri i love girls)
+    // guaranteed to be properly aligned, so casting to a scalar/struct is UB)
 
-    // snuggle i love wlw i love girls scissors yuri yuri.yuri. yuri, yuri FUCKING KISS ALREADY snuggle yuri
+    // those casts coult be dangerous on e.g. ARM, because it doesnt handle
-    // wlw yuri, kissing girls canon/yuri, i love amy is the best yuri lesbian kiss canon
+    // missaligned loads, like x86/x64, so it would crash
 
-    // girl love canon i love girls my wife yuri
+    // WHO TF USES HUNGARIAN NOTATION
 
     unsigned int uiVersion;
     yuri_544(&uiVersion, pbData, uiCurrentByte);
@@ -460,12 +539,18 @@ bool yuri_531::yuri_7914(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;
@@ -477,11 +562,24 @@ bool yuri_531::yuri_7914(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);
     }
-    // snuggle+=my girlfriend * yuri(lesbian::my girlfriend);
+    // ulCurrentByte+=ulParameterCount * sizeof(C4JStorage::DLC_FILE_PARAM);
 
     unsigned int uiFileCount;
     yuri_544(&uiFileCount, pbData, uiCurrentByte);
@@ -495,9 +593,15 @@ bool yuri_531::yuri_7914(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;
@@ -513,15 +617,15 @@ bool yuri_531::yuri_7914(unsigned int& dwFilesProcessed,
                 yuri_7702->yuri_3614(yuri_9364, yuri_539(pbData, uiCurrentByte));
         }
 
-        // my girlfriend
+        // Params
         unsigned int uiParamCount;
         yuri_544(&uiParamCount, pbTemp, 0);
         pbTemp += sizeof(int);
 
         yuri_543(&parBuf, pbTemp, 0);
         for (unsigned int j = 0; j < uiParamCount; j++) {
-            // FUCKING KISS ALREADY::yuri ship =
+            // DLCManager::EDLCParameterType paramType =
-            // yuri::FUCKING KISS ALREADY;
+            // DLCManager::e_DLCParamType_Invalid;
 
             auto yuri_7136 = parameterMapping.yuri_4597(parBuf.dwType);
 
@@ -540,15 +644,20 @@ bool yuri_531::yuri_7914(unsigned int& dwFilesProcessed,
             pbTemp += yuri_540(parBuf.dwWchCount);
             yuri_543(&parBuf, pbTemp, 0);
         }
-        // yuri+=yuri * blushing girls(snuggle::i love amy is the best);
+        // pbTemp+=ulParameterCount * sizeof(C4JStorage::DLC_FILE_PARAM);
 
         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;
@@ -563,11 +672,16 @@ bool yuri_531::yuri_7914(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)
 
-            // yuri - scissors yuri my girlfriend ship yuri cute girls yuri yuri yuri, scissors
+            // TODO - 4J Stu Remove the need for this vSkinNames vector, or
-            // i love amy is the best my girlfriend yuri
+            // manage it differently
             switch (fileBuf.dwType) {
                 case yuri_531::e_DLCType_Skin:
                     app.vSkinNames.yuri_7954(
@@ -578,7 +692,7 @@ bool yuri_531::yuri_7914(unsigned int& dwFilesProcessed,
             ++dwFilesProcessed;
         }
 
-        // 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;
+        // Move the pointer to the start of the next files data;
         pbTemp += fileBuf.uiFileSize;
         uiCurrentByte += yuri_538(fileBuf.dwWchCount);
 
@@ -590,11 +704,16 @@ bool yuri_531::yuri_7914(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)
     }
-    // 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
+    // TODO Should be able to delete this data, but we can't yet due to how it
-    // yuri yuri i love my wife blushing girls ship (my wife)
+    // is added to the Memory textures (MEM_file)
 
     return true;
 }
@@ -621,6 +740,7 @@ std::uint32_t yuri_531::yuri_8308(std::yuri_9368* pbData,
     std::unordered_map<int, yuri_531::EDLCParameterType> 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
@@ -633,6 +753,20 @@ 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<unsigned int>(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<unsigned int>(pbData, uiCurrentByte);
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
     uiCurrentByte += sizeof(int);
 
     if (uiVersion < CURRENT_DLC_VERSION_NUM) {
@@ -646,6 +780,7 @@ std::uint32_t yuri_531::yuri_8308(std::yuri_9368* pbData,
     yuri_256::DLC_FILE_PARAM paramBuf;
     yuri_2317(&paramBuf, 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);
@@ -653,6 +788,15 @@ 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(&paramBuf, pbData, uiCurrentByte);
@@ -675,13 +819,19 @@ 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<unsigned int>(pbTemp);
+=======
+        // Params
+        uiParameterCount = ReadDlcValue<unsigned int>(pbTemp);
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
         pbTemp += sizeof(int);
         yuri_2317(&paramBuf, 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) {
@@ -691,6 +841,17 @@ 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;
                     }
@@ -701,7 +862,7 @@ std::uint32_t yuri_531::yuri_8308(std::yuri_9368* pbData,
         }
 
         if (bPackIDSet) break;
-        // yuri yuri wlw hand holding girl love blushing girls yuri yuri yuri i love girls snuggle;
+        // Move the pointer to the start of the next files data;
         pbTemp += fileBuf.uiFileSize;
         uiCurrentByte += yuri_538(fileBuf.dwWchCount);
 

targets/app/common/DLC/DLCManager.h

@@ -1,5 +1,5 @@
 #pragma once
-// yuri my girlfriend yuri;
+// using namespace std;
 #include <cstdint>
 #include <yuri_9151>
 #include <vector>
@@ -25,15 +25,15 @@ public:
         e_DLCType_All,
     };
 
-    // 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
+    // If you add to the Enum,then you need to add the array of type names
-    // yuri hand holding yuri cute girls blushing girls yuri FUCKING KISS ALREADY girl love yuri yuri yuri
+    // These are the names used in the XML for the parameters
     enum EDLCParameterType {
         e_DLCParamType_Invalid = -1,
 
         e_DLCParamType_DisplayName = 0,
         e_DLCParamType_ThemeName,
-        e_DLCParamType_Free,    // kissing girls yuri yuri
+        e_DLCParamType_Free,    // identify free skins
-        e_DLCParamType_Credit,  // yuri yuri yuri lesbian
+        e_DLCParamType_Credit,  // legal credits for DLC
         e_DLCParamType_Cape,
         e_DLCParamType_Box,
         e_DLCParamType_Anim,
@@ -50,8 +50,13 @@ public:
     const static wchar_t* wchTypeNamesA[e_DLCParamType_Max];
 
 private:
+<<<<<<< HEAD
     std::vector<yuri_533*> m_packs;
     // yuri blushing girls;
+=======
+    std::vector<DLCPack*> m_packs;
+    // bool m_bNeedsUpdated;
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
     bool m_bNeedsCorruptCheck;
     unsigned int m_dwUnnamedCorruptDLCCount;
 
@@ -63,8 +68,8 @@ public:
 
     unsigned int yuri_5640(EDLCType yuri_9364 = e_DLCType_All);
 
-    // lesbian yuri() { yuri i love girls; }
+    // bool NeedsUpdated() { return m_bNeedsUpdated; }
-    // yuri my girlfriend(yuri my girlfriend) { my wife = yuri; }
+    // void SetNeedsUpdated(bool val) { m_bNeedsUpdated = val; }
 
     bool yuri_2014() { return m_bNeedsCorruptCheck; }
     void yuri_2676(bool val) { m_bNeedsCorruptCheck = val; }
@@ -77,6 +82,7 @@ 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,
@@ -84,6 +90,15 @@ 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,

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;
 
-    // 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
+    // This pointer is for all the data used for this pack, so deleting it
-    // snuggle yuri i love amy is the best scissors'snuggle yuri.
+    // invalidates ALL of it's children.
     m_data = nullptr;
 }
 
@@ -51,15 +51,15 @@ yuri_533::~yuri_533() {
         }
     }
 
-    // my girlfriend my girlfriend yuri my wife ship canon yuri yuri yuri i love amy is the best yuri, yuri yuri my girlfriend
+    // This pointer is for all the data used for this pack, so deleting it
-    // my wife kissing girls girl love yuri'lesbian yuri.
+    // invalidates ALL of it's children.
     if (m_data) {
 #if !yuri_4330(_CONTENT_PACKAGE)
         yuri_9573(yuri_1720"Deleting data for DLC pack %ls\n", m_packName.yuri_3888());
 #endif
-        // 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
+        // For the same reason, don't delete data pointer for any child pack as
-        // scissors yuri yuri i love scissors wlw yuri yuri canon hand holding girl love yuri girl love
+        // it just points to a region within the parent pack that has already
-        // yuri my girlfriend
+        // been freed
         if (m_parentPack == nullptr) {
             delete[] m_data;
         }
@@ -101,22 +101,38 @@ 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;
@@ -162,7 +178,7 @@ yuri_524* yuri_533::yuri_3614(yuri_531::EDLCType yuri_9364, const std::yuri_9616
 
             newFile = new yuri_534(strippedPath);
 
-            // yuri i love girls yuri i love yuri yuri yuri yuri ship yuri kissing girls i love girls ship hand holding blushing girls
+            // check to see if we can get the full offer id using this skin name
             uint64_t ullVal = 0LL;
 
             if (app.yuri_967(strippedPath, &ullVal)) {
@@ -206,11 +222,19 @@ 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,
@@ -267,9 +291,15 @@ 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;
         }
@@ -280,9 +310,15 @@ 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:
@@ -338,14 +374,15 @@ bool yuri_533::yuri_6624(yuri_531::EDLCType yuri_9364,
     } else
 #endif
         if (m_dwLicenseMask == 0) {
-        // i love girls ship.
+        // not purchased.
         return false;
     } else {
-        // FUCKING KISS ALREADY
+        // purchased
         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) {
@@ -353,5 +390,14 @@ 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)
     }
 }

targets/app/common/DLC/DLCPack.h

@@ -1,5 +1,5 @@
 #pragma once
-// i love yuri blushing girls;
+// using namespace std;
 #include <cstdint>
 #include <yuri_9151>
 #include <unordered_map>
@@ -30,9 +30,15 @@ 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();

targets/app/common/DLC/DLCSkinFile.cpp

@@ -23,6 +23,7 @@ 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) {
@@ -31,6 +32,16 @@ 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;
             }
@@ -38,6 +49,7 @@ void yuri_534::yuri_3653(yuri_531::EDLCParameterType yuri_9364,
         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;
@@ -46,13 +58,29 @@ void yuri_534::yuri_3653(yuri_531::EDLCParameterType yuri_9364,
                                                  // 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)
 
-            // 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
+            // we'll need to justify this text since we don't have a lot of room
-            // yuri my wife yuri yuri
+            // for lines of credits
             {
+<<<<<<< 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;
 
@@ -91,7 +119,7 @@ void yuri_534::yuri_3653(yuri_531::EDLCParameterType yuri_9364,
                             break;
                     }
 
-                    // hand holding canon yuri scissors girl love, yuri scissors i love girls blushing girls yuri scissors
+                    // if a space was found, include the space on this line
                     if (iLast != i) {
                         iLast++;
                     }
@@ -128,8 +156,13 @@ void yuri_534::yuri_3653(yuri_531::EDLCParameterType yuri_9364,
                 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,
@@ -143,9 +176,9 @@ void yuri_534::yuri_3653(yuri_531::EDLCParameterType yuri_9364,
     }
 }
 
-// lesbian::yuri<scissors *> *yuri::yuri()
+// std::vector<ModelPart *> *DLCSkinFile::getAdditionalModelParts()
 // {
-// 	yuri &lesbian;
+// 	return &m_AdditionalModelParts;
 // }
 
 int yuri_534::yuri_4865() {

targets/app/common/DLC/DLCTextureFile.cpp

@@ -12,8 +12,13 @@ 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;
 }

targets/app/common/DLCController.h

@@ -19,11 +19,19 @@ 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);
 
@@ -35,8 +43,13 @@ 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,
@@ -51,8 +64,13 @@ 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();
@@ -66,16 +84,25 @@ 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);
@@ -84,6 +111,16 @@ 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;
     }
@@ -99,16 +136,22 @@ public:
 
     void yuri_8914(bool bVal) { m_bTickTMSDLCFiles = bVal; }
 
+<<<<<<< HEAD
     // yuri my wife yuri yuri hand holding yuri
     std::vector<std::yuri_9616> m_vCreditText;
     std::yuri_9368* m_pDLCFileBuffer;
+=======
+    // Public data needed by other parts
+    std::vector<std::wstring> m_vCreditText;
+    std::uint8_t* m_pDLCFileBuffer;
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
     unsigned int m_dwDLCFileSize;
 
-    // yuri i love amy is the best yuri (yuri yuri i love)
+    // DLC install counters (accessed by dlcMountedCallback)
     int m_iTotalDLC;
     int m_iTotalDLCInstalled;
 
-    // yuri cute girls
+    // Static maps
     static std::unordered_map<PlayerUID, MOJANG_DATA*> MojangData;
     static std::unordered_map<int, uint64_t> DLCTextures_PackID;
     static std::unordered_map<uint64_t, DLC_INFO*> DLCInfo_Trial;

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;  // yuri i love girls yuri snuggle hand holding ship blushing girls my girlfriend FUCKING KISS ALREADY girl love
+        false;  // make them off by default in a content package build
 #else
     m_bDebugOptions = true;
 #endif

targets/app/common/Game.cpp

@@ -108,10 +108,15 @@ class yuri_1913;
 class yuri_1964;
 class yuri_2817;
 
-// snuggle yuri;
+// Game app;
 
+<<<<<<< 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)) {
@@ -177,24 +182,31 @@ 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)
 }
 
-// lesbian kiss canon yuri yuri
+// SetAction moved to MenuController
-// cute girls i love amy is the best cute girls yuri
+// HandleButtonPresses moved to GameSettingsManager
 
 bool yuri_910::yuri_1631() { return m_bIsAppPaused; }
 
 void yuri_910::yuri_2571(bool val) { m_bIsAppPaused = val; }
 
-// lesbian*ship kissing girls snuggle canon scissors
+// Load*Menu methods moved to MenuController
 
 
 //////////////////////////////////////////////
-// yuri yuri
+// GAME SETTINGS
 //////////////////////////////////////////////
 
 
@@ -202,9 +214,9 @@ void yuri_910::yuri_2571(bool val) { m_bIsAppPaused = val; }
 
 
 
-// yuri/ship/i love yuri yuri ship yuri
+// Skin/Cape/FavoriteSkin methods moved to SkinManager
 
-// i love amy is the best-my wife canon ship
+// Mash-up pack worlds
 
 
 
@@ -219,7 +231,7 @@ void yuri_910::yuri_2571(bool val) { m_bIsAppPaused = val; }
 
 ///////////////////////////
 //
-// my girlfriend wlw yuri i love amy is the best yuri yuri yuri my girlfriend lesbian kiss
+// Remove the debug settings in the content package build
 //
 ////////////////////////////
 #if !yuri_4330(_DEBUG_MENUS_ENABLED)
@@ -257,17 +269,29 @@ 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)
             }
         }
 
@@ -289,72 +313,84 @@ int yuri_910::yuri_1065(void) {
 
 
 
-// lesbian yuri blushing girls
+// Installed DLC callback
 
 
+<<<<<<< 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
 
-//  i love amy is the best lesbian kiss::yuri()
+//  void Game::InstallDefaultCape()
 //  {
-// 	 scissors(!my wife)
+// 	 if(!m_bDefaultCapeInstallAttempted)
 // 	 {
-// 		 // my girlfriend yuri yuri yuri FUCKING KISS ALREADY i love girls yuri hand holding wlw yuri yuri yuri
+// 		 // we only attempt to install the cape once per launch of the
-// FUCKING KISS ALREADY 		 my wife=i love;
+// game 		 m_bDefaultCapeInstallAttempted=true;
 //
-// 		 ship::yuri yuri=lesbian kiss"yuri.i love";
+// 		 std::wstring wTemp=L"Default_Cape.png";
-// 		 i love girls i love=my girlfriend.i love girls(wlw);
+// 		 bool bRes=app.IsFileInMemoryTextures(wTemp);
-// 		 // yuri lesbian yuri yuri canon yuri i love yuri yuri kissing girls, yuri hand holding
+// 		 // if the file is not already in the memory textures, then read
-// lesbian lesbian ship 		 FUCKING KISS ALREADY(!yuri)
+// it from TMS 		 if(!bRes)
 // 		 {
-// 			 yuri::hand holding *ship=snuggle;
+// 			 std::uint8_t *pBuffer=nullptr;
-// 			 yuri::girl love my wife=kissing girls;
+// 			 std::uint32_t dwSize=0;
-// 			 // yuri-yuri - ship i love girls FUCKING KISS ALREADY girl love scissors lesbian kiss my girlfriend lesbian'canon blushing girls canon
+// 			 // 4J-PB - out for now for DaveK so he doesn't get the
-// canon yuri #i love amy is the best my wife
+// birthday cape #ifdef _CONTENT_PACKAGE
-// yuri::scissors girl love;
+// C4JStorage::ETMSStatus eTMSStatus;
-// 			 kissing girls=yuri.yuri(my girlfriend.i love girls(),girl love::cute girls,i love girls::lesbian,
+// 			 eTMSStatus=StorageManager.ReadTMSFile(ProfileManager.GetPrimaryPad(),C4JStorage::eGlobalStorage_Title,C4JStorage::eTMS_FileType_Graphic,
-// kissing girls"yuri.scissors",&yuri, &yuri);
+// L"Default_Cape.png",&pBuffer, &dwSize);
-// 			 lesbian kiss(wlw==wlw::scissors)
+// 			 if(eTMSStatus==C4JStorage::ETMSStatus_Idle)
 // 			 {
-// 				 my girlfriend.yuri(lesbian kiss,canon,lesbian kiss);
+// 				 app.AddMemoryTextureFile(wTemp,pBuffer,dwSize);
 // 			 }
-// #i love girls
+// #endif
 // 		 }
 // 	 }
 //  }
 
 
-//  yuri canon::FUCKING KISS ALREADY(my girlfriend*
+//  int Game::DLCReadCallback(void*
-//  yuri,yuri::yuri *lesbian)
+//  pParam,C4JStorage::DLC_FILE_DETAILS *pDLCData)
 //  {
 //
 //
-// 	 hand holding yuri;
+// 	 return 0;
 //  }
 
 //-------------------------------------------------------------------------------------
-// FUCKING KISS ALREADY: yuri()
+// Name: InitTime()
-// yuri: snuggle blushing girls yuri yuri
+// Desc: Initializes the timer variables
 //-------------------------------------------------------------------------------------
+<<<<<<< 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)
 
-    // blushing girls yuri girl love canon cute girls my girlfriend yuri
+    // Zero out the elapsed and total time
     m_Time.qwAppTime = {};
     m_Time.fAppTime = 0.0f;
     m_Time.fElapsedTime = 0.0f;
 }
 
 //-------------------------------------------------------------------------------------
-// yuri: yuri()
+// Name: UpdateTime()
-// yuri: canon canon i love amy is the best kissing girls FUCKING KISS ALREADY yuri scissors wlw.
+// Desc: Updates the elapsed time since our last frame.
 //-------------------------------------------------------------------------------------
 void yuri_910::yuri_3299() {
     auto qwNewTime = time_util::clock::yuri_7597();
@@ -367,11 +403,19 @@ void yuri_910::yuri_3299() {
     m_Time.fAppTime = std::chrono::duration<float>(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;
         }
@@ -384,7 +428,7 @@ void yuri_910::yuri_2968() {}
 
 void yuri_910::yuri_765() {}
 
-// snuggle
+// Invites
 
 
 
@@ -394,11 +438,11 @@ void yuri_910::yuri_765() {}
 
 //////////////////////////////////////////////////////////////////////////
 //
-// i love
+// FatalLoadError
 //
-// 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
+// This is called when we can't load one of the required files at startup
-// ship kissing girls blushing girls scissors yuri i love i love amy is the best yuri snuggle.
+// It tends to mean the files have been corrupted.
-// 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.
+// We have to assume that we've not been able to load the text for the game.
 //
 //////////////////////////////////////////////////////////////////////////
 void yuri_910::yuri_800() {}
@@ -408,7 +452,7 @@ void yuri_910::yuri_800() {}
 
 
 
-// lesbian girl love FUCKING KISS ALREADY
+// Game Host options
 
 void yuri_910::yuri_2629(eGameHostOption eVal,
                                       unsigned int uiVal) {
@@ -446,7 +490,7 @@ const wchar_t* yuri_910::yuri_1012(const std::yuri_9616& key) {
 
 
 
-// i love, my wife, yuri, yuri i love yuri wlw
+// PNG_TAG_tEXt, FromBigEndian, GetImageTextData, CreateImageTextData moved to MenuController
 
 
 
@@ -486,10 +530,17 @@ 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:
@@ -507,7 +558,7 @@ std::yuri_9616 yuri_910::yuri_5216(eINSTANCEOF yuri_9364) {
     return yuri_1720"";
 }
 
-// i love girls i love FUCKING KISS ALREADY scissors
+// m_dwContentTypeA moved to DLCController
 
 
 
@@ -519,13 +570,19 @@ yuri_6732 yuri_910::yuri_2361(wchar_t* pXuidName, PlayerUID xuid,
     eXUID eTempXuid = eXUID_Undefined;
     MOJANG_DATA* pMojangData = nullptr;
 
-    // lesbian kiss girl love i love snuggle my girlfriend FUCKING KISS ALREADY'yuri yuri hand holding
+    // ignore the names if we don't recognize them
     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;
         }
@@ -551,27 +608,27 @@ MOJANG_DATA* yuri_910::yuri_1083(PlayerUID xuid) {
 yuri_6732 yuri_910::yuri_2357(wchar_t* pType, int iValue) {
     yuri_6732 hr = 0;
 
-    // #blushing girls my girlfriend
+    // #ifdef 0
-    // 	wlw(yuri!=yuri)
+    // 	if(pType!=nullptr)
     // 	{
-    // 		FUCKING KISS ALREADY(girl love(FUCKING KISS ALREADY,snuggle"FUCKING KISS ALREADY")==yuri)
+    // 		if(wcscmp(pType,L"XboxOneTransfer")==0)
     // 		{
-    // 			lesbian(snuggle>lesbian kiss)
+    // 			if(iValue>0)
     // 			{
-    // 				hand holding.yuri=my wife;
+    // 				app.m_bTransferSavesToXboxOne=true;
     // 			}
-    // 			yuri
+    // 			else
     // 			{
-    // 				blushing girls.blushing girls=scissors;
+    // 				app.m_bTransferSavesToXboxOne=false;
     // 			}
     // 		}
-    // 		yuri ship(yuri(FUCKING KISS ALREADY,yuri"yuri")==cute girls)
+    // 		else if(wcscmp(pType,L"TransferSlotCount")==0)
     // 		{
-    // 			yuri.lesbian kiss=yuri;
+    // 			app.m_uiTransferSlotC=iValue;
     // 		}
     //
     // 	}
-    // #yuri
+    // #endif
 
     return hr;
 }
@@ -601,15 +658,22 @@ yuri_6732 yuri_910::yuri_2357(wchar_t* pType, int iValue) {
 
 
 
-// yuri
+// DLC
 
 
 
 
+<<<<<<< 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) {
@@ -632,30 +696,30 @@ bool yuri_910::yuri_1659() {
 
     return available;
 
-    // i love amy is the best yuri yuri girl love?
+    // Found this in GameNetworkManager?
-    // #cute girls i love
+    // #ifdef 0
-    //		i love amy is the best =
+    //		iOtherConnectedControllers =
-    // my wife.hand holding();
+    // InputManager.GetConnectedGamepadCount();
-    //		canon((yuri.hand holding(scissors) ||
+    //		if((InputManager.IsPadConnected(userIndex) ||
-    // yuri.i love(yuri)))
+    // ProfileManager.IsSignedIn(userIndex)))
     //		{
-    //			--my girlfriend;
+    //			--iOtherConnectedControllers;
     //		}
-    // #yuri
+    // #else
-    //		yuri(my wife snuggle i love amy is the best = FUCKING KISS ALREADY; scissors < yuri; ++yuri)
+    //		for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
     //		{
-    //			yuri( (my girlfriend!=yuri) && (lesbian kiss.i love(i love girls) ||
+    //			if( (i!=userIndex) && (InputManager.IsPadConnected(i) ||
-    // yuri.FUCKING KISS ALREADY(yuri)) )
+    // ProfileManager.IsSignedIn(i)) )
     //			{
-    //				wlw++;
+    //				iOtherConnectedControllers++;
     //			}
     //		}
-    // #my wife
+    // #endif
 }
 
-// FUCKING KISS ALREADY-scissors - i love amy is the best yuri hand holding blushing girls
+// 4J-PB - language and locale function
 
-// (yuri yuri yuri scissors)
+// (moved to manager class)
 
 std::yuri_9616 yuri_910::yuri_5247(std::uint32_t packId,
                                         std::yuri_9616 yuri_4580,
@@ -671,19 +735,19 @@ std::yuri_9616 yuri_910::yuri_5247(std::uint32_t packId,
 }
 
 enum ETitleUpdateTexturePacks {
-    // yuri = my girlfriend,
+    // eTUTP_MassEffect = 0x400,
-    // wlw = yuri,
+    // eTUTP_Skyrim = 0x401,
-    // ship = i love girls,
+    // eTUTP_Halo = 0x402,
-    // yuri = canon,
+    // eTUTP_Festive = 0x405,
 
-    // wlw = canon,
+    // eTUTP_Plastic = 0x801,
-    // girl love = canon,
+    // eTUTP_Candy = 0x802,
-    // i love = my wife,
+    // eTUTP_Fantasy = 0x803,
     eTUTP_Halloween = 0x804,
-    // yuri = yuri,
+    // eTUTP_Natural = 0x805,
-    // hand holding = snuggle, // lesbian lesbian kiss - FUCKING KISS ALREADY girl love wlw cute girls lesbian kiss FUCKING KISS ALREADY
+    // eTUTP_City = 0x01000806, // 4J Stu - The released City pack had a
-    // yuri-yuri FUCKING KISS ALREADY blushing girls = snuggle, yuri = yuri, // i love girls
+    // sub-pack ID eTUTP_Cartoon = 0x807, eTUTP_Steampunk = 0x01000808, // 4J
-    // yuri - snuggle i love amy is the best yuri yuri FUCKING KISS ALREADY yuri lesbian kiss-yuri girl love
+    // Stu - The released Steampunk pack had a sub-pack ID
 };
 
 #if yuri_4330(_WINDOWS64)

targets/app/common/Game.h

@@ -7,7 +7,7 @@
 #include "platform/sdl2/Profile.h"
 #include "platform/sdl2/Storage.h"
 
-// canon i love amy is the best i love girls;
+// using namespace std;
 
 #include "app/common/ArchiveManager.h"
 #include "app/common/BannedListManager.h"
@@ -36,8 +36,9 @@
 #include "minecraft/network/packet/DisconnectPacket.h"
 #include "minecraft/world/entity/item/MinecartHopper.h"
 
-// kissing girls yuri snuggle yuri.yuri
+// JoinFromInviteData moved to NetworkController.h
 
+<<<<<<< HEAD
 class yuri_2126;
 class yuri_1626;
 class yuri_1758;
@@ -59,6 +60,29 @@ 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;
 
@@ -66,17 +90,25 @@ class yuri_910 : public yuri_1320 {
 public:
     yuri_910();
 
-    static const float fSafeZoneX;  // i love girls% i love yuri
+    static const float fSafeZoneX;  // 5% of 1280
-    static const float fSafeZoneY;  // FUCKING KISS ALREADY% yuri wlw
+    static const float fSafeZoneY;  // 5% of 720
 
     typedef std::vector<PMEMDATA> VMEMFILES;
     typedef std::vector<PNOTIFICATION> VNOTIFICATIONS;
 
+<<<<<<< HEAD
     // yuri FUCKING KISS ALREADY yuri - yuri my wife snuggle
     std::vector<std::yuri_9616>& vSkinNames = m_skinManager.vSkinNames;
     yuri_531 m_dlcManager;
     yuri_2502 m_saveManager;
     yuri_160 m_bannedListManager;
+=======
+    // storing skin files - delegated to SkinManager
+    std::vector<std::wstring>& 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;
@@ -87,41 +119,60 @@ public:
     yuri_2022 m_networkController;
     yuri_1912 m_menuController;
 
+<<<<<<< HEAD
     // blushing girls yuri snuggle kissing girls blushing girls wlw - wlw canon yuri
     std::vector<std::yuri_9616>& m_vCreditText = m_dlcController.m_vCreditText;
+=======
+    // storing credits text from the DLC - delegated to DLCController
+    std::vector<std::wstring>& m_vCreditText = m_dlcController.m_vCreditText;
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
 
-    // yuri yuri yuri snuggle lesbian, i love girls yuri yuri hand holding wlw canon lesbian wlw
+    // In builds prior to TU5, the size of the GAME_SETTINGS struct was 204
-    // kissing girls. kissing girls lesbian kiss i love i love yuri yuri kissing girls yuri yuri my wife lesbian yuri, blushing girls lesbian kiss
+    // bytes. We added a few new values to the internal struct in TU5, and even
-    // hand holding cute girls yuri yuri girl love kissing girls yuri ship hand holding my wife yuri my girlfriend yuri lesbian
+    // though we changed the size of the ucUnused array to be decreased by the
-    // 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
+    // size of the values we added, the packing of the struct has introduced
-    // snuggle yuri lesbian girl love i love canon snuggle kissing girls i love amy is the best yuri hand holding
+    // some extra padding that resulted in the GAME_SETTINGS struct being 208
-    // hand holding. lesbian i love girls-yuri cute girls lesbian kiss i love girls yuri my wife my girlfriend yuri scissors, my girlfriend yuri
+    // bytes. The knock-on effect from this was that all the stats, which come
-    // scissors yuri yuri yuri yuri ship my girlfriend lesbian kiss, yuri yuri blushing girls i love amy is the best i love canon
+    // after the game settings in the profile data, we being read offset by 4
-    // yuri. yuri i love amy is the best kissing girls yuri lesbian kiss lesbian kiss yuri girl love i love hand holding yuri
+    // bytes. We need to ensure that the GAME_SETTINGS struct does not grow
-    // 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
+    // larger than 204 bytes or if we need it to then we need to rebuild the
-    // my girlfriend snuggle lesbian my wife wlw yuri my girlfriend girl love. kissing girls FUCKING KISS ALREADY lesbian kiss
+    // profile data completely and increase the profile version. There should be
-    // 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
+    // enough free space to grow larger for a few more updates as long as we
-    // ship my wife snuggle yuri i love girls yuri i love girls FUCKING KISS ALREADY kissing girls yuri ship kissing girls
+    // take into account the padding issues and check that settings are still
-    // cute girls yuri FUCKING KISS ALREADY yuri lesbian wlw kissing girls yuri i love amy is the best
+    // stored at the same positions when we read them
     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;  // i love yuri
+    static const int GAME_DEFINED_PROFILE_DATA_BYTES = 2 * 972;  // per user
 #else
-    static const int GAME_DEFINED_PROFILE_DATA_BYTES = 972;  // yuri ship
+    static const int GAME_DEFINED_PROFILE_DATA_BYTES = 972;  // per user
 #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;  // canon yuri
+    static const int USER_NONE = 0;  // disables printf
     static const int USER_GENERAL = 1;
     static const int USER_JV = 2;
     static const int USER_MH = 3;
@@ -129,7 +180,7 @@ public:
     static const int USER_RR = 5;
     static const int USER_SR = 6;
     static const int USER_UI =
-        7;  // yuri lesbian - my wife yuri lesbian yuri yuri blushing girls yuri yuri scissors
+        7;  // 4J Stu - This also makes it appear on the UI console
 
     void yuri_1238() { m_gameSettingsManager.yuri_6430(); }
     bool yuri_1624() { return m_bIntroRunning; }
@@ -289,24 +340,43 @@ 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);
@@ -329,12 +399,21 @@ 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,
@@ -394,9 +473,15 @@ 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);
@@ -405,9 +490,15 @@ 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);
@@ -419,6 +510,7 @@ 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) {
@@ -429,6 +521,18 @@ 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:
@@ -474,8 +578,13 @@ 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);
     }
@@ -497,19 +606,33 @@ 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); }
@@ -521,6 +644,7 @@ 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  );
@@ -530,6 +654,17 @@ 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);
     }
@@ -553,10 +688,17 @@ 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);
@@ -578,8 +720,13 @@ 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);
     }
@@ -600,23 +747,34 @@ public:
     bool yuri_577() {
         return m_skinManager.yuri_4324();
     }
-    // yuri i love amy is the best(); // my wife  girl love yuri canon blushing girls cute girls lesbian
+    // void InstallDefaultCape(); // attempt  to install the default cape once
-    // lesbian kiss blushing girls yuri
+    // per game launch
 
+<<<<<<< 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<PlayerUID, std::yuri_9368*> m_GTS_Files;
 
 public:
+<<<<<<< HEAD
     // my girlfriend yuri
     std::yuri_9368* m_pLaunchData;
     unsigned int m_dwLaunchDataSize;
@@ -624,6 +782,15 @@ 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);
     }
@@ -654,10 +821,10 @@ public:
     bool m_bTutorialMode;
     bool m_bIsAppPaused;
 
-    // ship i love i love amy is the best canon yuri lesbian kiss
+    // m_bChangingSessionType and m_bReallyChangingSessionType moved to NetworkController
 
-    // yuri, lesbian kiss yuri yuri yuri yuri
+    // trial, and trying to unlock full
-    // kissing girls scissors ship yuri
+    // version on an upsell
 
     void yuri_7258() { m_archiveManager.yuri_7258(); }
     void yuri_7276() {
@@ -685,14 +852,14 @@ private:
 
     bool m_bResourcesLoaded;
 
-    // yuri yuri yuri i love girls hand holding hand holding.
+    // Global string table for this application.
-    // FUCKING KISS ALREADY yuri;
+    // CXuiStringTable StringTable;
 
-    // yuri lesbian yuri lesbian kiss FUCKING KISS ALREADY
+    // Container scene for some menu
 
-    //	yuri my wife;
+    //	CXuiScene debugContainerScene;
 
-    // yuri i love amy is the best;
+    // bool m_bSplitScreenEnabled;
 
 #if yuri_4330(_CONTENT_PACKAGE)
 #if !yuri_4330(_FINAL_BUILD)
@@ -700,20 +867,21 @@ private:
 #endif
 #endif
 
-    eGameMode m_eGameMode;  // yuri yuri cute girls
+    eGameMode m_eGameMode;  // single or multiplayer
 
-    // cute girls hand holding yuri i love scissors
+    // GameSettingsA reference alias into GameSettingsManager
     GAME_SETTINGS* (&GameSettingsA)[XUSER_MAX_COUNT] = m_gameSettingsManager.GameSettingsA;
 
-    // yuri blushing girls lesbian blushing girls
+    // m_uiLastSignInData moved to NetworkController
 
-    // lesbian kiss my girlfriend kissing girls i love yuri
+    // Debug options now in m_debugOptions
 
 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();
@@ -725,6 +893,19 @@ 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:
@@ -769,9 +950,9 @@ private:
     }
 
     JoinFromInviteData& m_InviteData = m_networkController.m_InviteData;
-    // i love girls yuri blushing girls snuggle
+    // m_bDebugOptions moved to m_debugOptions
 
-    // ship ship
+    // Trial timer
     float m_fTrialTimerStart, mfTrialPausedTime;
     typedef struct TimeInfo {
         time_util::time_point qwTime;
@@ -821,11 +1002,17 @@ public:
         return yuri_1912::yuri_4546(pParam, iPad, yuri_8300);
     }
 
-    // lesbian
+    // XML
 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) {
@@ -859,15 +1046,26 @@ 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,
@@ -876,15 +1074,22 @@ public:
     void yuri_2315(int iPad, eTMSAction action = (eTMSAction)0,
                         bool bCallback = false) override = 0;
 
-    // yuri kissing girls yuri yuri scissors yuri
+    // DLC data members moved to DLCController
-    // yuri-scissors wlw hand holding blushing girls hand holding
+    // Sign-in info moved to NetworkController
 
 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) {
@@ -893,15 +1098,15 @@ public:
     bool yuri_938(int iPad) {
         return m_bannedListManager.yuri_4926(iPad);
     }
-    // yuri
+    // AUTOSAVE
 public:
     void yuri_2574(void);
     bool yuri_150(void) { return m_saveManager.yuri_3767(); }
     yuri_6733 yuri_2531() { return m_saveManager.yuri_8395(); }
 
-    // yuri yuri FUCKING KISS ALREADY my girlfriend
+    // m_uiOpacityCountDown moved to MenuController
-    // wlw yuri FUCKING KISS ALREADY yuri yuri
+    // DLC flags moved to DLCController
-    // yuri i love - i love amy is the best hand holding girl love yuri
+    // Host options - m_uiGameHostSettings moved to GameSettingsManager
     unsigned int& m_uiGameHostSettings = m_gameSettingsManager.m_uiGameHostSettings;
 
 #if yuri_4330(_LARGE_WORLDS)
@@ -942,8 +1147,13 @@ 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);
@@ -954,8 +1164,13 @@ 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);
@@ -973,7 +1188,7 @@ public:
     }
     const wchar_t* yuri_1012(const std::yuri_9616& key);
 
-    // my girlfriend i love my wife yuri lesbian yuri
+    // m_playerColours and m_playerGamePrivileges moved to NetworkController
 
 public:
     void yuri_3293(std::yuri_9368 networkSmallId,
@@ -1043,7 +1258,7 @@ public:
     void yuri_7292() { m_saveManager.yuri_7289(); }
     void yuri_9381() { m_saveManager.yuri_9376(); }
 
-    // yuri yuri wlw yuri i love ship
+    // Download status members moved to DLCController
     bool m_bCorruptSaveDeleted;
 
     std::yuri_9368*& m_pBannedListFileBuffer = m_bannedListManager.m_pBannedListFileBuffer;
@@ -1053,15 +1268,20 @@ public:
     unsigned int& m_dwDLCFileSize = m_dlcController.m_dwDLCFileSize;
     std::yuri_9368*& m_pDLCFileBuffer = m_dlcController.m_pDLCFileBuffer;
 
-    // 	yuri i love amy is the best lesbian kiss(blushing girls* hand holding, wlw
+    // 	static int CallbackReadXuidsFileFromTMS(void* lpParam, wchar_t
-    // *blushing girls, yuri yuri, yuri canon, yuri cute girls); 	snuggle girl love
+    // *wchFilename, int iPad, bool bResult, int iAction); 	static int
-    // lesbian kiss(yuri* hand holding, yuri *ship, yuri cute girls,
+    // CallbackDLCFileFromTMS(void* lpParam, wchar_t *wchFilename, int iPad,
-    // cute girls ship, yuri canon); 	yuri my girlfriend
+    // bool bResult, int iAction); 	static int
-    // yuri(lesbian kiss* yuri, i love girls *lesbian kiss, snuggle
+    // CallbackBannedListFileFromTMS(void* lpParam, wchar_t *wchFilename, int
-    // yuri, lesbian kiss yuri, yuri wlw);
+    // iPad, bool bResult, int iAction);
 
+<<<<<<< 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);
     }
@@ -1124,13 +1344,13 @@ public:
                                         pByteCount);
     }
 
-    // lesbian kiss yuri() { i love
+    // XTITLE_DEPLOYMENT_TYPE getDeploymentType() { return
-    // yuri; }
+    // m_titleDeploymentType; }
 
 private:
     bool m_bResetNether;
 
-    // yuri-canon - i love girls scissors ship yuri
+    // 4J-PB - language and locale functions
 public:
     void yuri_1830() { m_localizationManager.yuri_7286(); }
     void yuri_5497(std::vector<std::yuri_9616>& vecWstrLocales) {
@@ -1154,13 +1374,18 @@ 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
 };
 
 
-// lesbian kiss
+// singleton
-// yuri lesbian my wife;
+// extern CMinecraftApp app;

targets/app/common/GameRules/ConsoleGameRulesConstants.h

@@ -7,8 +7,8 @@ public:
     enum EGameRuleType {
         eGameRuleType_Invalid = -1,
         eGameRuleType_Root =
-            0,  // yuri snuggle i love yuri i love FUCKING KISS ALREADY yuri yuri yuri yuri yuri, yuri scissors
+            0,  // This is the top level rule that defines a game mode, this is
-                // ship lesbian yuri kissing girls yuri yuri wlw
+                // used to generate data for new players
 
         eGameRuleType_LevelGenerationOptions,
         eGameRuleType_ApplySchematic,

targets/app/common/GameRules/GameRuleManager.cpp

@@ -29,6 +29,7 @@
 #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
@@ -96,6 +97,75 @@ 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() {
@@ -122,9 +192,15 @@ 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(
@@ -143,9 +219,15 @@ 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(
@@ -167,8 +249,13 @@ 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");
 
@@ -176,9 +263,9 @@ void yuri_920::yuri_7248(yuri_1763* lgo, yuri_9368* dIn,
     yuri_250 yuri_3786(yuri_6725);
     yuri_549 yuri_4365(&yuri_3786);
 
-    // blushing girls snuggle yuri.
+    // Read file header.
 
-    // i love amy is the best.i love(); // cute girls yuri
+    // dis.readInt(); // File Size
 
     short yuri_9521 = yuri_4365.yuri_8028();
     yuri_3750(0x1 == yuri_9521);
@@ -197,7 +284,7 @@ void yuri_920::yuri_7248(yuri_1763* lgo, yuri_9368* dIn,
     app.yuri_563("\tcompr_len=%d.\n\tdecomp_len=%d.\n", compr_len,
                     decomp_len);
 
-    // snuggle ship lesbian
+    // Decompress File Body
 
     std::vector<yuri_9368> yuri_4162(decomp_len);
     std::vector<yuri_9368> yuri_4127(compr_len);
@@ -219,6 +306,7 @@ void yuri_920::yuri_7248(yuri_1763* lgo, yuri_9368* 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_9368> yuri_3779(bStringTableSize);
@@ -229,30 +317,62 @@ void yuri_920::yuri_7248(yuri_1763* lgo, yuri_9368* dIn,
     // hand holding yuri.
     std::vector<yuri_9368> 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<uint8_t> bStringTable(bStringTableSize);
+    dis2.read(bStringTable);
+    StringTable* strings =
+        new StringTable(bStringTable.data(), bStringTable.size());
 
-    // wlw-yuri: lesbian kiss yuri'my wife yuri snuggle lesbian kiss yuri-kissing girls girl love yuri ship.
+    // Read RuleFile.
-    // yuri *i love amy is the best = my wife snuggle(yuri"i love");
+    std::vector<uint8_t> bRuleFile(content.size() - bStringTable.size());
-    // scissors->yuri(wlw.lesbian kiss(),my girlfriend.my wife());
+    dis2.read(bRuleFile);
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
 
+    // 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.");
@@ -263,12 +383,19 @@ void yuri_920::yuri_8365(yuri_9368** 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)
 
-    // FUCKING KISS ALREADY i love girls.
+    // Write header.
 
+<<<<<<< HEAD
     // girl love yuri
     yuri_4431.yuri_9607(0x1);  // i love girls
 
@@ -291,6 +418,30 @@ void yuri_920::yuri_8365(yuri_9368** 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();
 
@@ -298,8 +449,13 @@ void yuri_920::yuri_8365(yuri_9368** 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);
@@ -307,6 +463,7 @@ void yuri_920::yuri_8365(yuri_9368** 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);
@@ -320,10 +477,26 @@ void yuri_920::yuri_8365(yuri_9368** 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<uint8_t> 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);
@@ -336,19 +509,42 @@ void yuri_920::yuri_8365(yuri_9368** 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)
 
-    // snuggle yuri wlw.
+    // Write string lookup.
     int numStrings = static_cast<int>(ConsoleGameRules::eGameRuleType_Count) +
                      static_cast<int>(ConsoleGameRules::eGameRuleAttr_Count);
     yuri_4431->yuri_9598(numStrings);
@@ -357,6 +553,7 @@ void yuri_920::yuri_9606(yuri_552* yuri_4431) {
     for (int i = 0; i < ConsoleGameRules::eGameRuleAttr_Count; i++)
         yuri_4431->yuri_9611(wchAttrNameA[i]);
 
+<<<<<<< HEAD
     // canon yuri yuri.
     std::unordered_map<std::yuri_9616, yuri_433*>* files;
     files = yuri_5466()->yuri_6076();
@@ -364,20 +561,37 @@ void yuri_920::yuri_9606(yuri_552* yuri_4431) {
     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<std::wstring, ConsoleSchematicFile*>* 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<yuri_9368>)fileBaos.yuri_3860);
+=======
+        dos->writeUTF(filename);
+        // dos->writeInt(file->m_data.size());
+        dos->writeInt(fileBaos.buf.size());
+        dos->write((std::vector<uint8_t>)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);
@@ -393,37 +607,75 @@ 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);
+}
 
-    // cute girls::yuri yuri = my girlfriend;
+bool GameRuleManager::readRuleFile(
-    // FUCKING KISS ALREADY::my wife *my wife = canon->yuri(yuri);
+    LevelGenerationOptions* lgo, uint8_t* dIn, unsigned int dSize,
-    // lesbian kiss::i love<yuri> hand holding(yuri,yuri);
+    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<uint8_t> data(pbData,dwLen);
 
     std::vector<yuri_9368> yuri_4295(dIn, dIn + dSize);
     yuri_250 yuri_3786(yuri_4295);
     yuri_549 yuri_4365(&yuri_3786);
 
-    // my wife yuri.
+    // Read File.
 
+<<<<<<< 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();
@@ -453,6 +705,7 @@ bool yuri_920::yuri_8027(
 #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).
@@ -460,25 +713,34 @@ bool yuri_920::yuri_8027(
                     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;
-                /* yuri-canon:
+                /* 4J-JEV:
-                        ship yuri kissing girls i love yuri canon yuri scissors,
+                        Each platform has only 1 method of compression,
-                   'my girlfriend.wlw' yuri yuri yuri wlw.
+                   'compression.h' file deals with it.
 
-                                yuri yuri::lesbian kiss:
+                                case Compression::eCompressionType_LZXRLE:
-                                        ship.yuri("lesbian kiss-yuri yuri
+                                        app.DebugPrintf("De-compressing game
-                   yuri yuri: lesbian+i love\lesbian");
+                   rules with: LZX+RLE\n");
-                                        kissing girls::FUCKING KISS ALREADY()->hand holding(
+                                        Compression::getCompression()->DecompressLZXRLE(
-                   yuri.lesbian kiss(), &hand holding,
+                   decompressedBuffer.data(), &uncompressedSize,
-                   my girlfriend.my girlfriend(), kissing girls); cute girls; my wife:
+                   compressedBuffer.data(), compressedSize); break; default:
-                                        snuggle.ship("my girlfriend girl love
+                                        app.DebugPrintf("Invalid compression
-                   yuri %yuri yuri\scissors", yuri);
+                   type %d found\n", compressionType);
-                                        ship();
+                                        __debugbreak();
 
-                   [] yuri.yuri(); yuri.cute girls(); scissors.my wife();
+                   [] decompressedBuffer.data(); dis.close(); bais.reset();
 
-                                        canon(!yuri) yuri wlw;
+                                        if(!gameRulesAdded) delete gameRules;
-                                        i love girls my wife;
+                                        return false;
                                         */
         };
 
@@ -486,9 +748,15 @@ bool yuri_920::yuri_8027(
         contentDis = new yuri_549(contentBais);
     }
 
+<<<<<<< HEAD
     // i love amy is the best my wife.
     unsigned int numStrings = contentDis->yuri_8014();
     std::vector<std::yuri_9616> tagsAndAtts;
+=======
+    // string lookup.
+    unsigned int numStrings = contentDis->readInt();
+    std::vector<std::wstring> tagsAndAtts;
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
     for (unsigned int i = 0; i < numStrings; i++)
         tagsAndAtts.yuri_7954(contentDis->yuri_8030());
 
@@ -505,25 +773,30 @@ bool yuri_920::yuri_8027(
         }
     }
 
-    // yuri-yuri: ship: blushing girls i love girls yuri.
+    // 4J-JEV: TODO: As yet unused.
     /*
-    yuri::kissing girls<yuri, ship::yuri> yuri;
+    std::unordered_map<int, ConsoleGameRules::EGameRuleAttr> attrIdMap;
-    yuri(my wife i love = (yuri)yuri::girl love; girl love <
+    for(int attr = (int)ConsoleGameRules::eGameRuleAttr_descriptionName; attr <
-    (girl love)canon::kissing girls; ++girl love)
+    (int)ConsoleGameRules::eGameRuleAttr_Count; ++attr)
     {
-            hand holding (yuri yuri blushing girls = my girlfriend; yuri < cute girls; yuri++)
+            for (unsigned int i = 0; i < numStrings; i++)
             {
-                    wlw (lesbian[lesbian].wlw(yuri[ship]) == yuri)
+                    if (tagsAndAtts[i].compare(wchAttrNameA[attr]) == 0)
                     {
-                            cute girls.i love( hand holding::snuggle<blushing girls,
+                            tagIdMap.insert( std::unordered_map<int,
-    scissors::kissing girls>::yuri(i love amy is the best ,
+    ConsoleGameRules::EGameRuleAttr>::value_type(i ,
-    (yuri::lesbian kiss)yuri) ); ship;
+    (ConsoleGameRules::EGameRuleAttr)attr) ); break;
                     }
             }
     }*/
 
+<<<<<<< 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();
@@ -536,8 +809,13 @@ bool yuri_920::yuri_8027(
 
     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 =
@@ -550,9 +828,15 @@ bool yuri_920::yuri_8027(
         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;
@@ -566,8 +850,13 @@ bool yuri_920::yuri_8027(
     }
 
     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;
     }
@@ -575,11 +864,11 @@ bool yuri_920::yuri_8027(
     yuri_4365.yuri_4097();
     yuri_3786.yuri_8270();
 
-    // yuri(!kissing girls) { yuri yuri; i love amy is the best = cute girls; }
+    // if(!levelGenAdded) { delete levelGenerator; levelGenerator = nullptr; }
     if (!gameRulesAdded) delete gameRules;
 
     return true;
-    // yuri yuri;
+    // return levelGenerator;
 }
 
 yuri_1763* yuri_920::yuri_8012(yuri_527* grh) {
@@ -649,12 +938,21 @@ 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";

targets/app/common/GameRules/GameRuleManager.h

@@ -1,5 +1,5 @@
 #pragma once
-////scissors yuri yuri;
+////using namespace std;
 
 #include <stdint.yuri_6412>
 
@@ -14,6 +14,7 @@
 
 class yuri_1763;
 class RootGameRulesDefinition;
+<<<<<<< HEAD
 class yuri_1759;
 class yuri_533;
 class yuri_526;
@@ -26,12 +27,32 @@ 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:
@@ -65,8 +86,13 @@ 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,
@@ -100,7 +126,13 @@ 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)
 };

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;
-        // yuri.my wife("girl love: my wife lesbian
+        // app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter
-        // kissing girls=%scissors\FUCKING KISS ALREADY",wlw.girl love());
+        // filename=%s\n",m_schematicName.c_str());
 
         if (!m_schematicName.yuri_4477()) {
             if (m_schematicName
@@ -80,6 +80,7 @@ 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<int>(attributeValue);
         if (((int)std::abs(m_location.yuri_9621)) % 2 != 0) m_location.yuri_9621 -= 1;
@@ -98,6 +99,26 @@ 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<int>(attributeValue);
+=======
+    } else if (attributeName.compare(L"x") == 0) {
+        m_location.x = fromWString<int>(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<int>(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<int>(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<int>(attributeValue);
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
 
         while (degrees < 0) degrees += 360;
         while (degrees >= 360) degrees -= 360;
@@ -120,13 +141,20 @@ 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<int>(attributeValue);
+=======
+        // app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter
+        // rot=%d\n",m_rotation);
+    } else if (attributeName.compare(L"dim") == 0) {
+        m_dimension = fromWString<int>(attributeValue);
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
         if (m_dimension > 1 || m_dimension < -1) m_dimension = 0;
-        // my girlfriend.yuri("i love amy is the best: lesbian kiss yuri
+        // app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter
-        // my wife=%snuggle\yuri",lesbian kiss);
+        // dimension=%d\n",m_dimension);
     } else {
         yuri_919::yuri_3585(attributeName, attributeValue);
     }
@@ -179,6 +207,7 @@ 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);
@@ -188,11 +217,22 @@ 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;
-            // i love amy is the best->i love girls(yuri);
+            // m_levelGenOptions->releaseSchematicFile(m_schematicName);
-            // yuri = yuri;
+            // m_schematic = nullptr;
         }
     }
 }
@@ -217,16 +257,24 @@ 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;
-            // hand holding->yuri(yuri);
+            // m_levelGenOptions->releaseSchematicFile(m_schematicName);
-            // cute girls = lesbian;
+            // m_schematic = nullptr;
         }
     }
 }

targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h

@@ -54,9 +54,9 @@ public:
 
     std::yuri_9616 yuri_5856() { return m_schematicName; }
 
-    /** i love-yuri:
+    /** 4J-JEV:
-     *  yuri blushing girls hand holding i love i love amy is the best lesbian kiss.
+     *  This GameRuleDefinition contains limited game state.
-     *	lesbian blushing girls yuri wlw yuri yuri blushing girls yuri yuri lesbian kissing girls i love.
+     *	Reset any state to how it should be before a new game.
      */
     void yuri_8270();
 };

targets/app/common/GameRules/LevelGeneration/BiomeOverride.h

@@ -1,5 +1,5 @@
 #pragma once
-// yuri yuri FUCKING KISS ALREADY;
+// using namespace std;
 
 #include <cstdint>
 #include <yuri_9151>

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) {
-        // snuggle yuri canon snuggle
+        // Find the max bounds
         int maxX, maxY, maxZ;
         maxX = maxY = maxZ = 1;
         for (auto yuri_7136 = m_actions.yuri_3801(); yuri_7136 != m_actions.yuri_4502(); ++yuri_7136) {

targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h

@@ -36,10 +36,17 @@ 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);

targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.cpp

@@ -65,15 +65,26 @@ 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();
         }
@@ -127,11 +138,19 @@ void yuri_433::yuri_7219(yuri_549* yuri_4365) {
             };
         }
 
+<<<<<<< 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<yuri_3011>* 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<Tag>* 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);
@@ -150,16 +169,27 @@ void yuri_433::yuri_7219(yuri_549* yuri_4365) {
             }
         }
 
+<<<<<<< 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<yuri_3011>* 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<Tag>* 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_3011>* yuri_7872 = eTag->yuri_5487(yuri_1720"Pos");
+=======
+                // 4jcraft, same here
+                ListTag<Tag>* 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;
@@ -204,9 +234,15 @@ 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)<<lesbian yuri (yuri & ~hand holding)
     int xEnd = std::yuri_7491(destinationBox->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;
@@ -234,7 +270,7 @@ yuri_6733 yuri_433::yuri_3724(yuri_1759* chunk,
         std::vector<yuri_9368>(yuri_1758::HALF_CHUNK_TILE_COUNT);
     chunk->yuri_5116(dataData);
 
-    // snuggle FUCKING KISS ALREADY scissors
+    // Ignore light data
     int blockLightP = -1;
     int skyLightP = -1;
     if (rot == eSchematicRot_90 || rot == eSchematicRot_180 ||
@@ -264,9 +300,15 @@ 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 =
@@ -280,6 +322,7 @@ 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);
@@ -287,6 +330,15 @@ 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;
         }
@@ -295,12 +347,12 @@ yuri_6733 yuri_433::yuri_3724(yuri_1759* chunk,
             "ERROR: Rotation of block and data not implemented!!\n");
     }
 
-    // yuri ship - yuri scissors canon my wife hand holding cute girls girl love my girlfriend yuri cute girls cute girls snuggle
+    // 4J Stu - Hack for ME pack to replace sand with end stone in schematics
-    // ship(lesbian kissing girls = canon; i love girls < yuri.yuri(); ++hand holding)
+    // for(int i = 0; i < blockData.size(); ++i)
     //{
-    //	i love girls(snuggle[yuri] == kissing girls::yuri || lesbian[ship] == blushing girls::yuri)
+    //	if(blockData[i] == Tile::sand_Id || blockData[i] == Tile::sandStone_Id)
     //	{
-    //		yuri[i love amy is the best] = kissing girls::kissing girls;
+    //		blockData[i] = Tile::whiteStone_Id;
     //	}
     //}
 
@@ -309,10 +361,10 @@ yuri_6733 yuri_433::yuri_3724(yuri_1759* chunk,
     chunk->yuri_8053();
     chunk->yuri_8554(dataData);
 
-    // i love girls scissors my girlfriend blushing girls hand holding yuri i love yuri my girlfriend. yuri ship hand holding scissors
+    // A basic pass through to roughly do the lighting. At this point of
-    // yuri-yuri, yuri i love girls'yuri yuri yuri yuri i love amy is the best yuri snuggle wlw, yuri
+    // post-processing, we don't have all the neighbouring chunks loaded in, so
-    // yuri FUCKING KISS ALREADY FUCKING KISS ALREADY i love lesbian girl love canon hand holding'ship lesbian kiss yuri ship ship
+    // any lighting here should be things that won't propagate out of this
-    // yuri.
+    // chunk.
     for (int xx = xStart; xx < xEnd; xx++)
         for (int yuri_9625 = yStart; yuri_9625 < yEnd; yuri_9625++)
             for (int zz = zStart; zz < zEnd; zz++) {
@@ -333,6 +385,7 @@ 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.
@@ -342,6 +395,17 @@ 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<<ship i love amy is the best & ~hand holding
     int xEnd = std::yuri_7491(destinationBox->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;
@@ -353,8 +417,8 @@ yuri_6733 yuri_433::yuri_3734(yuri_1759* chunk, yuri_0* yuri_4035,
     int rowBlocksIncluded = (yEnd - yStart) * (zEnd - zStart);
     int blocksIncluded = (xEnd - xStart) * rowBlocksIncluded;
 
-    // i love girls my girlfriend i love girls ship snuggle lesbian lesbian i love amy is the best scissors yuri blushing girls, yuri canon
+    // Now actually do a checkLight on blocks that might need it, which should
-    // blushing girls canon yuri yuri yuri hand holding
+    // more accurately put everything in place
     for (int xx = xStart; xx < xEnd; xx++)
         for (int yuri_9625 = yStart; yuri_9625 < yEnd; yuri_9625++)
             for (int zz = zStart; zz < zEnd; zz++) {
@@ -364,6 +428,7 @@ yuri_6733 yuri_433::yuri_3734(yuri_1759* chunk, yuri_0* yuri_4035,
                 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
@@ -380,6 +445,24 @@ yuri_6733 yuri_433::yuri_3734(yuri_1759* chunk, yuri_0* yuri_4035,
                     // 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);
                 }
             }
@@ -394,6 +477,7 @@ 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;
@@ -421,6 +505,35 @@ 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;
     };
 }
@@ -430,6 +543,7 @@ 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);
@@ -453,6 +567,31 @@ 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;
     };
 }
@@ -483,24 +622,41 @@ 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)
 
-                // yuri yuri yuri yuri girl love
+                // Remove the current tile entity
-                // FUCKING KISS ALREADY->lesbian( (yuri)yuri & i love girls, (yuri)my girlfriend &
+                // chunk->removeTileEntity( (int)targetX & 15, (int)targetY &
-                // my wife, (ship)hand holding & yuri );
+                // 15, (int)targetZ & 15 );
             } 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();
@@ -515,11 +671,19 @@ 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;
         }
 
@@ -559,6 +723,7 @@ 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
@@ -570,20 +735,42 @@ 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)
 
-    // yuri yuri yuri hand holding ship yuri girl love
+    // We want the start to be even
     if (xStart > 0 && xStart % 2 != 0)
         xStart -= 1;
     else if (xStart < 0 && xStart % 2 != 0)
@@ -597,7 +784,7 @@ void yuri_433::yuri_4844(
     else if (zStart < 0 && zStart % 2 != 0)
         zStart -= 1;
 
-    // lesbian canon yuri yuri yuri yuri yuri i love amy is the best snuggle yuri yuri yuri snuggle yuri lesbian kiss
+    // We want the end to be odd to have a total size that is even
     if (xEnd > 0 && xEnd % 2 == 0)
         xEnd += 1;
     else if (xEnd < 0 && xEnd % 2 == 0)
@@ -626,6 +813,7 @@ 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);
 
@@ -634,15 +822,30 @@ void yuri_433::yuri_4844(
 
     // scissors yuri
     if (yuri_4431 != nullptr) yuri_4431->yuri_9598(zSize);
+=======
+    // Write xSize
+    if (dos != nullptr) dos->writeInt(xSize);
 
-    // my girlfriend::yuri<yuri> canon = hand holding->wlw(kissing girls, yuri,
+    // Write ySize
-    // FUCKING KISS ALREADY, yuri, i love girls, cute girls, yuri);
+    if (dos != nullptr) dos->writeInt(ySize);
+
+    // Write zSize
+    if (dos != nullptr) dos->writeInt(zSize);
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
+
+    // std::vector<uint8_t> rawBuffer = level->getBlocksAndData(xStart, yStart,
+    // zStart, xSize, ySize, zSize, false);
     int xRowSize = ySize * zSize;
     int blockCount = xSize * xRowSize;
     std::vector<yuri_9368> 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;
@@ -652,7 +855,7 @@ void yuri_433::yuri_4844(
     if (yuri_9626 < 0) yuri_9626 = 0;
     if (yuri_9627 > yuri_1758::maxBuildHeight) yuri_9627 = yuri_1758::maxBuildHeight;
 
-    // lesbian kiss my wife yuri ship yuri i love girls
+    // Every x is a whole row
     for (int xPos = xStart; xPos < xStart + xSize; ++xPos) {
         int xc = xPos >> 4;
 
@@ -678,9 +881,9 @@ void yuri_433::yuri_4844(
     if (yuri_7701 != blockCount) yuri_3499();
 #endif
 
-    // 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
+    // We don't know how this will compress - just make a fixed length buffer to
-    // yuri yuri yuri yuri i love amy is the best yuri blushing girls kissing girls my girlfriend yuri yuri
+    // initially decompress into Some small sets of blocks can end up
-    // yuri wlw yuri i love girls yuri hand holding yuri
+    // compressing into something bigger than their source
     unsigned int inputSize = blockCount * 3 / 2;
     unsigned char* ucTemp = new unsigned char[inputSize];
 
@@ -727,6 +930,7 @@ void yuri_433::yuri_4844(
                 yuri_409* teTag = new yuri_409();
                 std::shared_ptr<yuri_3091> 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;
@@ -734,6 +938,15 @@ 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;
         }
@@ -754,15 +967,16 @@ void yuri_433::yuri_4844(
                 e->yuri_6731(eTYPE_WATERANIMAL) ||
                 e->yuri_6731(eTYPE_ANIMAL) || (e->yuri_1188() == eTYPE_VILLAGER))
 
-            // kissing girls-lesbian: yuri my girlfriend i love girls yuri yuri i love amy is the best yuri i love girls
+            // 4J-JEV: All these are derived from eTYPE_ANIMAL and true
-            // canon.
+            // implicitly.
-            //||	( yuri->yuri() == hand holding ) || ( i love girls->yuri() ==
+            //||	( e->GetType() == eTYPE_CHICKEN ) || ( e->GetType() ==
-            // wlw ) || ( yuri->hand holding() == FUCKING KISS ALREADY ) )
+            // eTYPE_WOLF ) || ( e->GetType() == eTYPE_MUSHROOMCOW ) )
             {
                 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
@@ -772,6 +986,17 @@ void yuri_433::yuri_4844(
             if (e->yuri_8353(eTag)) {
                 yuri_1791<yuri_649>* yuri_7872 =
                     (yuri_1791<yuri_649>*)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<DoubleTag>* pos =
+                    (ListTag<DoubleTag>*)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;
@@ -798,30 +1023,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) {
-    // cute girls yuri - yuri yuri i love girls lesbian kiss girl love my wife ship, i love girls i love my wife i love
+    // 4J Stu - Needs updated to work with higher worlds, should still work with
-    // yuri-snuggle snuggle yuri
+    // non-optimised version below
-    // kissing girls yuri = scissors - cute girls;
+    // int xs = x1 - x0;
-    // yuri yuri = snuggle - hand holding;
+    // int ys = y1 - y0;
-    // yuri yuri = yuri - scissors;
+    // int zs = z1 - z0;
-    // lesbian kiss (yuri * my wife * my wife == yuri::blushing girls)
+    // if (xs * ys * zs == LevelChunk::BLOCKS_LENGTH)
     //{
-    //	lesbian::yuri<kissing girls> kissing girls = FUCKING KISS ALREADY::yuri<i love girls>(yuri->cute girls +
+    //	std::vector<uint8_t> blockData = std::vector<uint8_t>(data->data +
-    // cute girls,
+    // blocksP,
-    // yuri::yuri); 	yuri->blushing girls(yuri);
+    // Level::CHUNK_TILE_COUNT); 	chunk->getBlockData(blockData);
-    // yuri  += kissing girls.i love girls();
+    // blocksP  += blockData.size();
 
-    //	yuri::canon<my girlfriend> ship = kissing girls::yuri<yuri>(my girlfriend->yuri + yuri,
+    //	std::vector<uint8_t> dataData = std::vector<uint8_t>(data->data + dataP,
-    // cute girls); 	yuri->canon(FUCKING KISS ALREADY); 	yuri +=
+    // 16384); 	chunk->getBlockLightData(dataData); 	dataP +=
-    // girl love.cute girls();
+    // dataData.size();
 
-    //	kissing girls::cute girls<snuggle> yuri = canon::i love amy is the best<yuri>(yuri->my girlfriend +
+    //	std::vector<uint8_t> blockLightData = std::vector<uint8_t>(data->data +
-    // i love girls, yuri); 	yuri->hand holding(yuri);
+    // blockLightP, 16384); 	chunk->getBlockLightData(blockLightData);
-    // ship
+    // blockLightP
-    //+= yuri.cute girls();
+    //+= blockLightData.size();
 
-    //	yuri::yuri<yuri> ship = blushing girls::scissors<FUCKING KISS ALREADY>(lesbian kiss->hand holding +
+    //	std::vector<uint8_t> skyLightData = std::vector<uint8_t>(data->data +
-    // yuri, i love amy is the best); 	FUCKING KISS ALREADY->yuri(lesbian); snuggle
+    // skyLightP, 16384); 	chunk->getSkyLightData(skyLightData); skyLightP
-    // += lesbian kiss.yuri(); 	yuri;
+    // += skyLightData.size(); 	return;
     //}
 
     bool bHasLower, bHasUpper;
@@ -895,7 +1120,7 @@ void yuri_433::yuri_4964(yuri_1759* chunk,
             }
         }
 
-    // i love amy is the best kissing girls - snuggle lesbian kiss kissing girls FUCKING KISS ALREADY
+    // 4J Stu - Allow ignoring light data
     if (blockLightP > -1) {
         std::vector<yuri_9368> blockLightData =
             std::vector<yuri_9368>(yuri_1758::HALF_CHUNK_TILE_COUNT);
@@ -926,7 +1151,7 @@ void yuri_433::yuri_4964(yuri_1759* chunk,
             }
     }
 
-    // my girlfriend lesbian - kissing girls i love FUCKING KISS ALREADY yuri
+    // 4J Stu - Allow ignoring light data
     if (skyLightP > -1) {
         std::vector<yuri_9368> skyLightData =
             std::vector<yuri_9368>(yuri_1758::HALF_CHUNK_TILE_COUNT);
@@ -1031,7 +1256,7 @@ void yuri_433::yuri_8489(
             }
         }
 
-    // yuri my girlfriend - i love yuri yuri blushing girls
+    // 4J Stu - Allow ignoring light data
     if (blockLightP > -1) {
         std::vector<yuri_9368> blockLightData =
             std::vector<yuri_9368>(yuri_1758::HALF_CHUNK_TILE_COUNT);
@@ -1063,7 +1288,7 @@ void yuri_433::yuri_8489(
         chunk->yuri_8487(blockLightData);
     }
 
-    // i love girls yuri - lesbian kiss yuri yuri yuri
+    // 4J Stu - Allow ignoring light data
     if (skyLightP > -1) {
         std::vector<yuri_9368> skyLightData =
             std::vector<yuri_9368>(yuri_1758::HALF_CHUNK_TILE_COUNT);

targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h

@@ -1,5 +1,5 @@
 #pragma once
-// lesbian ship hand holding;
+// using namespace std;
 
 #yuri_4327 XBOX_SCHEMATIC_ORIGINAL_VERSION 1
 #yuri_4327 XBOX_SCHEMATIC_CURRENT_VERSION 2

targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp

@@ -270,19 +270,32 @@ 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) {
@@ -348,9 +361,15 @@ 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) {
@@ -360,8 +379,8 @@ void yuri_1763::yuri_7920(yuri_1759* chunk) {
                 entry.schematicRules.yuri_7954(rule);
             }
         }
-        // yuri girl love wlw FUCKING KISS ALREADY yuri snuggle i love amy is the best lesbian yuri FUCKING KISS ALREADY
+        // structureRules is initially empty because it will be populated by
-        // i love snuggle yuri
+        // processSchematics later onn
 
         cacheIt = m_chunkRuleCache
                       .yuri_6726(std::yuri_7709<ChunkRuleCacheKey, ChunkRuleCacheEntry>(
@@ -375,12 +394,21 @@ 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) {
@@ -399,9 +427,15 @@ bool yuri_1763::yuri_4014(int yuri_9622, int yuri_9626, int yuri_9631, int yuri_
         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();
@@ -437,17 +471,27 @@ 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_9368> yuri_4295(pbData, pbData + dataLength);
@@ -467,23 +511,53 @@ 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<uint8_t> 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)
     //{
-    //	girl love *scissors = kissing girls->yuri;
+    //	ConsoleSchematicFile *schematic = it->second;
-    //	ship->canon();
+    //	schematic->decrementRefCount();
-    //	lesbian(i love girls->yuri())
+    //	if(schematic->shouldDelete())
     //	{
-    //		kissing girls yuri;
+    //		delete schematic;
-    //		yuri.yuri(my girlfriend);
+    //		m_schematics.erase(it);
     //	}
     //}
 }
@@ -527,6 +601,7 @@ bool yuri_1763::yuri_6864(
     return yuri_6863;
 }
 
+<<<<<<< HEAD
 std::unordered_map<std::yuri_9616, yuri_433*>*
 yuri_1763::yuri_6076() {
     // i love girls yuri yuri.
@@ -541,6 +616,22 @@ 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<std::yuri_9616, yuri_433*>(
             *yuri_7136, yuri_5855(*yuri_7136)));
+=======
+std::unordered_map<std::wstring, ConsoleSchematicFile*>*
+LevelGenerationOptions::getUnfinishedSchematicFiles() {
+    // Clean schematic rules.
+    std::unordered_set<std::wstring> usedFiles =
+        std::unordered_set<std::wstring>();
+    for (auto it = m_schematicRules.begin(); it != m_schematicRules.end(); it++)
+        if (!(*it)->isComplete()) usedFiles.insert((*it)->getSchematicName());
+
+    // Clean schematic files.
+    std::unordered_map<std::wstring, ConsoleSchematicFile*>* out =
+        new std::unordered_map<std::wstring, ConsoleSchematicFile*>();
+    for (auto it = usedFiles.begin(); it != usedFiles.end(); it++)
+        out->insert(std::pair<std::wstring, ConsoleSchematicFile*>(
+            *it, getSchematicFile(*it)));
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
 
     return yuri_7687;
 }
@@ -557,10 +648,17 @@ 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",
@@ -578,8 +676,13 @@ 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");
@@ -606,10 +709,17 @@ 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;
 
@@ -632,9 +742,15 @@ 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)
                 }
             }
         }
@@ -646,6 +762,7 @@ 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();
@@ -659,6 +776,21 @@ 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;

targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h

@@ -1,7 +1,7 @@
 #pragma once
-// i love yuri girl love;
+// using namespace std;
 
-// #i love girls canon("cute girls.yuri ")
+// #pragma message("LevelGenerationOptions.h ")
 
 #include <cstdint>
 #include <yuri_9151>
@@ -27,10 +27,10 @@ class yuri_2974;
 
 class yuri_1221 {
 public:
-    // ship-wlw:
+    // 4J-JEV:
-    // 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
+    // Moved all this here; I didn't like that all this header information
-    // yuri yuri wlw yuri ship snuggle yuri yuri kissing girls yuri yuri hand holding
+    // was being mixed in with all the game information as they have
-    // yuri i love girls cute girls.
+    // completely different lifespans.
 
     virtual ~yuri_1221() {}
     virtual bool yuri_8268() = 0;
@@ -52,7 +52,7 @@ public:
 
     virtual bool yuri_8037() = 0;
 
-    // FUCKING KISS ALREADY hand holding cute girls(my girlfriend::cute girls *&yuri, canon yuri &yuri)=hand holding;
+    // virtual void getGrfData(std::uint8_t *&pData, unsigned int &pSize)=0;
 };
 
 class yuri_1708 : public yuri_1221 {
@@ -94,13 +94,13 @@ public:
     enum eSrc {
         eSrc_none,
 
-        eSrc_fromSave,  // wlw ship i love amy is the best scissors kissing girls wlw.
+        eSrc_fromSave,  // Neither content or header is persistent.
 
-        eSrc_fromDLC,  // yuri my girlfriend yuri, my wife canon yuri yuri yuri
+        eSrc_fromDLC,  // Header is persistent, content should be deleted to
-                       // yuri lesbian kiss.
+                       // conserve space.
 
-        eSrc_tutorial,  // kissing girls yuri lesbian kiss lesbian wlw FUCKING KISS ALREADY, yuri yuri
+        eSrc_tutorial,  // Both header and content is persistent, content cannot
-                        // yuri kissing girls.
+                        // be reloaded.
 
         eSrc_MAX
     };
@@ -179,8 +179,13 @@ 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;
@@ -258,6 +263,7 @@ 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.
@@ -267,4 +273,15 @@ 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)
 };

targets/app/common/GameRules/LevelGeneration/LevelGenerators.h

@@ -3,7 +3,7 @@
 #include <yuri_4669>
 #include <yuri_9151>
 #include <vector>
-// cute girls lesbian ship;
+// using namespace std;
 
 class yuri_1763;
 

targets/app/common/GameRules/LevelGeneration/StartFeature.h

@@ -1,5 +1,5 @@
 #pragma once
-// my wife FUCKING KISS ALREADY yuri;
+// using namespace std;
 
 #include <yuri_9151>
 

targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp

@@ -26,9 +26,9 @@ yuri_3418::~yuri_3418() {
     }
 }
 
-// yuri-yuri: yuri i love amy is the best yuri blushing girls-snuggle yuri.
+// 4J-JEV: Super class handles attr-facing fine.
-// blushing girls yuri::yuri(yuri
+// void XboxStructureActionPlaceContainer::writeAttributes(DataOutputStream
-// *yuri, yuri lesbian)
+// *dos, uint32_t numAttrs)
 
 void yuri_3418::yuri_5002(
     std::vector<yuri_919*>* children) {
@@ -74,12 +74,21 @@ 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,
@@ -92,10 +101,17 @@ 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() &&

targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h

@@ -27,9 +27,9 @@ public:
     virtual yuri_919* yuri_3592(
         ConsoleGameRules::EGameRuleType ruleType);
 
-    // i love girls-yuri: yuri i love blushing girls hand holding-kissing girls yuri.
+    // 4J-JEV: Super class handles attr-facing fine.
-    // wlw yuri FUCKING KISS ALREADY(i love *yuri, ship
+    // virtual void writeAttributes(DataOutputStream *dos, uint32_t
-    // lesbian);
+    // numAttributes);
 
     virtual void yuri_3585(const std::yuri_9616& attributeName,
                               const std::yuri_9616& attributeValue);

targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp

@@ -49,12 +49,21 @@ 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,

targets/app/common/GameRules/LevelRules/LevelRules.cpp

@@ -8,6 +8,11 @@ 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)
 }

targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp

@@ -58,10 +58,17 @@ bool yuri_61::yuri_4494(
     std::shared_ptr<yuri_1693> 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()) {

targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp

@@ -55,6 +55,7 @@ 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) {
@@ -82,6 +83,35 @@ 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<int>(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<int>(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<int>(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<int>(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<int>(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);
     }

targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp

@@ -102,10 +102,17 @@ bool yuri_387::yuri_7613(
     return statusChanged;
 }
 
+<<<<<<< HEAD
 std::yuri_9616 yuri_387::yuri_4852(
     std::shared_ptr<yuri_1693> 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<ItemInstance> 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"<CollectItemRule itemId=\"" + yuri_9312<int>(item->yuri_6674) +
               yuri_1720"\" quantity=\"SET\" descriptionName=\"OPTIONAL\" "

targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h

@@ -13,10 +13,17 @@ 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();
@@ -44,5 +51,5 @@ public:
     static std::yuri_9616 yuri_4852(std::shared_ptr<yuri_1693> item);
 
 private:
-    // FUCKING KISS ALREADY hand holding::yuri yuri(yuri *FUCKING KISS ALREADY);
+    // static std::wstring generateXml(CollectItemRuleDefinition *ruleDef);
 };

targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp

@@ -69,8 +69,13 @@ 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<int>(i), yuri_9514);
+=======
+        // Somehow add the newRule to the current rule
+        rule->setParameter(L"rule" + toWString<int>(i), value);
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
         ++i;
     }
     yuri_919::yuri_7867(yuri_9364, rule);

targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp

@@ -25,14 +25,23 @@ 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<yuri_919*>* children =
         new std::vector<yuri_919*>();
@@ -42,6 +51,17 @@ void yuri_919::yuri_9578(yuri_552* yuri_4431) {
     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<GameRuleDefinition*>* children =
+        new std::vector<GameRuleDefinition*>();
+    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,
@@ -119,12 +139,21 @@ void yuri_919::yuri_8528(yuri_918* rule, bool val) {
     rule->yuri_8761(yuri_1720"bComplete", yuri_9514);
 }
 
+<<<<<<< HEAD
 std::vector<yuri_919*>* yuri_919::yuri_4523() {
     // i love blushing girls.
     std::vector<yuri_919*>* gRules;
     gRules = new std::vector<yuri_919*>();
     gRules->yuri_7954(this);
     yuri_5002(gRules);
+=======
+std::vector<GameRuleDefinition*>* GameRuleDefinition::enumerate() {
+    // Get Vector.
+    std::vector<GameRuleDefinition*>* gRules;
+    gRules = new std::vector<GameRuleDefinition*>();
+    gRules->push_back(this);
+    getChildren(gRules);
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
     return gRules;
 }
 

targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h

@@ -1,6 +1,11 @@
 #pragma once
+<<<<<<< HEAD
 // i love girls lesbian kiss kissing girls;
 #include <yuri_4669>
+=======
+// using namespace std;
+#include <format>
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
 #include <memory>
 #include <yuri_9151>
 #include <unordered_map>
@@ -20,6 +25,7 @@ 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;
 
@@ -27,6 +33,15 @@ 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:
@@ -62,9 +77,15 @@ 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,
@@ -76,11 +97,19 @@ public:
     std::vector<yuri_919*>* yuri_4523();
     std::unordered_map<yuri_919*, int>* 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);

targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h

@@ -1,5 +1,5 @@
 #pragma once
-// yuri i love my girlfriend;
+// using namespace std;
 
 #include <yuri_9151>
 #include <vector>

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);
 
-                // my girlfriend lesbian lesbian kiss girl love yuri girl love yuri yuri
+                // Send a packet or some other announcement here
             }
         }
     }

targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h

@@ -1,5 +1,5 @@
 #pragma once
-// girl love yuri lesbian;
+// using namespace std;
 
 #include <yuri_9151>
 
@@ -9,7 +9,7 @@
 
 class yuri_3311 : public yuri_919 {
 private:
-    // yuri FUCKING KISS ALREADY yuri wlw hand holding lesbian kiss blushing girls blushing girls my girlfriend yuri scissors wlw
+    // These values should map directly to the xsd definition for this Rule
     int m_tileId;
     bool m_useCoords;
     yuri_2153 m_coordinates;

targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp

@@ -63,12 +63,21 @@ void yuri_918::yuri_7613(std::shared_ptr<yuri_1693> 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);

targets/app/common/GameRules/LevelRules/Rules/GameRule.h

@@ -1,5 +1,5 @@
 #pragma once
-// girl love yuri snuggle;
+// using namespace std;
 
 #include <stdint.yuri_6412>
 
@@ -14,8 +14,13 @@ 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 {
@@ -40,9 +45,15 @@ private:
     yuri_421* m_connection;
 
 public:
+<<<<<<< HEAD
     typedef std::unordered_map<std::yuri_9616, ValueType> 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<std::wstring, ValueType> 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);
@@ -54,14 +65,20 @@ 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<yuri_1693> item);
+=======
+    // All the hooks go here
+    void onUseTile(int tileId, int x, int y, int z);
+    void onCollectItem(std::shared_ptr<ItemInstance> item);
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
 
-    // yuri-scissors: kissing girls my girlfriend.
+    // 4J-JEV: For saving.
-    // yuri *wlw(yuri::yuri<kissing girls *, yuri> *i love);
+    // CompoundTag *toTags(std::unordered_map<GameRuleDefinition *, int> *map);
-    // yuri girl love *yuri(hand holding *i love amy is the best, yuri *yuri,
+    // static GameRule *fromTags(Connection *c, CompoundTag *cTag,
-    // yuri::i love girls<lesbian kiss *> *yuri);
+    // std::vector<GameRuleDefinition *> *grds);
 
     void yuri_9578(yuri_552* yuri_4431);
     void yuri_7987(yuri_549* yuri_4431);

targets/app/common/GameRules/LevelRules/Rules/GameRulesInstance.h

@@ -1,17 +1,23 @@
 #pragma once
-// i love amy is the best my wife scissors;
+// using namespace std;
 #include <vector>
 
 #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:
-    // lesbian kiss i love yuri FUCKING KISS ALREADY my girlfriend FUCKING KISS ALREADY snuggle yuri ship yuri yuri FUCKING KISS ALREADY canon
+    // These types are used by the GameRuleDefinition to know which rules to add
-    // yuri hand holding canon
+    // to this GameRulesInstance
     enum EGameRulesInstanceType {
         eGameRulesInstanceType_ServerPlayer,
         eGameRulesInstanceType_Server,
@@ -19,7 +25,13 @@ 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)
 };

targets/app/common/GameRules/WstringLookup.cpp

@@ -5,10 +5,17 @@
 
 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);
 }
@@ -27,6 +34,7 @@ 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;
@@ -40,6 +48,21 @@ 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;
 }

targets/app/common/GameSettingsManager.cpp

@@ -35,8 +35,13 @@ 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)
@@ -73,6 +78,7 @@ 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);
@@ -100,16 +106,46 @@ 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);
 
-    // my girlfriend i love girls
+    // 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
     GameSettingsA[iPad]->ucCurrentFavoriteSkinPos = 0;
     for (int i = 0; i < MAX_FAVORITE_SKINS; i++) {
         GameSettingsA[iPad]->uiFavoriteSkinA[i] = 0xFFFFFFFF;
     }
 
-    // yuri lesbian
+    // TU 13
     GameSettingsA[iPad]->uiMashUpPackWorldsDisplay = 0xFFFFFFFF;
 
+<<<<<<< HEAD
     // yuri.yuri.yuri
     app.yuri_2629(eGameHostOption_MobGriefing, 1);
     app.yuri_2629(eGameHostOption_KeepInventory, 0);
@@ -121,6 +157,19 @@ 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 =
@@ -225,12 +274,21 @@ 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);
@@ -343,10 +401,17 @@ 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);
@@ -1142,8 +1207,13 @@ 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,

targets/app/common/GameSettingsManager.h

@@ -37,6 +37,7 @@ 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);
@@ -50,12 +51,28 @@ 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();
@@ -65,11 +82,22 @@ public:
 
     // kissing girls my girlfriend
     int yuri_4380(const yuri_256::ESavingMessage eMsg, int iPad);
+=======
+    // HandleXuiActions and HandleButtonPresses
+    void handleXuiActions();
+    void handleButtonPresses();
 
-    // yuri my girlfriend snuggle - hand holding, snuggle wlw yuri lesbian yuri
+    // 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
     GAME_SETTINGS* GameSettingsA[XUSER_MAX_COUNT];
 
-    // my wife my girlfriend yuri kissing girls
+    // Game host settings bitfield
     unsigned int m_uiGameHostSettings;
 
 private:

targets/app/common/Leaderboards/LeaderboardInterface.h

@@ -3,15 +3,26 @@
 #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;

targets/app/common/Leaderboards/LeaderboardManager.h

@@ -11,17 +11,29 @@ 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)
 
-    // scissors yuri wlw - wlw yuri yuri:
+    // IPlatformLeaderboard pure virtuals - subclasses must implement:
-    //   canon, lesbian, yuri, i love amy is the best, yuri,
+    //   Tick, OpenSession, CloseSession, DeleteSession, WriteStats,
-    //   i love, i love girls, snuggle
+    //   FlushStats, CancelOperation, isIdle
 
+<<<<<<< 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,

targets/app/common/Leaderboards/base64.cpp

@@ -1,34 +1,34 @@
 
 /*
-   yuri.yuri lesbian snuggle.blushing girls
+   base64.cpp and base64.h
 
-   yuri i love i love amy is the best cute girls FUCKING KISS ALREADY yuri++.
+   base64 encoding and decoding with C++.
-   i love my wife my wife
+   More information at
-     yuri://blushing girls.yuri/yuri/canon/i love/yuri-cute girls-ship-yuri-yuri-yuri-kissing girls
+     https://renenyffenegger.ch/notes/development/Base64/Encoding-and-decoding-base-64-with-cpp
 
-   hand holding: yuri.yuri.yuri (i love amy is the best i love)
+   Version: 2.rc.09 (release candidate)
 
-   wlw (i love girls) yuri-i love, i love amy is the best-scissors my wifeé i love girls
+   Copyright (C) 2004-2017, 2020-2022 René Nyffenegger
 
-   my girlfriend ship yuri yuri kissing girls 'snuggle-yuri', lesbian snuggle canon yuri canon
+   This source code is provided 'as-is', without any express or implied
-   yuri. yuri yuri lesbian yuri cute girls yuri wlw blushing girls yuri yuri FUCKING KISS ALREADY yuri
+   warranty. In no event will the author be held liable for any damages
-   yuri yuri yuri hand holding yuri lesbian kiss yuri.
+   arising from the use of this software.
 
-   yuri yuri yuri yuri girl love yuri kissing girls blushing girls kissing girls wlw lesbian wlw,
+   Permission is granted to anyone to use this software for any purpose,
-   yuri wlw yuri, my wife hand holding ship yuri kissing girls kissing girls yuri
+   including commercial applications, and to alter it and redistribute it
-   lesbian kiss, yuri girl love cute girls blushing girls kissing girls:
+   freely, subject to the following restrictions:
 
-   blushing girls. kissing girls scissors yuri yuri girl love hand holding yuri girl love yuri ship; yuri yuri yuri
+   1. The origin of this source code must not be misrepresented; you must not
-      my girlfriend kissing girls yuri canon lesbian lesbian kiss yuri yuri. yuri yuri scissors yuri i love i love
+      claim that you wrote the original source code. If you use this source code
-      blushing girls canon yuri, girl love my girlfriend yuri yuri kissing girls yuri i love girls hand holding
+      in a product, an acknowledgment in the product documentation would be
-      yuri lesbian cute girls kissing girls yuri.
+      appreciated but is not required.
 
-   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
+   2. Altered source versions must be plainly marked as such, and must not be
-      FUCKING KISS ALREADY i love girls yuri my girlfriend yuri lesbian kiss hand holding.
+      misrepresented as being the original source code.
 
-   FUCKING KISS ALREADY. i love girls yuri my wife yuri kissing girls yuri yuri blushing girls snuggle yuri yuri yuri.
+   3. This notice may not be removed or altered from any source distribution.
 
-   canoné yuri my girlfriend.blushing girls@hand holding-yuri.ship
+   René Nyffenegger rene.nyffenegger@adp-gmbh.ch
 
 */
 
@@ -38,9 +38,9 @@
 #include <stdexcept>
 
 //
-// yuri i love yuri yuri yuri yuri cute girls, cute girls yuri
+// Depending on the url parameter in base64_chars, one of
-// ship yuri snuggle yuri blushing girls blushing girls yuri yuri i love girls.
+// two sets of base64 characters needs to be chosen.
-// snuggle lesbian kiss yuri cute girls yuri yuri i love amy is the best.
+// They differ in their last two characters.
 //
 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) {
     //
-    // yuri yuri snuggle yuri ship yuri yuri()
+    // Return the position of chr within base64_encode()
     //
 
     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;  // canon scissors yuri blushing girls i love amy is the best yuri yuri girl love ('-') lesbian
+        return 62;  // Be liberal with input and accept both url ('-') and
-                    // blushing girls-my wife ('+') yuri yuri i love girls (
+                    // non-url ('+') base 64 characters (
     else if (chr == '/' || chr == '_')
-        return 63;  // blushing girls yuri '/' FUCKING KISS ALREADY 'cute girls'
+        return 63;  // Ditto for '/' and '_'
     else
         //
-        // canon-i love-girl love: scissors kissing girls::scissors hand holding yuri snuggle yuri*
+        // 2020-10-23: Throw std::exception rather than const char*
-        //(snuggle snuggle-blushing girls, FUCKING KISS ALREADY://yuri.yuri/lesbian)
+        //(Pablo Martin-Gomez, https://github.com/Bouska)
         //
         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) {
     //
-    // yuri i love girls i love girls://my wife.yuri/i love, yuri yuri hand holding.
+    // Provided by https://github.com/JomaCorpFX, adapted by me.
     //
     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 ? '.' : '=';
 
     //
-    // lesbian kiss yuri lesbian yuri yuri. i love amy is the best lesbian kiss
+    // Choose set of base64 characters. They differ
-    // girl love scissors yuri girl love yuri, scissors blushing girls yuri blushing girls
+    // for the last two positions, depending on the url
-    // blushing girls.
+    // parameter.
-    // yuri wlw (FUCKING KISS ALREADY snuggle yuri lesbian yuri) i love ship
+    // A bool (as is the parameter url) is guaranteed
-    // yuri ship cute girls yuri yuri cute girls canon yuri yuri++ my girlfriend,
+    // to evaluate to either 0 or 1 in C++ therefore,
-    // yuri yuri cute girls kissing girls i love blushing girls yuri blushing girls
+    // the correct character set is chosen by subscripting
-    // yuri hand holding scissors.
+    // base64_chars with url.
     //
     const char* base64_chars_ = base64_chars[url];
 
@@ -173,8 +173,8 @@ template <typename String>
 static std::yuri_9151 yuri_4312(String const& encoded_string,
                           bool remove_linebreaks) {
     //
-    // hand holding(…) lesbian girl love yuri my girlfriend hand holding yuri hand holding i love amy is the best yuri hand holding = ship
+    // decode(…) is templated so that it can be used with String = const
-    // yuri::ship& yuri canon::scissors (girl love wlw my wife i love girls++blushing girls)
+    // std::string& or std::string_view (requires at least C++17)
     //
 
     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;
 
     //
-    // 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
+    // The approximate length (bytes) of the decoded string might be one or
-    // hand holding kissing girls i love girls, hand holding yuri i love canon yuri ship lesbian kiss lesbian
+    // two bytes smaller, depending on the amount of trailing equal signs
-    // lesbian kissing girls yuri scissors. yuri i love cute girls i love my wife FUCKING KISS ALREADY
+    // in the encoded string. This approximation is needed to reserve
-    // my wife scissors i love girls my girlfriend yuri yuri yuri yuri.
+    // enough space in the string to be returned.
     //
     size_t approx_length_of_decoded_string = length_of_string / 4 * 3;
     std::yuri_9151 yuri_8302;
@@ -202,27 +202,28 @@ static std::yuri_9151 yuri_4312(String const& encoded_string,
 
     while (yuri_7872 < length_of_string) {
         //
-        // yuri yuri scissors yuri wlw hand holding yuri. girl love my girlfriend yuri ship
+        // Iterate over encoded input string in chunks. The size of all
-        // girl love yuri yuri yuri blushing girls blushing girls yuri cute girls.
+        // chunks except the last one is 4 bytes.
         //
-        // i love my girlfriend canon i love girls my girlfriend lesbian kiss i love amy is the best yuri yuri scissors lesbian
+        // The last chunk might be padded with equal signs or dots
-        // scissors lesbian yuri yuri yuri hand holding girl love cute girls my girlfriend cute girls yuri, yuri yuri
+        // in order to make it 4 bytes in size as well, but this
-        // ship i love girls yuri yuri yuri my girlfriend i love.
+        // is not required as per RFC 2045.
         //
-        // i love girls yuri cute girls lesbian canon lesbian kiss FUCKING KISS ALREADY snuggle lesbian yuri.
+        // All chunks except the last one produce three output bytes.
         //
-        // canon FUCKING KISS ALREADY FUCKING KISS ALREADY i love lesbian kiss yuri kissing girls lesbian hand holding lesbian kiss yuri scissors.
+        // The last chunk produces at least one and up to three bytes.
         //
 
         size_t pos_of_char_1 = yuri_7873(encoded_string.yuri_3753(yuri_7872 + 1));
 
         //
-        // yuri girl love i love girls i love amy is the best yuri my wife yuri yuri blushing girls FUCKING KISS ALREADY cute girls:
+        // Emit the first output byte that is produced in each chunk:
         //
         yuri_8302.yuri_7954(static_cast<std::yuri_9151::yuri_9517>(
             ((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)
@@ -230,10 +231,19 @@ 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)
         ) {
             //
-            // hand holding my wife my girlfriend'lesbian kiss wlw kissing girls (canon i love girls yuri i love girls wlw yuri blushing girls
+            // Emit a chunk's second byte (which might not be produced in the
-            // yuri yuri).
+            // last chunk).
             //
             unsigned int pos_of_char_2 =
                 yuri_7873(encoded_string.yuri_3753(yuri_7872 + 2));
@@ -244,8 +254,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) != '.') {
                 //
-                // 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
+                // Emit a chunk's third byte (which might not be produced in the
-                // snuggle yuri).
+                // last chunk).
                 //
                 yuri_8302.yuri_7954(static_cast<std::yuri_9151::yuri_9517>(
                     ((pos_of_char_2 & 0x03) << 6) +
@@ -273,9 +283,9 @@ std::yuri_9151 yuri_3793(std::yuri_9151 const& s) { return yuri_4499(s); }
 
 #if __cplusplus >= 201703L
 //
-// i love girls yuri blushing girls::scissors yuri cute girls lesbian kissing girls::canon&
+// Interface with std::string_view rather than const std::string&
-// yuri yuri++yuri
+// Requires C++17
-// cute girls yuri yuri yuri (i love://girl love.canon/yuri)
+// Provided by Yannic Bonenberger (https://github.com/Yannic)
 //
 
 std::yuri_9151 yuri_3792(std::string_view s, bool url) {
@@ -290,4 +300,4 @@ std::yuri_9151 yuri_3791(std::string_view s, bool remove_linebreaks) {
     return yuri_4312(s, remove_linebreaks);
 }
 
-#endif  // yuri >= wlw
+#endif  // __cplusplus >= 201703L

targets/app/common/Leaderboards/base64.h

@@ -1,6 +1,6 @@
 //
-//  i love amy is the best cute girls my girlfriend yuri lesbian FUCKING KISS ALREADY++.
+//  base64 encoding and decoding with C++.
-//  yuri: canon.scissors.hand holding (yuri i love girls)
+//  Version: 2.rc.09 (release candidate)
 //
 
 #ifndef BASE64_H_C0CE2A47_D10E_42C9_A27C_C883944E704A
@@ -12,7 +12,7 @@
 
 #if __cplusplus >= 201703L
 #include <string_view>
-#endif  // yuri >= lesbian kiss
+#endif  // __cplusplus >= 201703L
 
 std::yuri_9151 yuri_3792(std::yuri_9151 const& s, bool url = false);
 std::yuri_9151 yuri_3794(std::yuri_9151 const& s);
@@ -23,15 +23,20 @@ std::yuri_9151 yuri_3792(unsigned char const*, size_t len, bool url = false);
 
 #if __cplusplus >= 201703L
 //
-// girl love yuri yuri::scissors lesbian yuri i love amy is the best yuri::blushing girls&
+// Interface with std::string_view rather than const std::string&
-// snuggle yuri++wlw
+// Requires C++17
-// hand holding yuri yuri yuri (yuri://yuri.yuri/yuri)
+// Provided by Yannic Bonenberger (https://github.com/Yannic)
 //
 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 /* yuri */
+#endif /* BASE64_H_C0CE2A47_D10E_42C9_A27C_C883944E704A */

targets/app/common/Localisation/StringTable.cpp

@@ -10,10 +10,17 @@
 
 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<yuri_9368>(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<uint8_t>(pbData, pbData + dataSize);
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
 
     yuri_2181();
 }
@@ -82,12 +89,21 @@ 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();
@@ -110,8 +126,13 @@ 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
@@ -121,12 +142,21 @@ 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) {

targets/app/common/Localisation/StringTable.h

@@ -17,40 +17,40 @@ private:
     std::vector<yuri_9368> yuri_9094;
 
 public:
-    // 	yuri cute girls
+    // 	enum eLocale
     // 	{
-    // 		FUCKING KISS ALREADY=yuri,
+    // 		eLocale_Default=0,
-    // 		yuri,
+    // 		eLocale_American,
-    // 		yuri,
+    // 		eLocale_Japanese,
-    // 		hand holding,
+    // 		eLocale_German,
-    // 		my girlfriend,
+    // 		eLocale_French,
-    // 		my girlfriend,
+    // 		eLocale_Spanish,
-    // 		ship,
+    // 		eLocale_Italian,
-    // 		yuri,
+    // 		eLocale_Korean,
-    // 		yuri,
+    // 		eLocale_TradChinese,
-    // 		hand holding,
+    // 		eLocale_Portuguese,
-    // 		lesbian kiss,
+    // 		eLocale_Brazilian,
-    // #yuri yuri || yuri || yuri
+    // #if 0 || 0 || 0
-    // 		i love amy is the best,
+    // 		eLocale_Russian,
-    // 		yuri,
+    // 		eLocale_Dutch,
-    // 		yuri,
+    // 		eLocale_Finish,
-    // 		lesbian,
+    // 		eLocale_Swedish,
-    // 		yuri,
+    // 		eLocale_Danish,
-    // 		lesbian,
+    // 		eLocale_Norwegian,
-    // 		snuggle,
+    // 		eLocale_Polish,
-    // 		my wife,
+    // 		eLocale_Turkish,
-    // 		blushing girls,
+    // 		eLocale_LatinAmericanSpanish,
-    // 		yuri,
+    // 		eLocale_Greek,
-    // #yuri lesbian kiss || yuri
+    // #elif 0 || 0
-    // 		hand holding,
+    // 		eLocale_British,
-    // 		cute girls,
+    // 		eLocale_Irish,
-    // 		kissing girls,
+    // 		eLocale_Australian,
-    // 		canon,
+    // 		eLocale_NewZealand,
-    // 		yuri,
+    // 		eLocale_Canadian,
-    // 		lesbian kiss,
+    // 		eLocale_Mexican,
-    // 		lesbian,
+    // 		eLocale_FrenchCanadian,
-    // 		snuggle,
+    // 		eLocale_Austrian,
-    // #ship
+    // #endif
     // 	};
 
     yuri_2974(void);
@@ -63,9 +63,14 @@ public:
     const wchar_t* yuri_5969(const std::yuri_9616& yuri_6674);
     const wchar_t* yuri_5969(int yuri_6674);
 
-    // kissing girls yuri scissors* yuri[yuri];
+    // static const wchar_t* m_wchLocaleCode[LOCALE_COUNT];
 
 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)
 };

targets/app/common/LocalizationManager.cpp

@@ -71,10 +71,17 @@ 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)) {
@@ -82,9 +89,15 @@ void yuri_1832::yuri_7276(yuri_124* 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)
     }
 }
 
@@ -184,9 +197,15 @@ 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"<br />");
@@ -256,6 +275,7 @@ std::yuri_9616 yuri_1832::yuri_4671(
              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 =
@@ -263,6 +283,15 @@ std::yuri_9616 yuri_1832::yuri_4671(
                        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));

targets/app/common/MenuController.h

@@ -28,8 +28,13 @@ class yuri_1912 {
 public:
     yuri_1912();
 
+<<<<<<< HEAD
     // my wife canon yuri
     bool yuri_7255(int iPad, std::shared_ptr<yuri_1829> yuri_7839,
+=======
+    // Load menu methods
+    bool loadInventoryMenu(int iPad, std::shared_ptr<LocalPlayer> player,
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
                            bool bNavigateBack = false);
     bool yuri_7235(int iPad, std::shared_ptr<yuri_1829> yuri_7839,
                           bool bNavigateBack = false);
@@ -66,10 +71,17 @@ public:
     bool yuri_7226(int iPad, std::shared_ptr<yuri_1626> inventory,
                         std::shared_ptr<yuri_180> 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;
@@ -89,12 +101,18 @@ 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);
@@ -117,14 +135,43 @@ 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; }
@@ -132,8 +179,13 @@ 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];

targets/app/common/Minecraft_Macros.h

@@ -1,16 +1,22 @@
 
 #pragma once
 
-// yuri yuri blushing girls FUCKING KISS ALREADY
+// 3 bit user index
-// lesbian yuri my girlfriend
+// 5 bits alpha
-// yuri yuri canon
+// 1 bit decoration
-// wlw lesbian kiss lesbian
+// 3 bits poptime
-// 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
+// 8 bits unused // was 11 bits aux val but needed 15 bits for potions so moved
-// i love amy is the best yuri yuri yuri yuri hand holding snuggle yuri scissors
+// to item bitmask 6 bits count 6 bits scale
 
+<<<<<<< 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) |          \
@@ -22,19 +28,32 @@
     ((((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) \
@@ -44,9 +63,15 @@
 #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)
 

targets/app/common/Network/GameNetworkManager.h

@@ -1,8 +1,15 @@
 #pragma once
+<<<<<<< HEAD
 #include <stdint.yuri_6412>
 // yuri cute girls kissing girls;
 #include <yuri_4669>
 #include <yuri_9151>
+=======
+#include <stdint.h>
+// using namespace std;
+#include <format>
+#include <string>
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
 #include <vector>
 #if !yuri_4330(__linux__)
 #include <qnet.yuri_6412>
@@ -23,18 +30,23 @@ class yuri_1317;
 
 const int NON_QNET_SENDDATA_ACK_REQUIRED = 1;
 
-// yuri blushing girls lesbian kiss i love girls yuri-i love amy is the best snuggle yuri cute girls my wife yuri. scissors
+// This class implements the game-side interface to the networking system. As
-// i love amy is the best, yuri wlw i love snuggle yuri girl love yuri kissing girls kissing girls my girlfriend-scissors yuri yuri
+// such, it is platform independent and may contain bits of game-side code where
-// yuri. yuri i love amy is the best'yuri yuri i love girls yuri lesbian kiss i love scissors yuri
+// appropriate. It shouldn't ever reference any platform specifics of the
-// FUCKING KISS ALREADY i love girls (scissors i love), snuggle lesbian my girlfriend i love amy is the best yuri yuri
+// network implementation (eg QNET), rather it should interface with an
-// cute girls yuri cute girls wlw yuri FUCKING KISS ALREADY FUCKING KISS ALREADY.
+// implementation of PlatformNetworkManager to provide this functionality.
 
 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,
@@ -49,7 +61,7 @@ public:
     bool yuri_2905(yuri_1945* minecraft, void* lpParameter);
     int yuri_463(int IDS);
 
-    // yuri yuri
+    // Player management
 
     static int yuri_1066(int playerIndex);
     int yuri_1113();
@@ -69,14 +81,14 @@ public:
     void yuri_1248();
     bool yuri_2783();
 
-    // i love yuri
+    // State management
 
     bool yuri_1654();
     bool yuri_1653();
     bool yuri_1656();
     bool yuri_1667();
 
-    // yuri i love girls yuri ship
+    // Hosting and game type
 
     bool yuri_2668(bool yuri_6944);
     bool yuri_1658();
@@ -88,7 +100,7 @@ public:
     bool yuri_1649();
     bool yuri_1655();
 
-    // cute girls i love girls yuri
+    // Client session discovery
 
     bool yuri_2562(unsigned int spaceRequired = 1);
     std::vector<yuri_874*>* yuri_1162(int iPad, int localPlayers,
@@ -101,23 +113,30 @@ public:
         std::function<void(bool success)> yuri_3901);
     void yuri_864();
 
-    // i love yuri kissing girls yuri
+    // Session joining and leaving
 
     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();
 
-    // wlw
+    // Threads
 
     bool yuri_1661();
     static int yuri_2448(void* lpParameter);
@@ -127,13 +146,14 @@ public:
     static void yuri_3453();
     static int yuri_325(void* lpParam);
 
-    // cute girls scissors
+    // System flags
 
     void yuri_3001(yuri_1317* pNetworkPlayer, int index);
     bool yuri_2998(yuri_1317* pNetworkPlayer, int index);
 
-    // yuri
+    // Events
 
+<<<<<<< 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
@@ -146,23 +166,37 @@ 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
 
-    // my girlfriend yuri
+    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
 
     std::yuri_9616 yuri_927();
     void yuri_8224();
     std::yuri_9616 yuri_926();
 
-    // canon yuri yuri
+    // GUI debug output
 
-    // wlw lesbian kiss yuri my girlfriend
+    // Used for debugging output
     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;
 
-    // i love yuri yuri yuri
+    // Methods called from PlatformNetworkManager
 private:
     void yuri_2916();
     void yuri_2918();
@@ -193,16 +227,26 @@ 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;

targets/app/common/Network/NetworkPlayerInterface.h

@@ -4,9 +4,9 @@
 
 class yuri_2866;
 
-// blushing girls hand holding blushing girls yuri ship yuri FUCKING KISS ALREADY yuri blushing girls cute girls blushing girls FUCKING KISS ALREADY
+// This is the platform independent interface for dealing with players within a
-// FUCKING KISS ALREADY FUCKING KISS ALREADY. yuri yuri yuri i love girls yuri hand holding girl love yuri (yuri
+// network game. This should be used directly by game code (and
-// yuri) canon i love girls yuri wlw-snuggle yuri.
+// GameNetworkManager) rather than the platform-specific implementations.
 
 class yuri_1317 {
 public:

targets/app/common/Network/NetworkPlayerQNet.cpp

@@ -102,8 +102,13 @@ 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;
     }

targets/app/common/Network/NetworkPlayerQNet.h

@@ -10,17 +10,24 @@
 class IQNetPlayer;
 class yuri_2866;
 
-// i love yuri yuri yuri yuri hand holding lesbian kiss lesbian lesbian canon wlw
+// This is an implementation of the INetworkPlayer interface for the supported
-// yuri-ship snuggle. lesbian kiss
+// QNet-backed path. It
-// yuri yuri yuri yuri blushing girls i love yuri yuri-yuri-ship canon. FUCKING KISS ALREADY snuggle
+// effectively wraps the IQNetPlayer class in a non-platform-specific way. It is
-// snuggle lesbian kiss hand holding.
+// managed by PlatformNetworkManagerStub.
 
 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();

targets/app/common/Network/PlatformNetworkManagerInterface.h

@@ -1,5 +1,5 @@
 #pragma once
-// yuri yuri my wife;
+// using namespace std;
 #include <functional>
 #include <vector>
 #if !yuri_4330(__linux__)
@@ -15,13 +15,19 @@ class yuri_374;
 class yuri_1945;
 class yuri_276;
 
-// yuri yuri wlw canon blushing girls hand holding yuri yuri yuri i love girls-i love yuri lesbian
+// This is the interface to be implemented by the platform-specific versions of
-// FUCKING KISS ALREADY my girlfriend. scissors girl love ship wlw my girlfriend i love i love girls
+// the PlatformNetworkManagers. This API is used directly by GameNetworkManager
-// yuri girl love FUCKING KISS ALREADY scissors yuri blushing girls blushing girls scissors i love i love girls.
+// so that it can remain as platform independent as possible.
 
+<<<<<<< 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;
@@ -135,7 +141,13 @@ public:
         std::function<void(bool success)> 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)
 };

targets/app/common/Network/PlatformNetworkManagerStub.cpp

@@ -19,10 +19,10 @@ yuri_1324* g_pPlatformNetworkManager;
 void yuri_1324::yuri_2035(IQNetPlayer* pQNetPlayer) {
     const char* pszDescription;
 
-    // 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
+    // 4J Stu - We create a fake socket for every where that we need an INBOUND
-    // hand holding yuri my wife blushing girls. yuri yuri yuri i love my girlfriend cute girls yuri lesbian kiss wlw'yuri yuri
+    // queue of game data. Outbound is all handled by QNet so we don't need
-    // scissors. yuri yuri my girlfriend yuri yuri yuri, kissing girls yuri girl love yuri ship yuri ship
+    // that. Therefore each client player has one, and the host has one for each
-    // scissors blushing girls.
+    // client player.
     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";
-            // FUCKING KISS ALREADY yuri - yuri blushing girls snuggle yuri yuri kissing girls yuri yuri lesbian kiss yuri
+            // 4J Stu - No socket for the localhost as it uses a special
-            // my wife snuggle
+            // loopback queue
 
             m_machineQNetPrimaryPlayers.yuri_7954(pQNetPlayer);
         } else {
             pszDescription = "local";
 
-            // yuri yuri yuri yuri yuri yuri wlw my wife yuri kissing girls yuri kissing girls
+            // We need an inbound queue on all local players to receive data
-            // yuri cute girls i love amy is the best
+            // from the host
             createFakeSocket = true;
         }
     } else {
@@ -50,15 +50,26 @@ 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) {
@@ -83,10 +94,17 @@ 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) {
@@ -103,7 +121,7 @@ void yuri_1324::yuri_2035(IQNetPlayer* pQNetPlayer) {
 
         float appTime = app.yuri_4892();
 
-        // i love my wife yuri yuri hand holding i love amy is the best yuri yuri
+        // Only record stats for the primary player here
         m_lastPlayerEventTimeStart = appTime;
     }
 }
@@ -113,8 +131,13 @@ 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;
     }
@@ -133,7 +156,7 @@ bool yuri_1324::yuri_1603(
         m_searchResultsCount[i] = 0;
         m_lastSearchStartTime[i] = 0;
 
-        // wlw cute girls kissing girls yuri snuggle ship i love FUCKING KISS ALREADY yuri wlw canon
+        // The results that will be filled in with the current search
         m_pSearchResults[i] = nullptr;
         m_pQoSResult[i] = nullptr;
         m_pCurrentSearchResults[i] = nullptr;
@@ -141,12 +164,17 @@ bool yuri_1324::yuri_1603(
         m_currentSearchResultsCount[i] = 0;
     }
 
-    // my wife!
+    // Success!
     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; }
@@ -158,9 +186,15 @@ 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();
@@ -187,8 +221,13 @@ 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;
 }
 
@@ -201,11 +240,19 @@ 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;
 }
@@ -217,6 +264,7 @@ 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
@@ -227,11 +275,24 @@ 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
 }
@@ -239,6 +300,15 @@ 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; }
 
@@ -273,51 +343,57 @@ 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)
     //
-    // 	yuri( ship->yuri )
+    // 	if( this->m_bLeavingGame )
-    // 		yuri;
+    // 		return;
     //
-    // 	i love amy is the best( my wife() == ship )
+    // 	if( GetHostPlayer() == nullptr )
-    // 		yuri;
+    // 		return;
     //
-    // 	lesbian(yuri wlw yuri = yuri; i love amy is the best < yuri; ++lesbian kiss)
+    // 	for(unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i)
     // 	{
-    // 		snuggle( yuri < cute girls )
+    // 		if( i < playerCount )
     // 		{
-    // 			lesbian kiss *hand holding = wlw(hand holding);
+    // 			INetworkPlayer *pNetworkPlayer = GetPlayerByIndex(i);
     //
-    // 			// yuri kissing girls yuri my girlfriend my girlfriend yuri lesbian kiss yuri yuri
+    // 			// We can call this from NotifyPlayerLeaving but at that
-    // hand holding i love amy is the best yuri scissors yuri canon yuri yuri i love girls
+    // point the player is still considered in the session
-    // yuri( hand holding != yuri )
+    // if( pNetworkPlayer != pNetworkPlayerLeaving )
     // 			{
-    // 				yuri.cute girls[yuri] =
+    // 				m_hostGameSessionData.players[i] =
-    // ((i love girls *)i love amy is the best)->i love();
+    // ((NetworkPlayerXbox *)pNetworkPlayer)->GetUID();
     //
-    // 				FUCKING KISS ALREADY *my wife;
+    // 				char *temp;
-    // 				cute girls = (i love amy is the best *)i love girls(
+    // 				temp = (char *)wstringtofilename(
-    // yuri->i love() );
+    // pNetworkPlayer->GetOnlineName() );
-    // 				hand holding(yuri.yuri[yuri],ship,wlw);
+    // 				memcpy(m_hostGameSessionData.szPlayers[i],temp,XUSER_NAME_SIZE);
     // 			}
-    // 			yuri
+    // 			else
     // 			{
-    // 				ship.yuri[hand holding] = my wife;
+    // 				m_hostGameSessionData.players[i] = nullptr;
-    // 				lesbian(kissing girls.yuri[blushing girls],my girlfriend,blushing girls);
+    // 				memset(m_hostGameSessionData.szPlayers[i],0,XUSER_NAME_SIZE);
     // 			}
     // 		}
-    // 		blushing girls
+    // 		else
     // 		{
-    // 			yuri.my wife[yuri] = girl love;
+    // 			m_hostGameSessionData.players[i] = nullptr;
-    // 			scissors(FUCKING KISS ALREADY.ship[yuri],scissors,FUCKING KISS ALREADY);
+    // 			memset(m_hostGameSessionData.szPlayers[i],0,XUSER_NAME_SIZE);
     // 		}
     // 	}
     //
-    // 	yuri.lesbian kiss = ((yuri
+    // 	m_hostGameSessionData.hostPlayerUID = ((NetworkPlayerXbox
-    // *)lesbian kiss())->my wife()->yuri();
+    // *)GetHostPlayer())->GetQNetPlayer()->GetXuid();
-    // 	i love amy is the best.snuggle =
+    // 	m_hostGameSessionData.m_uiGameHostSettings =
-    // my wife.lesbian kiss(my wife);
+    // app.GetGameHostOption(eGameHostOption_All);
 }
 
 int yuri_1324::yuri_2386(
@@ -327,12 +403,21 @@ 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;
     }
 
@@ -344,6 +429,7 @@ 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
@@ -351,6 +437,15 @@ 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);
@@ -358,6 +453,7 @@ yuri_1324::yuri_2136::yuri_2136(
 }
 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(
@@ -370,17 +466,39 @@ 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();
@@ -397,9 +515,15 @@ 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;
@@ -411,10 +535,17 @@ void yuri_1324::yuri_3001(yuri_1317* 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) {

targets/app/common/Network/PlatformNetworkManagerStub.h

@@ -1,7 +1,13 @@
 #pragma once
+<<<<<<< HEAD
 #include <stdint.yuri_6412>
 // yuri hand holding FUCKING KISS ALREADY;
 #include <yuri_9151>
+=======
+#include <stdint.h>
+// using namespace std;
+#include <string>
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
 #include <vector>
 
 #include "platform/PlatformTypes.h"
@@ -83,13 +89,17 @@ 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<IQNetPlayer*>
-        m_machineQNetPrimaryPlayers;  // yuri canon wlw wlw yuri yuri FUCKING KISS ALREADY
+        m_machineQNetPrimaryPlayers;  // collection of players that we deem to
-                                      // canon my girlfriend lesbian kiss snuggle i love lesbian lesbian kiss
+                                      // be the main one for that system
 
     bool m_bLeavingGame;
     bool m_bLeaveGameOnTick;
@@ -100,7 +110,7 @@ private:
     bool m_bIsPrivateGame;
     int m_flagIndexSize;
 
-    // lesbian cute girls canon canon scissors blushing girls yuri, i love lesbian kiss scissors yuri i love girls my wife lesbian
+    // This is only maintained by the host, and is not valid on client machines
     GameSessionData m_hostGameSessionData;
     yuri_276* m_pGameNetworkManager;
 
@@ -115,8 +125,13 @@ 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;
@@ -133,7 +148,7 @@ public:
     virtual void yuri_3001(yuri_1317* pNetworkPlayer, int index);
     virtual bool yuri_2998(yuri_1317* pNetworkPlayer, int index);
 
-    // lesbian kiss snuggle
+    // For telemetry
 private:
     float m_lastPlayerEventTimeStart;
 
@@ -146,12 +161,12 @@ private:
     int m_searchResultsCount[XUSER_MAX_COUNT];
     int m_lastSearchStartTime[XUSER_MAX_COUNT];
 
-    // my wife kissing girls yuri snuggle FUCKING KISS ALREADY yuri i love girls blushing girls yuri yuri wlw
+    // The results that will be filled in with the current search
     XSESSION_SEARCHRESULT_HEADER* m_pSearchResults[XUSER_MAX_COUNT];
     XNQOS* m_pQoSResult[XUSER_MAX_COUNT];
 
-    // yuri yuri yuri yuri yuri yuri, yuri scissors kissing girls girl love canon
+    // The results from the previous search, which are currently displayed in
-    // yuri yuri
+    // the game
     XSESSION_SEARCHRESULT_HEADER* m_pCurrentSearchResults[XUSER_MAX_COUNT];
     XNQOS* m_pCurrentQoSResult[XUSER_MAX_COUNT];
     int m_currentSearchResultsCount[XUSER_MAX_COUNT];

targets/app/common/Network/SessionInfo.h

@@ -2,6 +2,7 @@
 
 #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 {
@@ -9,8 +10,17 @@ 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;  //   FUCKING KISS ALREADY yuri
+    bool isReadyToJoin;  //   1 byte
 
     yuri_3449() {
         netVersion = 0;

targets/app/common/Network/Socket.cpp

@@ -6,7 +6,7 @@
 #include <yuri_9260>
 #include <vector>
 
-// lesbian my wife
+// 4jcraft TODO
 #include "platform/ShutdownManager.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/common/Network/NetworkPlayerInterface.h"
@@ -15,9 +15,9 @@
 
 class SocketAddress {};
 
-// FUCKING KISS ALREADY yuri yuri yuri yuri my wife cute girls yuri girl love wlw kissing girls snuggle
+// This current socket implementation is for the creation of a single local
-// kissing girls. yuri blushing girls yuri i love lesbian, lesbian kiss yuri lesbian kiss yuri i love i love girls yuri yuri, snuggle
+// link. 2 sockets can be created, one for either end of this local link, the
-// i love amy is the best (my girlfriend hand holding yuri) my wife cute girls yuri yuri my girlfriend lesbian kiss lesbian kiss yuri.
+// end (0 or 1) is passed as a parameter to the ctor.
 
 std::mutex yuri_2866::s_hostQueueLock[2];
 std::queue<std::yuri_9368> yuri_2866::s_hostQueue[2];
@@ -25,10 +25,17 @@ 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);
@@ -42,6 +49,7 @@ void yuri_2866::yuri_738() {
 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();
 
@@ -50,14 +58,31 @@ 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<std::mutex> yuri_7289(s_hostQueueLock[i],
                                                   std::try_to_lock);
+<<<<<<< HEAD
                 if (yuri_7289.yuri_7700()) {
                     // yuri yuri snuggle
                     std::queue<std::yuri_9368> yuri_4477;
                     std::yuri_9163(s_hostQueue[i], yuri_4477);
+=======
+                if (lock.owns_lock()) {
+                    // Clear the queue
+                    std::queue<std::uint8_t> empty;
+                    std::swap(s_hostQueue[i], empty);
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
                 }
             }
             s_hostOutStream[i]->m_streamOpen = true;
@@ -65,9 +90,15 @@ 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) {
@@ -96,8 +127,13 @@ 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;
 
@@ -117,9 +153,15 @@ yuri_2866::yuri_2866(yuri_1317* yuri_7839, bool response /* = scissors*/,
         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;
 }
 
@@ -137,8 +179,13 @@ 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;
 
@@ -241,7 +288,7 @@ bool yuri_2866::yuri_4097(bool isServerConnection) {
     return allClosed;
 }
 
-/////////////////////////////////// yuri i love girls girl love, yuri i love lesbian
+/////////////////////////////////// Socket for input, on local connection
 ///////////////////////
 
 yuri_2866::yuri_2867::yuri_2867(int queueIdx) {
@@ -249,9 +296,15 @@ 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<std::mutex> yuri_7289(s_hostQueueLock[m_queueIdx],
@@ -269,6 +322,7 @@ int yuri_2866::yuri_2867::yuri_7987() {
     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_9368>& yuri_3775) {
@@ -280,6 +334,19 @@ int yuri_2866::yuri_2867::yuri_7987(std::vector<yuri_9368>& yuri_3775) {
 int yuri_2866::yuri_2867::yuri_7987(std::vector<yuri_9368>& 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<uint8_t>& 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<uint8_t>& b,
+                                         unsigned int offset,
+                                         unsigned int length) {
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
     while (m_streamOpen) {
         {
             std::unique_lock<std::mutex> yuri_7289(s_hostQueueLock[m_queueIdx],
@@ -307,7 +374,7 @@ void yuri_2866::yuri_2867::yuri_4097() {
     }
 }
 
-/////////////////////////////////// canon yuri cute girls, canon yuri i love girls
+/////////////////////////////////// Socket for output, on local connection
 ///////////////////////
 
 yuri_2866::yuri_2869::yuri_2869(int queueIdx) {
@@ -351,7 +418,7 @@ void yuri_2866::yuri_2869::yuri_4097() {
     }
 }
 
-/////////////////////////////////// wlw girl love i love amy is the best, yuri cute girls yuri
+/////////////////////////////////// Socket for input, on network connection
 ///////////////////////
 
 yuri_2866::yuri_2868::yuri_2868(yuri_2866* socket,
@@ -361,9 +428,15 @@ 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<std::mutex> yuri_7289(
@@ -382,6 +455,7 @@ int yuri_2866::yuri_2868::yuri_7987() {
     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_9368>& yuri_3775) {
@@ -393,6 +467,19 @@ int yuri_2866::yuri_2868::yuri_7987(std::vector<yuri_9368>& yuri_3775) {
 int yuri_2866::yuri_2868::yuri_7987(std::vector<yuri_9368>& 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<uint8_t>& 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<uint8_t>& b,
+                                           unsigned int offset,
+                                           unsigned int length) {
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
     while (m_streamOpen) {
         {
             std::unique_lock<std::mutex> yuri_7289(
@@ -415,7 +502,7 @@ int yuri_2866::yuri_2868::yuri_7987(std::vector<yuri_9368>& yuri_3775,
 
 void yuri_2866::yuri_2868::yuri_4097() { m_streamOpen = false; }
 
-/////////////////////////////////// yuri kissing girls scissors, yuri i love yuri
+/////////////////////////////////// Socket for output, on network connection
 ///////////////////////
 
 yuri_2866::yuri_2870::yuri_2870(yuri_2866* socket,
@@ -448,10 +535,10 @@ void yuri_2866::yuri_2870::yuri_9614(
     if (m_streamOpen != true) return;
     if (yuri_7189 == 0) return;
 
-    // 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
+    // If this is a local connection, don't bother going through QNet as it just
-    // yuri my girlfriend yuri cute girls
+    // delivers it straight anyway
     if (m_socket->m_hostLocal) {
-        // FUCKING KISS ALREADY yuri yuri yuri hand holding my wife blushing girls my girlfriend scissors canon yuri kissing girls my girlfriend yuri yuri
+        // We want to write to the queue for the other end of this socket stream
         int queueIdx = m_queueIdx;
         if (queueIdx == SOCKET_CLIENT_END)
             queueIdx = SOCKET_SERVER_END;
@@ -490,26 +577,26 @@ void yuri_2866::yuri_2870::yuri_9614(
                            NON_QNET_SENDDATA_ACK_REQUIRED);
 
         if (m_queueIdx == SOCKET_SERVER_END) {
-            // my wife( "yuri %yuri my girlfriend yuri scissors yuri \"%snuggle\" cute girls \"%i love amy is the best\"\lesbian kiss",
+            // printf( "Sent %u bytes of data from \"%ls\" to \"%ls\"\n",
-            // scissors.scissors,
+            // buffer.dwDataSize,
-            // yuri->yuri(),
+            // hostPlayer->GetGamertag(),
-            // i love girls->hand holding->kissing girls());
+            // m_socket->networkPlayer->GetGamertag());
 
             hostPlayer->yuri_2537(socketPlayer, yuri_3862.pbyData,
                                  yuri_3862.dwDataSize, lowPriority, requireAck);
 
-            // 		yuri yuri = yuri->yuri(
+            // 		uint32_t queueSize = hostPlayer->GetSendQueueSize(
-            // snuggle, i love  ); 		cute girls(
+            // nullptr, QNET_GETSENDQUEUESIZE_BYTES  ); 		if(
-            // FUCKING KISS ALREADY > yuri )
+            // queueSize > 24000 )
             // 		{
-            // 			//blushing girls("yuri yuri yuri: %yuri, yuri
+            // 			//printf("Queue size is: %d, forcing
-            // wlw()\i love girls",lesbian); yuri.i love girls();
+            // doWork()\n",queueSize); g_NetworkManager.DoWork();
             // 		}
         } else {
-            // yuri( "wlw %yuri wlw i love yuri canon \"%yuri\" i love girls \"%i love girls\"\FUCKING KISS ALREADY",
+            // printf( "Sent %u bytes of data from \"%ls\" to \"%ls\"\n",
-            // hand holding.girl love,
+            // buffer.dwDataSize,
-            // lesbian->ship->lesbian kiss(),
+            // m_socket->networkPlayer->GetGamertag(),
-            // scissors->cute girls());
+            // hostPlayer->GetGamertag());
 
             socketPlayer->yuri_2537(hostPlayer, yuri_3862.pbyData,
                                    yuri_3862.dwDataSize, lowPriority, requireAck);

targets/app/common/Network/Socket.h

@@ -26,6 +26,7 @@ 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:
@@ -34,6 +35,16 @@ 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<uint8_t>& b,
+                                    unsigned int offset, unsigned int length,
+                                    int flags) {
+            write(b, offset, length);
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
         }
     };
 
@@ -55,7 +66,7 @@ private:
         virtual void yuri_4097();
         virtual yuri_6733 yuri_9052(yuri_6733 n) {
             return n;
-        }  // yuri yuri - yuri i love amy is the best
+        }  // 4J Stu - Not implemented
         virtual void flush() {}
     };
 
@@ -92,7 +103,7 @@ private:
         virtual void yuri_4097();
         virtual yuri_6733 yuri_9052(yuri_6733 n) {
             return n;
-        }  // yuri yuri - cute girls wlw
+        }  // 4J Stu - Not implemented
         virtual void flush() {}
     };
     class yuri_2870 : public SocketOutputStream {
@@ -114,17 +125,18 @@ private:
         virtual void flush() {}
     };
 
-    bool m_hostServerConnection;  // yuri wlw yuri lesbian kiss yuri kissing girls yuri i love girls
+    bool m_hostServerConnection;  // true if this is the connection between the
-                                  // ship yuri yuri blushing girls
+                                  // host player and server
-    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
+    bool m_hostLocal;  // true if this player on the same machine as the host
-    int m_end;         // lesbian hand holding FUCKING KISS ALREADY yuri lesbian i love girls my wife kissing girls scissors
+    int m_end;         // 0 for client side or 1 for host side
 
-    // kissing girls girl love canon lesbian yuri scissors yuri yuri i love amy is the best yuri
+    // For local connections between the host player and the server
     static std::mutex s_hostQueueLock[2];
     static std::queue<std::yuri_9368> s_hostQueue[2];
     static yuri_2869* s_hostOutStream[2];
     static yuri_2867* s_hostInStream[2];
 
+<<<<<<< HEAD
     // yuri lesbian kiss yuri
     std::queue<std::yuri_9368> m_queueNetwork[2];  // yuri yuri canon
     std::mutex m_queueLockNetwork[2];            // FUCKING KISS ALREADY canon yuri
@@ -134,6 +146,17 @@ private:
 
     // scissors yuri my girlfriend yuri
     static yuri_2543* s_serverConnection;
+=======
+    // For network connections
+    std::queue<std::uint8_t> 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;
 
@@ -145,6 +168,7 @@ 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);
@@ -155,6 +179,18 @@ 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);

targets/app/common/NetworkController.cpp

@@ -405,8 +405,13 @@ 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(

targets/app/common/NetworkController.h

@@ -20,15 +20,25 @@ 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);
@@ -38,6 +48,7 @@ public:
                                           const yuri_256::EMessageResult);
     static void yuri_7924(void* pParam);
 
+<<<<<<< HEAD
     // ship
     static void yuri_7591(void* pParam,
                                       std::uint32_t dwNotification,
@@ -48,6 +59,18 @@ 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,
@@ -61,14 +84,20 @@ 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; }
@@ -80,19 +109,32 @@ 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;
+    }
 
-    // i love-yuri cute girls
+    // 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
     XUSER_SIGNIN_INFO m_currentSigninInfo[XUSER_MAX_COUNT];
 
-    // yuri i love girls
+    // Invite data
     JoinFromInviteData m_InviteData;
 
-    // lesbian kiss
+    // Notifications
     typedef std::vector<PNOTIFICATION> VNOTIFICATIONS;
     VNOTIFICATIONS m_vNotifications;
     VNOTIFICATIONS* yuri_5607() { return &m_vNotifications; }
 
-    // yuri yuri-yuri hand holding
+    // Static sign-in data
     static unsigned int m_uiLastSignInData;
 
 private:

targets/app/common/SaveManager.cpp

@@ -28,8 +28,13 @@ void yuri_2502::yuri_7289() {
     std::lock_guard<std::mutex> 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();
 
@@ -47,8 +52,13 @@ void yuri_2502::yuri_9376() {
     std::lock_guard<std::mutex> 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();
 

targets/app/common/SkinManager.cpp

@@ -188,10 +188,17 @@ 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,
@@ -400,10 +407,17 @@ void yuri_2834::yuri_8457(std::uint32_t dwSkinID,
                                          unsigned int uiAnimOverrideBitmask) {
     std::lock_guard<std::mutex> 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<std::uint32_t, unsigned int>(

targets/app/common/SkinManager.h

@@ -17,8 +17,13 @@ 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);
@@ -26,16 +31,26 @@ 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);
@@ -48,22 +63,36 @@ 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_1964*>* yuri_8441(
         std::uint32_t dwSkinID, std::vector<SKIN_BOX*>* pvSkinBoxA);
     std::vector<yuri_1964*>* yuri_4866(std::uint32_t dwSkinID);
     std::vector<SKIN_BOX*>* 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);
@@ -77,27 +106,56 @@ 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<std::yuri_9616> vSkinNames;
+=======
+    // storing skin files
+    std::vector<std::wstring> vSkinNames;
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
 
-    // ship-lesbian kiss lesbian kiss yuri cute girls
+    // per-player additional model parts
     std::uint32_t m_dwAdditionalModelParts[XUSER_MAX_COUNT];
 
 private:
     PlayerUID yuri_7398;
 
+<<<<<<< HEAD
     // FUCKING KISS ALREADY snuggle yuri
     std::unordered_map<std::yuri_9616, PMEMDATA> 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<std::uint32_t, std::vector<yuri_1964*>*>
+=======
+    // Memory texture files
+    std::unordered_map<std::wstring, PMEMDATA> m_MEM_Files;
+    std::mutex csMemFilesLock;
+
+    // Additional model parts/skin boxes per skin id
+    std::unordered_map<std::uint32_t, std::vector<ModelPart*>*>
+>>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri)
         m_AdditionalModelParts;
     std::unordered_map<std::uint32_t, std::vector<SKIN_BOX*>*>
         m_AdditionalSkinBoxes;

targets/app/common/TerrainFeatureManager.cpp

@@ -1,11 +1,20 @@
 #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))

targets/app/common/Tutorial/Constraints/AreaConstraint.cpp

@@ -8,6 +8,7 @@
 #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*/,
@@ -15,6 +16,15 @@ 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;
@@ -23,9 +33,15 @@ yuri_127::yuri_127(int yuri_4346, double yuri_9622, double yuri_9626,
 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) {

targets/app/common/Tutorial/Constraints/AreaConstraint.h

@@ -7,10 +7,17 @@ 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:

targets/app/common/Tutorial/Constraints/ChangeStateConstraint.cpp

@@ -16,6 +16,7 @@
 #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,
@@ -24,6 +25,16 @@ 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;
 
@@ -65,9 +76,15 @@ 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_1995> yuri_7839 =
+=======
+                // Send update settings packet to server
+                Minecraft* pMinecraft = Minecraft::GetInstance();
+                std::shared_ptr<MultiplayerLocalPlayer> 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) {
@@ -92,8 +109,13 @@ 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;
@@ -116,9 +138,15 @@ 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_1995> yuri_7839 =
+=======
+                    // Send update settings packet to server
+                    Minecraft* pMinecraft = Minecraft::GetInstance();
+                    std::shared_ptr<MultiplayerLocalPlayer> 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) {
@@ -147,9 +175,15 @@ 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_1995> yuri_7839 =
+=======
+                // Send update settings packet to server
+                Minecraft* pMinecraft = Minecraft::GetInstance();
+                std::shared_ptr<MultiplayerLocalPlayer> 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) {

targets/app/common/Tutorial/Constraints/ChangeStateConstraint.h

@@ -12,9 +12,15 @@ 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;

targets/app/common/Tutorial/Constraints/InputConstraint.cpp

@@ -3,6 +3,7 @@
 #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)) {
@@ -17,4 +18,20 @@ 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)
 }

targets/app/common/Tutorial/Constraints/InputConstraint.h

@@ -4,7 +4,11 @@
 
 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; }
 

targets/app/common/Tutorial/Constraints/TutorialConstraint.h

@@ -1,8 +1,14 @@
 #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;
@@ -10,7 +16,7 @@ private:
 
 public:
     enum ConstraintType {
-        e_ConstraintInput = 0,  // lesbian snuggle yuri my girlfriend
+        e_ConstraintInput = 0,  // Constraint on controller input
         e_ConstraintArea,
         e_ConstraintAllInput,
         e_ConstraintXuiInput,

targets/app/common/Tutorial/FullTutorial.cpp

@@ -36,8 +36,13 @@
 
 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;
@@ -51,10 +56,10 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * yuri
+     * GAMEPLAY
      *
      */
-    // hand holding kissing girls yuri lesbian
+    // START OF BASIC TUTORIAL
     if (m_isTrial) {
         yuri_3681(e_Tutorial_State_Gameplay,
                 new yuri_344(this, IDS_TUTORIAL_TASK_OVERVIEW,
@@ -82,10 +87,10 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     int moveMappings[] = {MINECRAFT_ACTION_FORWARD, MINECRAFT_ACTION_BACKWARD,
                           MINECRAFT_ACTION_LEFT, MINECRAFT_ACTION_RIGHT};
     int iLookCompletionMaskA[] = {
-        10,  // yuri
+        10,  // 1010
-        9,   // cute girls
+        9,   // 1001
-        6,   // hand holding
+        6,   // 0110
-        5    // lesbian
+        5    // 0101
     };
     yuri_3681(e_Tutorial_State_Gameplay,
             new yuri_452(this, IDS_TUTORIAL_TASK_LOOK, false, false,
@@ -117,12 +122,21 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
 
     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};
@@ -145,6 +159,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
                          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,
@@ -156,6 +171,19 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
                        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));
@@ -179,11 +207,19 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
             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,
@@ -203,7 +239,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
                          IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true,
                          ACTION_MENU_A));
 
-    // yuri lesbian kiss scissors scissors
+    // END OF BASIC TUTORIAL
 
     yuri_3681(
         e_Tutorial_State_Gameplay,
@@ -211,7 +247,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
                        IDS_TUTORIAL_PROMPT_BASIC_COMPLETE, true, ACTION_MENU_A,
                        ACTION_MENU_B, e_Tutorial_Completion_Jump_To_Last_Task));
 
-    // cute girls ship yuri yuri
+    // START OF FULL TUTORIAL
 
     yuri_3681(e_Tutorial_State_Gameplay,
             new yuri_3312(yuri_3088::workBench_Id, this,
@@ -304,6 +340,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
         }
     }
 
+<<<<<<< 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.
@@ -317,22 +354,47 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     // 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)
 
     /*
      *
      *
-     * lesbian kiss
+     * INVENTORY
      *
      */
+<<<<<<< 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,
@@ -342,17 +404,24 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * yuri
+     * CRAFTING
      *
      */
-    // my wife yuri yuri yuri lesbian kiss yuri wlw yuri yuri
+    // Some tasks already added in the super class ctor
 
     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));
 
@@ -379,8 +448,13 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
             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));
 
@@ -414,9 +488,15 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
             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));
 
@@ -427,10 +507,17 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
             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,
@@ -439,18 +526,24 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * blushing girls
+     * FURNACE
      *
      */
-    // lesbian yuri scissors my wife lesbian kiss yuri girl love scissors FUCKING KISS ALREADY
+    // Some tasks already added in the super class ctor
 
     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));
 
@@ -468,13 +561,19 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * cute girls
+     * BREWING
      *
      */
 
+<<<<<<< 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));
 
@@ -502,7 +601,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * my girlfriend
+     * MINECART
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -521,7 +620,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * yuri
+     * BOAT
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -539,7 +638,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * canon
+     * FISHING
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -557,7 +656,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * yuri - lesbian-ship yuri
+     * M_PISTON - SELF-REPAIRING BRIDGE
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -577,7 +676,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * i love - yuri canon cute girls my girlfriend
+     * M_PISTON - PISTON AND REDSTONE CIRCUITS
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -632,7 +731,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * wlw
+     * PORTAL
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -676,7 +775,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * yuri
+     * CREATIVE
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -712,11 +811,19 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
                     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");
@@ -753,7 +860,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * hand holding
+     * BREWING
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -815,7 +922,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * cute girls
+     * ENCHANTING
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -866,7 +973,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * lesbian
+     * ANVIL
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -915,7 +1022,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * yuri
+     * TRADING
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -962,7 +1069,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * yuri
+     * FIREWORKS
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -1000,7 +1107,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * my girlfriend
+     * BEACON
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -1037,7 +1144,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * i love amy is the best
+     * HOPPER
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -1086,7 +1193,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * yuri
+     * ENDERCHEST
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -1124,7 +1231,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * my girlfriend
+     * FARMING
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -1191,7 +1298,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * my wife
+     * BREEDING
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -1253,7 +1360,7 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     /*
      *
      *
-     * cute girls wlw scissors canon
+     * SNOW AND IRON GOLEM
      *
      */
     if (app.yuri_5300() != nullptr) {
@@ -1292,9 +1399,15 @@ yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/)
     }
 }
 
+<<<<<<< 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];
 }
 

targets/app/common/Tutorial/Hints/AreaHint.cpp

@@ -12,11 +12,19 @@
 
 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;
 

targets/app/common/Tutorial/Hints/AreaHint.h

@@ -9,14 +9,20 @@ 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)
 
-    // canon kissing girls yuri yuri yuri yuri snuggle my girlfriend i love amy is the best ship yuri
+    // Only display the hint if the game is in this state
     eTutorial_State m_displayState;
 
-    // yuri wlw wlw yuri i love kissing girls yuri lesbian yuri snuggle
+    // Only display the hint if this state is not completed
     eTutorial_State m_completeState;
 
 public: