Kolyah35/minecraft-pe-0.6.1
4
9
Fork 8
Code Issues 4 Pull Requests 3 Packages Projects Releases 4 Wiki Activity

Compare commits

base: Kolyah35:cadc4d7e60b9d7b39960fc24fea36b1aca710102
Branches Tags
Kolyah35:main Kolyah35:dedicated-rewrite Kolyah35:ios-support Kolyah35:!no-build-refactor
Kolyah35:0.6.1-alpha-0.0.4 Kolyah35:dev Kolyah35:0.6.1-alpha-0.0.3 Kolyah35:0.6.1-alpha-0.0.2 Kolyah35:0.6.1-alpha-0.0.1
..
compare: Kolyah35:ios-support
Branches Tags
Kolyah35:main Kolyah35:dedicated-rewrite Kolyah35:ios-support Kolyah35:!no-build-refactor
Kolyah35:0.6.1-alpha-0.0.4 Kolyah35:dev Kolyah35:0.6.1-alpha-0.0.3 Kolyah35:0.6.1-alpha-0.0.2 Kolyah35:0.6.1-alpha-0.0.1

1 Commits
cadc4d7e60 ... ios-suppor

Author SHA1 Message Date
Kolyah35
fe73853a64 defined() would be better ig 2026-04-06 22:49:54 +03:00
2 changed files with 4 additions and 44 deletions
Expand all files Collapse all files

40
project/iosproj/minecraftpe.xcodeproj/project.pbxproj
View File

@@ -2441,13 +2441,8 @@
F99D341D2F736AA100DC153E /* HttpClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HttpClient.h; path = ../../src/platform/HttpClient.h; sourceTree = "<group>"; };
F99D341E2F736AA100DC153E /* HttpClient.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = HttpClient.cpp; path = ../../src/platform/HttpClient.cpp; sourceTree = "<group>"; };
F99D34212F736AD400DC153E /* TextOption.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TextOption.h; path = ../../src/client/gui/components/TextOption.h; sourceTree = "<group>"; };
<<<<<<< HEAD
F99D34222F736AD400DC153E /* TextOption.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = TextOption.cpp; path = ../../src/client/gui/components/TextOption.cpp; };
F99D34252F736AFB00DC153E /* OptionsFile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionsFile.h; path = ../../src/client/OptionsFile.h; sourceTree = "<group>"; sourceTree = "<group>"; };
=======
F99D34222F736AD400DC153E /* TextOption.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = TextOption.cpp; path = ../../src/client/gui/components/TextOption.cpp; sourceTree = "<unknown>"; };
F99D34252F736AFB00DC153E /* OptionsFile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionsFile.h; path = ../../src/client/OptionsFile.h; sourceTree = "<group>"; };
>>>>>>> ios-rebase
F99D34262F736AFB00DC153E /* OptionsFile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OptionsFile.cpp; path = ../../src/client/OptionsFile.cpp; sourceTree = "<group>"; };
F99D34292F736B6F00DC153E /* OptionsItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionsItem.h; path = ../../src/client/gui/components/OptionsItem.h; sourceTree = "<group>"; };
F99D342A2F736B6F00DC153E /* OptionsItem.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OptionsItem.cpp; path = ../../src/client/gui/components/OptionsItem.cpp; sourceTree = "<group>"; };
@@ -2468,12 +2463,9 @@
F99D34492F7370CF00DC153E /* Slider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Slider.h; path = ../../src/client/gui/components/Slider.h; sourceTree = "<group>"; };
F99D344A2F7370CF00DC153E /* Slider.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Slider.cpp; path = ../../src/client/gui/components/Slider.cpp; sourceTree = "<group>"; };
F99D344D2F7372A100DC153E /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
<<<<<<< HEAD
=======
F99F0FA82F84369F00F2B29A /* GrassColor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GrassColor.cpp; sourceTree = "<group>"; };
F99F0FAB2F8436CE00F2B29A /* FoliageColor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FoliageColor.cpp; sourceTree = "<group>"; };
F99F0FAE2F8436EB00F2B29A /* Color.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Color.cpp; sourceTree = "<group>"; };
>>>>>>> ios-rebase
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -5879,11 +5871,7 @@
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
<<<<<<< HEAD
IPHONEOS_DEPLOYMENT_TARGET = 14;
=======
IPHONEOS_DEPLOYMENT_TARGET = 12;
>>>>>>> ios-rebase
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "C93D3524-5C6F-466E-B12B-833663B7EAE0";
@@ -5914,11 +5902,7 @@
);
INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
<<<<<<< HEAD
IPHONEOS_DEPLOYMENT_TARGET = 14;
=======
IPHONEOS_DEPLOYMENT_TARGET = 12;
>>>>>>> ios-rebase
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.mojang.mcpe-arm64";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -6012,11 +5996,7 @@
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
<<<<<<< HEAD
IPHONEOS_DEPLOYMENT_TARGET = 14;
=======
IPHONEOS_DEPLOYMENT_TARGET = 12;
>>>>>>> ios-rebase
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "64BA8967-1A9A-4980-972C-42E75AD5E023";
@@ -6048,11 +6028,7 @@
);
INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
<<<<<<< HEAD
IPHONEOS_DEPLOYMENT_TARGET = 14;
=======
IPHONEOS_DEPLOYMENT_TARGET = 12;
>>>>>>> ios-rebase
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"-DNS_BLOCK_ASSERTIONS=1",
@@ -6118,11 +6094,7 @@
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
<<<<<<< HEAD
IPHONEOS_DEPLOYMENT_TARGET = 14;
=======
IPHONEOS_DEPLOYMENT_TARGET = 12;
>>>>>>> ios-rebase
ONLY_ACTIVE_ARCH = YES;
RUN_CLANG_STATIC_ANALYZER = NO;
SDKROOT = iphoneos;
@@ -6150,11 +6122,7 @@
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
<<<<<<< HEAD
IPHONEOS_DEPLOYMENT_TARGET = 14;
=======
IPHONEOS_DEPLOYMENT_TARGET = 12;
>>>>>>> ios-rebase
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
RUN_CLANG_STATIC_ANALYZER = NO;
@@ -6187,11 +6155,7 @@
);
INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
<<<<<<< HEAD
IPHONEOS_DEPLOYMENT_TARGET = 14;
=======
IPHONEOS_DEPLOYMENT_TARGET = 12;
>>>>>>> ios-rebase
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.mojang.mcpe-arm64";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -6226,11 +6190,7 @@
);
INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
<<<<<<< HEAD
IPHONEOS_DEPLOYMENT_TARGET = 14;
=======
IPHONEOS_DEPLOYMENT_TARGET = 12;
>>>>>>> ios-rebase
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.mojang.mcpe-arm64";
PRODUCT_NAME = "$(TARGET_NAME)";

8
src/client/Minecraft.cpp
View File

@@ -1106,9 +1106,9 @@ void Minecraft::releaseMouse()
}
bool Minecraft::useTouchscreen() {
#if TARGET_OS_IPHONE
#if defined(TARGET_OS_IPHONE)
return true;
#elif RPI
#elif defined(RPI)
return false;
#endif
return options.getBooleanValue(OPTIONS_USE_TOUCHSCREEN) && !_supportsNonTouchscreen;
@@ -1149,8 +1149,8 @@ void Minecraft::init()
int* grassPixels = textures->loadTexturePixels(grassId, "misc/foliagecolor.png");
GrassColor::init(grassPixels);
bool tint = options.getBooleanValue(OPTIONS_FOLIAGE_TINT); // finally, toggleable foliage color
FoliageColor::setUseTint(tint);
bool tint = options.getBooleanValue(OPTIONS_FOLIAGE_TINT); // finally, toggleable foliage color
FoliageColor::setUseTint(tint);
GrassColor::setUseTint(tint);
// Platform specific initialization here