diff --git a/dependencies/symbol-processor/src b/dependencies/symbol-processor/src index 00b223a6ad..63ad20456c 160000 --- a/dependencies/symbol-processor/src +++ b/dependencies/symbol-processor/src @@ -1 +1 @@ -Subproject commit 00b223a6adb8808b34f49371b6f2f30c182f147a +Subproject commit 63ad20456c858068fb2762359695021a76fad851 diff --git a/symbols/CMakeLists.txt b/symbols/CMakeLists.txt index d90eae6a41..1bd28753ea 100644 --- a/symbols/CMakeLists.txt +++ b/symbols/CMakeLists.txt @@ -2,132 +2,132 @@ project(symbols) # Definition Files set(SRC - src/LeafTile.def - src/ServerPlayer.def - src/Tile.def - src/Material.def - src/RakNetInstance.def - src/LiquidTile.def - src/LoginPacket.def - src/ChestTileEntity.def - src/InBedScreen.def - src/LevelSource.def - src/TallGrass.def - src/Player.def - src/ImageButton.def - src/Strings.def - src/ExternalFileLevelStorageSource.def - src/TileEntity.def - src/ItemRenderer.def - src/ModelPart.def - src/Biome.def - src/SimpleChooseLevelScreen.def - src/PauseScreen.def - src/Tesselator.def - src/AABB.def - src/AppPlatform.def - src/Minecraft.def - src/OptionsFile.def - src/EntityRenderer.def - src/RakNet_RakString_SharedString.def - src/ChunkSource.def - src/Vec3.def - src/NetEventCallback.def - src/PathfinderMob.def - src/Level.def - src/RakNet_RakString.def - src/StemTile.def - src/LevelRenderer.def - src/FillingContainer.def - src/HumanoidModel.def - src/TripodCameraRenderer.def - src/FurnaceScreen.def - src/HitResult.def - src/Container.def - src/PerfRenderer.def - src/ParticleEngine.def - src/PlayerRenderer.def - src/GameMode.def - src/Font.def - src/RemotePlayer.def - src/EntityRenderDispatcher.def - src/Texture.def - src/MobRenderer.def - src/LargeFeature.def - src/ContainerMenu.def - src/Textures.def - src/FurnaceTileEntity.def - src/TileRenderer.def - src/GrassTile.def - src/WorkbenchScreen.def - src/Packet.def - src/RandomLevelSource.def - src/SelectWorldScreen.def - src/AuxDataTileItem.def - src/OptionButton.def - src/Touch_IngameBlockSelectionScreen.def - src/OptionsPane.def - src/HeavyTile.def - src/Options.def - src/AppPlatform_linux.def - src/StartGamePacket.def - src/IBuildInput.def - src/ItemInstance.def - src/SoundEngine.def - src/GuiComponent.def - src/NinecraftApp.def - src/Mob.def - src/MouseBuildInput.def - src/FurnaceRecipes.def - src/Recipes.def - src/Button.def - src/ChatPacket.def - src/LevelData.def - src/ServerSideNetworkHandler.def - src/LargeCaveFeature.def - src/Screen.def - src/CreatorMode.def - src/HumanoidMobRenderer.def - src/OptionsScreen.def - src/Gui.def - src/Recipes_Type.def - src/Inventory.def - src/Common.def - src/CommandServer.def - src/RakNet_SystemAddress.def - src/LevelSettings.def - src/ServerLevel.def - src/Item.def - src/extra.h - src/Entity.def - src/RakNet_RakNetGUID.def - src/RakNet_RakPeer.def - src/Config.def - src/ConnectedClient.def - src/Mouse.def - src/GameRenderer.def - src/SurvivalMode.def - src/AppPlatform_readAssetFile_return_value.def - src/TextEditScreen.def - src/StartMenuScreen.def - src/ProgressScreen.def - src/LocalPlayer.def - src/Touch_SelectWorldScreen.def - src/TileItem.def - src/Tile_SoundType.def - src/Options_Option.def - src/LevelStorageSource.def - src/SignTileEntity.def - src/AgableMob.def - src/PrimedTnt.def - src/ItemEntity.def - src/Arrow.def - src/OffsetPosTranslator.def - src/EntityFactory.def - src/MobFactory.def - src/Animal.def - src/Sheep.def - src/PingedCompatibleServer.def + src/game/options/Options_Option.def + src/game/options/OptionsFile.def + src/game/options/Options.def + src/game/Minecraft.def + src/game/mode/GameMode.def + src/game/mode/CreatorMode.def + src/game/mode/SurvivalMode.def + src/game/NinecraftApp.def + src/game/GameRenderer.def + src/network/RakNetInstance.def + src/network/PingedCompatibleServer.def + src/network/NetEventCallback.def + src/network/raknet/RakNet_RakString_SharedString.def + src/network/raknet/RakNet_RakString.def + src/network/raknet/RakNet_SystemAddress.def + src/network/raknet/extra.h + src/network/raknet/RakNet_RakNetGUID.def + src/network/raknet/RakNet_RakPeer.def + src/network/ServerSideNetworkHandler.def + src/network/packet/LoginPacket.def + src/network/packet/Packet.def + src/network/packet/StartGamePacket.def + src/network/packet/ChatPacket.def + src/entity/EntityFactory.def + src/entity/PrimedTnt.def + src/entity/EntityRenderer.def + src/entity/Sheep.def + src/entity/PathfinderMob.def + src/entity/HumanoidModel.def + src/entity/TripodCameraRenderer.def + src/entity/MobFactory.def + src/entity/EntityRenderDispatcher.def + src/entity/MobRenderer.def + src/entity/AgableMob.def + src/entity/Animal.def + src/entity/Mob.def + src/entity/player/ServerPlayer.def + src/entity/player/Player.def + src/entity/player/PlayerRenderer.def + src/entity/player/RemotePlayer.def + src/entity/player/LocalPlayer.def + src/entity/HumanoidMobRenderer.def + src/entity/Entity.def + src/entity/ItemEntity.def + src/entity/Arrow.def + src/level/container/FillingContainer.def + src/level/container/Container.def + src/level/container/ContainerMenu.def + src/level/container/Inventory.def + src/level/feature/LargeFeature.def + src/level/feature/LargeCaveFeature.def + src/level/Material.def + src/level/LevelSource.def + src/level/ExternalFileLevelStorageSource.def + src/level/Biome.def + src/level/ChunkSource.def + src/level/Level.def + src/level/LevelRenderer.def + src/level/LevelStorageSource.def + src/level/ParticleEngine.def + src/level/RandomLevelSource.def + src/level/LevelData.def + src/level/LevelSettings.def + src/level/ServerLevel.def + src/item/ItemRenderer.def + src/item/AuxDataTileItem.def + src/item/ItemInstance.def + src/item/Item.def + src/item/TileItem.def + src/api/OffsetPosTranslator.def + src/api/CommandServer.def + src/api/ConnectedClient.def + src/gui/screens/InBedScreen.def + src/gui/screens/SimpleChooseLevelScreen.def + src/gui/screens/PauseScreen.def + src/gui/screens/FurnaceScreen.def + src/gui/screens/WorkbenchScreen.def + src/gui/screens/SelectWorldScreen.def + src/gui/screens/Touch_IngameBlockSelectionScreen.def + src/gui/screens/Screen.def + src/gui/screens/OptionsScreen.def + src/gui/screens/TextEditScreen.def + src/gui/screens/StartMenuScreen.def + src/gui/screens/ProgressScreen.def + src/gui/screens/Touch_SelectWorldScreen.def + src/gui/Font.def + src/gui/components/ImageButton.def + src/gui/components/OptionButton.def + src/gui/components/OptionsPane.def + src/gui/components/GuiComponent.def + src/gui/components/Button.def + src/gui/components/Gui.def + src/app-platform/AppPlatform.def + src/app-platform/AppPlatform_linux.def + src/app-platform/AppPlatform_readAssetFile_return_value.def + src/tile/LeafTile.def + src/tile/Tile.def + src/tile/LiquidTile.def + src/tile/TallGrass.def + src/tile/entity/ChestTileEntity.def + src/tile/entity/TileEntity.def + src/tile/entity/FurnaceTileEntity.def + src/tile/entity/SignTileEntity.def + src/tile/StemTile.def + src/tile/Tile_SoundType.def + src/tile/TileRenderer.def + src/tile/GrassTile.def + src/tile/HeavyTile.def + src/misc/Strings.def + src/misc/ModelPart.def + src/misc/Tesselator.def + src/misc/AABB.def + src/misc/Vec3.def + src/misc/HitResult.def + src/misc/PerfRenderer.def + src/misc/Texture.def + src/misc/Textures.def + src/misc/SoundEngine.def + src/misc/Common.def + src/misc/Config.def + src/input/IBuildInput.def + src/input/MouseBuildInput.def + src/input/Mouse.def + src/recipes/FurnaceRecipes.def + src/recipes/Recipes.def + src/recipes/Recipes_Type.def ) # Resolve Definition Files set(RESOLVED_SRC "") diff --git a/symbols/src/Container.def b/symbols/src/Container.def deleted file mode 100644 index 50e7db81aa..0000000000 --- a/symbols/src/Container.def +++ /dev/null @@ -1,2 +0,0 @@ -virtual-method void startOpen() = 0x24; -virtual-method void stopOpen() = 0x28; diff --git a/symbols/src/TripodCameraRenderer.def b/symbols/src/TripodCameraRenderer.def deleted file mode 100644 index 1463265e42..0000000000 --- a/symbols/src/TripodCameraRenderer.def +++ /dev/null @@ -1,3 +0,0 @@ -size 0x178; - -constructor () = 0x6583c; \ No newline at end of file diff --git a/symbols/src/CommandServer.def b/symbols/src/api/CommandServer.def similarity index 100% rename from symbols/src/CommandServer.def rename to symbols/src/api/CommandServer.def diff --git a/symbols/src/ConnectedClient.def b/symbols/src/api/ConnectedClient.def similarity index 100% rename from symbols/src/ConnectedClient.def rename to symbols/src/api/ConnectedClient.def diff --git a/symbols/src/OffsetPosTranslator.def b/symbols/src/api/OffsetPosTranslator.def similarity index 100% rename from symbols/src/OffsetPosTranslator.def rename to symbols/src/api/OffsetPosTranslator.def diff --git a/symbols/src/AppPlatform.def b/symbols/src/app-platform/AppPlatform.def similarity index 100% rename from symbols/src/AppPlatform.def rename to symbols/src/app-platform/AppPlatform.def diff --git a/symbols/src/AppPlatform_linux.def b/symbols/src/app-platform/AppPlatform_linux.def similarity index 100% rename from symbols/src/AppPlatform_linux.def rename to symbols/src/app-platform/AppPlatform_linux.def diff --git a/symbols/src/AppPlatform_readAssetFile_return_value.def b/symbols/src/app-platform/AppPlatform_readAssetFile_return_value.def similarity index 100% rename from symbols/src/AppPlatform_readAssetFile_return_value.def rename to symbols/src/app-platform/AppPlatform_readAssetFile_return_value.def diff --git a/symbols/src/AgableMob.def b/symbols/src/entity/AgableMob.def similarity index 100% rename from symbols/src/AgableMob.def rename to symbols/src/entity/AgableMob.def diff --git a/symbols/src/Animal.def b/symbols/src/entity/Animal.def similarity index 100% rename from symbols/src/Animal.def rename to symbols/src/entity/Animal.def diff --git a/symbols/src/Arrow.def b/symbols/src/entity/Arrow.def similarity index 100% rename from symbols/src/Arrow.def rename to symbols/src/entity/Arrow.def diff --git a/symbols/src/Entity.def b/symbols/src/entity/Entity.def similarity index 100% rename from symbols/src/Entity.def rename to symbols/src/entity/Entity.def diff --git a/symbols/src/EntityFactory.def b/symbols/src/entity/EntityFactory.def similarity index 100% rename from symbols/src/EntityFactory.def rename to symbols/src/entity/EntityFactory.def diff --git a/symbols/src/EntityRenderDispatcher.def b/symbols/src/entity/EntityRenderDispatcher.def similarity index 100% rename from symbols/src/EntityRenderDispatcher.def rename to symbols/src/entity/EntityRenderDispatcher.def diff --git a/symbols/src/EntityRenderer.def b/symbols/src/entity/EntityRenderer.def similarity index 100% rename from symbols/src/EntityRenderer.def rename to symbols/src/entity/EntityRenderer.def diff --git a/symbols/src/HumanoidMobRenderer.def b/symbols/src/entity/HumanoidMobRenderer.def similarity index 100% rename from symbols/src/HumanoidMobRenderer.def rename to symbols/src/entity/HumanoidMobRenderer.def diff --git a/symbols/src/HumanoidModel.def b/symbols/src/entity/HumanoidModel.def similarity index 100% rename from symbols/src/HumanoidModel.def rename to symbols/src/entity/HumanoidModel.def diff --git a/symbols/src/ItemEntity.def b/symbols/src/entity/ItemEntity.def similarity index 100% rename from symbols/src/ItemEntity.def rename to symbols/src/entity/ItemEntity.def diff --git a/symbols/src/Mob.def b/symbols/src/entity/Mob.def similarity index 100% rename from symbols/src/Mob.def rename to symbols/src/entity/Mob.def diff --git a/symbols/src/MobFactory.def b/symbols/src/entity/MobFactory.def similarity index 100% rename from symbols/src/MobFactory.def rename to symbols/src/entity/MobFactory.def diff --git a/symbols/src/MobRenderer.def b/symbols/src/entity/MobRenderer.def similarity index 100% rename from symbols/src/MobRenderer.def rename to symbols/src/entity/MobRenderer.def diff --git a/symbols/src/PathfinderMob.def b/symbols/src/entity/PathfinderMob.def similarity index 100% rename from symbols/src/PathfinderMob.def rename to symbols/src/entity/PathfinderMob.def diff --git a/symbols/src/PrimedTnt.def b/symbols/src/entity/PrimedTnt.def similarity index 100% rename from symbols/src/PrimedTnt.def rename to symbols/src/entity/PrimedTnt.def diff --git a/symbols/src/Sheep.def b/symbols/src/entity/Sheep.def similarity index 100% rename from symbols/src/Sheep.def rename to symbols/src/entity/Sheep.def diff --git a/symbols/src/entity/TripodCameraRenderer.def b/symbols/src/entity/TripodCameraRenderer.def new file mode 100644 index 0000000000..8756f4a08c --- /dev/null +++ b/symbols/src/entity/TripodCameraRenderer.def @@ -0,0 +1,5 @@ +size 0x178; + +extends EntityRenderer; + +constructor () = 0x6583c; diff --git a/symbols/src/LocalPlayer.def b/symbols/src/entity/player/LocalPlayer.def similarity index 100% rename from symbols/src/LocalPlayer.def rename to symbols/src/entity/player/LocalPlayer.def diff --git a/symbols/src/Player.def b/symbols/src/entity/player/Player.def similarity index 100% rename from symbols/src/Player.def rename to symbols/src/entity/player/Player.def diff --git a/symbols/src/PlayerRenderer.def b/symbols/src/entity/player/PlayerRenderer.def similarity index 100% rename from symbols/src/PlayerRenderer.def rename to symbols/src/entity/player/PlayerRenderer.def diff --git a/symbols/src/RemotePlayer.def b/symbols/src/entity/player/RemotePlayer.def similarity index 100% rename from symbols/src/RemotePlayer.def rename to symbols/src/entity/player/RemotePlayer.def diff --git a/symbols/src/ServerPlayer.def b/symbols/src/entity/player/ServerPlayer.def similarity index 100% rename from symbols/src/ServerPlayer.def rename to symbols/src/entity/player/ServerPlayer.def diff --git a/symbols/src/GameRenderer.def b/symbols/src/game/GameRenderer.def similarity index 100% rename from symbols/src/GameRenderer.def rename to symbols/src/game/GameRenderer.def diff --git a/symbols/src/Minecraft.def b/symbols/src/game/Minecraft.def similarity index 100% rename from symbols/src/Minecraft.def rename to symbols/src/game/Minecraft.def diff --git a/symbols/src/NinecraftApp.def b/symbols/src/game/NinecraftApp.def similarity index 100% rename from symbols/src/NinecraftApp.def rename to symbols/src/game/NinecraftApp.def diff --git a/symbols/src/CreatorMode.def b/symbols/src/game/mode/CreatorMode.def similarity index 100% rename from symbols/src/CreatorMode.def rename to symbols/src/game/mode/CreatorMode.def diff --git a/symbols/src/GameMode.def b/symbols/src/game/mode/GameMode.def similarity index 100% rename from symbols/src/GameMode.def rename to symbols/src/game/mode/GameMode.def diff --git a/symbols/src/SurvivalMode.def b/symbols/src/game/mode/SurvivalMode.def similarity index 100% rename from symbols/src/SurvivalMode.def rename to symbols/src/game/mode/SurvivalMode.def diff --git a/symbols/src/Options.def b/symbols/src/game/options/Options.def similarity index 100% rename from symbols/src/Options.def rename to symbols/src/game/options/Options.def diff --git a/symbols/src/OptionsFile.def b/symbols/src/game/options/OptionsFile.def similarity index 100% rename from symbols/src/OptionsFile.def rename to symbols/src/game/options/OptionsFile.def diff --git a/symbols/src/Options_Option.def b/symbols/src/game/options/Options_Option.def similarity index 100% rename from symbols/src/Options_Option.def rename to symbols/src/game/options/Options_Option.def diff --git a/symbols/src/Font.def b/symbols/src/gui/Font.def similarity index 100% rename from symbols/src/Font.def rename to symbols/src/gui/Font.def diff --git a/symbols/src/Button.def b/symbols/src/gui/components/Button.def similarity index 100% rename from symbols/src/Button.def rename to symbols/src/gui/components/Button.def diff --git a/symbols/src/Gui.def b/symbols/src/gui/components/Gui.def similarity index 100% rename from symbols/src/Gui.def rename to symbols/src/gui/components/Gui.def diff --git a/symbols/src/GuiComponent.def b/symbols/src/gui/components/GuiComponent.def similarity index 100% rename from symbols/src/GuiComponent.def rename to symbols/src/gui/components/GuiComponent.def diff --git a/symbols/src/ImageButton.def b/symbols/src/gui/components/ImageButton.def similarity index 100% rename from symbols/src/ImageButton.def rename to symbols/src/gui/components/ImageButton.def diff --git a/symbols/src/OptionButton.def b/symbols/src/gui/components/OptionButton.def similarity index 100% rename from symbols/src/OptionButton.def rename to symbols/src/gui/components/OptionButton.def diff --git a/symbols/src/OptionsPane.def b/symbols/src/gui/components/OptionsPane.def similarity index 100% rename from symbols/src/OptionsPane.def rename to symbols/src/gui/components/OptionsPane.def diff --git a/symbols/src/FurnaceScreen.def b/symbols/src/gui/screens/FurnaceScreen.def similarity index 100% rename from symbols/src/FurnaceScreen.def rename to symbols/src/gui/screens/FurnaceScreen.def diff --git a/symbols/src/InBedScreen.def b/symbols/src/gui/screens/InBedScreen.def similarity index 100% rename from symbols/src/InBedScreen.def rename to symbols/src/gui/screens/InBedScreen.def diff --git a/symbols/src/OptionsScreen.def b/symbols/src/gui/screens/OptionsScreen.def similarity index 100% rename from symbols/src/OptionsScreen.def rename to symbols/src/gui/screens/OptionsScreen.def diff --git a/symbols/src/PauseScreen.def b/symbols/src/gui/screens/PauseScreen.def similarity index 100% rename from symbols/src/PauseScreen.def rename to symbols/src/gui/screens/PauseScreen.def diff --git a/symbols/src/ProgressScreen.def b/symbols/src/gui/screens/ProgressScreen.def similarity index 100% rename from symbols/src/ProgressScreen.def rename to symbols/src/gui/screens/ProgressScreen.def diff --git a/symbols/src/Screen.def b/symbols/src/gui/screens/Screen.def similarity index 83% rename from symbols/src/Screen.def rename to symbols/src/gui/screens/Screen.def index df30850ce8..c02051d6e2 100644 --- a/symbols/src/Screen.def +++ b/symbols/src/gui/screens/Screen.def @@ -12,8 +12,8 @@ virtual-method void buttonClicked(Button *button) = 0x60; virtual-method void init() = 0xc; property Minecraft *minecraft = 0x14; -property std::vector rendered_buttons = 0x18; -property std::vector selectable_buttons = 0x30; +property std::vector