gonna try changing all Options::Option* in the whole project to just Option* not sure if this works but it gets the compiler to shut up. if this breaks everything change all 'Option*' to 'Options::Option*' as it once was.

more header fixes
2026-03-30 12:03:30 +00:00 · 2026-03-19 11:10:19 -04:00 · 2026-03-19 11:06:55 -04:00
13 changed files with 71 additions and 32 deletions
--- a/project/iosproj/minecraftpe.xcodeproj/project.pbxproj
+++ b/project/iosproj/minecraftpe.xcodeproj/project.pbxproj
@@ -1147,6 +1147,7 @@
 		D5F3B7DD14548E7900D25470 /* IASKPSToggleSwitchSpecifierViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D5F3B7C814548E7900D25470 /* IASKPSToggleSwitchSpecifierViewCell.xib */; };
 		D5F3B7DE14548E7900D25470 /* IASKSpecifierValuesView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D5F3B7C914548E7900D25470 /* IASKSpecifierValuesView.xib */; };
 		D5F3B7E51454930400D25470 /* InAppSettings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D5F3B7E41454930400D25470 /* InAppSettings.bundle */; };
+		F912B8CF2F6C3D5200BC60DF /* TextBox.h in Sources */ = {isa = PBXBuildFile; fileRef = 042A91AC16B17517007ABBC6 /* TextBox.h */; };
 /* End PBXBuildFile section */

 /* Begin PBXFileReference section */
@@ -5345,6 +5346,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F912B8CF2F6C3D5200BC60DF /* TextBox.h in Sources */,
 				D5CF9C57144C225000E4244F /* main.mm in Sources */,
 				D5CF9C5B144C225000E4244F /* minecraftpeAppDelegate.mm in Sources */,
 				D5CF9C65144C225000E4244F /* EAGLView.m in Sources */,
@@ -5754,7 +5756,11 @@
 				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "$(SRCROOT)\\src/**";
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/src/**",
+					"$(SRCROOT)/src/client/gui/components/**",
+					"$(SRCROOT)/src/client/gui/**",
+				);
 				IPHONEOS_DEPLOYMENT_TARGET = 14;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
@@ -5776,7 +5782,11 @@
 				"GCC_THUMB_SUPPORT[arch=armv7]" = NO;
 				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				HEADER_SEARCH_PATHS = "";
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/src/client/gui/components/**",
+					"$(SRCROOT)/src/client/gui/**",
+					"$(SRCROOT)/src/**",
+				);
 				INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
 				IPHONEOS_DEPLOYMENT_TARGET = 14;
@@ -5869,7 +5879,11 @@
 				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "$(SRCROOT)\\src/**";
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/src/**",
+					"$(SRCROOT)/src/client/gui/components/**",
+					"$(SRCROOT)/src/client/gui/**",
+				);
 				IPHONEOS_DEPLOYMENT_TARGET = 14;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
@@ -5892,7 +5906,11 @@
 				"GCC_THUMB_SUPPORT[arch=armv7]" = NO;
 				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				HEADER_SEARCH_PATHS = "";
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/src/client/gui/components/**",
+					"$(SRCROOT)/src/client/gui/**",
+					"$(SRCROOT)/src/**",
+				);
 				INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
 				IPHONEOS_DEPLOYMENT_TARGET = 14;
@@ -5957,7 +5975,11 @@
 				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "$(SRCROOT)\\src/**";
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/src/**",
+					"$(SRCROOT)/src/client/gui/components/**",
+					"$(SRCROOT)/src/client/gui/**",
+				);
 				IPHONEOS_DEPLOYMENT_TARGET = 14;
 				ONLY_ACTIVE_ARCH = YES;
 				RUN_CLANG_STATIC_ANALYZER = NO;
@@ -5984,7 +6006,11 @@
 				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "$(SRCROOT)\\src/**";
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/src/**",
+					"$(SRCROOT)/src/client/gui/components/**",
+					"$(SRCROOT)/src/client/gui/**",
+				);
 				IPHONEOS_DEPLOYMENT_TARGET = 14;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
@@ -6008,7 +6034,11 @@
 				"GCC_THUMB_SUPPORT[arch=armv7]" = NO;
 				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				HEADER_SEARCH_PATHS = "";
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/src/client/gui/components/**",
+					"$(SRCROOT)/src/client/gui/**",
+					"$(SRCROOT)/src/**",
+				);
 				INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
 				IPHONEOS_DEPLOYMENT_TARGET = 14;
@@ -6034,7 +6064,11 @@
 				"GCC_THUMB_SUPPORT[arch=armv7]" = NO;
 				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				HEADER_SEARCH_PATHS = "";
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/src/client/gui/components/**",
+					"$(SRCROOT)/src/client/gui/**",
+					"$(SRCROOT)/src/**",
+				);
 				INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
 				IPHONEOS_DEPLOYMENT_TARGET = 14;
--- a/src/client/Minecraft.cpp
+++ b/src/client/Minecraft.cpp
@@ -1195,7 +1195,7 @@ void Minecraft::setSize(int w, int h) {
 	int screenHeight = (int)(height * Gui::InvGuiScale);

 	// if (platform()) {
-	// 	float pixelsPerMillimeter = options.getProgressValue(&Options::Option::PIXELS_PER_MILLIMETER);
+	// 	float pixelsPerMillimeter = options.getProgressValue(&Option::PIXELS_PER_MILLIMETER);
 	// 	pixelCalc.setPixelsPerMillimeter(pixelsPerMillimeter);
 	// 	pixelCalcUi.setPixelsPerMillimeter(pixelsPerMillimeter * Gui::InvGuiScale);
 	// }
--- a/src/client/Options.h
+++ b/src/client/Options.h
@@ -93,6 +93,10 @@ typedef std::vector<std::string> StringVector;
 class Options
 {
 public:
+    // deepfriedwaffles: for iOS, was getting compile errors saying: No member named 'sound' in 'Options' and No member named 'music' in 'Options' so I floated them here. 1.0f means full volume out of the box, but if everything is too loud, you might want to try adjusting this
+    float sound = 1.0f;
+    float music = 1.0f;
+    
    static bool debugGl;

    Options(Minecraft* minecraft, const std::string& workingDirectory = "") 
--- a/src/client/gui/components/OptionsPane.cpp
+++ b/src/client/gui/components/OptionsPane.cpp
@@ -28,7 +28,7 @@ OptionsGroup& OptionsPane::createOptionsGroup( std::string label ) {
 	return *newGroup;
 }

-void OptionsPane::createToggle( unsigned int group, std::string label, const Options::Option* option ) {
+void OptionsPane::createToggle( unsigned int group, std::string label, const Option* option ) {
 	if(group > children.size()) return;
 	ImageDef def;
 	def.setSrc(IntRectangle(160, 206, 39, 20));
@@ -42,7 +42,7 @@ void OptionsPane::createToggle( unsigned int group, std::string label, const Opt
 	setupPositions();
 }

-void OptionsPane::createProgressSlider( Minecraft* minecraft, unsigned int group, std::string label, const Options::Option* option, float progressMin/*=1.0f*/, float progressMax/*=1.0f */ ) {
+void OptionsPane::createProgressSlider( Minecraft* minecraft, unsigned int group, std::string label, const Option* option, float progressMin/*=1.0f*/, float progressMax/*=1.0f */ ) {
 	if(group > children.size()) return;
 	Slider* element = new Slider(minecraft, option, progressMin, progressMax);
 	element->width = 100;
@@ -52,7 +52,7 @@ void OptionsPane::createProgressSlider( Minecraft* minecraft, unsigned int group
 	setupPositions();
 }

-void OptionsPane::createStepSlider( Minecraft* minecraft, unsigned int group, std::string label, const Options::Option* option, const std::vector<int>& stepVec ) {
+void OptionsPane::createStepSlider( Minecraft* minecraft, unsigned int group, std::string label, const Option* option, const std::vector<int>& stepVec ) {
 	if(group > children.size()) return;
 	Slider* element = new Slider(minecraft, option, stepVec);
 	element->width = 100;
--- a/src/client/gui/components/OptionsPane.h
+++ b/src/client/gui/components/OptionsPane.h
@@ -21,9 +21,9 @@ class OptionsPane: public GuiElementContainer
 public:
 	OptionsPane();
 	OptionsGroup& createOptionsGroup( std::string label );
-	void createToggle( unsigned int group, std::string label, const Options::Option* option );
-	void createProgressSlider(Minecraft* minecraft, unsigned int group, std::string label, const Options::Option* option, float progressMin=1.0f, float progressMax=1.0f );
-	void createStepSlider(Minecraft* minecraft, unsigned int group, std::string label, const Options::Option* option, const std::vector<int>& stepVec );
+	void createToggle( unsigned int group, std::string label, const Option* option );
+	void createProgressSlider(Minecraft* minecraft, unsigned int group, std::string label, const Option* option, float progressMin=1.0f, float progressMax=1.0f );
+	void createStepSlider(Minecraft* minecraft, unsigned int group, std::string label, const Option* option, const std::vector<int>& stepVec );
 	void setupPositions();
 };

--- a/src/client/gui/components/Slider.h
+++ b/src/client/gui/components/Slider.h
@@ -3,7 +3,7 @@

 #include "GuiElement.h"
 #include "../../../client/Options.h"
-#include <client/Option.h>
+#include "OptionsPane.h" // was originally Option.h, shouldn't it be this?

 class Slider : public GuiElement {
 	typedef GuiElement super;
--- a/src/client/gui/components/SmallButton.cpp
+++ b/src/client/gui/components/SmallButton.cpp
@@ -12,13 +12,13 @@ SmallButton::SmallButton( int id, int x, int y, int width, int height, const std
 {
 }

-SmallButton::SmallButton( int id, int x, int y, Options::Option* item, const std::string& msg )
+SmallButton::SmallButton( int id, int x, int y, Option* item, const std::string& msg )
 :	super(id, x, y, 150, 20, msg),
 	option(item)
 {
 }

-Options::Option* SmallButton::getOption()
+Option* SmallButton::getOption()
 {
 	return option;
 }
--- a/src/client/gui/components/SmallButton.h
+++ b/src/client/gui/components/SmallButton.h
@@ -13,11 +13,11 @@ class SmallButton: public Button
 public:
    SmallButton(int id, int x, int y, const std::string& msg);
    SmallButton(int id, int x, int y, int width, int height, const std::string& msg);
-    SmallButton(int id, int x, int y, Options::Option* item, const std::string& msg);
+    SmallButton(int id, int x, int y, Option* item, const std::string& msg);

-    Options::Option* getOption();
+    Option* getOption();
 private:
-	Options::Option* option;
+	Option* option;
 };

 #endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__SmallButton_H__*/
--- a/src/client/gui/screens/JoinByIPScreen.h
+++ b/src/client/gui/screens/JoinByIPScreen.h
@@ -2,8 +2,8 @@
 #include "../Screen.h"
 #include "../components/Button.h"
 #include "../../Minecraft.h"
-#include "client/gui/components/ImageButton.h"
-#include "client/gui/components/TextBox.h"
+#include "ImageButton.h"
+#include "TextBox.h"

 class JoinByIPScreen: public Screen
 {
--- a/src/client/gui/screens/OptionsScreen.cpp
+++ b/src/client/gui/screens/OptionsScreen.cpp
@@ -221,9 +221,9 @@ void OptionsScreen::generateOptionScreens() {

 	// // Graphics Pane
 	optionPanes[3]->addOptionItem(OPTIONS_FANCY_GRAPHICS, minecraft)
-		// .addOptionItem(&Options::Option::VIEW_BOBBING, minecraft)
-		// .addOptionItem(&Options::Option::AMBIENT_OCCLUSION, minecraft)
-		// .addOptionItem(&Options::Option::ANAGLYPH, minecraft)
+		// .addOptionItem(&Option::VIEW_BOBBING, minecraft)
+		// .addOptionItem(&Option::AMBIENT_OCCLUSION, minecraft)
+		// .addOptionItem(&Option::ANAGLYPH, minecraft)
 		.addOptionItem(OPTIONS_LIMIT_FRAMERATE, minecraft)
 		.addOptionItem(OPTIONS_VSYNC, minecraft)
 		.addOptionItem(OPTIONS_RENDER_DEBUG, minecraft)
--- a/src/client/gui/screens/ScreenChooser.cpp
+++ b/src/client/gui/screens/ScreenChooser.cpp
@@ -13,7 +13,7 @@

 #include "../../Minecraft.h"

-#include <client/gui/screens/UsernameScreen.h>
+#include "UsernameScreen.h"

 Screen* ScreenChooser::createScreen( ScreenId id )
 {
--- a/src/client/gui/screens/UsernameScreen.h
+++ b/src/client/gui/screens/UsernameScreen.h
@@ -3,7 +3,8 @@

 #include "../Screen.h"
 #include "../components/Button.h"
-#include "/client/gui/components/TextBox.h"
+// this is cursed lol
+#include "../../../client/gui/components/TextBox.h"
 #include <string>

 class UsernameScreen : public Screen
--- a/src/client/gui/screens/crafting/PaneCraftingScreen.cpp
+++ b/src/client/gui/screens/crafting/PaneCraftingScreen.cpp
@@ -16,7 +16,7 @@
 #include "../../../../world/level/Level.h"
 #include "../../../../world/item/DyePowderItem.h"
 #include "../../../../world/item/crafting/Recipe.h"
-#include "platform/input/Keyboard.h"
+#include "Keyboard.h"

 static NinePatchLayer* guiPaneFrame = NULL;
Author	SHA1	Message	Date
deepfriedwaffles	05baea1ed4	gonna try changing all Options::Option* in the whole project to just Option* not sure if this works but it gets the compiler to shut up. if this breaks everything change all 'Option' to 'Options::Option' as it once was.	2026-03-19 11:10:19 -04:00
deepfriedwaffles	04aea27334	more header fixes	2026-03-19 11:06:55 -04:00