Added iOS comppiling instructions to README

I keep messing this up. For now I am removing all the needs for publish except iOS

CMakeLists.txt

@@ -166,7 +166,6 @@ file(GLOB SERVER_SOURCES
     "src/util/Mth.cpp"
     "src/util/PerfTimer.cpp"
     "src/util/StringUtils.cpp"
-    "src/util/Color.cpp"
 
     "src/world/Direction.cpp"
 
@@ -200,9 +199,6 @@ file(GLOB SERVER_SOURCES
 
     "src/world/level/dimension/Dimension.cpp"
 
-    "src/world/level/dimension/FoliageColor.cpp"
-    "src/world/level/GrassColor.cpp"
-
     "src/world/level/levelgen/*.cpp"
     "src/world/level/levelgen/feature/Feature.cpp"
     "src/world/level/levelgen/synth/*.cpp"
@@ -262,8 +258,6 @@ file(GLOB CLIENT_SOURCES
     
     "src/util/**.cpp"
 
-    "src/util/Color.cpp"
-
     "src/world/*.cpp"
     "src/world/phys/*.cpp"
     "src/world/entity/*.cpp"

project/android/jni/Android.mk

@@ -146,7 +146,6 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/util/StringUtils.cpp \
 ../../../src/util/PerfTimer.cpp \
 ../../../src/util/PerfRenderer.cpp \
-../../../src/util/Color.cpp \
 ../../../src/world/Direction.cpp \
 ../../../src/world/entity/AgableMob.cpp \
 ../../../src/world/entity/Entity.cpp \

project/android_java/jni/Android.mk

@@ -122,7 +122,6 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/util/StringUtils.cpp \
 ../../../src/util/PerfTimer.cpp \
 ../../../src/util/PerfRenderer.cpp \
-../../../src/util/Color.cpp \
 ../../../src/world/Direction.cpp \
 ../../../src/world/entity/AgableMob.cpp \
 ../../../src/world/entity/Entity.cpp \

project/iosproj/minecraftpe.xcodeproj/project.pbxproj

@@ -1173,12 +1173,6 @@
 		F99D344C2F7370CF00DC153E /* Slider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D344A2F7370CF00DC153E /* Slider.cpp */; };
 		F99D344E2F7372A100DC153E /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F99D344D2F7372A100DC153E /* Launch Screen.storyboard */; };
 		F99D344F2F7372A100DC153E /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F99D344D2F7372A100DC153E /* Launch Screen.storyboard */; };
-		F99F0FA92F84369F00F2B29A /* GrassColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FA82F84369F00F2B29A /* GrassColor.cpp */; };
-		F99F0FAA2F84369F00F2B29A /* GrassColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FA82F84369F00F2B29A /* GrassColor.cpp */; };
-		F99F0FAC2F8436CE00F2B29A /* FoliageColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FAB2F8436CE00F2B29A /* FoliageColor.cpp */; };
-		F99F0FAD2F8436CE00F2B29A /* FoliageColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FAB2F8436CE00F2B29A /* FoliageColor.cpp */; };
-		F99F0FAF2F8436EB00F2B29A /* Color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FAE2F8436EB00F2B29A /* Color.cpp */; };
-		F99F0FB02F8436EB00F2B29A /* Color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FAE2F8436EB00F2B29A /* Color.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -2441,8 +2435,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>"; };
-		F99D34222F736AD400DC153E /* TextOption.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = TextOption.cpp; path = ../../src/client/gui/components/TextOption.cpp; sourceTree = "<unknown>"; };
+		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>"; };
+		F99D34252F736AFB00DC153E /* OptionsFile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionsFile.h; path = ../../src/client/OptionsFile.h; sourceTree = "<group>"; sourceTree = "<group>"; };
 		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>"; };
@@ -2463,9 +2457,6 @@
 		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>"; };
-		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>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -3770,7 +3761,6 @@
 				D5B50E6914CFF66F005F7284 /* StringUtils.cpp */,
 				D5B50E6A14CFF66F005F7284 /* StringUtils.h */,
 				D5B50E6B14CFF66F005F7284 /* WeighedRandom.h */,
-				F99F0FAE2F8436EB00F2B29A /* Color.cpp */,
 			);
 			path = util;
 			sourceTree = "<group>";
@@ -4035,8 +4025,6 @@
 				D5B50F3714CFF66F005F7284 /* TickNextTickData.h */,
 				D5B50F3814CFF66F005F7284 /* tile */,
 				D5B50F6814CFF66F005F7284 /* TilePos.h */,
-				F99F0FA82F84369F00F2B29A /* GrassColor.cpp */,
-				F99F0FAB2F8436CE00F2B29A /* FoliageColor.cpp */,
 			);
 			path = level;
 			sourceTree = "<group>";
@@ -5206,7 +5194,6 @@
 				D5B5111014CFF670005F7284 /* Mth.cpp in Sources */,
 				D5B5111214CFF670005F7284 /* PerfRenderer.cpp in Sources */,
 				D5B5111414CFF670005F7284 /* PerfTimer.cpp in Sources */,
-				F99F0FA92F84369F00F2B29A /* GrassColor.cpp in Sources */,
 				D5B5111614CFF670005F7284 /* StringUtils.cpp in Sources */,
 				D5B5111814CFF670005F7284 /* Direction.cpp in Sources */,
 				D5B5111A14CFF670005F7284 /* Animal.cpp in Sources */,
@@ -5227,14 +5214,12 @@
 				D5B5113814CFF670005F7284 /* PathFinderMob.cpp in Sources */,
 				D5B5113A14CFF670005F7284 /* Inventory.cpp in Sources */,
 				D5B5113C14CFF670005F7284 /* Player.cpp in Sources */,
-				F99F0FB02F8436EB00F2B29A /* Color.cpp in Sources */,
 				D5B5113E14CFF670005F7284 /* Arrow.cpp in Sources */,
 				D5B5114014CFF670005F7284 /* Recipes.cpp in Sources */,
 				D5B5114214CFF670005F7284 /* ToolRecipes.cpp in Sources */,
 				D5B5114414CFF670005F7284 /* WeaponRecipes.cpp in Sources */,
 				D5B5114614CFF670005F7284 /* HatchetItem.cpp in Sources */,
 				D5B5114814CFF670005F7284 /* Item.cpp in Sources */,
-				F99F0FAC2F8436CE00F2B29A /* FoliageColor.cpp in Sources */,
 				D5B5114A14CFF670005F7284 /* ItemInstance.cpp in Sources */,
 				D5B5114C14CFF670005F7284 /* PickaxeItem.cpp in Sources */,
 				F99D344B2F7370CF00DC153E /* Slider.cpp in Sources */,
@@ -5543,7 +5528,6 @@
 				D5B5102F14CFF670005F7284 /* main.cpp in Sources */,
 				D5B5103514CFF670005F7284 /* Tag.cpp in Sources */,
 				D5B5103714CFF670005F7284 /* ClientSideNetworkHandler.cpp in Sources */,
-				F99F0FAF2F8436EB00F2B29A /* Color.cpp in Sources */,
 				D5B5103914CFF670005F7284 /* NetEventCallback.cpp in Sources */,
 				D5B5103B14CFF670005F7284 /* Packet.cpp in Sources */,
 				D5B5103D14CFF670005F7284 /* RakNetInstance.cpp in Sources */,
@@ -5564,7 +5548,6 @@
 				D5B5111514CFF670005F7284 /* StringUtils.cpp in Sources */,
 				D5B5111714CFF670005F7284 /* Direction.cpp in Sources */,
 				D5B5111914CFF670005F7284 /* Animal.cpp in Sources */,
-				F99F0FAD2F8436CE00F2B29A /* FoliageColor.cpp in Sources */,
 				D5B5111B14CFF670005F7284 /* Chicken.cpp in Sources */,
 				D5B5111D14CFF670005F7284 /* Cow.cpp in Sources */,
 				D5B5111F14CFF670005F7284 /* Pig.cpp in Sources */,
@@ -5615,7 +5598,6 @@
 				D5B5117714CFF670005F7284 /* ExternalFileLevelStorageSource.cpp in Sources */,
 				D5B5117914CFF670005F7284 /* RegionFile.cpp in Sources */,
 				D5B5117B14CFF670005F7284 /* TickNextTickData.cpp in Sources */,
-				F99F0FAA2F84369F00F2B29A /* GrassColor.cpp in Sources */,
 				D5B5117D14CFF670005F7284 /* DoorTile.cpp in Sources */,
 				D5B5118114CFF670005F7284 /* StoneSlabTile.cpp in Sources */,
 				D5B5118314CFF670005F7284 /* Tile.cpp in Sources */,
@@ -5871,7 +5853,7 @@
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
-				IPHONEOS_DEPLOYMENT_TARGET = 12;
+				IPHONEOS_DEPLOYMENT_TARGET = 14;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "C93D3524-5C6F-466E-B12B-833663B7EAE0";
@@ -5902,7 +5884,7 @@
 				);
 				INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
-				IPHONEOS_DEPLOYMENT_TARGET = 12;
+				IPHONEOS_DEPLOYMENT_TARGET = 14;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mojang.mcpe-arm64";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -5996,7 +5978,7 @@
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
-				IPHONEOS_DEPLOYMENT_TARGET = 12;
+				IPHONEOS_DEPLOYMENT_TARGET = 14;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "64BA8967-1A9A-4980-972C-42E75AD5E023";
@@ -6028,7 +6010,7 @@
 				);
 				INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
-				IPHONEOS_DEPLOYMENT_TARGET = 12;
+				IPHONEOS_DEPLOYMENT_TARGET = 14;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-DNS_BLOCK_ASSERTIONS=1",
@@ -6094,7 +6076,7 @@
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
-				IPHONEOS_DEPLOYMENT_TARGET = 12;
+				IPHONEOS_DEPLOYMENT_TARGET = 14;
 				ONLY_ACTIVE_ARCH = YES;
 				RUN_CLANG_STATIC_ANALYZER = NO;
 				SDKROOT = iphoneos;
@@ -6122,7 +6104,7 @@
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
-				IPHONEOS_DEPLOYMENT_TARGET = 12;
+				IPHONEOS_DEPLOYMENT_TARGET = 14;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				RUN_CLANG_STATIC_ANALYZER = NO;
@@ -6155,7 +6137,7 @@
 				);
 				INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
-				IPHONEOS_DEPLOYMENT_TARGET = 12;
+				IPHONEOS_DEPLOYMENT_TARGET = 14;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mojang.mcpe-arm64";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -6190,7 +6172,7 @@
 				);
 				INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
-				IPHONEOS_DEPLOYMENT_TARGET = 12;
+				IPHONEOS_DEPLOYMENT_TARGET = 14;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mojang.mcpe-arm64";
 				PRODUCT_NAME = "$(TARGET_NAME)";

src/client/Minecraft.cpp

@@ -1106,9 +1106,9 @@ void Minecraft::releaseMouse()
 }
 
 bool Minecraft::useTouchscreen() {
-#if defined(TARGET_OS_IPHONE)
+#if TARGET_OS_IPHONE
     return true;
-#elif defined(RPI)
+#elif RPI
 	return false;
 #endif
 	return options.getBooleanValue(OPTIONS_USE_TOUCHSCREEN) && !_supportsNonTouchscreen;
@@ -1140,13 +1140,13 @@ void Minecraft::init()
 
 
 	// my code
-	TextureId foliageId = (textures->loadTexture("misc/foliagecolor.png")); // loading the uh png for foliage color
+	TextureId foliageId = (textures->loadTexture("environment/foliagecolor.png")); // loading the uh png for foliage color
-	int* foliagePixels = textures->loadTexturePixels(foliageId, "misc/foliagecolor.png");
+	int* foliagePixels = textures->loadTexturePixels(foliageId, "environment/foliagecolor.png");
 	// now i can finally initialize foliage color, probably not the best way to handle this but i cant be arsed rn
 	FoliageColor::init(foliagePixels);
 
-	TextureId grassId = (textures->loadTexture("misc/foliagecolor.png")); // loading the uh png for foliage color
+	TextureId grassId = (textures->loadTexture("environment/grasscolor.png")); // loading the uh png for foliage color
-	int* grassPixels = textures->loadTexturePixels(grassId, "misc/foliagecolor.png");
+	int* grassPixels = textures->loadTexturePixels(grassId, "environment/grasscolor.png");
 	GrassColor::init(grassPixels);
 	
 	bool tint = options.getBooleanValue(OPTIONS_FOLIAGE_TINT); // finally, toggleable foliage color
@@ -1403,12 +1403,6 @@ void Minecraft::_levelGenerated()
 		player->resetPos(false);
 	}
 
-	    if (level && level->dimension) {
-        // For example, if you want FogType or any other option
-        level->dimension->FogType = options.getBooleanValue(OPTIONS_FOG_TYPE);
-		}
-
-
 	this->cameraTargetPlayer = player;
 
 	std::string serverName = options.getStringValue(OPTIONS_USERNAME) + " - " + level->getLevelData()->levelName;

src/client/Options.cpp

@@ -62,10 +62,6 @@ OptionBool serverVisible("servervisible", true);
 
 OptionBool foliageTint("foliagetint", false);
 
-OptionInt fogType("fogType", 0, 0, 2);
-
-OptionBool javaHud("javaHud", false);
-
 OptionInt keyForward("key.forward", Keyboard::KEY_W);
 OptionInt keyLeft("key.left", Keyboard::KEY_A);
 OptionInt keyBack("key.back", Keyboard::KEY_S);
@@ -170,11 +166,6 @@ void Options::initTable() {
 	m_options[OPTIONS_RPI_CURSOR] = &rpiCursor;
 	m_options[OPTIONS_FOLIAGE_TINT] = &foliageTint;
 
-	// more options yay
-	m_options[OPTIONS_FOG_TYPE] = &fogType;
-
-	m_options[OPTIONS_JAVA_HUD] = &javaHud;
-
 	m_options[OPTIONS_AUTOJUMP] = &autoJump;
 	m_options[OPTIONS_LAST_IP] = &lastIp;
 }

src/client/Options.h

@@ -85,8 +85,6 @@ enum OptionId {
 
     OPTIONS_RPI_CURSOR,
 	OPTIONS_FOLIAGE_TINT,
-	OPTIONS_FOG_TYPE,
-	OPTIONS_JAVA_HUD,
 	// Should be last!
 	OPTIONS_COUNT
 };

src/client/gui/Gui.cpp

@@ -103,12 +103,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 		}
 	}
 
-	// @todo - Shredder: I added this here but currently viginette is broken so i cant do much about it.
-	//	if (minecraft->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS)){
-	//		this->renderVignette(this->minecraft->player->getBrightness(a), screenWidth, screenHeight);
-	//	}
-	// shredder end
-
 	if(minecraft->player->getSleepTimer() > 0) {
 		glDisable(GL_DEPTH_TEST);
 		glDisable(GL_ALPHA_TEST);
@@ -350,8 +344,6 @@ void Gui::displayClientMessage(const std::string& messageId) {
 	addMessage(messageId);
 }
 
-
-// @todo - shredder: Function seems to be completely fine and ported over from java beta, but renders opaque??? need to investigate
 void Gui::renderVignette(float br, int w, int h) {
 	br = 1 - br;
 	if (br < 0) br = 0;
@@ -362,10 +354,7 @@ void Gui::renderVignette(float br, int w, int h) {
 	glDepthMask(false);
 	glBlendFunc2(GL_ZERO, GL_ONE_MINUS_SRC_COLOR);
 	glColor4f2(tbr, tbr, tbr, 1);
-
 	minecraft->textures->loadAndBindTexture("misc/vignette.png");
-	glTexParameteri2(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri2(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
 	Tesselator& t = Tesselator::instance;
 	t.begin();
@@ -1116,41 +1105,22 @@ void Gui::renderToolBar( float a, int ySlot, const int screenWidth ) {
 
 	// Draw count
 	//Tesselator& t = Tesselator::instance;
-
-	const float k = 0.5f * GuiScale;
-	if (minecraft->options.getBooleanValue(OPTIONS_JAVA_HUD)) // if true enables the java beta item count size and color and calls the java items decorations
-	{
-		t.beginOverride();
-		if (minecraft->gameMode->isSurvivalType()) {
-			x = baseItemX;
-			for (int i = 0; i < slots; i++) {
-				ItemInstance* item = minecraft->player->inventory->getItem(i);
-				if (item && item->count >= 0)
-					ItemRenderer::renderGuiItemDecorations(minecraft->font, minecraft->textures, minecraft->player->inventory->getItem(i), x, (float)ySlot);
-				x += 20;
-			}
-		}
-		minecraft->textures->loadAndBindTexture("font/default8.png");
-		t.endOverrideAndDraw();
-	}
-	else { // otherwise uses the normal pocket edition one
 	glPushMatrix2();
 	glScalef2(InvGuiScale + InvGuiScale, InvGuiScale + InvGuiScale, 1);
+	const float k = 0.5f * GuiScale;
+
 	t.beginOverride();
 	if (minecraft->gameMode->isSurvivalType()) {
 		x = baseItemX;
 		for (int i = 0; i < slots; i++) {
 			ItemInstance* item = minecraft->player->inventory->getItem(i);
 			if (item && item->count >= 0)
-					renderSlotText(item, k*x, k*ySlot, true, true);
+				renderSlotText(item, k*x, k*ySlot + 1, true, true);
 			x += 20;
 		}
 	}
-
 	minecraft->textures->loadAndBindTexture("font/default8.png");
 	t.endOverrideAndDraw();
 
 	glPopMatrix2();
 }
-
-}

src/client/gui/screens/OptionsScreen.cpp

@@ -229,10 +229,7 @@ void OptionsScreen::generateOptionScreens() {
 	optionPanes[4]->addOptionItem(OPTIONS_ALLOW_SPRINT, minecraft)
 		.addOptionItem(OPTIONS_BAR_ON_TOP, minecraft)
 		.addOptionItem(OPTIONS_RPI_CURSOR, minecraft)
-		.addOptionItem(OPTIONS_FOLIAGE_TINT, minecraft)
+		.addOptionItem(OPTIONS_FOLIAGE_TINT, minecraft);
-		.addOptionItem(OPTIONS_JAVA_HUD, minecraft)
-		.addOptionItem(OPTIONS_FOG_TYPE, minecraft);
-		
 }
 
 void OptionsScreen::mouseClicked(int x, int y, int buttonNum) {

src/client/renderer/LevelRenderer.cpp

@@ -49,7 +49,6 @@ LevelRenderer::LevelRenderer( Minecraft* mc)
 	xMaxChunk(0), yMaxChunk(0), zMaxChunk(0),
 
 	lastViewDistance(-1),
-	lastFogType(-1),
 
 	noEntityRenderFrames(2),
 	totalEntities(0),
@@ -162,8 +161,6 @@ void LevelRenderer::allChanged()
 	Tile::leaves_carried->setFancy(fancy);
 	lastViewDistance = mc->options.getIntValue(OPTIONS_VIEW_DISTANCE);
 
-	lastFogType = mc->options.getIntValue(OPTIONS_FOG_TYPE);
-
 	bool tint = mc->options.getBooleanValue(OPTIONS_FOLIAGE_TINT);
 	FoliageColor::setUseTint(tint);
 	GrassColor::setUseTint(tint);
@@ -315,17 +312,6 @@ int LevelRenderer::render( Mob* player, int layer, float alpha )
 		allChanged();
 	}
 
-	int currentFogType = mc->options.getIntValue(OPTIONS_FOG_TYPE);
-	if (currentFogType != lastFogType) {
-		lastFogType = currentFogType;
-
-		if (level && level->dimension) {
-			level->dimension->FogType = currentFogType; // use new fog stuff
-		}
-
-		allChanged(); 
-	}
-
 	TIMER_PUSH("sortchunks");
 	for (int i = 0; i < 10; i++) {
 		chunkFixOffs = (chunkFixOffs + 1) % chunksLength;

src/client/renderer/LevelRenderer.h

@@ -113,9 +113,6 @@ private:
 	bool occlusionCheck;
 	int lastViewDistance;
 
-	// shredder added again...
-	int lastFogType;
-
 	int ticks;
     int starList, skyList, darkList;
 

src/client/renderer/entity/EntityRenderDispatcher.cpp

@@ -40,18 +40,18 @@ EntityRenderDispatcher::EntityRenderDispatcher()
 {
 	//@note: The Models (model/armor) will be deleted by resp. MobRenderer
 	assign( ER_ITEM_RENDERER,       new ItemRenderer());
-	assign(	ER_HUMANOID_RENDERER,	new HumanoidMobRenderer(new HumanoidModel(), 0.5));
+	assign(	ER_HUMANOID_RENDERER,	new HumanoidMobRenderer(new HumanoidModel(), 0));
-	assign(	ER_PIG_RENDERER,		new PigRenderer(new PigModel(0.5), NULL/*new PigModel(0.5f)*/, 0.7));
+	assign(	ER_PIG_RENDERER,		new PigRenderer(new PigModel(), NULL/*new PigModel(0.5f)*/, 0));
-	assign(	ER_COW_RENDERER,		new MobRenderer(new CowModel(), 0.7));
+	assign(	ER_COW_RENDERER,		new MobRenderer(new CowModel(), 0));
-	assign(	ER_CHICKEN_RENDERER,	new ChickenRenderer( new ChickenModel(), 0.3));
+	assign(	ER_CHICKEN_RENDERER,	new ChickenRenderer( new ChickenModel(), 0));
-	assign(	ER_SHEEP_RENDERER,	    new SheepRenderer(new SheepModel(), new SheepFurModel(), 0.7));
+	assign(	ER_SHEEP_RENDERER,	    new SheepRenderer(new SheepModel(), new SheepFurModel(), 0));
 	assign(	ER_SKELETON_RENDERER,	new HumanoidMobRenderer(new SkeletonModel(), 0.5f));
 	assign(	ER_ZOMBIE_RENDERER,		new HumanoidMobRenderer(new ZombieModel(), 0.5f));
 	assign(	ER_CREEPER_RENDERER,	new CreeperRenderer());
 	assign(	ER_SPIDER_RENDERER,		new SpiderRenderer());
 	assign(	ER_TNT_RENDERER,		new TntRenderer());
 	assign(	ER_ARROW_RENDERER,		new ArrowRenderer());
-	assign( ER_PLAYER_RENDERER,		new PlayerRenderer(new HumanoidModel(0, 0, 64, 64), 0.5));
+	assign( ER_PLAYER_RENDERER,		new PlayerRenderer(new HumanoidModel(0, 0, 64, 64), 0));
 	assign( ER_THROWNEGG_RENDERER,  new ItemSpriteRenderer(Item::egg->getIcon(0)));
 	assign( ER_SNOWBALL_RENDERER,   new ItemSpriteRenderer(Item::snowBall->getIcon(0)));
 	assign( ER_PAINTING_RENDERER,   new PaintingRenderer());
@@ -133,7 +133,7 @@ void EntityRenderDispatcher::render( Entity* entity, float x, float y, float z,
 	EntityRenderer* renderer = getRenderer(entity);
 	if (renderer != NULL) {
 		renderer->render(entity, x, y, z, rot, a);
-		renderer->postRender(entity, x, y, z, rot, a);
+		//renderer->postRender(entity, x, y, z, rot, a);
 	}
 }
 

src/client/renderer/entity/EntityRenderer.cpp

@@ -5,12 +5,6 @@
 #include "../gles.h"
 #include "../../../world/phys/AABB.h"
 #include "EntityRenderDispatcher.h"
-#include "../../../util/Mth.h"
-#include "../../../world/level/Level.h"
-#include "../../../world/level/tile/Tile.h"
-
-#include "../../Minecraft.h"
-#include "../../Option.h"
 
 EntityRenderDispatcher* EntityRenderer::entityRenderDispatcher = NULL;
 
@@ -42,37 +36,37 @@ void EntityRenderer::render(const AABB& bb, float xo, float yo, float zo) {
 	glColor4f2(1, 1, 1, 1);
 	t.begin();
 	t.offset(xo, yo, zo);
-	t.normal(0, 0, -1);
+	//t.normal(0, 0, -1);
 	t.vertex(bb.x0, bb.y1, bb.z0);
 	t.vertex(bb.x1, bb.y1, bb.z0);
 	t.vertex(bb.x1, bb.y0, bb.z0);
 	t.vertex(bb.x0, bb.y0, bb.z0);
 
-	t.normal(0, 0, 1);
+	//t.normal(0, 0, 1);
 	t.vertex(bb.x0, bb.y0, bb.z1);
 	t.vertex(bb.x1, bb.y0, bb.z1);
 	t.vertex(bb.x1, bb.y1, bb.z1);
 	t.vertex(bb.x0, bb.y1, bb.z1);
 
-	t.normal(0, -1, 0);
+	//t.normal(0, -1, 0);
 	t.vertex(bb.x0, bb.y0, bb.z0);
 	t.vertex(bb.x1, bb.y0, bb.z0);
 	t.vertex(bb.x1, bb.y0, bb.z1);
 	t.vertex(bb.x0, bb.y0, bb.z1);
 
-	t.normal(0, 1, 0);
+	//t.normal(0, 1, 0);
 	t.vertex(bb.x0, bb.y1, bb.z1);
 	t.vertex(bb.x1, bb.y1, bb.z1);
 	t.vertex(bb.x1, bb.y1, bb.z0);
 	t.vertex(bb.x0, bb.y1, bb.z0);
 
-	t.normal(-1, 0, 0);
+	//t.normal(-1, 0, 0);
 	t.vertex(bb.x0, bb.y0, bb.z1);
 	t.vertex(bb.x0, bb.y1, bb.z1);
 	t.vertex(bb.x0, bb.y1, bb.z0);
 	t.vertex(bb.x0, bb.y0, bb.z0);
 
-	t.normal(1, 0, 0);
+	//t.normal(1, 0, 0);
 	t.vertex(bb.x1, bb.y0, bb.z0);
 	t.vertex(bb.x1, bb.y1, bb.z0);
 	t.vertex(bb.x1, bb.y1, bb.z1);
@@ -122,139 +116,134 @@ Font* EntityRenderer::getFont() {
 	return entityRenderDispatcher->getFont();
 }
 
-void EntityRenderer::postRender(Entity* entity, float x, float y, float z, float rot, float a) {
+//void postRender(Entity entity, float x, float y, float z, float rot, float a) {
-	if (/*entityRenderDispatcher.options.fancyGraphics &&*/entityRenderDispatcher->minecraft->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS) && shadowRadius > 0)  {
+//    if (entityRenderDispatcher.options.fancyGraphics && shadowRadius > 0) {
-		float dist = entityRenderDispatcher->distanceToSqr(entity->x, entity->y, entity->z);
+//        float dist = entityRenderDispatcher.distanceToSqr(entity.x, entity.y, entity.z);
-		float pow = (float) ((1 - dist / (16.0f * 16.0f)) * shadowStrength);
+//        float pow = (float) ((1 - dist / (16.0f * 16.0f)) * shadowStrength);
-		if (pow > 0) {
+//        if (pow > 0) {
-			renderShadow(entity, x, y, z, pow, a);
+//            renderShadow(entity, x, y, z, pow, a);
-		}
+//        }
+//    }
+//    if (entity.isOnFire()) renderFlame(entity, x, y, z, a);
 //}
-		if (entity->isOnFire()) renderFlame(entity, x, y, z, a);
-	}
-}
-void EntityRenderer::renderFlame(Entity* e, float x, float y, float z, float a) {
 
-	int tex = ((Tile*)Tile::fire)->tex;
+//void renderFlame(Entity e, float x, float y, float z, float a) {
+//	glDisable2(GL_LIGHTING);
+//	int tex = Tile.fire.tex;
 
-	int xt = (tex & 0xf) << 4;
+//	int xt = (tex & 0xf) << 4;
-	int yt = tex & 0xf0;
+//	int yt = tex & 0xf0;
 
-	float u0 = (xt) / 256.0f;
+//	float u0 = (xt) / 256.0f;
-	float u1 = (xt + 15.99f) / 256.0f;
+//	float u1 = (xt + 15.99f) / 256.0f;
-	float v0 = (yt) / 256.0f;
+//	float v0 = (yt) / 256.0f;
-	float v1 = (yt + 15.99f) / 256.0f;
+//	float v1 = (yt + 15.99f) / 256.0f;
 
-	glPushMatrix2();
+//	glPushMatrix2();
-	glTranslatef2((float) x, (float) y, (float) z);
+//	glTranslatef2((float) x, (float) y, (float) z);
 
-	float s = e->bbWidth * 1.4f;
+//	float s = e.bbWidth * 1.4f;
-	glScalef2(s, s, s);
+//	glScalef2(s, s, s);
-	bindTexture("terrain.png");
+//	bindTexture("terrain.png");
-	Tesselator& t = Tesselator::instance;
+//	Tesselator t = Tesselator.instance;
 
-	float r = 1.0f;
+//	float r = 1.0f;
-	float xo = 0.5f;
+//	float xo = 0.5f;
-	float yo = 0.0f;
+//	float yo = 0.0f;
 
-	float h = e->bbHeight / e->bbWidth;
+//	float h = e.bbHeight / e.bbWidth;
 
-	glRotatef2(-entityRenderDispatcher->playerRotY, 0, 1, 0);
+//	glRotatef2(-entityRenderDispatcher.playerRotY, 0, 1, 0);
-	glTranslatef2(0, 0, -0.4f + ((int) h) * 0.02f);
+//	glTranslatef2(0, 0, -0.4f + ((int) h) * 0.02f);
-	glColor4f2(1, 1, 1, 1);
+//	glColor4f2(1, 1, 1, 1);
-	// glRotatef2(-playerRotX, 1, 0, 0);
+//	// glRotatef2(-playerRotX, 1, 0, 0);
-	t.begin();
+//	t.begin();
-	while (h > 0) {
+//	while (h > 0) {
-		t.vertexUV(r - xo, 0 - yo, 0, u1, v1);
+//		t.vertexUV(r - xo, 0 - yo, 0, u1, v1);
-		t.vertexUV(0 - xo, 0 - yo, 0, u0, v1);
+//		t.vertexUV(0 - xo, 0 - yo, 0, u0, v1);
-		t.vertexUV(0 - xo, 1.4f - yo, 0, u0, v0);
+//		t.vertexUV(0 - xo, 1.4f - yo, 0, u0, v0);
-		t.vertexUV(r - xo, 1.4f - yo, 0, u1, v0);
+//		t.vertexUV(r - xo, 1.4f - yo, 0, u1, v0);
-		h -= 1;
+//		h -= 1;
-		yo -= 1;
+//		yo -= 1;
-		r *= 0.9f;
+//		r *= 0.9f;
-		glTranslatef2(0, 0, -0.04f);
+//		glTranslatef2(0, 0, -0.04f);
-	}
+//	}
-	t.draw();
+//	t.end();
-	glPopMatrix2();
+//	glPopMatrix2();
 //	glEnable2(GL_LIGHTING);
-}
+//}
 
-void EntityRenderer::renderShadow(Entity* e, float x, float y, float z, float pow, float a) { //
+//void renderShadow(Entity e, float x, float y, float z, float pow, float a) {
-	glEnable2(GL_BLEND);
+//	glEnable2(GL_BLEND);
-	glBlendFunc2(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+//	glBlendFunc2(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-	//Textures* textures = entityRenderDispatcher->textures;
+//	Textures textures = entityRenderDispatcher.textures;
-	//textures->bind(textures->loadTexture("%clamp%/environment/shadow.png"));
+//	textures.bind(textures.loadTexture("%clamp%/misc/shadow.png"));
-	Textures* textures = entityRenderDispatcher->textures;
-	textures->bind(textures->loadTexture("/misc/shadow.png"));
 
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+//	Level level = getLevel();
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
-	Level* level = getLevel();
+//	glDepthMask(false);
+//	float r = shadowRadius;
 
-	glDepthMask(false);
+//	float ex = e.xOld + (e.x - e.xOld) * a;
-	float r = shadowRadius;
+//	float ey = e.yOld + (e.y - e.yOld) * a + e.getShadowHeightOffs();
+//	float ez = e.zOld + (e.z - e.zOld) * a;
 
-	float ex = e->xOld + (e->x - e->xOld) * a;
+//	int x0 = Mth.floor(ex - r);
-	float ey = e->yOld + (e->y - e->yOld) * a + e->getShadowHeightOffs();
+//	int x1 = Mth.floor(ex + r);
-	float ez = e->zOld + (e->z - e->zOld) * a;
+//	int y0 = Mth.floor(ey - r);
+//	int y1 = Mth.floor(ey);
+//	int z0 = Mth.floor(ez - r);
+//	int z1 = Mth.floor(ez + r);
 
-	int x0 = Mth::floor(ex - r);
+//	float xo = x - ex;
-	int x1 = Mth::floor(ex + r);
+//	float yo = y - ey;
-	int y0 = Mth::floor(ey - r);
+//	float zo = z - ez;
-	int y1 = Mth::floor(ey);
-	int z0 = Mth::floor(ez - r);
-	int z1 = Mth::floor(ez + r);
 
-	float xo = x - ex;
+//	Tesselator tt = Tesselator.instance;
-	float yo = y - ey;
+//	tt.begin();
-	float zo = z - ez;
+//	for (int xt = x0; xt <= x1; xt++)
+//		for (int yt = y0; yt <= y1; yt++)
+//			for (int zt = z0; zt <= z1; zt++) {
+//				int t = level.getTile(xt, yt - 1, zt);
+//				if (t > 0 && level.getRawBrightness(xt, yt, zt) > 3) {
+//					renderTileShadow(Tile.tiles[t], x, y + e.getShadowHeightOffs(), z, xt, yt, zt, pow, r, xo, yo + e.getShadowHeightOffs(), zo);
+//				}
+//			}
+//			tt.end();
 
-	Tesselator& tt = Tesselator::instance;
+//			glColor4f2(1, 1, 1, 1);
-	tt.begin();
+//			glDisable2(GL_BLEND);
-	for (int xt = x0; xt <= x1; xt++)
+//			glDepthMask(true);
-		for (int yt = y0; yt <= y1; yt++)
+//}
-			for (int zt = z0; zt <= z1; zt++) {
-				int t = level->getTile(xt, yt - 1, zt);
-				if (t > 0 && level->getRawBrightness(xt, yt, zt) > 3) {
-					renderTileShadow(Tile::tiles[t], x, y + e->getShadowHeightOffs(), z, xt, yt, zt, pow, r, xo, yo + e->getShadowHeightOffs(), zo);
-				}
-			}
-			tt.draw();
 
-			glColor4f2(1, 1, 1, 1);
+//Level* getLevel() {
-			glDisable2(GL_BLEND);
+//	return entityRenderDispatcher.level;
-			glDepthMask(true);
+//}
-}
 
-Level* EntityRenderer::getLevel() {
+//void renderTileShadow(Tile tt, float x, float y, float z, int xt, int yt, int zt, float pow, float r, float xo, float yo, float zo) {
-	return entityRenderDispatcher->level;
+//	Tesselator t = Tesselator.instance;
-}
+//	if (!tt.isCubeShaped()) return;
 
-void EntityRenderer::renderTileShadow(Tile* tt, float x, float y, float z, int xt, int yt, int zt, float pow, float r, float xo, float yo, float zo) {
+//	float a = ((pow - (y - (yt + yo)) / 2) * 0.5f) * getLevel().getBrightness(xt, yt, zt);
-	Tesselator& t = Tesselator::instance;
+//	if (a < 0) return;
-	if (!tt->isCubeShaped()) return;
+//	if (a > 1) a = 1;
-
-	float a = ((pow - (y - (yt + yo)) / 2) * 0.5f) * getLevel()->getBrightness(xt, yt, zt);
-	if (a < 0) return;
-	if (a > 1) a = 1;
 //	t.color(1, 1, 1, (float) a);
-	glColor4f2(1, 1, 1, (float) a);
+//	// glColor4f2(1, 1, 1, (float) a);
 
-	float x0 = xt + tt->xx0 + xo;
+//	float x0 = xt + tt.xx0 + xo;
-	float x1 = xt + tt->xx1 + xo;
+//	float x1 = xt + tt.xx1 + xo;
-	float y0 = yt + tt->yy0 + yo + 1.0 / 64.0f;
+//	float y0 = yt + tt.yy0 + yo + 1.0 / 64.0f;
-	float z0 = zt + tt->zz0 + zo;
+//	float z0 = zt + tt.zz0 + zo;
-	float z1 = zt + tt->zz1 + zo;
+//	float z1 = zt + tt.zz1 + zo;
 
-	float u0 = (float) ((x - (x0)) / 2 / r + 0.5f);
+//	float u0 = (float) ((x - (x0)) / 2 / r + 0.5f);
-	float u1 = (float) ((x - (x1)) / 2 / r + 0.5f);
+//	float u1 = (float) ((x - (x1)) / 2 / r + 0.5f);
-	float v0 = (float) ((z - (z0)) / 2 / r + 0.5f);
+//	float v0 = (float) ((z - (z0)) / 2 / r + 0.5f);
-	float v1 = (float) ((z - (z1)) / 2 / r + 0.5f);
+//	float v1 = (float) ((z - (z1)) / 2 / r + 0.5f);
 
-	t.vertexUV(x0, y0, z0, u0, v0);
+//	t.vertexUV(x0, y0, z0, u0, v0);
-	t.vertexUV(x0, y0, z1, u0, v1);
+//	t.vertexUV(x0, y0, z1, u0, v1);
-	t.vertexUV(x1, y0, z1, u1, v1);
+//	t.vertexUV(x1, y0, z1, u1, v1);
-	t.vertexUV(x1, y0, z0, u1, v0);
+//	t.vertexUV(x1, y0, z0, u1, v0);
-}
+//}

src/client/renderer/entity/EntityRenderer.h

@@ -12,8 +12,6 @@ class EntityRenderDispatcher;
 class Entity;
 class AABB;
 class Font;
-class Tile;
-class Level;
 
 class EntityRenderer
 {
@@ -26,11 +24,6 @@ public:
 	virtual void render(Entity* entity, float x, float y, float z, float rot, float a) = 0;
     static void render(const AABB& bb, float xo, float yo, float zo);
     static void renderFlat(const AABB& bb);
-	void renderShadow(Entity* e, float x, float y, float z, float pow, float a);
-	void renderTileShadow(Tile* tt, float x, float y, float z, int xt, int yt, int zt, float pow, float r, float xo, float yo, float zo);
-	void renderFlame(Entity* e, float x, float y, float z, float a);
-	void postRender(Entity* entity, float x, float y, float z, float rot, float a);
-	Level* getLevel();
 
 	Font* getFont();
 

src/client/renderer/entity/ItemRenderer.cpp

@@ -226,42 +226,7 @@ void ItemRenderer::renderGuiItem(Font* font, Textures* textures, const ItemInsta
 	t.draw();
 }
 
-
+void ItemRenderer::renderGuiItemDecorations(const ItemInstance* item, float x, float y) {
-void ItemRenderer::renderGuiItemDecorations(Font* font, Textures* textures, ItemInstance* item, int x, int y){ // this is normally unused in the header but i ported it from java beta - shredder
-	if (item != NULL) {
-		if (item->count > 1) {
-			char buf[16];
-			sprintf(buf, "%d", item->count);
-			std::string countStr = buf;
-			//			glDisable(GL_LIGHTING);
-			//			glDisable(GL_DEPTH_TEST);
-			font->drawShadow(countStr, x + 19 - 2 - font->width(countStr),
-				y + 6 + 3, 0xFFFFFF);
-			//			glEnable(GL_LIGHTING);
-			//			glEnable(GL_DEPTH_TEST);
-		}
-		if (item->isDamaged()) {
-			float p = std::floor(13.5f - (float) item->getDamageValue() * 13.0f / (float) item->getMaxDamage() + 0.5);
-		    int cc = (int) std::floor(255.5f - (float) item->getDamageValue() * 255.0f / (float) item->getMaxDamage() + 0.5);
-			//			glDisable(GL_LIGHTING);
-			//			glDisable(GL_DEPTH_TEST);
-			//			glDisable(GL_TEXTURE_2D);
-			//            auto var8 = ::net::minecraft::client::renderer::Tesselator::instance();
-			Tesselator& t = Tesselator::instance;
-			int ca = ((255 - cc)<< 16 | (cc << 8));
-			int cb = (((255 - cc) / 4) << 16 | 16128);
-			fillRect(t, x + 2, y + 13, 13, 2, 0);
-			fillRect(t, x + 2, y + 13, 12, 1, cb);
-			fillRect(t, x + 2, y + 13, p, 1, ca);
-			//			glEnable(GL_TEXTURE_2D);
-			//			glEnable(GL_LIGHTING);
-			//			glEnable(GL_DEPTH_TEST);
-			glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-		}
-	}
-}
-
-void ItemRenderer::renderGuiItemDecorations(const ItemInstance* item, float x, float y) { // nothing changed here this is the normal pocket edition one.
 	if (!item) return;
 	if (item->count > 0 && item->isDamaged()) {
 		float p = std::floor(13.5f - (float) item->getDamageValue() * 13.0f / (float) item->getMaxDamage());

src/client/renderer/entity/ItemRenderer.h

@@ -22,7 +22,7 @@ public:
     static void renderGuiItem(Font* font, Textures* textures, const ItemInstance* item, float x, float y, bool fancy);
 	static void renderGuiItem(Font* font, Textures* textures, const ItemInstance* item, float x, float y, float w, float h, bool fancy);
 	static void renderGuiItemCorrect(Font* font, Textures* textures, const ItemInstance* item, int x, int y);
-	static void renderGuiItemDecorations(Font* font, Textures* textures, ItemInstance* item, int x, int y);
+	//void renderGuiItemDecorations(Font* font, Textures* textures, ItemInstance* item, int x, int y);
 	static void renderGuiItemDecorations(const ItemInstance* item, float x, float y);
 
 	static void blit(float x, float y, float sx, float sy, float w, float h);

src/client/renderer/entity/MobRenderer.cpp

@@ -135,7 +135,7 @@ void MobRenderer::render(Entity* e, float x, float y, float z, float rot, float
 	//glEnable2(GL_DEPTH_TEST);
 
 	glPopMatrix2();
-	postRender(mob, x, y, z, rot, a);
+
 	renderName(mob, x, y, z);
 }
 

src/util/Color.cpp

@@ -1,98 +0,0 @@
-#include "Mth.h"
-
-#include "Color.h"
-#include <cassert>
-
-//Creates an opaque sRGB color with the specified red, green, and blue values in the range (0.0 - 1.0).
-//Alpha is defaulted to 1.0. The actual color used in rendering depends on finding the best match given the color space
-//available for a particular output device.
-//Parameters:
-//r - the red component
-//g - the green component
-//b - the blue component
-//Throws:
-//IllegalArgumentException - if r, g or b are outside of the range 0.0 to 1.0, inclusive
-Color::Color( float r, float g, float b)
-{
-	assert( r >= 0.0f && r <= 1.0f );
-	assert( g >= 0.0f && g <= 1.0f );
-	assert( b >= 0.0f && b <= 1.0f );
-
-	//argb
-	colour = ( (0xFF<<24) | ( (int)(r*255)<<16 ) | ( (int)(g*255)<<8 ) | ( (int)(b*255) ) );
-}
-
-Color::Color( int r, int g, int b)
-{
-	colour = ( (0xFF<<24) | ( (r&0xff)<<16 ) | ( (g&0xff)<<8 ) | ( (b&0xff) ) );
-}
-
-
-//Creates a Color object based on the specified values for the HSB color model.
-//The s and b components should be floating-point values between zero and one (numbers in the range 0.0-1.0).
-//The h component can be any floating-point number. The floor of this number is subtracted from it to create a fraction between 0 and 1.
-//This fractional number is then multiplied by 360 to produce the hue angle in the HSB color model.
-//
-//Parameters:
-//h - the hue component
-//s - the saturation of the color
-//b - the brightness of the color
-//Returns:
-//a Color object with the specified hue, saturation, and brightness.
-Color Color::getHSBColor(float hue, float saturation, float brightness)
-{
-	int r = 0, g = 0, b = 0;
-    if (saturation == 0)
-	{
-	    r = g = b = (int) (brightness * 255.0f + 0.5f);
-	}
-	else
-	{
-	    float h = (hue - (float)Mth::floor(hue)) * 6.0f;
-	    float f = h - (float)Mth::floor(h);
-	    float p = brightness * (1.0f - saturation);
-	    float q = brightness * (1.0f - saturation * f);
-	    float t = brightness * (1.0f - (saturation * (1.0f - f)));
-	    switch ((int) h)
-		{
-			case 0:
-				r = (int) (brightness * 255.0f + 0.5f);
-				g = (int) (t * 255.0f + 0.5f);
-				b = (int) (p * 255.0f + 0.5f);
-			break;
-			case 1:
-				r = (int) (q * 255.0f + 0.5f);
-				g = (int) (brightness * 255.0f + 0.5f);
-				b = (int) (p * 255.0f + 0.5f);
-			break;
-			case 2:
-				r = (int) (p * 255.0f + 0.5f);
-				g = (int) (brightness * 255.0f + 0.5f);
-				b = (int) (t * 255.0f + 0.5f);
-			break;
-			case 3:
-				r = (int) (p * 255.0f + 0.5f);
-				g = (int) (q * 255.0f + 0.5f);
-				b = (int) (brightness * 255.0f + 0.5f);
-			break;
-			case 4:
-				r = (int) (t * 255.0f + 0.5f);
-				g = (int) (p * 255.0f + 0.5f);
-				b = (int) (brightness * 255.0f + 0.5f);
-			break;
-			case 5:
-				r = (int) (brightness * 255.0f + 0.5f);
-				g = (int) (p * 255.0f + 0.5f);
-				b = (int) (q * 255.0f + 0.5f);
-			break;
-	    }
-	}
-
-
-	return Color( r, g, b );
-}
-
-int Color::getRGB()
-{
-	return colour;
-}

src/util/Color.h

@@ -1,15 +0,0 @@
-#pragma once
-
-class Color
-{
-private:
-	int colour;
-
-public:
-	//Creates an opaque sRGB color with the specified red, green, and blue values in the range (0.0 - 1.0).
-	Color( float r, float g, float b);
-	Color( int r, int g, int b);
-
-	static Color getHSBColor(float h, float s, float b);
-	int getRGB();
-};

src/world/entity/player/Inventory.cpp

@@ -245,7 +245,6 @@ void Inventory::setupDefault() {
 		addItem(new ItemInstance(Item::seeds_melon));
 		addItem(new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE));
 		addItem(new ItemInstance(Item::hoe_iron));
-		addItem(new ItemInstance(Item::flintAndSteel));
 #ifdef RPI
 		Sel[0] = addItem(new ItemInstance(Item::sword_iron));
 #else

src/world/level/Level.cpp

@@ -1176,20 +1176,10 @@ Vec3 Level::getSkyColor(Entity* source, float a) {
     if (br < 0.0f) br = 0.0f;
     if (br > 0.75f) br = 0.75f; //@note; was 1.0f
 
-	int xx = Mth::floor(source->x);
+//    int xx = Mth::floor(source->x);
-	int zz = Mth::floor(source->z);
+//    int zz = Mth::floor(source->z);
-	//    float temp = 0.5;//(float) getBiomeSource().getTemperature(xx, zz); // unused in normal pe too, just hardcoded temp values for some reason.
+//    float temp = 0.5;//(float) getBiomeSource().getTemperature(xx, zz);
-	float temp = (float) getBiomeSource()->getTemperature(xx, zz);
+    int skyColor = 0x3070ff;//getBiomeSource().getBiome(xx, zz).getSkyColor(temp);
-	int skyColor;
-	if (dimension->FogType == 1){ // 1 is java styled fog which should use temperatures!
-		skyColor = getBiomeSource()->getBiome(xx, zz)->getSkyColor(temp);
-	}
-	else { // otherwise default to the normal pocket edition skycolor
-
-		skyColor = 0x3070ff;
-	}
-
-	//    int skyColor = 0x3070ff;//getBiomeSource().getBiome(xx, zz).getSkyColor(temp); // This is the vanilla way, add it as OPTION_SKY - shredder
 
     float r = ((skyColor >> 16) & 0xff) / 255.0f;
     float g = ((skyColor >> 8) & 0xff) / 255.0f;

src/world/level/biome/Biome.cpp

@@ -8,8 +8,6 @@
 #include "../../entity/MobCategory.h"
 #include "../../level/tile/TallGrass.h"
 
-#include "../../../util/Color.h"
-
 Biome* Biome::rainForest	 = NULL;
 Biome* Biome::swampland		 = NULL;
 Biome* Biome::seasonalForest = NULL;
@@ -210,11 +208,11 @@ float Biome::adjustDepth( float depth )
 
 int Biome::getSkyColor( float temp )
 {
-	temp /= 3.f;
+//	temp /= 3.f;
-	if (temp < -1) temp = -1;
+//	if (temp < -1) temp = -1;
-	if (temp > 1) temp = 1;
+//	if (temp > 1) temp = 1;
-//	return 0x80808080;This is the vanilla way, add it as OPTION_SKY or leave it like this bcus this function literally never gets used anyways if level has vanilla sky color - shredder
+	return 0x80808080;
-	return Color::getHSBColor(224 / 360.0f - temp * 0.05f, 0.50f + temp * 0.1f, 1.0f).getRGB();
+	//return Color.getHSBColor(224 / 360.0f - temp * 0.05f, 0.50f + temp * 0.1f, 1.0f).getRGB();
 }
 
 Biome::MobList& Biome::getMobs(const MobCategory& category)

src/world/level/chunk/LevelChunk.cpp

@@ -262,14 +262,14 @@ void LevelChunk::recalcHeight(int x, int yStart, int z) {
 
 /*public*/
 void LevelChunk::skyBrightnessChanged() {
-	int x0 = xt;
+//	int x0 = xt;
-    int y0 = this->minHeight - 16;
+//    int y0 = this->minHeight - 16;
-    int z0 = zt;
+//    int z0 = zt;
-    int x1 = xt + 16;
+//    int x1 = xt + 16;
-    int y1 = Level::DEPTH - 1;
+//    int y1 = Level::DEPTH - 1;
-    int z1 = zt + 16;
+//    int z1 = zt + 16;
 
-    level->setTilesDirty(x0, y0, z0, x1, y1, z1);
+    //level->setTilesDirty(x0, y0, z0, x1, y1, z1);
 }
 
 /*public*/

src/world/level/dimension/Dimension.cpp

@@ -15,8 +15,7 @@ Dimension::Dimension()
 	ultraWarm(false),
 	hasCeiling(false),
 	biomeSource(NULL),
-	id(0),
+	id(0)
-	fogColor(0x80daff)
 {
 }
 
@@ -94,18 +93,6 @@ float* Dimension::getSunriseColor( float td, float a )
 
 Vec3 Dimension::getFogColor( float td, float a )
 {
-	if (FogType == 1)
-	{
-		fogColor = 0xc0d8ff; // 1 returns java beta styled fog color.
-	} 
-	else if (FogType == 2)
-	{
-		fogColor = 0x406fe5; // 2 returns some type of unused fog color IDK what this one was used for possibly early pe??
-	}
-	else // otherwise as default we return the mcpe fog color
-	{
-		fogColor = 0x80daff;
-	}
 	float br = Mth::cos(td * Mth::PI * 2) * 2 + 0.5f;
 	if (br < 0.0f) br = 0.0f;
 	if (br > 1.0f) br = 1.0f;
@@ -117,8 +104,7 @@ Vec3 Dimension::getFogColor( float td, float a )
 	g *= br * 0.94f + 0.06f;
 	b *= br * 0.91f + 0.09f;
 	return Vec3(r, g, b);
-	
+	//return Vec3(0.752941f, 0.847059f, 1);
-	 //
 }
 
 bool Dimension::mayRespawn()

src/world/level/dimension/Dimension.h

@@ -49,11 +49,8 @@ public:
 	bool hasCeiling;
 	float brightnessRamp[16];//Level::MAX_BRIGHTNESS + 1];
 	int id;
-
-	// shredder added
-	int FogType; // lets us choose between what fog we want ig
 protected:
-	long fogColor; //= 0x80daff;//0x406fe5;//0xc0d8ff;
+	static const long fogColor = 0x80daff;//0x406fe5;//0xc0d8ff;
 	float sunriseCol[4];
 };
 

src/world/level/dimension/NormalDayCycleDimension.h

@@ -9,7 +9,6 @@
 
 class NormalDayCycleDimension: public Dimension {
 public:
-
 	float getTimeOfDay(long time, float a) {
 		int dayStep = (int) (time % Level::TICKS_PER_DAY);
 		float td = (dayStep + a) / Level::TICKS_PER_DAY - 0.25f;
@@ -21,18 +20,6 @@ public:
 	}
 
 	Vec3 getFogColor( float td, float a ) {
-		if (FogType == 1)
-		{
-			fogColor = 0xc0d8ff; // 1 returns java beta styled fog color.
-		} 
-		else if (FogType == 2)
-		{
-			fogColor = 0x406fe5; // 2 returns some type of unused fog color IDK what this one was used for possibly early pe??
-		}
-		else // otherwise as default we return the mcpe fog color
-		{
-			fogColor = 0x80daff;
-		}
 		float br = cos(td * Mth::PI * 2) * 2 + 0.5f;
 		if (br < 0) br = 0;
 		if (br > 1.f) br = 1.f;