format the whole repo (again)

2026-09-23 10:12:26 +00:00 · 2026-04-01 18:17:44 -05:00
parent 3d173c384d
commit f1118bf007
934 changed files with 21368 additions and 20452 deletions
@@ -3,9 +3,11 @@
 #include <GL/gl.h>
 #include <math.h>
 #include <string.h>
+
 #include <numbers>

 #include "MemoryTracker.h"
+#include "Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMath.h"
 #include "Minecraft.Client/include/stubs.h"
 #include "java/FloatBuffer.h"
 #include "minecraft/world/entity/LivingEntity.h"
@@ -16,7 +18,6 @@
 #include "minecraft/world/level/tile/LiquidTile.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMath.h"

 float Camera::xPlayerOffs = 0.0f;
 float Camera::yPlayerOffs = 0.0f;
@@ -2,34 +2,14 @@

 #include <assert.h>
 #include <stdlib.h>
-#include <chrono>
-#include <ctime>
-#include <thread>
+
 #include <algorithm>
+#include <chrono>
 #include <cmath>
 #include <cstdint>
+#include <ctime>
+#include <thread>

-#include "Options.h"
-#include "ProgressRenderer.h"
-#include "Timer.h"
-#include "User.h"
-#include "minecraft/client/gui/DeathScreen.h"
-#include "minecraft/client/gui/ErrorScreen.h"
-#include "minecraft/client/gui/Screen.h"
-#include "minecraft/client/gui/particle/GuiParticles.h"
-#include "minecraft/client/model/HumanoidModel.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/particle/ParticleEngine.h"
-#include "minecraft/client/renderer/Chunk.h"
-#include "minecraft/client/renderer/GameRenderer.h"
-#include "minecraft/client/renderer/LevelRenderer.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/client/title/TitleScreen.h"
-#include "minecraft/stats/StatsCounter.h"
 #include "4J.Common/4J_InputActions.h"
 #include "4J_Profile.h"
 #include "4J_Render.h"
@@ -46,24 +26,44 @@
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "Minecraft.Client/include/XboxStubs.h"
+#include "Options.h"
 #include "Pos.h"
+#include "ProgressRenderer.h"
 #include "SharedConstants.h"
-#include "minecraft/client/player/LocalPlayer.h"
-#include "minecraft/client/renderer/ItemInHandRenderer.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "minecraft/client/renderer/TileRenderer.h"
-#include "minecraft/client/resources/ResourceLocation.h"
-#include "minecraft/client/skins/TexturePack.h"
+#include "Timer.h"
+#include "User.h"
 #include "console_helpers/Definitions.h"
 #include "console_helpers/compression.h"
 #include "gl3_loader.h"
 #include "java/Class.h"
 #include "java/Random.h"
+#include "minecraft/client/gui/DeathScreen.h"
+#include "minecraft/client/gui/ErrorScreen.h"
+#include "minecraft/client/gui/Screen.h"
+#include "minecraft/client/gui/particle/GuiParticles.h"
+#include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/particle/ParticleEngine.h"
+#include "minecraft/client/player/LocalPlayer.h"
+#include "minecraft/client/renderer/Chunk.h"
+#include "minecraft/client/renderer/GameRenderer.h"
+#include "minecraft/client/renderer/ItemInHandRenderer.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/TileRenderer.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h"
+#include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/client/title/TitleScreen.h"
 #include "minecraft/network/packet/DisconnectPacket.h"
 #include "minecraft/network/packet/Packet.h"
 #include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/stats/Stats.h"
-#include "strings.h"
+#include "minecraft/stats/StatsCounter.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/ItemFrame.h"
 #include "minecraft/world/entity/Mob.h"
@@ -97,6 +97,7 @@
 #include "minecraft/world/level/tile/TallGrassPlantTile.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/HitResult.h"
+#include "strings.h"
 #if defined(ENABLE_JAVA_GUIS)
 #include "minecraft/client/gui/inventory/CreativeInventoryScreen.h"
 #endif
@@ -1,7 +1,8 @@
 #pragma once
 #include <stdint.h>
-#include <mutex>
+
 #include <memory>
+#include <mutex>
 #include <string>
 #include <vector>

@@ -7,8 +7,8 @@
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Gui.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/gui/Screen.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"

 const std::wstring ChatScreen::allowedChars =
    SharedConstants::acceptableLetters;
@@ -3,9 +3,9 @@
 #include <vector>

 #include "SmallButton.h"
-#include "minecraft/locale/Language.h"
 #include "minecraft/client/gui/Button.h"
 #include "minecraft/client/gui/Screen.h"
+#include "minecraft/locale/Language.h"

 ConfirmScreen::ConfirmScreen(Screen* parent, const std::wstring& title1,
                             const std::wstring& title2, int id) {
@@ -5,9 +5,9 @@
 #include "SmallButton.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Options.h"
-#include "minecraft/locale/Language.h"
 #include "minecraft/client/gui/Button.h"
 #include "minecraft/client/gui/Screen.h"
+#include "minecraft/locale/Language.h"

 ControlsScreen::ControlsScreen(Screen* lastScreen, Options* options) {
    // 4J - added initialisers
@@ -2,6 +2,7 @@

 #include <stddef.h>
 #include <stdint.h>
+
 #include <string>
 #include <vector>

@@ -21,11 +22,11 @@
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Options.h"
+#include "minecraft/client/gui/Screen.h"
 #include "minecraft/locale/Language.h"
 #include "minecraft/server/MinecraftServer.h"
 #include "minecraft/world/level/LevelSettings.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
-#include "minecraft/client/gui/Screen.h"

 CreateWorldScreen::CreateWorldScreen(Screen* lastScreen) {
    done = false;  // 4J added
@@ -9,8 +9,8 @@
 #include "PauseScreen.h"
 #include "console_helpers/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/gui/Screen.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"

 void DeathScreen::init() {
    buttons.clear();
@@ -1,6 +1,7 @@
 #include "Font.h"

 #include <string.h>
+
 #include <utility>
 #include <vector>

@@ -4,28 +4,6 @@

 #include "4J.Common/4J_Compat.h"
 #include "4J_Input.h"
-#include "Minecraft.Client/include/stdafx.h"
-#include "java/JavaMath.h"
-#include "java/System.h"
-#include "minecraft/client/ClientConstants.h"
-#include "minecraft/client/Lighting.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/Options.h"
-#include "minecraft/client/gui/Font.h"
-#include "minecraft/client/gui/ScreenSizeCalculator.h"
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/entity/EnderDragonRenderer.h"
-#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "minecraft/net.minecraft.h"
-#include "minecraft/world/food/net.minecraft.world.food.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/level/biome/Biome.h"
-#include "minecraft/world/level/dimension/Dimension.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/net.minecraft.world.h"
 #include "4J_Render.h"
 #include "Facing.h"
 #include "Minecraft.Client/Common/App_enums.h"
@@ -33,29 +11,51 @@
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "Minecraft.Client/include/XboxStubs.h"
-#include "minecraft/client/GuiMessage.h"
-#include "minecraft/client/gui/Screen.h"
-#include "minecraft/client/gui/ChatScreen.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "minecraft/client/resources/ResourceLocation.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "console_helpers/StringHelpers.h"
 #include "gl3_loader.h"
+#include "java/JavaMath.h"
 #include "java/Random.h"
-#include "strings.h"
+#include "java/System.h"
+#include "minecraft/client/ClientConstants.h"
+#include "minecraft/client/GuiMessage.h"
+#include "minecraft/client/Lighting.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/gui/ChatScreen.h"
+#include "minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/Screen.h"
+#include "minecraft/client/gui/ScreenSizeCalculator.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/renderer/GameRenderer.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/entity/EnderDragonRenderer.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
+#include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/net.minecraft.h"
+#include "minecraft/util/Mth.h"
 #include "minecraft/world/Icon.h"
 #include "minecraft/world/effect/MobEffect.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
+#include "minecraft/world/food/net.minecraft.world.food.h"
 #include "minecraft/world/item/ItemInstance.h"
-#include "minecraft/world/level/tile/PortalTile.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
-#include "minecraft/world/level/tile/Tile.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
+#include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/storage/LevelData.h"
-#include "minecraft/util/Mth.h"
-#include "minecraft/client/renderer/GameRenderer.h"
-#include "console_helpers/StringHelpers.h"
+#include "minecraft/world/level/tile/PortalTile.h"
+#include "minecraft/world/level/tile/Tile.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/net.minecraft.world.h"
+#include "strings.h"

 ResourceLocation Gui::PUMPKIN_BLUR_LOCATION =
    ResourceLocation(TN__BLUR__MISC_PUMPKINBLUR);
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <cstddef>
 #include <memory>
 #include <string>
@@ -8,9 +8,9 @@
 #include "Minecraft.Client/include/stubs.h"
 #include "console_helpers/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/ChatScreen.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/locale/Language.h"
-#include "minecraft/client/gui/ChatScreen.h"

 void InBedChatScreen::init() {
    Keyboard::enableRepeatEvents(true);
@@ -8,8 +8,8 @@
 #include "console_helpers/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Options.h"
-#include "minecraft/locale/Language.h"
 #include "minecraft/client/gui/Screen.h"
+#include "minecraft/locale/Language.h"

 JoinMultiplayerScreen::JoinMultiplayerScreen(Screen* lastScreen) {
    ipEdit = nullptr;
@@ -2,8 +2,9 @@

 #include <GL/gl.h>
 #include <math.h>
-#include <wchar.h>
 #include <string.h>
+#include <wchar.h>
+
 #include <string>

 #include "4J_Render.h"
@@ -8,9 +8,9 @@
 #include "VideoSettingsScreen.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Options.h"
-#include "minecraft/locale/Language.h"
 #include "minecraft/client/gui/Button.h"
 #include "minecraft/client/gui/Screen.h"
+#include "minecraft/locale/Language.h"

 OptionsScreen::OptionsScreen(Screen* lastScreen, Options* options) {
    title = L"Options";  // 4J added
@@ -1,6 +1,7 @@
 #include "PauseScreen.h"

 #include <math.h>
+
 #include <memory>
 #include <numbers>
 #include <string>
@@ -14,10 +15,10 @@
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "OptionsScreen.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Screen.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/locale/I18n.h"
 #include "minecraft/server/MinecraftServer.h"
-#include "minecraft/client/gui/Screen.h"

 PauseScreen::PauseScreen() {
    saveStep = 0;
@@ -7,9 +7,9 @@
 #include "Minecraft.Client/include/stubs.h"
 #include "console_helpers/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Screen.h"
 #include "minecraft/locale/Language.h"
 #include "minecraft/world/level/storage/LevelStorageSource.h"
-#include "minecraft/client/gui/Screen.h"

 RenameWorldScreen::RenameWorldScreen(Screen* lastScreen,
                                     const std::wstring& levelId) {
@@ -1,8 +1,8 @@
 #include "Screen.h"

 #include "4J.Common/4J_InputActions.h"
-#include "4J_Profile.h"
 #include "4J_Input.h"
+#include "4J_Profile.h"
 #include "Button.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <format>
 #include <vector>

@@ -2,6 +2,7 @@

 #include <stdint.h>
 #include <wchar.h>
+
 #include <vector>

 #include "Button.h"
@@ -12,11 +13,11 @@
 #include "RenameWorldScreen.h"
 #include "console_helpers/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Screen.h"
+#include "minecraft/client/gui/ScrolledSelectionList.h"
 #include "minecraft/locale/Language.h"
 #include "minecraft/world/level/storage/LevelStorageSource.h"
 #include "minecraft/world/level/storage/LevelSummary.h"
-#include "minecraft/client/gui/Screen.h"
-#include "minecraft/client/gui/ScrolledSelectionList.h"

 SelectWorldScreen::SelectWorldScreen(Screen* lastScreen) {
    // 4J - added initialisers
@@ -6,7 +6,6 @@
 #include "minecraft/client/gui/Button.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/resources/ResourceLocation.h"
-#include "minecraft/client/gui/Button.h"

 // 4jcraft: referenced from MCP 8.11 (JE 1.6.4)
 #ifdef ENABLE_JAVA_GUIS
@@ -6,9 +6,9 @@
 #include "SmallButton.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Options.h"
-#include "minecraft/locale/Language.h"
 #include "minecraft/client/gui/Button.h"
 #include "minecraft/client/gui/Screen.h"
+#include "minecraft/locale/Language.h"

 // 4jcraft
 #define ITEM_COUNT 10
@@ -1,6 +1,7 @@
 #include "AchievementScreen.h"

 #include <GL/gl.h>
+
 #include <string>
 #include <vector>

@@ -3,8 +3,8 @@
 #include <string>

 #include "BeaconScreen.h"
-#include "minecraft/locale/Language.h"
 #include "minecraft/client/gui/inventory/AbstractBeaconButton.h"
+#include "minecraft/locale/Language.h"

 // 4jcraft: referenced from MCP 8.11 (JE 1.6.4)
 #ifdef ENABLE_JAVA_GUIS
@@ -3,8 +3,8 @@
 #include <string>

 #include "BeaconScreen.h"
-#include "minecraft/locale/Language.h"
 #include "minecraft/client/gui/inventory/AbstractBeaconButton.h"
+#include "minecraft/locale/Language.h"

 // 4jcraft: referenced from MCP 8.11 (JE 1.6.4)
 #ifdef ENABLE_JAVA_GUIS
@@ -4,8 +4,8 @@

 #include "BeaconScreen.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/world/effect/MobEffect.h"
 #include "minecraft/client/gui/inventory/AbstractBeaconButton.h"
+#include "minecraft/world/effect/MobEffect.h"

 // 4jcraft: referenced from MCP 8.11 (JE 1.6.4)
 #ifdef ENABLE_JAVA_GUIS
@@ -1,6 +1,7 @@
 #include "BeaconScreen.h"

 #include <GL/gl.h>
+
 #include <memory>
 #include <string>
 #include <vector>
@@ -14,6 +15,8 @@
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Button.h"
 #include "minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/inventory/AbstractBeaconButton.h"
+#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 #include "minecraft/client/multiplayer/ClientConnection.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/renderer/entity/ItemRenderer.h"
@@ -24,8 +27,6 @@
 #include "minecraft/world/inventory/BeaconMenu.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/tile/entity/BeaconTileEntity.h"
-#include "minecraft/client/gui/inventory/AbstractBeaconButton.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"

 // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing
 // container classes (and iggy too)
@@ -4,10 +4,10 @@
 #include <string>

 #include "minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/inventory/BrewingStandMenu.h"
 #include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"

 // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing
 // container classes
@@ -1,8 +1,8 @@
 #include "ContainerScreen.h"

+#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/inventory/ContainerMenu.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"

 ContainerScreen::ContainerScreen(std::shared_ptr<Container> inventory,
                                 std::shared_ptr<Container> container)
@@ -4,12 +4,12 @@

 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/locale/Language.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "minecraft/world/inventory/CraftingMenu.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"

 class Player;

@@ -1,6 +1,7 @@
 #include "CreativeInventoryScreen.h"

 #include <GL/gl.h>
+
 #include <algorithm>
 #include <string>

@@ -10,22 +11,22 @@
 #include "AbstractContainerScreen.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/stubs.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Screen.h"
+#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 #include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/renderer/entity/ItemRenderer.h"
 #include "minecraft/world/SimpleContainer.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
+#include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "minecraft/world/inventory/InventoryMenu.h"
 #include "minecraft/world/inventory/Slot.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
-#include "minecraft/world/inventory/AbstractContainerMenu.h"
-#include "Minecraft.Client/include/stubs.h"

 // Static member initialization
 int CreativeInventoryScreen::selectedTabIndex =
@@ -3,10 +3,10 @@
 #include <string>

 #include "minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/inventory/FurnaceMenu.h"
 #include "minecraft/world/level/tile/entity/FurnaceTileEntity.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"

 #ifdef ENABLE_JAVA_GUIS
 ResourceLocation GUI_FURNACE_LOCATION = ResourceLocation(TN_GUI_FURNACE);
@@ -7,14 +7,12 @@
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Font.h"
 #include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
+#include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
 #include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/inventory/HorseInventoryMenu.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
-
-#include "minecraft/client/renderer/Textures.h"

 class EntityHorse;

@@ -8,6 +8,7 @@
 #include "minecraft/client/Lighting.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Button.h"
+#include "minecraft/client/gui/Font.h"
 #include "minecraft/client/gui/achievement/AchievementScreen.h"
 #include "minecraft/client/gui/achievement/StatsScreen.h"
 #include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
@@ -17,8 +18,6 @@
 #include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/entity/player/Player.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
-#include "minecraft/client/gui/Font.h"

 InventoryScreen::InventoryScreen(std::shared_ptr<Player> player)
    : AbstractContainerScreen(player->inventoryMenu) {
@@ -1,6 +1,7 @@
 #include "RepairScreen.h"

 #include <GL/gl.h>
+
 #include <memory>
 #include <string>

@@ -16,10 +17,10 @@
 #include "minecraft/locale/Language.h"
 #include "minecraft/network/packet/CustomPayloadPacket.h"
 #include "minecraft/world/entity/player/Abilities.h"
+#include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "minecraft/world/inventory/AnvilMenu.h"
 #include "minecraft/world/inventory/Slot.h"
 #include "minecraft/world/item/ItemInstance.h"
-#include "minecraft/world/inventory/AbstractContainerMenu.h"

 class Inventory;
 class Level;
@@ -3,10 +3,10 @@
 #include <string>

 #include "minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/inventory/TrapMenu.h"
 #include "minecraft/world/level/tile/entity/DispenserTileEntity.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"

 #ifdef ENABLE_JAVA_GUIS
 ResourceLocation GUI_TRAP_LOCATION = ResourceLocation(TN_GUI_TRAP);
@@ -1,10 +1,10 @@
 #include "DemoLevel.h"

+#include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSettings.h"
 #include "minecraft/world/level/LevelType.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
 #include "minecraft/world/level/storage/LevelData.h"
-#include "minecraft/world/level/Level.h"

 class LevelStorage;

@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <memory>
 #include <string>

@@ -1,7 +1,7 @@
 #include "CowModel.h"

-#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/model/QuadrupedModel.h"
+#include "minecraft/client/model/geom/ModelPart.h"

 CowModel::CowModel() : QuadrupedModel(12, 0) {
    head = new ModelPart(this, 0, 0);
@@ -2,8 +2,8 @@

 #include <memory>

-#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/model/geom/ModelPart.h"

 EndermanModel::EndermanModel() : HumanoidModel(0, -14, 64, 32) {
    carrying = false;
@@ -1,7 +1,7 @@
 #include "PigModel.h"

-#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/model/QuadrupedModel.h"
+#include "minecraft/client/model/geom/ModelPart.h"

 PigModel::PigModel() : QuadrupedModel(6, 0) {
    head->texOffs(16, 16)->addBox(-2.0f, 0.0f, -9.0f, 4, 3, 1, 0.0f);
@@ -2,10 +2,10 @@

 #include <memory>

+#include "minecraft/client/model/QuadrupedModel.h"
 #include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/animal/Sheep.h"
-#include "minecraft/client/model/QuadrupedModel.h"

 SheepFurModel::SheepFurModel() : QuadrupedModel(12, 0) {
    headXRot = 0.0f;
@@ -2,10 +2,10 @@

 #include <memory>

+#include "minecraft/client/model/QuadrupedModel.h"
 #include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/animal/Sheep.h"
-#include "minecraft/client/model/QuadrupedModel.h"

 SheepModel::SheepModel() : QuadrupedModel(12, 0) {
    headXRot = 0.0f;
@@ -2,10 +2,10 @@

 #include <memory>

+#include "minecraft/client/model/ZombieModel.h"
 #include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/monster/Skeleton.h"
-#include "minecraft/client/model/ZombieModel.h"

 void SkeletonModel::_init(float g) {
    arm0 = new ModelPart(this, 24 + 16, 16);
@@ -1,11 +1,12 @@
 #include "VillagerZombieModel.h"

 #include <math.h>
+
 #include <memory>
 #include <numbers>

-#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/model/geom/ModelPart.h"

 void VillagerZombieModel::_init(float g, float yOffset, bool isArmor) {
    delete head;
@@ -5,8 +5,8 @@
 #include <numbers>

 #include "minecraft/client/model/geom/ModelPart.h"
-#include "minecraft/world/entity/boss/wither/WitherBoss.h"
 #include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/boss/wither/WitherBoss.h"

 WitherBossModel::WitherBossModel() {
    texWidth = 64;
@@ -1,11 +1,12 @@
 #include "ZombieModel.h"

 #include <math.h>
+
 #include <memory>
 #include <numbers>

-#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/model/geom/ModelPart.h"

 ZombieModel::ZombieModel() : HumanoidModel(0, 0, 64, 32) {}

@@ -1,17 +1,18 @@
 #include "DragonModel.h"

 #include <math.h>
+
 #include <memory>
 #include <numbers>
 #include <string>
 #include <vector>

-#include "minecraft/world/entity/boss/enderdragon/EnderDragon.h"
 #include "4J_Render.h"
+#include "gl3_loader.h"
 #include "minecraft/client/model/geom/Model.h"
 #include "minecraft/client/model/geom/ModelPart.h"
-#include "gl3_loader.h"
 #include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/boss/enderdragon/EnderDragon.h"

 DragonModel::DragonModel(float g) : Model() {
    // 4J-PB
@@ -1,14 +1,15 @@
 #include "ModelPart.h"

 #include <GL/gl.h>
+
 #include <numbers>

 #include "4J_Render.h"
 #include "Cube.h"
 #include "TexOffs.h"
 #include "minecraft/client/MemoryTracker.h"
-#include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/renderer/Tesselator.h"

 const float ModelPart::RAD = (180.0f / std::numbers::pi);

@@ -3,63 +3,61 @@
 #include <assert.h>
 #include <stdio.h>
 #include <wchar.h>
-#include <limits>
+
 #include <cmath>
 #include <cstdint>
 #include <format>
+#include <limits>
 #include <unordered_set>

-#include "4J_Input.h"
-#include "Minecraft.Client/Common/src/ConsoleGameMode.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "Minecraft.Client/Common/src/Network/Socket.h"
-#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
-#include "MultiPlayerLevel.h"
-#include "ReceivingLevelScreen.h"
-#include "console_helpers/PlatformTime.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/Pos.h"
-#include "minecraft/SharedConstants.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/ProgressRenderer.h"
-#include "minecraft/client/User.h"
-#include "minecraft/client/gui/Gui.h"
-#include "minecraft/client/particle/CritParticle.h"
-#include "minecraft/client/particle/TakeAnimationParticle.h"
-#include "minecraft/client/player/RemotePlayer.h"
-#include "minecraft/client/renderer/LevelRenderer.h"
-#include "minecraft/client/skins/DLCTexturePack.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/sounds/SoundTypes.h"
-#include "minecraft/world/phys/AABB.h"
 #include "4J.Common/4J_Compat.h"
+#include "4J_Input.h"
 #include "4J_Profile.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/App_structs.h"
+#include "Minecraft.Client/Common/src/ConsoleGameMode.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
+#include "Minecraft.Client/Common/src/Network/Socket.h"
+#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/particle/ParticleEngine.h"
-#include "minecraft/client/player/LocalPlayer.h"
-#include "minecraft/core/particles/ParticleTypes.h"
+#include "MultiPlayerLevel.h"
+#include "ReceivingLevelScreen.h"
+#include "console_helpers/PlatformTime.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/Class.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/Random.h"
+#include "minecraft/Pos.h"
+#include "minecraft/SharedConstants.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/ProgressRenderer.h"
+#include "minecraft/client/User.h"
+#include "minecraft/client/gui/Gui.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/particle/CritParticle.h"
+#include "minecraft/client/particle/ParticleEngine.h"
+#include "minecraft/client/particle/TakeAnimationParticle.h"
+#include "minecraft/client/player/LocalPlayer.h"
+#include "minecraft/client/player/RemotePlayer.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/client/skins/DLCTexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/network/packet/AddEntityPacket.h"
 #include "minecraft/network/packet/AddExperienceOrbPacket.h"
 #include "minecraft/network/packet/AddGlobalEntityPacket.h"
@@ -127,8 +125,9 @@
 #include "minecraft/network/packet/UpdateMobEffectPacket.h"
 #include "minecraft/network/packet/UpdateProgressPacket.h"
 #include "minecraft/network/packet/XZPacket.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/stats/GenericStats.h"
-#include "strings.h"
 #include "minecraft/world/SimpleContainer.h"
 #include "minecraft/world/effect/MobEffectInstance.h"
 #include "minecraft/world/entity/EntityIO.h"
@@ -200,6 +199,8 @@
 #include "minecraft/world/level/tile/entity/SignTileEntity.h"
 #include "minecraft/world/level/tile/entity/SkullTileEntity.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "minecraft/world/phys/AABB.h"
+#include "strings.h"

 class Packet;
 class TexturePack;
@@ -1,12 +1,13 @@
 #pragma once
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <vector>

 #include "4J_Storage.h"
-#include "minecraft/network/net.minecraft.network.h"
 #include "minecraft/network/Connection.h"
+#include "minecraft/network/net.minecraft.network.h"
 #include "minecraft/network/packet/DisconnectPacket.h"
 #include "minecraft/network/packet/PacketListener.h"
 #include "minecraft/world/entity/Entity.h"
@@ -12,13 +12,13 @@
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelType.h"
 #include "minecraft/world/level/LightLayer.h"
+#include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/chunk/EmptyLevelChunk.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
 #include "minecraft/world/level/chunk/WaterLevelChunk.h"
 #include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/world/level/biome/Biome.h"

 MultiPlayerChunkCache::MultiPlayerChunkCache(Level* level) {
    XZSIZE = level->dimension->getXZSize();  // 4J Added
@@ -7,6 +7,7 @@
 #include "MultiPlayerLevel.h"
 #include "java/Class.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/network/packet/ContainerButtonClickPacket.h"
 #include "minecraft/network/packet/ContainerClickPacket.h"
 #include "minecraft/network/packet/CraftItemPacket.h"
@@ -21,6 +22,7 @@
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "minecraft/world/item/Item.h"
+#include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/TileItem.h"
 #include "minecraft/world/item/WeaponItem.h"
 #include "minecraft/world/level/Level.h"
@@ -28,8 +30,6 @@
 #include "minecraft/world/level/tile/LevelEvent.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/world/item/ItemInstance.h"

 MultiPlayerGameMode::MultiPlayerGameMode(Minecraft* minecraft,
                                         ClientConnection* connection) {
@@ -1,6 +1,7 @@
 #include "MultiPlayerLevel.h"

 #include <float.h>
+
 #include <algorithm>
 #include <cmath>
 #include <compare>
@@ -25,8 +26,10 @@
 #include "minecraft/client/particle/ParticleEngine.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/network/packet/DisconnectPacket.h"
+#include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/ChunkPos.h"
 #include "minecraft/world/level/GameRules.h"
+#include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
 #include "minecraft/world/level/dimension/Dimension.h"
@@ -35,8 +38,6 @@
 #include "minecraft/world/level/storage/SavedDataStorage.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/level/Level.h"

 class LevelSettings;
 class Scoreboard;
@@ -1,6 +1,7 @@
 #pragma once

 #include <stdint.h>
+
 #include <memory>
 #include <unordered_map>
 #include <unordered_set>
@@ -1,6 +1,7 @@
 #include "MultiPlayerLocalPlayer.h"

 #include <wchar.h>
+
 #include <cmath>

 #include "ClientConnection.h"
@@ -28,11 +29,11 @@
 #include "minecraft/world/effect/MobEffectInstance.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Inventory.h"
+#include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/phys/AABB.h"
-#include "minecraft/world/entity/player/Player.h"

 class User;
 class ItemEntity;
@@ -1,12 +1,12 @@
 #include "BreakingItemParticle.h"

 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/particle/Particle.h"
+#include "minecraft/client/particle/ParticleEngine.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/world/Icon.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/client/particle/Particle.h"
-#include "minecraft/client/particle/ParticleEngine.h"

 class Level;
 class Textures;
@@ -4,9 +4,9 @@

 #include "java/JavaMath.h"
 #include "java/Random.h"
+#include "minecraft/client/particle/Particle.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
-#include "minecraft/client/particle/Particle.h"

 BubbleParticle::BubbleParticle(Level* level, double x, double y, double z,
                               double xa, double ya, double za)
@@ -1,12 +1,12 @@
 #include "CritParticle.h"

 #include "java/Random.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/level/Level.h"
-#include "minecraft/world/phys/AABB.h"
 #include "minecraft/client/particle/Particle.h"
 #include "minecraft/client/particle/ParticleEngine.h"
 #include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/level/Level.h"
+#include "minecraft/world/phys/AABB.h"

 void CritParticle::_init(Level* level, std::shared_ptr<Entity> entity,
                         ePARTICLE_TYPE type) {
@@ -6,11 +6,11 @@
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "java/JavaMath.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/particle/Particle.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/LiquidTile.h"
-#include "minecraft/client/particle/Particle.h"

 DripParticle::DripParticle(Level* level, double x, double y, double z,
                           Material* material)
@@ -1,6 +1,7 @@
 #include "FireworksParticles.h"

 #include <math.h>
+
 #include <memory>
 #include <numbers>
 #include <vector>
@@ -8,6 +9,8 @@
 #include "java/Random.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/particle/Particle.h"
+#include "minecraft/client/particle/ParticleEngine.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/entity/LivingEntity.h"
@@ -16,8 +19,6 @@
 #include "nbt/CompoundTag.h"
 #include "nbt/ListTag.h"
 #include "nbt/Tag.h"
-#include "minecraft/client/particle/Particle.h"
-#include "minecraft/client/particle/ParticleEngine.h"

 FireworksParticles::FireworksStarter::FireworksStarter(
    Level* level, double x, double y, double z, double xd, double yd, double zd,
@@ -1,15 +1,16 @@
 #include "FootstepParticle.h"

 #include <GL/gl.h>
+
 #include <cmath>

 #include "4J_Render.h"
+#include "minecraft/client/particle/Particle.h"
+#include "minecraft/client/particle/ParticleEngine.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/level/Level.h"
-#include "minecraft/client/particle/Particle.h"
-#include "minecraft/client/particle/ParticleEngine.h"

 ResourceLocation FootstepParticle::FOOTPRINT_LOCATION =
    ResourceLocation(TN_MISC_FOOTSTEP);
@@ -8,11 +8,11 @@
 #include "java/Random.h"
 #include "minecraft/client/Lighting.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/particle/Particle.h"
+#include "minecraft/client/particle/ParticleEngine.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/resources/ResourceLocation.h"
-#include "minecraft/client/particle/Particle.h"
-#include "minecraft/client/particle/ParticleEngine.h"

 class Level;

@@ -2,10 +2,10 @@

 #include "java/Random.h"
 #include "minecraft/client/Minecraft.h"
-#include "minecraft/core/particles/ParticleTypes.h"
-#include "minecraft/world/level/Level.h"
 #include "minecraft/client/particle/Particle.h"
 #include "minecraft/client/particle/ParticleEngine.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/world/level/Level.h"

 HugeExplosionSeedParticle::HugeExplosionSeedParticle(Level* level, double x,
                                                     double y, double z,
@@ -2,9 +2,9 @@

 #include "java/JavaMath.h"
 #include "java/Random.h"
+#include "minecraft/client/particle/Particle.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/level/Level.h"
-#include "minecraft/client/particle/Particle.h"

 LavaParticle::LavaParticle(Level* level, double x, double y, double z)
    : Particle(level, x, y, z, 0, 0, 0) {
@@ -1,6 +1,7 @@
 #include "Particle.h"

 #include <stdio.h>
+
 #include <cmath>

 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
@@ -8,9 +9,9 @@
 #include "java/Random.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/particle/ParticleEngine.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/world/Icon.h"
-#include "minecraft/client/particle/ParticleEngine.h"
 #include "minecraft/world/entity/Entity.h"

 class Level;
@@ -3,10 +3,10 @@
 #include <memory>

 #include "java/JavaMath.h"
+#include "minecraft/client/particle/Particle.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/phys/AABB.h"
-#include "minecraft/client/particle/Particle.h"

 PlayerCloudParticle::PlayerCloudParticle(Level* level, double x, double y,
                                         double z, double xa, double ya,
@@ -7,9 +7,9 @@
 #include "java/JavaMath.h"
 #include "java/Random.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/particle/Particle.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
-#include "minecraft/client/particle/Particle.h"

 SuspendedParticle::SuspendedParticle(Level* level, double x, double y, double z,
                                     double xa, double ya, double za)
@@ -1,15 +1,16 @@
 #include "TakeAnimationParticle.h"

 #include <GL/gl.h>
+
 #include <cmath>

 #include "4J_Render.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/particle/Particle.h"
+#include "minecraft/client/particle/ParticleEngine.h"
 #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/Level.h"
-#include "minecraft/client/particle/Particle.h"
-#include "minecraft/client/particle/ParticleEngine.h"

 TakeAnimationParticle::TakeAnimationParticle(Level* level,
                                             std::shared_ptr<Entity> item,
@@ -1,13 +1,13 @@
 #include "TerrainParticle.h"

 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/particle/Particle.h"
+#include "minecraft/client/particle/ParticleEngine.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/world/Icon.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/GrassTile.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/client/particle/Particle.h"
-#include "minecraft/client/particle/ParticleEngine.h"

 class Textures;

@@ -4,10 +4,10 @@

 #include "java/JavaMath.h"
 #include "java/Random.h"
+#include "minecraft/client/particle/Particle.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/LiquidTile.h"
-#include "minecraft/client/particle/Particle.h"

 WaterDropParticle::WaterDropParticle(Level* level, double x, double y, double z)
    : Particle(level, x, y, z, 0, 0, 0) {
@@ -1,10 +1,11 @@
 #include "LocalPlayer.h"

 #include <stdio.h>
+
+#include <cmath>
 #include <iostream>
 #include <memory>
 #include <numbers>
-#include <cmath>

 #include "Input.h"
 #include "java/Random.h"
@@ -24,9 +25,10 @@
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/tile/Tile.h"
 // 4J Stu - Added for tutorial callbacks
-#include "4J_Render.h"
+#include "4J.Common/4J_InputActions.h"
 #include "4J_Input.h"
 #include "4J_Profile.h"
+#include "4J_Render.h"
 #include "Minecraft.Client/Common/App_structs.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
@@ -36,6 +38,8 @@
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "PlatformTypes.h"
+#include "Pos.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Gui.h"
@@ -53,12 +57,14 @@
 #include "minecraft/client/gui/inventory/TextEditScreen.h"
 #include "minecraft/client/gui/inventory/TrapScreen.h"
 #include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/commands/CommandsEnum.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/stats/Achievement.h"
 #include "minecraft/stats/CommonStats.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/stats/Stat.h"
+#include "minecraft/util/SmoothFloat.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/effect/MobEffect.h"
 #include "minecraft/world/effect/MobEffectInstance.h"
@@ -66,6 +72,7 @@
 #include "minecraft/world/entity/monster/SharedMonsterAttributes.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Inventory.h"
+#include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/food/FoodConstants.h"
 #include "minecraft/world/food/FoodData.h"
 #include "minecraft/world/item/BowItem.h"
@@ -77,12 +84,6 @@
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/HitResult.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "4J.Common/4J_InputActions.h"
-#include "PlatformTypes.h"
-#include "Pos.h"
-#include "minecraft/commands/CommandsEnum.h"
-#include "minecraft/util/SmoothFloat.h"
-#include "minecraft/world/entity/player/Player.h"

 LocalPlayer::LocalPlayer(Minecraft* minecraft, Level* level, User* user,
                         int dimension)
@@ -1,15 +1,15 @@
 #include "RemotePlayer.h"

+#include <cmath>
 #include <memory>
 #include <vector>
-#include <cmath>

 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Pos.h"
 #include "minecraft/world/entity/player/Inventory.h"
+#include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
-#include "Pos.h"
-#include "minecraft/world/entity/player/Player.h"

 class Level;

@@ -2,6 +2,7 @@

 #include <GL/gl.h>
 #include <string.h>
+
 #include <mutex>
 #include <unordered_map>
 #include <unordered_set>
@@ -13,6 +14,7 @@
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "Minecraft.Client/include/FrameProfiler.h"
 #include "TileRenderer.h"
+#include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/culling/Culler.h"
 #include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h"
 #include "minecraft/world/entity/Entity.h"
@@ -22,7 +24,6 @@
 #include "minecraft/world/level/chunk/LevelChunk.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
-#include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/world/phys/AABB.h"

 int Chunk::updates = 0;
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <mutex>
@@ -1,13 +1,14 @@
 #include "GameRenderer.h"

 #include <float.h>
+
 #include <algorithm>
 #include <cmath>
 #include <numbers>

 #include "4J.Common/4J_Compat.h"
-#include "4J_Render.h"
 #include "4J_Input.h"
+#include "4J_Render.h"
 #include "BossMobGuiInfo.h"
 #include "Chunk.h"
 #include "ItemInHandRenderer.h"
@@ -22,6 +23,7 @@
 #include "Minecraft.Client/include/stubs.h"
 #include "Tesselator.h"
 #include "console_helpers/compression.h"
+#include "gl3_loader.h"
 #include "java/Class.h"
 #include "java/FloatBuffer.h"
 #include "java/JavaMath.h"
@@ -46,6 +48,7 @@
 #include "minecraft/client/particle/SmokeParticle.h"
 #include "minecraft/client/particle/WaterDropParticle.h"
 #include "minecraft/client/player/LocalPlayer.h"
+#include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/culling/Culler.h"
 #include "minecraft/client/renderer/culling/Frustum.h"
 #include "minecraft/client/renderer/culling/FrustumCuller.h"
@@ -78,8 +81,6 @@
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/HitResult.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "gl3_loader.h"
 #include "minecraft/world/phys/Vec3.h"

 bool GameRenderer::anaglyph3d = false;
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <mutex>
@@ -1,6 +1,7 @@
 #include "ItemInHandRenderer.h"

 #include <GL/gl.h>
+
 #include <cmath>
 #include <numbers>
 #include <vector>
@@ -4,6 +4,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
+
 #include <algorithm>
 #include <array>
 #include <cmath>
@@ -13,8 +14,8 @@
 #include <utility>

 #include "4J.Common/4J_Compat.h"
-#include "4J_Render.h"
 #include "4J_Input.h"
+#include "4J_Render.h"
 #include "Chunk.h"
 #include "GameRenderer.h"
 #include "Minecraft.Client/Common/App_enums.h"
@@ -67,6 +68,8 @@
 #include "minecraft/client/particle/SuspendedTownParticle.h"
 #include "minecraft/client/particle/TerrainParticle.h"
 #include "minecraft/client/player/LocalPlayer.h"
+#include "minecraft/client/renderer/OffsettedRenderList.h"
+#include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/TileRenderer.h"
 #include "minecraft/client/renderer/culling/Culler.h"
 #include "minecraft/client/renderer/culling/Frustum.h"
@@ -91,6 +94,7 @@
 #include "minecraft/world/item/PotionItem.h"
 #include "minecraft/world/item/RecordingItem.h"
 #include "minecraft/world/level/BlockDestructionProgress.h"
+#include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
 #include "minecraft/world/level/dimension/Dimension.h"
@@ -100,12 +104,9 @@
 #include "minecraft/world/level/tile/LevelEvent.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/HitResult.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "minecraft/client/renderer/OffsettedRenderList.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/world/level/Level.h"
-#include "minecraft/world/phys/AABB.h"

 class Icon;
 class ItemInstance;
@@ -23,6 +23,7 @@ class ResourceLocation;
 #endif
 #include <stddef.h>
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <mutex>
@@ -1,6 +1,7 @@
 #include "Tesselator.h"

 #include <GL/gl.h>
+
 #include <vector>

 #include "4J_Render.h"
@@ -1,6 +1,7 @@
 #pragma once

 #include <float.h>
+
 #include <cstdint>
 #include <format>
 #include <vector>
@@ -1,11 +1,13 @@
 #include "Textures.h"

 #include <assert.h>
+
 #include <cstdint>
 #include <cstring>
 #include <string>
 #include <utility>

+#include "4J_Render.h"
 #include "HttpTexture.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/include/BufferedImage.h"
@@ -13,6 +15,7 @@
 #include "Minecraft.Client/include/MemTextureProcessor.h"
 #include "Minecraft.Client/include/MobSkinMemTextureProcessor.h"
 #include "console_helpers/StringHelpers.h"
+#include "gl3_loader.h"
 #include "java/Buffer.h"
 #include "java/ByteBuffer.h"
 #include "minecraft/client/MemoryTracker.h"
@@ -27,8 +30,6 @@
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/item/ItemEntity.h"
 #include "minecraft/world/item/ItemInstance.h"
-#include "4J_Render.h"
-#include "gl3_loader.h"

 // Linux/PC port: disable mipmapping globally so textures are always sampled
 // from the full-resolution level 0 with GL_NEAREST, giving pixel-crisp
@@ -4,6 +4,7 @@
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
+
 #include <array>
 #include <cmath>
 #include <numbers>
@@ -19,6 +20,7 @@
 #include "minecraft/Facing.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/renderer/Textures.h"
 #include "minecraft/world/Icon.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
@@ -63,7 +65,6 @@
 #include "minecraft/world/level/tile/piston/PistonBaseTile.h"
 #include "minecraft/world/level/tile/piston/PistonExtensionTile.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "minecraft/client/renderer/Textures.h"

 bool TileRenderer::fancy = true;

@@ -1,8 +1,8 @@
 #include "FrustumCuller.h"

-#include "minecraft/world/phys/AABB.h"
 #include "minecraft/client/renderer/culling/Frustum.h"
 #include "minecraft/client/renderer/culling/FrustumData.h"
+#include "minecraft/world/phys/AABB.h"

 FrustumCuller::FrustumCuller() { frustum = Frustum::getFrustum(); }

@@ -1,15 +1,16 @@
 #include "ArrowRenderer.h"

 #include <math.h>
+
 #include <memory>

 #include "4J_Render.h"
+#include "gl3_loader.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/projectile/Arrow.h"
-#include "gl3_loader.h"

 ResourceLocation ArrowRenderer::ARROW_LOCATION =
    ResourceLocation(TN_ITEM_ARROWS);
@@ -7,10 +7,10 @@
 #include "minecraft/client/model/BatModel.h"
 #include "minecraft/client/model/geom/Model.h"
 #include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/ambient/Bat.h"
-#include "minecraft/client/renderer/entity/MobRenderer.h"

 ResourceLocation BatRenderer::BAT_LOCATION = ResourceLocation(TN_MOB_BAT);

@@ -4,10 +4,10 @@

 #include "minecraft/client/model/BlazeModel.h"
 #include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/monster/Blaze.h"
-#include "minecraft/client/renderer/entity/MobRenderer.h"

 ResourceLocation BlazeRenderer::BLAZE_LOCATION = ResourceLocation(TN_MOB_BLAZE);

@@ -1,16 +1,17 @@
 #include "BoatRenderer.h"

 #include <math.h>
+
 #include <memory>

 #include "4J_Render.h"
 #include "minecraft/client/model/BoatModel.h"
 #include "minecraft/client/model/geom/Model.h"
 #include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/entity/EntityRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/item/Boat.h"
-#include "minecraft/client/renderer/entity/EntityRenderer.h"

 ResourceLocation BoatRenderer::BOAT_LOCATION = ResourceLocation(TN_ITEM_BOAT);

@@ -4,8 +4,8 @@

 #include "4J_Render.h"
 #include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/client/renderer/entity/SpiderRenderer.h"
+#include "minecraft/client/resources/ResourceLocation.h"

 ResourceLocation CaveSpiderRenderer::CAVE_SPIDER_LOCATION =
    ResourceLocation(TN_MOB_CAVE_SPIDER);
@@ -1,13 +1,14 @@
 #include "ChickenRenderer.h"

 #include <math.h>
+
 #include <memory>

 #include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/animal/Chicken.h"
-#include "minecraft/client/renderer/entity/MobRenderer.h"

 class Model;

@@ -3,8 +3,8 @@
 #include <memory>

 #include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
+#include "minecraft/client/resources/ResourceLocation.h"

 class Model;

@@ -1,16 +1,17 @@
 #include "CreeperRenderer.h"

 #include <math.h>
+
 #include <memory>

 #include "4J_Render.h"
+#include "gl3_loader.h"
 #include "minecraft/client/model/CreeperModel.h"
 #include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/monster/Creeper.h"
-#include "minecraft/client/renderer/entity/MobRenderer.h"
-#include "gl3_loader.h"

 ResourceLocation CreeperRenderer::POWER_LOCATION =
    ResourceLocation(TN_POWERED_CREEPER);
@@ -3,8 +3,8 @@
 #include <cmath>
 #include <memory>

-#include "minecraft/client/model/dragon/EnderCrystalModel.h"
 #include "4J_Render.h"
+#include "minecraft/client/model/dragon/EnderCrystalModel.h"
 #include "minecraft/client/model/geom/Model.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/resources/ResourceLocation.h"
@@ -5,18 +5,18 @@
 #include <numbers>
 #include <vector>

-#include "minecraft/client/Lighting.h"
-#include "minecraft/client/model/dragon/DragonModel.h"
-#include "minecraft/client/renderer/BossMobGuiInfo.h"
-#include "minecraft/client/renderer/Tesselator.h"
 #include "4J_Render.h"
 #include "SharedConstants.h"
+#include "gl3_loader.h"
+#include "java/Random.h"
+#include "minecraft/client/Lighting.h"
+#include "minecraft/client/model/dragon/DragonModel.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/renderer/BossMobGuiInfo.h"
+#include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
-#include "gl3_loader.h"
-#include "java/Random.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/boss/enderdragon/EnderCrystal.h"
@@ -3,18 +3,18 @@
 #include <memory>

 #include "4J_Render.h"
+#include "gl3_loader.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/model/EndermanModel.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/TileRenderer.h"
+#include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/renderer/texture/TextureAtlas.h"
 #include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/monster/EnderMan.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/client/renderer/entity/MobRenderer.h"
-#include "gl3_loader.h"

 ResourceLocation EndermanRenderer::ENDERMAN_EYES_LOCATION =
    ResourceLocation(TN_MOB_ENDERMAN_EYES);
@@ -1,9 +1,11 @@
 #include "EntityRenderDispatcher.h"

 #include <assert.h>
+
 #include <cmath>
 #include <utility>

+#include "4J_Render.h"
 #include "ArrowRenderer.h"
 #include "BatRenderer.h"
 #include "BlazeRenderer.h"
@@ -32,12 +34,14 @@
 #include "LightningBoltRenderer.h"
 #include "MinecartRenderer.h"
 #include "MinecartSpawnerRenderer.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
 #include "MobRenderer.h"
 #include "MushroomCowRenderer.h"
 #include "OcelotRenderer.h"
 #include "PaintingRenderer.h"
 #include "PigRenderer.h"
 #include "PlayerRenderer.h"
+#include "SharedConstants.h"
 #include "SheepRenderer.h"
 #include "SilverfishRenderer.h"
 #include "SkeletonRenderer.h"
@@ -54,6 +58,7 @@
 #include "WitherSkullRenderer.h"
 #include "WolfRenderer.h"
 #include "ZombieRenderer.h"
+#include "gl3_loader.h"
 #include "minecraft/client/model/ChickenModel.h"
 #include "minecraft/client/model/CowModel.h"
 #include "minecraft/client/model/HumanoidModel.h"
@@ -65,12 +70,8 @@
 #include "minecraft/client/model/SlimeModel.h"
 #include "minecraft/client/model/SquidModel.h"
 #include "minecraft/client/model/WolfModel.h"
-#include "4J_Render.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
-#include "SharedConstants.h"
 #include "minecraft/client/model/ZombieModel.h"
 #include "minecraft/client/renderer/Tesselator.h"
-#include "gl3_loader.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/player/Player.h"
@@ -3,9 +3,9 @@
 #include <unordered_map>

 #include "EntityRenderer.h"
+#include "java/Class.h"
 #include "java/JavaIntHash.h"
 #include "minecraft/world/entity/Entity.h"
-#include "java/Class.h"

 class font;
 class Entity;
@@ -4,6 +4,7 @@

 #include "4J_Render.h"
 #include "EntityRenderDispatcher.h"
+#include "gl3_loader.h"
 #include "java/Class.h"
 #include "minecraft/client/Options.h"
 #include "minecraft/client/renderer/Tesselator.h"
@@ -19,7 +20,6 @@
 #include "minecraft/world/level/tile/FireTile.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
-#include "gl3_loader.h"

 ResourceLocation EntityRenderer::SHADOW_LOCATION =
    ResourceLocation(TN__CLAMP__MISC_SHADOW);
@@ -1,18 +1,19 @@
 #include "ExperienceOrbRenderer.h"

 #include <math.h>
+
 #include <memory>
 #include <numbers>

 #include "4J_Render.h"
 #include "EntityRenderDispatcher.h"
+#include "gl3_loader.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/ExperienceOrb.h"
-#include "gl3_loader.h"

 ResourceLocation ExperienceOrbRenderer::XP_ORB_LOCATION =
    ResourceLocation(TN_ITEM_EXPERIENCE_ORB);
--- a/Show More
+++ b/Show More