diff --git a/Minecraft.Client/UI/Screen.cpp b/Minecraft.Client/UI/Screen.cpp index c3260a893..d0d0a744c 100644 --- a/Minecraft.Client/UI/Screen.cpp +++ b/Minecraft.Client/UI/Screen.cpp @@ -174,7 +174,6 @@ void Screen::renderBackground(int vo) { } void Screen::renderDirtBackground(int vo) { - // 4J Unused - Iggy Flash UI renders the background on consoles #ifdef ENABLE_JAVA_GUIS glDisable(GL_LIGHTING); glDisable(GL_FOG); diff --git a/Minecraft.Client/UI/Screens/AbstractContainerScreen.cpp b/Minecraft.Client/UI/Screens/AbstractContainerScreen.cpp index bf608e7ee..a1723776e 100644 --- a/Minecraft.Client/UI/Screens/AbstractContainerScreen.cpp +++ b/Minecraft.Client/UI/Screens/AbstractContainerScreen.cpp @@ -240,7 +240,6 @@ void AbstractContainerScreen::render(int xm, int ym, float a) { void AbstractContainerScreen::renderLabels() {} void AbstractContainerScreen::renderSlot(Slot* slot) { - // 4J Unused #if ENABLE_JAVA_GUIS int x = slot->x; int y = slot->y; diff --git a/Minecraft.Client/UI/Screens/AchievementPopup.cpp b/Minecraft.Client/UI/Screens/AchievementPopup.cpp index f518da342..512533c81 100644 --- a/Minecraft.Client/UI/Screens/AchievementPopup.cpp +++ b/Minecraft.Client/UI/Screens/AchievementPopup.cpp @@ -66,7 +66,6 @@ void AchievementPopup::prepareWindow() { } void AchievementPopup::render() { -// 4J Unused #if ENABLE_JAVA_GUIS if (Minecraft::warezTime > 0) { glDisable(GL_DEPTH_TEST); diff --git a/Minecraft.Client/UI/Screens/AchievementScreen.cpp b/Minecraft.Client/UI/Screens/AchievementScreen.cpp index 1ef4a92bc..48ea264b4 100644 --- a/Minecraft.Client/UI/Screens/AchievementScreen.cpp +++ b/Minecraft.Client/UI/Screens/AchievementScreen.cpp @@ -136,7 +136,6 @@ void AchievementScreen::renderLabels() { } void AchievementScreen::renderBg(int xm, int ym, float a) { - // 4J Unused #if 0 int xScroll = Mth::floor(xScrollO + (xScrollP - xScrollO) * a); int yScroll = Mth::floor(yScrollO + (yScrollP - yScrollO) * a); diff --git a/Minecraft.Client/UI/Screens/ContainerScreen.cpp b/Minecraft.Client/UI/Screens/ContainerScreen.cpp index 4f34f524e..ad2513207 100644 --- a/Minecraft.Client/UI/Screens/ContainerScreen.cpp +++ b/Minecraft.Client/UI/Screens/ContainerScreen.cpp @@ -25,7 +25,6 @@ void ContainerScreen::renderLabels() { } void ContainerScreen::renderBg(float a) { - // 4J Unused #ifdef ENABLE_JAVA_GUIS int tex = minecraft->textures->loadTexture(TN_GUI_CONTAINER); glColor4f(1, 1, 1, 1); diff --git a/Minecraft.Client/UI/Screens/CraftingScreen.cpp b/Minecraft.Client/UI/Screens/CraftingScreen.cpp index 14b9aaae5..666c66878 100644 --- a/Minecraft.Client/UI/Screens/CraftingScreen.cpp +++ b/Minecraft.Client/UI/Screens/CraftingScreen.cpp @@ -27,7 +27,6 @@ void CraftingScreen::renderLabels() { } void CraftingScreen::renderBg(float a) { - // 4J Unused #ifdef ENABLE_JAVA_GUIS glColor4f(1, 1, 1, 1); minecraft->textures->bindTexture(&GUI_CRAFTING_LOCATION); diff --git a/Minecraft.Client/UI/Screens/EnchantmentScreen.cpp b/Minecraft.Client/UI/Screens/EnchantmentScreen.cpp index 23685b1cc..24d239382 100644 --- a/Minecraft.Client/UI/Screens/EnchantmentScreen.cpp +++ b/Minecraft.Client/UI/Screens/EnchantmentScreen.cpp @@ -125,7 +125,6 @@ void EnchantmentScreen::render(int xm, int ym, float a) { } void EnchantmentScreen::renderBg(float a) { - // 4J unused #ifdef ENABLE_JAVA_GUIS glColor4f(1.0f, 1.0f, 1.0f, 1.0f); Minecraft::GetInstance()->textures->bindTexture(&GUI_ENCHANT_LOCATION); diff --git a/Minecraft.Client/UI/Screens/FurnaceScreen.cpp b/Minecraft.Client/UI/Screens/FurnaceScreen.cpp index 04d0ca346..170aedb61 100644 --- a/Minecraft.Client/UI/Screens/FurnaceScreen.cpp +++ b/Minecraft.Client/UI/Screens/FurnaceScreen.cpp @@ -23,7 +23,6 @@ void FurnaceScreen::renderLabels() { } void FurnaceScreen::renderBg(float a) { - // 4J Unused #ifdef ENABLE_JAVA_GUIS glColor4f(1, 1, 1, 1); minecraft->textures->bindTexture(&GUI_FURNACE_LOCATION); diff --git a/Minecraft.Client/UI/Screens/HopperScreen.cpp b/Minecraft.Client/UI/Screens/HopperScreen.cpp index 2bab4945e..df3b3af9a 100644 --- a/Minecraft.Client/UI/Screens/HopperScreen.cpp +++ b/Minecraft.Client/UI/Screens/HopperScreen.cpp @@ -26,7 +26,6 @@ void HopperScreen::renderLabels() { } void HopperScreen::renderBg(float a) { - // 4J Unused #ifdef ENABLE_JAVA_GUIS glColor4f(1, 1, 1, 1); minecraft->textures->bindTexture(&GUI_HOPPER_LOCATION); diff --git a/Minecraft.Client/UI/Screens/HorseInventoryScreen.cpp b/Minecraft.Client/UI/Screens/HorseInventoryScreen.cpp index 1ce2e2fe1..f6de569c9 100644 --- a/Minecraft.Client/UI/Screens/HorseInventoryScreen.cpp +++ b/Minecraft.Client/UI/Screens/HorseInventoryScreen.cpp @@ -40,7 +40,6 @@ void HorseInventoryScreen::render(int xm, int ym, float a) { } void HorseInventoryScreen::renderBg(float a) { - // 4J Unused #ifdef ENABLE_JAVA_GUIS glColor4f(1, 1, 1, 1); minecraft->textures->bindTexture(&GUI_HORSE_LOCATION); diff --git a/Minecraft.Client/UI/Screens/InventoryScreen.cpp b/Minecraft.Client/UI/Screens/InventoryScreen.cpp index 67348db84..f4dccf4f6 100644 --- a/Minecraft.Client/UI/Screens/InventoryScreen.cpp +++ b/Minecraft.Client/UI/Screens/InventoryScreen.cpp @@ -32,7 +32,6 @@ void InventoryScreen::render(int xm, int ym, float a) { } void InventoryScreen::renderBg(float a) { - // 4J Unused #ifdef ENABLE_JAVA_GUIS int tex = minecraft->textures->loadTexture(TN_GUI_INVENTORY); glColor4f(1, 1, 1, 1); diff --git a/Minecraft.Client/UI/Screens/TitleScreen.cpp b/Minecraft.Client/UI/Screens/TitleScreen.cpp index 0f8212cb1..50b527600 100644 --- a/Minecraft.Client/UI/Screens/TitleScreen.cpp +++ b/Minecraft.Client/UI/Screens/TitleScreen.cpp @@ -365,7 +365,6 @@ void TitleScreen::rotateAndBlur(float a) { } void TitleScreen::render(int xm, int ym, float a) { - // 4J Unused - Iggy Flash UI renders the title screen on consoles #ifdef ENABLE_JAVA_GUIS // 4jcraft: panorama renderSkybox(a); diff --git a/Minecraft.Client/UI/Screens/TrapScreen.cpp b/Minecraft.Client/UI/Screens/TrapScreen.cpp index 7a1afb6bd..7936ec174 100644 --- a/Minecraft.Client/UI/Screens/TrapScreen.cpp +++ b/Minecraft.Client/UI/Screens/TrapScreen.cpp @@ -23,7 +23,6 @@ void TrapScreen::renderLabels() { } void TrapScreen::renderBg(float a) { - // 4J Unused #ifdef ENABLE_JAVA_GUIS glColor4f(1, 1, 1, 1); minecraft->textures->bindTexture(&GUI_TRAP_LOCATION);