LegacyConsoleArchive/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-09-23 10:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: fold 4J.Common into platform types, eliminate last 4J directory

Browse Source
This commit is contained in:
MatthewBeshay
2026-04-02 16:27:06 +11:00
parent 11f9bd6046
commit 26222f26e0
124 changed files with 197 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/minecraft/client/Minecraft.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#include <ctime>
#include <thread>
#include "4J.Common/4J_InputActions.h"
#include "platform/InputActions.h"
#include "platform/sdl2/Profile.h"
#include "platform/sdl2/Render.h"
#include "platform/sdl2/Storage.h"
targets/minecraft/client/Minecraft.h
+1 -1
View File
@@ -6,7 +6,7 @@
#include <string>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "console_helpers/C4JThread.h"
#include "java/File.h"
#include "minecraft/client/resources/ResourceLocation.h"
targets/minecraft/client/gui/Gui.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include <cmath>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "platform/sdl2/Input.h"
#include "platform/sdl2/Render.h"
#include "Facing.h"
targets/minecraft/client/gui/Gui.h
+1 -1
View File
@@ -6,7 +6,7 @@
#include <string>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "GuiComponent.h"
#include "minecraft/client/GuiMessage.h"
#include "minecraft/client/renderer/entity/ItemRenderer.h"
targets/minecraft/client/gui/Screen.cpp
+1 -1
View File
@@ -1,6 +1,6 @@
#include "Screen.h"
#include "4J.Common/4J_InputActions.h"
#include "platform/InputActions.h"
#include "platform/sdl2/Input.h"
#include "platform/sdl2/Profile.h"
#include "Button.h"
targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include <algorithm>
#include <string>
#include "4J.Common/4J_InputActions.h"
#include "platform/InputActions.h"
#include "platform/sdl2/Input.h"
#include "platform/sdl2/Render.h"
#include "AbstractContainerScreen.h"
targets/minecraft/client/multiplayer/ClientConnection.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#include <limits>
#include <unordered_set>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "platform/sdl2/Input.h"
#include "platform/sdl2/Profile.h"
#include "app/common/App_enums.h"
targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include <string>
#include <utility>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "platform/sdl2/Input.h"
#include "ClientConnection.h"
#include "app/common/src/Audio/SoundEngine.h"
targets/minecraft/client/player/Input.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include <cmath>
#include "4J.Common/4J_InputActions.h"
#include "platform/InputActions.h"
#include "platform/sdl2/Input.h"
#include "LocalPlayer.h"
#include "app/common/App_enums.h"
targets/minecraft/client/player/LocalPlayer.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
#include "minecraft/world/item/Item.h"
#include "minecraft/world/level/tile/Tile.h"
// 4J Stu - Added for tutorial callbacks
#include "4J.Common/4J_InputActions.h"
#include "platform/InputActions.h"
#include "platform/sdl2/Input.h"
#include "platform/sdl2/Profile.h"
#include "platform/sdl2/Render.h"
targets/minecraft/client/renderer/GameRenderer.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include <cmath>
#include <numbers>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "platform/sdl2/Input.h"
#include "platform/sdl2/Render.h"
#include "BossMobGuiInfo.h"
targets/minecraft/client/renderer/LevelRenderer.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include <ranges>
#include <utility>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "platform/sdl2/Input.h"
#include "platform/sdl2/Render.h"
#include "Chunk.h"
targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include <string>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "java/JavaMath.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include <string>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "java/JavaMath.h"
#include "minecraft/Pos.h"
#include "minecraft/client/Minecraft.h"
targets/minecraft/client/skins/DLCTexturePack.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include <cstdint>
#include <string>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "AbstractTexturePack.h"
#include "app/common/src/Localisation/StringTable.h"
targets/minecraft/commands/Command.h
+1 -1
View File
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "CommandsEnum.h"
#include "minecraft/network/packet/ChatPacket.h"
targets/minecraft/commands/common/EnchantItemCommand.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include <string>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "java/InputOutputStream/ByteArrayInputStream.h"
#include "java/InputOutputStream/ByteArrayOutputStream.h"
#include "java/InputOutputStream/DataInputStream.h"
targets/minecraft/commands/common/GiveItemCommand.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "java/InputOutputStream/ByteArrayInputStream.h"
#include "java/InputOutputStream/ByteArrayOutputStream.h"
#include "java/InputOutputStream/DataInputStream.h"
targets/minecraft/network/packet/AddPlayerPacket.h
+1 -1
View File
@@ -6,7 +6,7 @@
#include <string>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "Packet.h"
#include "minecraft/network/packet/Packet.h"
#include "minecraft/world/entity/SyncedEntityData.h"
targets/minecraft/network/packet/LoginPacket.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include <memory>
#include <string>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "Packet.h"
#include "minecraft/network/packet/Packet.h"
targets/minecraft/network/packet/PreLoginPacket.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include <memory>
#include <string>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "Packet.h"
#include "minecraft/network/packet/Packet.h"
targets/minecraft/server/MinecraftServer.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#include <thread>
#include <utility>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "platform/sdl2/Profile.h"
#include "platform/sdl2/Storage.h"
#include "ConsoleInput.h"
targets/minecraft/server/PlayerList.h
+1 -1
View File
@@ -8,7 +8,7 @@
#include <unordered_map>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "nbt/CompoundTag.h"
class ServerPlayer;
targets/minecraft/server/commands/TeleportCommand.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include <memory>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "minecraft/commands/Command.h"
#include "minecraft/commands/CommandsEnum.h"
#include "minecraft/network/packet/GameCommandPacket.h"
targets/minecraft/server/level/TrackedEntity.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "EntityTracker.h"
#include "app/common/src/Network/NetworkPlayerInterface.h"
#include "app/linux/Linux_App.h"
targets/minecraft/server/network/PendingConnection.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include <cstdint>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "platform/sdl2/Storage.h"
#include "app/common/App_enums.h"
#include "app/common/src/BuildVer/BuildVer.h"
targets/minecraft/server/network/PlayerConnection.h
+1 -1
View File
@@ -7,7 +7,7 @@
#include <unordered_map>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "java/JavaIntHash.h"
#include "minecraft/network/packet/DisconnectPacket.h"
#include "minecraft/network/packet/PacketListener.h"
targets/minecraft/world/entity/player/Player.h
+1 -1
View File
@@ -6,7 +6,7 @@
#include <string>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "Abilities.h"
#include "console_helpers/Definitions.h"
#include "java/Class.h"
targets/minecraft/world/item/ClockItem.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include <string>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "Item.h"
class Icon;
targets/minecraft/world/item/CompassItem.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include <string>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "Item.h"
class Icon;
targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include <algorithm>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "minecraft/world/entity/animal/Sheep.h"
#include "minecraft/world/inventory/CraftingContainer.h"
#include "minecraft/world/item/ArmorItem.h"
targets/minecraft/world/item/crafting/Recipy.h
+1 -1
View File
@@ -5,7 +5,7 @@
#pragma once
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "minecraft/world/inventory/CraftingContainer.h"
#define RECIPE_TYPE_2x2 0
targets/minecraft/world/item/crafting/ShapedRecipy.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include <string.h>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "app/linux/Linux_App.h"
#include "Recipes.h"
#include "minecraft/world/inventory/CraftingContainer.h"
targets/minecraft/world/item/crafting/ShapelessRecipy.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
#include <memory>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "Recipes.h"
#include "minecraft/world/inventory/CraftingContainer.h"
#include "minecraft/world/item/ItemInstance.h"
targets/minecraft/world/level/Level.h
+1 -1
View File
@@ -10,7 +10,7 @@
#include <unordered_set>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "ChunkPos.h"
#include "LevelSource.h"
#include "LightLayer.h"
targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
#include <format>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "app/common/App_enums.h"
#include "app/common/src/BuildVer/BuildVer.h"
#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include <thread>
#include <utility>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "app/common/App_enums.h"
#include "app/common/src/BuildVer/BuildVer.h"
#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
targets/minecraft/world/level/storage/DirectoryLevelStorage.h
+1 -1
View File
@@ -31,7 +31,7 @@
#include <unordered_map>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "LevelStorage.h"
#include "PlayerIO.h"
#include "java/File.h"
targets/minecraft/world/level/storage/LevelStorage.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include <string>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
class PlayerIO;
targets/minecraft/world/level/storage/SavedDataStorage.h
+1 -1
View File
@@ -6,7 +6,7 @@
#include <unordered_map>
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "platform/PlatformTypes.h"
#include "minecraft/world/level/saveddata/SavedData.h"
class ConsoleSaveFile;