From f81bf3c67fd3871292aada763b7dfaaf4979843b Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Tue, 8 Dec 2020 16:32:12 -0500
Subject: [PATCH] Add --print-features

---
 debian/client/common/usr/bin/minecraft-pi | 15 ++++++++++++---
 mods/src/game_mode/game_mode.c            |  4 ++--
 mods/src/minecraft.h                      |  3 +--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/debian/client/common/usr/bin/minecraft-pi b/debian/client/common/usr/bin/minecraft-pi
index 846b511..bf4796e 100755
--- a/debian/client/common/usr/bin/minecraft-pi
+++ b/debian/client/common/usr/bin/minecraft-pi
@@ -2,8 +2,8 @@
 
 set -e
 
-# Ensure Features Are Selected
-MCPI_FEATURES="$(zenity --class 'Minecraft - Pi edition' --list --checklist --column 'Enabled' --column 'Feature' \
+# All Feature Flags
+export AVAILABLE_FEATURES=" \
     TRUE 'Touch GUI' \
     TRUE 'Fix Bow & Arrow' \
     TRUE 'Fix Attacking' \
@@ -18,7 +18,16 @@ MCPI_FEATURES="$(zenity --class 'Minecraft - Pi edition' --list --checklist --co
     TRUE 'Remove Invalid Item Background' \
     TRUE 'Disable gui_blocks Atlas' \
     TRUE 'Smooth Lighting' \
-    FALSE '3D Anaglyph')"
+    FALSE '3D Anaglyph'"
+
+# Print Feature Flags Option
+if [ "$1" = "--print-features" ]; then
+    echo "${AVAILABLE_FEATURES}"
+    exit 0
+fi
+
+# Ensure Features Are Selected
+MCPI_FEATURES="$(sh -c "zenity --class 'Minecraft - Pi edition' --list --checklist --column 'Enabled' --column 'Feature' ${AVAILABLE_FEATURES}")"
 MCPI_USERNAME="$(zenity --class 'Minecraft - Pi edition' --entry --text 'Minecraft Username:' --entry-text 'StevePi')"
 export MCPI_FEATURES
 export MCPI_USERNAME
diff --git a/mods/src/game_mode/game_mode.c b/mods/src/game_mode/game_mode.c
index 7cd32fd..4d4962f 100644
--- a/mods/src/game_mode/game_mode.c
+++ b/mods/src/game_mode/game_mode.c
@@ -20,8 +20,8 @@ static void set_is_survival(int new_is_survival) {
         unsigned char size_patch[4] = {new_is_survival ? 0x24 : 0x18, 0x00, 0xa0, 0xe3};
         patch((void *) 0x16ee4, size_patch);
 
-        // Replace Creator Constructor With CreativeMode Or SurvivalMode Constructor
-        overwrite(Creator, new_is_survival ? SurvivalMode : CreativeMode);
+        // Replace Default CreatorMode Constructor With CreatorMode Or SurvivalMode Constructor
+        overwrite_call((void *) 0x16ef4, new_is_survival ? SurvivalMode : CreatorMode);
 
         is_survival = new_is_survival;
     }
diff --git a/mods/src/minecraft.h b/mods/src/minecraft.h
index 9d49e26..15460c0 100644
--- a/mods/src/minecraft.h
+++ b/mods/src/minecraft.h
@@ -135,9 +135,8 @@ static Gui_renderOnSelectItemNameText_t Gui_renderOnSelectItemNameText = (Gui_re
 
 // GameMode Constructors
 
-static void *Creator = (void *) 0x1a044;
+static void *CreatorMode = (void *) 0x1a044;
 static void *SurvivalMode = (void *) 0x1b7d8;
-static void *CreativeMode = (void *) 0x1b258;
 
 // LevelData