From 79493336fd50ae6355903bc1478b4373ebeae993 Mon Sep 17 00:00:00 2001 From: ShrBox Date: Sun, 23 Apr 2023 21:35:39 +0800 Subject: [PATCH 01/11] ci: add missing parameter in update sdk --- .github/workflows/publish_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 3ef30452bc..07e61c91a7 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -146,7 +146,7 @@ jobs: git config --global user.name "github-actions[bot]" git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" cd scripts - cmd //c "UpdateSDK.cmd action" + cmd //c "UpdateSDK.cmd action release" shell: bash - name: Upload LiteLoaderBDS From b24f2b0cfb01deab1b9873a9d78aeb044fc1c50a Mon Sep 17 00:00:00 2001 From: ShrBox <53301243+ShrBox@users.noreply.github.com> Date: Sun, 30 Apr 2023 18:18:16 +0800 Subject: [PATCH 02/11] feat: adapt to 1.19.81 (#1237) * feat: update header for 1.19.80.24 * feat: update StaticVanillaBlocks for 1.19.80 * Initial adaptation 1.19.81.01 * refactor: update target protocol * feat: update header 1.19.81 * feat: update Packet Api * fix: fix enums.inc * fix: fix Packet size * feat: fill SerializedAbilitiesData * fix: fix ScriptEngine * fix: fix missing symbol in Bedrock.hpp --------- Co-authored-by: qingyu <62042544+dreamguxiang@users.noreply.github.com> Co-authored-by: OEOTYAN <1124718975@qq.com> Co-authored-by: Qiuzhizhe <42761326+quizhizhe@users.noreply.github.com> --- LiteLoader/include/liteloader/Version.h | 6 +- LiteLoader/include/llapi/DynamicCommandAPI.h | 4 +- LiteLoader/include/llapi/RegCommandAPI.h | 10 +- LiteLoader/include/llapi/mc/AABBBucket.hpp | 25 +- LiteLoader/include/llapi/mc/Abilities.hpp | 16 - LiteLoader/include/llapi/mc/Ability.hpp | 8 +- .../include/llapi/mc/AbilityCommand.hpp | 2 +- .../include/llapi/mc/AbsorptionMobEffect.hpp | 4 - .../include/llapi/mc/AbstractCandleBlock.hpp | 94 ++-- .../include/llapi/mc/AcaciaTreeCanopy.hpp | 8 + .../mc/AccessRecordingConstBlockSource.hpp | 4 - LiteLoader/include/llapi/mc/ActionQueue.hpp | 38 -- .../include/llapi/mc/ActivatorRailBlock.hpp | 53 +- .../mc/ActiveDirectoryScreenCapabilities.hpp | 13 +- LiteLoader/include/llapi/mc/Actor.hpp | 64 ++- .../include/llapi/mc/ActorAddEffectEvent.hpp | 5 +- .../llapi/mc/ActorAliasDescription.hpp | 4 - .../llapi/mc/ActorAnimationController.hpp | 4 - .../llapi/mc/ActorAnimationControllerPtr.hpp | 12 - .../mc/ActorAnimationControllerState.hpp | 32 -- .../include/llapi/mc/ActorAnimationEvent.hpp | 8 +- .../include/llapi/mc/ActorAnimationPlayer.hpp | 4 - LiteLoader/include/llapi/mc/ActorBlock.hpp | 49 +- .../include/llapi/mc/ActorCommandOrigin.hpp | 4 - .../llapi/mc/ActorContainerDiffHelper.hpp | 4 - .../llapi/mc/ActorContainerDiffHelperImpl.hpp | 8 +- .../llapi/mc/ActorDamageByBlockSource.hpp | 4 - .../llapi/mc/ActorDefinitionDescriptor.hpp | 8 +- .../llapi/mc/ActorDefinitionDiffList.hpp | 44 -- .../include/llapi/mc/ActorDefinitionGroup.hpp | 8 - .../llapi/mc/ActorDefinitionIdentifier.hpp | 20 +- .../llapi/mc/ActorDefinitionModifier.hpp | 8 +- .../include/llapi/mc/ActorDefinitionPtr.hpp | 18 +- .../llapi/mc/ActorEventCoordinator.hpp | 12 +- .../include/llapi/mc/ActorEventListener.hpp | 4 + .../include/llapi/mc/ActorFactoryData.hpp | 5 +- .../include/llapi/mc/ActorFilterGroup.hpp | 4 + .../llapi/mc/ActorGarbageCollector.hpp | 4 - .../include/llapi/mc/ActorIsRaiderTest.hpp | 65 +++ LiteLoader/include/llapi/mc/ActorManager.hpp | 8 +- LiteLoader/include/llapi/mc/ActorMapping.hpp | 16 +- .../llapi/mc/ActorMoveNotifierSystem.hpp | 4 + .../include/llapi/mc/ActorMoveSystem.hpp | 8 + LiteLoader/include/llapi/mc/ActorMovement.hpp | 8 + .../include/llapi/mc/ActorParticleEffect.hpp | 31 + .../llapi/mc/ActorPermutationEventHandler.hpp | 4 - .../include/llapi/mc/ActorPlacerItem.hpp | 4 +- .../mc/ActorPlayMovementSoundSystemImpl.hpp | 4 + .../include/llapi/mc/ActorPostAiStep.hpp | 24 + .../llapi/mc/ActorPostAiStepTickSystem.hpp | 32 ++ .../llapi/mc/ActorPropertiesDescription.hpp | 21 +- .../llapi/mc/ActorRemoveEffectEvent.hpp | 5 +- .../llapi/mc/ActorRuntimeIDManager.hpp | 12 +- .../include/llapi/mc/ActorSelectorArgs.hpp | 8 - .../llapi/mc/ActorServerCommandOrigin.hpp | 4 - .../llapi/mc/ActorSkeletalAnimation.hpp | 56 -- .../llapi/mc/ActorSkeletalAnimationPtr.hpp | 17 - .../llapi/mc/ActorSpawnRuleDefinition.hpp | 8 +- .../llapi/mc/ActorStopRidingEventSystem.hpp | 4 + .../include/llapi/mc/ActorTargetFilter.hpp | 32 ++ .../llapi/mc/ActorTerrainInterlockData.hpp | 32 ++ .../llapi/mc/ActorTickNeededComponent.hpp | 8 +- LiteLoader/include/llapi/mc/ActorUniqueID.hpp | 4 + ...ActorUpdatePostTickPositionDeltaSystem.hpp | 8 + .../llapi/mc/ActorUpdateRidingIDSystem.hpp | 12 + .../include/llapi/mc/ActorValueValidation.hpp | 8 +- .../include/llapi/mc/AddActorBasePacket.hpp | 18 +- .../include/llapi/mc/AddActorEntityProxy.hpp | 4 - .../include/llapi/mc/AddEntityPacket.hpp | 4 - .../mc/AdultRidingHeightOffsetComponent.hpp | 32 ++ LiteLoader/include/llapi/mc/Agent.hpp | 8 - .../include/llapi/mc/AgentBodyControl.hpp | 5 +- LiteLoader/include/llapi/mc/AgentCommand.hpp | 2 +- .../include/llapi/mc/AgentLookControl.hpp | 5 +- .../include/llapi/mc/AgentTravelSystem.hpp | 8 + LiteLoader/include/llapi/mc/AirBlock.hpp | 57 +- .../include/llapi/mc/AirTravelSystem.hpp | 4 + .../include/llapi/mc/AllayVibrationConfig.hpp | 30 - LiteLoader/include/llapi/mc/AllowList.hpp | 4 - .../include/llapi/mc/AllowListCommand.hpp | 2 +- .../include/llapi/mc/AllowListEntry.hpp | 4 - .../llapi/mc/AllowedAnywhereConsume.hpp | 32 -- LiteLoader/include/llapi/mc/AmethystBlock.hpp | 47 +- .../include/llapi/mc/AmethystBlockUtils.hpp | 24 + .../include/llapi/mc/AmethystClusterBlock.hpp | 67 ++- .../llapi/mc/AmphibiousMoveControl.hpp | 4 +- .../include/llapi/mc/AngryComponent.hpp | 8 +- LiteLoader/include/llapi/mc/AnimatePacket.hpp | 8 +- .../include/llapi/mc/AnimatedImageData.hpp | 8 +- .../include/llapi/mc/AnimationComponentID.hpp | 8 - .../llapi/mc/AntiCheatTickShimSystem.hpp | 36 -- LiteLoader/include/llapi/mc/AnvilBlock.hpp | 81 +-- .../mc/AnvilContainerScreenValidator.hpp | 5 +- LiteLoader/include/llapi/mc/AppConfigs.hpp | 5 +- LiteLoader/include/llapi/mc/AppPlatform.hpp | 12 +- .../include/llapi/mc/AppPlatformListener.hpp | 4 + .../llapi/mc/AppPlatformNetworkSettings.hpp | 5 +- .../include/llapi/mc/AppPlatformWindows.hpp | 5 +- .../include/llapi/mc/AreaEffectCloud.hpp | 4 - LiteLoader/include/llapi/mc/ArmorItem.hpp | 4 +- .../include/llapi/mc/ArmorItemComponent.hpp | 4 - LiteLoader/include/llapi/mc/ArmorStand.hpp | 9 +- .../include/llapi/mc/ArmorStandItem.hpp | 4 +- LiteLoader/include/llapi/mc/ArmorTrim.hpp | 84 +++ .../llapi/mc/ArmorTrimIconGenerationInfo.hpp | 48 ++ .../include/llapi/mc/AssertHandlerContext.hpp | 32 ++ .../llapi/mc/AtomicTimeAccumulator.hpp | 4 - .../llapi/mc/AttackCooldownComponent.hpp | 8 - LiteLoader/include/llapi/mc/Attribute.hpp | 12 - LiteLoader/include/llapi/mc/AttributeBuff.hpp | 13 +- .../include/llapi/mc/AttributeInstance.hpp | 49 +- .../llapi/mc/AttributeInstanceDelegate.hpp | 22 - .../llapi/mc/AttributeInstanceHandle.hpp | 16 - .../include/llapi/mc/AttributeModifier.hpp | 8 +- .../include/llapi/mc/AutoStepFilterSystem.hpp | 4 + .../include/llapi/mc/AverageTracker.hpp | 8 +- LiteLoader/include/llapi/mc/AzaleaBlock.hpp | 47 +- .../include/llapi/mc/AzaleaLeafBlock.hpp | 65 ++- .../include/llapi/mc/BackgroundTaskBase.hpp | 4 - .../include/llapi/mc/BackgroundTaskQueue.hpp | 4 - .../include/llapi/mc/BackgroundWorker.hpp | 8 - .../llapi/mc/BackwardsCompatTextureInfo.hpp | 34 -- LiteLoader/include/llapi/mc/Balloon.hpp | 4 - LiteLoader/include/llapi/mc/BalloonItem.hpp | 4 +- LiteLoader/include/llapi/mc/BambooItem.hpp | 4 +- .../include/llapi/mc/BambooSaplingBlock.hpp | 65 ++- .../include/llapi/mc/BambooStalkBlock.hpp | 65 ++- .../llapi/mc/BannerAddPatternRecipe.hpp | 9 +- LiteLoader/include/llapi/mc/BannerBlock.hpp | 61 +- .../include/llapi/mc/BannerBlockActor.hpp | 4 - .../llapi/mc/BannerDuplicateRecipe.hpp | 9 +- LiteLoader/include/llapi/mc/BannerItem.hpp | 8 +- LiteLoader/include/llapi/mc/BannerPattern.hpp | 12 + LiteLoader/include/llapi/mc/BarrelBlock.hpp | 59 +- .../include/llapi/mc/BarrelBlockActor.hpp | 4 - .../mc/BarrelContainerScreenValidator.hpp | 5 +- LiteLoader/include/llapi/mc/BarrierBlock.hpp | 53 +- .../include/llapi/mc/BasaltPillarFeature.hpp | 4 +- .../include/llapi/mc/BaseAttributeMap.hpp | 16 +- .../include/llapi/mc/BaseCircuitComponent.hpp | 12 - .../include/llapi/mc/BaseCommandBlock.hpp | 16 - .../include/llapi/mc/BaseContainerMenu.hpp | 4 - .../include/llapi/mc/BaseGameVersion.hpp | 8 +- .../include/llapi/mc/BaseMoveToGoal.hpp | 2 +- .../llapi/mc/BasePressurePlateBlock.hpp | 73 +-- LiteLoader/include/llapi/mc/BaseRailBlock.hpp | 63 ++- LiteLoader/include/llapi/mc/BeaconBlock.hpp | 49 +- .../mc/BeaconContainerScreenValidator.hpp | 5 +- .../include/llapi/mc/BeardDescription.hpp | 41 -- LiteLoader/include/llapi/mc/BeardKernel.hpp | 4 - LiteLoader/include/llapi/mc/BedBlock.hpp | 79 +-- LiteLoader/include/llapi/mc/BedItem.hpp | 8 +- LiteLoader/include/llapi/mc/Bedrock.hpp | 123 ++++ LiteLoader/include/llapi/mc/BedrockBlock.hpp | 55 +- LiteLoader/include/llapi/mc/BedrockLog.hpp | 4 - LiteLoader/include/llapi/mc/BeehiveBlock.hpp | 69 ++- .../include/llapi/mc/BeehiveBlockActor.hpp | 4 - LiteLoader/include/llapi/mc/BeetrootBlock.hpp | 63 ++- .../include/llapi/mc/BehaviorDefinition.hpp | 4 - .../include/llapi/mc/BehaviorFactory.hpp | 4 - .../llapi/mc/BehaviorTreeDefinitionPtr.hpp | 21 +- .../include/llapi/mc/BehaviorTreeGroup.hpp | 4 - LiteLoader/include/llapi/mc/BellBlock.hpp | 69 +-- .../include/llapi/mc/BellBlockActor.hpp | 4 - LiteLoader/include/llapi/mc/BellBlockItem.hpp | 530 +++++++++++++++++- .../include/llapi/mc/BigDripleafBlock.hpp | 63 ++- LiteLoader/include/llapi/mc/BinaryStream.hpp | 8 +- LiteLoader/include/llapi/mc/Biome.hpp | 32 +- .../llapi/mc/BiomeComponentFactory.hpp | 5 - .../llapi/mc/BiomeDefinitionListPacket.hpp | 4 + LiteLoader/include/llapi/mc/BiomeSource.hpp | 35 -- .../include/llapi/mc/BlastFurnaceBlock.hpp | 53 +- .../llapi/mc/BlastFurnaceBlockActor.hpp | 4 - .../mc/BlendedMultiNoiseBiomeProvider.hpp | 8 + LiteLoader/include/llapi/mc/BlendingData.hpp | 4 - LiteLoader/include/llapi/mc/Block.hpp | 68 ++- LiteLoader/include/llapi/mc/BlockActor.hpp | 12 +- .../llapi/mc/BlockBreakSensorComponent.hpp | 5 +- .../mc/BlockBreathabilityDescription.hpp | 12 +- .../llapi/mc/BlockCollisionBoxDescription.hpp | 12 +- .../llapi/mc/BlockCollisionBoxProcessor.hpp | 4 +- .../include/llapi/mc/BlockCommandOrigin.hpp | 4 - .../llapi/mc/BlockComponentDescription.hpp | 4 - .../mc/BlockCraftingTableDescription.hpp | 12 +- .../mc/BlockCreativeGroupDescription.hpp | 12 +- .../include/llapi/mc/BlockDefinition.hpp | 13 +- .../include/llapi/mc/BlockDefinitionGroup.hpp | 12 +- .../include/llapi/mc/BlockDescription.hpp | 5 +- .../include/llapi/mc/BlockDescriptor.hpp | 20 +- ...lockDestructibleByExplosionDescription.hpp | 12 +- .../BlockDestructibleByMiningDescription.hpp | 12 +- .../llapi/mc/BlockDisplayNameComponent.hpp | 35 -- .../llapi/mc/BlockDisplayNameDescription.hpp | 12 +- .../include/llapi/mc/BlockEventDispatcher.hpp | 4 - .../llapi/mc/BlockEventDispatcherToken.hpp | 4 + .../include/llapi/mc/BlockEventPacket.hpp | 8 +- .../llapi/mc/BlockFlammableDescription.hpp | 12 +- .../llapi/mc/BlockFrictionDescription.hpp | 12 +- .../llapi/mc/BlockGeometryComponent.hpp | 4 + .../llapi/mc/BlockGeometryDescription.hpp | 17 +- .../include/llapi/mc/BlockHashPalette.hpp | 58 ++ LiteLoader/include/llapi/mc/BlockItem.hpp | 4 +- LiteLoader/include/llapi/mc/BlockLegacy.hpp | 293 ++++------ .../mc/BlockLightDampeningDescription.hpp | 12 +- .../mc/BlockLightEmissionDescription.hpp | 12 +- .../include/llapi/mc/BlockListEventMap.hpp | 5 +- .../include/llapi/mc/BlockListSerializer.hpp | 8 +- .../mc/BlockLootComponentDescription.hpp | 12 +- .../llapi/mc/BlockMapColorDescription.hpp | 12 +- .../mc/BlockMaterialInstancesComponent.hpp | 4 - .../mc/BlockMaterialInstancesDescription.hpp | 8 +- ...ockMovementSlowdownMultiplierComponent.hpp | 32 ++ .../BlockMovementSlowdownMultiplierSystem.hpp | 16 + LiteLoader/include/llapi/mc/BlockPalette.hpp | 50 +- .../llapi/mc/BlockPartVisibilityComponent.hpp | 39 -- .../mc/BlockPartVisibilityDescription.hpp | 48 +- .../include/llapi/mc/BlockPatternBuilder.hpp | 8 +- .../mc/BlockPlacementFilterComponent.hpp | 4 - .../mc/BlockPlacementFilterDescription.hpp | 8 +- .../include/llapi/mc/BlockPlanterItem.hpp | 4 +- .../mc/BlockQueuedTickingDescription.hpp | 8 +- .../mc/BlockRandomTickingDescription.hpp | 8 +- .../include/llapi/mc/BlockRegistryManager.hpp | 49 ++ .../llapi/mc/BlockSelectionBoxDescription.hpp | 8 +- .../llapi/mc/BlockSelectionBoxProcessor.hpp | 9 +- LiteLoader/include/llapi/mc/BlockSource.hpp | 102 ++-- LiteLoader/include/llapi/mc/BlockState.hpp | 38 ++ .../llapi/mc/BlockStateCommandParam.hpp | 12 +- .../include/llapi/mc/BlockStateDefinition.hpp | 10 +- .../include/llapi/mc/BlockStateInstance.hpp | 36 ++ .../include/llapi/mc/BlockStateMeta.hpp | 8 +- .../include/llapi/mc/BlockStateRegistry.hpp | 32 ++ .../include/llapi/mc/BlockStateVariant.hpp | 48 -- .../include/llapi/mc/BlockTickingQueue.hpp | 40 +- .../llapi/mc/BlockTransformationComponent.hpp | 40 ++ .../mc/BlockTransformationDescription.hpp | 74 +++ .../include/llapi/mc/BlockTypeRegistry.hpp | 24 +- .../mc/BlockTypeRegistryModificationsLock.hpp | 8 - .../llapi/mc/BlockTypeRegistryReadLock.hpp | 8 - .../llapi/mc/BlockUnitCubeComponent.hpp | 8 +- .../llapi/mc/BlockUnitCubeDescription.hpp | 8 +- LiteLoader/include/llapi/mc/BlueFireBlock.hpp | 57 +- LiteLoader/include/llapi/mc/BlueIceBlock.hpp | 49 +- LiteLoader/include/llapi/mc/BoatItem.hpp | 4 +- .../llapi/mc/BoatPaddleInputSystem.hpp | 4 - .../include/llapi/mc/BodyControlComponent.hpp | 35 -- LiteLoader/include/llapi/mc/BoneAnimation.hpp | 41 -- .../include/llapi/mc/BoneAnimationChannel.hpp | 41 -- .../include/llapi/mc/BoneOrientation.hpp | 5 +- .../llapi/mc/BoneOrientationTransform.hpp | 34 -- .../include/llapi/mc/BookCloningRecipe.hpp | 9 +- .../include/llapi/mc/BookEditPacket.hpp | 8 +- .../include/llapi/mc/BookshelfBlock.hpp | 57 +- LiteLoader/include/llapi/mc/BoolOption.hpp | 12 - LiteLoader/include/llapi/mc/BorderBlock.hpp | 65 ++- .../llapi/mc/BossEventSubscriptionManager.hpp | 34 ++ .../mc/BossEventSubscriptionManagerImpl.hpp | 53 ++ LiteLoader/include/llapi/mc/BottleItem.hpp | 4 +- .../include/llapi/mc/BounceEventingSystem.hpp | 4 + LiteLoader/include/llapi/mc/BowEnchant.hpp | 4 - .../include/llapi/mc/BrazeSDKManager.hpp | 16 + .../include/llapi/mc/BrewingStandBlock.hpp | 61 +- .../llapi/mc/BrewingStandBlockActor.hpp | 4 - .../BrewingStandContainerScreenValidator.hpp | 5 +- .../mc/BrushEffectsCooldownComponent.hpp | 36 ++ LiteLoader/include/llapi/mc/BrushItem.hpp | 4 +- ...iciousSandBlock.hpp => BrushableBlock.hpp} | 124 ++-- .../include/llapi/mc/BrushableBlockActor.hpp | 110 ++++ .../include/llapi/mc/BrushableBlockUtils.hpp | 24 + .../include/llapi/mc/BubbleColumnBlock.hpp | 61 +- LiteLoader/include/llapi/mc/BucketItem.hpp | 4 +- .../include/llapi/mc/BuddingAmethystBlock.hpp | 57 +- .../include/llapi/mc/BuiltInBlockStates.hpp | 32 ++ .../include/llapi/mc/BuoyancyComponent.hpp | 9 +- .../include/llapi/mc/BuryDescription.hpp | 39 -- LiteLoader/include/llapi/mc/BushBlock.hpp | 51 +- LiteLoader/include/llapi/mc/ButtonBlock.hpp | 69 +-- .../include/llapi/mc/CachedComponentData.hpp | 4 + LiteLoader/include/llapi/mc/CactusBlock.hpp | 59 +- LiteLoader/include/llapi/mc/CakeBlock.hpp | 63 ++- .../llapi/mc/CalibratedSculkSensorBlock.hpp | 257 +++++++++ .../mc/CalibratedSculkSensorBlockActor.hpp | 78 +++ .../CalibratedSculkSensorVibrationConfig.hpp | 39 ++ LiteLoader/include/llapi/mc/Camel.hpp | 5 - LiteLoader/include/llapi/mc/CameraBlock.hpp | 47 +- LiteLoader/include/llapi/mc/CameraPreset.hpp | 43 ++ .../include/llapi/mc/CameraShakeCommand.hpp | 2 +- LiteLoader/include/llapi/mc/CampfireBlock.hpp | 73 +-- .../include/llapi/mc/CampfireBlockActor.hpp | 8 - LiteLoader/include/llapi/mc/CandleBlock.hpp | 90 ++- .../include/llapi/mc/CandleBlockItem.hpp | 4 +- .../include/llapi/mc/CandleCakeBlock.hpp | 92 ++- .../llapi/mc/CappedSurfaceAttributes.hpp | 4 - LiteLoader/include/llapi/mc/CarpetBlock.hpp | 57 +- LiteLoader/include/llapi/mc/CarrotBlock.hpp | 71 +-- .../llapi/mc/CartographyTableBlock.hpp | 49 +- LiteLoader/include/llapi/mc/CauldronBlock.hpp | 63 ++- .../include/llapi/mc/CauldronBlockActor.hpp | 4 - .../include/llapi/mc/CaveVinesBlock.hpp | 67 ++- .../llapi/mc/CerealDocumentUpgradeStep.hpp | 16 - LiteLoader/include/llapi/mc/CerealHelpers.hpp | 20 +- .../llapi/mc/CerealItemComponentFactory.hpp | 8 - LiteLoader/include/llapi/mc/ChainBlock.hpp | 57 +- .../include/llapi/mc/ChanceInformation.hpp | 8 +- .../include/llapi/mc/ChangeSettingCommand.hpp | 2 +- .../llapi/mc/ChargeableItemComponent.hpp | 8 - .../llapi/mc/CheckFallDamageInMoveSystem.hpp | 8 + .../llapi/mc/CheckFallDamageSystem.hpp | 4 + .../include/llapi/mc/ChemicalHeatBlock.hpp | 51 +- .../include/llapi/mc/ChemistryIngredient.hpp | 8 +- .../include/llapi/mc/ChemistryTableBlock.hpp | 69 +-- .../llapi/mc/ChemistryTableBlockActor.hpp | 4 - .../include/llapi/mc/CherryLeafBlock.hpp | 273 +++++++++ .../include/llapi/mc/CherrySaplingBlock.hpp | 279 +++++++++ .../include/llapi/mc/CherryTreeCanopy.hpp | 51 ++ .../include/llapi/mc/CherryTreeTrunk.hpp | 52 ++ LiteLoader/include/llapi/mc/ChestBlock.hpp | 63 ++- LiteLoader/include/llapi/mc/Chicken.hpp | 9 +- .../llapi/mc/ChickenPostAIStepSystem.hpp | 43 -- .../llapi/mc/ChiseledBookshelfBlock.hpp | 65 ++- .../include/llapi/mc/ChorusFlowerBlock.hpp | 61 +- .../include/llapi/mc/ChorusPlantBlock.hpp | 82 ++- LiteLoader/include/llapi/mc/ChunkBlender.hpp | 4 - .../include/llapi/mc/ChunkLoadActionList.hpp | 4 + .../include/llapi/mc/ChunkLoadedRequest.hpp | 24 - .../llapi/mc/ChunkRecyclerTelemetryData.hpp | 8 - LiteLoader/include/llapi/mc/ChunkSource.hpp | 18 +- .../llapi/mc/ChunkTickRangeManager.hpp | 48 ++ .../include/llapi/mc/ChunkViewSource.hpp | 20 +- .../include/llapi/mc/CircuitSceneGraph.hpp | 8 - LiteLoader/include/llapi/mc/CircuitSystem.hpp | 4 + LiteLoader/include/llapi/mc/ClayBlock.hpp | 51 +- LiteLoader/include/llapi/mc/ClearCommand.hpp | 2 +- .../llapi/mc/ClearSpawnPointCommand.hpp | 2 +- .../include/llapi/mc/ClientAutoStepSystem.hpp | 9 +- .../mc/ClientCacheMissResponsePacket.hpp | 5 +- .../ClientChunkGenerationValidationData.hpp | 10 +- .../llapi/mc/ClientInputLockComponent.hpp | 4 + .../llapi/mc/ClientInputUpdateSystem.hpp | 8 + .../llapi/mc/ClientInputUpdateSystemImpl.hpp | 28 + .../mc/ClientRequestPlaceholderBlock.hpp | 47 +- .../llapi/mc/ClientSideChunkGeneration.hpp | 36 ++ .../llapi/mc/ClientStopGlidingSystem.hpp | 17 +- .../include/llapi/mc/ClimateParameters.hpp | 8 +- LiteLoader/include/llapi/mc/ClimateUtils.hpp | 2 +- .../llapi/mc/ClockSpriteCalculator.hpp | 4 - LiteLoader/include/llapi/mc/CloneCommand.hpp | 2 +- .../llapi/mc/CloseWebSocketCommand.hpp | 2 +- LiteLoader/include/llapi/mc/ClothBlock.hpp | 55 +- .../include/llapi/mc/CobblestoneBlock.hpp | 53 +- LiteLoader/include/llapi/mc/CocoaBlock.hpp | 65 ++- LiteLoader/include/llapi/mc/CodeBuilder.hpp | 8 +- .../llapi/mc/CodeBuilderActorInfoCommand.hpp | 2 +- .../include/llapi/mc/CodeBuilderCommand.hpp | 2 +- .../llapi/mc/CodeScreenCapabilities.hpp | 13 +- .../llapi/mc/CollisionBoxDefinition.hpp | 4 + LiteLoader/include/llapi/mc/ColorFormat.hpp | 40 ++ LiteLoader/include/llapi/mc/ColoredBlock.hpp | 61 +- .../include/llapi/mc/ColoredTorchBlock.hpp | 73 ++- LiteLoader/include/llapi/mc/Command.hpp | 10 +- LiteLoader/include/llapi/mc/CommandArea.hpp | 4 - .../include/llapi/mc/CommandAreaFactory.hpp | 12 - LiteLoader/include/llapi/mc/CommandBlock.hpp | 94 ++-- .../include/llapi/mc/CommandBlockActor.hpp | 4 - .../include/llapi/mc/CommandBlockName.hpp | 8 +- .../llapi/mc/CommandChainedSubcommand.hpp | 4 - .../include/llapi/mc/CommandFunctionEntry.hpp | 4 - LiteLoader/include/llapi/mc/CommandItem.hpp | 8 - LiteLoader/include/llapi/mc/CommandLexer.hpp | 16 - .../include/llapi/mc/CommandManager.hpp | 64 +++ .../include/llapi/mc/CommandMessage.hpp | 4 +- LiteLoader/include/llapi/mc/CommandOrigin.hpp | 24 +- .../include/llapi/mc/CommandOriginData.hpp | 8 +- LiteLoader/include/llapi/mc/CommandOutput.hpp | 12 +- .../include/llapi/mc/CommandOutputMessage.hpp | 12 +- .../llapi/mc/CommandOutputParameter.hpp | 48 +- .../include/llapi/mc/CommandOutputSender.hpp | 55 -- .../include/llapi/mc/CommandParameterData.hpp | 28 +- .../mc/CommandPermissionLevelConversion.hpp | 24 + .../include/llapi/mc/CommandPosition.hpp | 4 - .../include/llapi/mc/CommandPropertyBag.hpp | 9 +- .../include/llapi/mc/CommandRegistry.hpp | 54 +- .../include/llapi/mc/CommandRequestPacket.hpp | 8 +- .../include/llapi/mc/CommandSelectorBase.hpp | 80 +-- .../include/llapi/mc/CommandSelectorUtil.hpp | 27 - LiteLoader/include/llapi/mc/CommandUtils.hpp | 4 - .../include/llapi/mc/CommandVersion.hpp | 4 + .../llapi/mc/CompactionListenerEnv.hpp | 4 - .../include/llapi/mc/ComparatorBlock.hpp | 67 ++- .../include/llapi/mc/ComparatorBlockActor.hpp | 4 - LiteLoader/include/llapi/mc/CompassItem.hpp | 4 +- .../llapi/mc/CompassSpriteCalculator.hpp | 4 - .../llapi/mc/CompletedUsingItemPacket.hpp | 8 +- ...omplexAliasBlockAchievementEventHelper.hpp | 28 + .../llapi/mc/ComplexInventoryTransaction.hpp | 8 +- LiteLoader/include/llapi/mc/ComponentItem.hpp | 4 +- .../include/llapi/mc/CompositeDefinition.hpp | 13 +- .../include/llapi/mc/ComposterBlock.hpp | 96 ++-- LiteLoader/include/llapi/mc/CompoundTag.hpp | 18 +- .../include/llapi/mc/CompoundTagVariant.hpp | 8 +- .../CompressedBiomeDefinitionListPacket.hpp | 67 +++ LiteLoader/include/llapi/mc/ConcreteBlock.hpp | 61 +- .../include/llapi/mc/ConcretePowderBlock.hpp | 71 +-- LiteLoader/include/llapi/mc/ConduitBlock.hpp | 47 +- .../include/llapi/mc/ConduitBlockActor.hpp | 4 - .../include/llapi/mc/ConnectionRequest.hpp | 4 + .../include/llapi/mc/ConsoleChunkBlender.hpp | 13 +- .../llapi/mc/ConsoleGameTestListener.hpp | 1 + LiteLoader/include/llapi/mc/Container.hpp | 69 +-- .../include/llapi/mc/ContainerComponent.hpp | 8 +- .../llapi/mc/ContainerManagerController.hpp | 36 ++ .../llapi/mc/ContainerManagerModel.hpp | 2 +- .../include/llapi/mc/ContainerModel.hpp | 48 -- .../llapi/mc/ContainerScreenValidatorBase.hpp | 5 +- .../llapi/mc/ContainerValidationDebug.hpp | 35 -- .../llapi/mc/ContainerValidationOperation.hpp | 35 -- .../llapi/mc/ContainerValidationResult.hpp | 9 +- .../llapi/mc/ContainerValidationSlotData.hpp | 9 +- .../llapi/mc/ContainerValidationSlotInfo.hpp | 16 - .../llapi/mc/ContainerValidatorFactory.hpp | 4 - LiteLoader/include/llapi/mc/ContentLog.hpp | 12 +- .../include/llapi/mc/ContextMessageLogger.hpp | 39 -- .../ControlledByLocalInstanceSystemImpl.hpp | 4 + .../include/llapi/mc/CopperBehavior.hpp | 12 - LiteLoader/include/llapi/mc/CopperBlock.hpp | 80 +-- LiteLoader/include/llapi/mc/Coral.hpp | 71 +-- LiteLoader/include/llapi/mc/CoralBlock.hpp | 63 ++- LiteLoader/include/llapi/mc/CoralFan.hpp | 73 +-- .../include/llapi/mc/CoralFanBlockItem.hpp | 4 +- LiteLoader/include/llapi/mc/CoralFanHang.hpp | 65 ++- LiteLoader/include/llapi/mc/Core.hpp | 8 + ...dleNonImplemented_DEPRECATEDASKTYLAING.hpp | 4 - .../include/llapi/mc/CraftHandlerBase.hpp | 42 +- .../include/llapi/mc/CraftHandlerCrafting.hpp | 4 - .../include/llapi/mc/CraftHandlerEnchant.hpp | 4 - .../llapi/mc/CraftHandlerGrindstone.hpp | 4 - .../include/llapi/mc/CraftHandlerLoom.hpp | 4 - .../llapi/mc/CraftHandlerSmithingTable.hpp | 4 - .../include/llapi/mc/CraftHandlerTrade.hpp | 4 - .../include/llapi/mc/CraftingContainer.hpp | 20 +- .../include/llapi/mc/CraftingContext.hpp | 36 ++ .../include/llapi/mc/CreativeGroupInfo.hpp | 22 - .../include/llapi/mc/CreativeItemEntry.hpp | 12 - .../llapi/mc/CreativeItemGroupCategory.hpp | 9 +- .../include/llapi/mc/CreativeItemRegistry.hpp | 8 - .../include/llapi/mc/CreatorMetadataUtils.hpp | 60 ++ LiteLoader/include/llapi/mc/CropBlock.hpp | 71 +-- .../include/llapi/mc/CryingObsidianBlock.hpp | 55 +- .../llapi/mc/CurrentSwimAmountSystem.hpp | 8 +- .../include/llapi/mc/CurseBindingEnchant.hpp | 4 - .../llapi/mc/CurseVanishingEnchant.hpp | 4 - .../llapi/mc/CustomBlockStateVariant.hpp | 43 ++ LiteLoader/include/llapi/mc/CutCopperSlab.hpp | 80 +-- .../include/llapi/mc/CutCopperStairs.hpp | 80 +-- .../include/llapi/mc/DBChunkStorage.hpp | 21 +- .../include/llapi/mc/DBLoggingUtils.hpp | 27 - LiteLoader/include/llapi/mc/DBStorage.hpp | 8 +- .../llapi/mc/DBStorageEnvironmentChain.hpp | 20 - LiteLoader/include/llapi/mc/DamageCommand.hpp | 2 +- .../llapi/mc/DanceComponentListener.hpp | 137 +---- LiteLoader/include/llapi/mc/DashSystem.hpp | 8 + .../include/llapi/mc/DayLockCommand.hpp | 2 +- .../llapi/mc/DaylightDetectorBlock.hpp | 65 ++- .../llapi/mc/DaylightDetectorBlockActor.hpp | 4 - LiteLoader/include/llapi/mc/DeOpCommand.hpp | 2 +- LiteLoader/include/llapi/mc/DeadBush.hpp | 85 ++- .../include/llapi/mc/DebugAssertException.hpp | 8 +- .../include/llapi/mc/DebugInfoComponent.hpp | 5 + LiteLoader/include/llapi/mc/DebugUtils.hpp | 33 +- .../include/llapi/mc/DecoratedPotBlock.hpp | 58 +- .../include/llapi/mc/DecoratedPotRecipe.hpp | 9 +- .../include/llapi/mc/DedicatedServer.hpp | 4 +- .../DedicatedServerGameTestRunnerListener.hpp | 1 + .../llapi/mc/DedicatedWSServerCommand.hpp | 2 +- .../include/llapi/mc/DeepslateBlock.hpp | 57 +- .../include/llapi/mc/DeepslateOreBlock.hpp | 51 +- .../llapi/mc/DeepslateRedStoneOreBlock.hpp | 51 +- .../llapi/mc/DefaultPlayerNameValidator.hpp | 24 + .../llapi/mc/DefaultScreenCapabilities.hpp | 13 +- .../include/llapi/mc/DeferredCommand.hpp | 4 - .../llapi/mc/DeferredCommandBlockCommand.hpp | 4 - .../llapi/mc/DeferredCompiledCommand.hpp | 4 - .../llapi/mc/DeferredScriptCommand.hpp | 4 +- LiteLoader/include/llapi/mc/DelayRequest.hpp | 16 - .../llapi/mc/DeprecatedSlabBlockItem.hpp | 4 +- .../llapi/mc/DeserializeDataParams.hpp | 8 +- .../include/llapi/mc/DesertPyramidPiece.hpp | 4 - .../include/llapi/mc/DetectorRailBlock.hpp | 53 +- .../include/llapi/mc/DialogueCommand.hpp | 2 +- .../llapi/mc/DictionaryCompressionUtil.hpp | 40 ++ LiteLoader/include/llapi/mc/DiffListPair.hpp | 35 -- .../include/llapi/mc/DifficultyCommand.hpp | 2 +- .../include/llapi/mc/DiggerItemComponent.hpp | 13 +- .../include/llapi/mc/DiggingEnchant.hpp | 4 - LiteLoader/include/llapi/mc/Dimension.hpp | 20 +- .../llapi/mc/DimensionConversionData.hpp | 4 - .../include/llapi/mc/DimensionManager.hpp | 17 +- .../llapi/mc/DimensionTransitionSystem.hpp | 8 + LiteLoader/include/llapi/mc/DiodeBlock.hpp | 87 +-- .../llapi/mc/DirectAgentMobMovementProxy.hpp | 8 +- .../llapi/mc/DirectPlayerMovementProxy.hpp | 8 +- .../llapi/mc/DirectionalProducerComponent.hpp | 56 ++ ...ectoryPackWithEncryptionAccessStrategy.hpp | 25 - LiteLoader/include/llapi/mc/DirtBlock.hpp | 67 ++- .../include/llapi/mc/DirtyTicksCounter.hpp | 24 - .../llapi/mc/DispatcherUpdateSystem.hpp | 8 +- .../include/llapi/mc/DispenserBlock.hpp | 73 +-- .../include/llapi/mc/DispenserBlockActor.hpp | 4 - .../llapi/mc/DisplayNameItemComponent.hpp | 4 - .../include/llapi/mc/DisplayObjective.hpp | 4 - LiteLoader/include/llapi/mc/DoorBlock.hpp | 71 +-- .../include/llapi/mc/DoorInteractGoal.hpp | 8 - LiteLoader/include/llapi/mc/DoorItem.hpp | 4 +- .../include/llapi/mc/DoublePlantBaseBlock.hpp | 329 +++++++++++ .../include/llapi/mc/DoublePlantBlock.hpp | 154 ++--- LiteLoader/include/llapi/mc/DoubleTag.hpp | 5 +- .../include/llapi/mc/DragonEggBlock.hpp | 59 +- .../include/llapi/mc/DriedKelpBlock.hpp | 47 +- .../include/llapi/mc/DropItemForGoal.hpp | 8 + LiteLoader/include/llapi/mc/DropperBlock.hpp | 53 +- .../include/llapi/mc/DropperBlockActor.hpp | 4 - .../llapi/mc/DurabilityItemComponent.hpp | 12 - LiteLoader/include/llapi/mc/DyePowderItem.hpp | 4 +- .../llapi/mc/EDUWorldsScreenCapabilities.hpp | 13 +- .../llapi/mc/EconomyTradeableComponent.hpp | 4 +- LiteLoader/include/llapi/mc/Editor.hpp | 1 + .../llapi/mc/EditorTickFilterSystem.hpp | 4 + .../include/llapi/mc/EduUriResourcePacket.hpp | 8 +- .../llapi/mc/EducationLevelSettings.hpp | 8 +- .../include/llapi/mc/EducationMetadata.hpp | 5 +- .../llapi/mc/EducationMetadataError.hpp | 4 - LiteLoader/include/llapi/mc/EffectCommand.hpp | 2 +- LiteLoader/include/llapi/mc/ElementBlock.hpp | 57 +- .../llapi/mc/EnableEncryptionCommand.hpp | 2 +- .../mc/EnchantBookForTradingFunction.hpp | 5 - .../include/llapi/mc/EnchantCommand.hpp | 2 +- .../mc/EnchantRandomEquipmentFunction.hpp | 5 - .../llapi/mc/EnchantRandomlyFunction.hpp | 5 - LiteLoader/include/llapi/mc/EnchantUtils.hpp | 8 +- .../llapi/mc/EnchantWithLevelsFunction.hpp | 5 - .../include/llapi/mc/EnchantingTableBlock.hpp | 49 +- .../include/llapi/mc/EncryptedProxyEnv.hpp | 4 - LiteLoader/include/llapi/mc/EndCityPieces.hpp | 4 - .../include/llapi/mc/EndCrystalItem.hpp | 4 +- .../include/llapi/mc/EndDragonFight.hpp | 4 - .../include/llapi/mc/EndGatewayBlock.hpp | 55 +- .../include/llapi/mc/EndGatewayBlockActor.hpp | 4 - .../include/llapi/mc/EndPortalBlock.hpp | 59 +- .../include/llapi/mc/EndPortalFrameBlock.hpp | 63 ++- .../include/llapi/mc/EndPortalShape.hpp | 4 - LiteLoader/include/llapi/mc/EndRodBlock.hpp | 63 ++- .../include/llapi/mc/EnderChestBlock.hpp | 57 +- .../include/llapi/mc/EnderChestContainer.hpp | 14 +- LiteLoader/include/llapi/mc/EnderDragon.hpp | 5 - .../llapi/mc/EnderDragonPostAIStepSystem.hpp | 43 -- LiteLoader/include/llapi/mc/EnderMan.hpp | 4 - .../llapi/mc/EnderManPreAIStepSystem.hpp | 4 - .../mc/EntitiesEnteredVolumeComponent.hpp | 35 -- .../mc/EntitiesExitedVolumeComponent.hpp | 35 -- .../mc/EntitiesInsideVolumeComponent.hpp | 35 -- .../EntitiesPendingEnterVolumeComponent.hpp | 39 -- .../llapi/mc/EntityComponentFactoryCereal.hpp | 5 +- LiteLoader/include/llapi/mc/EntityContext.hpp | 1 + .../include/llapi/mc/EntityContextBase.hpp | 19 +- .../mc/EntityGlobalComponentsUtility.hpp | 33 -- .../llapi/mc/EntityPlacerItemComponent.hpp | 4 - LiteLoader/include/llapi/mc/EntitySet.hpp | 8 +- LiteLoader/include/llapi/mc/EntitySystems.hpp | 8 +- .../llapi/mc/EntitySystemsCollection.hpp | 29 - LiteLoader/include/llapi/mc/EventCommand.hpp | 2 +- LiteLoader/include/llapi/mc/EventPacket.hpp | 40 +- .../include/llapi/mc/EventResponseFactory.hpp | 5 - .../mc/EventingRequestQueueComponent.hpp | 4 - .../llapi/mc/EventingRequestSystem.hpp | 4 + .../include/llapi/mc/ExecuteCommand.hpp | 2 +- .../include/llapi/mc/ExitVehicleSystem.hpp | 21 +- .../llapi/mc/ExpectedAnywhereConsume.hpp | 32 -- .../llapi/mc/ExperienceCostCommitObject.hpp | 4 - LiteLoader/include/llapi/mc/ExperienceOrb.hpp | 4 - .../include/llapi/mc/ExperimentStorage.hpp | 4 - LiteLoader/include/llapi/mc/Experiments.hpp | 9 +- .../llapi/mc/ExplosionDecayFunction.hpp | 5 - .../include/llapi/mc/ExpressionNode.hpp | 49 +- .../include/llapi/mc/ExpressionOpBitField.hpp | 12 +- .../include/llapi/mc/ExtendedCertificate.hpp | 4 - .../llapi/mc/ExtendedStreamReadResult.hpp | 9 +- .../llapi/mc/ExternalDataComponent.hpp | 32 ++ .../llapi/mc/ExternalDataServerLevel.hpp | 48 ++ .../mc/ExternalFileLevelStorageMetadata.hpp | 27 - .../include/llapi/mc/ExternalLinkSettings.hpp | 8 +- .../include/llapi/mc/ExternalRecipeStore.hpp | 4 - .../mc/EyeOfEnderPreNormalTickSystem.hpp | 4 + .../llapi/mc/FaceDirectionalActorBlock.hpp | 61 +- .../include/llapi/mc/FaceDirectionalBlock.hpp | 61 +- LiteLoader/include/llapi/mc/Facing.hpp | 8 +- LiteLoader/include/llapi/mc/FarmBlock.hpp | 59 +- LiteLoader/include/llapi/mc/Feature.hpp | 2 +- .../include/llapi/mc/FeatureToggles.hpp | 8 - LiteLoader/include/llapi/mc/FeedItem.hpp | 5 +- LiteLoader/include/llapi/mc/FenceBlock.hpp | 68 +-- .../include/llapi/mc/FenceGateBlock.hpp | 55 +- .../include/llapi/mc/FertilizerItem.hpp | 4 +- LiteLoader/include/llapi/mc/FillCommand.hpp | 2 +- .../include/llapi/mc/FillingContainer.hpp | 34 +- LiteLoader/include/llapi/mc/FilterGroup.hpp | 2 +- LiteLoader/include/llapi/mc/FilterInput.hpp | 8 +- .../llapi/mc/FilterInputDefinition.hpp | 8 +- LiteLoader/include/llapi/mc/FilterTest.hpp | 18 +- .../include/llapi/mc/FinalizeMoveSystem.hpp | 4 + LiteLoader/include/llapi/mc/FindCoverGoal.hpp | 4 - LiteLoader/include/llapi/mc/FireBlock.hpp | 55 +- .../include/llapi/mc/FireChargeItem.hpp | 4 +- LiteLoader/include/llapi/mc/FireworksItem.hpp | 4 +- .../include/llapi/mc/FireworksRecipe.hpp | 14 +- .../FlagAllPassengersForPositioningSystem.hpp | 4 + .../llapi/mc/FlagPassengerRemovalSystem.hpp | 8 + .../llapi/mc/FlatWorldGeneratorOptions.hpp | 4 - .../include/llapi/mc/FlintAndSteelItem.hpp | 4 +- LiteLoader/include/llapi/mc/FlowerBlock.hpp | 67 ++- .../include/llapi/mc/FlowerPotBlock.hpp | 59 +- LiteLoader/include/llapi/mc/FlushableEnv.hpp | 4 - .../llapi/mc/FlushableStorageAreaEnv.hpp | 5 - .../include/llapi/mc/FlyTravelSystem.hpp | 4 + .../include/llapi/mc/FlyTriggerSystem.hpp | 8 - LiteLoader/include/llapi/mc/FogCommand.hpp | 2 +- LiteLoader/include/llapi/mc/FoliageColor.hpp | 8 +- .../llapi/mc/FramewiseActionOrStopSystem.hpp | 4 + .../include/llapi/mc/FrogSpawnBlock.hpp | 57 +- .../include/llapi/mc/FrogSpawnBlockItem.hpp | 4 +- .../include/llapi/mc/FrostWalkSystem.hpp | 4 + .../include/llapi/mc/FrostedIceBlock.hpp | 51 +- .../include/llapi/mc/FunctionCommand.hpp | 2 +- LiteLoader/include/llapi/mc/FunctionEntry.hpp | 8 - .../include/llapi/mc/FunctionManager.hpp | 8 - LiteLoader/include/llapi/mc/FurnaceBlock.hpp | 67 ++- .../GameDirectorEntityServerCommandOrigin.hpp | 4 - LiteLoader/include/llapi/mc/GameEvent.hpp | 8 - .../include/llapi/mc/GameEventContext.hpp | 35 -- .../llapi/mc/GameEventListenerComponent.hpp | 8 +- LiteLoader/include/llapi/mc/GameEventPair.hpp | 8 +- .../include/llapi/mc/GameEventRegistry.hpp | 60 ++ LiteLoader/include/llapi/mc/GameMode.hpp | 14 +- .../include/llapi/mc/GameModeCommand.hpp | 2 +- LiteLoader/include/llapi/mc/GameRule.hpp | 8 +- .../include/llapi/mc/GameRuleCommand.hpp | 2 +- LiteLoader/include/llapi/mc/GameRules.hpp | 12 +- .../include/llapi/mc/GameTestClearTask.hpp | 4 - .../include/llapi/mc/GameTestCommand.hpp | 7 +- .../llapi/mc/GameTestInstanceLedger.hpp | 1 + .../llapi/mc/GameTestLevelListener.hpp | 63 +-- .../llapi/mc/GameTestNetworkAdapter.hpp | 1 + .../llapi/mc/GameTestRequestPacket.hpp | 1 + .../include/llapi/mc/GameTestRunner.hpp | 5 +- LiteLoader/include/llapi/mc/GameVersion.hpp | 12 +- .../include/llapi/mc/GameplayUserManager.hpp | 67 ++- .../llapi/mc/GameplayUserManagerProxy.hpp | 54 ++ .../llapi/mc/GameplayUserSuspension.hpp | 32 ++ .../include/llapi/mc/GeneticsComponent.hpp | 5 +- .../llapi/mc/GetAttachPosRequestComponent.hpp | 4 - .../include/llapi/mc/GetChunkDataCommand.hpp | 2 +- .../include/llapi/mc/GetChunksCommand.hpp | 6 +- .../llapi/mc/GetEduServerInfoCommand.hpp | 2 +- .../GetInterpolatedRidingPositionSystem.hpp | 4 + .../include/llapi/mc/GetSpawnPointCommand.hpp | 2 +- .../llapi/mc/GetTopSolidBlockCommand.hpp | 2 +- .../include/llapi/mc/GildedBlackstone.hpp | 51 +- LiteLoader/include/llapi/mc/GiveCommand.hpp | 2 +- .../include/llapi/mc/GiveableComponent.hpp | 4 - LiteLoader/include/llapi/mc/GlassBlock.hpp | 49 +- .../llapi/mc/GlazedTerracottaBlock.hpp | 55 +- .../include/llapi/mc/GlideTriggerSystem.hpp | 4 - .../llapi/mc/GlidingMoveFinalizeSystem.hpp | 4 + .../include/llapi/mc/GlobalPauseCommand.hpp | 2 +- .../include/llapi/mc/GlowItemFrameBlock.hpp | 49 +- .../include/llapi/mc/GlowLichenBlock.hpp | 59 +- LiteLoader/include/llapi/mc/GoHomeGoal.hpp | 4 - LiteLoader/include/llapi/mc/GrassBlock.hpp | 63 ++- .../include/llapi/mc/GrassPathBlock.hpp | 53 +- LiteLoader/include/llapi/mc/GravelBlock.hpp | 59 +- .../include/llapi/mc/GrindstoneBlock.hpp | 63 ++- .../llapi/mc/GuardianPreAIStepSystem.hpp | 4 + LiteLoader/include/llapi/mc/HC_CALL.hpp | 53 +- .../include/llapi/mc/HC_PERFORM_ENV.hpp | 52 ++ LiteLoader/include/llapi/mc/HC_WEBSOCKET.hpp | 79 --- .../llapi/mc/HC_WEBSOCKET_OBSERVER.hpp | 50 ++ LiteLoader/include/llapi/mc/HangingActor.hpp | 6 +- .../include/llapi/mc/HangingActorItem.hpp | 4 +- LiteLoader/include/llapi/mc/HangingRoots.hpp | 53 +- .../include/llapi/mc/HangingSignBlock.hpp | 60 +- LiteLoader/include/llapi/mc/HayBlockBlock.hpp | 55 +- LiteLoader/include/llapi/mc/HeavyBlock.hpp | 75 +-- .../include/llapi/mc/HeightmapWrapper.hpp | 4 - LiteLoader/include/llapi/mc/HelpCommand.hpp | 2 +- LiteLoader/include/llapi/mc/HitResult.hpp | 12 +- LiteLoader/include/llapi/mc/HoneyBlock.hpp | 59 +- .../include/llapi/mc/HoneycombBlock.hpp | 47 +- .../include/llapi/mc/HopMoveControl.hpp | 8 +- LiteLoader/include/llapi/mc/HopperBlock.hpp | 63 ++- LiteLoader/include/llapi/mc/Horse.hpp | 20 +- .../include/llapi/mc/HorseArmorItem.hpp | 8 + LiteLoader/include/llapi/mc/HorseMovement.hpp | 16 + .../include/llapi/mc/HorsePreTravelSystem.hpp | 4 + LiteLoader/include/llapi/mc/HttpHeaders.hpp | 9 +- .../include/llapi/mc/HudContainerModel.hpp | 4 - .../llapi/mc/HudScreenCapabilities.hpp | 13 +- .../include/llapi/mc/HugeMushroomBlock.hpp | 63 ++- LiteLoader/include/llapi/mc/I18n.hpp | 16 +- .../include/llapi/mc/IConnectionEventing.hpp | 6 - .../include/llapi/mc/IDefinitionInstance.hpp | 2 +- .../include/llapi/mc/IDimensionFactory.hpp | 18 +- .../include/llapi/mc/IEntityRegistryOwner.hpp | 18 +- .../include/llapi/mc/INpcDialogueData.hpp | 20 +- .../include/llapi/mc/IPackTelemetry.hpp | 6 - .../include/llapi/mc/IPacketObserver.hpp | 18 +- .../llapi/mc/IScreenChangedEventing.hpp | 6 - .../llapi/mc/IStructurePoolBlockPredicate.hpp | 34 ++ .../include/llapi/mc/ITickingSystem.hpp | 34 ++ .../include/llapi/mc/IWebviewTelemetry.hpp | 71 +-- LiteLoader/include/llapi/mc/IceBlock.hpp | 57 +- .../include/llapi/mc/IdentityDefinition.hpp | 32 -- .../include/llapi/mc/IdentityDictionary.hpp | 24 - LiteLoader/include/llapi/mc/IdleState.hpp | 4 - LiteLoader/include/llapi/mc/Igloo.hpp | 4 - LiteLoader/include/llapi/mc/IllagerBeast.hpp | 5 - LiteLoader/include/llapi/mc/ImguiProfiler.hpp | 22 +- .../include/llapi/mc/ImmobileSystem.hpp | 4 + .../llapi/mc/ImmutableWorldCommand.hpp | 2 +- .../llapi/mc/ImportStructureMetaData.hpp | 8 +- LiteLoader/include/llapi/mc/ImprovedNoise.hpp | 8 - LiteLoader/include/llapi/mc/InMemoryEnv.hpp | 5 - LiteLoader/include/llapi/mc/InMemoryFile.hpp | 28 - .../include/llapi/mc/InMemoryFileStorage.hpp | 12 - .../include/llapi/mc/InWaterSensingSystem.hpp | 4 + LiteLoader/include/llapi/mc/IndexSet.hpp | 8 +- LiteLoader/include/llapi/mc/InfestedBlock.hpp | 51 +- .../llapi/mc/InfestedDeepslateBlock.hpp | 53 +- .../llapi/mc/InitialTickFilterSystem.hpp | 4 + .../llapi/mc/InputPermissionCommand.hpp | 59 ++ .../include/llapi/mc/InsideBlockEventMap.hpp | 20 - .../mc/InsideBubbleColumnBlockComponent.hpp | 4 - .../llapi/mc/InsideBubbleColumnSystemImpl.hpp | 32 ++ .../llapi/mc/InsideCactusBlockSystem.hpp | 4 + .../mc/InsideEndPortalBlockSystemImpl.hpp | 4 + .../mc/InsidePowderSnowBlockSystemImpl.hpp | 8 + .../mc/InsideSweetBerryBushBlockSystem.hpp | 4 + .../mc/InsideWaterlilyBlockSystemImpl.hpp | 8 + .../include/llapi/mc/InsideWebBlockSystem.hpp | 4 + LiteLoader/include/llapi/mc/Int64Tag.hpp | 5 +- LiteLoader/include/llapi/mc/IntArrayTag.hpp | 5 +- LiteLoader/include/llapi/mc/IntComponent.hpp | 4 + LiteLoader/include/llapi/mc/Interaction.hpp | 8 +- .../llapi/mc/InternalItemDescriptor.hpp | 8 +- .../include/llapi/mc/InternalSystemInfo.hpp | 4 - ...polatedRidingPositionCalculationHelper.hpp | 8 +- LiteLoader/include/llapi/mc/Inventory.hpp | 57 +- .../include/llapi/mc/InventoryAction.hpp | 4 - .../include/llapi/mc/InventorySlotPacket.hpp | 8 +- .../include/llapi/mc/InventoryTransaction.hpp | 12 - .../llapi/mc/InventoryTransactionManager.hpp | 4 - .../include/llapi/mc/InvisibleBlock.hpp | 47 +- .../llapi/mc/IsSpawnableDescription.hpp | 5 - .../llapi/mc/IsSummonableDescription.hpp | 5 - .../llapi/mc/IsTakingFireDamageTest.hpp | 65 +++ LiteLoader/include/llapi/mc/Item.hpp | 46 +- LiteLoader/include/llapi/mc/ItemColorUtil.hpp | 8 + LiteLoader/include/llapi/mc/ItemContext.hpp | 96 ++-- .../include/llapi/mc/ItemDescriptor.hpp | 16 +- .../include/llapi/mc/ItemDescriptorCount.hpp | 17 +- LiteLoader/include/llapi/mc/ItemEnchants.hpp | 4 - .../llapi/mc/ItemEventResponseFactory.hpp | 6 - .../include/llapi/mc/ItemFrameBlock.hpp | 100 ++-- .../include/llapi/mc/ItemFrameBlockActor.hpp | 4 +- LiteLoader/include/llapi/mc/ItemInstance.hpp | 24 +- .../include/llapi/mc/ItemLockHelper.hpp | 4 - LiteLoader/include/llapi/mc/ItemRegistry.hpp | 100 +--- .../include/llapi/mc/ItemRegistryRef.hpp | 20 +- LiteLoader/include/llapi/mc/ItemStack.hpp | 20 +- LiteLoader/include/llapi/mc/ItemStackBase.hpp | 80 +-- .../mc/ItemStackBaseComponentsHelper.hpp | 40 -- .../include/llapi/mc/ItemStackDescriptor.hpp | 8 +- .../llapi/mc/ItemStackNetIdVariant.hpp | 8 - .../llapi/mc/ItemStackNetManagerBase.hpp | 12 +- .../llapi/mc/ItemStackNetManagerScreen.hpp | 12 - .../mc/ItemStackNetManagerScreenStack.hpp | 28 - .../ItemStackRequestActionBeaconPayment.hpp | 5 +- .../mc/ItemStackRequestActionConsume.hpp | 11 +- .../ItemStackRequestActionCraftGrindstone.hpp | 4 - .../mc/ItemStackRequestActionCraftHandler.hpp | 8 - .../mc/ItemStackRequestActionCraftLoom.hpp | 4 - .../ItemStackRequestActionCraftRecipeAuto.hpp | 8 - ...mStackRequestActionCraftRecipeOptional.hpp | 4 - ...ctionCraftResults_DEPRECATEDASKTYLAING.hpp | 8 - .../llapi/mc/ItemStackRequestActionCreate.hpp | 5 +- .../mc/ItemStackRequestActionDestroy.hpp | 11 +- .../llapi/mc/ItemStackRequestActionDrop.hpp | 9 +- .../mc/ItemStackRequestActionHandler.hpp | 24 - .../mc/ItemStackRequestActionMineBlock.hpp | 5 +- .../llapi/mc/ItemStackRequestActionPlace.hpp | 11 +- ...StackRequestActionPlaceInItemContainer.hpp | 11 +- .../llapi/mc/ItemStackRequestActionSwap.hpp | 11 +- .../llapi/mc/ItemStackRequestActionTake.hpp | 11 +- ...tackRequestActionTakeFromItemContainer.hpp | 11 +- .../mc/ItemStackRequestActionTransferBase.hpp | 38 +- .../mc/ItemStackRequestHandlerSlotInfo.hpp | 5 +- .../llapi/mc/ItemStackRequestSlotInfo.hpp | 4 - LiteLoader/include/llapi/mc/ItemState.hpp | 43 -- .../include/llapi/mc/ItemStateInstance.hpp | 41 -- .../include/llapi/mc/ItemTagDescriptor.hpp | 8 +- .../llapi/mc/ItemTransactionLogger.hpp | 8 +- LiteLoader/include/llapi/mc/JigsawBlock.hpp | 65 ++- .../include/llapi/mc/JigsawEditorData.hpp | 4 - .../include/llapi/mc/JigsawJunction.hpp | 39 -- .../mc/JigsawStructureActorRulesRegistry.hpp | 4 - .../llapi/mc/JigsawStructureBlockInfo.hpp | 4 - .../mc/JigsawStructureBlockRulesRegistry.hpp | 4 - .../JigsawStructureBlockTagRulesRegistry.hpp | 4 - .../mc/JigsawStructureElementRegistry.hpp | 8 - LiteLoader/include/llapi/mc/Json.hpp | 8 +- LiteLoader/include/llapi/mc/JukeboxBlock.hpp | 55 +- .../include/llapi/mc/JunglePyramidPiece.hpp | 4 - LiteLoader/include/llapi/mc/KelpBlock.hpp | 65 +-- .../include/llapi/mc/KeyFrameLerpMode.hpp | 4 - .../include/llapi/mc/KeyFrameTransform.hpp | 20 +- .../llapi/mc/KeyFrameTransformData.hpp | 4 + LiteLoader/include/llapi/mc/KeyManager.hpp | 4 - LiteLoader/include/llapi/mc/KickCommand.hpp | 10 +- LiteLoader/include/llapi/mc/KillCommand.hpp | 2 +- .../llapi/mc/KnockbackArmorUpdater.hpp | 5 + .../include/llapi/mc/KnockbackRules.hpp | 12 +- .../include/llapi/mc/LabTablePacket.hpp | 8 +- LiteLoader/include/llapi/mc/LadderBlock.hpp | 59 +- LiteLoader/include/llapi/mc/LanternBlock.hpp | 65 ++- .../include/llapi/mc/LavaTravelSystem.hpp | 4 + .../include/llapi/mc/LayeredAbilities.hpp | 18 +- LiteLoader/include/llapi/mc/LeadItem.hpp | 4 +- LiteLoader/include/llapi/mc/LeafBlock.hpp | 79 +-- LiteLoader/include/llapi/mc/LecternBlock.hpp | 61 +- .../mc/LegacyBlockPlacementProcessor.hpp | 4 - .../llapi/mc/LegacyStructureActorInfo.hpp | 35 -- .../llapi/mc/LegacyStructureBlockInfo.hpp | 35 -- .../llapi/mc/LegacyStructureBlockPalette.hpp | 8 - .../llapi/mc/LegacyStructureSettings.hpp | 21 +- .../llapi/mc/LegacyStructureTemplate.hpp | 4 + LiteLoader/include/llapi/mc/LessonCommand.hpp | 2 +- LiteLoader/include/llapi/mc/Level.hpp | 320 +++++------ LiteLoader/include/llapi/mc/LevelChunk.hpp | 48 +- .../mc/LevelChunkAndSubChunkLoggingData.hpp | 8 +- .../llapi/mc/LevelChunkFinalDeleter.hpp | 8 +- .../llapi/mc/LevelChunkGarbageCollector.hpp | 4 - .../include/llapi/mc/LevelChunkMetaData.hpp | 8 - .../llapi/mc/LevelContainerManagerModel.hpp | 8 +- .../include/llapi/mc/LevelContainerModel.hpp | 4 - LiteLoader/include/llapi/mc/LevelData.hpp | 60 +- LiteLoader/include/llapi/mc/LevelDataKeys.hpp | 4 + .../llapi/mc/LevelDbRandomAccessFile.hpp | 5 - .../llapi/mc/LevelDbSequentialFile.hpp | 5 - .../llapi/mc/LevelEventCoordinator.hpp | 4 - .../include/llapi/mc/LevelEventListener.hpp | 4 - .../include/llapi/mc/LevelEventPacket.hpp | 8 +- LiteLoader/include/llapi/mc/LevelListener.hpp | 16 - LiteLoader/include/llapi/mc/LevelProvider.hpp | 40 ++ LiteLoader/include/llapi/mc/LevelSettings.hpp | 56 +- .../include/llapi/mc/LevelSoundManager.hpp | 30 +- .../llapi/mc/LevelStorageEventingContext.hpp | 32 ++ .../include/llapi/mc/LevelStorageObserver.hpp | 4 - LiteLoader/include/llapi/mc/LevelSummary.hpp | 16 +- LiteLoader/include/llapi/mc/LeverBlock.hpp | 69 +-- .../llapi/mc/LibraryScreenCapabilities.hpp | 13 +- LiteLoader/include/llapi/mc/LightBlock.hpp | 63 ++- LiteLoader/include/llapi/mc/LightGemBlock.hpp | 51 +- LiteLoader/include/llapi/mc/LightningRod.hpp | 61 +- LiteLoader/include/llapi/mc/LiquidBlock.hpp | 63 ++- .../include/llapi/mc/LiquidBlockDynamic.hpp | 49 +- .../include/llapi/mc/LiquidBlockStatic.hpp | 49 +- .../llapi/mc/LiquidSplashRequestSystem.hpp | 4 + .../include/llapi/mc/LiquidSplashSystem.hpp | 8 + LiteLoader/include/llapi/mc/ListCommand.hpp | 2 +- LiteLoader/include/llapi/mc/ListDCommand.hpp | 2 +- LiteLoader/include/llapi/mc/Localization.hpp | 4 - LiteLoader/include/llapi/mc/LocateCommand.hpp | 2 +- .../include/llapi/mc/LodestoneBlock.hpp | 47 +- .../include/llapi/mc/LodestoneCompassItem.hpp | 4 +- LiteLoader/include/llapi/mc/LogBlock.hpp | 71 ++- LiteLoader/include/llapi/mc/LoomBlock.hpp | 49 +- LiteLoader/include/llapi/mc/LootCommand.hpp | 2 +- .../LootItemActorHasMarkVariantCondition.hpp | 5 - .../mc/LootItemActorHasVariantCondition.hpp | 5 - .../include/llapi/mc/LootItemFunction.hpp | 4 - .../mc/LootItemKilledByPlayerCondition.hpp | 5 - .../LootItemKilledByPlayerOrPetsCondition.hpp | 5 - .../mc/LootItemRandomChanceCondition.hpp | 5 - ...otItemRandomChanceWithLootingCondition.hpp | 5 - ...ndomChanceWithSpecialModifierCondition.hpp | 5 - ...ootItemRandomDifficultyChanceCondition.hpp | 5 - LiteLoader/include/llapi/mc/LootPoolTiers.hpp | 36 -- LiteLoader/include/llapi/mc/LootTable.hpp | 4 - .../include/llapi/mc/LootTableContext.hpp | 8 - .../include/llapi/mc/LootTableEntry.hpp | 5 - .../llapi/mc/LootingEnchantFunction.hpp | 5 - .../include/llapi/mc/LowMemoryWatcher.hpp | 44 ++ LiteLoader/include/llapi/mc/MCRESULT.hpp | 4 + LiteLoader/include/llapi/mc/MC_ANONYMOUS.hpp | 24 + LiteLoader/include/llapi/mc/MagmaBlock.hpp | 59 +- .../include/llapi/mc/MangroveLeafBlock.hpp | 51 +- .../include/llapi/mc/MangrovePropagule.hpp | 105 ++-- .../include/llapi/mc/MangroveRootBlock.hpp | 47 +- .../include/llapi/mc/MangroveTreeRoots.hpp | 4 + .../include/llapi/mc/MapCloningRecipe.hpp | 9 +- LiteLoader/include/llapi/mc/MapDecoration.hpp | 13 +- .../include/llapi/mc/MapExtendingRecipe.hpp | 9 +- .../include/llapi/mc/MapInfoRequestPacket.hpp | 8 +- .../include/llapi/mc/MapItemTrackedActor.hpp | 8 - .../include/llapi/mc/MapLockingRecipe.hpp | 9 +- .../include/llapi/mc/MapUpgradingRecipe.hpp | 9 +- LiteLoader/include/llapi/mc/Matrix.hpp | 8 + LiteLoader/include/llapi/mc/MeCommand.hpp | 10 +- LiteLoader/include/llapi/mc/MelonBlock.hpp | 51 +- .../include/llapi/mc/MerchantRecipe.hpp | 24 +- .../include/llapi/mc/MessagingCommand.hpp | 8 +- LiteLoader/include/llapi/mc/MetalBlock.hpp | 47 +- LiteLoader/include/llapi/mc/Minecart.hpp | 6 +- .../llapi/mc/MinecartBlockCommandOrigin.hpp | 4 - .../llapi/mc/MinecartComeOffRailSystem.hpp | 8 + LiteLoader/include/llapi/mc/MinecartItem.hpp | 4 +- .../llapi/mc/MinecartMoveAlongRailSystem.hpp | 4 + .../llapi/mc/MinecartPreNormalTickSystem.hpp | 4 + LiteLoader/include/llapi/mc/Minecraft.hpp | 4 +- .../include/llapi/mc/MinecraftCommands.hpp | 8 +- .../include/llapi/mc/MinecraftEventing.hpp | 40 +- .../include/llapi/mc/MinecraftGameTest.hpp | 5 + .../llapi/mc/MinecraftGameTestBatchRunner.hpp | 5 +- .../llapi/mc/MinecraftGameTestHelper.hpp | 5 +- .../mc/MinecraftGameTestHelperProvider.hpp | 1 + .../llapi/mc/MinecraftGameTestInstance.hpp | 4 - .../llapi/mc/MinecraftReportGameListener.hpp | 1 + LiteLoader/include/llapi/mc/MineshaftData.hpp | 35 -- LiteLoader/include/llapi/mc/MineshaftRoom.hpp | 4 - LiteLoader/include/llapi/mc/MineshaftUtil.hpp | 4 - LiteLoader/include/llapi/mc/Mob.hpp | 24 +- LiteLoader/include/llapi/mc/MobAnimation.hpp | 20 + LiteLoader/include/llapi/mc/MobEffect.hpp | 12 - .../include/llapi/mc/MobEffectInstance.hpp | 28 +- LiteLoader/include/llapi/mc/MobEvent.hpp | 8 +- .../include/llapi/mc/MobEventCommand.hpp | 2 +- .../llapi/mc/MobIsImmobileFilterSystem.hpp | 4 + .../llapi/mc/MobOnPlayerJumpSystem.hpp | 4 + LiteLoader/include/llapi/mc/MobPredicates.hpp | 32 ++ .../mc/MobResetPassengerYRotLimitSystem.hpp | 4 + .../llapi/mc/MobSetPreviousRotSystem.hpp | 4 + .../include/llapi/mc/MobSpawnerBlock.hpp | 51 +- .../llapi/mc/MobTravelUpdateSpeedsSystem.hpp | 4 + .../llapi/mc/MockUnknownBlockTypeRegistry.hpp | 43 -- .../include/llapi/mc/MolangActorArrayPtr.hpp | 4 + .../include/llapi/mc/MolangArrayVariable.hpp | 8 +- .../include/llapi/mc/MolangDescriptor.hpp | 8 +- .../include/llapi/mc/MolangEvalStackState.hpp | 32 -- .../include/llapi/mc/MolangMemberArray.hpp | 20 +- .../include/llapi/mc/MolangScriptArg.hpp | 12 +- .../include/llapi/mc/MolangVariable.hpp | 12 +- .../include/llapi/mc/MolangVariableMap.hpp | 28 - .../include/llapi/mc/MonsterAiStepSystem.hpp | 13 +- .../include/llapi/mc/MonsterEggBlock.hpp | 59 +- LiteLoader/include/llapi/mc/MossBlock.hpp | 47 +- LiteLoader/include/llapi/mc/Motive.hpp | 12 - .../llapi/mc/MoveActorAbsolutePacket.hpp | 8 +- .../include/llapi/mc/MoveCollisionSystem.hpp | 13 +- .../include/llapi/mc/MoveInputHandler.hpp | 39 +- .../include/llapi/mc/MoveInputState.hpp | 8 - .../include/llapi/mc/MovePlayerPacket.hpp | 8 +- .../include/llapi/mc/MoveRequestComponent.hpp | 4 - ...ardsClosestSpaceSystemFromActorContext.hpp | 8 + .../mc/MoveTowardsDwellingRestrictionGoal.hpp | 13 +- .../mc/MoveTowardsHomeRestrictionGoal.hpp | 13 +- .../mc/MoveTowardsRestrictionDefinition.hpp | 11 +- .../llapi/mc/MoveTowardsRestrictionGoal.hpp | 35 +- LiteLoader/include/llapi/mc/MovingBlock.hpp | 55 +- .../include/llapi/mc/MovingBlockActor.hpp | 28 - LiteLoader/include/llapi/mc/MudBlock.hpp | 49 +- LiteLoader/include/llapi/mc/MultiRecipe.hpp | 15 +- .../include/llapi/mc/MultifaceBlock.hpp | 65 ++- LiteLoader/include/llapi/mc/MushroomBlock.hpp | 55 +- LiteLoader/include/llapi/mc/MusicCommand.hpp | 2 +- LiteLoader/include/llapi/mc/MyceliumBlock.hpp | 57 +- .../include/llapi/mc/NBTSchemaWriter.hpp | 16 +- .../include/llapi/mc/NavigationComponent.hpp | 16 +- .../llapi/mc/NavigationTravelSystem.hpp | 4 + .../llapi/mc/NearestAttackableTargetGoal.hpp | 4 - .../include/llapi/mc/NetEventCallback.hpp | 12 + .../include/llapi/mc/NetherFungusBlock.hpp | 49 +- .../include/llapi/mc/NetherNetConnector.hpp | 16 +- .../llapi/mc/NetherNetTransportStub.hpp | 4 +- .../include/llapi/mc/NetherReactorBlock.hpp | 49 +- LiteLoader/include/llapi/mc/NetherSprouts.hpp | 53 +- .../include/llapi/mc/NetherWartBlock.hpp | 55 +- .../mc/NetheriteArmorEquippedListener.hpp | 5 + .../include/llapi/mc/NetherrackBlock.hpp | 72 +-- .../llapi/mc/NetworkChunkPublisher.hpp | 6 - .../mc/NetworkChunkPublisherUpdatePacket.hpp | 8 +- .../include/llapi/mc/NetworkIdentifier.hpp | 4 + .../mc/NetworkItemInstanceDescriptor.hpp | 8 +- .../llapi/mc/NetworkItemStackDescriptor.hpp | 16 +- LiteLoader/include/llapi/mc/NetworkSystem.hpp | 4 + .../include/llapi/mc/NewExecuteCommand.hpp | 2 +- LiteLoader/include/llapi/mc/NewLeafBlock.hpp | 63 ++- LiteLoader/include/llapi/mc/NewLogBlock.hpp | 87 +-- .../llapi/mc/NormalTickFilterSystem.hpp | 8 + LiteLoader/include/llapi/mc/NoteBlock.hpp | 49 +- LiteLoader/include/llapi/mc/Npc.hpp | 321 +++++------ LiteLoader/include/llapi/mc/NpcAction.hpp | 127 ----- .../include/llapi/mc/NpcActionsContainer.hpp | 61 -- .../include/llapi/mc/NpcCommandAction.hpp | 82 --- LiteLoader/include/llapi/mc/NpcComponent.hpp | 42 +- .../include/llapi/mc/NpcDialogueScene.hpp | 5 +- .../include/llapi/mc/NpcSceneDialogueData.hpp | 8 +- LiteLoader/include/llapi/mc/NpcUrlAction.hpp | 47 -- LiteLoader/include/llapi/mc/NyliumBlock.hpp | 51 +- LiteLoader/include/llapi/mc/Objective.hpp | 8 - .../include/llapi/mc/ObjectiveCriteria.hpp | 4 - LiteLoader/include/llapi/mc/ObserverBlock.hpp | 65 ++- LiteLoader/include/llapi/mc/ObsidianBlock.hpp | 55 +- .../include/llapi/mc/OceanRuinPieces.hpp | 4 - .../llapi/mc/OculusPlatformMessagePump.hpp | 32 ++ .../llapi/mc/OfferFlowerTickSystem.hpp | 4 + LiteLoader/include/llapi/mc/OldLeafBlock.hpp | 69 +-- LiteLoader/include/llapi/mc/OldLogBlock.hpp | 87 +-- .../llapi/mc/OnActorEnterVolumeComponent.hpp | 4 +- .../llapi/mc/OnActorEnterVolumeDefinition.hpp | 4 +- .../llapi/mc/OnActorLeaveVolumeComponent.hpp | 4 +- .../llapi/mc/OnActorLeaveVolumeDefinition.hpp | 4 +- LiteLoader/include/llapi/mc/OpCommand.hpp | 2 +- .../include/llapi/mc/OpenSignPacket.hpp | 67 +++ LiteLoader/include/llapi/mc/Option.hpp | 18 - LiteLoader/include/llapi/mc/OreBlock.hpp | 51 +- .../llapi/mc/OverworldBiomeBuilder.hpp | 4 - .../include/llapi/mc/OverworldDimension.hpp | 4 - .../llapi/mc/OverworldGeneratorMultinoise.hpp | 4 + .../include/llapi/mc/OverworldNoises3d.hpp | 4 - .../include/llapi/mc/OwnerStorageEntity.hpp | 8 +- LiteLoader/include/llapi/mc/POIBlueprint.hpp | 8 +- LiteLoader/include/llapi/mc/POIInstance.hpp | 52 -- LiteLoader/include/llapi/mc/Pack.hpp | 4 - .../include/llapi/mc/PackAccessStrategy.hpp | 28 +- .../llapi/mc/PackCapabilityRegistry.hpp | 5 - LiteLoader/include/llapi/mc/PackError.hpp | 5 +- LiteLoader/include/llapi/mc/PackIdVersion.hpp | 4 - LiteLoader/include/llapi/mc/PackInstance.hpp | 24 +- LiteLoader/include/llapi/mc/PackManifest.hpp | 129 ----- LiteLoader/include/llapi/mc/PackMetadata.hpp | 38 -- LiteLoader/include/llapi/mc/PackReport.hpp | 36 +- LiteLoader/include/llapi/mc/PackSettings.hpp | 5 +- .../include/llapi/mc/PackSettingsFactory.hpp | 5 + .../include/llapi/mc/PackSourceFactory.hpp | 30 - LiteLoader/include/llapi/mc/Packet.hpp | 8 +- LiteLoader/include/llapi/mc/PacketHeader.hpp | 35 -- .../llapi/mc/PacketViolationWarningPacket.hpp | 8 +- LiteLoader/include/llapi/mc/ParameterList.hpp | 5 - LiteLoader/include/llapi/mc/Parrot.hpp | 5 - .../llapi/mc/ParrotPostAIStepSystem.hpp | 43 -- LiteLoader/include/llapi/mc/Parser.hpp | 88 ++- .../include/llapi/mc/ParticleCommand.hpp | 2 +- .../mc/ParticleEventRequestQueueComponent.hpp | 4 - .../mc/PassengerFreezeMovementSystem.hpp | 4 + .../PassengerNeedsPostPositioningSystem.hpp | 4 + .../llapi/mc/PassengerPositionSelfSystem.hpp | 4 + .../include/llapi/mc/PathFinderHackUtils.hpp | 27 - .../include/llapi/mc/PathFinderUtils.hpp | 31 - .../include/llapi/mc/PathfinderNode.hpp | 20 +- .../llapi/mc/PauseScreenCapabilities.hpp | 13 +- .../mc/PendingRemovePassengersSystemImpl.hpp | 32 ++ .../include/llapi/mc/PerformEnvDeleter.hpp | 32 -- LiteLoader/include/llapi/mc/Performance.hpp | 32 ++ LiteLoader/include/llapi/mc/PerlinNoise.hpp | 16 +- .../include/llapi/mc/PerlinSimplexNoise.hpp | 16 +- .../include/llapi/mc/PermissionCommand.hpp | 2 +- .../include/llapi/mc/PermissionsHandler.hpp | 2 +- .../include/llapi/mc/PersistentBlendData.hpp | 39 -- .../llapi/mc/PersonaEmoteInputSystem.hpp | 8 +- .../llapi/mc/PetSleepWithOwnerGoal.hpp | 12 - .../llapi/mc/PillagerOutpostPieces.hpp | 4 - .../include/llapi/mc/PinkPetalsBlock.hpp | 297 ++++++++++ .../include/llapi/mc/PinkPetalsFeature.hpp | 39 ++ .../include/llapi/mc/PistonArmBlock.hpp | 53 +- LiteLoader/include/llapi/mc/PistonBlock.hpp | 65 ++- LiteLoader/include/llapi/mc/PlanksBlock.hpp | 67 ++- .../include/llapi/mc/PlayAnimationCommand.hpp | 2 +- .../include/llapi/mc/PlaySoundCommand.hpp | 2 +- LiteLoader/include/llapi/mc/Player.hpp | 69 +-- .../include/llapi/mc/PlayerActionPacket.hpp | 8 +- .../llapi/mc/PlayerAuthInputPacket.hpp | 8 +- .../include/llapi/mc/PlayerBlockActions.hpp | 16 - .../include/llapi/mc/PlayerCapabilities.hpp | 8 +- .../include/llapi/mc/PlayerCommandOrigin.hpp | 4 - .../include/llapi/mc/PlayerDataSystem.hpp | 12 +- .../include/llapi/mc/PlayerFetchUtils.hpp | 52 ++ .../include/llapi/mc/PlayerInventory.hpp | 52 +- .../include/llapi/mc/PlayerItemInUse.hpp | 65 +++ .../include/llapi/mc/PlayerListEntry.hpp | 21 +- .../include/llapi/mc/PlayerListManager.hpp | 52 ++ .../include/llapi/mc/PlayerMovement.hpp | 8 +- .../include/llapi/mc/PlayerNameValidator.hpp | 24 + .../llapi/mc/PlayerPreMobTravelSystem.hpp | 4 + .../llapi/mc/PlayerRespawnTelemetryData.hpp | 29 +- LiteLoader/include/llapi/mc/PlayerScore.hpp | 4 - .../include/llapi/mc/PlayerScoreboardId.hpp | 8 - .../include/llapi/mc/PlayerSleepManager.hpp | 55 ++ .../include/llapi/mc/PlayerUIContainer.hpp | 10 +- .../llapi/mc/PlayerUIContainerModelBase.hpp | 6 - LiteLoader/include/llapi/mc/PodzolBlock.hpp | 49 +- .../llapi/mc/PointedDripstoneBlock.hpp | 85 +-- .../llapi/mc/PoolElementStructurePiece.hpp | 12 - LiteLoader/include/llapi/mc/PortalBlock.hpp | 59 +- LiteLoader/include/llapi/mc/PortalForcer.hpp | 16 +- LiteLoader/include/llapi/mc/PortalRecord.hpp | 51 -- LiteLoader/include/llapi/mc/PortalShape.hpp | 4 - .../include/llapi/mc/PositionTrackingId.hpp | 8 - .../mc/PostFallDamageFinalizeMoveSystem.hpp | 4 + LiteLoader/include/llapi/mc/PotatoBlock.hpp | 63 ++- LiteLoader/include/llapi/mc/Potion.hpp | 8 +- LiteLoader/include/llapi/mc/PotionItem.hpp | 9 +- .../include/llapi/mc/PowderSnowBlock.hpp | 57 +- .../include/llapi/mc/PoweredRailBlock.hpp | 53 +- .../include/llapi/mc/PressurePlateBlock.hpp | 53 +- LiteLoader/include/llapi/mc/PrintStream.hpp | 10 + .../include/llapi/mc/PrismarineBlock.hpp | 59 +- .../include/llapi/mc/PrivateKeyManager.hpp | 4 - .../include/llapi/mc/ProjectileComponent.hpp | 8 +- .../include/llapi/mc/PropertiesSettings.hpp | 24 + LiteLoader/include/llapi/mc/PropertyBag.hpp | 8 +- .../include/llapi/mc/PropertyContainer.hpp | 28 - LiteLoader/include/llapi/mc/PropertyGroup.hpp | 4 - LiteLoader/include/llapi/mc/PumpkinBlock.hpp | 59 +- .../include/llapi/mc/QuartzBlockBlock.hpp | 67 ++- LiteLoader/include/llapi/mc/Quaternion.hpp | 32 ++ .../include/llapi/mc/QueryTargetCommand.hpp | 2 +- LiteLoader/include/llapi/mc/Raid.hpp | 4 + .../include/llapi/mc/RaidBossComponent.hpp | 4 + .../include/llapi/mc/RaidTriggerSystem.hpp | 4 + LiteLoader/include/llapi/mc/RailBlock.hpp | 53 +- .../include/llapi/mc/RakNetServerLocator.hpp | 4 - LiteLoader/include/llapi/mc/RakPeerHelper.hpp | 8 - LiteLoader/include/llapi/mc/RakTcpProxy.hpp | 5 +- LiteLoader/include/llapi/mc/RakWebSocket.hpp | 20 - .../llapi/mc/RakWebSocketDataFrame.hpp | 57 +- .../llapi/mc/RakWebSocketDataFrameHeader.hpp | 70 --- .../llapi/mc/RakWebSocketDataFrameParser.hpp | 8 - LiteLoader/include/llapi/mc/Random.hpp | 4 - .../include/llapi/mc/RandomDyeFunction.hpp | 5 - .../include/llapi/mc/RandomHoverGoal.hpp | 4 - .../include/llapi/mc/RangedAttackGoal.hpp | 8 - LiteLoader/include/llapi/mc/Recipe.hpp | 25 +- .../include/llapi/mc/RecipeCraftInputs.hpp | 4 - .../include/llapi/mc/RecipeIngredient.hpp | 21 +- .../llapi/mc/RecipeOptionalCraftInputs.hpp | 32 -- .../llapi/mc/RecipeUnlockingRequirement.hpp | 25 +- .../llapi/mc/RecipeUnlockingSystem.hpp | 32 ++ LiteLoader/include/llapi/mc/Recipes.hpp | 20 +- .../include/llapi/mc/RedStoneDustItem.hpp | 4 +- .../include/llapi/mc/RedStoneOreBlock.hpp | 67 ++- .../include/llapi/mc/RedStoneWireBlock.hpp | 67 ++- LiteLoader/include/llapi/mc/RedstoneBlock.hpp | 53 +- .../include/llapi/mc/RedstoneLampBlock.hpp | 53 +- .../include/llapi/mc/RedstoneTorchBlock.hpp | 63 ++- LiteLoader/include/llapi/mc/ReedBlock.hpp | 65 ++- LiteLoader/include/llapi/mc/RegistryKey.hpp | 16 - .../llapi/mc/ReinforcedDeepslateBlock.hpp | 47 +- LiteLoader/include/llapi/mc/ReloadCommand.hpp | 2 +- .../llapi/mc/RemoveAllPassengersSystem.hpp | 8 + .../include/llapi/mc/RemoveEntityPacket.hpp | 4 - .../llapi/mc/RemovePassengersComponent.hpp | 4 - .../llapi/mc/RemovePassengersSystemImpl.hpp | 4 + .../mc/RemovePassengersWithoutSeatSystem.hpp | 8 + .../llapi/mc/RenderOffsetsItemComponent.hpp | 9 +- .../llapi/mc/RenderingRidingOffsetInfo.hpp | 8 +- .../include/llapi/mc/RepairItemRecipe.hpp | 9 +- LiteLoader/include/llapi/mc/RepeaterBlock.hpp | 73 +-- .../include/llapi/mc/ReplaceItemCommand.hpp | 2 +- .../include/llapi/mc/ReplayStateConfig.hpp | 4 - .../llapi/mc/ResetActionStopSystem.hpp | 4 + LiteLoader/include/llapi/mc/ResetEventObj.hpp | 16 - .../llapi/mc/ResetFrictionModifierSystem.hpp | 4 +- .../llapi/mc/ResetPositionModeSystem.hpp | 4 + .../llapi/mc/ResetSlideOffSetSystem.hpp | 4 + .../include/llapi/mc/ResourceInformation.hpp | 8 +- .../include/llapi/mc/ResourceLocation.hpp | 16 +- .../include/llapi/mc/ResourceMetadata.hpp | 5 +- LiteLoader/include/llapi/mc/ResourcePack.hpp | 36 -- .../mc/ResourcePackFileUploadManager.hpp | 4 - .../include/llapi/mc/ResourcePackManager.hpp | 12 +- .../include/llapi/mc/ResourcePackStack.hpp | 8 - .../include/llapi/mc/ResourceSignature.hpp | 4 - .../include/llapi/mc/ResourceUriCommand.hpp | 2 +- .../include/llapi/mc/RespawnAnchorBlock.hpp | 69 +-- LiteLoader/include/llapi/mc/RespawnPacket.hpp | 8 +- LiteLoader/include/llapi/mc/RideCommand.hpp | 2 +- .../llapi/mc/RideJumpTriggerSystem.hpp | 4 + .../include/llapi/mc/RideableComponent.hpp | 16 +- .../llapi/mc/RiseToLiquidLevelGoal.hpp | 8 - .../include/llapi/mc/RootedDirtBlock.hpp | 49 +- LiteLoader/include/llapi/mc/RopeParams.hpp | 5 +- LiteLoader/include/llapi/mc/RopePoints.hpp | 24 - LiteLoader/include/llapi/mc/RopeSystem.hpp | 4 + .../include/llapi/mc/RotatedPillarBlock.hpp | 59 +- .../llapi/mc/RotatedPillarInfestedBlock.hpp | 51 +- .../include/llapi/mc/RotationCommandUtils.hpp | 4 +- LiteLoader/include/llapi/mc/RotationUtil.hpp | 8 +- LiteLoader/include/llapi/mc/SHStartPiece.hpp | 4 - LiteLoader/include/llapi/mc/SandBlock.hpp | 73 +-- .../include/llapi/mc/SandStoneBlock.hpp | 59 +- LiteLoader/include/llapi/mc/Sapling.hpp | 79 ++- LiteLoader/include/llapi/mc/SaplingUtils.hpp | 28 + LiteLoader/include/llapi/mc/SaveCommand.hpp | 2 +- LiteLoader/include/llapi/mc/SayCommand.hpp | 10 +- .../include/llapi/mc/ScaffoldingBlock.hpp | 71 +-- .../include/llapi/mc/ScaffoldingBlockItem.hpp | 4 +- LiteLoader/include/llapi/mc/ScatterParams.hpp | 4 - .../include/llapi/mc/ScheduleCommand.hpp | 2 +- .../llapi/mc/ScopedAutoreleasePool.hpp | 8 - LiteLoader/include/llapi/mc/Scoreboard.hpp | 24 +- .../include/llapi/mc/ScoreboardCommand.hpp | 2 +- LiteLoader/include/llapi/mc/ScoreboardId.hpp | 16 +- .../llapi/mc/ScoreboardIdentityRef.hpp | 4 - .../include/llapi/mc/ScreenHandlerBase.hpp | 8 - .../llapi/mc/ScriptActorGameplayHandler.hpp | 4 +- .../llapi/mc/ScriptBlockGameplayHandler.hpp | 8 +- .../include/llapi/mc/ScriptCommandOrigin.hpp | 4 +- .../include/llapi/mc/ScriptCommandUtils.hpp | 28 + .../include/llapi/mc/ScriptDebugger.hpp | 8 - .../llapi/mc/ScriptDebuggerTransport.hpp | 4 - .../llapi/mc/ScriptDebuggerWatchdog.hpp | 8 - .../llapi/mc/ScriptDeferredActionManager.hpp | 43 -- .../mc/ScriptDeferredEventCoordinator.hpp | 32 ++ .../llapi/mc/ScriptDeferredEventListener.hpp | 42 ++ .../include/llapi/mc/ScriptEventCommand.hpp | 2 +- .../llapi/mc/ScriptFormPromiseTracker.hpp | 5 +- .../llapi/mc/ScriptGameTestModuleFactory.hpp | 1 + .../llapi/mc/ScriptIdentityModuleFactory.hpp | 40 ++ .../llapi/mc/ScriptItemGameplayHandler.hpp | 12 +- LiteLoader/include/llapi/mc/ScriptMemory.hpp | 28 - .../mc/ScriptMinecraftCommonModuleFactory.hpp | 9 +- .../llapi/mc/ScriptMinecraftModuleFactory.hpp | 5 - .../mc/ScriptMinecraftNetModuleFactory.hpp | 4 + ...criptMinecraftServerAdminModuleFactory.hpp | 4 - .../llapi/mc/ScriptModuleMinecraft.hpp | 25 +- .../llapi/mc/ScriptModuleMinecraftUI.hpp | 25 + .../llapi/mc/ScriptPackConfiguration.hpp | 29 +- .../mc/ScriptPackConfigurationManager.hpp | 8 +- .../llapi/mc/ScriptPackPermissions.hpp | 13 +- LiteLoader/include/llapi/mc/ScriptPlugin.hpp | 40 -- .../llapi/mc/ScriptPluginHandleCounter.hpp | 12 - .../llapi/mc/ScriptPluginHandleStats.hpp | 8 +- .../include/llapi/mc/ScriptPluginManager.hpp | 22 +- .../mc/ScriptPluginPackSourceEnumerator.hpp | 9 - .../include/llapi/mc/ScriptPluginResult.hpp | 16 - .../include/llapi/mc/ScriptPluginUtils.hpp | 9 - .../include/llapi/mc/ScriptPrintLogger.hpp | 14 +- .../include/llapi/mc/ScriptResultUtil.hpp | 9 +- .../mc/ScriptServerNetworkEventHandler.hpp | 4 +- .../include/llapi/mc/ScriptTickListener.hpp | 50 +- .../include/llapi/mc/ScriptWatchdog.hpp | 28 - LiteLoader/include/llapi/mc/Scripting.hpp | 36 ++ LiteLoader/include/llapi/mc/SculkBlock.hpp | 51 +- .../include/llapi/mc/SculkCatalystBlock.hpp | 59 +- .../llapi/mc/SculkCatalystBlockActor.hpp | 4 +- .../include/llapi/mc/SculkChargeCursor.hpp | 16 +- .../include/llapi/mc/SculkSensorBlock.hpp | 75 +-- .../llapi/mc/SculkSensorBlockActor.hpp | 26 +- .../llapi/mc/SculkSensorVibrationConfig.hpp | 7 +- .../include/llapi/mc/SculkShriekerBlock.hpp | 67 ++- LiteLoader/include/llapi/mc/SculkSpreader.hpp | 24 - LiteLoader/include/llapi/mc/SculkUtils.hpp | 28 - .../include/llapi/mc/SculkVeinBlock.hpp | 57 +- .../llapi/mc/SculkVeinMultifaceSpreader.hpp | 5 - LiteLoader/include/llapi/mc/SeaGrass.hpp | 65 ++- .../include/llapi/mc/SeaLanternBlock.hpp | 51 +- LiteLoader/include/llapi/mc/SeaPickle.hpp | 71 +-- .../include/llapi/mc/SeaPickleBlockItem.hpp | 4 +- LiteLoader/include/llapi/mc/SemVersion.hpp | 8 +- .../include/llapi/mc/SendPacketsComponent.hpp | 4 - .../llapi/mc/SendPacketsSystemImpl.hpp | 4 + .../llapi/mc/SerializedAbilitiesData.hpp | 15 +- .../include/llapi/mc/SerializedSkin.hpp | 21 +- .../include/llapi/mc/SerializerContext.hpp | 8 +- .../include/llapi/mc/SerializerTraits.hpp | 8 +- .../include/llapi/mc/ServerAutoStepSystem.hpp | 9 +- LiteLoader/include/llapi/mc/ServerCommand.hpp | 4 - .../include/llapi/mc/ServerCommandOrigin.hpp | 4 - .../llapi/mc/ServerFileChunkUploader.hpp | 4 - .../mc/ServerGameplayUserManagerProxy.hpp | 44 ++ .../include/llapi/mc/ServerInstance.hpp | 4 +- LiteLoader/include/llapi/mc/ServerLevel.hpp | 44 +- .../llapi/mc/ServerNetworkController.hpp | 4 - .../include/llapi/mc/ServerNetworkHandler.hpp | 204 +++---- LiteLoader/include/llapi/mc/ServerPlayer.hpp | 29 +- .../mc/ServerPlayerMovementComponent.hpp | 4 - .../llapi/mc/ServerPlayerSleepManager.hpp | 81 +++ .../llapi/mc/ServerScriptDebugCommand.hpp | 2 +- .../llapi/mc/ServerStandInCauldronSystem.hpp | 4 + .../mc/ServerToClientHandshakePacket.hpp | 8 +- .../include/llapi/mc/SetActorDataPacket.hpp | 8 +- .../llapi/mc/SetActorLinkPacketSystemImpl.hpp | 4 + .../include/llapi/mc/SetBlockCommand.hpp | 2 +- .../include/llapi/mc/SetItemCountFunction.hpp | 5 - .../include/llapi/mc/SetMaxPlayersCommand.hpp | 2 +- .../llapi/mc/SetPreviousPositionSystem.hpp | 4 + .../llapi/mc/SetPreviousWalkDistSystem.hpp | 8 + .../include/llapi/mc/SetScorePacket.hpp | 8 +- .../llapi/mc/SetSpawnPositionPacket.hpp | 8 +- .../include/llapi/mc/SetTitlePacket.hpp | 8 +- .../include/llapi/mc/SetWorldSpawnCommand.hpp | 2 +- .../llapi/mc/SettingsScreenCapabilities.hpp | 10 +- .../llapi/mc/ShapedChemistryRecipe.hpp | 5 + LiteLoader/include/llapi/mc/ShapedRecipe.hpp | 18 +- .../llapi/mc/ShapelessChemistryRecipe.hpp | 5 + .../include/llapi/mc/ShapelessRecipe.hpp | 18 +- .../include/llapi/mc/ShareableComponent.hpp | 16 +- LiteLoader/include/llapi/mc/ShearsItem.hpp | 4 +- .../include/llapi/mc/SheepPreAIStepSystem.hpp | 4 + LiteLoader/include/llapi/mc/ShieldItem.hpp | 14 + LiteLoader/include/llapi/mc/ShieldRecipe.hpp | 83 +++ LiteLoader/include/llapi/mc/ShortTag.hpp | 5 +- LiteLoader/include/llapi/mc/ShovelItem.hpp | 4 +- .../include/llapi/mc/ShowCreditsPacket.hpp | 8 +- LiteLoader/include/llapi/mc/Shulker.hpp | 9 - .../include/llapi/mc/ShulkerBoxBlock.hpp | 59 +- .../include/llapi/mc/ShulkerBoxRecipe.hpp | 11 +- .../llapi/mc/ShulkerPostAiStepSystem.hpp | 4 + .../llapi/mc/SideBySideExtractionSystem.hpp | 4 +- .../llapi/mc/SideBySideLevelSystem.hpp | 36 ++ .../llapi/mc/SideBySideResultComponent.hpp | 4 - .../include/llapi/mc/SideBySideTrigger.hpp | 12 +- .../SideBySideValidationFailureComponent.hpp | 35 -- LiteLoader/include/llapi/mc/SignBlock.hpp | 70 ++- .../include/llapi/mc/SignBlockActor.hpp | 74 ++- LiteLoader/include/llapi/mc/SignItem.hpp | 4 +- .../include/llapi/mc/SimpleContainer.hpp | 22 +- .../llapi/mc/SimplePlayerContainer.hpp | 33 +- LiteLoader/include/llapi/mc/SimplexNoise.hpp | 4 - .../include/llapi/mc/SimulatedPlayer.hpp | 28 +- .../include/llapi/mc/SkinAdjustments.hpp | 34 -- LiteLoader/include/llapi/mc/SkullBlock.hpp | 61 +- LiteLoader/include/llapi/mc/SkullItem.hpp | 4 +- LiteLoader/include/llapi/mc/SlabBlock.hpp | 61 +- LiteLoader/include/llapi/mc/SlabBlockItem.hpp | 4 +- LiteLoader/include/llapi/mc/Slime.hpp | 4 - LiteLoader/include/llapi/mc/SlimeBlock.hpp | 55 +- .../llapi/mc/SlimePreNormalTickSystem.hpp | 4 + .../include/llapi/mc/SlotDescriptor.hpp | 8 +- .../include/llapi/mc/SmallDripleafBlock.hpp | 65 ++- .../include/llapi/mc/SmithingTableBlock.hpp | 49 +- .../mc/SmithingTableContainerManagerModel.hpp | 4 + .../SmithingTableInputContainerValidation.hpp | 4 +- ...ithingTableMaterialContainerValidation.hpp | 4 +- ...ithingTableTemplateContainerValidation.hpp | 79 +++ .../include/llapi/mc/SmithingTemplateItem.hpp | 114 ++++ .../llapi/mc/SmithingTemplateUtils.hpp | 56 ++ .../llapi/mc/SmithingTransformRecipe.hpp | 30 +- .../include/llapi/mc/SmithingTrimRecipe.hpp | 74 +++ .../llapi/mc/SmithingTrimRecipeUtils.hpp | 36 ++ LiteLoader/include/llapi/mc/SmokerBlock.hpp | 53 +- .../include/llapi/mc/SnapshotWritableFile.hpp | 4 - .../include/llapi/mc/SneakMovementSystem.hpp | 25 +- .../include/llapi/mc/SneakTriggerSystem.hpp | 12 +- .../include/llapi/mc/SneakingSystem.hpp | 5 + LiteLoader/include/llapi/mc/SnowBlock.hpp | 51 +- .../llapi/mc/SortItemInstanceIdAux.hpp | 8 +- LiteLoader/include/llapi/mc/SoulSandBlock.hpp | 51 +- .../llapi/mc/SoulSpeedAttributeSystem.hpp | 4 + .../include/llapi/mc/SoulTorchBlock.hpp | 55 +- .../mc/SoundEventRequestQueueComponent.hpp | 4 - .../include/llapi/mc/SoundEventSystem.hpp | 4 + .../include/llapi/mc/SparseContainer.hpp | 4 - .../llapi/mc/SpatialActorNetworkData.hpp | 16 - .../include/llapi/mc/SpawnActorParameters.hpp | 8 +- LiteLoader/include/llapi/mc/SpawnData.hpp | 8 +- .../include/llapi/mc/SpawnGroupRegistry.hpp | 55 -- .../include/llapi/mc/SpawnPointCommand.hpp | 2 +- LiteLoader/include/llapi/mc/Spawner.hpp | 12 - .../include/llapi/mc/SpinAttackSystem.hpp | 4 + LiteLoader/include/llapi/mc/SplitBlockIds.hpp | 28 - .../include/llapi/mc/SplitBlockUtils.hpp | 40 ++ LiteLoader/include/llapi/mc/SpongeBlock.hpp | 63 ++- LiteLoader/include/llapi/mc/SporeBlossom.hpp | 55 +- .../include/llapi/mc/SpreadPlayersCommand.hpp | 2 +- .../include/llapi/mc/SprintTimerSystem.hpp | 4 + .../include/llapi/mc/SprintTriggerSystem.hpp | 21 +- .../llapi/mc/SprintTriggerSystemImpl.hpp | 24 + LiteLoader/include/llapi/mc/SpyglassItem.hpp | 4 - .../llapi/mc/SquidPostAIStepSystem.hpp | 43 -- .../include/llapi/mc/SquidPreAiStepSystem.hpp | 4 + .../llapi/mc/StackResultStorageEntity.hpp | 8 +- .../include/llapi/mc/StainedGlassBlock.hpp | 61 +- .../llapi/mc/StainedGlassPaneBlock.hpp | 57 +- LiteLoader/include/llapi/mc/StairBlock.hpp | 71 +-- ...dingVehiclePostPositionPassengerSystem.hpp | 4 + .../include/llapi/mc/StartGlidingSystem.hpp | 17 +- .../llapi/mc/StartScreenCapabilities.hpp | 13 +- .../llapi/mc/StateAnimationVariable.hpp | 35 -- .../include/llapi/mc/StaticVanillaBlocks.hpp | 37 +- LiteLoader/include/llapi/mc/StemBlock.hpp | 65 ++- .../include/llapi/mc/StompBlockGoal.hpp | 4 - LiteLoader/include/llapi/mc/StompEggGoal.hpp | 4 - LiteLoader/include/llapi/mc/StoneBlock.hpp | 63 ++- .../include/llapi/mc/StoneBrickBlock.hpp | 61 +- .../include/llapi/mc/StoneButtonBlock.hpp | 47 +- .../include/llapi/mc/StoneSlabBlock.hpp | 63 ++- .../include/llapi/mc/StoneSlabBlock2.hpp | 63 ++- .../include/llapi/mc/StoneSlabBlock3.hpp | 63 ++- .../include/llapi/mc/StoneSlabBlock4.hpp | 63 ++- .../include/llapi/mc/StoneSlabBlockItem.hpp | 4 - .../include/llapi/mc/StonecutterBlock.hpp | 63 ++- LiteLoader/include/llapi/mc/StopCommand.hpp | 2 +- .../include/llapi/mc/StopSoundCommand.hpp | 2 +- .../include/llapi/mc/StopSoundPacket.hpp | 8 +- .../include/llapi/mc/StopwatchHandler.hpp | 32 ++ .../mc/StoreLocalMovementVelocitySystem.hpp | 4 + .../llapi/mc/StorePreviousRideStatsSystem.hpp | 4 + .../include/llapi/mc/StrictEntityContext.hpp | 8 +- .../llapi/mc/StrictEntityContextOwner.hpp | 4 - .../include/llapi/mc/StrippedLogBlock.hpp | 62 +- .../llapi/mc/StrollTowardsVillageGoal.hpp | 4 - .../llapi/mc/StructureAnimationAction.hpp | 4 - .../include/llapi/mc/StructureBlock.hpp | 51 +- .../llapi/mc/StructureBlockUpdatePacket.hpp | 8 +- .../include/llapi/mc/StructureCommand.hpp | 2 +- .../include/llapi/mc/StructureEditorData.hpp | 8 +- .../include/llapi/mc/StructureFeature.hpp | 59 -- .../include/llapi/mc/StructureHelpers.hpp | 20 - .../llapi/mc/StructureIntegrityProcessor.hpp | 4 - .../include/llapi/mc/StructurePiece.hpp | 2 +- .../llapi/mc/StructurePoolActorRule.hpp | 4 - .../StructurePoolBlockPredicateBlockMatch.hpp | 4 + ...dicateCappedArcheologyBlockReplacement.hpp | 44 ++ ...kPredicateCappedRandomBlockReplacement.hpp | 66 +++ .../llapi/mc/StructurePoolBlockRule.hpp | 4 + .../llapi/mc/StructurePoolBlockTagRule.hpp | 4 - .../include/llapi/mc/StructurePoolElement.hpp | 8 +- .../include/llapi/mc/StructureSettings.hpp | 28 +- .../include/llapi/mc/StructureStart.hpp | 4 - .../include/llapi/mc/StructureTemplate.hpp | 38 -- .../llapi/mc/StructureTemplateData.hpp | 36 -- LiteLoader/include/llapi/mc/StructureVoid.hpp | 47 +- .../include/llapi/mc/SubBBsComponent.hpp | 4 + LiteLoader/include/llapi/mc/SubChunk.hpp | 17 +- .../llapi/mc/SubChunkBrightnessStorage.hpp | 40 -- .../include/llapi/mc/SubChunkRelighter.hpp | 9 +- .../llapi/mc/SubClientConnectionRequest.hpp | 4 + .../llapi/mc/SubpackInfoCollection.hpp | 16 - LiteLoader/include/llapi/mc/SummonCommand.hpp | 11 +- .../SurfaceMaterialAdjustmentAttributes.hpp | 4 - LiteLoader/include/llapi/mc/SurvivalMode.hpp | 4 +- .../llapi/mc/SuspiciousSandBlockActor.hpp | 110 ---- .../include/llapi/mc/SuspiciousStewItem.hpp | 4 - LiteLoader/include/llapi/mc/SwamplandHut.hpp | 4 - .../include/llapi/mc/SweetBerryBushBlock.hpp | 69 +-- LiteLoader/include/llapi/mc/SwellGoal.hpp | 4 - .../include/llapi/mc/SwimIdleDefinition.hpp | 9 +- LiteLoader/include/llapi/mc/SwimIdleGoal.hpp | 4 - .../include/llapi/mc/SwimTriggerSystem.hpp | 17 +- .../include/llapi/mc/SwimWanderDefinition.hpp | 9 +- .../include/llapi/mc/SwimWanderGoal.hpp | 4 - .../llapi/mc/SwimWithEntityDefinition.hpp | 9 +- .../include/llapi/mc/SwimWithEntityGoal.hpp | 4 - .../llapi/mc/SwoopAttackDefinition.hpp | 9 +- .../include/llapi/mc/SwoopAttackGoal.hpp | 4 - .../llapi/mc/SyncActorPropertyPacket.hpp | 8 +- LiteLoader/include/llapi/mc/SystemInfo.hpp | 4 + LiteLoader/include/llapi/mc/Tag.hpp | 12 +- LiteLoader/include/llapi/mc/TagCommand.hpp | 2 +- .../include/llapi/mc/TagUpdateToken.hpp | 4 + .../include/llapi/mc/TakeItemActorPacket.hpp | 8 +- .../include/llapi/mc/TakePictureCommand.hpp | 2 +- LiteLoader/include/llapi/mc/TallGrass.hpp | 71 +-- LiteLoader/include/llapi/mc/TargetBlock.hpp | 78 ++- LiteLoader/include/llapi/mc/TargetGoal.hpp | 2 +- .../include/llapi/mc/TargetWhenPushedGoal.hpp | 4 - .../include/llapi/mc/TaskQueuePortImpl.hpp | 51 +- LiteLoader/include/llapi/mc/TaskResult.hpp | 13 - .../include/llapi/mc/TeleportCommand.hpp | 2 +- .../mc/TeleportInterpolatorResetSystem.hpp | 4 + LiteLoader/include/llapi/mc/TellCommand.hpp | 6 +- .../include/llapi/mc/TellRawCommand.hpp | 2 +- .../llapi/mc/TemplateStructurePiece.hpp | 2 +- .../llapi/mc/TemporalAttributeBuff.hpp | 4 - LiteLoader/include/llapi/mc/TemptGoal.hpp | 4 - LiteLoader/include/llapi/mc/TestAction.hpp | 5 +- .../include/llapi/mc/TestForBlockCommand.hpp | 2 +- .../include/llapi/mc/TestForBlocksCommand.hpp | 2 +- .../include/llapi/mc/TestForCommand.hpp | 2 +- .../include/llapi/mc/TestSummaryDisplayer.hpp | 1 + .../include/llapi/mc/TextFilteringUtils.hpp | 12 + .../mc/TextObjectLocalizedTextWithParams.hpp | 4 - .../include/llapi/mc/TextObjectParser.hpp | 4 + .../include/llapi/mc/TextObjectScore.hpp | 4 - .../include/llapi/mc/TextObjectSelector.hpp | 4 - LiteLoader/include/llapi/mc/TextPacket.hpp | 21 +- .../include/llapi/mc/TheEndDimension.hpp | 4 - .../include/llapi/mc/ThinFenceBlock.hpp | 55 +- LiteLoader/include/llapi/mc/TickUtil.hpp | 12 - .../include/llapi/mc/TickingAreaCommand.hpp | 2 +- .../include/llapi/mc/TickingAreaListBase.hpp | 28 - .../include/llapi/mc/TickingAreasManager.hpp | 4 + .../include/llapi/mc/TimeAccumulator.hpp | 9 +- LiteLoader/include/llapi/mc/TimeCommand.hpp | 2 +- LiteLoader/include/llapi/mc/TitleCommand.hpp | 2 +- LiteLoader/include/llapi/mc/TitleInfo.hpp | 32 ++ .../include/llapi/mc/TitleRawCommand.hpp | 2 +- LiteLoader/include/llapi/mc/TntBlock.hpp | 63 ++- .../llapi/mc/ToggleDownfallCommand.hpp | 2 +- LiteLoader/include/llapi/mc/TopSnowBlock.hpp | 83 +-- .../include/llapi/mc/TopSnowBlockItem.hpp | 8 +- LiteLoader/include/llapi/mc/TorchBlock.hpp | 67 ++- .../include/llapi/mc/TorchflowerCropBlock.hpp | 92 ++- .../llapi/mc/Trade2ContainerManagerModel.hpp | 4 - .../llapi/mc/TradeContainerManagerModel.hpp | 59 -- .../include/llapi/mc/TradeInterestGoal.hpp | 4 - .../include/llapi/mc/TradeWithPlayerGoal.hpp | 4 - .../include/llapi/mc/TrailRuinsFeature.hpp | 48 ++ .../include/llapi/mc/TrailRuinsPiece.hpp | 58 ++ .../include/llapi/mc/TrailRuinsStart.hpp | 39 ++ LiteLoader/include/llapi/mc/TrapDoorBlock.hpp | 59 +- LiteLoader/include/llapi/mc/TridentItem.hpp | 4 - .../include/llapi/mc/TrimDataPacket.hpp | 67 +++ LiteLoader/include/llapi/mc/TrimMaterial.hpp | 32 ++ .../include/llapi/mc/TrimMaterialRegistry.hpp | 44 ++ .../mc/TrimMaterialRegistryHardCodedInit.hpp | 24 + LiteLoader/include/llapi/mc/TrimPattern.hpp | 32 ++ .../include/llapi/mc/TrimPatternRegistry.hpp | 40 ++ .../mc/TrimPatternRegistryHardCodedInit.hpp | 24 + LiteLoader/include/llapi/mc/TripWireBlock.hpp | 61 +- .../include/llapi/mc/TripWireHookBlock.hpp | 65 ++- .../mc/TripodCameraActivatedComponent.hpp | 35 -- .../include/llapi/mc/TropicalFishInfo.hpp | 8 +- .../include/llapi/mc/TrustComponent.hpp | 8 - .../include/llapi/mc/TurtleEggBlock.hpp | 63 ++- .../include/llapi/mc/TwistingVinesBlock.hpp | 63 ++- .../include/llapi/mc/UnburiedConstraint.hpp | 55 ++ .../llapi/mc/UnderWaterSensingSystem.hpp | 15 +- .../include/llapi/mc/UnderwaterTorchBlock.hpp | 53 +- .../llapi/mc/UndyedShulkerBoxBlock.hpp | 59 +- LiteLoader/include/llapi/mc/UnknownBlock.hpp | 47 +- .../llapi/mc/UnlockedRecipesPacket.hpp | 10 + .../mc/UnlockedRecipesServerComponent.hpp | 84 +++ .../llapi/mc/UpdateBoundingBoxSystem.hpp | 4 + .../llapi/mc/UpdateClientInputLocksPacket.hpp | 10 + .../llapi/mc/UpdateMovingFlagSystem.hpp | 4 + .../llapi/mc/UpdateRenderPosSystem.hpp | 4 + .../include/llapi/mc/UpdateTradePacket.hpp | 8 +- .../include/llapi/mc/UpgradePatchHelpers.hpp | 27 - LiteLoader/include/llapi/mc/Util.hpp | 16 +- .../llapi/mc/VRRotateControlSystem.hpp | 4 + .../include/llapi/mc/VanillaBiomeNames.hpp | 4 + .../include/llapi/mc/VanillaBlockTags.hpp | 129 ++++- .../llapi/mc/VanillaBlockTypeGroups.hpp | 32 ++ .../include/llapi/mc/VanillaBlockTypeIds.hpp | 148 ++++- .../include/llapi/mc/VanillaBlockTypes.hpp | 92 --- .../include/llapi/mc/VanillaBlockUpdater.hpp | 4 + LiteLoader/include/llapi/mc/VanillaBlocks.hpp | 92 --- .../mc/VanillaEntityInitializerCommon.hpp | 16 - .../mc/VanillaEntityInitializerServer.hpp | 5 - .../llapi/mc/VanillaGameModuleServer.hpp | 17 +- .../include/llapi/mc/VanillaGameVersions.hpp | 4 + .../include/llapi/mc/VanillaItemNames.hpp | 184 +++++- .../include/llapi/mc/VanillaItemTags.hpp | 24 + .../llapi/mc/VanillaLevelChunkUpgrade.hpp | 8 - .../llapi/mc/VanillaServerCommands.hpp | 27 - .../mc/VanillaServerGameplayEventListener.hpp | 4 + .../llapi/mc/VanillaServerNetworkHandler.hpp | 5 - LiteLoader/include/llapi/mc/VanillaStates.hpp | 520 ++++++++--------- .../include/llapi/mc/VanillaTagMaps.hpp | 33 -- LiteLoader/include/llapi/mc/VanillaTags.hpp | 109 ---- ...llaTrailRuinsJigsawStructureBlockRules.hpp | 32 ++ ...nillaTrailRuinsJigsawStructureElements.hpp | 33 ++ .../mc/VanillaTrailRuinsJigsawStructures.hpp | 33 ++ .../include/llapi/mc/VanillaWorldSystems.hpp | 5 +- LiteLoader/include/llapi/mc/Vec4.hpp | 44 ++ .../VehicleServerMolangSeatPositionSystem.hpp | 4 + .../llapi/mc/VerticalCollisionSystem.hpp | 5 + .../include/llapi/mc/VexRandomMoveGoal.hpp | 4 - LiteLoader/include/llapi/mc/VibrationInfo.hpp | 16 - .../llapi/mc/VibrationListenerComponent.hpp | 4 - .../llapi/mc/VibrationListenerConfig.hpp | 18 +- .../llapi/mc/VibrationListenerUtils.hpp | 4 + .../include/llapi/mc/VibrationSelector.hpp | 17 +- LiteLoader/include/llapi/mc/Village.hpp | 24 - .../include/llapi/mc/VillageManager.hpp | 25 +- .../llapi/mc/VillagerCelebrationGoal.hpp | 4 - LiteLoader/include/llapi/mc/VineBlock.hpp | 71 +-- .../include/llapi/mc/VolumeAreaCommand.hpp | 2 +- .../include/llapi/mc/VolumeFogComponent.hpp | 4 - .../include/llapi/mc/WSServerCommand.hpp | 2 +- LiteLoader/include/llapi/mc/WallBlock.hpp | 77 +-- .../llapi/mc/WanderingTraderScheduler.hpp | 12 - .../llapi/mc/WarpedFungusOnAStickItem.hpp | 4 - .../llapi/mc/WaterAnimalPreAIStepSystem.hpp | 4 + .../include/llapi/mc/WaterLilyBlockItem.hpp | 8 +- .../include/llapi/mc/WaterlilyBlock.hpp | 55 +- .../include/llapi/mc/WeakStorageEntity.hpp | 16 +- LiteLoader/include/llapi/mc/WeaponItem.hpp | 4 - .../include/llapi/mc/WeatherCommand.hpp | 2 +- LiteLoader/include/llapi/mc/WebBlock.hpp | 55 +- .../include/llapi/mc/WebSocketPacketData.hpp | 8 +- .../include/llapi/mc/WeepingVinesBlock.hpp | 63 ++- .../llapi/mc/WeightedPressurePlateBlock.hpp | 55 +- .../include/llapi/mc/WitchPreAIStepSystem.hpp | 4 + .../llapi/mc/WitherBossPostAIStepSystem.hpp | 43 -- .../llapi/mc/WitherBossPreAIStepSystem.hpp | 4 + .../llapi/mc/WitherRandomAttackPosGoal.hpp | 4 - .../include/llapi/mc/WitherRoseBlock.hpp | 61 +- LiteLoader/include/llapi/mc/WoodBlock.hpp | 65 ++- .../include/llapi/mc/WoodButtonBlock.hpp | 47 +- LiteLoader/include/llapi/mc/WoodSlabBlock.hpp | 63 ++- .../include/llapi/mc/WoolCarpetBlock.hpp | 59 +- .../llapi/mc/WorkComposterDefinition.hpp | 4 - .../include/llapi/mc/WorkComposterGoal.hpp | 4 - .../include/llapi/mc/WorkDefinition.hpp | 10 +- .../include/llapi/mc/WorkbenchBlock.hpp | 55 +- LiteLoader/include/llapi/mc/WorkerPool.hpp | 4 - .../include/llapi/mc/WorldBuilderCommand.hpp | 2 +- LiteLoader/include/llapi/mc/WorldGenCache.hpp | 12 - .../mc/WorldGenClimateMappingAttributes.hpp | 4 - .../llapi/mc/WorldHistoryPackSource.hpp | 13 - .../include/llapi/mc/WorldPackHistory.hpp | 41 +- .../llapi/mc/WorldPacksHistoryFile.hpp | 51 -- .../llapi/mc/WorldTemplateLevelData.hpp | 48 -- .../llapi/mc/WorldTemplatePackManifest.hpp | 8 - .../include/llapi/mc/WritableBookItem.hpp | 4 - .../include/llapi/mc/WrittenBookItem.hpp | 4 - LiteLoader/include/llapi/mc/XPCommand.hpp | 2 +- .../llapi/mc/ZlibFileAccessWrapper.hpp | 4 - LiteLoader/include/llapi/mc/gametest.hpp | 39 ++ .../include/llapi/mc/hc_websocket_impl.hpp | 37 -- .../include/llapi/mc/http_header_compare.hpp | 32 -- LiteLoader/include/llapi/mc/inc/enums.inc | 311 +++++----- LiteLoader/include/llapi/mc/typeid_t.hpp | 118 ---- .../llapi/mc/winhttp_websocket_impl.hpp | 57 -- .../include/llapi/mc/wspp_websocket_impl.hpp | 4 +- LiteLoader/src/liteloader/BuiltinBugFix.cpp | 22 +- LiteLoader/src/llapi/EventAPI.cpp | 34 +- .../src/llapi/command/DynamicCommandAPI.cpp | 4 +- LiteLoader/src/llapi/mc/LevelAPI.cpp | 7 +- LiteLoader/src/llapi/mc/MolangAPI.cpp | 2 +- LiteLoader/src/llapi/mc/PlayerAPI.cpp | 12 +- .../src/llapi/mc/StaticVanillaBlocksAPI.cpp | 74 ++- LiteLoader/src/llapi/network/PacketAPI.cpp | 14 +- ScriptEngine/src/api/ItemAPI.cpp | 3 +- ScriptEngine/src/api/PlayerAPI.cpp | 4 +- scripts/LINK.txt | 2 +- 1647 files changed, 21696 insertions(+), 20088 deletions(-) delete mode 100644 LiteLoader/include/llapi/mc/ActionQueue.hpp create mode 100644 LiteLoader/include/llapi/mc/ActorIsRaiderTest.hpp create mode 100644 LiteLoader/include/llapi/mc/ActorParticleEffect.hpp create mode 100644 LiteLoader/include/llapi/mc/ActorPostAiStep.hpp create mode 100644 LiteLoader/include/llapi/mc/ActorPostAiStepTickSystem.hpp create mode 100644 LiteLoader/include/llapi/mc/ActorTargetFilter.hpp create mode 100644 LiteLoader/include/llapi/mc/ActorTerrainInterlockData.hpp create mode 100644 LiteLoader/include/llapi/mc/AdultRidingHeightOffsetComponent.hpp delete mode 100644 LiteLoader/include/llapi/mc/AllowedAnywhereConsume.hpp create mode 100644 LiteLoader/include/llapi/mc/AmethystBlockUtils.hpp delete mode 100644 LiteLoader/include/llapi/mc/AntiCheatTickShimSystem.hpp create mode 100644 LiteLoader/include/llapi/mc/ArmorTrim.hpp create mode 100644 LiteLoader/include/llapi/mc/ArmorTrimIconGenerationInfo.hpp create mode 100644 LiteLoader/include/llapi/mc/AssertHandlerContext.hpp delete mode 100644 LiteLoader/include/llapi/mc/BackwardsCompatTextureInfo.hpp delete mode 100644 LiteLoader/include/llapi/mc/BeardDescription.hpp delete mode 100644 LiteLoader/include/llapi/mc/BiomeSource.hpp delete mode 100644 LiteLoader/include/llapi/mc/BlockDisplayNameComponent.hpp create mode 100644 LiteLoader/include/llapi/mc/BlockHashPalette.hpp create mode 100644 LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierComponent.hpp delete mode 100644 LiteLoader/include/llapi/mc/BlockPartVisibilityComponent.hpp create mode 100644 LiteLoader/include/llapi/mc/BlockRegistryManager.hpp create mode 100644 LiteLoader/include/llapi/mc/BlockState.hpp create mode 100644 LiteLoader/include/llapi/mc/BlockStateInstance.hpp create mode 100644 LiteLoader/include/llapi/mc/BlockStateRegistry.hpp delete mode 100644 LiteLoader/include/llapi/mc/BlockStateVariant.hpp create mode 100644 LiteLoader/include/llapi/mc/BlockTransformationComponent.hpp create mode 100644 LiteLoader/include/llapi/mc/BlockTransformationDescription.hpp delete mode 100644 LiteLoader/include/llapi/mc/BodyControlComponent.hpp delete mode 100644 LiteLoader/include/llapi/mc/BoneAnimation.hpp delete mode 100644 LiteLoader/include/llapi/mc/BoneAnimationChannel.hpp delete mode 100644 LiteLoader/include/llapi/mc/BoneOrientationTransform.hpp create mode 100644 LiteLoader/include/llapi/mc/BossEventSubscriptionManager.hpp create mode 100644 LiteLoader/include/llapi/mc/BossEventSubscriptionManagerImpl.hpp create mode 100644 LiteLoader/include/llapi/mc/BrushEffectsCooldownComponent.hpp rename LiteLoader/include/llapi/mc/{SuspiciousSandBlock.hpp => BrushableBlock.hpp} (58%) create mode 100644 LiteLoader/include/llapi/mc/BrushableBlockActor.hpp create mode 100644 LiteLoader/include/llapi/mc/BrushableBlockUtils.hpp create mode 100644 LiteLoader/include/llapi/mc/BuiltInBlockStates.hpp delete mode 100644 LiteLoader/include/llapi/mc/BuryDescription.hpp create mode 100644 LiteLoader/include/llapi/mc/CalibratedSculkSensorBlock.hpp create mode 100644 LiteLoader/include/llapi/mc/CalibratedSculkSensorBlockActor.hpp create mode 100644 LiteLoader/include/llapi/mc/CalibratedSculkSensorVibrationConfig.hpp create mode 100644 LiteLoader/include/llapi/mc/CameraPreset.hpp create mode 100644 LiteLoader/include/llapi/mc/CherryLeafBlock.hpp create mode 100644 LiteLoader/include/llapi/mc/CherrySaplingBlock.hpp create mode 100644 LiteLoader/include/llapi/mc/CherryTreeCanopy.hpp create mode 100644 LiteLoader/include/llapi/mc/CherryTreeTrunk.hpp delete mode 100644 LiteLoader/include/llapi/mc/ChickenPostAIStepSystem.hpp create mode 100644 LiteLoader/include/llapi/mc/ChunkTickRangeManager.hpp create mode 100644 LiteLoader/include/llapi/mc/ClientInputUpdateSystemImpl.hpp create mode 100644 LiteLoader/include/llapi/mc/ClientSideChunkGeneration.hpp create mode 100644 LiteLoader/include/llapi/mc/CommandManager.hpp create mode 100644 LiteLoader/include/llapi/mc/CommandPermissionLevelConversion.hpp delete mode 100644 LiteLoader/include/llapi/mc/CommandSelectorUtil.hpp create mode 100644 LiteLoader/include/llapi/mc/ComplexAliasBlockAchievementEventHelper.hpp create mode 100644 LiteLoader/include/llapi/mc/CompressedBiomeDefinitionListPacket.hpp create mode 100644 LiteLoader/include/llapi/mc/ContainerManagerController.hpp delete mode 100644 LiteLoader/include/llapi/mc/ContainerValidationDebug.hpp delete mode 100644 LiteLoader/include/llapi/mc/ContainerValidationOperation.hpp delete mode 100644 LiteLoader/include/llapi/mc/ContextMessageLogger.hpp create mode 100644 LiteLoader/include/llapi/mc/CraftingContext.hpp create mode 100644 LiteLoader/include/llapi/mc/CustomBlockStateVariant.hpp delete mode 100644 LiteLoader/include/llapi/mc/DBLoggingUtils.hpp create mode 100644 LiteLoader/include/llapi/mc/DefaultPlayerNameValidator.hpp create mode 100644 LiteLoader/include/llapi/mc/DictionaryCompressionUtil.hpp delete mode 100644 LiteLoader/include/llapi/mc/DiffListPair.hpp create mode 100644 LiteLoader/include/llapi/mc/DirectionalProducerComponent.hpp create mode 100644 LiteLoader/include/llapi/mc/DoublePlantBaseBlock.hpp delete mode 100644 LiteLoader/include/llapi/mc/EnderDragonPostAIStepSystem.hpp delete mode 100644 LiteLoader/include/llapi/mc/EntitiesEnteredVolumeComponent.hpp delete mode 100644 LiteLoader/include/llapi/mc/EntitiesExitedVolumeComponent.hpp delete mode 100644 LiteLoader/include/llapi/mc/EntitiesInsideVolumeComponent.hpp delete mode 100644 LiteLoader/include/llapi/mc/EntitiesPendingEnterVolumeComponent.hpp delete mode 100644 LiteLoader/include/llapi/mc/EntityGlobalComponentsUtility.hpp delete mode 100644 LiteLoader/include/llapi/mc/EntitySystemsCollection.hpp delete mode 100644 LiteLoader/include/llapi/mc/ExpectedAnywhereConsume.hpp create mode 100644 LiteLoader/include/llapi/mc/ExternalDataComponent.hpp create mode 100644 LiteLoader/include/llapi/mc/ExternalDataServerLevel.hpp delete mode 100644 LiteLoader/include/llapi/mc/ExternalFileLevelStorageMetadata.hpp delete mode 100644 LiteLoader/include/llapi/mc/GameEventContext.hpp create mode 100644 LiteLoader/include/llapi/mc/GameplayUserManagerProxy.hpp create mode 100644 LiteLoader/include/llapi/mc/GameplayUserSuspension.hpp delete mode 100644 LiteLoader/include/llapi/mc/HC_WEBSOCKET.hpp create mode 100644 LiteLoader/include/llapi/mc/HC_WEBSOCKET_OBSERVER.hpp create mode 100644 LiteLoader/include/llapi/mc/IStructurePoolBlockPredicate.hpp create mode 100644 LiteLoader/include/llapi/mc/ITickingSystem.hpp create mode 100644 LiteLoader/include/llapi/mc/InputPermissionCommand.hpp create mode 100644 LiteLoader/include/llapi/mc/InsideBubbleColumnSystemImpl.hpp create mode 100644 LiteLoader/include/llapi/mc/IsTakingFireDamageTest.hpp delete mode 100644 LiteLoader/include/llapi/mc/ItemStackBaseComponentsHelper.hpp delete mode 100644 LiteLoader/include/llapi/mc/ItemState.hpp delete mode 100644 LiteLoader/include/llapi/mc/ItemStateInstance.hpp delete mode 100644 LiteLoader/include/llapi/mc/JigsawJunction.hpp delete mode 100644 LiteLoader/include/llapi/mc/LegacyStructureActorInfo.hpp delete mode 100644 LiteLoader/include/llapi/mc/LegacyStructureBlockInfo.hpp create mode 100644 LiteLoader/include/llapi/mc/LevelProvider.hpp create mode 100644 LiteLoader/include/llapi/mc/LevelStorageEventingContext.hpp delete mode 100644 LiteLoader/include/llapi/mc/LootPoolTiers.hpp create mode 100644 LiteLoader/include/llapi/mc/LowMemoryWatcher.hpp create mode 100644 LiteLoader/include/llapi/mc/MC_ANONYMOUS.hpp delete mode 100644 LiteLoader/include/llapi/mc/MineshaftData.hpp create mode 100644 LiteLoader/include/llapi/mc/MobPredicates.hpp delete mode 100644 LiteLoader/include/llapi/mc/MockUnknownBlockTypeRegistry.hpp delete mode 100644 LiteLoader/include/llapi/mc/MolangEvalStackState.hpp delete mode 100644 LiteLoader/include/llapi/mc/NpcAction.hpp delete mode 100644 LiteLoader/include/llapi/mc/NpcActionsContainer.hpp delete mode 100644 LiteLoader/include/llapi/mc/NpcCommandAction.hpp delete mode 100644 LiteLoader/include/llapi/mc/NpcUrlAction.hpp create mode 100644 LiteLoader/include/llapi/mc/OculusPlatformMessagePump.hpp create mode 100644 LiteLoader/include/llapi/mc/OpenSignPacket.hpp delete mode 100644 LiteLoader/include/llapi/mc/PackMetadata.hpp delete mode 100644 LiteLoader/include/llapi/mc/PacketHeader.hpp delete mode 100644 LiteLoader/include/llapi/mc/ParrotPostAIStepSystem.hpp delete mode 100644 LiteLoader/include/llapi/mc/PathFinderHackUtils.hpp delete mode 100644 LiteLoader/include/llapi/mc/PathFinderUtils.hpp create mode 100644 LiteLoader/include/llapi/mc/PendingRemovePassengersSystemImpl.hpp delete mode 100644 LiteLoader/include/llapi/mc/PerformEnvDeleter.hpp create mode 100644 LiteLoader/include/llapi/mc/Performance.hpp delete mode 100644 LiteLoader/include/llapi/mc/PersistentBlendData.hpp create mode 100644 LiteLoader/include/llapi/mc/PinkPetalsBlock.hpp create mode 100644 LiteLoader/include/llapi/mc/PinkPetalsFeature.hpp create mode 100644 LiteLoader/include/llapi/mc/PlayerFetchUtils.hpp create mode 100644 LiteLoader/include/llapi/mc/PlayerItemInUse.hpp create mode 100644 LiteLoader/include/llapi/mc/PlayerListManager.hpp create mode 100644 LiteLoader/include/llapi/mc/PlayerNameValidator.hpp create mode 100644 LiteLoader/include/llapi/mc/PlayerSleepManager.hpp delete mode 100644 LiteLoader/include/llapi/mc/PortalRecord.hpp create mode 100644 LiteLoader/include/llapi/mc/Quaternion.hpp delete mode 100644 LiteLoader/include/llapi/mc/RakWebSocketDataFrameHeader.hpp delete mode 100644 LiteLoader/include/llapi/mc/RecipeOptionalCraftInputs.hpp create mode 100644 LiteLoader/include/llapi/mc/RecipeUnlockingSystem.hpp create mode 100644 LiteLoader/include/llapi/mc/SaplingUtils.hpp create mode 100644 LiteLoader/include/llapi/mc/ScriptCommandUtils.hpp delete mode 100644 LiteLoader/include/llapi/mc/ScriptDeferredActionManager.hpp create mode 100644 LiteLoader/include/llapi/mc/ScriptDeferredEventCoordinator.hpp create mode 100644 LiteLoader/include/llapi/mc/ScriptDeferredEventListener.hpp create mode 100644 LiteLoader/include/llapi/mc/ScriptIdentityModuleFactory.hpp delete mode 100644 LiteLoader/include/llapi/mc/ScriptMemory.hpp create mode 100644 LiteLoader/include/llapi/mc/ScriptModuleMinecraftUI.hpp delete mode 100644 LiteLoader/include/llapi/mc/ScriptWatchdog.hpp create mode 100644 LiteLoader/include/llapi/mc/ServerGameplayUserManagerProxy.hpp create mode 100644 LiteLoader/include/llapi/mc/ServerPlayerSleepManager.hpp create mode 100644 LiteLoader/include/llapi/mc/ShieldRecipe.hpp create mode 100644 LiteLoader/include/llapi/mc/SideBySideLevelSystem.hpp delete mode 100644 LiteLoader/include/llapi/mc/SideBySideValidationFailureComponent.hpp delete mode 100644 LiteLoader/include/llapi/mc/SkinAdjustments.hpp create mode 100644 LiteLoader/include/llapi/mc/SmithingTableTemplateContainerValidation.hpp create mode 100644 LiteLoader/include/llapi/mc/SmithingTemplateItem.hpp create mode 100644 LiteLoader/include/llapi/mc/SmithingTemplateUtils.hpp create mode 100644 LiteLoader/include/llapi/mc/SmithingTrimRecipe.hpp create mode 100644 LiteLoader/include/llapi/mc/SmithingTrimRecipeUtils.hpp delete mode 100644 LiteLoader/include/llapi/mc/SplitBlockIds.hpp create mode 100644 LiteLoader/include/llapi/mc/SplitBlockUtils.hpp create mode 100644 LiteLoader/include/llapi/mc/SprintTriggerSystemImpl.hpp delete mode 100644 LiteLoader/include/llapi/mc/SquidPostAIStepSystem.hpp delete mode 100644 LiteLoader/include/llapi/mc/StateAnimationVariable.hpp create mode 100644 LiteLoader/include/llapi/mc/StopwatchHandler.hpp create mode 100644 LiteLoader/include/llapi/mc/StructurePoolBlockPredicateCappedArcheologyBlockReplacement.hpp create mode 100644 LiteLoader/include/llapi/mc/StructurePoolBlockPredicateCappedRandomBlockReplacement.hpp delete mode 100644 LiteLoader/include/llapi/mc/SubChunkBrightnessStorage.hpp delete mode 100644 LiteLoader/include/llapi/mc/SuspiciousSandBlockActor.hpp create mode 100644 LiteLoader/include/llapi/mc/TitleInfo.hpp create mode 100644 LiteLoader/include/llapi/mc/TrailRuinsFeature.hpp create mode 100644 LiteLoader/include/llapi/mc/TrailRuinsPiece.hpp create mode 100644 LiteLoader/include/llapi/mc/TrailRuinsStart.hpp create mode 100644 LiteLoader/include/llapi/mc/TrimDataPacket.hpp create mode 100644 LiteLoader/include/llapi/mc/TrimMaterial.hpp create mode 100644 LiteLoader/include/llapi/mc/TrimMaterialRegistry.hpp create mode 100644 LiteLoader/include/llapi/mc/TrimMaterialRegistryHardCodedInit.hpp create mode 100644 LiteLoader/include/llapi/mc/TrimPattern.hpp create mode 100644 LiteLoader/include/llapi/mc/TrimPatternRegistry.hpp create mode 100644 LiteLoader/include/llapi/mc/TrimPatternRegistryHardCodedInit.hpp delete mode 100644 LiteLoader/include/llapi/mc/TripodCameraActivatedComponent.hpp create mode 100644 LiteLoader/include/llapi/mc/UnlockedRecipesServerComponent.hpp delete mode 100644 LiteLoader/include/llapi/mc/UpgradePatchHelpers.hpp create mode 100644 LiteLoader/include/llapi/mc/VanillaBlockTypeGroups.hpp delete mode 100644 LiteLoader/include/llapi/mc/VanillaServerCommands.hpp delete mode 100644 LiteLoader/include/llapi/mc/VanillaTagMaps.hpp delete mode 100644 LiteLoader/include/llapi/mc/VanillaTags.hpp create mode 100644 LiteLoader/include/llapi/mc/VanillaTrailRuinsJigsawStructureBlockRules.hpp create mode 100644 LiteLoader/include/llapi/mc/VanillaTrailRuinsJigsawStructureElements.hpp create mode 100644 LiteLoader/include/llapi/mc/VanillaTrailRuinsJigsawStructures.hpp create mode 100644 LiteLoader/include/llapi/mc/Vec4.hpp delete mode 100644 LiteLoader/include/llapi/mc/WitherBossPostAIStepSystem.hpp delete mode 100644 LiteLoader/include/llapi/mc/WorldPacksHistoryFile.hpp create mode 100644 LiteLoader/include/llapi/mc/gametest.hpp delete mode 100644 LiteLoader/include/llapi/mc/hc_websocket_impl.hpp delete mode 100644 LiteLoader/include/llapi/mc/http_header_compare.hpp delete mode 100644 LiteLoader/include/llapi/mc/typeid_t.hpp delete mode 100644 LiteLoader/include/llapi/mc/winhttp_websocket_impl.hpp diff --git a/LiteLoader/include/liteloader/Version.h b/LiteLoader/include/liteloader/Version.h index a99d79bddd..b4bd2e0540 100644 --- a/LiteLoader/include/liteloader/Version.h +++ b/LiteLoader/include/liteloader/Version.h @@ -5,13 +5,13 @@ #define LITELOADER_VERSION_RELEASE 2 #define LITELOADER_VERSION_MAJOR 2 -#define LITELOADER_VERSION_MINOR 12 -#define LITELOADER_VERSION_REVISION 4 +#define LITELOADER_VERSION_MINOR 13 +#define LITELOADER_VERSION_REVISION 0 #define LITELOADER_VERSION_COMMIT_SHA UNKNOWN #define LITELOADER_VERSION_STATUS LITELOADER_VERSION_DEV #define LITELOADER_VERSION_STATUS_VERSION 0 -#define TARGET_BDS_PROTOCOL_VERSION 575 +#define TARGET_BDS_PROTOCOL_VERSION 582 #define LITELOADER_VERSION ll::getLoaderVersion() diff --git a/LiteLoader/include/llapi/DynamicCommandAPI.h b/LiteLoader/include/llapi/DynamicCommandAPI.h index 6dff862c45..53c82ae51a 100644 --- a/LiteLoader/include/llapi/DynamicCommandAPI.h +++ b/LiteLoader/include/llapi/DynamicCommandAPI.h @@ -403,8 +403,8 @@ class DynamicCommand : public Command { } template CommandParameterData makeParameterData() const { - CommandParameterData param{ - type == ParameterType::Enum ? typeid_t::count++ : type_id(), + CommandParameterData param{type == ParameterType::Enum ? Bedrock::typeid_t::count++ + : Bedrock::type_id(), type == ParameterType::Enum ? &CommandRegistry::fakeParse : CommandRegistry::getParseFn(), name, getCommandParameterDataType(), diff --git a/LiteLoader/include/llapi/RegCommandAPI.h b/LiteLoader/include/llapi/RegCommandAPI.h index 7f66806bb6..4a8196ff8b 100644 --- a/LiteLoader/include/llapi/RegCommandAPI.h +++ b/LiteLoader/include/llapi/RegCommandAPI.h @@ -30,7 +30,7 @@ template static CommandParameterData makeMandatory(Type Command::*field, std::string name, bool Command::*isSet = nullptr) { return { - type_id(), + Bedrock::type_id(), CommandRegistry::getParseFn(), name, CommandParameterDataType::NORMAL, @@ -44,7 +44,7 @@ template static CommandParameterData makeMandatory(Type Command::*field, std::string name, char const* desc = nullptr, bool Command::*isSet = nullptr) { return { - type_id(), + Bedrock::type_id(), CommandRegistry::getParseFn(), name, DataType, @@ -56,10 +56,10 @@ static CommandParameterData } template static CommandParameterData makeOptional(Type Command::*field, std::string name, bool Command::*isSet = nullptr) { - typeid_t tpid{0}; + Bedrock::typeid_t tpid{0}; return { - type_id(), + Bedrock::type_id(), CommandRegistry::getParseFn(), name, CommandParameterDataType::NORMAL, @@ -74,7 +74,7 @@ static CommandParameterData makeOptional(Type Command::*field, std::string name, char const* desc = nullptr, bool Command::*isSet = nullptr) { return { - type_id(), + Bedrock::type_id(), CommandRegistry::getParseFn(), name, DataType, diff --git a/LiteLoader/include/llapi/mc/AABBBucket.hpp b/LiteLoader/include/llapi/mc/AABBBucket.hpp index 75ec0b0a6e..c109206846 100644 --- a/LiteLoader/include/llapi/mc/AABBBucket.hpp +++ b/LiteLoader/include/llapi/mc/AABBBucket.hpp @@ -25,36 +25,13 @@ struct AABBBucket { public: struct AABBBucket& operator=(struct AABBBucket const &) = delete; AABBBucket(struct AABBBucket const &) = delete; + AABBBucket() = delete; #endif public: - /** - * @symbol ??0AABBBucket\@\@QEAA\@XZ - */ - MCAPI AABBBucket(); - /** - * @symbol ?clearDirty\@AABBBucket\@\@QEAAXXZ - */ - MCAPI void clearDirty(); - /** - * @symbol ?clearNeedsFinalize\@AABBBucket\@\@QEAAXXZ - */ - MCAPI void clearNeedsFinalize(); - /** - * @symbol ?isDirty\@AABBBucket\@\@QEAA_NXZ - */ - MCAPI bool isDirty(); - /** - * @symbol ?markDirty\@AABBBucket\@\@QEAAXXZ - */ - MCAPI void markDirty(); /** * @symbol ?mergeAABBs\@AABBBucket\@\@QEAAXXZ */ MCAPI void mergeAABBs(); - /** - * @symbol ?needsFinalize\@AABBBucket\@\@QEBA_NXZ - */ - MCAPI bool needsFinalize() const; }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Abilities.hpp b/LiteLoader/include/llapi/mc/Abilities.hpp index 437fd28256..57a1837dbe 100644 --- a/LiteLoader/include/llapi/mc/Abilities.hpp +++ b/LiteLoader/include/llapi/mc/Abilities.hpp @@ -49,14 +49,6 @@ class Abilities { * @symbol ?forEachAbility\@Abilities\@\@QEBAXAEBV?$function\@$$A6AXAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z\@std\@\@W4Options\@Ability\@\@\@Z */ MCAPI void forEachAbility(class std::function const &, enum class Ability::Options) const; - /** - * @symbol ?getAbility\@Abilities\@\@QEAAAEAVAbility\@\@W4AbilitiesIndex\@\@\@Z - */ - MCAPI class Ability & getAbility(enum class AbilitiesIndex); - /** - * @symbol ?getAbility\@Abilities\@\@QEBAAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z - */ - MCAPI class Ability const & getAbility(enum class AbilitiesIndex) const; /** * @symbol ?getBool\@Abilities\@\@QEBA_NW4AbilitiesIndex\@\@\@Z */ @@ -77,14 +69,6 @@ class Abilities { * @symbol ??4Abilities\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class Abilities & operator=(class Abilities const &); - /** - * @symbol ?setAbility\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@AEBVAbility\@\@\@Z - */ - MCAPI void setAbility(enum class AbilitiesIndex, class Ability const &); - /** - * @symbol ?setAbility\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@M\@Z - */ - MCAPI void setAbility(enum class AbilitiesIndex, float); /** * @symbol ?setAbility\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/Ability.hpp b/LiteLoader/include/llapi/mc/Ability.hpp index c62f5ab293..43251048e2 100644 --- a/LiteLoader/include/llapi/mc/Ability.hpp +++ b/LiteLoader/include/llapi/mc/Ability.hpp @@ -31,14 +31,14 @@ class Ability { #endif public: - /** - * @symbol ??0Ability\@\@QEAA\@XZ - */ - MCAPI Ability(); /** * @symbol ??0Ability\@\@QEAA\@_NW4Options\@0\@\@Z */ MCAPI Ability(bool, enum class Ability::Options); + /** + * @symbol ??0Ability\@\@QEAA\@XZ + */ + MCAPI Ability(); /** * @symbol ?getBool\@Ability\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/AbilityCommand.hpp b/LiteLoader/include/llapi/mc/AbilityCommand.hpp index 57b5469794..8d06441766 100644 --- a/LiteLoader/include/llapi/mc/AbilityCommand.hpp +++ b/LiteLoader/include/llapi/mc/AbilityCommand.hpp @@ -36,7 +36,7 @@ class AbilityCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@AbilityCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/AbsorptionMobEffect.hpp b/LiteLoader/include/llapi/mc/AbsorptionMobEffect.hpp index e1e1b04867..581cf7ff8a 100644 --- a/LiteLoader/include/llapi/mc/AbsorptionMobEffect.hpp +++ b/LiteLoader/include/llapi/mc/AbsorptionMobEffect.hpp @@ -45,9 +45,5 @@ class AbsorptionMobEffect : public MobEffect { * @symbol ?removeEffects\@AbsorptionMobEffect\@\@UEAAXPEAVActor\@\@\@Z */ virtual void removeEffects(class Actor *); - /** - * @symbol ??0AbsorptionMobEffect\@\@QEAA\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_NHH\@Z - */ - MCAPI AbsorptionMobEffect(int, std::string const &, std::string const &, bool, int, int); }; diff --git a/LiteLoader/include/llapi/mc/AbstractCandleBlock.hpp b/LiteLoader/include/llapi/mc/AbstractCandleBlock.hpp index 7fa38d1786..d94fa9bf88 100644 --- a/LiteLoader/include/llapi/mc/AbstractCandleBlock.hpp +++ b/LiteLoader/include/llapi/mc/AbstractCandleBlock.hpp @@ -196,30 +196,30 @@ class AbstractCandleBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 152 * @symbol ?animateTick\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 153 + * @vftbl 154 * @symbol ?getLightEmission\@AbstractCandleBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -231,74 +231,50 @@ class AbstractCandleBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 194 + * @vftbl 195 * @symbol ?_getNumCandles\@AbstractCandleBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int _getNumCandles(class Block const &) const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?_iterateCandles\@AbstractCandleBlock\@\@MEBAXAEBVBlock\@\@AEBVBlockPos\@\@V?$function\@$$A6AXAEBVVec3\@\@H\@Z\@std\@\@\@Z */ virtual void _iterateCandles(class Block const &, class BlockPos const &, class std::function) const; /** - * @vftbl 196 + * @vftbl 197 * @symbol ?_tryLightOnFire\@AbstractCandleBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void _tryLightOnFire(class BlockSource &, class BlockPos const &, class Actor *) const; - /** - * @vftbl 197 - * @symbol __unk_vfn_197 - */ - virtual void __unk_vfn_197(); - /** - * @vftbl 198 - * @symbol __unk_vfn_198 - */ - virtual void __unk_vfn_198(); - /** - * @vftbl 199 - * @symbol __unk_vfn_199 - */ - virtual void __unk_vfn_199(); - /** - * @vftbl 200 - * @symbol __unk_vfn_200 - */ - virtual void __unk_vfn_200(); - /** - * @vftbl 201 - * @symbol __unk_vfn_201 - */ - virtual void __unk_vfn_201(); - /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getDescriptionId() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ABSTRACTCANDLEBLOCK /** * @symbol ?canBeSilkTouched\@AbstractCandleBlock\@\@UEBA_NXZ @@ -339,10 +315,6 @@ class AbstractCandleBlock : public BlockLegacy { * @symbol ?_isLit\@AbstractCandleBlock\@\@KA_NAEBVBlock\@\@\@Z */ MCAPI static bool _isLit(class Block const &); - /** - * @symbol ?_setLit\@AbstractCandleBlock\@\@KAXAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z - */ - MCAPI static void _setLit(class Block const &, class BlockSource &, class BlockPos const &, bool); protected: diff --git a/LiteLoader/include/llapi/mc/AcaciaTreeCanopy.hpp b/LiteLoader/include/llapi/mc/AcaciaTreeCanopy.hpp index 325009cffe..eba0e98ba2 100644 --- a/LiteLoader/include/llapi/mc/AcaciaTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/AcaciaTreeCanopy.hpp @@ -41,4 +41,12 @@ class AcaciaTreeCanopy { */ virtual class std::optional placeCanopy(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &, struct TreeHelper::TreeParams const &, std::vector const &) const; +//private: + /** + * @symbol ?_placeLeaf\@AcaciaTreeCanopy\@\@AEBAXAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@AEBUTreeParams\@TreeHelper\@\@\@Z + */ + MCAPI void _placeLeaf(class IBlockWorldGenAPI &, class BlockPos const &, class gsl::not_null, struct TreeHelper::TreeParams const &) const; + +private: + }; diff --git a/LiteLoader/include/llapi/mc/AccessRecordingConstBlockSource.hpp b/LiteLoader/include/llapi/mc/AccessRecordingConstBlockSource.hpp index 6910e5d3cf..b768a1c28a 100644 --- a/LiteLoader/include/llapi/mc/AccessRecordingConstBlockSource.hpp +++ b/LiteLoader/include/llapi/mc/AccessRecordingConstBlockSource.hpp @@ -133,10 +133,6 @@ class AccessRecordingConstBlockSource { */ MCVAPI ~AccessRecordingConstBlockSource(); #endif - /** - * @symbol ??0AccessRecordingConstBlockSource\@\@QEAA\@V?$not_null\@PEBVIConstBlockSource\@\@\@gsl\@\@\@Z - */ - MCAPI AccessRecordingConstBlockSource(class gsl::not_null); /** * @symbol ?takeAccessedBlocks\@AccessRecordingConstBlockSource\@\@QEHAA?AUAccessedBlockSourceBlocks\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ActionQueue.hpp b/LiteLoader/include/llapi/mc/ActionQueue.hpp deleted file mode 100644 index 29c796fcb5..0000000000 --- a/LiteLoader/include/llapi/mc/ActionQueue.hpp +++ /dev/null @@ -1,38 +0,0 @@ -/** - * @file ActionQueue.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ActionQueue. - * - */ -class ActionQueue { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTIONQUEUE -public: - class ActionQueue& operator=(class ActionQueue const &) = delete; - ActionQueue(class ActionQueue const &) = delete; -#endif - -public: - /** - * @symbol ??0ActionQueue\@\@QEAA\@XZ - */ - MCAPI ActionQueue(); - /** - * @symbol ?pushBackActionEvent\@ActionQueue\@\@QEAAXVActionEvent\@\@\@Z - */ - MCAPI void pushBackActionEvent(class ActionEvent); - -}; diff --git a/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp b/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp index a20e798b95..728441b101 100644 --- a/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp @@ -181,25 +181,25 @@ class ActivatorRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 - * @symbol ?getVariant\@ActivatorRailBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 147 + * @symbol ?getVariant\@ActivatorRailBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,25 +211,30 @@ class ActivatorRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0ActivatorRailBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActiveDirectoryScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/ActiveDirectoryScreenCapabilities.hpp index 569b642e9d..2b90627a90 100644 --- a/LiteLoader/include/llapi/mc/ActiveDirectoryScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/ActiveDirectoryScreenCapabilities.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -12,7 +13,7 @@ #undef BEFORE_EXTRA -class ActiveDirectoryScreenCapabilities { +struct ActiveDirectoryScreenCapabilities { #define AFTER_EXTRA // Add Member There @@ -20,8 +21,8 @@ class ActiveDirectoryScreenCapabilities { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTIVEDIRECTORYSCREENCAPABILITIES public: - class ActiveDirectoryScreenCapabilities& operator=(class ActiveDirectoryScreenCapabilities const &) = delete; - ActiveDirectoryScreenCapabilities(class ActiveDirectoryScreenCapabilities const &) = delete; + struct ActiveDirectoryScreenCapabilities& operator=(struct ActiveDirectoryScreenCapabilities const &) = delete; + ActiveDirectoryScreenCapabilities(struct ActiveDirectoryScreenCapabilities const &) = delete; ActiveDirectoryScreenCapabilities() = delete; #endif @@ -33,9 +34,9 @@ class ActiveDirectoryScreenCapabilities { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@UActiveDirectoryScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @symbol ?isOfType\@?$TypedScreenCapabilities\@UActiveDirectoryScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@Bedrock\@\@\@Z */ - virtual bool isOfType(class typeid_t) const; + virtual bool isOfType(class Bedrock::typeid_t) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTIVEDIRECTORYSCREENCAPABILITIES /** * @symbol __unk_destructor_-1 @@ -43,4 +44,4 @@ class ActiveDirectoryScreenCapabilities { MCVAPI ~ActiveDirectoryScreenCapabilities(); #endif -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Actor.hpp b/LiteLoader/include/llapi/mc/Actor.hpp index 8d14e91711..75eaf0f4cc 100644 --- a/LiteLoader/include/llapi/mc/Actor.hpp +++ b/LiteLoader/include/llapi/mc/Actor.hpp @@ -1723,14 +1723,14 @@ class Actor { * @symbol ?distanceTo\@Actor\@\@QEBAMAEBV1\@\@Z */ MCAPI float distanceTo(class Actor const &) const; - /** - * @symbol ?distanceToSqr\@Actor\@\@QEBAMAEBVVec3\@\@\@Z - */ - MCAPI float distanceToSqr(class Vec3 const &) const; /** * @symbol ?distanceToSqr\@Actor\@\@QEBAMAEBV1\@\@Z */ MCAPI float distanceToSqr(class Actor const &) const; + /** + * @symbol ?distanceToSqr\@Actor\@\@QEBAMAEBVVec3\@\@\@Z + */ + MCAPI float distanceToSqr(class Vec3 const &) const; /** * @symbol ?dropLeash\@Actor\@\@QEAAX_N0\@Z */ @@ -1740,9 +1740,9 @@ class Actor { */ MCAPI void dropTowards(class ItemStack const &, class Vec3); /** - * @symbol ?evaluateSeatRotation\@Actor\@\@QEAAMAEBVRideableComponent\@\@\@Z + * @symbol ?evaluateSeatRotation\@Actor\@\@QEAAMAEBVRideableComponent\@\@_N\@Z */ - MCAPI float evaluateSeatRotation(class RideableComponent const &); + MCAPI float evaluateSeatRotation(class RideableComponent const &, bool); /** * @symbol ?executeEvent\@Actor\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVariantParameterList\@\@\@Z */ @@ -1823,10 +1823,6 @@ class Actor { * @symbol ?getCarriedItemInSlotPreferredBy\@Actor\@\@QEBAAEBVItemStack\@\@AEBV2\@\@Z */ MCAPI class ItemStack const & getCarriedItemInSlotPreferredBy(class ItemStack const &) const; - /** - * @symbol ?getCategories\@Actor\@\@QEBA?AW4ActorCategory\@\@XZ - */ - MCAPI enum class ActorCategory getCategories() const; /** * @symbol ?getChainedDamageEffects\@Actor\@\@QEBA_NXZ */ @@ -1883,22 +1879,22 @@ class Actor { * @symbol ?getEconomyTradeableComponent\@Actor\@\@QEBAPEAVEconomyTradeableComponent\@\@XZ */ MCAPI class EconomyTradeableComponent * getEconomyTradeableComponent() const; - /** - * @symbol ?getEffect\@Actor\@\@QEBAPEBVMobEffectInstance\@\@I\@Z - */ - MCAPI class MobEffectInstance const * getEffect(unsigned int) const; /** * @symbol ?getEffect\@Actor\@\@QEBAPEBVMobEffectInstance\@\@AEBVMobEffect\@\@\@Z */ MCAPI class MobEffectInstance const * getEffect(class MobEffect const &) const; /** - * @symbol ?getEntityData\@Actor\@\@QEBAAEBVSynchedActorDataEntityWrapper\@\@XZ + * @symbol ?getEffect\@Actor\@\@QEBAPEBVMobEffectInstance\@\@I\@Z */ - MCAPI class SynchedActorDataEntityWrapper const & getEntityData() const; + MCAPI class MobEffectInstance const * getEffect(unsigned int) const; /** * @symbol ?getEntityData\@Actor\@\@QEAAAEAVSynchedActorDataEntityWrapper\@\@XZ */ MCAPI class SynchedActorDataEntityWrapper & getEntityData(); + /** + * @symbol ?getEntityData\@Actor\@\@QEBAAEBVSynchedActorDataEntityWrapper\@\@XZ + */ + MCAPI class SynchedActorDataEntityWrapper const & getEntityData() const; /** * @symbol ?getEntityRegistry\@Actor\@\@QEAA?AV?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@XZ */ @@ -1991,14 +1987,14 @@ class Actor { * @symbol ?getLeashHolder\@Actor\@\@QEBA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getLeashHolder() const; - /** - * @symbol ?getLevel\@Actor\@\@QEBAAEBVLevel\@\@XZ - */ - MCAPI class Level const & getLevel() const; /** * @symbol ?getLevel\@Actor\@\@QEAAAEAVLevel\@\@XZ */ MCAPI class Level & getLevel(); + /** + * @symbol ?getLevel\@Actor\@\@QEBAAEBVLevel\@\@XZ + */ + MCAPI class Level const & getLevel() const; /** * @symbol ?getLevelTimeStamp\@Actor\@\@QEBA_KXZ */ @@ -2587,14 +2583,14 @@ class Actor { * @symbol ?isWalker\@Actor\@\@QEBA_NXZ */ MCAPI bool isWalker() const; - /** - * @symbol ?lerpTo\@Actor\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@MH\@Z - */ - MCAPI void lerpTo(class Vec3 const &, class Vec2 const &, float, int); /** * @symbol ?lerpTo\@Actor\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@H\@Z */ MCAPI void lerpTo(class Vec3 const &, class Vec2 const &, int); + /** + * @symbol ?lerpTo\@Actor\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@MH\@Z + */ + MCAPI void lerpTo(class Vec3 const &, class Vec2 const &, float, int); /** * @symbol ?lerpToRotation\@Actor\@\@QEAAXAEBVVec2\@\@H\@Z */ @@ -2655,6 +2651,10 @@ class Actor { * @symbol ?playMovementSound\@Actor\@\@QEAAXXZ */ MCAPI void playMovementSound(); + /** + * @symbol ?playSound\@Actor\@\@QEAAXAEBVIConstBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@H\@Z + */ + MCAPI void playSound(class IConstBlockSource const &, enum class LevelSoundEvent, class Vec3 const &, int); /** * @symbol ?playSound\@Actor\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@\@Z */ @@ -2663,10 +2663,6 @@ class Actor { * @symbol ?playSound\@Actor\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@H\@Z */ MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, int); - /** - * @symbol ?playSound\@Actor\@\@QEAAXAEBVIConstBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@H\@Z - */ - MCAPI void playSound(class IConstBlockSource const &, enum class LevelSoundEvent, class Vec3 const &, int); /** * @symbol ?positionAllPassengers\@Actor\@\@QEAAXXZ */ @@ -3075,6 +3071,10 @@ class Actor { * @symbol ?tick\@Actor\@\@QEAA_NAEAVBlockSource\@\@\@Z */ MCAPI bool tick(class BlockSource &); + /** + * @symbol ?tickBlockDamage\@Actor\@\@QEAAXXZ + */ + MCAPI void tickBlockDamage(); /** * @symbol ?transferTickingArea\@Actor\@\@QEAAXAEAVDimension\@\@\@Z */ @@ -3261,6 +3261,10 @@ class Actor { * @symbol ?_initializeMaxAutoStep\@Actor\@\@IEAAXM\@Z */ MCAPI void _initializeMaxAutoStep(float); + /** + * @symbol ?_isDeathLootAllowed\@Actor\@\@IEBA_NXZ + */ + MCAPI bool _isDeathLootAllowed() const; /** * @symbol ?_isHeadInWater\@Actor\@\@IEBA_NXZ */ @@ -3331,6 +3335,10 @@ class Actor { * @symbol ?_defaultInitEquipmentDropChances\@Actor\@\@AEAAXXZ */ MCAPI void _defaultInitEquipmentDropChances(); + /** + * @symbol ?_initAliasProperties\@Actor\@\@AEAAXXZ + */ + MCAPI void _initAliasProperties(); /** * @symbol ?_initializeLeashRopeSystem\@Actor\@\@AEAAXPEAV1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorAddEffectEvent.hpp b/LiteLoader/include/llapi/mc/ActorAddEffectEvent.hpp index 6367296d39..47c685df1f 100644 --- a/LiteLoader/include/llapi/mc/ActorAddEffectEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorAddEffectEvent.hpp @@ -19,11 +19,14 @@ struct ActorAddEffectEvent { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORADDEFFECTEVENT public: struct ActorAddEffectEvent& operator=(struct ActorAddEffectEvent const &) = delete; - ActorAddEffectEvent(struct ActorAddEffectEvent const &) = delete; ActorAddEffectEvent() = delete; #endif public: + /** + * @symbol ??0ActorAddEffectEvent\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI ActorAddEffectEvent(struct ActorAddEffectEvent const &); /** * @symbol ??1ActorAddEffectEvent\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ActorAliasDescription.hpp b/LiteLoader/include/llapi/mc/ActorAliasDescription.hpp index b677bc1071..99fc48f280 100644 --- a/LiteLoader/include/llapi/mc/ActorAliasDescription.hpp +++ b/LiteLoader/include/llapi/mc/ActorAliasDescription.hpp @@ -43,10 +43,6 @@ class ActorAliasDescription { */ MCVAPI ~ActorAliasDescription(); #endif - /** - * @symbol ?getAliasInfo\@ActorAliasDescription\@\@QEBAPEBUAliasInfoDescription\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI struct AliasInfoDescription const * getAliasInfo(std::string const &) const; /** * @symbol ?parse\@ActorAliasDescription\@\@QEAAXAEAVValue\@Json\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorAnimationController.hpp b/LiteLoader/include/llapi/mc/ActorAnimationController.hpp index 317ab91e7d..48a50e77cb 100644 --- a/LiteLoader/include/llapi/mc/ActorAnimationController.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationController.hpp @@ -29,10 +29,6 @@ class ActorAnimationController { #endif public: - /** - * @symbol ??0ActorAnimationController\@\@QEAA\@AEBVHashedString\@\@AEBVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI ActorAnimationController(class HashedString const &, class SemVersion const &, std::string const &); /** * @symbol ?addState\@ActorAnimationController\@\@QEAAAEAV?$shared_ptr\@VActorAnimationControllerState\@\@\@std\@\@AEBVHashedString\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorAnimationControllerPtr.hpp b/LiteLoader/include/llapi/mc/ActorAnimationControllerPtr.hpp index b2e6057063..bc6c182960 100644 --- a/LiteLoader/include/llapi/mc/ActorAnimationControllerPtr.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationControllerPtr.hpp @@ -29,10 +29,6 @@ class ActorAnimationControllerPtr { #endif public: - /** - * @symbol ??0ActorAnimationControllerPtr\@\@QEAA\@AEAVActorAnimationControllerGroup\@\@AEBVHashedString\@\@\@Z - */ - MCAPI ActorAnimationControllerPtr(class ActorAnimationControllerGroup &, class HashedString const &); /** * @symbol ?getName\@ActorAnimationControllerPtr\@\@QEBAAEBVHashedString\@\@XZ */ @@ -41,14 +37,6 @@ class ActorAnimationControllerPtr { * @symbol ?isNull\@ActorAnimationControllerPtr\@\@QEBA_NXZ */ MCAPI bool isNull() const; - /** - * @symbol ??CActorAnimationControllerPtr\@\@QEBAPEBVActorAnimationController\@\@XZ - */ - MCAPI class ActorAnimationController const * operator->() const; - /** - * @symbol ??CActorAnimationControllerPtr\@\@QEAAPEAVActorAnimationController\@\@XZ - */ - MCAPI class ActorAnimationController * operator->(); /** * @symbol ??1ActorAnimationControllerPtr\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ActorAnimationControllerState.hpp b/LiteLoader/include/llapi/mc/ActorAnimationControllerState.hpp index b6d3bff2fb..88f9c5acc5 100644 --- a/LiteLoader/include/llapi/mc/ActorAnimationControllerState.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationControllerState.hpp @@ -29,38 +29,6 @@ class ActorAnimationControllerState { #endif public: - /** - * @symbol ?addAnimation\@ActorAnimationControllerState\@\@QEAAXAEBVHashedString\@\@AEBVExpressionNode\@\@\@Z - */ - MCAPI void addAnimation(class HashedString const &, class ExpressionNode const &); - /** - * @symbol ?addAnimation\@ActorAnimationControllerState\@\@QEAAXAEBVHashedString\@\@\@Z - */ - MCAPI void addAnimation(class HashedString const &); - /** - * @symbol ?addBlendTransitionKeyFrame\@ActorAnimationControllerState\@\@QEAAXMM\@Z - */ - MCAPI void addBlendTransitionKeyFrame(float, float); - /** - * @symbol ?addEntryActorEvent\@ActorAnimationControllerState\@\@QEAAAEAVActorAnimationEvent\@\@MAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CurrentCmdVersion\@\@W4MolangVersion\@\@\@Z - */ - MCAPI class ActorAnimationEvent & addEntryActorEvent(float, std::string const &, enum class CurrentCmdVersion, enum class MolangVersion); - /** - * @symbol ?addExitActorEvent\@ActorAnimationControllerState\@\@QEAAAEAVActorAnimationEvent\@\@MAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CurrentCmdVersion\@\@W4MolangVersion\@\@\@Z - */ - MCAPI class ActorAnimationEvent & addExitActorEvent(float, std::string const &, enum class CurrentCmdVersion, enum class MolangVersion); - /** - * @symbol ?addParticleEffect\@ActorAnimationControllerState\@\@QEAAAEAVActorParticleEffect\@\@XZ - */ - MCAPI class ActorParticleEffect & addParticleEffect(); - /** - * @symbol ?addSoundEffect\@ActorAnimationControllerState\@\@QEAAAEAVActorSoundEffect\@\@XZ - */ - MCAPI class ActorSoundEffect & addSoundEffect(); - /** - * @symbol ?addTransition\@ActorAnimationControllerState\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4MolangVersion\@\@_N\@Z - */ - MCAPI void addTransition(std::string const &, std::string const &, enum class MolangVersion, bool); /** * @symbol ?addVariable\@ActorAnimationControllerState\@\@QEAAAEAVStateAnimationVariable\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorAnimationEvent.hpp b/LiteLoader/include/llapi/mc/ActorAnimationEvent.hpp index 2377178b35..007e036d13 100644 --- a/LiteLoader/include/llapi/mc/ActorAnimationEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationEvent.hpp @@ -29,14 +29,14 @@ class ActorAnimationEvent { #endif public: - /** - * @symbol ??0ActorAnimationEvent\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI ActorAnimationEvent(class ActorAnimationEvent &&); /** * @symbol ??0ActorAnimationEvent\@\@QEAA\@MAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CurrentCmdVersion\@\@W4MolangVersion\@\@\@Z */ MCAPI ActorAnimationEvent(float, std::string const &, enum class CurrentCmdVersion, enum class MolangVersion); + /** + * @symbol ??0ActorAnimationEvent\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI ActorAnimationEvent(class ActorAnimationEvent &&); /** * @symbol ?fire\@ActorAnimationEvent\@\@QEBAXAEAVRenderParams\@\@PEAVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorAnimationPlayer.hpp b/LiteLoader/include/llapi/mc/ActorAnimationPlayer.hpp index 87248f34ff..6855e576a4 100644 --- a/LiteLoader/include/llapi/mc/ActorAnimationPlayer.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationPlayer.hpp @@ -47,9 +47,5 @@ class ActorAnimationPlayer { */ MCVAPI ~ActorAnimationPlayer(); #endif - /** - * @symbol ??0ActorAnimationPlayer\@\@QEAA\@AEBVHashedString\@\@AEBVExpressionNode\@\@\@Z - */ - MCAPI ActorAnimationPlayer(class HashedString const &, class ExpressionNode const &); }; diff --git a/LiteLoader/include/llapi/mc/ActorBlock.hpp b/LiteLoader/include/llapi/mc/ActorBlock.hpp index 3d04e994b1..43901daf59 100644 --- a/LiteLoader/include/llapi/mc/ActorBlock.hpp +++ b/LiteLoader/include/llapi/mc/ActorBlock.hpp @@ -196,20 +196,20 @@ class ActorBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -221,27 +221,32 @@ class ActorBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 194 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 195 * @symbol ?getEntityResourceItem\@ActorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; diff --git a/LiteLoader/include/llapi/mc/ActorCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ActorCommandOrigin.hpp index 074e57b303..c92295e77e 100644 --- a/LiteLoader/include/llapi/mc/ActorCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/ActorCommandOrigin.hpp @@ -110,9 +110,5 @@ class ActorCommandOrigin : public CommandOrigin { * @symbol ??0ActorCommandOrigin\@\@QEAA\@AEAVActor\@\@\@Z */ MCAPI ActorCommandOrigin(class Actor &); - /** - * @symbol ?load\@ActorCommandOrigin\@\@SA?AV?$unique_ptr\@VActorCommandOrigin\@\@U?$default_delete\@VActorCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z - */ - MCAPI static std::unique_ptr load(class CompoundTag const &, class Level &); }; diff --git a/LiteLoader/include/llapi/mc/ActorContainerDiffHelper.hpp b/LiteLoader/include/llapi/mc/ActorContainerDiffHelper.hpp index 987e4cd8c5..28b855cc94 100644 --- a/LiteLoader/include/llapi/mc/ActorContainerDiffHelper.hpp +++ b/LiteLoader/include/llapi/mc/ActorContainerDiffHelper.hpp @@ -21,10 +21,6 @@ namespace ActorContainerDiffHelper { // Add Member There #undef AFTER_EXTRA - /** - * @symbol ?applyIfChanged\@ActorContainerDiffHelper\@\@YAXAEAVBaseAttributeMap\@\@AEBV2\@1\@Z - */ - MCAPI void applyIfChanged(class BaseAttributeMap &, class BaseAttributeMap const &, class BaseAttributeMap const &); /** * @symbol ?applyIfChanged\@ActorContainerDiffHelper\@\@YAXAEAVSynchedActorData\@\@AEBV2\@1PEAVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp b/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp index 53c10f1702..a8bf5d4630 100644 --- a/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp +++ b/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp @@ -37,6 +37,10 @@ namespace ActorContainerDiffHelperImpl { * @symbol ?_createListOfPointers\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVMobEffectInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVMobEffectInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@3\@\@Z */ MCAPI std::vector> const _createListOfPointers(std::vector const &); + /** + * @symbol ?_getDiff\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVMobEffectInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVMobEffectInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@3\@0\@Z + */ + MCAPI std::vector> const _getDiff(std::vector const &, std::vector const &); /** * @symbol ?_getDiff\@ActorContainerDiffHelperImpl\@\@YA?AV?$vector\@V?$unique_ptr\@VDataItem\@\@U?$default_delete\@VDataItem\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VDataItem\@\@U?$default_delete\@VDataItem\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVSynchedActorData\@\@0\@Z */ @@ -45,9 +49,5 @@ namespace ActorContainerDiffHelperImpl { * @symbol ?_getDiff\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBVBaseAttributeMap\@\@0\@Z */ MCAPI std::vector> const _getDiff(class BaseAttributeMap const &, class BaseAttributeMap const &); - /** - * @symbol ?_getDiff\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVMobEffectInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVMobEffectInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@3\@0\@Z - */ - MCAPI std::vector> const _getDiff(std::vector const &, std::vector const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorDamageByBlockSource.hpp b/LiteLoader/include/llapi/mc/ActorDamageByBlockSource.hpp index 1966b4c545..7b19d62e7f 100644 --- a/LiteLoader/include/llapi/mc/ActorDamageByBlockSource.hpp +++ b/LiteLoader/include/llapi/mc/ActorDamageByBlockSource.hpp @@ -50,9 +50,5 @@ class ActorDamageByBlockSource : public ActorDamageSource { * @symbol ?clone\@ActorDamageByBlockSource\@\@UEBA?AV?$unique_ptr\@VActorDamageSource\@\@U?$default_delete\@VActorDamageSource\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; - /** - * @symbol ??0ActorDamageByBlockSource\@\@QEAA\@AEBVBlock\@\@W4ActorDamageCause\@\@\@Z - */ - MCAPI ActorDamageByBlockSource(class Block const &, enum class ActorDamageCause); }; diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp index 971396148f..9df03ff98e 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp @@ -26,14 +26,14 @@ class ActorDefinitionDescriptor { * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@XZ */ MCAPI ActorDefinitionDescriptor(); - /** - * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI ActorDefinitionDescriptor(class ActorDefinitionDescriptor const &); /** * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ActorDefinitionDescriptor(class ActorDefinitionDescriptor &&); + /** + * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI ActorDefinitionDescriptor(class ActorDefinitionDescriptor const &); /** * @symbol ?combine\@ActorDefinitionDescriptor\@\@QEAAAEAV1\@AEBV1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionDiffList.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionDiffList.hpp index 1370f3b37a..e0436a200d 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionDiffList.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionDiffList.hpp @@ -29,10 +29,6 @@ class ActorDefinitionDiffList { #endif public: - /** - * @symbol ??0ActorDefinitionDiffList\@\@QEAA\@AEAVActorDefinitionGroup\@\@\@Z - */ - MCAPI ActorDefinitionDiffList(class ActorDefinitionGroup &); /** * @symbol ?addDefinition\@ActorDefinitionDiffList\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -45,22 +41,10 @@ class ActorDefinitionDiffList { * @symbol ?buildAdditiveDescriptionFrom\@ActorDefinitionDiffList\@\@QEBA?AVActorDefinitionDescriptor\@\@_K0\@Z */ MCAPI class ActorDefinitionDescriptor buildAdditiveDescriptionFrom(unsigned __int64, unsigned __int64) const; - /** - * @symbol ?clearChangedDescription\@ActorDefinitionDiffList\@\@QEAAXXZ - */ - MCAPI void clearChangedDescription(); - /** - * @symbol ?clearDefinitions\@ActorDefinitionDiffList\@\@QEAAXXZ - */ - MCAPI void clearDefinitions(); /** * @symbol ?definitionListToString\@ActorDefinitionDiffList\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string definitionListToString(std::string const &) const; - /** - * @symbol ?getAddedDefinitionGroup\@ActorDefinitionDiffList\@\@QEBAAEBVDefinitionInstanceGroup\@\@XZ - */ - MCAPI class DefinitionInstanceGroup const & getAddedDefinitionGroup() const; /** * @symbol ?getAddedDefinitionGroupMutable\@ActorDefinitionDiffList\@\@QEAAAEAVDefinitionInstanceGroup\@\@XZ */ @@ -77,46 +61,18 @@ class ActorDefinitionDiffList { * @symbol ?getDescription\@ActorDefinitionDiffList\@\@QEAA?AV?$unique_ptr\@VActorDefinitionDescriptor\@\@U?$default_delete\@VActorDefinitionDescriptor\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI std::unique_ptr getDescription(bool); - /** - * @symbol ?getRemovedDefinitionGroup\@ActorDefinitionDiffList\@\@QEBAAEBVDefinitionInstanceGroup\@\@XZ - */ - MCAPI class DefinitionInstanceGroup const & getRemovedDefinitionGroup() const; /** * @symbol ?getRemovedDefinitionGroupMutable\@ActorDefinitionDiffList\@\@QEAAAEAVDefinitionInstanceGroup\@\@XZ */ MCAPI class DefinitionInstanceGroup & getRemovedDefinitionGroupMutable(); - /** - * @symbol ?hasChanged\@ActorDefinitionDiffList\@\@QEBA_NXZ - */ - MCAPI bool hasChanged() const; - /** - * @symbol ?hasDefinition\@ActorDefinitionDiffList\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI bool hasDefinition(std::string const &) const; - /** - * @symbol ?lockChanges\@ActorDefinitionDiffList\@\@QEAAXXZ - */ - MCAPI void lockChanges(); /** * @symbol ?removeDefinition\@ActorDefinitionDiffList\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void removeDefinition(std::string const &); - /** - * @symbol ?setDefinitionStack\@ActorDefinitionDiffList\@\@QEAAXAEAV?$vector\@UDiffListPair\@\@V?$allocator\@UDiffListPair\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI void setDefinitionStack(std::vector &); /** * @symbol ?size\@ActorDefinitionDiffList\@\@QEBA_KXZ */ MCAPI unsigned __int64 size() const; - /** - * @symbol ?unlockChanges\@ActorDefinitionDiffList\@\@QEAAXXZ - */ - MCAPI void unlockChanges(); - /** - * @symbol ??1ActorDefinitionDiffList\@\@QEAA\@XZ - */ - MCAPI ~ActorDefinitionDiffList(); //private: /** diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp index ce1fe94cbf..ff81865aa8 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp @@ -45,14 +45,6 @@ struct LoadActorResult { * @symbol ?buildActorEventList\@ActorDefinitionGroup\@\@QEBA?AV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector buildActorEventList() const; - /** - * @symbol ?getComponentFactory\@ActorDefinitionGroup\@\@QEAAPEAVActorComponentFactory\@\@XZ - */ - MCAPI class ActorComponentFactory * getComponentFactory(); - /** - * @symbol ?setComponentFactory\@ActorDefinitionGroup\@\@QEAAXPEAVActorComponentFactory\@\@\@Z - */ - MCAPI void setComponentFactory(class ActorComponentFactory *); /** * @symbol ?tryGetDefinition\@ActorDefinitionGroup\@\@QEAA?AVActorDefinitionPtr\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp index fdcc72320c..52a5514f0f 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp @@ -33,25 +33,25 @@ struct ActorDefinitionIdentifier { */ MCAPI ActorDefinitionIdentifier(enum class ActorType); /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@XZ */ - MCAPI ActorDefinitionIdentifier(struct ActorDefinitionIdentifier const &); + MCAPI ActorDefinitionIdentifier(); /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@PEBD\@Z */ - MCAPI ActorDefinitionIdentifier(std::string const &); + MCAPI ActorDefinitionIdentifier(char const *); /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@XZ + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBU0\@\@Z */ - MCAPI ActorDefinitionIdentifier(); + MCAPI ActorDefinitionIdentifier(struct ActorDefinitionIdentifier const &); /** * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ MCAPI ActorDefinitionIdentifier(std::string, std::string, std::string); /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@PEBD\@Z + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI ActorDefinitionIdentifier(char const *); + MCAPI ActorDefinitionIdentifier(std::string const &); /** * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@$$QEAU0\@\@Z */ @@ -60,10 +60,6 @@ struct ActorDefinitionIdentifier { * @symbol ?_getLegacyActorType\@ActorDefinitionIdentifier\@\@QEBA?AW4ActorType\@\@XZ */ MCAPI enum class ActorType _getLegacyActorType() const; - /** - * @symbol ?clear\@ActorDefinitionIdentifier\@\@QEAAXXZ - */ - MCAPI void clear(); /** * @symbol ?getCanonicalHash\@ActorDefinitionIdentifier\@\@QEBAAEBVHashedString\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionModifier.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionModifier.hpp index 09bfbe81ad..8ee081ca9a 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionModifier.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionModifier.hpp @@ -29,14 +29,14 @@ struct ActorDefinitionModifier { * @symbol ??0ActorDefinitionModifier\@\@QEAA\@AEBU0\@\@Z */ MCAPI ActorDefinitionModifier(struct ActorDefinitionModifier const &); - /** - * @symbol ??4ActorDefinitionModifier\@\@QEAAAEAU0\@$$QEAU0\@\@Z - */ - MCAPI struct ActorDefinitionModifier & operator=(struct ActorDefinitionModifier &&); /** * @symbol ??4ActorDefinitionModifier\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct ActorDefinitionModifier & operator=(struct ActorDefinitionModifier const &); + /** + * @symbol ??4ActorDefinitionModifier\@\@QEAAAEAU0\@$$QEAU0\@\@Z + */ + MCAPI struct ActorDefinitionModifier & operator=(struct ActorDefinitionModifier &&); /** * @symbol ??1ActorDefinitionModifier\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionPtr.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionPtr.hpp index 112abfa0c9..b0dc4a8bac 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionPtr.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionPtr.hpp @@ -24,25 +24,11 @@ class ActorDefinitionPtr { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORDEFINITIONPTR public: class ActorDefinitionPtr& operator=(class ActorDefinitionPtr const &) = delete; + ActorDefinitionPtr(class ActorDefinitionPtr const &) = delete; + ActorDefinitionPtr() = delete; #endif public: - /** - * @symbol ??0ActorDefinitionPtr\@\@QEAA\@AEAVActorDefinitionGroup\@\@AEAVActorDefinition\@\@\@Z - */ - MCAPI ActorDefinitionPtr(class ActorDefinitionGroup &, class ActorDefinition &); - /** - * @symbol ??0ActorDefinitionPtr\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI ActorDefinitionPtr(class ActorDefinitionPtr const &); - /** - * @symbol ??0ActorDefinitionPtr\@\@QEAA\@XZ - */ - MCAPI ActorDefinitionPtr(); - /** - * @symbol ??4ActorDefinitionPtr\@\@QEAAAEAV0\@$$QEAV0\@\@Z - */ - MCAPI class ActorDefinitionPtr & operator=(class ActorDefinitionPtr &&); /** * @symbol ??1ActorDefinitionPtr\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp index 0b17b731db..94627cfb48 100644 --- a/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp @@ -41,6 +41,10 @@ class ActorEventCoordinator { * @symbol ?sendActorCreated\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void sendActorCreated(class Actor &); + /** + * @symbol ?sendActorCreationAttemptFailed\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + */ + MCAPI void sendActorCreationAttemptFailed(class Actor &, class std::basic_string_view>); /** * @symbol ?sendActorMove\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@AEBVVec3\@\@\@Z */ @@ -77,6 +81,10 @@ class ActorEventCoordinator { * @symbol ?sendActorUseItemOn\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@AEBVItemStack\@\@AEBVBlockPos\@\@E\@Z */ MCAPI void sendActorUseItemOn(class Actor &, class ItemStack const &, class BlockPos const &, unsigned char); + /** + * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@AEBV?$EventRef\@U?$ActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z + */ + MCAPI enum class CoordinatorResult sendEvent(class EventRef> const &); /** * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$MutableActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z */ @@ -85,9 +93,5 @@ class ActorEventCoordinator { * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAAXAEBV?$EventRef\@U?$ActorGameplayEvent\@X\@\@\@\@\@Z */ MCAPI void sendEvent(class EventRef> const &); - /** - * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@AEBV?$EventRef\@U?$ActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z - */ - MCAPI enum class CoordinatorResult sendEvent(class EventRef> const &); }; diff --git a/LiteLoader/include/llapi/mc/ActorEventListener.hpp b/LiteLoader/include/llapi/mc/ActorEventListener.hpp index 1a0f9b8b02..4d3dbccdc0 100644 --- a/LiteLoader/include/llapi/mc/ActorEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventListener.hpp @@ -38,6 +38,10 @@ class ActorEventListener { * @symbol ?onActorCreated\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@\@Z */ MCVAPI enum class EventResult onActorCreated(class Actor &); + /** + * @symbol ?onActorCreationAttemptFailed\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + */ + MCVAPI enum class EventResult onActorCreationAttemptFailed(class Actor &, class std::basic_string_view>); /** * @symbol ?onActorDefinitionEvent\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@UActorDefinitionModifier\@\@V?$allocator\@UActorDefinitionModifier\@\@\@std\@\@\@5\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorFactoryData.hpp b/LiteLoader/include/llapi/mc/ActorFactoryData.hpp index be1b145239..b77e5eb692 100644 --- a/LiteLoader/include/llapi/mc/ActorFactoryData.hpp +++ b/LiteLoader/include/llapi/mc/ActorFactoryData.hpp @@ -22,10 +22,13 @@ struct ActorFactoryData { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORFACTORYDATA public: ActorFactoryData(struct ActorFactoryData const &) = delete; - ActorFactoryData() = delete; #endif public: + /** + * @symbol ??0ActorFactoryData\@\@QEAA\@XZ + */ + MCAPI ActorFactoryData(); /** * @symbol ??4ActorFactoryData\@\@QEAAAEAU0\@AEBU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorFilterGroup.hpp b/LiteLoader/include/llapi/mc/ActorFilterGroup.hpp index 1f6655b87e..26de41d444 100644 --- a/LiteLoader/include/llapi/mc/ActorFilterGroup.hpp +++ b/LiteLoader/include/llapi/mc/ActorFilterGroup.hpp @@ -61,6 +61,10 @@ struct LegacyMapping { * @symbol ?evaluateActor\@ActorFilterGroup\@\@QEBA_NAEBVActor\@\@AEBVVariantParameterList\@\@\@Z */ MCAPI bool evaluateActor(class Actor const &, class VariantParameterList const &) const; + /** + * @symbol ??4ActorFilterGroup\@\@QEAAAEAV0\@$$QEAV0\@\@Z + */ + MCAPI class ActorFilterGroup & operator=(class ActorFilterGroup &&); /** * @symbol ??4ActorFilterGroup\@\@QEAAAEAV0\@AEBV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorGarbageCollector.hpp b/LiteLoader/include/llapi/mc/ActorGarbageCollector.hpp index 77fcdd22b8..b007df767b 100644 --- a/LiteLoader/include/llapi/mc/ActorGarbageCollector.hpp +++ b/LiteLoader/include/llapi/mc/ActorGarbageCollector.hpp @@ -45,10 +45,6 @@ class ActorGarbageCollector { * @symbol ?garbageCollectEntity\@ActorGarbageCollector\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI void garbageCollectEntity(class OwnerPtrT); - /** - * @symbol ?garbageCollectEntityWhenChunkDiscarded\@ActorGarbageCollector\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z - */ - MCAPI void garbageCollectEntityWhenChunkDiscarded(class OwnerPtrT); /** * @symbol ?update\@ActorGarbageCollector\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/ActorIsRaiderTest.hpp b/LiteLoader/include/llapi/mc/ActorIsRaiderTest.hpp new file mode 100644 index 0000000000..3641c1228a --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorIsRaiderTest.hpp @@ -0,0 +1,65 @@ +/** + * @file ActorIsRaiderTest.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "FilterTest.hpp" +#include "Json.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ActorIsRaiderTest { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORISRAIDERTEST +public: + class ActorIsRaiderTest& operator=(class ActorIsRaiderTest const &) = delete; + ActorIsRaiderTest(class ActorIsRaiderTest const &) = delete; + ActorIsRaiderTest() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorIsRaiderTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + */ + virtual bool evaluate(struct FilterContext const &) const; + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorIsRaiderTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ + */ + virtual class std::basic_string_view> getName() const; + /** + * @vftbl 5 + * @symbol ?_serializeDomain\@FilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; + +}; diff --git a/LiteLoader/include/llapi/mc/ActorManager.hpp b/LiteLoader/include/llapi/mc/ActorManager.hpp index b41f4692ee..1eaa267d02 100644 --- a/LiteLoader/include/llapi/mc/ActorManager.hpp +++ b/LiteLoader/include/llapi/mc/ActorManager.hpp @@ -34,14 +34,14 @@ class ActorManager { * @symbol ??0ActorManager\@\@QEAA\@XZ */ MCAPI ActorManager(); - /** - * @symbol ?addActorEntity\@ActorManager\@\@QEAAPEAVActor\@\@AEAVIAddActorEntityProxy\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z - */ - MCAPI class Actor * addActorEntity(class IAddActorEntityProxy &, class OwnerPtrT); /** * @symbol ?addActorEntity\@ActorManager\@\@QEAAPEAVActor\@\@AEAVDimension\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI class Actor * addActorEntity(class Dimension &, class OwnerPtrT); + /** + * @symbol ?addActorEntity\@ActorManager\@\@QEAAPEAVActor\@\@AEAVIAddActorEntityProxy\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + */ + MCAPI class Actor * addActorEntity(class IAddActorEntityProxy &, class OwnerPtrT); /** * @symbol ?cleanupActorEntityReferencesGarbageCollect\@ActorManager\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorMapping.hpp b/LiteLoader/include/llapi/mc/ActorMapping.hpp index 2713cf15e4..13547a9d19 100644 --- a/LiteLoader/include/llapi/mc/ActorMapping.hpp +++ b/LiteLoader/include/llapi/mc/ActorMapping.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class ActorMapping { +struct ActorMapping { #define AFTER_EXTRA // Add Member There @@ -20,20 +20,20 @@ class ActorMapping { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORMAPPING public: - class ActorMapping& operator=(class ActorMapping const &) = delete; - ActorMapping(class ActorMapping const &) = delete; + struct ActorMapping& operator=(struct ActorMapping const &) = delete; + ActorMapping(struct ActorMapping const &) = delete; ActorMapping() = delete; #endif public: - /** - * @symbol ??0ActorMapping\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z - */ - MCAPI ActorMapping(std::string const &, std::string const &, std::string const &); /** * @symbol ??0ActorMapping\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI ActorMapping(std::string const &, std::string const &); + /** + * @symbol ??0ActorMapping\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z + */ + MCAPI ActorMapping(std::string const &, std::string const &, std::string const &); /** * @symbol ?getMappingName\@ActorMapping\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ActorTypeNamespaceRules\@\@\@Z */ @@ -43,4 +43,4 @@ class ActorMapping { */ MCAPI ~ActorMapping(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorMoveNotifierSystem.hpp b/LiteLoader/include/llapi/mc/ActorMoveNotifierSystem.hpp index 5085fbc3ea..94500b79ae 100644 --- a/LiteLoader/include/llapi/mc/ActorMoveNotifierSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorMoveNotifierSystem.hpp @@ -31,5 +31,9 @@ class ActorMoveNotifierSystem { * @symbol ?createActorMoveNotifierSystem\@ActorMoveNotifierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createActorMoveNotifierSystem(); + /** + * @symbol ?tickActorMoveNotifierSystem\@ActorMoveNotifierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUMoveRequestComponent\@\@VActorMovementProxyComponent\@\@\@\@\@Z + */ + MCAPI static void tickActorMoveNotifierSystem(class ViewT); }; diff --git a/LiteLoader/include/llapi/mc/ActorMoveSystem.hpp b/LiteLoader/include/llapi/mc/ActorMoveSystem.hpp index 25e713286c..3b024f7dd9 100644 --- a/LiteLoader/include/llapi/mc/ActorMoveSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorMoveSystem.hpp @@ -35,5 +35,13 @@ class ActorMoveSystem { * @symbol ?createUpdateHitboxSystem\@ActorMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createUpdateHitboxSystem(); + /** + * @symbol ?tickActorMoveSystem\@ActorMoveSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUOnewayPhysicsBlocksComponent\@\@UMoveRequestComponent\@\@UAABBShapeComponent\@\@USubBBsComponent\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UIsStuckItemFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UUsesOneWayCollisionFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@$$CBV?$FlagComponent\@UIsStuckInColliderFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@$$CBV?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UIsStuckInColliderFlag\@\@\@\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@UShouldMoveTowardClosestSpaceFlagComponent\@\@\@\@\@Z + */ + MCAPI static void tickActorMoveSystem(class ViewT const>, class Optional const>>, class ViewT const>>, class ViewT const>>, class EntityModifierT, class FlagComponent, struct ShouldMoveTowardClosestSpaceFlagComponent>); + /** + * @symbol ?tickUpdateHitboxSystem\@ActorMoveSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UMoveRequestComponent\@\@\@\@$$CBUStateVectorComponent\@\@VHitboxComponent\@\@\@\@\@Z + */ + MCAPI static void tickUpdateHitboxSystem(class ViewT, struct StateVectorComponent const, class HitboxComponent>); }; diff --git a/LiteLoader/include/llapi/mc/ActorMovement.hpp b/LiteLoader/include/llapi/mc/ActorMovement.hpp index d765f8d5ea..c4dec48946 100644 --- a/LiteLoader/include/llapi/mc/ActorMovement.hpp +++ b/LiteLoader/include/llapi/mc/ActorMovement.hpp @@ -32,10 +32,18 @@ namespace ActorMovement { * @symbol ?initializeActor\@ActorMovement\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void initializeActor(class EntityContext &); + /** + * @symbol ?isImmobile\@ActorMovement\@\@YA_NAEBVEntityContext\@\@\@Z + */ + MCAPI bool isImmobile(class EntityContext const &); /** * @symbol ?setHasTeleported\@ActorMovement\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setHasTeleported(class EntityContext &, bool); + /** + * @symbol ?setIsImmobile\@ActorMovement\@\@YAXAEAVEntityContext\@\@_N\@Z + */ + MCAPI void setIsImmobile(class EntityContext &, bool); /** * @symbol ?setWalkDist\@ActorMovement\@\@YAXAEAVEntityContext\@\@M\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorParticleEffect.hpp b/LiteLoader/include/llapi/mc/ActorParticleEffect.hpp new file mode 100644 index 0000000000..bb7fb0f2ca --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorParticleEffect.hpp @@ -0,0 +1,31 @@ +/** + * @file ActorParticleEffect.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ActorParticleEffect { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORPARTICLEEFFECT +public: + class ActorParticleEffect& operator=(class ActorParticleEffect const &) = delete; + ActorParticleEffect(class ActorParticleEffect const &) = delete; +#endif + +public: + /** + * @symbol ??0ActorParticleEffect\@\@QEAA\@XZ + */ + MCAPI ActorParticleEffect(); + +}; diff --git a/LiteLoader/include/llapi/mc/ActorPermutationEventHandler.hpp b/LiteLoader/include/llapi/mc/ActorPermutationEventHandler.hpp index aebe332ad7..9468f322d1 100644 --- a/LiteLoader/include/llapi/mc/ActorPermutationEventHandler.hpp +++ b/LiteLoader/include/llapi/mc/ActorPermutationEventHandler.hpp @@ -53,9 +53,5 @@ class ActorPermutationEventHandler { * @symbol ?reload\@ActorPermutationEventHandler\@\@QEAAXAEAVRenderParams\@\@\@Z */ MCAPI void reload(class RenderParams &); - /** - * @symbol ??1ActorPermutationEventHandler\@\@QEAA\@XZ - */ - MCAPI ~ActorPermutationEventHandler(); }; diff --git a/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp b/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp index f7234c84c6..00a0c4449b 100644 --- a/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp +++ b/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp @@ -143,9 +143,9 @@ class ActorPlacerItem : public Item { virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** * @vftbl 132 - * @symbol ?_useOn\@ActorPlacerItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@ActorPlacerItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORPLACERITEM /** * @symbol ?getBaseColor\@ActorPlacerItem\@\@UEBA?AVColor\@mce\@\@AEBVItemStack\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/ActorPlayMovementSoundSystemImpl.hpp b/LiteLoader/include/llapi/mc/ActorPlayMovementSoundSystemImpl.hpp index 0ef54287fc..d0e13892e9 100644 --- a/LiteLoader/include/llapi/mc/ActorPlayMovementSoundSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/ActorPlayMovementSoundSystemImpl.hpp @@ -20,5 +20,9 @@ namespace ActorPlayMovementSoundSystemImpl { * @symbol ?doPlayMovementSound\@ActorPlayMovementSoundSystemImpl\@\@YAXAEAVActorOwnerComponent\@\@\@Z */ MCAPI void doPlayMovementSound(class ActorOwnerComponent &); + /** + * @symbol ?tick\@ActorPlayMovementSoundSystemImpl\@\@YAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@U?$Exclude\@UPassengerComponent\@\@V?$FlagComponent\@UActorRemovedFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI void tick(class ViewT>, struct Exclude>, class ActorOwnerComponent>); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorPostAiStep.hpp b/LiteLoader/include/llapi/mc/ActorPostAiStep.hpp new file mode 100644 index 0000000000..3a559bdf07 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorPostAiStep.hpp @@ -0,0 +1,24 @@ +/** + * @file ActorPostAiStep.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ActorPostAiStep { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?_tickEach\@ActorPostAiStep\@\@YAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UActorRemovedFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UChickenFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UEnderDragonFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UParrotFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@USquidFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UWitherBossFlag\@\@\@\@\@\@$$CBUWitherBossPreAIStepResultComponent\@\@\@\@\@Z + */ + MCAPI void _tickEach(class ViewT>, struct Exclude>, class ActorOwnerComponent>, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>, struct WitherBossPreAIStepResultComponent const>); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorPostAiStepTickSystem.hpp b/LiteLoader/include/llapi/mc/ActorPostAiStepTickSystem.hpp new file mode 100644 index 0000000000..2f66eb7904 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorPostAiStepTickSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file ActorPostAiStepTickSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ActorPostAiStepTickSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORPOSTAISTEPTICKSYSTEM +public: + class ActorPostAiStepTickSystem& operator=(class ActorPostAiStepTickSystem const &) = delete; + ActorPostAiStepTickSystem(class ActorPostAiStepTickSystem const &) = delete; + ActorPostAiStepTickSystem() = delete; +#endif + +public: + /** + * @symbol ?createSystem\@ActorPostAiStepTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/ActorPropertiesDescription.hpp b/LiteLoader/include/llapi/mc/ActorPropertiesDescription.hpp index 56eb6349eb..ec71e94264 100644 --- a/LiteLoader/include/llapi/mc/ActorPropertiesDescription.hpp +++ b/LiteLoader/include/llapi/mc/ActorPropertiesDescription.hpp @@ -5,18 +5,14 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC structure ActorPropertiesDescription. - * - */ -struct ActorPropertiesDescription { + +class ActorPropertiesDescription { #define AFTER_EXTRA // Add Member There @@ -24,7 +20,8 @@ struct ActorPropertiesDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORPROPERTIESDESCRIPTION public: - ActorPropertiesDescription(struct ActorPropertiesDescription const &) = delete; + class ActorPropertiesDescription& operator=(class ActorPropertiesDescription const &) = delete; + ActorPropertiesDescription(class ActorPropertiesDescription const &) = delete; ActorPropertiesDescription() = delete; #endif @@ -45,13 +42,5 @@ struct ActorPropertiesDescription { */ MCVAPI ~ActorPropertiesDescription(); #endif - /** - * @symbol ??4ActorPropertiesDescription\@\@QEAAAEAU0\@AEBU0\@\@Z - */ - MCAPI struct ActorPropertiesDescription & operator=(struct ActorPropertiesDescription const &); - /** - * @symbol ?parse\@ActorPropertiesDescription\@\@QEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z - */ - MCAPI void parse(class Json::Value &, class SemVersion const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorRemoveEffectEvent.hpp b/LiteLoader/include/llapi/mc/ActorRemoveEffectEvent.hpp index 8008820d44..d1a9731671 100644 --- a/LiteLoader/include/llapi/mc/ActorRemoveEffectEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorRemoveEffectEvent.hpp @@ -19,11 +19,14 @@ struct ActorRemoveEffectEvent { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORREMOVEEFFECTEVENT public: struct ActorRemoveEffectEvent& operator=(struct ActorRemoveEffectEvent const &) = delete; - ActorRemoveEffectEvent(struct ActorRemoveEffectEvent const &) = delete; ActorRemoveEffectEvent() = delete; #endif public: + /** + * @symbol ??0ActorRemoveEffectEvent\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI ActorRemoveEffectEvent(struct ActorRemoveEffectEvent const &); /** * @symbol ??1ActorRemoveEffectEvent\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ActorRuntimeIDManager.hpp b/LiteLoader/include/llapi/mc/ActorRuntimeIDManager.hpp index de455b00e4..677acd5b07 100644 --- a/LiteLoader/include/llapi/mc/ActorRuntimeIDManager.hpp +++ b/LiteLoader/include/llapi/mc/ActorRuntimeIDManager.hpp @@ -44,9 +44,9 @@ class ActorRuntimeIDManager { */ MCAPI std::vector getRuntimeActorList() const; /** - * @symbol ?initialize\@ActorRuntimeIDManager\@\@QEAAXAEAVActorManager\@\@\@Z + * @symbol ?initialize\@ActorRuntimeIDManager\@\@QEAAXAEAVActorManager\@\@AEAVGameplayUserManager\@\@\@Z */ - MCAPI void initialize(class ActorManager &); + MCAPI void initialize(class ActorManager &, class GameplayUserManager &); /** * @symbol ?removeRuntimeActorEntity\@ActorRuntimeIDManager\@\@QEAAXVActorRuntimeID\@\@\@Z */ @@ -57,6 +57,10 @@ class ActorRuntimeIDManager { MCAPI ~ActorRuntimeIDManager(); //private: + /** + * @symbol ?_addEntity\@ActorRuntimeIDManager\@\@AEAAXAEBVEntityContext\@\@\@Z + */ + MCAPI void _addEntity(class EntityContext const &); /** * @symbol ?_onActorAdded\@ActorRuntimeIDManager\@\@AEAAXAEAVActor\@\@\@Z */ @@ -65,6 +69,10 @@ class ActorRuntimeIDManager { * @symbol ?_onRemoveActorEntityReferences\@ActorRuntimeIDManager\@\@AEAAXAEAVActor\@\@\@Z */ MCAPI void _onRemoveActorEntityReferences(class Actor &); + /** + * @symbol ?_removeEntity\@ActorRuntimeIDManager\@\@AEAAXAEBVEntityContext\@\@\@Z + */ + MCAPI void _removeEntity(class EntityContext const &); private: diff --git a/LiteLoader/include/llapi/mc/ActorSelectorArgs.hpp b/LiteLoader/include/llapi/mc/ActorSelectorArgs.hpp index a0288e95bb..5f98c5fbd3 100644 --- a/LiteLoader/include/llapi/mc/ActorSelectorArgs.hpp +++ b/LiteLoader/include/llapi/mc/ActorSelectorArgs.hpp @@ -38,13 +38,5 @@ struct ActorSelectorArgs { * @symbol ?DEFAULT_LEVEL\@ActorSelectorArgs\@\@2U?$pair\@HH\@std\@\@B */ MCAPI static struct std::pair const DEFAULT_LEVEL; - /** - * @symbol ?DEFAULT_X_ROTATION\@ActorSelectorArgs\@\@2U?$pair\@MM\@std\@\@B - */ - MCAPI static struct std::pair const DEFAULT_X_ROTATION; - /** - * @symbol ?DEFAULT_Y_ROTATION\@ActorSelectorArgs\@\@2U?$pair\@MM\@std\@\@B - */ - MCAPI static struct std::pair const DEFAULT_Y_ROTATION; }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorServerCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ActorServerCommandOrigin.hpp index 481edcdb34..a7c5f2f722 100644 --- a/LiteLoader/include/llapi/mc/ActorServerCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/ActorServerCommandOrigin.hpp @@ -69,9 +69,5 @@ class ActorServerCommandOrigin : public ActorCommandOrigin { * @symbol ?setTargetOther\@ActorServerCommandOrigin\@\@QEAAXUActorUniqueID\@\@\@Z */ MCAPI void setTargetOther(struct ActorUniqueID); - /** - * @symbol ?load\@ActorServerCommandOrigin\@\@SA?AV?$unique_ptr\@VActorServerCommandOrigin\@\@U?$default_delete\@VActorServerCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z - */ - MCAPI static std::unique_ptr load(class CompoundTag const &, class Level &); }; diff --git a/LiteLoader/include/llapi/mc/ActorSkeletalAnimation.hpp b/LiteLoader/include/llapi/mc/ActorSkeletalAnimation.hpp index cc9c1b149d..6f7c411b0f 100644 --- a/LiteLoader/include/llapi/mc/ActorSkeletalAnimation.hpp +++ b/LiteLoader/include/llapi/mc/ActorSkeletalAnimation.hpp @@ -49,65 +49,9 @@ class ActorSkeletalAnimation { * @symbol ?addSoundEffectEvent\@ActorSkeletalAnimation\@\@QEAAAEAVActorSoundEffectEvent\@\@M\@Z */ MCAPI class ActorSoundEffectEvent & addSoundEffectEvent(float); - /** - * @symbol ?calculateAnimationLength\@ActorSkeletalAnimation\@\@QEAAXXZ - */ - MCAPI void calculateAnimationLength(); - /** - * @symbol ?getBoneAnimations\@ActorSkeletalAnimation\@\@QEAAAEAV?$vector\@VBoneAnimation\@\@V?$allocator\@VBoneAnimation\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector & getBoneAnimations(); - /** - * @symbol ?initPrecomputedInterpolation\@ActorSkeletalAnimation\@\@QEAAXXZ - */ - MCAPI void initPrecomputedInterpolation(); /** * @symbol ?removeIrrelevantKeyFramesAndConvertAllFloatKeyFramesToSimplifiedVersion\@ActorSkeletalAnimation\@\@QEAAXXZ */ MCAPI void removeIrrelevantKeyFramesAndConvertAllFloatKeyFramesToSimplifiedVersion(); - /** - * @symbol ?setAnimTimeUpdate\@ActorSkeletalAnimation\@\@QEAAXAEBVExpressionNode\@\@\@Z - */ - MCAPI void setAnimTimeUpdate(class ExpressionNode const &); - /** - * @symbol ?setAnimationLength\@ActorSkeletalAnimation\@\@QEAAXM\@Z - */ - MCAPI void setAnimationLength(float); - /** - * @symbol ?setBlendWeight\@ActorSkeletalAnimation\@\@QEAAXAEBVExpressionNode\@\@\@Z - */ - MCAPI void setBlendWeight(class ExpressionNode const &); - /** - * @symbol ?setLoopDelay\@ActorSkeletalAnimation\@\@QEAAXAEBVExpressionNode\@\@\@Z - */ - MCAPI void setLoopDelay(class ExpressionNode const &); - /** - * @symbol ?setLoopMode\@ActorSkeletalAnimation\@\@QEAAXW4AnimationLoopMode\@\@\@Z - */ - MCAPI void setLoopMode(enum class AnimationLoopMode); - /** - * @symbol ?setShouldOverridePreviousAnimation\@ActorSkeletalAnimation\@\@QEAAX_N\@Z - */ - MCAPI void setShouldOverridePreviousAnimation(bool); - /** - * @symbol ?setStartDelay\@ActorSkeletalAnimation\@\@QEAAXAEBVExpressionNode\@\@\@Z - */ - MCAPI void setStartDelay(class ExpressionNode const &); - /** - * @symbol ?sortEvents\@ActorSkeletalAnimation\@\@QEAAXXZ - */ - MCAPI void sortEvents(); - /** - * @symbol ?sortParticleEffectEvents\@ActorSkeletalAnimation\@\@QEAAXXZ - */ - MCAPI void sortParticleEffectEvents(); - /** - * @symbol ?sortSoundEffectEvents\@ActorSkeletalAnimation\@\@QEAAXXZ - */ - MCAPI void sortSoundEffectEvents(); - /** - * @symbol ??1ActorSkeletalAnimation\@\@QEAA\@XZ - */ - MCAPI ~ActorSkeletalAnimation(); }; diff --git a/LiteLoader/include/llapi/mc/ActorSkeletalAnimationPtr.hpp b/LiteLoader/include/llapi/mc/ActorSkeletalAnimationPtr.hpp index 0e8b76c73a..e88964f4bf 100644 --- a/LiteLoader/include/llapi/mc/ActorSkeletalAnimationPtr.hpp +++ b/LiteLoader/include/llapi/mc/ActorSkeletalAnimationPtr.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -29,26 +28,10 @@ class ActorSkeletalAnimationPtr { #endif public: - /** - * @symbol ??0ActorSkeletalAnimationPtr\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VActorAnimationGroup\@\@\@Bedrock\@\@\@gsl\@\@AEBVHashedString\@\@\@Z - */ - MCAPI ActorSkeletalAnimationPtr(class gsl::not_null> const &, class HashedString const &); - /** - * @symbol ?getName\@ActorSkeletalAnimationPtr\@\@QEBAAEBVHashedString\@\@XZ - */ - MCAPI class HashedString const & getName() const; /** * @symbol ?isNull\@ActorSkeletalAnimationPtr\@\@QEBA_NXZ */ MCAPI bool isNull() const; - /** - * @symbol ??CActorSkeletalAnimationPtr\@\@QEBAPEBVActorSkeletalAnimation\@\@XZ - */ - MCAPI class ActorSkeletalAnimation const * operator->() const; - /** - * @symbol ??CActorSkeletalAnimationPtr\@\@QEAAPEAVActorSkeletalAnimation\@\@XZ - */ - MCAPI class ActorSkeletalAnimation * operator->(); /** * @symbol ??4ActorSkeletalAnimationPtr\@\@QEAAAEAV0\@AEBV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorSpawnRuleDefinition.hpp b/LiteLoader/include/llapi/mc/ActorSpawnRuleDefinition.hpp index 0b4618865f..214c616c32 100644 --- a/LiteLoader/include/llapi/mc/ActorSpawnRuleDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ActorSpawnRuleDefinition.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class ActorSpawnRuleDefinition { +struct ActorSpawnRuleDefinition { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORSPAWNRULEDEFINITION public: - class ActorSpawnRuleDefinition& operator=(class ActorSpawnRuleDefinition const &) = delete; - ActorSpawnRuleDefinition(class ActorSpawnRuleDefinition const &) = delete; + struct ActorSpawnRuleDefinition& operator=(struct ActorSpawnRuleDefinition const &) = delete; + ActorSpawnRuleDefinition(struct ActorSpawnRuleDefinition const &) = delete; ActorSpawnRuleDefinition() = delete; #endif @@ -29,4 +29,4 @@ class ActorSpawnRuleDefinition { */ MCAPI ~ActorSpawnRuleDefinition(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorStopRidingEventSystem.hpp b/LiteLoader/include/llapi/mc/ActorStopRidingEventSystem.hpp index 9d3771d82f..59ec2d59a7 100644 --- a/LiteLoader/include/llapi/mc/ActorStopRidingEventSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorStopRidingEventSystem.hpp @@ -31,6 +31,10 @@ class ActorStopRidingEventSystem { * @symbol ?createSystem\@ActorStopRidingEventSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?tick\@ActorStopRidingEventSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@VActorOwnerComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@\@\@\@Z + */ + MCAPI static void tick(class ViewT>, class ActorOwnerComponent, class Optional const>, class Optional const>, class Optional const>, class Optional const>>); /** * @symbol ?tickSendEvent\@ActorStopRidingEventSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorTargetFilter.hpp b/LiteLoader/include/llapi/mc/ActorTargetFilter.hpp new file mode 100644 index 0000000000..6d8f52644a --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorTargetFilter.hpp @@ -0,0 +1,32 @@ +/** + * @file ActorTargetFilter.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ActorTargetFilter { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORTARGETFILTER +public: + struct ActorTargetFilter& operator=(struct ActorTargetFilter const &) = delete; + ActorTargetFilter(struct ActorTargetFilter const &) = delete; + ActorTargetFilter() = delete; +#endif + +public: + /** + * @symbol ?ConditionPredicates\@ActorTargetFilter\@\@2V?$unordered_map\@VHashedString\@\@P6A_NAEBUActorTargetFilter\@\@AEAVActor\@\@\@ZU?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@P6A_NAEBUActorTargetFilter\@\@AEAVActor\@\@\@Z\@std\@\@\@5\@\@std\@\@A + */ + MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> ConditionPredicates; + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorTerrainInterlockData.hpp b/LiteLoader/include/llapi/mc/ActorTerrainInterlockData.hpp new file mode 100644 index 0000000000..674b273f89 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorTerrainInterlockData.hpp @@ -0,0 +1,32 @@ +/** + * @file ActorTerrainInterlockData.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ActorTerrainInterlockData { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORTERRAININTERLOCKDATA +public: + class ActorTerrainInterlockData& operator=(class ActorTerrainInterlockData const &) = delete; + ActorTerrainInterlockData(class ActorTerrainInterlockData const &) = delete; + ActorTerrainInterlockData() = delete; +#endif + +public: + /** + * @symbol ?setCreationTime\@ActorTerrainInterlockData\@\@QEAAXXZ + */ + MCAPI void setCreationTime(); + +}; diff --git a/LiteLoader/include/llapi/mc/ActorTickNeededComponent.hpp b/LiteLoader/include/llapi/mc/ActorTickNeededComponent.hpp index fcb65bf8a8..52e260ea59 100644 --- a/LiteLoader/include/llapi/mc/ActorTickNeededComponent.hpp +++ b/LiteLoader/include/llapi/mc/ActorTickNeededComponent.hpp @@ -30,14 +30,14 @@ class ActorTickNeededComponent { #endif public: - /** - * @symbol ??0ActorTickNeededComponent\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI ActorTickNeededComponent(class ActorTickNeededComponent &&); /** * @symbol ??0ActorTickNeededComponent\@\@QEAA\@AEAVBlockSource\@\@\@Z */ MCAPI ActorTickNeededComponent(class BlockSource &); + /** + * @symbol ??0ActorTickNeededComponent\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI ActorTickNeededComponent(class ActorTickNeededComponent &&); /** * @symbol ?getBlockSource\@ActorTickNeededComponent\@\@QEAA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VBlockSource\@\@\@\@\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ActorUniqueID.hpp b/LiteLoader/include/llapi/mc/ActorUniqueID.hpp index 3c8d71c2c6..9e0c658ea2 100644 --- a/LiteLoader/include/llapi/mc/ActorUniqueID.hpp +++ b/LiteLoader/include/llapi/mc/ActorUniqueID.hpp @@ -50,6 +50,10 @@ struct ActorUniqueID { #endif public: + /** + * @symbol ?getHash\@ActorUniqueID\@\@QEBA_KXZ + */ + MCAPI unsigned __int64 getHash() const; /** * @symbol ?INVALID_ID\@ActorUniqueID\@\@2U1\@B */ diff --git a/LiteLoader/include/llapi/mc/ActorUpdatePostTickPositionDeltaSystem.hpp b/LiteLoader/include/llapi/mc/ActorUpdatePostTickPositionDeltaSystem.hpp index 2f15b0ffef..1a47d2f2cf 100644 --- a/LiteLoader/include/llapi/mc/ActorUpdatePostTickPositionDeltaSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorUpdatePostTickPositionDeltaSystem.hpp @@ -32,4 +32,12 @@ class ActorUpdatePostTickPositionDeltaSystem { */ MCAPI static struct TickingSystemWithInfo createActorUpdatePostTickPositionDeltaSystem(); +//private: + /** + * @symbol ?_tickActorUpdatePostTickPositionDeltaSystem\@ActorUpdatePostTickPositionDeltaSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUStateVectorComponent\@\@UPostTickPositionDeltaComponent\@\@\@\@\@Z + */ + MCAPI static void _tickActorUpdatePostTickPositionDeltaSystem(class ViewT>, struct StateVectorComponent const, struct PostTickPositionDeltaComponent>); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/ActorUpdateRidingIDSystem.hpp b/LiteLoader/include/llapi/mc/ActorUpdateRidingIDSystem.hpp index d21cfa3fe7..cfea41d379 100644 --- a/LiteLoader/include/llapi/mc/ActorUpdateRidingIDSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorUpdateRidingIDSystem.hpp @@ -48,4 +48,16 @@ class ActorUpdateRidingIDSystem { */ MCAPI static void tickUpdateRidingPrevID(class StrictEntityContext &, struct PassengerComponent const &, class ViewT, class EntityModifierT); +//private: + /** + * @symbol ?_tickClearRidingID\@ActorUpdateRidingIDSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@$$CBUPassengerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPassengerComponent\@\@\@\@\@Z + */ + MCAPI static void _tickClearRidingID(class ViewT>, struct PassengerComponent const>, class EntityModifierT); + /** + * @symbol ?_tickUpdateRidingPrevID\@ActorUpdateRidingIDSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@$$CBUPassengerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@URidingPrevIDComponent\@\@\@\@\@Z + */ + MCAPI static void _tickUpdateRidingPrevID(class ViewT>, struct PassengerComponent const>, class ViewT, class EntityModifierT); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/ActorValueValidation.hpp b/LiteLoader/include/llapi/mc/ActorValueValidation.hpp index 683aab0a0b..5ad78b5eb2 100644 --- a/LiteLoader/include/llapi/mc/ActorValueValidation.hpp +++ b/LiteLoader/include/llapi/mc/ActorValueValidation.hpp @@ -23,14 +23,14 @@ namespace ActorValueValidation { * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBVBlockPos\@\@PEBD\@Z */ MCAPI void _fireTelemetryEvent(class BlockPos const &, char const *); - /** - * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBVVec3\@\@PEBD\@Z - */ - MCAPI void _fireTelemetryEvent(class Vec3 const &, char const *); /** * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z */ MCAPI void _fireTelemetryEvent(std::string const &, char const *); + /** + * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBVVec3\@\@PEBD\@Z + */ + MCAPI void _fireTelemetryEvent(class Vec3 const &, char const *); /** * @symbol ?isLegalPlayerPosition\@ActorValueValidation\@\@YA_NAEBVVec3\@\@PEBD\@Z */ diff --git a/LiteLoader/include/llapi/mc/AddActorBasePacket.hpp b/LiteLoader/include/llapi/mc/AddActorBasePacket.hpp index 5422c0cb75..e14417fdec 100644 --- a/LiteLoader/include/llapi/mc/AddActorBasePacket.hpp +++ b/LiteLoader/include/llapi/mc/AddActorBasePacket.hpp @@ -11,10 +11,24 @@ #undef BEFORE_EXTRA -namespace AddActorBasePacket { +class AddActorBasePacket { #define AFTER_EXTRA #undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ADDACTORBASEPACKET +public: + class AddActorBasePacket& operator=(class AddActorBasePacket const &) = delete; + AddActorBasePacket(class AddActorBasePacket const &) = delete; + AddActorBasePacket() = delete; +#endif -}; \ No newline at end of file +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ADDACTORBASEPACKET + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~AddActorBasePacket(); +#endif + +}; diff --git a/LiteLoader/include/llapi/mc/AddActorEntityProxy.hpp b/LiteLoader/include/llapi/mc/AddActorEntityProxy.hpp index c3128192bb..cdf002efac 100644 --- a/LiteLoader/include/llapi/mc/AddActorEntityProxy.hpp +++ b/LiteLoader/include/llapi/mc/AddActorEntityProxy.hpp @@ -39,9 +39,5 @@ class AddActorEntityProxy { * @symbol ?reloadActor\@AddActorEntityProxy\@\@UEAAXAEAVActor\@\@\@Z */ virtual void reloadActor(class Actor &); - /** - * @symbol ??0AddActorEntityProxy\@\@QEAA\@AEAVDimension\@\@\@Z - */ - MCAPI AddActorEntityProxy(class Dimension &); }; diff --git a/LiteLoader/include/llapi/mc/AddEntityPacket.hpp b/LiteLoader/include/llapi/mc/AddEntityPacket.hpp index 72bee3586f..1a19086703 100644 --- a/LiteLoader/include/llapi/mc/AddEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddEntityPacket.hpp @@ -50,10 +50,6 @@ class AddEntityPacket : public Packet { */ MCVAPI ~AddEntityPacket(); #endif - /** - * @symbol ??0AddEntityPacket\@\@QEAA\@AEBVEntityContext\@\@\@Z - */ - MCAPI AddEntityPacket(class EntityContext const &); /** * @symbol ??0AddEntityPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/AdultRidingHeightOffsetComponent.hpp b/LiteLoader/include/llapi/mc/AdultRidingHeightOffsetComponent.hpp new file mode 100644 index 0000000000..f3730092d6 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AdultRidingHeightOffsetComponent.hpp @@ -0,0 +1,32 @@ +/** + * @file AdultRidingHeightOffsetComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct AdultRidingHeightOffsetComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ADULTRIDINGHEIGHTOFFSETCOMPONENT +public: + struct AdultRidingHeightOffsetComponent& operator=(struct AdultRidingHeightOffsetComponent const &) = delete; + AdultRidingHeightOffsetComponent(struct AdultRidingHeightOffsetComponent const &) = delete; + AdultRidingHeightOffsetComponent() = delete; +#endif + +public: + /** + * @symbol ?SITTING_ANIMATION_OFFSET\@AdultRidingHeightOffsetComponent\@\@2MB + */ + MCAPI static float const SITTING_ANIMATION_OFFSET; + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Agent.hpp b/LiteLoader/include/llapi/mc/Agent.hpp index ce78a8cda6..a942c5fda0 100644 --- a/LiteLoader/include/llapi/mc/Agent.hpp +++ b/LiteLoader/include/llapi/mc/Agent.hpp @@ -341,14 +341,6 @@ class Agent : public Mob { * @symbol ?stopCommandMode\@Agent\@\@QEAAXXZ */ MCAPI void stopCommandMode(); - /** - * @symbol ?swingAnimationCompleted\@Agent\@\@QEAA_NXZ - */ - MCAPI bool swingAnimationCompleted(); - /** - * @symbol ?swingArm\@Agent\@\@QEAAXXZ - */ - MCAPI void swingArm(); /** * @symbol ?tryFireCreateEvent\@Agent\@\@QEAAXAEAVPlayer\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/AgentBodyControl.hpp b/LiteLoader/include/llapi/mc/AgentBodyControl.hpp index e6ac8601ac..1d2bfd8e2f 100644 --- a/LiteLoader/include/llapi/mc/AgentBodyControl.hpp +++ b/LiteLoader/include/llapi/mc/AgentBodyControl.hpp @@ -25,6 +25,7 @@ class AgentBodyControl { public: class AgentBodyControl& operator=(class AgentBodyControl const &) = delete; AgentBodyControl(class AgentBodyControl const &) = delete; + AgentBodyControl() = delete; #endif public: @@ -38,9 +39,5 @@ class AgentBodyControl { * @symbol ?clientTick\@AgentBodyControl\@\@UEAAXAEAVMob\@\@\@Z */ virtual void clientTick(class Mob &); - /** - * @symbol ??0AgentBodyControl\@\@QEAA\@XZ - */ - MCAPI AgentBodyControl(); }; diff --git a/LiteLoader/include/llapi/mc/AgentCommand.hpp b/LiteLoader/include/llapi/mc/AgentCommand.hpp index 4f6c80ce88..7be89e7d80 100644 --- a/LiteLoader/include/llapi/mc/AgentCommand.hpp +++ b/LiteLoader/include/llapi/mc/AgentCommand.hpp @@ -36,7 +36,7 @@ class AgentCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@AgentCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/AgentLookControl.hpp b/LiteLoader/include/llapi/mc/AgentLookControl.hpp index 98a82e395f..07d5f83a31 100644 --- a/LiteLoader/include/llapi/mc/AgentLookControl.hpp +++ b/LiteLoader/include/llapi/mc/AgentLookControl.hpp @@ -25,6 +25,7 @@ class AgentLookControl { public: class AgentLookControl& operator=(class AgentLookControl const &) = delete; AgentLookControl(class AgentLookControl const &) = delete; + AgentLookControl() = delete; #endif public: @@ -43,10 +44,6 @@ class AgentLookControl { * @symbol ?tick\@AgentLookControl\@\@UEAAXAEAVMob\@\@\@Z */ virtual void tick(class Mob &); - /** - * @symbol ??0AgentLookControl\@\@QEAA\@XZ - */ - MCAPI AgentLookControl(); /** * @symbol ?sBaseYMax\@AgentLookControl\@\@2MA */ diff --git a/LiteLoader/include/llapi/mc/AgentTravelSystem.hpp b/LiteLoader/include/llapi/mc/AgentTravelSystem.hpp index 62b1693299..984329ecaa 100644 --- a/LiteLoader/include/llapi/mc/AgentTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/AgentTravelSystem.hpp @@ -32,6 +32,14 @@ class AgentTravelSystem { * @symbol ?createServerSystem\@AgentTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createServerSystem(); + /** + * @symbol ?tickClient\@AgentTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@V?$FlagComponent\@UAgentFlag\@\@\@\@\@\@VActorMovementProxyComponent\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void tickClient(class ViewT, class FlagComponent, class FlagComponent>, class ActorMovementProxyComponent, class ActorOwnerComponent>); + /** + * @symbol ?tickServer\@AgentTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@V?$FlagComponent\@UAgentFlag\@\@\@\@\@\@VActorMovementProxyComponent\@\@VActorOwnerComponent\@\@UStateVectorComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@\@Z + */ + MCAPI static void tickServer(class ViewT, class FlagComponent, class FlagComponent>, class ActorMovementProxyComponent, class ActorOwnerComponent, struct StateVectorComponent>, class EntityModifierT); //private: /** diff --git a/LiteLoader/include/llapi/mc/AirBlock.hpp b/LiteLoader/include/llapi/mc/AirBlock.hpp index 98617be844..178bffa853 100644 --- a/LiteLoader/include/llapi/mc/AirBlock.hpp +++ b/LiteLoader/include/llapi/mc/AirBlock.hpp @@ -246,35 +246,35 @@ class AirBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 142 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 143 * @symbol ?getVisualShapeInWorld\@AirBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; /** - * @vftbl 143 + * @vftbl 144 * @symbol ?getVisualShape\@AirBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@AirBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -286,30 +286,35 @@ class AirBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@AirBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AIRBLOCK /** * @symbol ?canBeSilkTouched\@AirBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/AirTravelSystem.hpp b/LiteLoader/include/llapi/mc/AirTravelSystem.hpp index c00cea6a6b..8ec97a7030 100644 --- a/LiteLoader/include/llapi/mc/AirTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/AirTravelSystem.hpp @@ -28,5 +28,9 @@ class AirTravelSystem { * @symbol ?createAirTravelSystem\@AirTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createAirTravelSystem(); + /** + * @symbol ?tickAirTravelSystem\@AirTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@V?$FlagComponent\@UAirTravelFlag\@\@\@\@\@\@$$CBUFlySpeedComponent\@\@UMobTravelComponent\@\@\@\@\@Z + */ + MCAPI static void tickAirTravelSystem(class ViewT, class FlagComponent, class FlagComponent>, struct FlySpeedComponent const, struct MobTravelComponent>); }; diff --git a/LiteLoader/include/llapi/mc/AllayVibrationConfig.hpp b/LiteLoader/include/llapi/mc/AllayVibrationConfig.hpp index 8cfdc748f6..87f8eb840b 100644 --- a/LiteLoader/include/llapi/mc/AllayVibrationConfig.hpp +++ b/LiteLoader/include/llapi/mc/AllayVibrationConfig.hpp @@ -47,36 +47,6 @@ class AllayVibrationConfig { * @symbol ?shouldListen\@AllayVibrationConfig\@\@UEAA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z */ virtual bool shouldListen(class BlockSource &, class GameEvent const &, struct GameEventContext const &); - /** - * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 - * @symbol __unk_vfn_5 - */ - virtual void __unk_vfn_5(); - /** - * @vftbl 6 - * @symbol __unk_vfn_6 - */ - virtual void __unk_vfn_6(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); - /** - * @vftbl 8 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z - */ - virtual void _Delete_this(bool); - /** - * @vftbl 9 - * @symbol ?_Get\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEBAPEBXXZ - */ - virtual void const * _Get() const; /** * @symbol ??0AllayVibrationConfig\@\@QEAA\@AEAVActor\@\@G\@Z */ diff --git a/LiteLoader/include/llapi/mc/AllowList.hpp b/LiteLoader/include/llapi/mc/AllowList.hpp index 1efd549bf0..f6ee91bbee 100644 --- a/LiteLoader/include/llapi/mc/AllowList.hpp +++ b/LiteLoader/include/llapi/mc/AllowList.hpp @@ -45,10 +45,6 @@ class AllowList { * @symbol ?deserialize\@AllowList\@\@UEAAXAEAVValue\@Json\@\@\@Z */ virtual void deserialize(class Json::Value &); - /** - * @symbol ??0AllowList\@\@QEAA\@V?$function\@$$A6AXXZ\@std\@\@\@Z - */ - MCAPI AllowList(class std::function); /** * @symbol ?addEntry\@AllowList\@\@QEAA_NAEBVAllowListEntry\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/AllowListCommand.hpp b/LiteLoader/include/llapi/mc/AllowListCommand.hpp index c68e710449..e370c2d7e0 100644 --- a/LiteLoader/include/llapi/mc/AllowListCommand.hpp +++ b/LiteLoader/include/llapi/mc/AllowListCommand.hpp @@ -34,7 +34,7 @@ class AllowListCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@AllowListCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/AllowListEntry.hpp b/LiteLoader/include/llapi/mc/AllowListEntry.hpp index 2a049a66b4..783ded4752 100644 --- a/LiteLoader/include/llapi/mc/AllowListEntry.hpp +++ b/LiteLoader/include/llapi/mc/AllowListEntry.hpp @@ -51,10 +51,6 @@ class AllowListEntry { */ MCVAPI ~AllowListEntry(); #endif - /** - * @symbol ??0AllowListEntry\@\@QEAA\@AEAVValue\@Json\@\@\@Z - */ - MCAPI AllowListEntry(class Json::Value &); /** * @symbol ??0AllowListEntry\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/AllowedAnywhereConsume.hpp b/LiteLoader/include/llapi/mc/AllowedAnywhereConsume.hpp deleted file mode 100644 index 9beee5d54c..0000000000 --- a/LiteLoader/include/llapi/mc/AllowedAnywhereConsume.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file AllowedAnywhereConsume.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -struct AllowedAnywhereConsume { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ALLOWEDANYWHERECONSUME -public: - struct AllowedAnywhereConsume& operator=(struct AllowedAnywhereConsume const &) = delete; - AllowedAnywhereConsume(struct AllowedAnywhereConsume const &) = delete; - AllowedAnywhereConsume() = delete; -#endif - -public: - /** - * @symbol ??0AllowedAnywhereConsume\@\@QEAA\@W4ContainerEnumName\@\@EE\@Z - */ - MCAPI AllowedAnywhereConsume(enum class ContainerEnumName, unsigned char, unsigned char); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AmethystBlock.hpp b/LiteLoader/include/llapi/mc/AmethystBlock.hpp index 93d7710918..e1721edb4d 100644 --- a/LiteLoader/include/llapi/mc/AmethystBlock.hpp +++ b/LiteLoader/include/llapi/mc/AmethystBlock.hpp @@ -181,20 +181,20 @@ class AmethystBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,25 +206,30 @@ class AmethystBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AMETHYSTBLOCK /** * @symbol ?isSilentWhenJumpingOff\@AmethystBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/AmethystBlockUtils.hpp b/LiteLoader/include/llapi/mc/AmethystBlockUtils.hpp new file mode 100644 index 0000000000..0e53104453 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AmethystBlockUtils.hpp @@ -0,0 +1,24 @@ +/** + * @file AmethystBlockUtils.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace AmethystBlockUtils { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?resonateVibration\@AmethystBlockUtils\@\@YAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + */ + MCAPI void resonateVibration(class BlockSource &, class BlockPos const &, int); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AmethystClusterBlock.hpp b/LiteLoader/include/llapi/mc/AmethystClusterBlock.hpp index c4dfbadbc2..a7afede100 100644 --- a/LiteLoader/include/llapi/mc/AmethystClusterBlock.hpp +++ b/LiteLoader/include/llapi/mc/AmethystClusterBlock.hpp @@ -192,9 +192,9 @@ class AmethystClusterBlock : public AmethystBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@AmethystClusterBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@AmethystClusterBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,30 +211,30 @@ class AmethystClusterBlock : public AmethystBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@AmethystClusterBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 152 + * @vftbl 153 * @symbol ?init\@AmethystClusterBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -246,47 +246,52 @@ class AmethystClusterBlock : public AmethystBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@AmethystClusterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@AmethystClusterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@AmethystClusterBlock\@\@EEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@AmethystClusterBlock\@\@EEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@AmethystClusterBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/AmphibiousMoveControl.hpp b/LiteLoader/include/llapi/mc/AmphibiousMoveControl.hpp index 3db45e6c2f..bda9e678cc 100644 --- a/LiteLoader/include/llapi/mc/AmphibiousMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/AmphibiousMoveControl.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "GenericMoveControl.hpp" +#include "MoveControl.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class AmphibiousMoveControl. * */ -class AmphibiousMoveControl : public GenericMoveControl { +class AmphibiousMoveControl : public MoveControl { #define AFTER_EXTRA // Add Member There diff --git a/LiteLoader/include/llapi/mc/AngryComponent.hpp b/LiteLoader/include/llapi/mc/AngryComponent.hpp index 3be5bae05d..78b28c4c63 100644 --- a/LiteLoader/include/llapi/mc/AngryComponent.hpp +++ b/LiteLoader/include/llapi/mc/AngryComponent.hpp @@ -28,14 +28,14 @@ class AngryComponent { #endif public: - /** - * @symbol ??0AngryComponent\@\@QEAA\@XZ - */ - MCAPI AngryComponent(); /** * @symbol ??0AngryComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI AngryComponent(class AngryComponent &&); + /** + * @symbol ??0AngryComponent\@\@QEAA\@XZ + */ + MCAPI AngryComponent(); /** * @symbol ?canGetAngry\@AngryComponent\@\@QEBA_NAEAVMob\@\@PEAV2\@PEAVActor\@\@_N3\@Z */ diff --git a/LiteLoader/include/llapi/mc/AnimatePacket.hpp b/LiteLoader/include/llapi/mc/AnimatePacket.hpp index 66bc33e26b..d96be56e69 100644 --- a/LiteLoader/include/llapi/mc/AnimatePacket.hpp +++ b/LiteLoader/include/llapi/mc/AnimatePacket.hpp @@ -74,14 +74,14 @@ class AnimatePacket : public Packet { */ MCVAPI ~AnimatePacket(); #endif - /** - * @symbol ??0AnimatePacket\@\@QEAA\@W4Action\@0\@AEAVActor\@\@\@Z - */ - MCAPI AnimatePacket(enum class AnimatePacket::Action, class Actor &); /** * @symbol ??0AnimatePacket\@\@QEAA\@XZ */ MCAPI AnimatePacket(); + /** + * @symbol ??0AnimatePacket\@\@QEAA\@W4Action\@0\@AEAVActor\@\@\@Z + */ + MCAPI AnimatePacket(enum class AnimatePacket::Action, class Actor &); /** * @symbol ??0AnimatePacket\@\@QEAA\@W4Action\@0\@VActorRuntimeID\@\@M\@Z */ diff --git a/LiteLoader/include/llapi/mc/AnimatedImageData.hpp b/LiteLoader/include/llapi/mc/AnimatedImageData.hpp index 3bf46ffa94..fb3a2f62e9 100644 --- a/LiteLoader/include/llapi/mc/AnimatedImageData.hpp +++ b/LiteLoader/include/llapi/mc/AnimatedImageData.hpp @@ -26,14 +26,14 @@ class AnimatedImageData { #endif public: - /** - * @symbol ??0AnimatedImageData\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI AnimatedImageData(class AnimatedImageData const &); /** * @symbol ??0AnimatedImageData\@\@QEAA\@W4AnimatedTextureType\@persona\@\@W4AnimationExpression\@2\@AEBUImage\@mce\@\@M\@Z */ MCAPI AnimatedImageData(enum class persona::AnimatedTextureType, enum class persona::AnimationExpression, struct mce::Image const &, float); + /** + * @symbol ??0AnimatedImageData\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI AnimatedImageData(class AnimatedImageData const &); /** * @symbol ??4AnimatedImageData\@\@QEAAAEAV0\@AEBV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/AnimationComponentID.hpp b/LiteLoader/include/llapi/mc/AnimationComponentID.hpp index c8fa286eb0..6767465e5d 100644 --- a/LiteLoader/include/llapi/mc/AnimationComponentID.hpp +++ b/LiteLoader/include/llapi/mc/AnimationComponentID.hpp @@ -31,13 +31,5 @@ class AnimationComponentID { * @symbol ??0AnimationComponentID\@\@QEAA\@AEBUActorUniqueID\@\@GW4AttachableSlotIndex\@\@\@Z */ MCAPI AnimationComponentID(struct ActorUniqueID const &, unsigned short, enum class AttachableSlotIndex); - /** - * @symbol ?getHash\@AnimationComponentID\@\@QEBA_KXZ - */ - MCAPI unsigned __int64 getHash() const; - /** - * @symbol ??8AnimationComponentID\@\@QEBA_NAEBV0\@\@Z - */ - MCAPI bool operator==(class AnimationComponentID const &) const; }; diff --git a/LiteLoader/include/llapi/mc/AntiCheatTickShimSystem.hpp b/LiteLoader/include/llapi/mc/AntiCheatTickShimSystem.hpp deleted file mode 100644 index 01b8fd4d9e..0000000000 --- a/LiteLoader/include/llapi/mc/AntiCheatTickShimSystem.hpp +++ /dev/null @@ -1,36 +0,0 @@ -/** - * @file AntiCheatTickShimSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -class AntiCheatTickShimSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ANTICHEATTICKSHIMSYSTEM -public: - class AntiCheatTickShimSystem& operator=(class AntiCheatTickShimSystem const &) = delete; - AntiCheatTickShimSystem(class AntiCheatTickShimSystem const &) = delete; - AntiCheatTickShimSystem() = delete; -#endif - -public: - /** - * @symbol ?_tickOne\@AntiCheatTickShimSystem\@\@SAXAEBVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@\@Z - */ - MCAPI static void _tickOne(class StrictEntityContext const &, class ActorMovementProxyComponent &); - /** - * @symbol ?create\@AntiCheatTickShimSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo create(); - -}; diff --git a/LiteLoader/include/llapi/mc/AnvilBlock.hpp b/LiteLoader/include/llapi/mc/AnvilBlock.hpp index 14999ef007..0dedf43722 100644 --- a/LiteLoader/include/llapi/mc/AnvilBlock.hpp +++ b/LiteLoader/include/llapi/mc/AnvilBlock.hpp @@ -187,9 +187,9 @@ class AnvilBlock : public HeavyBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@AnvilBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@AnvilBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,40 +206,40 @@ class AnvilBlock : public HeavyBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@AnvilBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@AnvilBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@AnvilBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@AnvilBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -251,57 +251,62 @@ class AnvilBlock : public HeavyBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@AnvilBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@AnvilBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@AnvilBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getDustColor\@AnvilBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getDustParticleName\@AnvilBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string getDustParticleName(class Block const &) const; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 197 + * @symbol __unk_vfn_197 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_197(); /** - * @vftbl 197 + * @vftbl 198 * @symbol ?onLand\@AnvilBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLand(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/AnvilContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/AnvilContainerScreenValidator.hpp index 141511a721..ce8f3bee52 100644 --- a/LiteLoader/include/llapi/mc/AnvilContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/AnvilContainerScreenValidator.hpp @@ -25,6 +25,7 @@ class AnvilContainerScreenValidator { public: class AnvilContainerScreenValidator& operator=(class AnvilContainerScreenValidator const &) = delete; AnvilContainerScreenValidator(class AnvilContainerScreenValidator const &) = delete; + AnvilContainerScreenValidator() = delete; #endif public: @@ -48,9 +49,5 @@ class AnvilContainerScreenValidator { * @symbol ?getCraftResult\@AnvilContainerScreenValidator\@\@UEAA?AUContainerValidationCraftResult\@\@AEBVContainerScreenContext\@\@AEAVContainerScreenValidation\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z */ virtual struct ContainerValidationCraftResult getCraftResult(class ContainerScreenContext const &, class ContainerScreenValidation &, std::unique_ptr); - /** - * @symbol ??0AnvilContainerScreenValidator\@\@QEAA\@XZ - */ - MCAPI AnvilContainerScreenValidator(); }; diff --git a/LiteLoader/include/llapi/mc/AppConfigs.hpp b/LiteLoader/include/llapi/mc/AppConfigs.hpp index 4529759cb9..bb25d96d13 100644 --- a/LiteLoader/include/llapi/mc/AppConfigs.hpp +++ b/LiteLoader/include/llapi/mc/AppConfigs.hpp @@ -26,6 +26,7 @@ class AppConfigs { public: class AppConfigs& operator=(class AppConfigs const &) = delete; AppConfigs(class AppConfigs const &) = delete; + AppConfigs() = delete; #endif public: @@ -331,9 +332,5 @@ class AppConfigs { */ MCVAPI ~AppConfigs(); #endif - /** - * @symbol ??0AppConfigs\@\@QEAA\@XZ - */ - MCAPI AppConfigs(); }; diff --git a/LiteLoader/include/llapi/mc/AppPlatform.hpp b/LiteLoader/include/llapi/mc/AppPlatform.hpp index e0974fcb24..15a36b5562 100644 --- a/LiteLoader/include/llapi/mc/AppPlatform.hpp +++ b/LiteLoader/include/llapi/mc/AppPlatform.hpp @@ -134,14 +134,14 @@ struct AndroidScopedStorageInfo { * @symbol ?createLoggingStorageArea\@AppPlatform\@\@UEAA?AV?$shared_ptr\@VFileStorageArea\@Core\@\@\@std\@\@W4FileAccessType\@Core\@\@AEBVPath\@5\@\@Z */ MCVAPI class std::shared_ptr createLoggingStorageArea(enum class Core::FileAccessType, class Core::Path const &); - /** - * @symbol ?createUserInput\@AppPlatform\@\@UEAAXXZ - */ - MCVAPI void createUserInput(); /** * @symbol ?createUserInput\@AppPlatform\@\@UEAAXH\@Z */ MCVAPI void createUserInput(int); + /** + * @symbol ?createUserInput\@AppPlatform\@\@UEAAXXZ + */ + MCVAPI void createUserInput(); /** * @symbol ?createWebview\@AppPlatform\@\@UEBA?AV?$shared_ptr\@VWebviewInterface\@\@\@std\@\@$$QEAVPlatformArguments\@Webview\@\@\@Z */ @@ -714,6 +714,10 @@ struct AndroidScopedStorageInfo { * @symbol ?restartRequested\@AppPlatform\@\@UEAA_NXZ */ MCVAPI bool restartRequested(); + /** + * @symbol ?sendIntegrityCheckTelemetry\@AppPlatform\@\@UEAAXAEAVIMinecraftEventing\@\@\@Z + */ + MCVAPI void sendIntegrityCheckTelemetry(class IMinecraftEventing &); /** * @symbol ?setARVRPlatform\@AppPlatform\@\@UEAAXW4ARVRPlatform\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/AppPlatformListener.hpp b/LiteLoader/include/llapi/mc/AppPlatformListener.hpp index b09fe3a6f3..828d1395b6 100644 --- a/LiteLoader/include/llapi/mc/AppPlatformListener.hpp +++ b/LiteLoader/include/llapi/mc/AppPlatformListener.hpp @@ -115,6 +115,10 @@ class AppPlatformListener { * @symbol ??0AppPlatformListener\@\@QEAA\@_N\@Z */ MCAPI AppPlatformListener(bool); + /** + * @symbol ?initListener\@AppPlatformListener\@\@QEAAXM\@Z + */ + MCAPI void initListener(float); /** * @symbol ?terminate\@AppPlatformListener\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/AppPlatformNetworkSettings.hpp b/LiteLoader/include/llapi/mc/AppPlatformNetworkSettings.hpp index 15e7e50152..c4243ca88b 100644 --- a/LiteLoader/include/llapi/mc/AppPlatformNetworkSettings.hpp +++ b/LiteLoader/include/llapi/mc/AppPlatformNetworkSettings.hpp @@ -23,6 +23,7 @@ class AppPlatformNetworkSettings { public: class AppPlatformNetworkSettings& operator=(class AppPlatformNetworkSettings const &) = delete; AppPlatformNetworkSettings(class AppPlatformNetworkSettings const &) = delete; + AppPlatformNetworkSettings() = delete; #endif public: @@ -36,9 +37,5 @@ class AppPlatformNetworkSettings { * @symbol ?requiresNetworkOutageMessaging\@AppPlatformNetworkSettings\@\@UEBA_NXZ */ virtual bool requiresNetworkOutageMessaging() const; - /** - * @symbol ??0AppPlatformNetworkSettings\@\@QEAA\@XZ - */ - MCAPI AppPlatformNetworkSettings(); }; diff --git a/LiteLoader/include/llapi/mc/AppPlatformWindows.hpp b/LiteLoader/include/llapi/mc/AppPlatformWindows.hpp index c95090c20f..786acc88cc 100644 --- a/LiteLoader/include/llapi/mc/AppPlatformWindows.hpp +++ b/LiteLoader/include/llapi/mc/AppPlatformWindows.hpp @@ -25,6 +25,7 @@ class AppPlatformWindows { public: class AppPlatformWindows& operator=(class AppPlatformWindows const &) = delete; AppPlatformWindows(class AppPlatformWindows const &) = delete; + AppPlatformWindows() = delete; #endif public: @@ -102,10 +103,6 @@ class AppPlatformWindows { */ MCVAPI ~AppPlatformWindows(); #endif - /** - * @symbol ??0AppPlatformWindows\@\@QEAA\@XZ - */ - MCAPI AppPlatformWindows(); /** * @symbol ?EXPERIMENTS_ACTIVE_KEY\@AppPlatformWindows\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp b/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp index 63625d9e19..fa2e1bd120 100644 --- a/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp +++ b/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp @@ -235,10 +235,6 @@ class AreaEffectCloud : public Actor { * @symbol ?_getTicksAlive\@AreaEffectCloud\@\@AEBA_JXZ */ MCAPI __int64 _getTicksAlive() const; - /** - * @symbol ?_setSpawnTick\@AreaEffectCloud\@\@AEAAX_J\@Z - */ - MCAPI void _setSpawnTick(__int64); /** * @symbol ?_spawnParticles\@AreaEffectCloud\@\@AEAAXAEAVRandom\@\@IM\@Z */ diff --git a/LiteLoader/include/llapi/mc/ArmorItem.hpp b/LiteLoader/include/llapi/mc/ArmorItem.hpp index 951a947cf4..b87afb8504 100644 --- a/LiteLoader/include/llapi/mc/ArmorItem.hpp +++ b/LiteLoader/include/llapi/mc/ArmorItem.hpp @@ -219,9 +219,9 @@ class ArmorMaterial { */ virtual float getArmorKnockbackResistance() const; /** - * @symbol ??0ArmorItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVArmorMaterial\@0\@HW4ArmorSlot\@\@\@Z + * @symbol ??0ArmorItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVArmorMaterial\@0\@HW4ArmorSlot\@\@_N\@Z */ - MCAPI ArmorItem(std::string const &, int, class ArmorItem::ArmorMaterial const &, int, enum class ArmorSlot); + MCAPI ArmorItem(std::string const &, int, class ArmorItem::ArmorMaterial const &, int, enum class ArmorSlot, bool); /** * @symbol ?CHAIN\@ArmorItem\@\@2VArmorMaterial\@1\@B */ diff --git a/LiteLoader/include/llapi/mc/ArmorItemComponent.hpp b/LiteLoader/include/llapi/mc/ArmorItemComponent.hpp index 5773017351..522f4c8bce 100644 --- a/LiteLoader/include/llapi/mc/ArmorItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ArmorItemComponent.hpp @@ -68,10 +68,6 @@ class ArmorItemComponent { * @symbol ?getArmorTextureType\@ArmorItemComponent\@\@QEBA?AW4ArmorTextureType\@\@XZ */ MCAPI enum class ArmorTextureType getArmorTextureType() const; - /** - * @symbol ?getArmorValue\@ArmorItemComponent\@\@QEBAHXZ - */ - MCAPI int getArmorValue() const; /** * @symbol ?bindType\@ArmorItemComponent\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/ArmorStand.hpp b/LiteLoader/include/llapi/mc/ArmorStand.hpp index c6d176eb16..cf89ed901e 100644 --- a/LiteLoader/include/llapi/mc/ArmorStand.hpp +++ b/LiteLoader/include/llapi/mc/ArmorStand.hpp @@ -157,6 +157,11 @@ struct Pose { * @symbol __unk_vfn_243 */ virtual void __unk_vfn_243(); + /** + * @vftbl 244 + * @symbol ?kill\@ArmorStand\@\@UEAAXXZ + */ + virtual void kill(); /** * @vftbl 245 * @symbol ?die\@ArmorStand\@\@UEAAXAEBVActorDamageSource\@\@\@Z @@ -227,10 +232,6 @@ struct Pose { * @symbol ??0ArmorStand\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI ArmorStand(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); - /** - * @symbol ?setPoseIndex\@ArmorStand\@\@QEAAXH\@Z - */ - MCAPI void setPoseIndex(int); //private: /** diff --git a/LiteLoader/include/llapi/mc/ArmorStandItem.hpp b/LiteLoader/include/llapi/mc/ArmorStandItem.hpp index 03c9e23a37..fc39fbe2a3 100644 --- a/LiteLoader/include/llapi/mc/ArmorStandItem.hpp +++ b/LiteLoader/include/llapi/mc/ArmorStandItem.hpp @@ -103,9 +103,9 @@ class ArmorStandItem : public Item { virtual void __unk_vfn_80(); /** * @vftbl 132 - * @symbol ?_useOn\@ArmorStandItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@ArmorStandItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0ArmorStandItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z */ diff --git a/LiteLoader/include/llapi/mc/ArmorTrim.hpp b/LiteLoader/include/llapi/mc/ArmorTrim.hpp new file mode 100644 index 0000000000..46a54b780f --- /dev/null +++ b/LiteLoader/include/llapi/mc/ArmorTrim.hpp @@ -0,0 +1,84 @@ +/** + * @file ArmorTrim.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ArmorTrim { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ARMORTRIM +public: + class ArmorTrim& operator=(class ArmorTrim const &) = delete; + ArmorTrim(class ArmorTrim const &) = delete; + ArmorTrim() = delete; +#endif + +public: + /** + * @symbol ??0ArmorTrim\@\@QEAA\@AEBVCompoundTag\@\@\@Z + */ + MCAPI ArmorTrim(class CompoundTag const &); + /** + * @symbol ??0ArmorTrim\@\@QEAA\@VHashedString\@\@0\@Z + */ + MCAPI ArmorTrim(class HashedString, class HashedString); + /** + * @symbol ?getMaterialId\@ArmorTrim\@\@QEBA?AVHashedString\@\@XZ + */ + MCAPI class HashedString getMaterialId() const; + /** + * @symbol ?getPatternId\@ArmorTrim\@\@QEBA?AVHashedString\@\@XZ + */ + MCAPI class HashedString getPatternId() const; + /** + * @symbol ??1ArmorTrim\@\@QEAA\@XZ + */ + MCAPI ~ArmorTrim(); + /** + * @symbol ?TAG_TRIM\@ArmorTrim\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI static std::string const TAG_TRIM; + /** + * @symbol ?TAG_TRIM_MATERIAL\@ArmorTrim\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI static std::string const TAG_TRIM_MATERIAL; + /** + * @symbol ?TAG_TRIM_PATTERN\@ArmorTrim\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI static std::string const TAG_TRIM_PATTERN; + /** + * @symbol ?UPGRADE_DESCRIPTION\@ArmorTrim\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI static std::string const UPGRADE_DESCRIPTION; + /** + * @symbol ?UPGRADE_DESCRIPTION_FORMAT\@ArmorTrim\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI static std::string const UPGRADE_DESCRIPTION_FORMAT; + /** + * @symbol ?WRONG_VERSION_OR_ITEM_ERROR\@ArmorTrim\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI static std::string const WRONG_VERSION_OR_ITEM_ERROR; + /** + * @symbol ?appendUpgradeHoverText\@ArmorTrim\@\@SAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI static void appendUpgradeHoverText(class ItemStackBase const &, class Level &, std::string &); + /** + * @symbol ?getTrim\@ArmorTrim\@\@SA?AV?$optional\@VArmorTrim\@\@\@std\@\@VBaseGameVersion\@\@VExperiments\@\@AEBVItemStackBase\@\@\@Z + */ + MCAPI static class std::optional getTrim(class BaseGameVersion, class Experiments, class ItemStackBase const &); + /** + * @symbol ?setTrim\@ArmorTrim\@\@SAXVBaseGameVersion\@\@VExperiments\@\@AEAVItemStackBase\@\@V1\@\@Z + */ + MCAPI static void setTrim(class BaseGameVersion, class Experiments, class ItemStackBase &, class ArmorTrim); + +}; diff --git a/LiteLoader/include/llapi/mc/ArmorTrimIconGenerationInfo.hpp b/LiteLoader/include/llapi/mc/ArmorTrimIconGenerationInfo.hpp new file mode 100644 index 0000000000..8cf3b7fa15 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ArmorTrimIconGenerationInfo.hpp @@ -0,0 +1,48 @@ +/** + * @file ArmorTrimIconGenerationInfo.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ArmorTrimIconGenerationInfo { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ARMORTRIMICONGENERATIONINFO +public: + class ArmorTrimIconGenerationInfo& operator=(class ArmorTrimIconGenerationInfo const &) = delete; + ArmorTrimIconGenerationInfo(class ArmorTrimIconGenerationInfo const &) = delete; + ArmorTrimIconGenerationInfo() = delete; +#endif + +public: + /** + * @symbol ?ARMOR_LOCATION_ROOT\@ArmorTrimIconGenerationInfo\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI static std::string const ARMOR_LOCATION_ROOT; + /** + * @symbol ?PALETTE_LOCATION_ROOT\@ArmorTrimIconGenerationInfo\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI static std::string const PALETTE_LOCATION_ROOT; + /** + * @symbol ?TRIMMED_ARMOR_SUBSTR\@ArmorTrimIconGenerationInfo\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI static std::string const TRIMMED_ARMOR_SUBSTR; + /** + * @symbol ?TRIM_LOCATION_ROOT\@ArmorTrimIconGenerationInfo\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI static std::string const TRIM_LOCATION_ROOT; + /** + * @symbol ?buildTrimmedArmorName\@ArmorTrimIconGenerationInfo\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@0\@Z + */ + MCAPI static std::string buildTrimmedArmorName(std::string const &, std::string const &); + +}; diff --git a/LiteLoader/include/llapi/mc/AssertHandlerContext.hpp b/LiteLoader/include/llapi/mc/AssertHandlerContext.hpp new file mode 100644 index 0000000000..8f7a842289 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AssertHandlerContext.hpp @@ -0,0 +1,32 @@ +/** + * @file AssertHandlerContext.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct AssertHandlerContext { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ASSERTHANDLERCONTEXT +public: + struct AssertHandlerContext& operator=(struct AssertHandlerContext const &) = delete; + AssertHandlerContext(struct AssertHandlerContext const &) = delete; + AssertHandlerContext() = delete; +#endif + +public: + /** + * @symbol ??1AssertHandlerContext\@\@QEAA\@XZ + */ + MCAPI ~AssertHandlerContext(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AtomicTimeAccumulator.hpp b/LiteLoader/include/llapi/mc/AtomicTimeAccumulator.hpp index ab62f6449c..08b378c546 100644 --- a/LiteLoader/include/llapi/mc/AtomicTimeAccumulator.hpp +++ b/LiteLoader/include/llapi/mc/AtomicTimeAccumulator.hpp @@ -36,9 +36,5 @@ class AtomicTimeAccumulator { * @symbol ?addTime\@AtomicTimeAccumulator\@\@QEAAXAEBV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@\@Z */ MCAPI void addTime(class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>> const &); - /** - * @symbol ?reset\@AtomicTimeAccumulator\@\@QEAAXXZ - */ - MCAPI void reset(); }; diff --git a/LiteLoader/include/llapi/mc/AttackCooldownComponent.hpp b/LiteLoader/include/llapi/mc/AttackCooldownComponent.hpp index 35808a7040..b9aa6a515d 100644 --- a/LiteLoader/include/llapi/mc/AttackCooldownComponent.hpp +++ b/LiteLoader/include/llapi/mc/AttackCooldownComponent.hpp @@ -29,14 +29,6 @@ class AttackCooldownComponent { #endif public: - /** - * @symbol ??0AttackCooldownComponent\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI AttackCooldownComponent(class AttackCooldownComponent &&); - /** - * @symbol ??4AttackCooldownComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z - */ - MCAPI class AttackCooldownComponent & operator=(class AttackCooldownComponent &&); /** * @symbol ??1AttackCooldownComponent\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Attribute.hpp b/LiteLoader/include/llapi/mc/Attribute.hpp index 3fa843b6f4..8e476bfd77 100644 --- a/LiteLoader/include/llapi/mc/Attribute.hpp +++ b/LiteLoader/include/llapi/mc/Attribute.hpp @@ -33,10 +33,6 @@ class Attribute { * @symbol ??0Attribute\@\@QEAA\@AEBVHashedString\@\@W4RedefinitionMode\@\@_N\@Z */ MCAPI Attribute(class HashedString const &, enum class RedefinitionMode, bool); - /** - * @symbol ?getIDValue\@Attribute\@\@QEBA?BIXZ - */ - MCAPI unsigned int const getIDValue() const; /** * @symbol ?getName\@Attribute\@\@QEBAAEBVHashedString\@\@XZ */ @@ -45,14 +41,6 @@ class Attribute { * @symbol ?getRedefinitionMode\@Attribute\@\@QEBA?AW4RedefinitionMode\@\@XZ */ MCAPI enum class RedefinitionMode getRedefinitionMode() const; - /** - * @symbol ?isClientSyncable\@Attribute\@\@QEBA_NXZ - */ - MCAPI bool isClientSyncable() const; - /** - * @symbol ??8Attribute\@\@QEBA_NAEBV0\@\@Z - */ - MCAPI bool operator==(class Attribute const &) const; /** * @symbol ?getByName\@Attribute\@\@SAAEAV1\@AEBVHashedString\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/AttributeBuff.hpp b/LiteLoader/include/llapi/mc/AttributeBuff.hpp index 5070af8a4e..35b39f9748 100644 --- a/LiteLoader/include/llapi/mc/AttributeBuff.hpp +++ b/LiteLoader/include/llapi/mc/AttributeBuff.hpp @@ -24,6 +24,7 @@ class AttributeBuff { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ATTRIBUTEBUFF public: class AttributeBuff& operator=(class AttributeBuff const &) = delete; + AttributeBuff(class AttributeBuff const &) = delete; AttributeBuff() = delete; #endif @@ -54,18 +55,10 @@ class AttributeBuff { */ MCVAPI ~AttributeBuff(); #endif - /** - * @symbol ??0AttributeBuff\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI AttributeBuff(class AttributeBuff const &); /** * @symbol ?getAmount\@AttributeBuff\@\@QEBAMXZ */ MCAPI float getAmount() const; - /** - * @symbol ?getCause\@AttributeBuff\@\@QEBA?AW4ActorDamageCause\@\@XZ - */ - MCAPI enum class ActorDamageCause getCause() const; /** * @symbol ?getId\@AttributeBuff\@\@QEBA_KXZ */ @@ -74,10 +67,6 @@ class AttributeBuff { * @symbol ?getOperand\@AttributeBuff\@\@QEBAHXZ */ MCAPI int getOperand() const; - /** - * @symbol ?getSource\@AttributeBuff\@\@QEBAAEBVActorDamageSource\@\@XZ - */ - MCAPI class ActorDamageSource const & getSource() const; /** * @symbol ?getType\@AttributeBuff\@\@QEBA?AW4AttributeBuffType\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/AttributeInstance.hpp b/LiteLoader/include/llapi/mc/AttributeInstance.hpp index 1109354b15..572ea66c23 100644 --- a/LiteLoader/include/llapi/mc/AttributeInstance.hpp +++ b/LiteLoader/include/llapi/mc/AttributeInstance.hpp @@ -24,6 +24,7 @@ class AttributeInstance { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ATTRIBUTEINSTANCE public: class AttributeInstance& operator=(class AttributeInstance const &) = delete; + AttributeInstance() = delete; #endif public: @@ -47,10 +48,6 @@ class AttributeInstance { * @symbol ??0AttributeInstance\@\@QEAA\@AEBV0\@\@Z */ MCAPI AttributeInstance(class AttributeInstance const &); - /** - * @symbol ??0AttributeInstance\@\@QEAA\@XZ - */ - MCAPI AttributeInstance(); /** * @symbol ?addBuff\@AttributeInstance\@\@QEAAXAEBVAttributeBuff\@\@\@Z */ @@ -83,10 +80,6 @@ class AttributeInstance { * @symbol ?getHandle\@AttributeInstance\@\@QEBA?AVAttributeInstanceHandle\@\@XZ */ MCAPI class AttributeInstanceHandle getHandle() const; - /** - * @symbol ?getListeners\@AttributeInstance\@\@QEBAAEBV?$vector\@VAttributeInstanceHandle\@\@V?$allocator\@VAttributeInstanceHandle\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector const & getListeners() const; /** * @symbol ?getMaxValue\@AttributeInstance\@\@QEBAMXZ */ @@ -99,22 +92,26 @@ class AttributeInstance { * @symbol ?getModifier\@AttributeInstance\@\@QEBA?AVAttributeModifier\@\@AEBVUUID\@mce\@\@\@Z */ MCAPI class AttributeModifier getModifier(class mce::UUID const &) const; - /** - * @symbol ?getModifiers\@AttributeInstance\@\@QEBA?AV?$vector\@VAttributeModifier\@\@V?$allocator\@VAttributeModifier\@\@\@std\@\@\@std\@\@H\@Z - */ - MCAPI std::vector getModifiers(int) const; /** * @symbol ?getModifiers\@AttributeInstance\@\@QEBA?AV?$vector\@VAttributeModifier\@\@V?$allocator\@VAttributeModifier\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getModifiers() const; /** - * @symbol ?hasModifier\@AttributeInstance\@\@QEBA_NAEBVUUID\@mce\@\@\@Z + * @symbol ?getModifiers\@AttributeInstance\@\@QEBA?AV?$vector\@VAttributeModifier\@\@V?$allocator\@VAttributeModifier\@\@\@std\@\@\@std\@\@H\@Z */ - MCAPI bool hasModifier(class mce::UUID const &) const; + MCAPI std::vector getModifiers(int) const; /** * @symbol ?hasModifier\@AttributeInstance\@\@QEBA_NV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z */ MCAPI bool hasModifier(class std::shared_ptr) const; + /** + * @symbol ?hasModifier\@AttributeInstance\@\@QEBA_NAEBVAttributeModifier\@\@\@Z + */ + MCAPI bool hasModifier(class AttributeModifier const &) const; + /** + * @symbol ?hasModifier\@AttributeInstance\@\@QEBA_NAEBVUUID\@mce\@\@\@Z + */ + MCAPI bool hasModifier(class mce::UUID const &) const; /** * @symbol ?hasModifiers\@AttributeInstance\@\@QEBA_NXZ */ @@ -131,10 +128,6 @@ class AttributeInstance { * @symbol ?isValid\@AttributeInstance\@\@QEBA_NXZ */ MCAPI bool isValid() const; - /** - * @symbol ?notify\@AttributeInstance\@\@QEAAX_J\@Z - */ - MCAPI void notify(__int64); /** * @symbol ??8AttributeInstance\@\@QEBA_NAEBV0\@\@Z */ @@ -163,14 +156,14 @@ class AttributeInstance { * @symbol ?removeModifier\@AttributeInstance\@\@QEAA_NAEBVUUID\@mce\@\@\@Z */ MCAPI bool removeModifier(class mce::UUID const &); - /** - * @symbol ?removeModifier\@AttributeInstance\@\@QEAAXV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z - */ - MCAPI void removeModifier(class std::shared_ptr); /** * @symbol ?removeModifier\@AttributeInstance\@\@QEAAXAEBVAttributeModifier\@\@\@Z */ MCAPI void removeModifier(class AttributeModifier const &); + /** + * @symbol ?removeModifier\@AttributeInstance\@\@QEAAXV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z + */ + MCAPI void removeModifier(class std::shared_ptr); /** * @symbol ?removeModifiers\@AttributeInstance\@\@QEAAXXZ */ @@ -226,21 +219,21 @@ class AttributeInstance { //private: /** - * @symbol ??0AttributeInstance\@\@AEAA\@PEAVBaseAttributeMap\@\@PEBVAttribute\@\@\@Z + * @symbol ?_calculateValue\@AttributeInstance\@\@AEAAMAEBVAttributeBuff\@\@\@Z */ - MCAPI AttributeInstance(class BaseAttributeMap *, class Attribute const *); + MCAPI float _calculateValue(class AttributeBuff const &); /** * @symbol ?_calculateValue\@AttributeInstance\@\@AEAAMXZ */ MCAPI float _calculateValue(); - /** - * @symbol ?_calculateValue\@AttributeInstance\@\@AEAAMAEBVAttributeBuff\@\@\@Z - */ - MCAPI float _calculateValue(class AttributeBuff const &); /** * @symbol ?_sanitizeValue\@AttributeInstance\@\@AEAAMM\@Z */ MCAPI float _sanitizeValue(float); + /** + * @symbol ?_setDirty\@AttributeInstance\@\@AEAAXXZ + */ + MCAPI void _setDirty(); private: diff --git a/LiteLoader/include/llapi/mc/AttributeInstanceDelegate.hpp b/LiteLoader/include/llapi/mc/AttributeInstanceDelegate.hpp index 3ca83eb525..0f655a9524 100644 --- a/LiteLoader/include/llapi/mc/AttributeInstanceDelegate.hpp +++ b/LiteLoader/include/llapi/mc/AttributeInstanceDelegate.hpp @@ -59,27 +59,5 @@ class AttributeInstanceDelegate { * @symbol ?getBuffValueWithModifiers\@AttributeInstanceDelegate\@\@UEBAMAEBVAttributeBuff\@\@\@Z */ virtual float getBuffValueWithModifiers(class AttributeBuff const &) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ATTRIBUTEINSTANCEDELEGATE - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~AttributeInstanceDelegate(); -#endif - /** - * @symbol ??0AttributeInstanceDelegate\@\@QEAA\@AEBVAttributeInstance\@\@\@Z - */ - MCAPI AttributeInstanceDelegate(class AttributeInstance const &); - -//protected: - /** - * @symbol ?_getInstance\@AttributeInstanceDelegate\@\@IEBAAEBVAttributeInstance\@\@XZ - */ - MCAPI class AttributeInstance const & _getInstance() const; - /** - * @symbol ?_getMutableInstance\@AttributeInstanceDelegate\@\@IEBAPEAVAttributeInstance\@\@XZ - */ - MCAPI class AttributeInstance * _getMutableInstance() const; - -protected: }; diff --git a/LiteLoader/include/llapi/mc/AttributeInstanceHandle.hpp b/LiteLoader/include/llapi/mc/AttributeInstanceHandle.hpp index 1a8d13666d..a4b9e0a293 100644 --- a/LiteLoader/include/llapi/mc/AttributeInstanceHandle.hpp +++ b/LiteLoader/include/llapi/mc/AttributeInstanceHandle.hpp @@ -29,25 +29,9 @@ class AttributeInstanceHandle { #endif public: - /** - * @symbol ?getAttributeID\@AttributeInstanceHandle\@\@QEBA?BIXZ - */ - MCAPI unsigned int const getAttributeID() const; /** * @symbol ?getInstance\@AttributeInstanceHandle\@\@QEBAAEBVAttributeInstance\@\@XZ */ MCAPI class AttributeInstance const & getInstance() const; - /** - * @symbol ?getMutableInstance\@AttributeInstanceHandle\@\@QEBAPEAVAttributeInstance\@\@XZ - */ - MCAPI class AttributeInstance * getMutableInstance() const; - /** - * @symbol ?inheritFrom\@AttributeInstanceHandle\@\@QEAAXAEBV1\@PEAVBaseAttributeMap\@\@\@Z - */ - MCAPI void inheritFrom(class AttributeInstanceHandle const &, class BaseAttributeMap *); - /** - * @symbol ??8AttributeInstanceHandle\@\@QEBA_NAEBV0\@\@Z - */ - MCAPI bool operator==(class AttributeInstanceHandle const &) const; }; diff --git a/LiteLoader/include/llapi/mc/AttributeModifier.hpp b/LiteLoader/include/llapi/mc/AttributeModifier.hpp index b3cec94e81..208bd0a2d6 100644 --- a/LiteLoader/include/llapi/mc/AttributeModifier.hpp +++ b/LiteLoader/include/llapi/mc/AttributeModifier.hpp @@ -65,6 +65,10 @@ class AttributeModifier { */ MCVAPI ~AttributeModifier(); #endif + /** + * @symbol ??0AttributeModifier\@\@QEAA\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MW4AttributeModifierOperation\@\@W4AttributeOperands\@\@_N\@Z + */ + MCAPI AttributeModifier(class mce::UUID, std::string const &, float, enum class AttributeModifierOperation, enum class AttributeOperands, bool); /** * @symbol ??0AttributeModifier\@\@QEAA\@XZ */ @@ -73,10 +77,6 @@ class AttributeModifier { * @symbol ??0AttributeModifier\@\@QEAA\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MHH_N\@Z */ MCAPI AttributeModifier(class mce::UUID, std::string const &, float, int, int, bool); - /** - * @symbol ??0AttributeModifier\@\@QEAA\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MW4AttributeModifierOperation\@\@W4AttributeOperands\@\@_N\@Z - */ - MCAPI AttributeModifier(class mce::UUID, std::string const &, float, enum class AttributeModifierOperation, enum class AttributeOperands, bool); /** * @symbol ?getAmount\@AttributeModifier\@\@QEBAMXZ */ diff --git a/LiteLoader/include/llapi/mc/AutoStepFilterSystem.hpp b/LiteLoader/include/llapi/mc/AutoStepFilterSystem.hpp index 26ffb1d440..6d04771932 100644 --- a/LiteLoader/include/llapi/mc/AutoStepFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/AutoStepFilterSystem.hpp @@ -31,5 +31,9 @@ class AutoStepFilterSystem { * @symbol ?createAutoStepFilterSystem\@AutoStepFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createAutoStepFilterSystem(); + /** + * @symbol ?tickAutoStepFilterSystem\@AutoStepFilterSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUMoveRequestComponent\@\@$$CBUMaxAutoStepComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBUAbilitiesComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UAutoStepRequestFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void tickAutoStepFilterSystem(class ViewT const>, class Optional>, class EntityModifierT>); }; diff --git a/LiteLoader/include/llapi/mc/AverageTracker.hpp b/LiteLoader/include/llapi/mc/AverageTracker.hpp index 559eb5c990..6dec55fb02 100644 --- a/LiteLoader/include/llapi/mc/AverageTracker.hpp +++ b/LiteLoader/include/llapi/mc/AverageTracker.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class AverageTracker { +struct AverageTracker { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_AVERAGETRACKER public: - class AverageTracker& operator=(class AverageTracker const &) = delete; - AverageTracker(class AverageTracker const &) = delete; + struct AverageTracker& operator=(struct AverageTracker const &) = delete; + AverageTracker(struct AverageTracker const &) = delete; AverageTracker() = delete; #endif @@ -29,4 +29,4 @@ class AverageTracker { */ MCAPI void addSample(class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>>); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AzaleaBlock.hpp b/LiteLoader/include/llapi/mc/AzaleaBlock.hpp index 5bfbe68541..8d2e61ff9d 100644 --- a/LiteLoader/include/llapi/mc/AzaleaBlock.hpp +++ b/LiteLoader/include/llapi/mc/AzaleaBlock.hpp @@ -206,20 +206,20 @@ class AzaleaBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -231,25 +231,30 @@ class AzaleaBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); /** * @symbol ??0AzaleaBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/AzaleaLeafBlock.hpp b/LiteLoader/include/llapi/mc/AzaleaLeafBlock.hpp index c4dcd15d0e..b61f8bf314 100644 --- a/LiteLoader/include/llapi/mc/AzaleaLeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/AzaleaLeafBlock.hpp @@ -176,35 +176,35 @@ class AzaleaLeafBlock : public LeafBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 136 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 137 * @symbol ?getColor\@AzaleaLeafBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 140 + * @vftbl 141 * @symbol ?onGraphicsModeChanged\@AzaleaLeafBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@AzaleaLeafBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,42 +216,47 @@ class AzaleaLeafBlock : public LeafBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 181 + * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 182 * @symbol ?getRenderLayer\@AzaleaLeafBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@AzaleaLeafBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@AzaleaLeafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@AzaleaLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/BackgroundTaskBase.hpp b/LiteLoader/include/llapi/mc/BackgroundTaskBase.hpp index 8cb9f44e67..aec70fc97a 100644 --- a/LiteLoader/include/llapi/mc/BackgroundTaskBase.hpp +++ b/LiteLoader/include/llapi/mc/BackgroundTaskBase.hpp @@ -63,10 +63,6 @@ class BackgroundTaskBase { * @symbol ?getPrev\@BackgroundTaskBase\@\@QEAAPEAV1\@XZ */ MCAPI class BackgroundTaskBase * getPrev(); - /** - * @symbol ?getPriority\@BackgroundTaskBase\@\@QEBAHXZ - */ - MCAPI int getPriority() const; /** * @symbol ?getStartAfterTime\@BackgroundTaskBase\@\@QEBA?AV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BackgroundTaskQueue.hpp b/LiteLoader/include/llapi/mc/BackgroundTaskQueue.hpp index ca0a198028..f18d193d97 100644 --- a/LiteLoader/include/llapi/mc/BackgroundTaskQueue.hpp +++ b/LiteLoader/include/llapi/mc/BackgroundTaskQueue.hpp @@ -40,10 +40,6 @@ class BackgroundTaskQueue { * @symbol ?getApproximateTaskCount\@BackgroundTaskQueue\@\@QEBA_KXZ */ MCAPI unsigned __int64 getApproximateTaskCount() const; - /** - * @symbol ?getNextItemPriority\@BackgroundTaskQueue\@\@QEAAHXZ - */ - MCAPI int getNextItemPriority(); /** * @symbol ?queue\@BackgroundTaskQueue\@\@QEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/BackgroundWorker.hpp b/LiteLoader/include/llapi/mc/BackgroundWorker.hpp index 0069dc4508..c68b758ca6 100644 --- a/LiteLoader/include/llapi/mc/BackgroundWorker.hpp +++ b/LiteLoader/include/llapi/mc/BackgroundWorker.hpp @@ -69,10 +69,6 @@ enum class RunOneResult; * @symbol ?isIdle\@BackgroundWorker\@\@QEBA_NXZ */ MCAPI bool isIdle() const; - /** - * @symbol ?processTaskSync\@BackgroundWorker\@\@QEAA_NXZ - */ - MCAPI bool processTaskSync(); /** * @symbol ?queue\@BackgroundWorker\@\@QEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@\@Z */ @@ -81,10 +77,6 @@ enum class RunOneResult; * @symbol ?requestStop\@BackgroundWorker\@\@QEAAX_N\@Z */ MCAPI void requestStop(bool); - /** - * @symbol ?resetWorkerThreadID\@BackgroundWorker\@\@QEAAXXZ - */ - MCAPI void resetWorkerThreadID(); /** * @symbol ?resortPriorityQueue\@BackgroundWorker\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/BackwardsCompatTextureInfo.hpp b/LiteLoader/include/llapi/mc/BackwardsCompatTextureInfo.hpp deleted file mode 100644 index 59c99149ae..0000000000 --- a/LiteLoader/include/llapi/mc/BackwardsCompatTextureInfo.hpp +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @file BackwardsCompatTextureInfo.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class BackwardsCompatTextureInfo. - * - */ -class BackwardsCompatTextureInfo { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BACKWARDSCOMPATTEXTUREINFO -public: - class BackwardsCompatTextureInfo& operator=(class BackwardsCompatTextureInfo const &) = delete; - BackwardsCompatTextureInfo(class BackwardsCompatTextureInfo const &) = delete; -#endif - -public: - /** - * @symbol ??0BackwardsCompatTextureInfo\@\@QEAA\@XZ - */ - MCAPI BackwardsCompatTextureInfo(); - -}; diff --git a/LiteLoader/include/llapi/mc/Balloon.hpp b/LiteLoader/include/llapi/mc/Balloon.hpp index 30fa19b2a7..6ce2e74c19 100644 --- a/LiteLoader/include/llapi/mc/Balloon.hpp +++ b/LiteLoader/include/llapi/mc/Balloon.hpp @@ -160,9 +160,5 @@ class Balloon : public PredictableProjectile { * @symbol ??0Balloon\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Balloon(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); - /** - * @symbol ?remove\@Balloon\@\@QEAAX_N\@Z - */ - MCAPI void remove(bool); }; diff --git a/LiteLoader/include/llapi/mc/BalloonItem.hpp b/LiteLoader/include/llapi/mc/BalloonItem.hpp index a9996e963d..43473154ee 100644 --- a/LiteLoader/include/llapi/mc/BalloonItem.hpp +++ b/LiteLoader/include/llapi/mc/BalloonItem.hpp @@ -118,9 +118,9 @@ class BalloonItem : public Item { virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** * @vftbl 132 - * @symbol ?_useOn\@BalloonItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@BalloonItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0BalloonItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/BambooItem.hpp b/LiteLoader/include/llapi/mc/BambooItem.hpp index 87e9dd41dd..c85bbbca2f 100644 --- a/LiteLoader/include/llapi/mc/BambooItem.hpp +++ b/LiteLoader/include/llapi/mc/BambooItem.hpp @@ -103,9 +103,9 @@ class BambooItem : public BlockItem { virtual void __unk_vfn_80(); /** * @vftbl 132 - * @symbol ?_useOn\@BambooItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@BambooItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0BambooItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/BambooSaplingBlock.hpp b/LiteLoader/include/llapi/mc/BambooSaplingBlock.hpp index 3350e51f46..19b658f9b6 100644 --- a/LiteLoader/include/llapi/mc/BambooSaplingBlock.hpp +++ b/LiteLoader/include/llapi/mc/BambooSaplingBlock.hpp @@ -211,30 +211,30 @@ class BambooSaplingBlock : public Sapling { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 134 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@BambooSaplingBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@BambooSaplingBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -246,47 +246,52 @@ class BambooSaplingBlock : public Sapling { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@BambooSaplingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@BambooSaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@BambooSaplingBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@BambooSaplingBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@BambooSaplingBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/BambooStalkBlock.hpp b/LiteLoader/include/llapi/mc/BambooStalkBlock.hpp index c87be5915e..af8d1d6564 100644 --- a/LiteLoader/include/llapi/mc/BambooStalkBlock.hpp +++ b/LiteLoader/include/llapi/mc/BambooStalkBlock.hpp @@ -207,9 +207,9 @@ class BambooStalkBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@BambooStalkBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@BambooStalkBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -226,25 +226,25 @@ class BambooStalkBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@BambooStalkBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 144 + * @symbol ?getVisualShape\@BambooStalkBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -257,46 +257,51 @@ class BambooStalkBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@BambooStalkBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp b/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp index ba0612cbce..5f811a126b 100644 --- a/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp +++ b/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp @@ -38,9 +38,9 @@ class BannerAddPatternRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@BannerAddPatternRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @symbol ?assemble\@BannerAddPatternRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &) const; + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@BannerAddPatternRecipe\@\@UEBAHXZ @@ -56,6 +56,11 @@ class BannerAddPatternRecipe : public Recipe { * @symbol ?getResultItem\@BannerAddPatternRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; + /** + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); /** * @vftbl 6 * @symbol ?matches\@BannerAddPatternRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/BannerBlock.hpp b/LiteLoader/include/llapi/mc/BannerBlock.hpp index 9e15f26dca..6b2079c29c 100644 --- a/LiteLoader/include/llapi/mc/BannerBlock.hpp +++ b/LiteLoader/include/llapi/mc/BannerBlock.hpp @@ -201,30 +201,30 @@ class BannerBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@BannerBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@BannerBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -237,41 +237,46 @@ class BannerBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@BannerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@BannerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@BannerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getEntityResourceItem\@BannerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; diff --git a/LiteLoader/include/llapi/mc/BannerBlockActor.hpp b/LiteLoader/include/llapi/mc/BannerBlockActor.hpp index 19ee37a150..f9cba5577a 100644 --- a/LiteLoader/include/llapi/mc/BannerBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BannerBlockActor.hpp @@ -105,10 +105,6 @@ class BannerBlockActor : public BlockActor { * @symbol ?_onUpdatePacket\@BannerBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); - /** - * @symbol ??0BannerBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z - */ - MCAPI BannerBlockActor(class BlockPos const &); /** * @symbol ?getBaseColorInt\@BannerBlockActor\@\@QEBAEXZ */ diff --git a/LiteLoader/include/llapi/mc/BannerDuplicateRecipe.hpp b/LiteLoader/include/llapi/mc/BannerDuplicateRecipe.hpp index a7d5c0d52c..0398f5a801 100644 --- a/LiteLoader/include/llapi/mc/BannerDuplicateRecipe.hpp +++ b/LiteLoader/include/llapi/mc/BannerDuplicateRecipe.hpp @@ -37,9 +37,9 @@ class BannerDuplicateRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@BannerDuplicateRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @symbol ?assemble\@BannerDuplicateRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &) const; + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@BannerDuplicateRecipe\@\@UEBAHXZ @@ -55,6 +55,11 @@ class BannerDuplicateRecipe : public Recipe { * @symbol ?getResultItem\@BannerDuplicateRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; + /** + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); /** * @vftbl 6 * @symbol ?matches\@BannerDuplicateRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/BannerItem.hpp b/LiteLoader/include/llapi/mc/BannerItem.hpp index aaa9a4c74f..2aeb1bfa0f 100644 --- a/LiteLoader/include/llapi/mc/BannerItem.hpp +++ b/LiteLoader/include/llapi/mc/BannerItem.hpp @@ -123,12 +123,16 @@ class BannerItem : public Item { virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** * @vftbl 132 - * @symbol ?_useOn\@BannerItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@BannerItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0BannerItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BannerItem(std::string const &, int); + /** + * @symbol ?getPatternAndColorPairsFromItemStack\@BannerItem\@\@SA?AV?$vector\@U?$pair\@V?$not_null\@PEBVBannerPattern\@\@\@gsl\@\@W4ItemColor\@\@\@std\@\@V?$allocator\@U?$pair\@V?$not_null\@PEBVBannerPattern\@\@\@gsl\@\@W4ItemColor\@\@\@std\@\@\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z + */ + MCAPI static std::vector, enum class ItemColor>> getPatternAndColorPairsFromItemStack(class ItemStackBase const &); }; diff --git a/LiteLoader/include/llapi/mc/BannerPattern.hpp b/LiteLoader/include/llapi/mc/BannerPattern.hpp index f0039f3d9f..01e466e7dd 100644 --- a/LiteLoader/include/llapi/mc/BannerPattern.hpp +++ b/LiteLoader/include/llapi/mc/BannerPattern.hpp @@ -29,6 +29,10 @@ class BannerPattern { #endif public: + /** + * @symbol ??0BannerPattern\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0VItemStack\@\@F_N\@Z + */ + MCAPI BannerPattern(std::string const &, std::string const &, class ItemStack, short, bool); /** * @symbol ?getIgnoreAux\@BannerPattern\@\@QEBA_NXZ */ @@ -157,6 +161,10 @@ class BannerPattern { * @symbol ?mHalfVerticalRight\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mHalfVerticalRight; + /** + * @symbol ?mIllager\@BannerPattern\@\@2PEAV1\@EA + */ + MCAPI static class BannerPattern * mIllager; /** * @symbol ?mMojang\@BannerPattern\@\@2PEAV1\@EA */ @@ -249,5 +257,9 @@ class BannerPattern { * @symbol ?mTrianglesTop\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mTrianglesTop; + /** + * @symbol ?tryGetPatternDataFromTag\@BannerPattern\@\@SAPEBVCompoundTag\@\@PEBVTag\@\@\@Z + */ + MCAPI static class CompoundTag const * tryGetPatternDataFromTag(class Tag const *); }; diff --git a/LiteLoader/include/llapi/mc/BarrelBlock.hpp b/LiteLoader/include/llapi/mc/BarrelBlock.hpp index 79ac7783cd..5526920dcc 100644 --- a/LiteLoader/include/llapi/mc/BarrelBlock.hpp +++ b/LiteLoader/include/llapi/mc/BarrelBlock.hpp @@ -186,35 +186,35 @@ class BarrelBlock : public FaceDirectionalBlock { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 * @symbol ?getVariant\@BarrelBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 151 * @symbol ?getFaceFlip\@BarrelBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@BarrelBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,30 +226,35 @@ class BarrelBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 * @symbol ?use\@BarrelBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BARRELBLOCK /** * @symbol ?hasComparatorSignal\@BarrelBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/BarrelBlockActor.hpp b/LiteLoader/include/llapi/mc/BarrelBlockActor.hpp index f87b98fc99..36a9278f1b 100644 --- a/LiteLoader/include/llapi/mc/BarrelBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BarrelBlockActor.hpp @@ -55,9 +55,5 @@ class BarrelBlockActor { */ MCVAPI void stopOpen(class Player &); #endif - /** - * @symbol ??0BarrelBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z - */ - MCAPI BarrelBlockActor(class BlockPos const &); }; diff --git a/LiteLoader/include/llapi/mc/BarrelContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/BarrelContainerScreenValidator.hpp index dc41ae74ee..d36a04f4ff 100644 --- a/LiteLoader/include/llapi/mc/BarrelContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/BarrelContainerScreenValidator.hpp @@ -26,6 +26,7 @@ class BarrelContainerScreenValidator : public ContainerScreenValidatorBase { public: class BarrelContainerScreenValidator& operator=(class BarrelContainerScreenValidator const &) = delete; BarrelContainerScreenValidator(class BarrelContainerScreenValidator const &) = delete; + BarrelContainerScreenValidator() = delete; #endif public: @@ -34,9 +35,5 @@ class BarrelContainerScreenValidator : public ContainerScreenValidatorBase { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @symbol ??0BarrelContainerScreenValidator\@\@QEAA\@XZ - */ - MCAPI BarrelContainerScreenValidator(); }; diff --git a/LiteLoader/include/llapi/mc/BarrierBlock.hpp b/LiteLoader/include/llapi/mc/BarrierBlock.hpp index 788a744189..b434ce51e2 100644 --- a/LiteLoader/include/llapi/mc/BarrierBlock.hpp +++ b/LiteLoader/include/llapi/mc/BarrierBlock.hpp @@ -186,25 +186,25 @@ class BarrierBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 141 - * @symbol ?getShadeBrightness\@BarrierBlock\@\@UEBAMAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual float getShadeBrightness(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 142 + * @symbol ?getShadeBrightness\@BarrierBlock\@\@UEBAMAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual float getShadeBrightness(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,25 +216,30 @@ class BarrierBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0BarrierBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/BasaltPillarFeature.hpp b/LiteLoader/include/llapi/mc/BasaltPillarFeature.hpp index 38e552ba7d..7f162aaf90 100644 --- a/LiteLoader/include/llapi/mc/BasaltPillarFeature.hpp +++ b/LiteLoader/include/llapi/mc/BasaltPillarFeature.hpp @@ -43,9 +43,9 @@ class BasaltPillarFeature : public Feature { //private: /** - * @symbol ?_growColumn\@BasaltPillarFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@M\@Z + * @symbol ?_growColumn\@BasaltPillarFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@MAEBVBlock\@\@\@Z */ - MCAPI bool _growColumn(class BlockSource &, class BlockPos const &, class Random &, float) const; + MCAPI bool _growColumn(class BlockSource &, class BlockPos const &, class Random &, float, class Block const &) const; private: diff --git a/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp b/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp index 0f09bbc363..20be8b58f0 100644 --- a/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp +++ b/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp @@ -56,22 +56,22 @@ class BaseAttributeMap { * @symbol ?getDirtyAttributes\@BaseAttributeMap\@\@QEBAAEBV?$vector\@VAttributeInstanceHandle\@\@V?$allocator\@VAttributeInstanceHandle\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getDirtyAttributes() const; - /** - * @symbol ?getInstance\@BaseAttributeMap\@\@QEBAAEBVAttributeInstance\@\@I\@Z - */ - MCAPI class AttributeInstance const & getInstance(unsigned int) const; /** * @symbol ?getInstance\@BaseAttributeMap\@\@QEBAAEBVAttributeInstance\@\@AEBVAttribute\@\@\@Z */ MCAPI class AttributeInstance const & getInstance(class Attribute const &) const; /** - * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@AEBVHashedString\@\@\@Z + * @symbol ?getInstance\@BaseAttributeMap\@\@QEBAAEBVAttributeInstance\@\@I\@Z */ - MCAPI class AttributeInstance * getMutableInstance(class HashedString const &); + MCAPI class AttributeInstance const & getInstance(unsigned int) const; /** * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@AEBVAttribute\@\@\@Z */ MCAPI class AttributeInstance * getMutableInstance(class Attribute const &); + /** + * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@AEBVHashedString\@\@\@Z + */ + MCAPI class AttributeInstance * getMutableInstance(class HashedString const &); /** * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@I\@Z */ @@ -84,10 +84,6 @@ class BaseAttributeMap { * @symbol ?inheritFrom\@BaseAttributeMap\@\@QEAAXAEBV1\@\@Z */ MCAPI void inheritFrom(class BaseAttributeMap const &); - /** - * @symbol ?onAttributeModified\@BaseAttributeMap\@\@QEAAXAEBVAttributeInstance\@\@\@Z - */ - MCAPI void onAttributeModified(class AttributeInstance const &); /** * @symbol ?registerAttribute\@BaseAttributeMap\@\@QEAAAEAVAttributeInstance\@\@AEBVAttribute\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BaseCircuitComponent.hpp b/LiteLoader/include/llapi/mc/BaseCircuitComponent.hpp index 28ec833ad2..e9e94e08b9 100644 --- a/LiteLoader/include/llapi/mc/BaseCircuitComponent.hpp +++ b/LiteLoader/include/llapi/mc/BaseCircuitComponent.hpp @@ -215,18 +215,6 @@ class BaseCircuitComponent { * @symbol ?hasDirectPower\@BaseCircuitComponent\@\@QEAA_NXZ */ MCAPI bool hasDirectPower(); - /** - * @symbol ?isRemoved\@BaseCircuitComponent\@\@QEBA_NXZ - */ - MCAPI bool isRemoved() const; - /** - * @symbol ?removeFromSourceAndDestinationList\@BaseCircuitComponent\@\@QEAA?AV?$_Vector_iterator\@V?$_Vector_val\@U?$_Simple_types\@VItem\@CircuitComponentList\@\@\@std\@\@\@std\@\@\@std\@\@V23\@\@Z - */ - MCAPI class std::_Vector_iterator>> removeFromSourceAndDestinationList(class std::_Vector_iterator>>); - /** - * @symbol ?setRemoved\@BaseCircuitComponent\@\@QEAAXXZ - */ - MCAPI void setRemoved(); //protected: /** diff --git a/LiteLoader/include/llapi/mc/BaseCommandBlock.hpp b/LiteLoader/include/llapi/mc/BaseCommandBlock.hpp index 704bfce5dd..39ae33df6c 100644 --- a/LiteLoader/include/llapi/mc/BaseCommandBlock.hpp +++ b/LiteLoader/include/llapi/mc/BaseCommandBlock.hpp @@ -44,14 +44,6 @@ class BaseCommandBlock { * @symbol ?getName\@BaseCommandBlock\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getName() const; - /** - * @symbol ?getRawName\@BaseCommandBlock\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getRawName() const; - /** - * @symbol ?getSuccessCount\@BaseCommandBlock\@\@QEBAHXZ - */ - MCAPI int getSuccessCount() const; /** * @symbol ?getTickDelay\@BaseCommandBlock\@\@QEBAHXZ */ @@ -68,10 +60,6 @@ class BaseCommandBlock { * @symbol ?load\@BaseCommandBlock\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void load(class CompoundTag const &, class DataLoadHelper &); - /** - * @symbol ?performCommand\@BaseCommandBlock\@\@QEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEA_N\@Z - */ - MCAPI bool performCommand(class BlockSource &, class BlockPos const &, bool &); /** * @symbol ?performCommand\@BaseCommandBlock\@\@QEAA_NAEAVBlockSource\@\@AEBUActorUniqueID\@\@\@Z */ @@ -100,10 +88,6 @@ class BaseCommandBlock { * @symbol ?setShouldExecuteOnFirstTick\@BaseCommandBlock\@\@QEAAX_N\@Z */ MCAPI void setShouldExecuteOnFirstTick(bool); - /** - * @symbol ?setSuccessCount\@BaseCommandBlock\@\@QEAAXH\@Z - */ - MCAPI void setSuccessCount(int); /** * @symbol ?setTickDelay\@BaseCommandBlock\@\@QEAAXH\@Z */ diff --git a/LiteLoader/include/llapi/mc/BaseContainerMenu.hpp b/LiteLoader/include/llapi/mc/BaseContainerMenu.hpp index 8bb3c09431..e2d2eeacb6 100644 --- a/LiteLoader/include/llapi/mc/BaseContainerMenu.hpp +++ b/LiteLoader/include/llapi/mc/BaseContainerMenu.hpp @@ -71,10 +71,6 @@ class BaseContainerMenu { */ MCVAPI ~BaseContainerMenu(); #endif - /** - * @symbol ??0BaseContainerMenu\@\@QEAA\@AEAVPlayer\@\@W4ContainerType\@\@\@Z - */ - MCAPI BaseContainerMenu(class Player &, enum class ContainerType); //protected: /** diff --git a/LiteLoader/include/llapi/mc/BaseGameVersion.hpp b/LiteLoader/include/llapi/mc/BaseGameVersion.hpp index 452416e00e..40c0626079 100644 --- a/LiteLoader/include/llapi/mc/BaseGameVersion.hpp +++ b/LiteLoader/include/llapi/mc/BaseGameVersion.hpp @@ -31,14 +31,14 @@ class BaseGameVersion { * @symbol ??0BaseGameVersion\@\@QEAA\@AEBVSemVersion\@\@\@Z */ MCAPI BaseGameVersion(class SemVersion const &); - /** - * @symbol ??0BaseGameVersion\@\@QEAA\@GII\@Z - */ - MCAPI BaseGameVersion(unsigned short, unsigned int, unsigned int); /** * @symbol ??0BaseGameVersion\@\@QEAA\@XZ */ MCAPI BaseGameVersion(); + /** + * @symbol ??0BaseGameVersion\@\@QEAA\@GII\@Z + */ + MCAPI BaseGameVersion(unsigned short, unsigned int, unsigned int); /** * @symbol ?asSemVersion\@BaseGameVersion\@\@QEBAAEBVSemVersion\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp b/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp index 584bc26fd8..d948eda5c8 100644 --- a/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp +++ b/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp @@ -66,7 +66,7 @@ class BaseMoveToGoal { virtual void tick(); /** * @vftbl 7 - * @symbol ?appendDebugInfo\@LayEggGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?appendDebugInfo\@StrollTowardsVillageGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const = 0; /** diff --git a/LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp b/LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp index 95b9172412..70d72ad525 100644 --- a/LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp +++ b/LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp @@ -226,35 +226,35 @@ class BasePressurePlateBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@BasePressurePlateBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@BasePressurePlateBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 147 + * @vftbl 148 * @symbol ?canSpawnOn\@BasePressurePlateBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -267,66 +267,71 @@ class BasePressurePlateBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@BasePressurePlateBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@BasePressurePlateBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getTickDelay\@BasePressurePlateBlock\@\@UEBAHXZ */ virtual int getTickDelay() const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getSignalStrength\@PressurePlateBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getSignalStrength(class BlockSource &, class BlockPos const &) const = 0; /** - * @vftbl 196 + * @vftbl 197 * @symbol ?getSignalForData\@PressurePlateBlock\@\@MEBAHH\@Z */ virtual int getSignalForData(int) const = 0; /** - * @vftbl 197 + * @vftbl 198 * @symbol ?getRedstoneSignal\@PressurePlateBlock\@\@MEBAHH\@Z */ virtual int getRedstoneSignal(int) const = 0; /** - * @vftbl 198 + * @vftbl 199 * @symbol ?getSensitiveAABB\@BasePressurePlateBlock\@\@MEBA?BVAABB\@\@AEBVBlockPos\@\@\@Z */ virtual class AABB const getSensitiveAABB(class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/BaseRailBlock.hpp b/LiteLoader/include/llapi/mc/BaseRailBlock.hpp index 75f020bda6..95bafaaf03 100644 --- a/LiteLoader/include/llapi/mc/BaseRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/BaseRailBlock.hpp @@ -211,35 +211,35 @@ class BaseRailBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 140 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 141 * @symbol ?onGraphicsModeChanged\@BaseRailBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 143 + * @vftbl 144 * @symbol ?getVisualShape\@BaseRailBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 147 + * @vftbl 148 * @symbol ?canSpawnOn\@BaseRailBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -252,44 +252,49 @@ class BaseRailBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@BaseRailBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 181 + * @vftbl 182 * @symbol ?getRenderLayer\@BaseRailBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BASERAILBLOCK /** * @symbol ?isRailBlock\@BaseRailBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/BeaconBlock.hpp b/LiteLoader/include/llapi/mc/BeaconBlock.hpp index 76991f8adf..642cf820c4 100644 --- a/LiteLoader/include/llapi/mc/BeaconBlock.hpp +++ b/LiteLoader/include/llapi/mc/BeaconBlock.hpp @@ -181,20 +181,20 @@ class BeaconBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,30 +206,35 @@ class BeaconBlock : public ActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 * @symbol ?use\@BeaconBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BEACONBLOCK /** * @symbol ?isInteractiveBlock\@BeaconBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/BeaconContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/BeaconContainerScreenValidator.hpp index 06926b3fb3..40a4aa6e46 100644 --- a/LiteLoader/include/llapi/mc/BeaconContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/BeaconContainerScreenValidator.hpp @@ -26,6 +26,7 @@ class BeaconContainerScreenValidator : public ContainerScreenValidatorBase { public: class BeaconContainerScreenValidator& operator=(class BeaconContainerScreenValidator const &) = delete; BeaconContainerScreenValidator(class BeaconContainerScreenValidator const &) = delete; + BeaconContainerScreenValidator() = delete; #endif public: @@ -34,9 +35,5 @@ class BeaconContainerScreenValidator : public ContainerScreenValidatorBase { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @symbol ??0BeaconContainerScreenValidator\@\@QEAA\@XZ - */ - MCAPI BeaconContainerScreenValidator(); }; diff --git a/LiteLoader/include/llapi/mc/BeardDescription.hpp b/LiteLoader/include/llapi/mc/BeardDescription.hpp deleted file mode 100644 index 7f82b0b8c1..0000000000 --- a/LiteLoader/include/llapi/mc/BeardDescription.hpp +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @file BeardDescription.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class BeardDescription. - * - */ -class BeardDescription { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BEARDDESCRIPTION -public: - class BeardDescription& operator=(class BeardDescription const &) = delete; - BeardDescription(class BeardDescription const &) = delete; - BeardDescription() = delete; -#endif - -public: - /** - * @symbol ??0BeardDescription\@\@QEAA\@VBeardingDescriptionCache\@\@AEBUBeardKernel\@\@\@Z - */ - MCAPI BeardDescription(class BeardingDescriptionCache, struct BeardKernel const &); - /** - * @symbol ?calculateContribution\@BeardDescription\@\@QEBAMAEBVBlockPos\@\@\@Z - */ - MCAPI float calculateContribution(class BlockPos const &) const; - -}; diff --git a/LiteLoader/include/llapi/mc/BeardKernel.hpp b/LiteLoader/include/llapi/mc/BeardKernel.hpp index d2a6975b69..6a6eebda9b 100644 --- a/LiteLoader/include/llapi/mc/BeardKernel.hpp +++ b/LiteLoader/include/llapi/mc/BeardKernel.hpp @@ -32,10 +32,6 @@ struct BeardKernel { * @symbol ??0BeardKernel\@\@QEAA\@XZ */ MCAPI BeardKernel(); - /** - * @symbol ?getContribution\@BeardKernel\@\@QEBAMHHH\@Z - */ - MCAPI float getContribution(int, int, int) const; //private: /** diff --git a/LiteLoader/include/llapi/mc/BedBlock.hpp b/LiteLoader/include/llapi/mc/BedBlock.hpp index b0b8426a3a..d89fddf092 100644 --- a/LiteLoader/include/llapi/mc/BedBlock.hpp +++ b/LiteLoader/include/llapi/mc/BedBlock.hpp @@ -232,39 +232,39 @@ class BedBlock : public BlockLegacy { virtual void __unk_vfn_126(); /** * @vftbl 129 + * @symbol __unk_vfn_129 + */ + virtual void __unk_vfn_129(); + /** + * @vftbl 130 * @symbol ?canSpawnAt\@BedBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSpawnAt(class BlockSource const &, class BlockPos const &) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_132(); /** - * @vftbl 145 + * @vftbl 146 * @symbol ?telemetryVariant\@BedBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int telemetryVariant(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@BedBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 + * @vftbl 150 * @symbol ?getMappedFace\@BedBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -277,44 +277,49 @@ class BedBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 + * @vftbl 170 * @symbol ?onFallOn\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@BedBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@BedBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BEDBLOCK /** * @symbol ?canBeSilkTouched\@BedBlock\@\@MEBA_NXZ @@ -342,13 +347,9 @@ class BedBlock : public BlockLegacy { */ MCAPI static unsigned short const OCCUPIED_DATA; /** - * @symbol ?findWakeupPosition\@BedBlock\@\@SA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@_NAEBV?$optional\@VVec3\@\@\@3\@\@Z + * @symbol ?findWakeupPosition\@BedBlock\@\@SA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV?$optional\@VVec3\@\@\@3\@\@Z */ - MCAPI static class std::optional findWakeupPosition(class BlockSource &, class BlockPos const &, bool, class std::optional const &); - /** - * @symbol ?isDangerousSpawnPosition\@BedBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI static bool isDangerousSpawnPosition(class BlockSource &, class BlockPos const &); + MCAPI static class std::optional findWakeupPosition(class BlockSource &, class BlockPos const &, class std::optional const &); /** * @symbol ?isValidStandUpPosition\@BedBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ @@ -358,4 +359,12 @@ class BedBlock : public BlockLegacy { */ MCAPI static void setOccupied(class BlockSource &, class BlockPos const &, bool); +//private: + /** + * @symbol ?_isDangerousSpawnBlock\@BedBlock\@\@CA_NAEBVBlock\@\@\@Z + */ + MCAPI static bool _isDangerousSpawnBlock(class Block const &); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/BedItem.hpp b/LiteLoader/include/llapi/mc/BedItem.hpp index c604f1d50a..b4820811ee 100644 --- a/LiteLoader/include/llapi/mc/BedItem.hpp +++ b/LiteLoader/include/llapi/mc/BedItem.hpp @@ -123,15 +123,15 @@ class BedItem : public Item { virtual bool _checkUseOnPermissions(class Actor &, class ItemStackBase &, unsigned char const &, class BlockPos const &) const; /** * @vftbl 132 - * @symbol ?_useOn\@BedItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@BedItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; //private: /** - * @symbol ?_tryUseOn\@BedItem\@\@AEBA_NAEAVItemStackBase\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_tryUseOn\@BedItem\@\@AEBA?AVInteractionResult\@\@AEAVItemStackBase\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - MCAPI bool _tryUseOn(class ItemStackBase &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + MCAPI class InteractionResult _tryUseOn(class ItemStackBase &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; private: diff --git a/LiteLoader/include/llapi/mc/Bedrock.hpp b/LiteLoader/include/llapi/mc/Bedrock.hpp index c27ada3240..c87973f27a 100644 --- a/LiteLoader/include/llapi/mc/Bedrock.hpp +++ b/LiteLoader/include/llapi/mc/Bedrock.hpp @@ -8,6 +8,22 @@ #define BEFORE_EXTRA // Include Headers or Declare Types Here +#include "llapi/mc/Json.hpp" +#include + +class CommandRegistry; +enum class ActorDamageCause : int; +template +class AutomaticID; +template +class CommandSelector; + +namespace Json { +class Value; +} +class CommandIntegerRange; +struct ActorDefinitionIdentifier; +class CommandItem; #undef BEFORE_EXTRA @@ -110,6 +126,113 @@ class SessionInfo SessionInfo(SessionInfo const&&) = delete; }; + +template +class typeid_t { +public: + inline static unsigned short count = 0; + unsigned short value; + typeid_t(typeid_t const& id) : value(id.value){}; + typeid_t(unsigned short value) : value(value){}; +}; + +template +typeid_t type_id() { + static typeid_t id = typeid_t::count++; + return id; +} + +template <> +class typeid_t { +public: + inline static unsigned short count = 0; + unsigned short value; + typeid_t(typeid_t const& id) : value(id.value){}; + typeid_t(unsigned short value) : value(value){}; +}; + +template <> +MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id>(); +// template MCAPI typeid_t type_id(); +// template MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); +//template <> +//MCAPI typeid_t type_id>(); +template <> +MCAPI typeid_t type_id>(); +template <> +MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id>(); +template <> +MCAPI typeid_t type_id>(); +// template MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); + +// template MCAPI typeid_t type_id(); + +template <> +inline typeid_t type_id() { + static typeid_t id = + *(typeid_t*)dlsym_real("?id@?1???$type_id@VCommandRegistry@@PEBUActorDefinitionIdentifier@@@@" + "YA?AV?$typeid_t@VCommandRegistry@@@@XZ@4V1@A"); +// static typeid_t id = ([]() -> typeid_t { +// CommandParameterData data = +// SymCall("??$mandatory@VRideCommand@@PEBUActorDefinitionIdentifier@@@commands@@YA?AVCommandParameterData@@PEQRideCommand@@PEBUActorDefinitionIdentifier@@PEBDPEQ2@_N@Z", +// CommandParameterData, void*, char const*, uintptr_t)(nullptr, "entityType", 0); +// return data.tid; +// })(); + return id; +}; + +template <> +inline typeid_t type_id() { + static typeid_t id = *(typeid_t*)dlsym_real( + "?id@?1???$type_id@VCommandRegistry@@VCommandItem@@@@YA?AV?$typeid_t@VCommandRegistry@@@@XZ@4V1@A"); + return id; +}; + +template <> +inline typeid_t type_id() { + static typeid_t id = *(typeid_t*)dlsym_real( + "??$type_id@VCommandRegistry@@H@Bedrock@@YA?AV?$typeid_t@VCommandRegistry@@@0@XZ"); + return id; +}; + +template <> +inline typeid_t type_id() { + static typeid_t id = *(typeid_t*)dlsym_real( + "?id@?1???$type_id@VCommandRegistry@@VCommandBlockName@@@@YA?AV?$typeid_t@VCommandRegistry@@@@XZ@4V1@A"); + return id; +}; + + #undef AFTER_EXTRA /** * @symbol ?getExceptionMessage\@Bedrock\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@Vexception_ptr\@3\@\@Z diff --git a/LiteLoader/include/llapi/mc/BedrockBlock.hpp b/LiteLoader/include/llapi/mc/BedrockBlock.hpp index 62d80dab0d..96af4c3e83 100644 --- a/LiteLoader/include/llapi/mc/BedrockBlock.hpp +++ b/LiteLoader/include/llapi/mc/BedrockBlock.hpp @@ -181,25 +181,25 @@ class BedrockBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@BedrockBlock\@\@UEAAXXZ + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void _addHardCodedBlockComponents(); + virtual void __unk_vfn_157(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol ?_addHardCodedBlockComponents\@BedrockBlock\@\@UEAAXXZ */ - virtual void __unk_vfn_165(); + virtual void _addHardCodedBlockComponents(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,27 +211,32 @@ class BedrockBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@BedrockBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/BedrockLog.hpp b/LiteLoader/include/llapi/mc/BedrockLog.hpp index 141f91bfde..bf0fbcf652 100644 --- a/LiteLoader/include/llapi/mc/BedrockLog.hpp +++ b/LiteLoader/include/llapi/mc/BedrockLog.hpp @@ -86,10 +86,6 @@ struct LogDetails { * @symbol ?createLog\@BedrockLog\@\@YAXAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1W4LogCategory\@1\@V?$bitset\@$02\@5\@_NPEAVLogSettingsUpdater\@\@N\@Z */ MCAPI void createLog(class Core::Path const &, std::string const &, std::string const &, enum class BedrockLog::LogCategory, class std::bitset<3>, bool, class LogSettingsUpdater *, double); - /** - * @symbol ?flushAllLogs\@BedrockLog\@\@YAXXZ - */ - MCAPI void flushAllLogs(); /** * @symbol ?initialize\@BedrockLog\@\@YA?AVScopeExit\@Bedrock\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BeehiveBlock.hpp b/LiteLoader/include/llapi/mc/BeehiveBlock.hpp index f3b2930f4a..564825377a 100644 --- a/LiteLoader/include/llapi/mc/BeehiveBlock.hpp +++ b/LiteLoader/include/llapi/mc/BeehiveBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "FaceDirectionalActorBlock.hpp" +#include "ActorBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class BeehiveBlock. * */ -class BeehiveBlock : public FaceDirectionalActorBlock { +class BeehiveBlock : public ActorBlock { #define AFTER_EXTRA // Add Member There @@ -196,35 +196,35 @@ class BeehiveBlock : public FaceDirectionalActorBlock { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 * @symbol ?getVariant\@BeehiveBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 + * @vftbl 150 * @symbol ?getMappedFace\@BeehiveBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@BeehiveBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -236,32 +236,37 @@ class BeehiveBlock : public FaceDirectionalActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@BeehiveBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@BeehiveBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; @@ -309,6 +314,10 @@ class BeehiveBlock : public FaceDirectionalActorBlock { * @symbol ?_fillHoneyBottle\@BeehiveBlock\@\@AEBAXAEAVPlayer\@\@AEAVItemStack\@\@1AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _fillHoneyBottle(class Player &, class ItemStack &, class ItemStack &, class BlockSource &, class BlockPos const &) const; + /** + * @symbol ?_getSilkTouchItemInstance\@BeehiveBlock\@\@AEBA?AVItemInstance\@\@AEBVBlock\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI class ItemInstance _getSilkTouchItemInstance(class Block const &, class Player &, class BlockPos const &) const; /** * @symbol ?_playBottleSound\@BeehiveBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BeehiveBlockActor.hpp b/LiteLoader/include/llapi/mc/BeehiveBlockActor.hpp index ba4be6104a..3d86c66727 100644 --- a/LiteLoader/include/llapi/mc/BeehiveBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BeehiveBlockActor.hpp @@ -96,10 +96,6 @@ struct Occupant { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @symbol ??0BeehiveBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z - */ - MCAPI BeehiveBlockActor(class BlockPos const &); /** * @symbol ?disableBeeSpawn\@BeehiveBlockActor\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/BeetrootBlock.hpp b/LiteLoader/include/llapi/mc/BeetrootBlock.hpp index 56f63108d0..b3e3d81e33 100644 --- a/LiteLoader/include/llapi/mc/BeetrootBlock.hpp +++ b/LiteLoader/include/llapi/mc/BeetrootBlock.hpp @@ -181,25 +181,25 @@ class BeetrootBlock : public CropBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 - * @symbol ?getVariant\@BeetrootBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 147 + * @symbol ?getVariant\@BeetrootBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,42 +211,47 @@ class BeetrootBlock : public CropBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 194 - * @symbol __unk_vfn_194 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_194(); + virtual void __unk_vfn_187(); /** * @vftbl 195 + * @symbol __unk_vfn_195 + */ + virtual void __unk_vfn_195(); + /** + * @vftbl 196 * @symbol ?getBaseSeed\@BeetrootBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseSeed() const; /** - * @vftbl 196 + * @vftbl 197 * @symbol ?getBaseCrop\@BeetrootBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseCrop() const; /** - * @vftbl 198 + * @vftbl 199 * @symbol ?getCropNum\@BeetrootBlock\@\@UEBAHAEAVRandomize\@\@HH\@Z */ virtual int getCropNum(class Randomize &, int, int) const; diff --git a/LiteLoader/include/llapi/mc/BehaviorDefinition.hpp b/LiteLoader/include/llapi/mc/BehaviorDefinition.hpp index 877b85a775..762cbf2d33 100644 --- a/LiteLoader/include/llapi/mc/BehaviorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorDefinition.hpp @@ -51,9 +51,5 @@ class BehaviorDefinition { */ MCVAPI ~BehaviorDefinition(); #endif - /** - * @symbol ?getTreeDefinition\@BehaviorDefinition\@\@QEBA?AVBehaviorTreeDefinitionPtr\@\@XZ - */ - MCAPI class BehaviorTreeDefinitionPtr getTreeDefinition() const; }; diff --git a/LiteLoader/include/llapi/mc/BehaviorFactory.hpp b/LiteLoader/include/llapi/mc/BehaviorFactory.hpp index 028b1915e7..69f2b0175b 100644 --- a/LiteLoader/include/llapi/mc/BehaviorFactory.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorFactory.hpp @@ -41,10 +41,6 @@ class BehaviorFactory { * @symbol ?registerNodePair\@BehaviorFactory\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6A?AV?$unique_ptr\@VBehaviorDefinition\@\@U?$default_delete\@VBehaviorDefinition\@\@\@std\@\@\@std\@\@XZ\@3\@V?$function\@$$A6A?AV?$unique_ptr\@VBehaviorNode\@\@U?$default_delete\@VBehaviorNode\@\@\@std\@\@\@std\@\@XZ\@3\@\@Z */ MCAPI void registerNodePair(std::string const &, class std::function (void)>, class std::function (void)>); - /** - * @symbol ?tryGetNode\@BehaviorFactory\@\@QEBA?AV?$unique_ptr\@VBehaviorNode\@\@U?$default_delete\@VBehaviorNode\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z - */ - MCAPI std::unique_ptr tryGetNode(std::string const &) const; //private: /** diff --git a/LiteLoader/include/llapi/mc/BehaviorTreeDefinitionPtr.hpp b/LiteLoader/include/llapi/mc/BehaviorTreeDefinitionPtr.hpp index b78ecf35d1..878904c773 100644 --- a/LiteLoader/include/llapi/mc/BehaviorTreeDefinitionPtr.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorTreeDefinitionPtr.hpp @@ -21,19 +21,16 @@ class BehaviorTreeDefinitionPtr { // Add Member There #undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BEHAVIORTREEDEFINITIONPTR +public: + BehaviorTreeDefinitionPtr(class BehaviorTreeDefinitionPtr const &) = delete; +#endif + public: /** * @symbol ??0BehaviorTreeDefinitionPtr\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI BehaviorTreeDefinitionPtr(class BehaviorTreeDefinitionPtr &&); - /** - * @symbol ??0BehaviorTreeDefinitionPtr\@\@QEAA\@AEAVBehaviorTreeGroup\@\@AEAVBehaviorTreeDefinition\@\@\@Z - */ - MCAPI BehaviorTreeDefinitionPtr(class BehaviorTreeGroup &, class BehaviorTreeDefinition &); - /** - * @symbol ??0BehaviorTreeDefinitionPtr\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI BehaviorTreeDefinitionPtr(class BehaviorTreeDefinitionPtr const &); /** * @symbol ??0BehaviorTreeDefinitionPtr\@\@QEAA\@XZ */ @@ -55,4 +52,12 @@ class BehaviorTreeDefinitionPtr { */ MCAPI static class BehaviorTreeDefinitionPtr const NONE; +//protected: + /** + * @symbol ?_move\@BehaviorTreeDefinitionPtr\@\@IEAAAEAV1\@$$QEAV1\@\@Z + */ + MCAPI class BehaviorTreeDefinitionPtr & _move(class BehaviorTreeDefinitionPtr &&); + +protected: + }; diff --git a/LiteLoader/include/llapi/mc/BehaviorTreeGroup.hpp b/LiteLoader/include/llapi/mc/BehaviorTreeGroup.hpp index 4975113634..46ac2b6acb 100644 --- a/LiteLoader/include/llapi/mc/BehaviorTreeGroup.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorTreeGroup.hpp @@ -43,10 +43,6 @@ class BehaviorTreeGroup { MCAPI ~BehaviorTreeGroup(); //private: - /** - * @symbol ?_addRef\@BehaviorTreeGroup\@\@AEAAXAEAVBehaviorTreeDefinitionPtr\@\@\@Z - */ - MCAPI void _addRef(class BehaviorTreeDefinitionPtr &); /** * @symbol ?_removeRef\@BehaviorTreeGroup\@\@AEAAXAEAVBehaviorTreeDefinitionPtr\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BellBlock.hpp b/LiteLoader/include/llapi/mc/BellBlock.hpp index c2854a07c1..4e75ed01fd 100644 --- a/LiteLoader/include/llapi/mc/BellBlock.hpp +++ b/LiteLoader/include/llapi/mc/BellBlock.hpp @@ -202,9 +202,9 @@ class BellBlock : public ActorBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@BellBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@BellBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 113 * @symbol ?entityInside\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z @@ -226,25 +226,25 @@ class BellBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@BellBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 144 + * @symbol ?getVisualShape\@BellBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -257,46 +257,51 @@ class BellBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@BellBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@BellBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@BellBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; @@ -317,9 +322,9 @@ class BellBlock : public ActorBlock { //private: /** - * @symbol ?_determineAttachment\@BellBlock\@\@AEBAAEBVBlock\@\@AEAVActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?_determineAttachment\@BellBlock\@\@AEBAAEBVBlock\@\@AEBVActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ - MCAPI class Block const & _determineAttachment(class Actor &, class BlockSource &, class BlockPos const &, unsigned char) const; + MCAPI class Block const & _determineAttachment(class Actor const &, class BlockSource &, class BlockPos const &, unsigned char) const; /** * @symbol ?_getItemId\@BellBlock\@\@AEBAFAEBVBlockSource\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BellBlockActor.hpp b/LiteLoader/include/llapi/mc/BellBlockActor.hpp index f858bd412c..65be583429 100644 --- a/LiteLoader/include/llapi/mc/BellBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BellBlockActor.hpp @@ -101,10 +101,6 @@ class BellBlockActor : public BlockActor { * @symbol ?_onUpdatePacket\@BellBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); - /** - * @symbol ??0BellBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z - */ - MCAPI BellBlockActor(class BlockPos const &); /** * @symbol ?ejectItem\@BellBlockActor\@\@QEBAXAEBVBlockPos\@\@AEAVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BellBlockItem.hpp b/LiteLoader/include/llapi/mc/BellBlockItem.hpp index 0b47d80ecb..e16e9037aa 100644 --- a/LiteLoader/include/llapi/mc/BellBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/BellBlockItem.hpp @@ -6,6 +6,7 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Json.hpp" +#include "Potion.hpp" #include "BlockItem.hpp" #define BEFORE_EXTRA @@ -103,9 +104,534 @@ class BellBlockItem : public BlockItem { virtual void __unk_vfn_80(); /** * @vftbl 132 - * @symbol ?_useOn\@BellBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@BellBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + /** + * @vftbl 133 + * @symbol __unk_vfn_133 + */ + virtual void __unk_vfn_133(); + /** + * @vftbl 134 + * @symbol __unk_vfn_134 + */ + virtual void __unk_vfn_134(); + /** + * @vftbl 135 + * @symbol __unk_vfn_135 + */ + virtual void __unk_vfn_135(); + /** + * @vftbl 136 + * @symbol __unk_vfn_136 + */ + virtual void __unk_vfn_136(); + /** + * @vftbl 137 + * @symbol __unk_vfn_137 + */ + virtual void __unk_vfn_137(); + /** + * @vftbl 138 + * @symbol __unk_vfn_138 + */ + virtual void __unk_vfn_138(); + /** + * @vftbl 139 + * @symbol __unk_vfn_139 + */ + virtual void __unk_vfn_139(); + /** + * @vftbl 140 + * @symbol __unk_vfn_140 + */ + virtual void __unk_vfn_140(); + /** + * @vftbl 141 + * @symbol __unk_vfn_141 + */ + virtual void __unk_vfn_141(); + /** + * @vftbl 142 + * @symbol __unk_vfn_142 + */ + virtual void __unk_vfn_142(); + /** + * @vftbl 143 + * @symbol __unk_vfn_143 + */ + virtual void __unk_vfn_143(); + /** + * @vftbl 144 + * @symbol __unk_vfn_144 + */ + virtual void __unk_vfn_144(); + /** + * @vftbl 145 + * @symbol __unk_vfn_145 + */ + virtual void __unk_vfn_145(); + /** + * @vftbl 146 + * @symbol __unk_vfn_146 + */ + virtual void __unk_vfn_146(); + /** + * @vftbl 147 + * @symbol __unk_vfn_147 + */ + virtual void __unk_vfn_147(); + /** + * @vftbl 148 + * @symbol __unk_vfn_148 + */ + virtual void __unk_vfn_148(); + /** + * @vftbl 149 + * @symbol __unk_vfn_149 + */ + virtual void __unk_vfn_149(); + /** + * @vftbl 150 + * @symbol __unk_vfn_150 + */ + virtual void __unk_vfn_150(); + /** + * @vftbl 151 + * @symbol __unk_vfn_151 + */ + virtual void __unk_vfn_151(); + /** + * @vftbl 152 + * @symbol __unk_vfn_152 + */ + virtual void __unk_vfn_152(); + /** + * @vftbl 153 + * @symbol __unk_vfn_153 + */ + virtual void __unk_vfn_153(); + /** + * @vftbl 154 + * @symbol __unk_vfn_154 + */ + virtual void __unk_vfn_154(); + /** + * @vftbl 155 + * @symbol __unk_vfn_155 + */ + virtual void __unk_vfn_155(); + /** + * @vftbl 156 + * @symbol __unk_vfn_156 + */ + virtual void __unk_vfn_156(); + /** + * @vftbl 157 + * @symbol __unk_vfn_157 + */ + virtual void __unk_vfn_157(); + /** + * @vftbl 158 + * @symbol __unk_vfn_158 + */ + virtual void __unk_vfn_158(); + /** + * @vftbl 159 + * @symbol __unk_vfn_159 + */ + virtual void __unk_vfn_159(); + /** + * @vftbl 160 + * @symbol __unk_vfn_160 + */ + virtual void __unk_vfn_160(); + /** + * @vftbl 161 + * @symbol __unk_vfn_161 + */ + virtual void __unk_vfn_161(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); + /** + * @vftbl 163 + * @symbol __unk_vfn_163 + */ + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); + /** + * @vftbl 165 + * @symbol __unk_vfn_165 + */ + virtual void __unk_vfn_165(); + /** + * @vftbl 166 + * @symbol __unk_vfn_166 + */ + virtual void __unk_vfn_166(); + /** + * @vftbl 167 + * @symbol __unk_vfn_167 + */ + virtual void __unk_vfn_167(); + /** + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 + * @symbol __unk_vfn_169 + */ + virtual void __unk_vfn_169(); + /** + * @vftbl 170 + * @symbol __unk_vfn_170 + */ + virtual void __unk_vfn_170(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 + * @symbol __unk_vfn_172 + */ + virtual void __unk_vfn_172(); + /** + * @vftbl 173 + * @symbol __unk_vfn_173 + */ + virtual void __unk_vfn_173(); + /** + * @vftbl 174 + * @symbol __unk_vfn_174 + */ + virtual void __unk_vfn_174(); + /** + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 176 + * @symbol __unk_vfn_176 + */ + virtual void __unk_vfn_176(); + /** + * @vftbl 177 + * @symbol __unk_vfn_177 + */ + virtual void __unk_vfn_177(); + /** + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 180 + * @symbol __unk_vfn_180 + */ + virtual void __unk_vfn_180(); + /** + * @vftbl 181 + * @symbol __unk_vfn_181 + */ + virtual void __unk_vfn_181(); + /** + * @vftbl 182 + * @symbol __unk_vfn_182 + */ + virtual void __unk_vfn_182(); + /** + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 184 + * @symbol __unk_vfn_184 + */ + virtual void __unk_vfn_184(); + /** + * @vftbl 185 + * @symbol __unk_vfn_185 + */ + virtual void __unk_vfn_185(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 188 + * @symbol __unk_vfn_188 + */ + virtual void __unk_vfn_188(); + /** + * @vftbl 189 + * @symbol __unk_vfn_189 + */ + virtual void __unk_vfn_189(); + /** + * @vftbl 190 + * @symbol __unk_vfn_190 + */ + virtual void __unk_vfn_190(); + /** + * @vftbl 191 + * @symbol __unk_vfn_191 + */ + virtual void __unk_vfn_191(); + /** + * @vftbl 192 + * @symbol __unk_vfn_192 + */ + virtual void __unk_vfn_192(); + /** + * @vftbl 193 + * @symbol __unk_vfn_193 + */ + virtual void __unk_vfn_193(); + /** + * @vftbl 194 + * @symbol __unk_vfn_194 + */ + virtual void __unk_vfn_194(); + /** + * @vftbl 195 + * @symbol __unk_vfn_195 + */ + virtual void __unk_vfn_195(); + /** + * @vftbl 196 + * @symbol __unk_vfn_196 + */ + virtual void __unk_vfn_196(); + /** + * @vftbl 197 + * @symbol __unk_vfn_197 + */ + virtual void __unk_vfn_197(); + /** + * @vftbl 198 + * @symbol __unk_vfn_198 + */ + virtual void __unk_vfn_198(); + /** + * @vftbl 199 + * @symbol __unk_vfn_199 + */ + virtual void __unk_vfn_199(); + /** + * @vftbl 200 + * @symbol __unk_vfn_200 + */ + virtual void __unk_vfn_200(); + /** + * @vftbl 201 + * @symbol __unk_vfn_201 + */ + virtual void __unk_vfn_201(); + /** + * @vftbl 202 + * @symbol __unk_vfn_202 + */ + virtual void __unk_vfn_202(); + /** + * @vftbl 203 + * @symbol __unk_vfn_203 + */ + virtual void __unk_vfn_203(); + /** + * @vftbl 204 + * @symbol __unk_vfn_204 + */ + virtual void __unk_vfn_204(); + /** + * @vftbl 205 + * @symbol __unk_vfn_205 + */ + virtual void __unk_vfn_205(); + /** + * @vftbl 206 + * @symbol __unk_vfn_206 + */ + virtual void __unk_vfn_206(); + /** + * @vftbl 207 + * @symbol __unk_vfn_207 + */ + virtual void __unk_vfn_207(); + /** + * @vftbl 208 + * @symbol __unk_vfn_208 + */ + virtual void __unk_vfn_208(); + /** + * @vftbl 209 + * @symbol __unk_vfn_209 + */ + virtual void __unk_vfn_209(); + /** + * @vftbl 210 + * @symbol __unk_vfn_210 + */ + virtual void __unk_vfn_210(); + /** + * @vftbl 211 + * @symbol __unk_vfn_211 + */ + virtual void __unk_vfn_211(); + /** + * @vftbl 212 + * @symbol __unk_vfn_212 + */ + virtual void __unk_vfn_212(); + /** + * @vftbl 213 + * @symbol __unk_vfn_213 + */ + virtual void __unk_vfn_213(); + /** + * @vftbl 214 + * @symbol __unk_vfn_214 + */ + virtual void __unk_vfn_214(); + /** + * @vftbl 215 + * @symbol __unk_vfn_215 + */ + virtual void __unk_vfn_215(); + /** + * @vftbl 216 + * @symbol __unk_vfn_216 + */ + virtual void __unk_vfn_216(); + /** + * @vftbl 217 + * @symbol __unk_vfn_217 + */ + virtual void __unk_vfn_217(); + /** + * @vftbl 218 + * @symbol __unk_vfn_218 + */ + virtual void __unk_vfn_218(); + /** + * @vftbl 219 + * @symbol __unk_vfn_219 + */ + virtual void __unk_vfn_219(); + /** + * @vftbl 220 + * @symbol __unk_vfn_220 + */ + virtual void __unk_vfn_220(); + /** + * @vftbl 221 + * @symbol __unk_vfn_221 + */ + virtual void __unk_vfn_221(); + /** + * @vftbl 222 + * @symbol __unk_vfn_222 + */ + virtual void __unk_vfn_222(); + /** + * @vftbl 223 + * @symbol __unk_vfn_223 + */ + virtual void __unk_vfn_223(); + /** + * @vftbl 224 + * @symbol __unk_vfn_224 + */ + virtual void __unk_vfn_224(); + /** + * @vftbl 225 + * @symbol __unk_vfn_225 + */ + virtual void __unk_vfn_225(); + /** + * @vftbl 226 + * @symbol __unk_vfn_226 + */ + virtual void __unk_vfn_226(); + /** + * @vftbl 227 + * @symbol __unk_vfn_227 + */ + virtual void __unk_vfn_227(); + /** + * @vftbl 228 + * @symbol __unk_vfn_228 + */ + virtual void __unk_vfn_228(); + /** + * @vftbl 229 + * @symbol __unk_vfn_229 + */ + virtual void __unk_vfn_229(); + /** + * @vftbl 230 + * @symbol __unk_vfn_230 + */ + virtual void __unk_vfn_230(); + /** + * @vftbl 231 + * @symbol ?getPotionType\@SplashPotionItem\@\@UEBA?AW4PotionType\@Potion\@\@XZ + */ + virtual enum class Potion::PotionType getPotionType() const; + /** + * @vftbl 232 + * @symbol __unk_vfn_232 + */ + virtual void __unk_vfn_232(); + /** + * @vftbl 233 + * @symbol __unk_vfn_233 + */ + virtual void __unk_vfn_233(); + /** + * @vftbl 234 + * @symbol __unk_vfn_234 + */ + virtual void __unk_vfn_234(); + /** + * @vftbl 235 + * @symbol __unk_vfn_235 + */ + virtual void __unk_vfn_235(); + /** + * @vftbl 236 + * @symbol __unk_vfn_236 + */ + virtual void __unk_vfn_236(); + /** + * @vftbl 237 + * @symbol ?getVariant\@ComponentItem\@\@UEBAHHH_N\@Z + */ + virtual int getVariant(int, int, bool) const; /** * @symbol ??0BellBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/BigDripleafBlock.hpp b/LiteLoader/include/llapi/mc/BigDripleafBlock.hpp index a3d6249593..c6a25d6a24 100644 --- a/LiteLoader/include/llapi/mc/BigDripleafBlock.hpp +++ b/LiteLoader/include/llapi/mc/BigDripleafBlock.hpp @@ -222,9 +222,9 @@ class BigDripleafBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@BigDripleafBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@BigDripleafBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 113 * @symbol ?entityInside\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z @@ -246,30 +246,30 @@ class BigDripleafBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@BigDripleafBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 152 + * @vftbl 153 * @symbol ?init\@BigDripleafBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -282,39 +282,44 @@ class BigDripleafBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@BigDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BIGDRIPLEAFBLOCK /** * @symbol ?canBeSilkTouched\@BigDripleafBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/BinaryStream.hpp b/LiteLoader/include/llapi/mc/BinaryStream.hpp index 5e69e8d095..9c9175911a 100644 --- a/LiteLoader/include/llapi/mc/BinaryStream.hpp +++ b/LiteLoader/include/llapi/mc/BinaryStream.hpp @@ -78,14 +78,14 @@ class BinaryStream : public ReadOnlyBinaryStream { */ MCVAPI ~BinaryStream(); #endif - /** - * @symbol ??0BinaryStream\@\@QEAA\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z - */ - MCAPI BinaryStream(std::string &, bool); /** * @symbol ??0BinaryStream\@\@QEAA\@XZ */ MCAPI BinaryStream(); + /** + * @symbol ??0BinaryStream\@\@QEAA\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + */ + MCAPI BinaryStream(std::string &, bool); /** * @symbol ?getAndReleaseData\@BinaryStream\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Biome.hpp b/LiteLoader/include/llapi/mc/Biome.hpp index b1fd9f4795..63aac2d9c4 100644 --- a/LiteLoader/include/llapi/mc/Biome.hpp +++ b/LiteLoader/include/llapi/mc/Biome.hpp @@ -59,10 +59,6 @@ class Biome { #endif public: - /** - * @symbol ??0Biome\@\@QEAA\@H\@Z - */ - MCAPI Biome(int); /** * @symbol ?addTag\@Biome\@\@QEAAAEAV1\@VHashedString\@\@AEAV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@\@Z */ @@ -139,22 +135,18 @@ class Biome { * @symbol ?getTemperatureWorldGen\@Biome\@\@QEBAMAEBVBlockPos\@\@F\@Z */ MCAPI float getTemperatureWorldGen(class BlockPos const &, short) const; - /** - * @symbol ?hasTag\@Biome\@\@QEBA_NAEBU?$IDType\@UBiomeTagIDType\@\@\@\@AEBV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@\@Z - */ - MCAPI bool hasTag(struct IDType const &, class TagRegistry, struct IDType> const &) const; /** * @symbol ?hasTag\@Biome\@\@QEBA_N_KAEBV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@\@Z */ MCAPI bool hasTag(unsigned __int64, class TagRegistry, struct IDType> const &) const; /** - * @symbol ?hasTag\@Biome\@\@QEBA_NAEBVWellKnownTagID\@\@\@Z + * @symbol ?hasTag\@Biome\@\@QEBA_NAEBU?$IDType\@UBiomeTagIDType\@\@\@\@AEBV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@\@Z */ - MCAPI bool hasTag(class WellKnownTagID const &) const; + MCAPI bool hasTag(struct IDType const &, class TagRegistry, struct IDType> const &) const; /** - * @symbol ?initEntity\@Biome\@\@QEAAXAEAVEntityRegistry\@\@\@Z + * @symbol ?hasTag\@Biome\@\@QEBA_NAEBVWellKnownTagID\@\@\@Z */ - MCAPI void initEntity(class EntityRegistry &); + MCAPI bool hasTag(class WellKnownTagID const &) const; /** * @symbol ?isHumid\@Biome\@\@QEBA_NXZ */ @@ -163,26 +155,18 @@ class Biome { * @symbol ?isSnowCovered\@Biome\@\@QEBA_NXZ */ MCAPI bool isSnowCovered() const; - /** - * @symbol ?setColor\@Biome\@\@QEAAAEAV1\@H\@Z - */ - MCAPI class Biome & setColor(int); /** * @symbol ?setColor\@Biome\@\@QEAAAEAV1\@H_N\@Z */ MCAPI class Biome & setColor(int, bool); /** - * @symbol ?setDepthAndScale\@Biome\@\@QEAAAEAV1\@AEBUBiomeHeight\@\@\@Z + * @symbol ?setColor\@Biome\@\@QEAAAEAV1\@H\@Z */ - MCAPI class Biome & setDepthAndScale(struct BiomeHeight const &); + MCAPI class Biome & setColor(int); /** * @symbol ?setMapWaterColor\@Biome\@\@QEAAAEAV1\@H\@Z */ MCAPI class Biome & setMapWaterColor(int); - /** - * @symbol ?setName\@Biome\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI class Biome & setName(std::string const &); /** * @symbol ?setNoRain\@Biome\@\@QEAAAEAV1\@XZ */ @@ -195,10 +179,6 @@ class Biome { * @symbol ?setOddColor\@Biome\@\@QEAAAEAV1\@H\@Z */ MCAPI class Biome & setOddColor(int); - /** - * @symbol ?setSnowAccumulation\@Biome\@\@QEAAAEAV1\@MM\@Z - */ - MCAPI class Biome & setSnowAccumulation(float, float); /** * @symbol ?writePacketData\@Biome\@\@QEAAXAEAVCompoundTag\@\@AEAV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BiomeComponentFactory.hpp b/LiteLoader/include/llapi/mc/BiomeComponentFactory.hpp index 9a94221f4f..9c63147eb0 100644 --- a/LiteLoader/include/llapi/mc/BiomeComponentFactory.hpp +++ b/LiteLoader/include/llapi/mc/BiomeComponentFactory.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -34,10 +33,6 @@ class BiomeComponentFactory { * @symbol ??0BiomeComponentFactory\@\@QEAA\@W4FactoryScope\@0\@\@Z */ MCAPI BiomeComponentFactory(enum class BiomeComponentFactory::FactoryScope); - /** - * @symbol ?processDataComponents\@BiomeComponentFactory\@\@QEBAXAEAVBiome\@\@AEAVIWorldRegistriesProvider\@\@AEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z - */ - MCAPI void processDataComponents(class Biome &, class IWorldRegistriesProvider &, class Json::Value &, class SemVersion const &) const; /** * @symbol ?processDataComponents\@BiomeComponentFactory\@\@QEBAXAEAVBiome\@\@AEAVIWorldRegistriesProvider\@\@AEAVCompoundTag\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp b/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp index ead933cc6a..dec817d485 100644 --- a/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp +++ b/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp @@ -69,5 +69,9 @@ class BiomeDefinitionListPacket : public Packet { * @symbol ??0BiomeDefinitionListPacket\@\@QEAA\@XZ */ MCAPI BiomeDefinitionListPacket(); + /** + * @symbol ??0BiomeDefinitionListPacket\@\@QEAA\@VCompoundTag\@\@\@Z + */ + MCAPI BiomeDefinitionListPacket(class CompoundTag); }; diff --git a/LiteLoader/include/llapi/mc/BiomeSource.hpp b/LiteLoader/include/llapi/mc/BiomeSource.hpp deleted file mode 100644 index c124d2aee5..0000000000 --- a/LiteLoader/include/llapi/mc/BiomeSource.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file BiomeSource.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class BiomeSource. - * - */ -class BiomeSource { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BIOMESOURCE -public: - class BiomeSource& operator=(class BiomeSource const &) = delete; - BiomeSource(class BiomeSource const &) = delete; - BiomeSource() = delete; -#endif - -public: - /** - * @symbol ?getAreaIterator\@BiomeSource\@\@SA?AVBlockPosIterator\@\@AEBVBoundingBox\@\@I\@Z - */ - MCAPI static class BlockPosIterator getAreaIterator(class BoundingBox const &, unsigned int); - -}; diff --git a/LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp b/LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp index 10c10bc416..6b1800dfed 100644 --- a/LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp +++ b/LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp @@ -181,20 +181,20 @@ class BlastFurnaceBlock : public FurnaceBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,37 +206,42 @@ class BlastFurnaceBlock : public FurnaceBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 * @symbol ?use\@BlastFurnaceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@BlastFurnaceBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@BlastFurnaceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/BlastFurnaceBlockActor.hpp b/LiteLoader/include/llapi/mc/BlastFurnaceBlockActor.hpp index 0b64ad9619..23675e3976 100644 --- a/LiteLoader/include/llapi/mc/BlastFurnaceBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BlastFurnaceBlockActor.hpp @@ -35,9 +35,5 @@ class BlastFurnaceBlockActor { */ MCVAPI std::string getName() const; #endif - /** - * @symbol ??0BlastFurnaceBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z - */ - MCAPI BlastFurnaceBlockActor(class BlockPos const &); }; diff --git a/LiteLoader/include/llapi/mc/BlendedMultiNoiseBiomeProvider.hpp b/LiteLoader/include/llapi/mc/BlendedMultiNoiseBiomeProvider.hpp index c7687e9c76..6bf3d5140e 100644 --- a/LiteLoader/include/llapi/mc/BlendedMultiNoiseBiomeProvider.hpp +++ b/LiteLoader/include/llapi/mc/BlendedMultiNoiseBiomeProvider.hpp @@ -46,4 +46,12 @@ class BlendedMultiNoiseBiomeProvider { */ MCAPI ~BlendedMultiNoiseBiomeProvider(); +//private: + /** + * @symbol ?_selectBestFittingBiome\@BlendedMultiNoiseBiomeProvider\@\@AEBAPEBVBiome\@\@AEBUTargetPoint\@\@PEAUHint\@RTree\@\@\@Z + */ + MCAPI class Biome const * _selectBestFittingBiome(struct TargetPoint const &, struct RTree::Hint *) const; + +private: + }; diff --git a/LiteLoader/include/llapi/mc/BlendingData.hpp b/LiteLoader/include/llapi/mc/BlendingData.hpp index 91eaa2fe77..edff18d90f 100644 --- a/LiteLoader/include/llapi/mc/BlendingData.hpp +++ b/LiteLoader/include/llapi/mc/BlendingData.hpp @@ -27,10 +27,6 @@ class BlendingData { #endif public: - /** - * @symbol ?createDataForStorage\@BlendingData\@\@QEBA?AUPersistentBlendData\@\@W4BlendVersion\@\@\@Z - */ - MCAPI struct PersistentBlendData createDataForStorage(enum class BlendVersion) const; /** * @symbol ?getBiome\@BlendingData\@\@QEBA?AV?$ScalarOptional\@E\@\@HHH\@Z */ diff --git a/LiteLoader/include/llapi/mc/Block.hpp b/LiteLoader/include/llapi/mc/Block.hpp index c5b62eac19..65e18ad7b8 100644 --- a/LiteLoader/include/llapi/mc/Block.hpp +++ b/LiteLoader/include/llapi/mc/Block.hpp @@ -80,10 +80,6 @@ class Block { * @symbol ?getRenderLayer\@Block\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; - /** - * @symbol ??0Block\@\@QEAA\@GV?$not_null\@PEAVBlockLegacy\@\@\@gsl\@\@\@Z - */ - MCAPI Block(unsigned short, class gsl::not_null); /** * @symbol ??0Block\@\@QEAA\@GV?$not_null\@PEAVBlockLegacy\@\@\@gsl\@\@VCompoundTag\@\@AEBI\@Z */ @@ -112,6 +108,10 @@ class Block { * @symbol ?asItemInstance\@Block\@\@QEBA?AVItemInstance\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI class ItemInstance asItemInstance(class BlockSource &, class BlockPos const &) const; + /** + * @symbol ?asItemInstance\@Block\@\@QEBA?AVItemInstance\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + */ + MCAPI class ItemInstance asItemInstance(class BlockSource &, class BlockPos const &, bool) const; /** * @symbol ?attack\@Block\@\@QEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ @@ -128,6 +128,10 @@ class Block { * @symbol ?buildDescriptionName\@Block\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string buildDescriptionName() const; + /** + * @symbol ?buildSerializationIdString\@Block\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + MCAPI std::string buildSerializationIdString() const; /** * @symbol ?cacheComponentData\@Block\@\@QEAAXXZ */ @@ -140,14 +144,14 @@ class Block { * @symbol ?canBeBrokenFromFalling\@Block\@\@QEBA_NXZ */ MCAPI bool canBeBrokenFromFalling() const; - /** - * @symbol ?canBeBuiltOver\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI bool canBeBuiltOver(class BlockSource &, class BlockPos const &) const; /** * @symbol ?canBeBuiltOver\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z */ MCAPI bool canBeBuiltOver(class BlockSource &, class BlockPos const &, class BlockItem const &) const; + /** + * @symbol ?canBeBuiltOver\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI bool canBeBuiltOver(class BlockSource &, class BlockPos const &) const; /** * @symbol ?canBeFertilized\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBV1\@\@Z */ @@ -192,6 +196,10 @@ class Block { * @symbol ?canProvideSupport\@Block\@\@QEBA_NEW4BlockSupportType\@\@\@Z */ MCAPI bool canProvideSupport(unsigned char, enum class BlockSupportType) const; + /** + * @symbol ?canReactToNeighborsDuringInstatick\@Block\@\@QEBA_NXZ + */ + MCAPI bool canReactToNeighborsDuringInstatick() const; /** * @symbol ?canSlide\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ @@ -217,9 +225,13 @@ class Block { */ MCAPI class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool, class AABB const &) const; /** - * @symbol ?copyState\@Block\@\@QEBAAEBV1\@AEBV1\@AEBVItemState\@\@\@Z + * @symbol ?computeRawSerializationIdHashForNetwork\@Block\@\@QEBAIXZ + */ + MCAPI unsigned int computeRawSerializationIdHashForNetwork() const; + /** + * @symbol ?copyState\@Block\@\@QEBAAEBV1\@AEBV1\@AEBVBlockState\@\@\@Z */ - MCAPI class Block const & copyState(class Block const &, class ItemState const &) const; + MCAPI class Block const & copyState(class Block const &, class BlockState const &) const; /** * @symbol ?dealsContactDamage\@Block\@\@QEBA_NAEBVActor\@\@_N\@Z */ @@ -353,9 +365,9 @@ class Block { */ MCAPI class HashedString const & getName() const; /** - * @symbol ?getPlacementBlock\@Block\@\@QEBAAEBV1\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@Block\@\@QEBAAEBV1\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - MCAPI class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + MCAPI class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @symbol ?getRuntimeId\@Block\@\@QEBAAEBIXZ */ @@ -401,17 +413,17 @@ class Block { */ MCAPI bool hasProperty(enum class BlockProperty) const; /** - * @symbol ?hasState\@Block\@\@QEBA_NAEBVItemState\@\@\@Z - */ - MCAPI bool hasState(class ItemState const &) const; - /** - * @symbol ?hasTag\@Block\@\@QEBA_NAEBVHashedString\@\@\@Z + * @symbol ?hasState\@Block\@\@QEBA_NAEBVBlockState\@\@\@Z */ - MCAPI bool hasTag(class HashedString const &) const; + MCAPI bool hasState(class BlockState const &) const; /** * @symbol ?hasTag\@Block\@\@QEBA_NAEB_K\@Z */ MCAPI bool hasTag(unsigned __int64 const &) const; + /** + * @symbol ?hasTag\@Block\@\@QEBA_NAEBVHashedString\@\@\@Z + */ + MCAPI bool hasTag(class HashedString const &) const; /** * @symbol ?ignoreEntitiesOnPistonMove\@Block\@\@QEBA_NXZ */ @@ -561,21 +573,21 @@ class Block { */ MCAPI bool isWaterBlocking() const; /** - * @symbol ?keepState\@Block\@\@QEBAAEBV1\@AEBVItemState\@\@\@Z + * @symbol ?keepState\@Block\@\@QEBAAEBV1\@AEBVBlockState\@\@\@Z */ - MCAPI class Block const & keepState(class ItemState const &) const; + MCAPI class Block const & keepState(class BlockState const &) const; /** * @symbol ?mayConsumeFertilizer\@Block\@\@QEBA_NAEAVBlockSource\@\@\@Z */ MCAPI bool mayConsumeFertilizer(class BlockSource &) const; - /** - * @symbol ?mayPick\@Block\@\@QEBA_NAEBVBlockSource\@\@_N\@Z - */ - MCAPI bool mayPick(class BlockSource const &, bool) const; /** * @symbol ?mayPick\@Block\@\@QEBA_NXZ */ MCAPI bool mayPick() const; + /** + * @symbol ?mayPick\@Block\@\@QEBA_NAEBVBlockSource\@\@_N\@Z + */ + MCAPI bool mayPick(class BlockSource const &, bool) const; /** * @symbol ?mayPlace\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ @@ -780,10 +792,18 @@ class Block { * @symbol ?_getBlockOcclusionType\@Block\@\@AEBA?AW4BlockOcclusionType\@\@XZ */ MCAPI enum class BlockOcclusionType _getBlockOcclusionType() const; + /** + * @symbol ?_getLight\@Block\@\@AEBA?AUBrightness\@\@XZ + */ + MCAPI struct Brightness _getLight() const; /** * @symbol ?_lockRegistryForRead\@Block\@\@AEBA?AVBlockTypeRegistryReadLock\@\@XZ */ MCAPI class BlockTypeRegistryReadLock _lockRegistryForRead() const; + /** + * @symbol ?_tryGetTransformThenRotationMatrix\@Block\@\@AEBA?AV?$unique_ptr\@VMatrix\@\@U?$default_delete\@VMatrix\@\@\@std\@\@\@std\@\@XZ + */ + MCAPI std::unique_ptr _tryGetTransformThenRotationMatrix() const; /** * @symbol ?_tryInitEntityIfNotInitialized\@Block\@\@AEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/BlockActor.hpp b/LiteLoader/include/llapi/mc/BlockActor.hpp index 81fe3ede30..cb75815dd9 100644 --- a/LiteLoader/include/llapi/mc/BlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BlockActor.hpp @@ -309,9 +309,9 @@ class BlockActor { */ MCAPI enum class BlockActorType const & getType() const; /** - * @symbol ?ignoreLighting\@BlockActor\@\@QEBA?B_NXZ + * @symbol ?isChanged\@BlockActor\@\@QEBA_NXZ */ - MCAPI bool const ignoreLighting() const; + MCAPI bool isChanged() const; /** * @symbol ?isType\@BlockActor\@\@QEBA_NW4BlockActorType\@\@\@Z */ @@ -324,10 +324,6 @@ class BlockActor { * @symbol ?onUpdatePacket\@BlockActor\@\@QEAA_NAEBVCompoundTag\@\@AEAVBlockSource\@\@PEBVPlayer\@\@\@Z */ MCAPI bool onUpdatePacket(class CompoundTag const &, class BlockSource &, class Player const *); - /** - * @symbol ?setBB\@BlockActor\@\@QEAAXVAABB\@\@\@Z - */ - MCAPI void setBB(class AABB); /** * @symbol ?setChanged\@BlockActor\@\@QEAAXXZ */ @@ -336,10 +332,6 @@ class BlockActor { * @symbol ?setCustomNameSaved\@BlockActor\@\@QEAAX_N\@Z */ MCAPI void setCustomNameSaved(bool); - /** - * @symbol ?setIgnoreLighting\@BlockActor\@\@QEAAX_N\@Z - */ - MCAPI void setIgnoreLighting(bool); /** * @symbol ?setMovable\@BlockActor\@\@QEAAX_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockBreakSensorComponent.hpp b/LiteLoader/include/llapi/mc/BlockBreakSensorComponent.hpp index a48e665bfb..65d9843cb5 100644 --- a/LiteLoader/include/llapi/mc/BlockBreakSensorComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockBreakSensorComponent.hpp @@ -25,13 +25,10 @@ class BlockBreakSensorComponent { public: class BlockBreakSensorComponent& operator=(class BlockBreakSensorComponent const &) = delete; BlockBreakSensorComponent(class BlockBreakSensorComponent const &) = delete; + BlockBreakSensorComponent() = delete; #endif public: - /** - * @symbol ??0BlockBreakSensorComponent\@\@QEAA\@XZ - */ - MCAPI BlockBreakSensorComponent(); /** * @symbol ??0BlockBreakSensorComponent\@\@QEAA\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockBreathabilityDescription.hpp b/LiteLoader/include/llapi/mc/BlockBreathabilityDescription.hpp index 5790b6a5d2..8a4e66a397 100644 --- a/LiteLoader/include/llapi/mc/BlockBreathabilityDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockBreathabilityDescription.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class BlockBreathabilityDescription { +struct BlockBreathabilityDescription { #define AFTER_EXTRA // Add Member There @@ -20,8 +20,8 @@ class BlockBreathabilityDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKBREATHABILITYDESCRIPTION public: - class BlockBreathabilityDescription& operator=(class BlockBreathabilityDescription const &) = delete; - BlockBreathabilityDescription(class BlockBreathabilityDescription const &) = delete; + struct BlockBreathabilityDescription& operator=(struct BlockBreathabilityDescription const &) = delete; + BlockBreathabilityDescription(struct BlockBreathabilityDescription const &) = delete; BlockBreathabilityDescription() = delete; #endif @@ -69,9 +69,5 @@ class BlockBreathabilityDescription { * @symbol ?bindType\@BlockBreathabilityDescription\@\@SAXXZ */ MCAPI static void bindType(); - /** - * @symbol ?registerVersionUpgrades\@BlockBreathabilityDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockCollisionBoxDescription.hpp b/LiteLoader/include/llapi/mc/BlockCollisionBoxDescription.hpp index c6543b8896..12c8866720 100644 --- a/LiteLoader/include/llapi/mc/BlockCollisionBoxDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockCollisionBoxDescription.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class BlockCollisionBoxDescription { +struct BlockCollisionBoxDescription { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKCOLLISIONBOXDESCRIPTION public: - class BlockCollisionBoxDescription& operator=(class BlockCollisionBoxDescription const &) = delete; - BlockCollisionBoxDescription(class BlockCollisionBoxDescription const &) = delete; + struct BlockCollisionBoxDescription& operator=(struct BlockCollisionBoxDescription const &) = delete; + BlockCollisionBoxDescription(struct BlockCollisionBoxDescription const &) = delete; BlockCollisionBoxDescription() = delete; #endif @@ -67,9 +67,5 @@ class BlockCollisionBoxDescription { * @symbol ?bindType\@BlockCollisionBoxDescription\@\@SAXXZ */ MCAPI static void bindType(); - /** - * @symbol ?registerVersionUpgrades\@BlockCollisionBoxDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockCollisionBoxProcessor.hpp b/LiteLoader/include/llapi/mc/BlockCollisionBoxProcessor.hpp index 97051af0b6..68a3f62113 100644 --- a/LiteLoader/include/llapi/mc/BlockCollisionBoxProcessor.hpp +++ b/LiteLoader/include/llapi/mc/BlockCollisionBoxProcessor.hpp @@ -29,9 +29,9 @@ class BlockCollisionBoxProcessor { public: /** - * @symbol ?_tryBake\@BlockCollisionBoxProcessor\@\@SAXPEBUBlockRotationComponent\@\@PEAUBlockCollisionBoxComponent\@\@\@Z + * @symbol ?_tryBake\@BlockCollisionBoxProcessor\@\@SAXAEBVMatrix\@\@PEAUBlockCollisionBoxComponent\@\@\@Z */ - MCAPI static void _tryBake(struct BlockRotationComponent const *, struct BlockCollisionBoxComponent *); + MCAPI static void _tryBake(class Matrix const &, struct BlockCollisionBoxComponent *); /** * @symbol ?getProcessor\@BlockCollisionBoxProcessor\@\@SA?AV?$unique_ptr\@VEntityComponentProcessor\@Util\@\@U?$default_delete\@VEntityComponentProcessor\@Util\@\@\@std\@\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp b/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp index 784db4286a..df6404c41c 100644 --- a/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp @@ -135,10 +135,6 @@ class BlockCommandOrigin : public CommandOrigin { * @symbol ??0BlockCommandOrigin\@\@QEAA\@AEAVLevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@\@Z */ MCAPI BlockCommandOrigin(class Level &, class AutomaticID, std::string const &, class BlockPos const &); - /** - * @symbol ?load\@BlockCommandOrigin\@\@SA?AV?$unique_ptr\@VBlockCommandOrigin\@\@U?$default_delete\@VBlockCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z - */ - MCAPI static std::unique_ptr load(class CompoundTag const &, class Level &); //protected: /** diff --git a/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp b/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp index 72bb734ff2..d8e8d09fc9 100644 --- a/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp @@ -85,9 +85,5 @@ struct BlockComponentDescription { * @symbol ?bindType\@BlockComponentDescription\@\@SAXXZ */ MCAPI static void bindType(); - /** - * @symbol ?registerVersionUpgrades\@BlockComponentDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockCraftingTableDescription.hpp b/LiteLoader/include/llapi/mc/BlockCraftingTableDescription.hpp index e1dda41c5e..b7f1d43de8 100644 --- a/LiteLoader/include/llapi/mc/BlockCraftingTableDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockCraftingTableDescription.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class BlockCraftingTableDescription { +struct BlockCraftingTableDescription { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKCRAFTINGTABLEDESCRIPTION public: - class BlockCraftingTableDescription& operator=(class BlockCraftingTableDescription const &) = delete; - BlockCraftingTableDescription(class BlockCraftingTableDescription const &) = delete; + struct BlockCraftingTableDescription& operator=(struct BlockCraftingTableDescription const &) = delete; + BlockCraftingTableDescription(struct BlockCraftingTableDescription const &) = delete; BlockCraftingTableDescription() = delete; #endif @@ -67,9 +67,5 @@ class BlockCraftingTableDescription { * @symbol ?bindType\@BlockCraftingTableDescription\@\@SAXXZ */ MCAPI static void bindType(); - /** - * @symbol ?registerVersionUpgrades\@BlockCraftingTableDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockCreativeGroupDescription.hpp b/LiteLoader/include/llapi/mc/BlockCreativeGroupDescription.hpp index 018616bc93..747d40573a 100644 --- a/LiteLoader/include/llapi/mc/BlockCreativeGroupDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockCreativeGroupDescription.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class BlockCreativeGroupDescription { +struct BlockCreativeGroupDescription { #define AFTER_EXTRA // Add Member There @@ -20,8 +20,8 @@ class BlockCreativeGroupDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKCREATIVEGROUPDESCRIPTION public: - class BlockCreativeGroupDescription& operator=(class BlockCreativeGroupDescription const &) = delete; - BlockCreativeGroupDescription(class BlockCreativeGroupDescription const &) = delete; + struct BlockCreativeGroupDescription& operator=(struct BlockCreativeGroupDescription const &) = delete; + BlockCreativeGroupDescription(struct BlockCreativeGroupDescription const &) = delete; BlockCreativeGroupDescription() = delete; #endif @@ -40,9 +40,5 @@ class BlockCreativeGroupDescription { * @symbol ?NameID\@BlockCreativeGroupDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; - /** - * @symbol ?registerVersionUpgrades\@BlockCreativeGroupDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockDefinition.hpp b/LiteLoader/include/llapi/mc/BlockDefinition.hpp index 5a6ead0f7f..6c48160f61 100644 --- a/LiteLoader/include/llapi/mc/BlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BlockDefinition.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Core.hpp" #define BEFORE_EXTRA @@ -26,14 +25,14 @@ struct BlockDefinition { #endif public: - /** - * @symbol ??0BlockDefinition\@\@QEAA\@$$QEAU0\@\@Z - */ - MCAPI BlockDefinition(struct BlockDefinition &&); /** * @symbol ??0BlockDefinition\@\@QEAA\@XZ */ MCAPI BlockDefinition(); + /** + * @symbol ??0BlockDefinition\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI BlockDefinition(struct BlockDefinition &&); /** * @symbol ??0BlockDefinition\@\@QEAA\@AEBU0\@\@Z */ @@ -50,10 +49,6 @@ struct BlockDefinition { * @symbol ?registerBlockDefinitionTypes\@BlockDefinition\@\@SAXXZ */ MCAPI static void registerBlockDefinitionTypes(); - /** - * @symbol ?upgradeJson\@BlockDefinition\@\@SA?AU?$pair\@_NVSemVersion\@\@\@std\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVPath\@Core\@\@V?$optional\@VSemVersion\@\@\@3\@\@Z - */ - MCAPI static struct std::pair upgradeJson(std::string &, class Core::Path const &, class std::optional); //private: diff --git a/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp b/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp index 47c1cbe8cc..8cc3f0ebce 100644 --- a/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp +++ b/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp @@ -60,10 +60,6 @@ struct BlockResource { * @symbol ?getBlockDefinitions\@BlockDefinitionGroup\@\@QEBA?AV?$vector\@PEBUBlockDefinition\@\@V?$allocator\@PEBUBlockDefinition\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getBlockDefinitions() const; - /** - * @symbol ?initBlockLegacyFromDefinition\@BlockDefinitionGroup\@\@QEAAXAEAVBlockLegacy\@\@AEBUBlockDefinition\@\@\@Z - */ - MCAPI void initBlockLegacyFromDefinition(class BlockLegacy &, struct BlockDefinition const &); /** * @symbol ?initializeBlockFromDefinition\@BlockDefinitionGroup\@\@QEAAXAEBUBlockDefinition\@\@AEAVEntityRegistry\@\@AEAVLevel\@\@\@Z */ @@ -76,6 +72,10 @@ struct BlockResource { * @symbol ?loadResources\@BlockDefinitionGroup\@\@QEAAXAEAVResourcePackManager\@\@AEBVBlockComponentFactory\@\@AEBVExperiments\@\@\@Z */ MCAPI void loadResources(class ResourcePackManager &, class BlockComponentFactory const &, class Experiments const &); + /** + * @symbol ?postProcessComponents\@BlockDefinitionGroup\@\@QEAAXAEAVBlockLegacy\@\@\@Z + */ + MCAPI void postProcessComponents(class BlockLegacy &); /** * @symbol ?registerBlockDefinition\@BlockDefinitionGroup\@\@QEAAXV?$unique_ptr\@UBlockDefinition\@\@U?$default_delete\@UBlockDefinition\@\@\@std\@\@\@std\@\@\@Z */ @@ -106,6 +106,10 @@ struct BlockResource { * @symbol ?_buildBlockMenuCategorySchema\@BlockDefinitionGroup\@\@AEAAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UBlockDescription\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI void _buildBlockMenuCategorySchema(class std::shared_ptr> &); + /** + * @symbol ?_initializeComponentPostProcessors\@BlockDefinitionGroup\@\@AEAAXXZ + */ + MCAPI void _initializeComponentPostProcessors(); /** * @symbol ?_loadBlockDescription\@BlockDefinitionGroup\@\@AEAA_NAEBVValue\@Json\@\@AEAUBlockDescription\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockDescription.hpp b/LiteLoader/include/llapi/mc/BlockDescription.hpp index 22b8e5172a..5e06b6e54d 100644 --- a/LiteLoader/include/llapi/mc/BlockDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDescription.hpp @@ -21,11 +21,14 @@ struct BlockDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKDESCRIPTION public: - BlockDescription(struct BlockDescription const &) = delete; BlockDescription() = delete; #endif public: + /** + * @symbol ??0BlockDescription\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI BlockDescription(struct BlockDescription const &); /** * @symbol ??4BlockDescription\@\@QEAAAEAU0\@AEBU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockDescriptor.hpp b/LiteLoader/include/llapi/mc/BlockDescriptor.hpp index 62f8ad77c8..086610db95 100644 --- a/LiteLoader/include/llapi/mc/BlockDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/BlockDescriptor.hpp @@ -27,14 +27,14 @@ class BlockDescriptor { #endif public: - /** - * @symbol ??0BlockDescriptor\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEBV?$vector\@VBlockState\@BlockDescriptor\@\@V?$allocator\@VBlockState\@BlockDescriptor\@\@\@std\@\@\@2\@\@Z - */ - MCAPI BlockDescriptor(std::string const &, std::vector const &&); /** * @symbol ??0BlockDescriptor\@\@QEAA\@AEBV0\@\@Z */ MCAPI BlockDescriptor(class BlockDescriptor const &); + /** + * @symbol ??0BlockDescriptor\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEBV?$vector\@VState\@BlockDescriptor\@\@V?$allocator\@VState\@BlockDescriptor\@\@\@std\@\@\@2\@\@Z + */ + MCAPI BlockDescriptor(std::string const &, std::vector const &&); /** * @symbol ??0BlockDescriptor\@\@QEAA\@$$QEAV0\@\@Z */ @@ -60,9 +60,9 @@ class BlockDescriptor { */ MCAPI std::string const & getFullName() const; /** - * @symbol ?getStates\@BlockDescriptor\@\@QEBAAEBV?$vector\@VBlockState\@BlockDescriptor\@\@V?$allocator\@VBlockState\@BlockDescriptor\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getStates\@BlockDescriptor\@\@QEBAAEBV?$vector\@VState\@BlockDescriptor\@\@V?$allocator\@VState\@BlockDescriptor\@\@\@std\@\@\@std\@\@XZ */ - MCAPI std::vector const & getStates() const; + MCAPI std::vector const & getStates() const; /** * @symbol ?getTagExpression\@BlockDescriptor\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ @@ -141,18 +141,10 @@ class BlockDescriptor { MCAPI static class BlockDescriptor fromTagExpression(std::string const &, enum class MolangVersion); //private: - /** - * @symbol ?_anyTagsMatch\@BlockDescriptor\@\@AEBA_NAEBVBlock\@\@\@Z - */ - MCAPI bool _anyTagsMatch(class Block const &) const; /** * @symbol ?_resolveImpl\@BlockDescriptor\@\@AEAAX_N\@Z */ MCAPI void _resolveImpl(bool); - /** - * @symbol ?_statesMatch\@BlockDescriptor\@\@AEBA_NAEBVBlock\@\@\@Z - */ - MCAPI bool _statesMatch(class Block const &) const; private: diff --git a/LiteLoader/include/llapi/mc/BlockDestructibleByExplosionDescription.hpp b/LiteLoader/include/llapi/mc/BlockDestructibleByExplosionDescription.hpp index b3ac4172e5..3eee57d18e 100644 --- a/LiteLoader/include/llapi/mc/BlockDestructibleByExplosionDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDestructibleByExplosionDescription.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class BlockDestructibleByExplosionDescription { +struct BlockDestructibleByExplosionDescription { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKDESTRUCTIBLEBYEXPLOSIONDESCRIPTION public: - class BlockDestructibleByExplosionDescription& operator=(class BlockDestructibleByExplosionDescription const &) = delete; - BlockDestructibleByExplosionDescription(class BlockDestructibleByExplosionDescription const &) = delete; + struct BlockDestructibleByExplosionDescription& operator=(struct BlockDestructibleByExplosionDescription const &) = delete; + BlockDestructibleByExplosionDescription(struct BlockDestructibleByExplosionDescription const &) = delete; BlockDestructibleByExplosionDescription() = delete; #endif @@ -47,9 +47,5 @@ class BlockDestructibleByExplosionDescription { * @symbol ?bindType\@BlockDestructibleByExplosionDescription\@\@SAXXZ */ MCAPI static void bindType(); - /** - * @symbol ?registerVersionUpgrades\@BlockDestructibleByExplosionDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockDestructibleByMiningDescription.hpp b/LiteLoader/include/llapi/mc/BlockDestructibleByMiningDescription.hpp index be94ff0118..03ee3f5511 100644 --- a/LiteLoader/include/llapi/mc/BlockDestructibleByMiningDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDestructibleByMiningDescription.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class BlockDestructibleByMiningDescription { +struct BlockDestructibleByMiningDescription { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKDESTRUCTIBLEBYMININGDESCRIPTION public: - class BlockDestructibleByMiningDescription& operator=(class BlockDestructibleByMiningDescription const &) = delete; - BlockDestructibleByMiningDescription(class BlockDestructibleByMiningDescription const &) = delete; + struct BlockDestructibleByMiningDescription& operator=(struct BlockDestructibleByMiningDescription const &) = delete; + BlockDestructibleByMiningDescription(struct BlockDestructibleByMiningDescription const &) = delete; BlockDestructibleByMiningDescription() = delete; #endif @@ -67,9 +67,5 @@ class BlockDestructibleByMiningDescription { * @symbol ?bindType\@BlockDestructibleByMiningDescription\@\@SAXXZ */ MCAPI static void bindType(); - /** - * @symbol ?registerVersionUpgrades\@BlockDestructibleByMiningDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockDisplayNameComponent.hpp b/LiteLoader/include/llapi/mc/BlockDisplayNameComponent.hpp deleted file mode 100644 index c5c0367872..0000000000 --- a/LiteLoader/include/llapi/mc/BlockDisplayNameComponent.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file BlockDisplayNameComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure BlockDisplayNameComponent. - * - */ -struct BlockDisplayNameComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKDISPLAYNAMECOMPONENT -public: - struct BlockDisplayNameComponent& operator=(struct BlockDisplayNameComponent const &) = delete; - BlockDisplayNameComponent(struct BlockDisplayNameComponent const &) = delete; - BlockDisplayNameComponent() = delete; -#endif - -public: - /** - * @symbol ??1BlockDisplayNameComponent\@\@QEAA\@XZ - */ - MCAPI ~BlockDisplayNameComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockDisplayNameDescription.hpp b/LiteLoader/include/llapi/mc/BlockDisplayNameDescription.hpp index b113cd50fd..7688833d97 100644 --- a/LiteLoader/include/llapi/mc/BlockDisplayNameDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDisplayNameDescription.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class BlockDisplayNameDescription { +struct BlockDisplayNameDescription { #define AFTER_EXTRA // Add Member There @@ -20,8 +20,8 @@ class BlockDisplayNameDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKDISPLAYNAMEDESCRIPTION public: - class BlockDisplayNameDescription& operator=(class BlockDisplayNameDescription const &) = delete; - BlockDisplayNameDescription(class BlockDisplayNameDescription const &) = delete; + struct BlockDisplayNameDescription& operator=(struct BlockDisplayNameDescription const &) = delete; + BlockDisplayNameDescription(struct BlockDisplayNameDescription const &) = delete; BlockDisplayNameDescription() = delete; #endif @@ -69,9 +69,5 @@ class BlockDisplayNameDescription { * @symbol ?bindType\@BlockDisplayNameDescription\@\@SAXXZ */ MCAPI static void bindType(); - /** - * @symbol ?registerVersionUpgrades\@BlockDisplayNameDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp b/LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp index 41420402e3..ea613e3f97 100644 --- a/LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp @@ -37,10 +37,6 @@ class BlockEventDispatcher { * @symbol ?registerListener\@BlockEventDispatcher\@\@QEAA?AVBlockEventDispatcherToken\@\@AEBVVec3\@\@MV?$function\@$$A6AXAEBVBlockPos\@\@IAEBVBlock\@\@PEAVActor\@\@\@Z\@std\@\@\@Z */ MCAPI class BlockEventDispatcherToken registerListener(class Vec3 const &, float, class std::function); - /** - * @symbol ?removeListener\@BlockEventDispatcher\@\@QEAAXH\@Z - */ - MCAPI void removeListener(int); /** * @symbol ?updatePosition\@BlockEventDispatcher\@\@QEAAXHAEBVVec3\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockEventDispatcherToken.hpp b/LiteLoader/include/llapi/mc/BlockEventDispatcherToken.hpp index f153a94e34..5565dfcdae 100644 --- a/LiteLoader/include/llapi/mc/BlockEventDispatcherToken.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventDispatcherToken.hpp @@ -33,6 +33,10 @@ class BlockEventDispatcherToken { * @symbol ??4BlockEventDispatcherToken\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class BlockEventDispatcherToken & operator=(class BlockEventDispatcherToken &&); + /** + * @symbol ?unregister\@BlockEventDispatcherToken\@\@QEAAXXZ + */ + MCAPI void unregister(); /** * @symbol ??1BlockEventDispatcherToken\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BlockEventPacket.hpp b/LiteLoader/include/llapi/mc/BlockEventPacket.hpp index 90074cdad6..9890f7e9a3 100644 --- a/LiteLoader/include/llapi/mc/BlockEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventPacket.hpp @@ -60,13 +60,13 @@ class BlockEventPacket : public Packet { */ MCVAPI ~BlockEventPacket(); #endif - /** - * @symbol ??0BlockEventPacket\@\@QEAA\@VBlockPos\@\@HH\@Z - */ - MCAPI BlockEventPacket(class BlockPos, int, int); /** * @symbol ??0BlockEventPacket\@\@QEAA\@XZ */ MCAPI BlockEventPacket(); + /** + * @symbol ??0BlockEventPacket\@\@QEAA\@VBlockPos\@\@HH\@Z + */ + MCAPI BlockEventPacket(class BlockPos, int, int); }; diff --git a/LiteLoader/include/llapi/mc/BlockFlammableDescription.hpp b/LiteLoader/include/llapi/mc/BlockFlammableDescription.hpp index 1ad4e404ca..e1204a4900 100644 --- a/LiteLoader/include/llapi/mc/BlockFlammableDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockFlammableDescription.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class BlockFlammableDescription { +struct BlockFlammableDescription { #define AFTER_EXTRA // Add Member There @@ -20,8 +20,8 @@ class BlockFlammableDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKFLAMMABLEDESCRIPTION public: - class BlockFlammableDescription& operator=(class BlockFlammableDescription const &) = delete; - BlockFlammableDescription(class BlockFlammableDescription const &) = delete; + struct BlockFlammableDescription& operator=(struct BlockFlammableDescription const &) = delete; + BlockFlammableDescription(struct BlockFlammableDescription const &) = delete; BlockFlammableDescription() = delete; #endif @@ -57,9 +57,5 @@ class BlockFlammableDescription { * @symbol ?bindType\@BlockFlammableDescription\@\@SAXXZ */ MCAPI static void bindType(); - /** - * @symbol ?registerVersionUpgrades\@BlockFlammableDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp b/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp index ea607917c8..49433afe1b 100644 --- a/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class BlockFrictionDescription { +struct BlockFrictionDescription { #define AFTER_EXTRA // Add Member There @@ -20,8 +20,8 @@ class BlockFrictionDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKFRICTIONDESCRIPTION public: - class BlockFrictionDescription& operator=(class BlockFrictionDescription const &) = delete; - BlockFrictionDescription(class BlockFrictionDescription const &) = delete; + struct BlockFrictionDescription& operator=(struct BlockFrictionDescription const &) = delete; + BlockFrictionDescription(struct BlockFrictionDescription const &) = delete; BlockFrictionDescription() = delete; #endif @@ -69,9 +69,5 @@ class BlockFrictionDescription { * @symbol ?bindType\@BlockFrictionDescription\@\@SAXXZ */ MCAPI static void bindType(); - /** - * @symbol ?registerVersionUpgrades\@BlockFrictionDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockGeometryComponent.hpp b/LiteLoader/include/llapi/mc/BlockGeometryComponent.hpp index a25ee465d9..e87679462d 100644 --- a/LiteLoader/include/llapi/mc/BlockGeometryComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockGeometryComponent.hpp @@ -29,6 +29,10 @@ struct BlockGeometryComponent { #endif public: + /** + * @symbol ??0BlockGeometryComponent\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI BlockGeometryComponent(struct BlockGeometryComponent &&); /** * @symbol ??4BlockGeometryComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockGeometryDescription.hpp b/LiteLoader/include/llapi/mc/BlockGeometryDescription.hpp index e565294399..5084f58eaf 100644 --- a/LiteLoader/include/llapi/mc/BlockGeometryDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockGeometryDescription.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class BlockGeometryDescription { +struct BlockGeometryDescription { #define AFTER_EXTRA // Add Member There @@ -20,9 +20,8 @@ class BlockGeometryDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKGEOMETRYDESCRIPTION public: - class BlockGeometryDescription& operator=(class BlockGeometryDescription const &) = delete; - BlockGeometryDescription(class BlockGeometryDescription const &) = delete; - BlockGeometryDescription() = delete; + struct BlockGeometryDescription& operator=(struct BlockGeometryDescription const &) = delete; + BlockGeometryDescription(struct BlockGeometryDescription const &) = delete; #endif public: @@ -66,6 +65,10 @@ class BlockGeometryDescription { * @symbol ?handleVersionBasedInitialization\@BlockGeometryDescription\@\@UEAAXAEBVSemVersion\@\@\@Z */ virtual void handleVersionBasedInitialization(class SemVersion const &); + /** + * @symbol ??0BlockGeometryDescription\@\@QEAA\@XZ + */ + MCAPI BlockGeometryDescription(); /** * @symbol ?NameID\@BlockGeometryDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ @@ -74,9 +77,5 @@ class BlockGeometryDescription { * @symbol ?bindType\@BlockGeometryDescription\@\@SAXXZ */ MCAPI static void bindType(); - /** - * @symbol ?registerVersionUpgrades\@BlockGeometryDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockHashPalette.hpp b/LiteLoader/include/llapi/mc/BlockHashPalette.hpp new file mode 100644 index 0000000000..98a1206fd5 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockHashPalette.hpp @@ -0,0 +1,58 @@ +/** + * @file BlockHashPalette.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BlockPalette.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BlockHashPalette { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKHASHPALETTE +public: + class BlockHashPalette& operator=(class BlockHashPalette const &) = delete; + BlockHashPalette(class BlockHashPalette const &) = delete; + BlockHashPalette() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?getPaletteType\@BlockHashPalette\@\@UEAA?AW4PaletteType\@BlockPalette\@\@XZ + */ + virtual enum class BlockPalette::PaletteType getPaletteType(); + /** + * @vftbl 2 + * @symbol ?appendBlock\@BlockHashPalette\@\@UEAAXAEBVBlock\@\@\@Z + */ + virtual void appendBlock(class Block const &); + /** + * @vftbl 3 + * @symbol ?getBlock\@BlockHashPalette\@\@UEBAAEBVBlock\@\@AEBI\@Z + */ + virtual class Block const & getBlock(unsigned int const &) const; + /** + * @vftbl 4 + * @symbol ?assignBlockNetworkId\@BlockHashPalette\@\@MEBAXAEBVBlock\@\@_K\@Z + */ + virtual void assignBlockNetworkId(class Block const &, unsigned __int64) const; + /** + * @symbol ??0BlockHashPalette\@\@QEAA\@AEAVLevel\@\@\@Z + */ + MCAPI BlockHashPalette(class Level &); + +}; diff --git a/LiteLoader/include/llapi/mc/BlockItem.hpp b/LiteLoader/include/llapi/mc/BlockItem.hpp index ed90c2e8eb..d7aa023391 100644 --- a/LiteLoader/include/llapi/mc/BlockItem.hpp +++ b/LiteLoader/include/llapi/mc/BlockItem.hpp @@ -138,9 +138,9 @@ class BlockItem : public Item { virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** * @vftbl 132 - * @symbol ?_useOn\@BlockItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@BlockItem\@\@MEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKITEM /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/BlockLegacy.hpp b/LiteLoader/include/llapi/mc/BlockLegacy.hpp index 70af6f3fbf..26b1599599 100644 --- a/LiteLoader/include/llapi/mc/BlockLegacy.hpp +++ b/LiteLoader/include/llapi/mc/BlockLegacy.hpp @@ -570,9 +570,9 @@ class BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 107 * @symbol ?calcVariant\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVColor\@mce\@\@\@Z @@ -685,189 +685,189 @@ class BlockLegacy { virtual bool canSlide(class BlockSource &, class BlockPos const &) const; /** * @vftbl 129 + * @symbol __unk_vfn_129 + */ + virtual void __unk_vfn_129(); + /** + * @vftbl 130 * @symbol ?canSpawnAt\@BlockLegacy\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSpawnAt(class BlockSource const &, class BlockPos const &) const; /** - * @vftbl 130 + * @vftbl 131 * @symbol ?notifySpawnedAt\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void notifySpawnedAt(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_132(); /** - * @vftbl 132 + * @vftbl 133 * @symbol ?getIconYOffset\@BlockLegacy\@\@UEBAHXZ */ virtual int getIconYOffset() const; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?buildDescriptionId\@BlockLegacy\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@BlockLegacy\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@BlockLegacy\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColor\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 137 + * @vftbl 138 * @symbol ?getColorAtPos\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 138 + * @vftbl 139 * @symbol ?getColorForParticle\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColorForParticle(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 139 + * @vftbl 140 * @symbol ?isSeasonTinted\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isSeasonTinted(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 140 + * @vftbl 141 * @symbol ?onGraphicsModeChanged\@BlockLegacy\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 141 + * @vftbl 142 * @symbol ?getShadeBrightness\@BlockLegacy\@\@UEBAMAEBVBlock\@\@\@Z */ virtual float getShadeBrightness(class Block const &) const; /** - * @vftbl 142 + * @vftbl 143 * @symbol ?getVisualShapeInWorld\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; /** - * @vftbl 143 + * @vftbl 144 * @symbol ?getVisualShape\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 144 + * @vftbl 145 * @symbol ?getUIShape\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ virtual class AABB const & getUIShape(class Block const &, class AABB &) const; /** - * @vftbl 145 + * @vftbl 146 * @symbol ?telemetryVariant\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int telemetryVariant(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@BlockLegacy\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 147 + * @vftbl 148 * @symbol ?canSpawnOn\@BlockLegacy\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 148 + * @vftbl 149 * @symbol ?getRenderBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getRenderBlock() const; /** - * @vftbl 149 + * @vftbl 150 * @symbol ?getMappedFace\@BlockLegacy\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 150 + * @vftbl 151 * @symbol ?getFaceFlip\@BlockLegacy\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 152 + * @vftbl 153 * @symbol ?init\@BlockLegacy\@\@UEAAAEAV1\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 153 + * @vftbl 154 * @symbol ?getLightEmission\@BlockLegacy\@\@MEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; - /** - * @vftbl 154 - * @symbol ?addState\@BlockLegacy\@\@UEAAAEAV1\@AEBVItemState\@\@\@Z - */ - virtual class BlockLegacy & addState(class ItemState const &); /** * @vftbl 155 - * @symbol ?addState\@BlockLegacy\@\@UEAAAEAV1\@AEBVItemState\@\@_K\@Z + * @symbol ?addState\@BlockLegacy\@\@UEAAAEAV1\@AEBVBlockState\@\@\@Z */ - virtual class BlockLegacy & addState(class ItemState const &, unsigned __int64); + virtual class BlockLegacy & addState(class BlockState const &); /** * @vftbl 156 - * @symbol __unk_vfn_156 + * @symbol ?addState\@BlockLegacy\@\@UEAAAEAV1\@AEBVBlockState\@\@_K\@Z */ - virtual void __unk_vfn_156(); + virtual class BlockLegacy & addState(class BlockState const &, unsigned __int64); /** * @vftbl 157 + * @symbol __unk_vfn_157 + */ + virtual void __unk_vfn_157(); + /** + * @vftbl 158 * @symbol ?tryLegacyUpgrade\@BlockLegacy\@\@UEBAPEBVBlock\@\@G\@Z */ virtual class Block const * tryLegacyUpgrade(unsigned short) const; /** - * @vftbl 158 + * @vftbl 159 * @symbol ?dealsContactDamage\@BlockLegacy\@\@UEBA_NAEBVActor\@\@AEBVBlock\@\@_N\@Z */ virtual bool dealsContactDamage(class Actor const &, class Block const &, bool) const; /** - * @vftbl 159 + * @vftbl 160 * @symbol ?tryGetInfested\@BlockLegacy\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 160 + * @vftbl 161 * @symbol ?tryGetUninfested\@BlockLegacy\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetUninfested(class Block const &) const; /** - * @vftbl 161 + * @vftbl 162 * @symbol ?_addHardCodedBlockComponents\@BlockLegacy\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 163 + * @vftbl 164 * @symbol ?onExploded\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 164 + * @vftbl 165 * @symbol ?onStandOn\@BlockLegacy\@\@MEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -880,131 +880,136 @@ class BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 + * @vftbl 170 * @symbol ?onFallOn\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 + * @vftbl 174 * @symbol ?shouldRandomTick\@BlockLegacy\@\@MEBA_NXZ */ virtual bool shouldRandomTick() const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 175 + * @vftbl 176 * @symbol ?clip\@BlockLegacy\@\@MEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 176 + * @vftbl 177 * @symbol ?use\@BlockLegacy\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@EV?$optional\@VVec3\@\@\@std\@\@\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char, class std::optional) const; /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@BlockLegacy\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@BlockLegacy\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 180 + * @vftbl 181 * @symbol ?getRenderLayer\@BlockLegacy\@\@MEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 181 + * @vftbl 182 * @symbol ?getRenderLayer\@BlockLegacy\@\@MEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 182 + * @vftbl 183 * @symbol ?getExtraRenderLayers\@BlockLegacy\@\@MEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 183 + * @vftbl 184 * @symbol ?getExplosionResistance\@BlockLegacy\@\@MEBAMXZ */ virtual float getExplosionResistance() const; /** - * @vftbl 184 + * @vftbl 185 * @symbol ?getEmissiveBrightness\@BlockLegacy\@\@MEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getEmissiveBrightness(class Block const &) const; /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@BlockLegacy\@\@MEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@BlockLegacy\@\@MEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@BlockLegacy\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@BlockLegacy\@\@MEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@BlockLegacy\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 191 + * @vftbl 192 * @symbol ?_executeEvent\@BlockLegacy\@\@EEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV12\@\@std\@\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV12\@\@std\@\@\@2\@\@3\@AEAVRenderParams\@\@\@Z */ virtual void _executeEvent(std::string const &, std::vector> &, class RenderParams &) const; /** - * @vftbl 192 + * @vftbl 193 * @symbol ?_executeTrigger\@BlockLegacy\@\@EEBA_NAEBVDefinitionTrigger\@\@AEAV?$vector\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV12\@\@std\@\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV12\@\@std\@\@\@2\@\@std\@\@AEAVRenderParams\@\@\@Z */ virtual bool _executeTrigger(class DefinitionTrigger const &, std::vector> &, class RenderParams &) const; /** - * @vftbl 193 + * @vftbl 194 * @symbol ?_forceExecuteTrigger\@BlockLegacy\@\@EEBAXAEBVDefinitionTrigger\@\@AEAV?$vector\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV12\@\@std\@\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV12\@\@std\@\@\@2\@\@std\@\@AEAVRenderParams\@\@\@Z */ virtual void _forceExecuteTrigger(class DefinitionTrigger const &, std::vector> &, class RenderParams &) const; @@ -1029,6 +1034,10 @@ class BlockLegacy { * @symbol ?canHaveExtraData\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool canHaveExtraData() const; + /** + * @symbol ?canInstatick\@BlockLegacy\@\@UEBA_NXZ + */ + MCVAPI bool canInstatick() const; /** * @symbol ?canOccludeVibrations\@BlockLegacy\@\@UEBA_NXZ */ @@ -1183,17 +1192,13 @@ class BlockLegacy { */ MCAPI class BlockLegacy & addTag(class HashedString const &); /** - * @symbol ?anyOf\@BlockLegacy\@\@QEBA_NV?$initializer_list\@$$CBVHashedString\@\@\@std\@\@\@Z - */ - MCAPI bool anyOf(class std::initializer_list) const; - /** - * @symbol ?buildDescriptionName\@BlockLegacy\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @symbol ?anyOf\@BlockLegacy\@\@QEBA_NAEBV?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@\@Z */ - MCAPI std::string buildDescriptionName(class Block const &) const; + MCAPI bool anyOf(std::vector> const &) const; /** - * @symbol ?canInstatick\@BlockLegacy\@\@QEBA_NXZ + * @symbol ?anyOf\@BlockLegacy\@\@QEBA_NV?$initializer_list\@$$CBVHashedString\@\@\@std\@\@\@Z */ - MCAPI bool canInstatick() const; + MCAPI bool anyOf(class std::initializer_list) const; /** * @symbol ?createBlockPermutations\@BlockLegacy\@\@QEAAXI\@Z */ @@ -1207,13 +1212,9 @@ class BlockLegacy { */ MCAPI void forEachBlockPermutation(class std::function) const; /** - * @symbol ?forEachItemStateInstance\@BlockLegacy\@\@QEBAXV?$function\@$$A6A_NAEBVItemStateInstance\@\@\@Z\@std\@\@\@Z - */ - MCAPI void forEachItemStateInstance(class std::function) const; - /** - * @symbol ?getAllowsRunes\@BlockLegacy\@\@QEBA_NXZ + * @symbol ?forEachBlockStateInstance\@BlockLegacy\@\@QEBAXV?$function\@$$A6A_NAEBVBlockStateInstance\@\@\@Z\@std\@\@\@Z */ - MCAPI bool getAllowsRunes() const; + MCAPI void forEachBlockStateInstance(class std::function) const; /** * @symbol ?getBlockEntityType\@BlockLegacy\@\@QEBA?AW4BlockActorType\@\@XZ */ @@ -1223,9 +1224,9 @@ class BlockLegacy { */ MCAPI short getBlockItemId() const; /** - * @symbol ?getBlockState\@BlockLegacy\@\@QEBAPEBVItemState\@\@AEBVHashedString\@\@\@Z + * @symbol ?getBlockState\@BlockLegacy\@\@QEBAPEBVBlockState\@\@AEBVHashedString\@\@\@Z */ - MCAPI class ItemState const * getBlockState(class HashedString const &) const; + MCAPI class BlockState const * getBlockState(class HashedString const &) const; /** * @symbol ?getBlockStateGroup\@BlockLegacy\@\@QEAAPEAVBlockStateGroup\@\@XZ */ @@ -1258,14 +1259,6 @@ class BlockLegacy { * @symbol ?getEntityForModification\@BlockLegacy\@\@QEBAAEAVEntityContext\@\@XZ */ MCAPI class EntityContext & getEntityForModification() const; - /** - * @symbol ?getEntityNoCheck\@BlockLegacy\@\@QEBAAEBVEntityContext\@\@XZ - */ - MCAPI class EntityContext const & getEntityNoCheck() const; - /** - * @symbol ?getExperienceDrop\@BlockLegacy\@\@QEBAHAEAVRandom\@\@\@Z - */ - MCAPI int getExperienceDrop(class Random &) const; /** * @symbol ?getMaterial\@BlockLegacy\@\@QEBAAEBVMaterial\@\@XZ */ @@ -1294,30 +1287,22 @@ class BlockLegacy { * @symbol ?getUniquePermutations\@BlockLegacy\@\@QEBA_KXZ */ MCAPI unsigned __int64 getUniquePermutations() const; - /** - * @symbol ?hasBlockEntity\@BlockLegacy\@\@QEBA_NXZ - */ - MCAPI bool hasBlockEntity() const; /** * @symbol ?hasProperty\@BlockLegacy\@\@QEBA_NW4BlockProperty\@\@\@Z */ MCAPI bool hasProperty(enum class BlockProperty) const; /** - * @symbol ?hasState\@BlockLegacy\@\@QEBA_NAEBVHashedString\@\@\@Z + * @symbol ?hasState\@BlockLegacy\@\@QEBA_NAEBVBlockState\@\@\@Z */ - MCAPI bool hasState(class HashedString const &) const; + MCAPI bool hasState(class BlockState const &) const; /** - * @symbol ?hasState\@BlockLegacy\@\@QEBA_NAEBVItemState\@\@\@Z + * @symbol ?hasState\@BlockLegacy\@\@QEBA_NAEBVHashedString\@\@\@Z */ - MCAPI bool hasState(class ItemState const &) const; + MCAPI bool hasState(class HashedString const &) const; /** * @symbol ?hasTag\@BlockLegacy\@\@QEBA_NAEBVHashedString\@\@\@Z */ MCAPI bool hasTag(class HashedString const &) const; - /** - * @symbol ?hasTag\@BlockLegacy\@\@QEBA_NAEB_K\@Z - */ - MCAPI bool hasTag(unsigned __int64 const &) const; /** * @symbol ?initEntity\@BlockLegacy\@\@QEAAXAEAVEntityRegistry\@\@\@Z */ @@ -1326,26 +1311,10 @@ class BlockLegacy { * @symbol ?initializeBlockStateGroup\@BlockLegacy\@\@QEAAXXZ */ MCAPI void initializeBlockStateGroup(); - /** - * @symbol ?isEmpty\@BlockLegacy\@\@QEBA_NXZ - */ - MCAPI bool isEmpty() const; /** * @symbol ?isFullAndOpaque\@BlockLegacy\@\@QEBA_NXZ */ MCAPI bool isFullAndOpaque() const; - /** - * @symbol ?isHeavy\@BlockLegacy\@\@QEBA_NXZ - */ - MCAPI bool isHeavy() const; - /** - * @symbol ?isMotionBlockingBlock\@BlockLegacy\@\@QEBA_NXZ - */ - MCAPI bool isMotionBlockingBlock() const; - /** - * @symbol ?isSolidBlockingBlock\@BlockLegacy\@\@QEBA_NXZ - */ - MCAPI bool isSolidBlockingBlock() const; /** * @symbol ?isVanilla\@BlockLegacy\@\@QEBA_NXZ */ @@ -1387,9 +1356,9 @@ class BlockLegacy { */ MCAPI class BlockLegacy & setCategory(enum class CreativeItemCategory); /** - * @symbol ?setCreativeEnumState\@BlockLegacy\@\@QEAAAEAV1\@AEBVItemState\@\@\@Z + * @symbol ?setCreativeEnumState\@BlockLegacy\@\@QEAAAEAV1\@AEBVBlockState\@\@\@Z */ - MCAPI class BlockLegacy & setCreativeEnumState(class ItemState const &); + MCAPI class BlockLegacy & setCreativeEnumState(class BlockState const &); /** * @symbol ?setCreativeGroup\@BlockLegacy\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -1454,6 +1423,10 @@ class BlockLegacy { * @symbol ?setOnlyPermutationandDefaultState\@BlockLegacy\@\@QEAAXV?$unique_ptr\@VBlock\@\@U?$default_delete\@VBlock\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setOnlyPermutationandDefaultState(std::unique_ptr); + /** + * @symbol ?setPreFlatteningName\@BlockLegacy\@\@QEAAXAEBVHashedString\@\@\@Z + */ + MCAPI void setPreFlatteningName(class HashedString const &); /** * @symbol ?setPushesOutItems\@BlockLegacy\@\@QEAAX_N\@Z */ @@ -1474,18 +1447,18 @@ class BlockLegacy { * @symbol ?setSolid\@BlockLegacy\@\@QEAAX_N\@Z */ MCAPI void setSolid(bool); - /** - * @symbol ?setVisualShape\@BlockLegacy\@\@QEAAXAEBVVec3\@\@0\@Z - */ - MCAPI void setVisualShape(class Vec3 const &, class Vec3 const &); /** * @symbol ?setVisualShape\@BlockLegacy\@\@QEAAXAEBVAABB\@\@\@Z */ MCAPI void setVisualShape(class AABB const &); /** - * @symbol ?tryGetStateFromLegacyData\@BlockLegacy\@\@QEBAPEBVBlock\@\@G\@Z + * @symbol ?setVisualShape\@BlockLegacy\@\@QEAAXAEBVVec3\@\@0\@Z + */ + MCAPI void setVisualShape(class Vec3 const &, class Vec3 const &); + /** + * @symbol ?tryGetStateFromLegacyData\@BlockLegacy\@\@QEBAPEBVBlock\@\@G_N\@Z */ - MCAPI class Block const * tryGetStateFromLegacyData(unsigned short) const; + MCAPI class Block const * tryGetStateFromLegacyData(unsigned short, bool) const; /** * @symbol ?BLOCK_DESCRIPTION_PREFIX\@BlockLegacy\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ @@ -1503,13 +1476,13 @@ class BlockLegacy { */ MCAPI static struct BlockLegacy::NameInfo extractBlockNameInfo(std::string const &); /** - * @symbol ?getPlacementFacingAll\@BlockLegacy\@\@SAEAEAVActor\@\@AEBVBlockPos\@\@M\@Z + * @symbol ?getPlacementFacingAll\@BlockLegacy\@\@SAEAEBVActor\@\@AEBVBlockPos\@\@M\@Z */ - MCAPI static unsigned char getPlacementFacingAll(class Actor &, class BlockPos const &, float); + MCAPI static unsigned char getPlacementFacingAll(class Actor const &, class BlockPos const &, float); /** - * @symbol ?getPlacementFacingAllExceptAxisY\@BlockLegacy\@\@SAEAEAVActor\@\@AEBVBlockPos\@\@M\@Z + * @symbol ?getPlacementFacingAllExceptAxisY\@BlockLegacy\@\@SAEAEBVActor\@\@AEBVBlockPos\@\@M\@Z */ - MCAPI static unsigned char getPlacementFacingAllExceptAxisY(class Actor &, class BlockPos const &, float); + MCAPI static unsigned char getPlacementFacingAllExceptAxisY(class Actor const &, class BlockPos const &, float); /** * @symbol ?popResource\@BlockLegacy\@\@SAPEAVItemActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVItemStack\@\@\@Z */ @@ -1536,30 +1509,10 @@ class BlockLegacy { * @symbol ?forEachBlockPermutationMutable\@BlockLegacy\@\@IEAA_NV?$function\@$$A6A_NAEAVBlock\@\@\@Z\@std\@\@\@Z */ MCAPI bool forEachBlockPermutationMutable(class std::function); - /** - * @symbol ?getBurnOdds\@BlockLegacy\@\@IEBAHXZ - */ - MCAPI int getBurnOdds() const; - /** - * @symbol ?getDestroySpeed\@BlockLegacy\@\@IEBAMXZ - */ - MCAPI float getDestroySpeed() const; - /** - * @symbol ?getFlameOdds\@BlockLegacy\@\@IEBAHXZ - */ - MCAPI int getFlameOdds() const; /** * @symbol ?getFriction\@BlockLegacy\@\@IEBAMXZ */ MCAPI float getFriction() const; - /** - * @symbol ?getLight\@BlockLegacy\@\@IEBA?AUBrightness\@\@XZ - */ - MCAPI struct Brightness getLight() const; - /** - * @symbol ?isLavaFlammable\@BlockLegacy\@\@IEBA_NXZ - */ - MCAPI bool isLavaFlammable() const; /** * @symbol ?createAABBWithPixelCoordinates\@BlockLegacy\@\@KA?AVAABB\@\@MMMMMM\@Z */ @@ -1567,13 +1520,13 @@ class BlockLegacy { //private: /** - * @symbol ?_tryLookupSplitStateCollection\@BlockLegacy\@\@AEBA?AV?$optional\@H\@std\@\@_K\@Z + * @symbol ?_tryLookupAlteredStateCollection\@BlockLegacy\@\@AEBA?AV?$optional\@H\@std\@\@_KG\@Z */ - MCAPI class std::optional _tryLookupSplitStateCollection(unsigned __int64) const; + MCAPI class std::optional _tryLookupAlteredStateCollection(unsigned __int64, unsigned short) const; /** - * @symbol ?_trySetStateFromSplitStateCollection\@BlockLegacy\@\@AEBAPEBVBlock\@\@_KHG\@Z + * @symbol ?_trySetStateFromAlteredStateCollection\@BlockLegacy\@\@AEBAPEBVBlock\@\@_KHG\@Z */ - MCAPI class Block const * _trySetStateFromSplitStateCollection(unsigned __int64, int, unsigned short) const; + MCAPI class Block const * _trySetStateFromAlteredStateCollection(unsigned __int64, int, unsigned short) const; /** * @symbol ?initParams\@BlockLegacy\@\@AEBAXAEAVRenderParams\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockLightDampeningDescription.hpp b/LiteLoader/include/llapi/mc/BlockLightDampeningDescription.hpp index cd08f44751..9da575b8d1 100644 --- a/LiteLoader/include/llapi/mc/BlockLightDampeningDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockLightDampeningDescription.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class BlockLightDampeningDescription { +struct BlockLightDampeningDescription { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKLIGHTDAMPENINGDESCRIPTION public: - class BlockLightDampeningDescription& operator=(class BlockLightDampeningDescription const &) = delete; - BlockLightDampeningDescription(class BlockLightDampeningDescription const &) = delete; + struct BlockLightDampeningDescription& operator=(struct BlockLightDampeningDescription const &) = delete; + BlockLightDampeningDescription(struct BlockLightDampeningDescription const &) = delete; BlockLightDampeningDescription() = delete; #endif @@ -67,9 +67,5 @@ class BlockLightDampeningDescription { * @symbol ?bindType\@BlockLightDampeningDescription\@\@SAXXZ */ MCAPI static void bindType(); - /** - * @symbol ?registerVersionUpgrades\@BlockLightDampeningDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp b/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp index 93b9318aa8..e4dc65af66 100644 --- a/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class BlockLightEmissionDescription { +struct BlockLightEmissionDescription { #define AFTER_EXTRA // Add Member There @@ -20,8 +20,8 @@ class BlockLightEmissionDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKLIGHTEMISSIONDESCRIPTION public: - class BlockLightEmissionDescription& operator=(class BlockLightEmissionDescription const &) = delete; - BlockLightEmissionDescription(class BlockLightEmissionDescription const &) = delete; + struct BlockLightEmissionDescription& operator=(struct BlockLightEmissionDescription const &) = delete; + BlockLightEmissionDescription(struct BlockLightEmissionDescription const &) = delete; BlockLightEmissionDescription() = delete; #endif @@ -69,9 +69,5 @@ class BlockLightEmissionDescription { * @symbol ?bindType\@BlockLightEmissionDescription\@\@SAXXZ */ MCAPI static void bindType(); - /** - * @symbol ?registerVersionUpgrades\@BlockLightEmissionDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockListEventMap.hpp b/LiteLoader/include/llapi/mc/BlockListEventMap.hpp index d0863496e5..612efb0cc1 100644 --- a/LiteLoader/include/llapi/mc/BlockListEventMap.hpp +++ b/LiteLoader/include/llapi/mc/BlockListEventMap.hpp @@ -21,14 +21,11 @@ class BlockListEventMap { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKLISTEVENTMAP public: + BlockListEventMap(class BlockListEventMap const &) = delete; BlockListEventMap() = delete; #endif public: - /** - * @symbol ??0BlockListEventMap\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI BlockListEventMap(class BlockListEventMap const &); /** * @symbol ??4BlockListEventMap\@\@QEAAAEAV0\@AEBV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockListSerializer.hpp b/LiteLoader/include/llapi/mc/BlockListSerializer.hpp index c7cac99be4..2589a7126b 100644 --- a/LiteLoader/include/llapi/mc/BlockListSerializer.hpp +++ b/LiteLoader/include/llapi/mc/BlockListSerializer.hpp @@ -30,14 +30,14 @@ class BlockListSerializer { #endif public: - /** - * @symbol ?loadJSON\@BlockListSerializer\@\@SAXVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI static void loadJSON(class Json::Value, class SemVersion const &, std::vector &); /** * @symbol ?loadJSON\@BlockListSerializer\@\@SAXVValue\@Json\@\@AEBVSemVersion\@\@AEAVBlockDescriptor\@\@\@Z */ MCAPI static void loadJSON(class Json::Value, class SemVersion const &, class BlockDescriptor &); + /** + * @symbol ?loadJSON\@BlockListSerializer\@\@SAXVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI static void loadJSON(class Json::Value, class SemVersion const &, std::vector &); /** * @symbol ?saveJSON\@BlockListSerializer\@\@SAXAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockLootComponentDescription.hpp b/LiteLoader/include/llapi/mc/BlockLootComponentDescription.hpp index 1be6d8e262..13dfdce59b 100644 --- a/LiteLoader/include/llapi/mc/BlockLootComponentDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockLootComponentDescription.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class BlockLootComponentDescription { +struct BlockLootComponentDescription { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKLOOTCOMPONENTDESCRIPTION public: - class BlockLootComponentDescription& operator=(class BlockLootComponentDescription const &) = delete; - BlockLootComponentDescription(class BlockLootComponentDescription const &) = delete; + struct BlockLootComponentDescription& operator=(struct BlockLootComponentDescription const &) = delete; + BlockLootComponentDescription(struct BlockLootComponentDescription const &) = delete; BlockLootComponentDescription() = delete; #endif @@ -47,9 +47,5 @@ class BlockLootComponentDescription { * @symbol ?bindType\@BlockLootComponentDescription\@\@SAXXZ */ MCAPI static void bindType(); - /** - * @symbol ?registerVersionUpgrades\@BlockLootComponentDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockMapColorDescription.hpp b/LiteLoader/include/llapi/mc/BlockMapColorDescription.hpp index 8438fd3648..81b005f28e 100644 --- a/LiteLoader/include/llapi/mc/BlockMapColorDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockMapColorDescription.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class BlockMapColorDescription { +struct BlockMapColorDescription { #define AFTER_EXTRA // Add Member There @@ -20,8 +20,8 @@ class BlockMapColorDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKMAPCOLORDESCRIPTION public: - class BlockMapColorDescription& operator=(class BlockMapColorDescription const &) = delete; - BlockMapColorDescription(class BlockMapColorDescription const &) = delete; + struct BlockMapColorDescription& operator=(struct BlockMapColorDescription const &) = delete; + BlockMapColorDescription(struct BlockMapColorDescription const &) = delete; BlockMapColorDescription() = delete; #endif @@ -49,9 +49,5 @@ class BlockMapColorDescription { * @symbol ?bindType\@BlockMapColorDescription\@\@SAXXZ */ MCAPI static void bindType(); - /** - * @symbol ?registerVersionUpgrades\@BlockMapColorDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockMaterialInstancesComponent.hpp b/LiteLoader/include/llapi/mc/BlockMaterialInstancesComponent.hpp index 479dfcfb33..016cf5d18f 100644 --- a/LiteLoader/include/llapi/mc/BlockMaterialInstancesComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockMaterialInstancesComponent.hpp @@ -41,9 +41,5 @@ struct BlockMaterialInstancesComponent { * @symbol ??4BlockMaterialInstancesComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct BlockMaterialInstancesComponent & operator=(struct BlockMaterialInstancesComponent &&); - /** - * @symbol ??1BlockMaterialInstancesComponent\@\@QEAA\@XZ - */ - MCAPI ~BlockMaterialInstancesComponent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockMaterialInstancesDescription.hpp b/LiteLoader/include/llapi/mc/BlockMaterialInstancesDescription.hpp index 7c72c92568..b633f99210 100644 --- a/LiteLoader/include/llapi/mc/BlockMaterialInstancesDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockMaterialInstancesDescription.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class BlockMaterialInstancesDescription { +struct BlockMaterialInstancesDescription { #define AFTER_EXTRA // Add Member There @@ -20,8 +20,8 @@ class BlockMaterialInstancesDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKMATERIALINSTANCESDESCRIPTION public: - class BlockMaterialInstancesDescription& operator=(class BlockMaterialInstancesDescription const &) = delete; - BlockMaterialInstancesDescription(class BlockMaterialInstancesDescription const &) = delete; + struct BlockMaterialInstancesDescription& operator=(struct BlockMaterialInstancesDescription const &) = delete; + BlockMaterialInstancesDescription(struct BlockMaterialInstancesDescription const &) = delete; #endif public: @@ -73,4 +73,4 @@ class BlockMaterialInstancesDescription { */ MCAPI static void bindType(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierComponent.hpp b/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierComponent.hpp new file mode 100644 index 0000000000..3f55f1f0ee --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierComponent.hpp @@ -0,0 +1,32 @@ +/** + * @file BlockMovementSlowdownMultiplierComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct BlockMovementSlowdownMultiplierComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKMOVEMENTSLOWDOWNMULTIPLIERCOMPONENT +public: + struct BlockMovementSlowdownMultiplierComponent& operator=(struct BlockMovementSlowdownMultiplierComponent const &) = delete; + BlockMovementSlowdownMultiplierComponent(struct BlockMovementSlowdownMultiplierComponent const &) = delete; + BlockMovementSlowdownMultiplierComponent() = delete; +#endif + +public: + /** + * @symbol ?setMultiplier\@BlockMovementSlowdownMultiplierComponent\@\@QEAAXAEBVVec3\@\@\@Z + */ + MCAPI void setMultiplier(class Vec3 const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierSystem.hpp b/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierSystem.hpp index d6ac22618d..f353f5e9fd 100644 --- a/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierSystem.hpp +++ b/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierSystem.hpp @@ -31,18 +31,34 @@ class BlockMovementSlowdownMultiplierSystem { * @symbol ?_adjustFallDistance\@BlockMovementSlowdownMultiplierSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUBlockMovementSlowdownAppliedComponent\@\@AEAUFallDistanceComponent\@\@\@Z */ MCAPI static void _adjustFallDistance(class StrictEntityContext const &, struct BlockMovementSlowdownAppliedComponent const &, struct FallDistanceComponent &); + /** + * @symbol ?_adjustFallDistanceWrapper\@BlockMovementSlowdownMultiplierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUBlockMovementSlowdownAppliedComponent\@\@UFallDistanceComponent\@\@\@\@\@Z + */ + MCAPI static void _adjustFallDistanceWrapper(class ViewT); /** * @symbol ?_applySlowdownOnMove\@BlockMovementSlowdownMultiplierSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@AEAUMoveRequestComponent\@\@AEAUStateVectorComponent\@\@\@Z */ MCAPI static void _applySlowdownOnMove(class StrictEntityContext const &, struct BlockMovementSlowdownMultiplierComponent &, struct MoveRequestComponent &, struct StateVectorComponent &); + /** + * @symbol ?_applySlowdownOnMoveWrapper\@BlockMovementSlowdownMultiplierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UBlockMovementSlowdownMultiplierComponent\@\@UMoveRequestComponent\@\@UStateVectorComponent\@\@\@\@\@Z + */ + MCAPI static void _applySlowdownOnMoveWrapper(class ViewT); /** * @symbol ?_immunePlayer\@BlockMovementSlowdownMultiplierSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@AEBUAbilitiesComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z */ MCAPI static void _immunePlayer(class StrictEntityContext const &, struct BlockMovementSlowdownMultiplierComponent &, struct AbilitiesComponent const &, class EntityModifierT); + /** + * @symbol ?_immunePlayerWrapper\@BlockMovementSlowdownMultiplierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UBlockMovementSlowdownMultiplierComponent\@\@U?$Include\@UBlockMovementSlowdownAppliedComponent\@\@\@\@$$CBUAbilitiesComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z + */ + MCAPI static void _immunePlayerWrapper(class ViewT, struct AbilitiesComponent const>, class EntityModifierT); /** * @symbol ?_immuneSlowdown\@BlockMovementSlowdownMultiplierSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z */ MCAPI static void _immuneSlowdown(class StrictEntityContext const &, struct BlockMovementSlowdownMultiplierComponent &, class EntityModifierT); + /** + * @symbol ?_immuneWitherBossWrapper\@BlockMovementSlowdownMultiplierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UBlockMovementSlowdownMultiplierComponent\@\@U?$Include\@V?$FlagComponent\@UWitherBossFlag\@\@\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z + */ + MCAPI static void _immuneWitherBossWrapper(class ViewT, struct BlockMovementSlowdownAppliedComponent>>, class EntityModifierT); /** * @symbol ?createAdjustFallDistanceSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BlockPalette.hpp b/LiteLoader/include/llapi/mc/BlockPalette.hpp index 4c5b7205d1..a1c1a43fbd 100644 --- a/LiteLoader/include/llapi/mc/BlockPalette.hpp +++ b/LiteLoader/include/llapi/mc/BlockPalette.hpp @@ -19,6 +19,11 @@ class BlockPalette { #define AFTER_EXTRA // Add Member There +public: + enum class PaletteType : int { + Sequential = 0x0, + Hashed = 0x1, + }; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKPALETTE @@ -29,6 +34,37 @@ class BlockPalette { #endif public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?getPaletteType\@BlockPalette\@\@UEAA?AW4PaletteType\@1\@XZ + */ + virtual enum class BlockPalette::PaletteType getPaletteType(); + /** + * @vftbl 2 + * @symbol ?appendBlock\@BlockPalette\@\@UEAAXAEBVBlock\@\@\@Z + */ + virtual void appendBlock(class Block const &); + /** + * @vftbl 3 + * @symbol ?getBlock\@BlockPalette\@\@UEBAAEBVBlock\@\@AEBI\@Z + */ + virtual class Block const & getBlock(unsigned int const &) const; + /** + * @vftbl 4 + * @symbol ?assignBlockNetworkId\@BlockPalette\@\@MEBAXAEBVBlock\@\@_K\@Z + */ + virtual void assignBlockNetworkId(class Block const &, unsigned __int64) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKPALETTE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockPalette(); +#endif /** * @symbol ??0BlockPalette\@\@QEAA\@UConstructorToken\@0\@\@Z */ @@ -53,10 +89,6 @@ class BlockPalette { * @symbol ?getBlock\@BlockPalette\@\@QEBAAEBVBlock\@\@AEBVCompoundTag\@\@\@Z */ MCAPI class Block const & getBlock(class CompoundTag const &) const; - /** - * @symbol ?getBlock\@BlockPalette\@\@QEBAAEBVBlock\@\@AEBI\@Z - */ - MCAPI class Block const & getBlock(unsigned int const &) const; /** * @symbol ?getBlockFromLegacyData\@BlockPalette\@\@QEBAAEBVBlock\@\@UNewBlockID\@\@I\@Z */ @@ -73,17 +105,13 @@ class BlockPalette { * @symbol ?switchBlock\@BlockPalette\@\@QEBAAEBVBlock\@\@AEBV2\@AEBVBlockLegacy\@\@\@Z */ MCAPI class Block const & switchBlock(class Block const &, class BlockLegacy const &) const; - /** - * @symbol ??1BlockPalette\@\@QEAA\@XZ - */ - MCAPI ~BlockPalette(); -//private: +//protected: /** - * @symbol ?shouldWarnFor\@BlockPalette\@\@AEBA_NUNewBlockID\@\@G\@Z + * @symbol ?shouldWarnFor\@BlockPalette\@\@IEBA_NUNewBlockID\@\@G\@Z */ MCAPI bool shouldWarnFor(struct NewBlockID, unsigned short) const; -private: +protected: }; diff --git a/LiteLoader/include/llapi/mc/BlockPartVisibilityComponent.hpp b/LiteLoader/include/llapi/mc/BlockPartVisibilityComponent.hpp deleted file mode 100644 index 1e5c5b5456..0000000000 --- a/LiteLoader/include/llapi/mc/BlockPartVisibilityComponent.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file BlockPartVisibilityComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure BlockPartVisibilityComponent. - * - */ -struct BlockPartVisibilityComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKPARTVISIBILITYCOMPONENT -public: - struct BlockPartVisibilityComponent& operator=(struct BlockPartVisibilityComponent const &) = delete; - BlockPartVisibilityComponent(struct BlockPartVisibilityComponent const &) = delete; - BlockPartVisibilityComponent() = delete; -#endif - -public: - /** - * @symbol ??4BlockPartVisibilityComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z - */ - MCAPI struct BlockPartVisibilityComponent & operator=(struct BlockPartVisibilityComponent &&); - /** - * @symbol ??1BlockPartVisibilityComponent\@\@QEAA\@XZ - */ - MCAPI ~BlockPartVisibilityComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockPartVisibilityDescription.hpp b/LiteLoader/include/llapi/mc/BlockPartVisibilityDescription.hpp index ac609bdd3f..c00b0c3809 100644 --- a/LiteLoader/include/llapi/mc/BlockPartVisibilityDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockPartVisibilityDescription.hpp @@ -22,59 +22,13 @@ class BlockPartVisibilityDescription { public: class BlockPartVisibilityDescription& operator=(class BlockPartVisibilityDescription const &) = delete; BlockPartVisibilityDescription(class BlockPartVisibilityDescription const &) = delete; + BlockPartVisibilityDescription() = delete; #endif public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?getName\@BlockPartVisibilityDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - virtual std::string const & getName() const; - /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockPartVisibilityDescription\@\@UEBAXAEAVEntityContext\@\@\@Z - */ - virtual void initializeComponent(class EntityContext &) const; - /** - * @vftbl 3 - * @symbol __unk_vfn_3 - */ - virtual void __unk_vfn_3(); - /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockPartVisibilityDescription\@\@UEBA_NXZ - */ - virtual bool isNetworkComponent() const; - /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockPartVisibilityDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ - */ - virtual std::unique_ptr buildNetworkTag() const; - /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@BlockPartVisibilityDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z - */ - virtual void initializeFromNetwork(class CompoundTag const &); - /** - * @symbol ??0BlockPartVisibilityDescription\@\@QEAA\@XZ - */ - MCAPI BlockPartVisibilityDescription(); /** * @symbol ?NameID\@BlockPartVisibilityDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; - /** - * @symbol ?bindType\@BlockPartVisibilityDescription\@\@SAXXZ - */ - MCAPI static void bindType(); - /** - * @symbol ?registerVersionUpgrades\@BlockPartVisibilityDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); }; diff --git a/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp b/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp index a17a5cec06..e4b90f25e0 100644 --- a/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp +++ b/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp @@ -49,10 +49,6 @@ class BlockPatternBuilder { * @symbol ?isReadyForMatch\@BlockPatternBuilder\@\@QEAA_NXZ */ MCAPI bool isReadyForMatch(); - /** - * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@HHEE\@Z - */ - MCAPI struct BuildMatch match(class BlockPos const &, int, int, unsigned char, unsigned char); /** * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@\@Z */ @@ -61,6 +57,10 @@ class BlockPatternBuilder { * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@HH\@Z */ MCAPI struct BuildMatch match(class BlockPos const &, int, int); + /** + * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@HHEE\@Z + */ + MCAPI struct BuildMatch match(class BlockPos const &, int, int, unsigned char, unsigned char); /** * @symbol ?replaceBlocks\@BlockPatternBuilder\@\@QEAAXDUBuildMatch\@\@AEBVBlock\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockPlacementFilterComponent.hpp b/LiteLoader/include/llapi/mc/BlockPlacementFilterComponent.hpp index 22ba4b19eb..fa408f10a2 100644 --- a/LiteLoader/include/llapi/mc/BlockPlacementFilterComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockPlacementFilterComponent.hpp @@ -41,9 +41,5 @@ struct BlockPlacementFilterComponent { * @symbol ??4BlockPlacementFilterComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct BlockPlacementFilterComponent & operator=(struct BlockPlacementFilterComponent &&); - /** - * @symbol ??1BlockPlacementFilterComponent\@\@QEAA\@XZ - */ - MCAPI ~BlockPlacementFilterComponent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockPlacementFilterDescription.hpp b/LiteLoader/include/llapi/mc/BlockPlacementFilterDescription.hpp index 66dd2def50..0e76de7838 100644 --- a/LiteLoader/include/llapi/mc/BlockPlacementFilterDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockPlacementFilterDescription.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class BlockPlacementFilterDescription { +struct BlockPlacementFilterDescription { #define AFTER_EXTRA // Add Member There @@ -20,8 +20,8 @@ class BlockPlacementFilterDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKPLACEMENTFILTERDESCRIPTION public: - class BlockPlacementFilterDescription& operator=(class BlockPlacementFilterDescription const &) = delete; - BlockPlacementFilterDescription(class BlockPlacementFilterDescription const &) = delete; + struct BlockPlacementFilterDescription& operator=(struct BlockPlacementFilterDescription const &) = delete; + BlockPlacementFilterDescription(struct BlockPlacementFilterDescription const &) = delete; BlockPlacementFilterDescription() = delete; #endif @@ -70,4 +70,4 @@ class BlockPlacementFilterDescription { */ MCAPI static void bindType(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockPlanterItem.hpp b/LiteLoader/include/llapi/mc/BlockPlanterItem.hpp index 82f1b5ce4a..f6b71b91d0 100644 --- a/LiteLoader/include/llapi/mc/BlockPlanterItem.hpp +++ b/LiteLoader/include/llapi/mc/BlockPlanterItem.hpp @@ -113,9 +113,9 @@ class BlockPlanterItem : public Item { virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** * @vftbl 132 - * @symbol ?_useOn\@BlockPlanterItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@BlockPlanterItem\@\@MEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0BlockPlanterItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlock\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockQueuedTickingDescription.hpp b/LiteLoader/include/llapi/mc/BlockQueuedTickingDescription.hpp index dc40f65071..b7317145e7 100644 --- a/LiteLoader/include/llapi/mc/BlockQueuedTickingDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockQueuedTickingDescription.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class BlockQueuedTickingDescription { +struct BlockQueuedTickingDescription { #define AFTER_EXTRA // Add Member There @@ -20,8 +20,8 @@ class BlockQueuedTickingDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKQUEUEDTICKINGDESCRIPTION public: - class BlockQueuedTickingDescription& operator=(class BlockQueuedTickingDescription const &) = delete; - BlockQueuedTickingDescription(class BlockQueuedTickingDescription const &) = delete; + struct BlockQueuedTickingDescription& operator=(struct BlockQueuedTickingDescription const &) = delete; + BlockQueuedTickingDescription(struct BlockQueuedTickingDescription const &) = delete; BlockQueuedTickingDescription() = delete; #endif @@ -54,4 +54,4 @@ class BlockQueuedTickingDescription { */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockRandomTickingDescription.hpp b/LiteLoader/include/llapi/mc/BlockRandomTickingDescription.hpp index 39910490ff..0a4fe35ee7 100644 --- a/LiteLoader/include/llapi/mc/BlockRandomTickingDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockRandomTickingDescription.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class BlockRandomTickingDescription { +struct BlockRandomTickingDescription { #define AFTER_EXTRA // Add Member There @@ -20,8 +20,8 @@ class BlockRandomTickingDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKRANDOMTICKINGDESCRIPTION public: - class BlockRandomTickingDescription& operator=(class BlockRandomTickingDescription const &) = delete; - BlockRandomTickingDescription(class BlockRandomTickingDescription const &) = delete; + struct BlockRandomTickingDescription& operator=(struct BlockRandomTickingDescription const &) = delete; + BlockRandomTickingDescription(struct BlockRandomTickingDescription const &) = delete; BlockRandomTickingDescription() = delete; #endif @@ -50,4 +50,4 @@ class BlockRandomTickingDescription { */ MCAPI static void bindType(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockRegistryManager.hpp b/LiteLoader/include/llapi/mc/BlockRegistryManager.hpp new file mode 100644 index 0000000000..120c829bef --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockRegistryManager.hpp @@ -0,0 +1,49 @@ +/** + * @file BlockRegistryManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BlockRegistryManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKREGISTRYMANAGER +public: + class BlockRegistryManager& operator=(class BlockRegistryManager const &) = delete; + BlockRegistryManager(class BlockRegistryManager const &) = delete; + BlockRegistryManager() = delete; +#endif + +public: + +//private: + +private: + /** + * @symbol ?mClientIdRegistryMap\@BlockRegistryManager\@\@0V?$unordered_map\@W4SubClientId\@\@V?$weak_ptr\@VBlockTypeRegistry\@\@\@std\@\@U?$hash\@W4SubClientId\@\@\@3\@U?$equal_to\@W4SubClientId\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4SubClientId\@\@V?$weak_ptr\@VBlockTypeRegistry\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@A + */ + MCAPI static class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> mClientIdRegistryMap; + /** + * @symbol ?mClientRegistry\@BlockRegistryManager\@\@0V?$weak_ptr\@VBlockTypeRegistry\@\@\@std\@\@A + */ + MCAPI static class std::weak_ptr mClientRegistry; + /** + * @symbol ?mServerRegistry\@BlockRegistryManager\@\@0V?$weak_ptr\@VBlockTypeRegistry\@\@\@std\@\@A + */ + MCAPI static class std::weak_ptr mServerRegistry; + /** + * @symbol ?mThreadLocalRegistry\@BlockRegistryManager\@\@0V?$ThreadLocalObject\@V?$weak_ptr\@VBlockTypeRegistry\@\@\@std\@\@V?$allocator\@V?$weak_ptr\@VBlockTypeRegistry\@\@\@std\@\@\@2\@\@Threading\@Bedrock\@\@A + */ + MCAPI static class Bedrock::Threading::ThreadLocalObject, class std::allocator>> mThreadLocalRegistry; + +}; diff --git a/LiteLoader/include/llapi/mc/BlockSelectionBoxDescription.hpp b/LiteLoader/include/llapi/mc/BlockSelectionBoxDescription.hpp index 9807e0c3fb..22c631bfeb 100644 --- a/LiteLoader/include/llapi/mc/BlockSelectionBoxDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockSelectionBoxDescription.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class BlockSelectionBoxDescription { +struct BlockSelectionBoxDescription { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKSELECTIONBOXDESCRIPTION public: - class BlockSelectionBoxDescription& operator=(class BlockSelectionBoxDescription const &) = delete; - BlockSelectionBoxDescription(class BlockSelectionBoxDescription const &) = delete; + struct BlockSelectionBoxDescription& operator=(struct BlockSelectionBoxDescription const &) = delete; + BlockSelectionBoxDescription(struct BlockSelectionBoxDescription const &) = delete; BlockSelectionBoxDescription() = delete; #endif @@ -72,4 +72,4 @@ class BlockSelectionBoxDescription { */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockSelectionBoxProcessor.hpp b/LiteLoader/include/llapi/mc/BlockSelectionBoxProcessor.hpp index c8333e3080..e3578697aa 100644 --- a/LiteLoader/include/llapi/mc/BlockSelectionBoxProcessor.hpp +++ b/LiteLoader/include/llapi/mc/BlockSelectionBoxProcessor.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Util.hpp" #define BEFORE_EXTRA @@ -29,12 +28,8 @@ class BlockSelectionBoxProcessor { public: /** - * @symbol ?_tryBake\@BlockSelectionBoxProcessor\@\@SAXPEBUBlockRotationComponent\@\@PEAUBlockSelectionBoxComponent\@\@\@Z + * @symbol ?_tryBake\@BlockSelectionBoxProcessor\@\@SAXAEBVMatrix\@\@PEAUBlockSelectionBoxComponent\@\@\@Z */ - MCAPI static void _tryBake(struct BlockRotationComponent const *, struct BlockSelectionBoxComponent *); - /** - * @symbol ?getProcessor\@BlockSelectionBoxProcessor\@\@SA?AV?$unique_ptr\@VEntityComponentProcessor\@Util\@\@U?$default_delete\@VEntityComponentProcessor\@Util\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI static std::unique_ptr getProcessor(); + MCAPI static void _tryBake(class Matrix const &, struct BlockSelectionBoxComponent *); }; diff --git a/LiteLoader/include/llapi/mc/BlockSource.hpp b/LiteLoader/include/llapi/mc/BlockSource.hpp index ca8117cfa4..bf9e6bd93b 100644 --- a/LiteLoader/include/llapi/mc/BlockSource.hpp +++ b/LiteLoader/include/llapi/mc/BlockSource.hpp @@ -257,6 +257,16 @@ struct ClipParameters * @symbol ?areChunksFullyLoaded\@BlockSource\@\@UEBA_NAEBVBlockPos\@\@H\@Z */ virtual bool areChunksFullyLoaded(class BlockPos const &, int) const; + /** + * @vftbl 39 + * @symbol ?canDoBlockDrops\@BlockSource\@\@UEBA_NXZ + */ + virtual bool canDoBlockDrops() const; + /** + * @vftbl 40 + * @symbol ?canDoContainedItemDrops\@BlockSource\@\@UEBA_NXZ + */ + virtual bool canDoContainedItemDrops() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKSOURCE /** * @symbol ?getDimension\@BlockSource\@\@UEAAAEAVDimension\@\@XZ @@ -275,14 +285,14 @@ struct ClipParameters */ MCVAPI ~BlockSource(); #endif - /** - * @symbol ??0BlockSource\@\@QEAA\@AEAVLevel\@\@AEAVDimension\@\@AEAVChunkSource\@\@_N33\@Z - */ - MCAPI BlockSource(class Level &, class Dimension &, class ChunkSource &, bool, bool, bool); /** * @symbol ??0BlockSource\@\@QEAA\@AEAVChunkSource\@\@_N1\@Z */ MCAPI BlockSource(class ChunkSource &, bool, bool); + /** + * @symbol ??0BlockSource\@\@QEAA\@AEAVLevel\@\@AEAVDimension\@\@AEAVChunkSource\@\@_N33\@Z + */ + MCAPI BlockSource(class Level &, class Dimension &, class ChunkSource &, bool, bool, bool); /** * @symbol ?_fetchEntities\@BlockSource\@\@QEAA?AV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@PEBUIActorMovementProxy\@\@AEBVAABB\@\@_N\@Z */ @@ -343,14 +353,14 @@ struct ClipParameters * @symbol ?checkValidity\@BlockSource\@\@QEBAXXZ */ MCAPI void checkValidity() const; - /** - * @symbol ?clip\@BlockSource\@\@QEBA?AVHitResult\@\@AEBVVec3\@\@0_N1H11PEAVPlayer\@\@AEBV?$function\@$$A6A_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z\@std\@\@\@Z - */ - MCAPI class HitResult clip(class Vec3 const &, class Vec3 const &, bool, bool, int, bool, bool, class Player *, class std::function const &) const; /** * @symbol ?clip\@BlockSource\@\@QEBA?AVHitResult\@\@AEBUClipParameters\@\@\@Z */ MCAPI class HitResult clip(struct ClipParameters const &) const; + /** + * @symbol ?clip\@BlockSource\@\@QEBA?AVHitResult\@\@AEBVVec3\@\@0_N1H11PEAVPlayer\@\@AEBV?$function\@$$A6A_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z\@std\@\@\@Z + */ + MCAPI class HitResult clip(class Vec3 const &, class Vec3 const &, bool, bool, int, bool, bool, class Player *, class std::function const &) const; /** * @symbol ?containsAnyBlockInBox\@BlockSource\@\@QEAA_NAEBVBoundingBox\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z */ @@ -459,14 +469,14 @@ struct ClipParameters * @symbol ?getAABBFetchResultCache\@BlockSource\@\@QEAAAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector & getAABBFetchResultCache(); - /** - * @symbol ?getAboveTopSolidBlock\@BlockSource\@\@QEAAFHH_N0\@Z - */ - MCAPI short getAboveTopSolidBlock(int, int, bool, bool); /** * @symbol ?getAboveTopSolidBlock\@BlockSource\@\@QEAAFAEBVBlockPos\@\@_N1\@Z */ MCAPI short getAboveTopSolidBlock(class BlockPos const &, bool, bool); + /** + * @symbol ?getAboveTopSolidBlock\@BlockSource\@\@QEAAFHH_N0\@Z + */ + MCAPI short getAboveTopSolidBlock(int, int, bool, bool); /** * @symbol ?getAllocatedHeightAt\@BlockSource\@\@QEAAFAEBVBlockPos\@\@\@Z */ @@ -475,14 +485,14 @@ struct ClipParameters * @symbol ?getBiome\@BlockSource\@\@QEAAAEAVBiome\@\@AEBVBlockPos\@\@\@Z */ MCAPI class Biome & getBiome(class BlockPos const &); - /** - * @symbol ?getBlockEntity\@BlockSource\@\@QEAAPEAVBlockActor\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI class BlockActor * getBlockEntity(class BlockPos const &); /** * @symbol ?getBlockEntity\@BlockSource\@\@QEAAPEAVBlockActor\@\@HHH\@Z */ MCAPI class BlockActor * getBlockEntity(int, int, int); + /** + * @symbol ?getBlockEntity\@BlockSource\@\@QEAAPEAVBlockActor\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI class BlockActor * getBlockEntity(class BlockPos const &); /** * @symbol ?getBrightnessPair\@BlockSource\@\@QEBA?AUBrightnessPair\@\@AEBVBlockPos\@\@\@Z */ @@ -507,26 +517,26 @@ struct ClipParameters * @symbol ?getGrassColor\@BlockSource\@\@QEBAHAEBVBlockPos\@\@\@Z */ MCAPI int getGrassColor(class BlockPos const &) const; - /** - * @symbol ?getHeightmap\@BlockSource\@\@QEAAFHH\@Z - */ - MCAPI short getHeightmap(int, int); /** * @symbol ?getHeightmap\@BlockSource\@\@QEBAFAEBVBlockPos\@\@\@Z */ MCAPI short getHeightmap(class BlockPos const &) const; /** - * @symbol ?getHeightmapPos\@BlockSource\@\@QEBA?AVBlockPos\@\@AEBV2\@\@Z + * @symbol ?getHeightmap\@BlockSource\@\@QEAAFHH\@Z */ - MCAPI class BlockPos getHeightmapPos(class BlockPos const &) const; + MCAPI short getHeightmap(int, int); /** - * @symbol ?getLevel\@BlockSource\@\@QEAAAEAVLevel\@\@XZ + * @symbol ?getHeightmapPos\@BlockSource\@\@QEBA?AVBlockPos\@\@AEBV2\@\@Z */ - MCAPI class Level & getLevel(); + MCAPI class BlockPos getHeightmapPos(class BlockPos const &) const; /** * @symbol ?getLevel\@BlockSource\@\@QEBAAEAVLevel\@\@XZ */ MCAPI class Level & getLevel() const; + /** + * @symbol ?getLevel\@BlockSource\@\@QEAAAEAVLevel\@\@XZ + */ + MCAPI class Level & getLevel(); /** * @symbol ?getLevelConst\@BlockSource\@\@QEBAAEBVLevel\@\@XZ */ @@ -567,10 +577,6 @@ struct ClipParameters * @symbol ?hasBorderBlock\@BlockSource\@\@QEBA_NVBlockPos\@\@\@Z */ MCAPI bool hasBorderBlock(class BlockPos) const; - /** - * @symbol ?hasChunksAt\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@0_N\@Z - */ - MCAPI bool hasChunksAt(class BlockPos const &, class BlockPos const &, bool) const; /** * @symbol ?hasSubChunksAt\@BlockSource\@\@QEBA?AU?$pair\@_NV?$optional\@VSubChunkPos\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0\@Z */ @@ -584,29 +590,29 @@ struct ClipParameters */ MCAPI bool hasTickInCurrentTick(class BlockPos const &, enum class TickingQueueType) const; /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@W4TickingQueueType\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@W4TickingQueueType\@\@\@Z */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block const &, enum class TickingQueueType) const; + MCAPI bool hasTickInPendingTicks(class BlockPos const &, class BlockLegacy const &, enum class TickingQueueType) const; /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@W4TickingQueueType\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@W4TickingQueueType\@\@\@Z */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &, enum class TickingQueueType) const; + MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block const &, enum class TickingQueueType) const; /** * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block const &) const; /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@W4TickingQueueType\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &, class BlockLegacy const &, enum class TickingQueueType) const; + MCAPI bool hasTickInPendingTicks(class BlockPos const &) const; /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@W4TickingQueueType\@\@\@Z */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &, class BlockLegacy const &) const; + MCAPI bool hasTickInPendingTicks(class BlockPos const &, enum class TickingQueueType) const; /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@\@Z */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &) const; + MCAPI bool hasTickInPendingTicks(class BlockPos const &, class BlockLegacy const &) const; /** * @symbol ?hasUntickedNeighborChunk\@BlockSource\@\@QEBA_NAEBVChunkPos\@\@H\@Z */ @@ -651,14 +657,14 @@ struct ClipParameters * @symbol ?isUnderWater\@BlockSource\@\@QEBA_NAEBVVec3\@\@AEBVBlock\@\@\@Z */ MCAPI bool isUnderWater(class Vec3 const &, class Block const &) const; - /** - * @symbol ?isUnobstructedByEntities\@BlockSource\@\@QEAA_NAEBVAABB\@\@PEBVActor\@\@\@Z - */ - MCAPI bool isUnobstructedByEntities(class AABB const &, class Actor const *); /** * @symbol ?isUnobstructedByEntities\@BlockSource\@\@QEAA_NAEBVAABB\@\@V?$span\@V?$not_null\@PEBVActor\@\@\@gsl\@\@$0?0\@gsl\@\@\@Z */ MCAPI bool isUnobstructedByEntities(class AABB const &, class gsl::span, -1>); + /** + * @symbol ?isUnobstructedByEntities\@BlockSource\@\@QEAA_NAEBVAABB\@\@PEBVActor\@\@\@Z + */ + MCAPI bool isUnobstructedByEntities(class AABB const &, class Actor const *); /** * @symbol ?isWithinHeightLimits\@BlockSource\@\@QEBA_NH\@Z */ @@ -699,14 +705,14 @@ struct ClipParameters * @symbol ?removeFromTickingQueue\@BlockSource\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI void removeFromTickingQueue(class BlockPos const &, class Block const &); - /** - * @symbol ?setBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@AEBVBlock\@\@HV?$shared_ptr\@VBlockActor\@\@\@std\@\@PEBUActorBlockSyncMessage\@\@PEAVActor\@\@\@Z - */ - MCAPI bool setBlock(class BlockPos const &, class Block const &, int, class std::shared_ptr, struct ActorBlockSyncMessage const *, class Actor *); /** * @symbol ?setBlock\@BlockSource\@\@QEAA_NHHHAEBVBlock\@\@HPEAVActor\@\@\@Z */ MCAPI bool setBlock(int, int, int, class Block const &, int, class Actor *); + /** + * @symbol ?setBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@AEBVBlock\@\@HV?$shared_ptr\@VBlockActor\@\@\@std\@\@PEBUActorBlockSyncMessage\@\@PEAVActor\@\@\@Z + */ + MCAPI bool setBlock(class BlockPos const &, class Block const &, int, class std::shared_ptr, struct ActorBlockSyncMessage const *, class Actor *); /** * @symbol ?setBlockNoUpdate\@BlockSource\@\@QEAA_NHHHAEBVBlock\@\@\@Z */ @@ -783,10 +789,6 @@ struct ClipParameters * @symbol ?doesIntersect\@BlockSource\@\@SA_NAEBVIConstBlockSource\@\@AEBVAABB\@\@AEBVGetCollisionShapeInterface\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static bool doesIntersect(class IConstBlockSource const &, class AABB const &, class GetCollisionShapeInterface const &, std::vector &); - /** - * @symbol ?generateUnloadedChunkAABB\@BlockSource\@\@SA?AVAABB\@\@AEBVChunkPos\@\@\@Z - */ - MCAPI static class AABB generateUnloadedChunkAABB(class ChunkPos const &); /** * @symbol ?getLiquidBlock\@BlockSource\@\@SAAEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockState.hpp b/LiteLoader/include/llapi/mc/BlockState.hpp new file mode 100644 index 0000000000..ad4687b53f --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockState.hpp @@ -0,0 +1,38 @@ +/** + * @file BlockState.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BlockState { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKSTATE +public: + class BlockState& operator=(class BlockState const &) = delete; + BlockState(class BlockState const &) = delete; + BlockState() = delete; +#endif + +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKSTATE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockState(); +#endif + /** + * @symbol ?forEachState\@BlockState\@\@SAXV?$function\@$$A6A_NAEBVBlockState\@\@\@Z\@std\@\@\@Z + */ + MCAPI static void forEachState(class std::function); + +}; diff --git a/LiteLoader/include/llapi/mc/BlockStateCommandParam.hpp b/LiteLoader/include/llapi/mc/BlockStateCommandParam.hpp index 12939af8ec..b9128c8d2b 100644 --- a/LiteLoader/include/llapi/mc/BlockStateCommandParam.hpp +++ b/LiteLoader/include/llapi/mc/BlockStateCommandParam.hpp @@ -30,13 +30,9 @@ class BlockStateCommandParam { public: /** - * @symbol ??0BlockStateCommandParam\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4Type\@0\@\@Z + * @symbol ?getNameAndValue\@BlockStateCommandParam\@\@QEBA?AV?$optional\@U?$pair\@VHashedString\@\@H\@std\@\@\@std\@\@AEAVCommandOutput\@\@AEBVBlock\@\@\@Z */ - MCAPI BlockStateCommandParam(std::string, std::string, enum class BlockStateCommandParam::Type); - /** - * @symbol ?getNameAndValue\@BlockStateCommandParam\@\@QEBA?AV?$optional\@U?$pair\@VHashedString\@\@H\@std\@\@\@std\@\@AEAVCommandOutput\@\@\@Z - */ - MCAPI class std::optional> getNameAndValue(class CommandOutput &) const; + MCAPI class std::optional> getNameAndValue(class CommandOutput &, class Block const &) const; /** * @symbol ?setBlockState\@BlockStateCommandParam\@\@QEBA_NPEAPEBVBlock\@\@AEAVCommandOutput\@\@\@Z */ @@ -51,6 +47,10 @@ class BlockStateCommandParam { * @symbol ?_createCompoundTag\@BlockStateCommandParam\@\@AEBA_NAEAVCompoundTag\@\@AEAVCommandOutput\@\@\@Z */ MCAPI bool _createCompoundTag(class CompoundTag &, class CommandOutput &) const; + /** + * @symbol ?_getBlockState\@BlockStateCommandParam\@\@AEBAPEBVBlockState\@\@AEBVBlock\@\@\@Z + */ + MCAPI class BlockState const * _getBlockState(class Block const &) const; private: diff --git a/LiteLoader/include/llapi/mc/BlockStateDefinition.hpp b/LiteLoader/include/llapi/mc/BlockStateDefinition.hpp index 9e728e8cf1..47c068607e 100644 --- a/LiteLoader/include/llapi/mc/BlockStateDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BlockStateDefinition.hpp @@ -23,22 +23,16 @@ struct BlockStateDefinition { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKSTATEDEFINITION public: + struct BlockStateDefinition& operator=(struct BlockStateDefinition const &) = delete; + BlockStateDefinition(struct BlockStateDefinition const &) = delete; BlockStateDefinition() = delete; #endif public: - /** - * @symbol ??0BlockStateDefinition\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI BlockStateDefinition(struct BlockStateDefinition const &); /** * @symbol ??4BlockStateDefinition\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct BlockStateDefinition & operator=(struct BlockStateDefinition &&); - /** - * @symbol ??4BlockStateDefinition\@\@QEAAAEAU0\@AEBU0\@\@Z - */ - MCAPI struct BlockStateDefinition & operator=(struct BlockStateDefinition const &); /** * @symbol ??1BlockStateDefinition\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BlockStateInstance.hpp b/LiteLoader/include/llapi/mc/BlockStateInstance.hpp new file mode 100644 index 0000000000..685f741d22 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockStateInstance.hpp @@ -0,0 +1,36 @@ +/** + * @file BlockStateInstance.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BlockStateInstance { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKSTATEINSTANCE +public: + class BlockStateInstance& operator=(class BlockStateInstance const &) = delete; + BlockStateInstance(class BlockStateInstance const &) = delete; + BlockStateInstance() = delete; +#endif + +public: + /** + * @symbol ?initState\@BlockStateInstance\@\@QEAAXAEAIIIAEBVBlockState\@\@\@Z + */ + MCAPI void initState(unsigned int &, unsigned int, unsigned int, class BlockState const &); + /** + * @symbol ?isValidData\@BlockStateInstance\@\@QEBA_NI\@Z + */ + MCAPI bool isValidData(unsigned int) const; + +}; diff --git a/LiteLoader/include/llapi/mc/BlockStateMeta.hpp b/LiteLoader/include/llapi/mc/BlockStateMeta.hpp index 6d69a6aa33..d9a4546182 100644 --- a/LiteLoader/include/llapi/mc/BlockStateMeta.hpp +++ b/LiteLoader/include/llapi/mc/BlockStateMeta.hpp @@ -30,10 +30,6 @@ class BlockStateMeta { #endif public: - /** - * @symbol ??0BlockStateMeta\@\@QEAA\@AEBVItemState\@\@AEBUBlockStateDefinition\@\@\@Z - */ - MCAPI BlockStateMeta(class ItemState const &, struct BlockStateDefinition const &); /** * @symbol ?getBool\@BlockStateMeta\@\@QEBA?B_NH\@Z */ @@ -51,9 +47,9 @@ class BlockStateMeta { */ MCAPI std::string const & getName() const; /** - * @symbol ?getState\@BlockStateMeta\@\@QEBAAEBVItemState\@\@XZ + * @symbol ?getState\@BlockStateMeta\@\@QEBAAEBVBlockState\@\@XZ */ - MCAPI class ItemState const & getState() const; + MCAPI class BlockState const & getState() const; /** * @symbol ?getString\@BlockStateMeta\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockStateRegistry.hpp b/LiteLoader/include/llapi/mc/BlockStateRegistry.hpp new file mode 100644 index 0000000000..448e492c37 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockStateRegistry.hpp @@ -0,0 +1,32 @@ +/** + * @file BlockStateRegistry.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BlockStateRegistry { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKSTATEREGISTRY +public: + class BlockStateRegistry& operator=(class BlockStateRegistry const &) = delete; + BlockStateRegistry(class BlockStateRegistry const &) = delete; + BlockStateRegistry() = delete; +#endif + +public: + /** + * @symbol ?get\@BlockStateRegistry\@\@SAAEAV1\@XZ + */ + MCAPI static class BlockStateRegistry & get(); + +}; diff --git a/LiteLoader/include/llapi/mc/BlockStateVariant.hpp b/LiteLoader/include/llapi/mc/BlockStateVariant.hpp deleted file mode 100644 index dade5e10fb..0000000000 --- a/LiteLoader/include/llapi/mc/BlockStateVariant.hpp +++ /dev/null @@ -1,48 +0,0 @@ -/** - * @file BlockStateVariant.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class BlockStateVariant. - * - */ -class BlockStateVariant { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKSTATEVARIANT -public: - class BlockStateVariant& operator=(class BlockStateVariant const &) = delete; - BlockStateVariant(class BlockStateVariant const &) = delete; - BlockStateVariant() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?toNBT\@BlockStateVariant\@\@UEBAXAEAVCompoundTag\@\@H\@Z - */ - virtual void toNBT(class CompoundTag &, int) const; - /** - * @vftbl 2 - * @symbol ?fromNBT\@BlockStateVariant\@\@UEBA_NAEBVCompoundTag\@\@AEAH\@Z - */ - virtual bool fromNBT(class CompoundTag const &, int &) const; - -}; diff --git a/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp b/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp index 7a1572728b..cc667d0ba2 100644 --- a/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp +++ b/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp @@ -40,14 +40,14 @@ class TickDataSet { * @symbol ?acquireAllRandomTicks\@BlockTickingQueue\@\@QEAAXAEAVLevelChunk\@\@\@Z */ MCAPI void acquireAllRandomTicks(class LevelChunk &); - /** - * @symbol ?acquireAllTicks\@BlockTickingQueue\@\@QEAAXAEAV1\@\@Z - */ - MCAPI void acquireAllTicks(class BlockTickingQueue &); /** * @symbol ?acquireAllTicks\@BlockTickingQueue\@\@QEAAXAEAVLevelChunk\@\@\@Z */ MCAPI void acquireAllTicks(class LevelChunk &); + /** + * @symbol ?acquireAllTicks\@BlockTickingQueue\@\@QEAAXAEAV1\@\@Z + */ + MCAPI void acquireAllTicks(class BlockTickingQueue &); /** * @symbol ?add\@BlockTickingQueue\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@HH\@Z */ @@ -64,6 +64,10 @@ class TickDataSet { * @symbol ?eliminateDuplicatesOf\@BlockTickingQueue\@\@QEAAXAEBVBlockLegacy\@\@\@Z */ MCAPI void eliminateDuplicatesOf(class BlockLegacy const &); + /** + * @symbol ?finishInstaticking\@BlockTickingQueue\@\@QEAAXXZ + */ + MCAPI void finishInstaticking(); /** * @symbol ?getNextUpdateForPos\@BlockTickingQueue\@\@QEBA_NAEBVBlockPos\@\@AEAUTick\@\@\@Z */ @@ -76,42 +80,22 @@ class TickDataSet { * @symbol ?getTickDelaysInArea\@BlockTickingQueue\@\@QEBA?AV?$unordered_multimap\@VBlockPos\@\@UTickDelayBlock\@\@U?$hash\@VBlockPos\@\@\@std\@\@U?$equal_to\@VBlockPos\@\@\@4\@V?$allocator\@U?$pair\@$$CBVBlockPos\@\@UTickDelayBlock\@\@\@std\@\@\@4\@\@std\@\@AEBVBoundingBox\@\@\@Z */ MCAPI class std::unordered_multimap, struct std::equal_to, class std::allocator>> getTickDelaysInArea(class BoundingBox const &) const; - /** - * @symbol ?hasTickInCurrentTick\@BlockTickingQueue\@\@QEBA_NAEBVBlockPos\@\@\@Z - */ - MCAPI bool hasTickInCurrentTick(class BlockPos const &) const; /** * @symbol ?hasTickInPendingTicks\@BlockTickingQueue\@\@QEBA_NAEBVBlockPos\@\@\@Z */ MCAPI bool hasTickInPendingTicks(class BlockPos const &) const; - /** - * @symbol ?isBlockInPendingTick\@BlockTickingQueue\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z - */ - MCAPI bool isBlockInPendingTick(class BlockPos const &, class Block const &) const; - /** - * @symbol ?isBlockInPendingTick\@BlockTickingQueue\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@\@Z - */ - MCAPI bool isBlockInPendingTick(class BlockPos const &, class BlockLegacy const &) const; /** * @symbol ?isEmpty\@BlockTickingQueue\@\@QEBA_NXZ */ MCAPI bool isEmpty() const; - /** - * @symbol ?isInstaticking\@BlockTickingQueue\@\@QEBA_NXZ - */ - MCAPI bool isInstaticking() const; /** * @symbol ?load\@BlockTickingQueue\@\@QEAAXAEBVCompoundTag\@\@AEBVBlockPalette\@\@\@Z */ MCAPI void load(class CompoundTag const &, class BlockPalette const &); /** - * @symbol ?remove\@BlockTickingQueue\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z - */ - MCAPI void remove(class BlockPos const &, class Block const &); - /** - * @symbol ?remove\@BlockTickingQueue\@\@QEAAX$$QEAV?$function\@$$A6A_NAEBVTickNextTickData\@\@\@Z\@std\@\@\@Z + * @symbol ?remove\@BlockTickingQueue\@\@QEAAXAEBV?$function\@$$A6A_NAEBVTickNextTickData\@\@\@Z\@std\@\@\@Z */ - MCAPI void remove(class std::function &&); + MCAPI void remove(class std::function const &); /** * @symbol ?save\@BlockTickingQueue\@\@QEBAXAEAVCompoundTag\@\@\@Z */ @@ -152,6 +136,10 @@ class TickDataSet { * @symbol ?_addToNextTickQueue\@BlockTickingQueue\@\@AEAAXAEBVBlockPos\@\@AEBVBlock\@\@HH\@Z */ MCAPI void _addToNextTickQueue(class BlockPos const &, class Block const &, int, int); + /** + * @symbol ?_eliminateTicksForZeroAndAbove\@BlockTickingQueue\@\@AEAAXAEAVTickDataSet\@1\@\@Z + */ + MCAPI void _eliminateTicksForZeroAndAbove(class BlockTickingQueue::TickDataSet &); protected: diff --git a/LiteLoader/include/llapi/mc/BlockTransformationComponent.hpp b/LiteLoader/include/llapi/mc/BlockTransformationComponent.hpp new file mode 100644 index 0000000000..25beb45a2f --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockTransformationComponent.hpp @@ -0,0 +1,40 @@ +/** + * @file BlockTransformationComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BlockTransformationComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKTRANSFORMATIONCOMPONENT +public: + class BlockTransformationComponent& operator=(class BlockTransformationComponent const &) = delete; + BlockTransformationComponent(class BlockTransformationComponent const &) = delete; + BlockTransformationComponent() = delete; +#endif + +public: + /** + * @symbol ??0BlockTransformationComponent\@\@QEAA\@AEBVVec3\@\@AEBURotationType\@0\@0\@Z + */ + MCAPI BlockTransformationComponent(class Vec3 const &, struct BlockTransformationComponent::RotationType const &, class Vec3 const &); + /** + * @symbol ??0BlockTransformationComponent\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI BlockTransformationComponent(class BlockTransformationComponent &&); + /** + * @symbol ?getTransformationMatrix\@BlockTransformationComponent\@\@QEBAAEBVMatrix\@\@XZ + */ + MCAPI class Matrix const & getTransformationMatrix() const; + +}; diff --git a/LiteLoader/include/llapi/mc/BlockTransformationDescription.hpp b/LiteLoader/include/llapi/mc/BlockTransformationDescription.hpp new file mode 100644 index 0000000000..d1854d891d --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockTransformationDescription.hpp @@ -0,0 +1,74 @@ +/** + * @file BlockTransformationDescription.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct BlockTransformationDescription { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKTRANSFORMATIONDESCRIPTION +public: + struct BlockTransformationDescription& operator=(struct BlockTransformationDescription const &) = delete; + BlockTransformationDescription(struct BlockTransformationDescription const &) = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?getName\@BlockTransformationDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + virtual std::string const & getName() const; + /** + * @vftbl 2 + * @symbol ?initializeComponent\@BlockTransformationDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + */ + virtual void initializeComponent(class EntityContext &) const; + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockTransformationDescription\@\@UEBA_NXZ + */ + virtual bool isNetworkComponent() const; + /** + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockTransformationDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + */ + virtual std::unique_ptr buildNetworkTag() const; + /** + * @vftbl 6 + * @symbol ?initializeFromNetwork\@BlockTransformationDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + */ + virtual void initializeFromNetwork(class CompoundTag const &); + /** + * @symbol ??0BlockTransformationDescription\@\@QEAA\@XZ + */ + MCAPI BlockTransformationDescription(); + /** + * @symbol ?NameID\@BlockTransformationDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI static std::string const NameID; + /** + * @symbol ?bindType\@BlockTransformationDescription\@\@SAXXZ + */ + MCAPI static void bindType(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp b/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp index b26965b9df..6b8b46d882 100644 --- a/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp +++ b/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp @@ -48,9 +48,9 @@ class BlockTypeRegistry { */ MCAPI static class HashedString const & getBlockNameFromNameHash(unsigned __int64); /** - * @symbol ?getComplexAliasPostSplitBlockNames\@BlockTypeRegistry\@\@SAAEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@AEBVHashedString\@\@\@Z + * @symbol ?getComplexAliasPostSplitBlockNames\@BlockTypeRegistry\@\@SAAEBV?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@AEBVHashedString\@\@\@Z */ - MCAPI static std::vector const & getComplexAliasPostSplitBlockNames(class HashedString const &); + MCAPI static std::vector> const & getComplexAliasPostSplitBlockNames(class HashedString const &); /** * @symbol ?getDefaultBlockState\@BlockTypeRegistry\@\@SAAEBVBlock\@\@AEBVHashedString\@\@_N\@Z */ @@ -83,14 +83,14 @@ class BlockTypeRegistry { * @symbol ?lookupByName\@BlockTypeRegistry\@\@SA?AV?$WeakPtr\@VBlockLegacy\@\@\@\@AEBVHashedString\@\@_N\@Z */ MCAPI static class WeakPtr lookupByName(class HashedString const &, bool); - /** - * @symbol ?lookupByName\@BlockTypeRegistry\@\@SAPEBVBlock\@\@AEBVHashedString\@\@AEBV?$vector\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@V?$allocator\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@\@std\@\@\@std\@\@_N\@Z - */ - MCAPI static class Block const * lookupByName(class HashedString const &, std::vector const &, bool); /** * @symbol ?lookupByName\@BlockTypeRegistry\@\@SAPEBVBlock\@\@AEBVHashedString\@\@H_N\@Z */ MCAPI static class Block const * lookupByName(class HashedString const &, int, bool); + /** + * @symbol ?lookupByName\@BlockTypeRegistry\@\@SAPEBVBlock\@\@AEBVHashedString\@\@AEBV?$vector\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@V?$allocator\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@\@std\@\@\@std\@\@_N\@Z + */ + MCAPI static class Block const * lookupByName(class HashedString const &, std::vector const &, bool); /** * @symbol ?prepareBlocks\@BlockTypeRegistry\@\@SAXI\@Z */ @@ -100,9 +100,9 @@ class BlockTypeRegistry { */ MCAPI static void registerAlias(class HashedString const &, class HashedString const &); /** - * @symbol ?registerComplexAlias\@BlockTypeRegistry\@\@SAXAEBVHashedString\@\@V?$function\@$$A6APEBVBlock\@\@H\@Z\@std\@\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@4\@AEBVBaseGameVersion\@\@\@Z + * @symbol ?registerComplexAlias\@BlockTypeRegistry\@\@SAXAEBVHashedString\@\@V?$function\@$$A6APEBVBlock\@\@H\@Z\@std\@\@AEBV?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@4\@AEBVBaseGameVersion\@\@\@Z */ - MCAPI static void registerComplexAlias(class HashedString const &, class std::function, std::vector const &, class BaseGameVersion const &); + MCAPI static void registerComplexAlias(class HashedString const &, class std::function, std::vector> const &, class BaseGameVersion const &); /** * @symbol ?unregisterBlock\@BlockTypeRegistry\@\@SAXAEBVHashedString\@\@\@Z */ @@ -117,10 +117,6 @@ class BlockTypeRegistry { * @symbol ?_lookupByNameImpl\@BlockTypeRegistry\@\@CA?AULookupByNameImplReturnType\@1\@AEBVHashedString\@\@HW4LookupByNameImplResolve\@1\@_N\@Z */ MCAPI static struct BlockTypeRegistry::LookupByNameImplReturnType _lookupByNameImpl(class HashedString const &, int, enum class BlockTypeRegistry::LookupByNameImplResolve, bool); - /** - * @symbol ?_lookupByNameImplSetNewBlockStates\@BlockTypeRegistry\@\@CAPEBVBlock\@\@AEBV2\@AEBV?$vector\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@V?$allocator\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI static class Block const * _lookupByNameImplSetNewBlockStates(class Block const &, std::vector const &); private: /** @@ -132,9 +128,9 @@ class BlockTypeRegistry { */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mBlockComplexAliasLookupMap; /** - * @symbol ?mBlockComplexAliasPostSplitBlockNamesLookupMap\@BlockTypeRegistry\@\@0V?$map\@VHashedString\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@U?$less\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@A + * @symbol ?mBlockComplexAliasPostSplitBlockNamesLookupMap\@BlockTypeRegistry\@\@0V?$map\@VHashedString\@\@V?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@U?$less\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@A */ - MCAPI static class std::map, struct std::less, class std::allocator>>> mBlockComplexAliasPostSplitBlockNamesLookupMap; + MCAPI static class std::map>, struct std::less, class std::allocator>>>> mBlockComplexAliasPostSplitBlockNamesLookupMap; /** * @symbol ?mBlockLookupMap\@BlockTypeRegistry\@\@0V?$map\@VHashedString\@\@V?$SharedPtr\@VBlockLegacy\@\@\@\@U?$less\@VHashedString\@\@\@std\@\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$SharedPtr\@VBlockLegacy\@\@\@\@\@std\@\@\@4\@\@std\@\@A */ diff --git a/LiteLoader/include/llapi/mc/BlockTypeRegistryModificationsLock.hpp b/LiteLoader/include/llapi/mc/BlockTypeRegistryModificationsLock.hpp index 28a240f0f6..0ce67c17fc 100644 --- a/LiteLoader/include/llapi/mc/BlockTypeRegistryModificationsLock.hpp +++ b/LiteLoader/include/llapi/mc/BlockTypeRegistryModificationsLock.hpp @@ -32,12 +32,4 @@ class BlockTypeRegistryModificationsLock { */ MCAPI ~BlockTypeRegistryModificationsLock(); -//private: - /** - * @symbol ??0BlockTypeRegistryModificationsLock\@\@AEAA\@V?$shared_ptr\@VBlockTypeRegistryRWLock\@\@\@std\@\@\@Z - */ - MCAPI BlockTypeRegistryModificationsLock(class std::shared_ptr); - -private: - }; diff --git a/LiteLoader/include/llapi/mc/BlockTypeRegistryReadLock.hpp b/LiteLoader/include/llapi/mc/BlockTypeRegistryReadLock.hpp index f9fcd56a48..1b59b783c4 100644 --- a/LiteLoader/include/llapi/mc/BlockTypeRegistryReadLock.hpp +++ b/LiteLoader/include/llapi/mc/BlockTypeRegistryReadLock.hpp @@ -32,12 +32,4 @@ class BlockTypeRegistryReadLock { */ MCAPI ~BlockTypeRegistryReadLock(); -//private: - /** - * @symbol ??0BlockTypeRegistryReadLock\@\@AEAA\@V?$shared_ptr\@VBlockTypeRegistryRWLock\@\@\@std\@\@\@Z - */ - MCAPI BlockTypeRegistryReadLock(class std::shared_ptr); - -private: - }; diff --git a/LiteLoader/include/llapi/mc/BlockUnitCubeComponent.hpp b/LiteLoader/include/llapi/mc/BlockUnitCubeComponent.hpp index 92bff12236..b94c540b79 100644 --- a/LiteLoader/include/llapi/mc/BlockUnitCubeComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockUnitCubeComponent.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class BlockUnitCubeComponent { +struct BlockUnitCubeComponent { #define AFTER_EXTRA // Add Member There @@ -20,8 +20,8 @@ class BlockUnitCubeComponent { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKUNITCUBECOMPONENT public: - class BlockUnitCubeComponent& operator=(class BlockUnitCubeComponent const &) = delete; - BlockUnitCubeComponent(class BlockUnitCubeComponent const &) = delete; + struct BlockUnitCubeComponent& operator=(struct BlockUnitCubeComponent const &) = delete; + BlockUnitCubeComponent(struct BlockUnitCubeComponent const &) = delete; BlockUnitCubeComponent() = delete; #endif @@ -31,4 +31,4 @@ class BlockUnitCubeComponent { */ MCAPI static class std::shared_ptr mBlockSchematic; -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockUnitCubeDescription.hpp b/LiteLoader/include/llapi/mc/BlockUnitCubeDescription.hpp index 2c403619aa..f9861404ca 100644 --- a/LiteLoader/include/llapi/mc/BlockUnitCubeDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockUnitCubeDescription.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class BlockUnitCubeDescription { +struct BlockUnitCubeDescription { #define AFTER_EXTRA // Add Member There @@ -20,8 +20,8 @@ class BlockUnitCubeDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKUNITCUBEDESCRIPTION public: - class BlockUnitCubeDescription& operator=(class BlockUnitCubeDescription const &) = delete; - BlockUnitCubeDescription(class BlockUnitCubeDescription const &) = delete; + struct BlockUnitCubeDescription& operator=(struct BlockUnitCubeDescription const &) = delete; + BlockUnitCubeDescription(struct BlockUnitCubeDescription const &) = delete; BlockUnitCubeDescription() = delete; #endif @@ -65,4 +65,4 @@ class BlockUnitCubeDescription { */ MCAPI static void bindType(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlueFireBlock.hpp b/LiteLoader/include/llapi/mc/BlueFireBlock.hpp index abde8d6988..1aa4aa0075 100644 --- a/LiteLoader/include/llapi/mc/BlueFireBlock.hpp +++ b/LiteLoader/include/llapi/mc/BlueFireBlock.hpp @@ -206,25 +206,25 @@ class BlueFireBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 - * @symbol ?animateTick\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 152 + * @symbol ?animateTick\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -237,39 +237,44 @@ class BlueFireBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@BlueFireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLUEFIREBLOCK /** * @symbol ?canBeSilkTouched\@BlueFireBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/BlueIceBlock.hpp b/LiteLoader/include/llapi/mc/BlueIceBlock.hpp index 45da70b0a6..d05e337608 100644 --- a/LiteLoader/include/llapi/mc/BlueIceBlock.hpp +++ b/LiteLoader/include/llapi/mc/BlueIceBlock.hpp @@ -176,20 +176,20 @@ class BlueIceBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,27 +201,32 @@ class BlueIceBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 189 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 190 * @symbol ?getResourceCount\@BlueIceBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/BoatItem.hpp b/LiteLoader/include/llapi/mc/BoatItem.hpp index c0a322fe34..f67bd732f8 100644 --- a/LiteLoader/include/llapi/mc/BoatItem.hpp +++ b/LiteLoader/include/llapi/mc/BoatItem.hpp @@ -133,9 +133,9 @@ class BoatItem : public Item { virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** * @vftbl 132 - * @symbol ?_useOn\@BoatItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@BoatItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @vftbl 133 * @symbol ?_getActorType\@BoatItem\@\@EEBA?AW4ActorType\@\@XZ diff --git a/LiteLoader/include/llapi/mc/BoatPaddleInputSystem.hpp b/LiteLoader/include/llapi/mc/BoatPaddleInputSystem.hpp index 1664052636..0d1f154789 100644 --- a/LiteLoader/include/llapi/mc/BoatPaddleInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/BoatPaddleInputSystem.hpp @@ -16,10 +16,6 @@ namespace BoatPaddleInputSystem { #define AFTER_EXTRA #undef AFTER_EXTRA - /** - * @symbol ?createSideBySideSystem\@BoatPaddleInputSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI struct TickingSystemWithInfo createSideBySideSystem(); /** * @symbol ?createSystem\@BoatPaddleInputSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BodyControlComponent.hpp b/LiteLoader/include/llapi/mc/BodyControlComponent.hpp deleted file mode 100644 index 59c81e037a..0000000000 --- a/LiteLoader/include/llapi/mc/BodyControlComponent.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file BodyControlComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class BodyControlComponent. - * - */ -class BodyControlComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BODYCONTROLCOMPONENT -public: - class BodyControlComponent& operator=(class BodyControlComponent const &) = delete; - BodyControlComponent(class BodyControlComponent const &) = delete; - BodyControlComponent() = delete; -#endif - -public: - /** - * @symbol ??1BodyControlComponent\@\@QEAA\@XZ - */ - MCAPI ~BodyControlComponent(); - -}; diff --git a/LiteLoader/include/llapi/mc/BoneAnimation.hpp b/LiteLoader/include/llapi/mc/BoneAnimation.hpp deleted file mode 100644 index de30b3c1e2..0000000000 --- a/LiteLoader/include/llapi/mc/BoneAnimation.hpp +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @file BoneAnimation.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class BoneAnimation. - * - */ -class BoneAnimation { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BONEANIMATION -public: - class BoneAnimation& operator=(class BoneAnimation const &) = delete; - BoneAnimation(class BoneAnimation const &) = delete; - BoneAnimation() = delete; -#endif - -public: - /** - * @symbol ?addAnimationChannel\@BoneAnimation\@\@QEAAAEAVBoneAnimationChannel\@\@W4BoneTransformType\@\@\@Z - */ - MCAPI class BoneAnimationChannel & addAnimationChannel(enum class BoneTransformType); - /** - * @symbol ?setRotationRelativeMode\@BoneAnimation\@\@QEAAXW4BoneAnimationRelativeMode\@\@\@Z - */ - MCAPI void setRotationRelativeMode(enum class BoneAnimationRelativeMode); - -}; diff --git a/LiteLoader/include/llapi/mc/BoneAnimationChannel.hpp b/LiteLoader/include/llapi/mc/BoneAnimationChannel.hpp deleted file mode 100644 index 2dcdc2e3cc..0000000000 --- a/LiteLoader/include/llapi/mc/BoneAnimationChannel.hpp +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @file BoneAnimationChannel.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class BoneAnimationChannel. - * - */ -class BoneAnimationChannel { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BONEANIMATIONCHANNEL -public: - class BoneAnimationChannel& operator=(class BoneAnimationChannel const &) = delete; - BoneAnimationChannel(class BoneAnimationChannel const &) = delete; - BoneAnimationChannel() = delete; -#endif - -public: - /** - * @symbol ?addKeyFrame\@BoneAnimationChannel\@\@QEAAAEAVKeyFrameTransform\@\@M\@Z - */ - MCAPI class KeyFrameTransform & addKeyFrame(float); - /** - * @symbol ?sortKeyFrames\@BoneAnimationChannel\@\@QEAAXXZ - */ - MCAPI void sortKeyFrames(); - -}; diff --git a/LiteLoader/include/llapi/mc/BoneOrientation.hpp b/LiteLoader/include/llapi/mc/BoneOrientation.hpp index 08212b9da1..1bf4b46c5a 100644 --- a/LiteLoader/include/llapi/mc/BoneOrientation.hpp +++ b/LiteLoader/include/llapi/mc/BoneOrientation.hpp @@ -25,14 +25,13 @@ class BoneOrientation { public: class BoneOrientation& operator=(class BoneOrientation const &) = delete; BoneOrientation(class BoneOrientation const &) = delete; - BoneOrientation() = delete; #endif public: /** - * @symbol ?applyShortestPathBlend\@BoneOrientation\@\@QEAAXAEBV1\@0MM\@Z + * @symbol ??0BoneOrientation\@\@QEAA\@XZ */ - MCAPI void applyShortestPathBlend(class BoneOrientation const &, class BoneOrientation const &, float, float); + MCAPI BoneOrientation(); /** * @symbol ?getName\@BoneOrientation\@\@QEBAAEBVHashedString\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BoneOrientationTransform.hpp b/LiteLoader/include/llapi/mc/BoneOrientationTransform.hpp deleted file mode 100644 index be4724accf..0000000000 --- a/LiteLoader/include/llapi/mc/BoneOrientationTransform.hpp +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @file BoneOrientationTransform.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class BoneOrientationTransform. - * - */ -class BoneOrientationTransform { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BONEORIENTATIONTRANSFORM -public: - class BoneOrientationTransform& operator=(class BoneOrientationTransform const &) = delete; - BoneOrientationTransform(class BoneOrientationTransform const &) = delete; -#endif - -public: - /** - * @symbol ??0BoneOrientationTransform\@\@QEAA\@XZ - */ - MCAPI BoneOrientationTransform(); - -}; diff --git a/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp b/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp index 84f6c46baf..f40b76e0cf 100644 --- a/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp +++ b/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp @@ -37,9 +37,9 @@ class BookCloningRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@BookCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @symbol ?assemble\@BookCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &) const; + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@BookCloningRecipe\@\@UEBAHXZ @@ -55,6 +55,11 @@ class BookCloningRecipe : public Recipe { * @symbol ?getResultItem\@BookCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; + /** + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); /** * @vftbl 6 * @symbol ?matches\@BookCloningRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/BookEditPacket.hpp b/LiteLoader/include/llapi/mc/BookEditPacket.hpp index 801cc1e86d..ca7e96a062 100644 --- a/LiteLoader/include/llapi/mc/BookEditPacket.hpp +++ b/LiteLoader/include/llapi/mc/BookEditPacket.hpp @@ -59,14 +59,14 @@ class BookEditPacket : public Packet { */ MCVAPI ~BookEditPacket(); #endif - /** - * @symbol ??0BookEditPacket\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI BookEditPacket(class BookEditPacket const &); /** * @symbol ??0BookEditPacket\@\@QEAA\@XZ */ MCAPI BookEditPacket(); + /** + * @symbol ??0BookEditPacket\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI BookEditPacket(class BookEditPacket const &); /** * @symbol ?getPage\@BookEditPacket\@\@QEBA?AUPageContent\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BookshelfBlock.hpp b/LiteLoader/include/llapi/mc/BookshelfBlock.hpp index 1bb524eded..e6e47c44e6 100644 --- a/LiteLoader/include/llapi/mc/BookshelfBlock.hpp +++ b/LiteLoader/include/llapi/mc/BookshelfBlock.hpp @@ -176,25 +176,25 @@ class BookshelfBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 - * @symbol ?animateTick\@BookshelfBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 152 + * @symbol ?animateTick\@BookshelfBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,32 +206,37 @@ class BookshelfBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@BookshelfBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@BookshelfBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/BoolOption.hpp b/LiteLoader/include/llapi/mc/BoolOption.hpp index bb8b89f450..dd154ecbe1 100644 --- a/LiteLoader/include/llapi/mc/BoolOption.hpp +++ b/LiteLoader/include/llapi/mc/BoolOption.hpp @@ -46,18 +46,6 @@ class BoolOption : public Option { * @symbol ?load\@BoolOption\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void load(std::string const &); - /** - * @symbol ??0BoolOption\@\@QEAA\@W4OptionID\@\@W4OptionOwnerType\@\@W4OptionResetFlags\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@3_N\@Z - */ - MCAPI BoolOption(enum class OptionID, enum class OptionOwnerType, enum class OptionResetFlags, std::string const &, std::string const &, bool); - /** - * @symbol ?getValue\@BoolOption\@\@QEBA_NXZ - */ - MCAPI bool getValue() const; - /** - * @symbol ?set\@BoolOption\@\@QEAAX_N0\@Z - */ - MCAPI void set(bool, bool); //private: /** diff --git a/LiteLoader/include/llapi/mc/BorderBlock.hpp b/LiteLoader/include/llapi/mc/BorderBlock.hpp index 4a7c44c962..83f3c50e8b 100644 --- a/LiteLoader/include/llapi/mc/BorderBlock.hpp +++ b/LiteLoader/include/llapi/mc/BorderBlock.hpp @@ -186,50 +186,50 @@ class BorderBlock : public WallBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@BorderBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 142 + * @vftbl 143 * @symbol ?getVisualShapeInWorld\@BorderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; /** - * @vftbl 143 + * @vftbl 144 * @symbol ?getVisualShape\@BorderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@BorderBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -242,31 +242,36 @@ class BorderBlock : public WallBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@BorderBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/BossEventSubscriptionManager.hpp b/LiteLoader/include/llapi/mc/BossEventSubscriptionManager.hpp new file mode 100644 index 0000000000..d753381c48 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BossEventSubscriptionManager.hpp @@ -0,0 +1,34 @@ +/** + * @file BossEventSubscriptionManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BossEventSubscriptionManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BOSSEVENTSUBSCRIPTIONMANAGER +public: + class BossEventSubscriptionManager& operator=(class BossEventSubscriptionManager const &) = delete; + BossEventSubscriptionManager(class BossEventSubscriptionManager const &) = delete; + BossEventSubscriptionManager() = delete; +#endif + +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BOSSEVENTSUBSCRIPTIONMANAGER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BossEventSubscriptionManager(); +#endif + +}; diff --git a/LiteLoader/include/llapi/mc/BossEventSubscriptionManagerImpl.hpp b/LiteLoader/include/llapi/mc/BossEventSubscriptionManagerImpl.hpp new file mode 100644 index 0000000000..43d4478b1c --- /dev/null +++ b/LiteLoader/include/llapi/mc/BossEventSubscriptionManagerImpl.hpp @@ -0,0 +1,53 @@ +/** + * @file BossEventSubscriptionManagerImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BossEventSubscriptionManagerImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BOSSEVENTSUBSCRIPTIONMANAGERIMPL +public: + class BossEventSubscriptionManagerImpl& operator=(class BossEventSubscriptionManagerImpl const &) = delete; + BossEventSubscriptionManagerImpl(class BossEventSubscriptionManagerImpl const &) = delete; +#endif + +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BOSSEVENTSUBSCRIPTIONMANAGERIMPL + /** + * @symbol ?areBossEventSubscribersReady\@BossEventSubscriptionManagerImpl\@\@UEBA_NXZ + */ + MCVAPI bool areBossEventSubscribersReady() const; + /** + * @symbol ?broadcastBossEvent\@BossEventSubscriptionManagerImpl\@\@UEAAXW4BossEventUpdateType\@\@\@Z + */ + MCVAPI void broadcastBossEvent(enum class BossEventUpdateType); + /** + * @symbol ?broadcastBossEvent\@BossEventSubscriptionManagerImpl\@\@UEAAXW4BossEventUpdateType\@\@AEBUActorUniqueID\@\@AEBVBossEventPacket\@\@\@Z + */ + MCVAPI void broadcastBossEvent(enum class BossEventUpdateType, struct ActorUniqueID const &, class BossEventPacket const &); + /** + * @symbol ?subscribeToBossEvent\@BossEventSubscriptionManagerImpl\@\@UEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXW4BossEventUpdateType\@\@\@Z\@std\@\@\@Z + */ + MCVAPI class Bedrock::PubSub::Subscription subscribeToBossEvent(class std::function); + /** + * @symbol ?subscribeToBossEvent\@BossEventSubscriptionManagerImpl\@\@UEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXW4BossEventUpdateType\@\@AEBUActorUniqueID\@\@AEBVBossEventPacket\@\@\@Z\@std\@\@\@Z + */ + MCVAPI class Bedrock::PubSub::Subscription subscribeToBossEvent(class std::function); +#endif + /** + * @symbol ??0BossEventSubscriptionManagerImpl\@\@QEAA\@XZ + */ + MCAPI BossEventSubscriptionManagerImpl(); + +}; diff --git a/LiteLoader/include/llapi/mc/BottleItem.hpp b/LiteLoader/include/llapi/mc/BottleItem.hpp index 469ee02598..a112f779d2 100644 --- a/LiteLoader/include/llapi/mc/BottleItem.hpp +++ b/LiteLoader/include/llapi/mc/BottleItem.hpp @@ -113,9 +113,9 @@ class BottleItem : public Item { virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** * @vftbl 132 - * @symbol ?_useOn\@BottleItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@BottleItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0BottleItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/BounceEventingSystem.hpp b/LiteLoader/include/llapi/mc/BounceEventingSystem.hpp index eca791208f..4984b824cf 100644 --- a/LiteLoader/include/llapi/mc/BounceEventingSystem.hpp +++ b/LiteLoader/include/llapi/mc/BounceEventingSystem.hpp @@ -27,6 +27,10 @@ class BounceEventingSystem { #endif public: + /** + * @symbol ?_tickBounceEventingSystem\@BounceEventingSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@$$CBUStateVectorComponent\@\@$$CBUActorUniqueIDComponent\@\@$$CBUEventingDispatcherComponent\@\@UBounceComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UEventingRequestQueueComponent\@\@\@\@\@Z + */ + MCAPI static void _tickBounceEventingSystem(class ViewT, class FlagComponent>, struct StateVectorComponent const, struct ActorUniqueIDComponent const, struct EventingDispatcherComponent const, struct BounceComponent>, class ViewT); /** * @symbol ?createSystem\@BounceEventingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BowEnchant.hpp b/LiteLoader/include/llapi/mc/BowEnchant.hpp index 44dbbf7c0a..fae5a643a0 100644 --- a/LiteLoader/include/llapi/mc/BowEnchant.hpp +++ b/LiteLoader/include/llapi/mc/BowEnchant.hpp @@ -75,10 +75,6 @@ class BowEnchant : public Enchant { * @symbol ?_isValidEnchantmentTypeForCategory\@BowEnchant\@\@EEBA_NW4Type\@Enchant\@\@\@Z */ virtual bool _isValidEnchantmentTypeForCategory(enum class Enchant::Type) const; - /** - * @symbol ??0BowEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2HH\@Z - */ - MCAPI BowEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, int); //private: diff --git a/LiteLoader/include/llapi/mc/BrazeSDKManager.hpp b/LiteLoader/include/llapi/mc/BrazeSDKManager.hpp index be79a2090b..c6342bccc9 100644 --- a/LiteLoader/include/llapi/mc/BrazeSDKManager.hpp +++ b/LiteLoader/include/llapi/mc/BrazeSDKManager.hpp @@ -50,4 +50,20 @@ class BrazeSDKManager { MCVAPI void setBrazeId(std::string const &); #endif +//private: + +private: + /** + * @symbol ?mInitialized\@BrazeSDKManager\@\@0_NA + */ + MCAPI static bool mInitialized; + /** + * @symbol ?mInstance\@BrazeSDKManager\@\@0V?$shared_ptr\@VBrazeSDKManager\@\@\@std\@\@A + */ + MCAPI static class std::shared_ptr mInstance; + /** + * @symbol ?mIsReady\@BrazeSDKManager\@\@0_NA + */ + MCAPI static bool mIsReady; + }; diff --git a/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp b/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp index 1f26638257..97196acfec 100644 --- a/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp +++ b/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp @@ -211,35 +211,35 @@ class BrewingStandBlock : public ActorBlock { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@BrewingStandBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@BrewingStandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@BrewingStandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -251,32 +251,37 @@ class BrewingStandBlock : public ActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 * @symbol ?use\@BrewingStandBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@BrewingStandBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/BrewingStandBlockActor.hpp b/LiteLoader/include/llapi/mc/BrewingStandBlockActor.hpp index 7120bdb390..0b0a88ffce 100644 --- a/LiteLoader/include/llapi/mc/BrewingStandBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BrewingStandBlockActor.hpp @@ -103,10 +103,6 @@ class BrewingStandBlockActor { */ MCVAPI void tick(class BlockSource &); #endif - /** - * @symbol ??0BrewingStandBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z - */ - MCAPI BrewingStandBlockActor(class BlockPos const &); /** * @symbol ?brew\@BrewingStandBlockActor\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/BrewingStandContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/BrewingStandContainerScreenValidator.hpp index 15d0e9c220..57807729f4 100644 --- a/LiteLoader/include/llapi/mc/BrewingStandContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/BrewingStandContainerScreenValidator.hpp @@ -26,6 +26,7 @@ class BrewingStandContainerScreenValidator : public ContainerScreenValidatorBase public: class BrewingStandContainerScreenValidator& operator=(class BrewingStandContainerScreenValidator const &) = delete; BrewingStandContainerScreenValidator(class BrewingStandContainerScreenValidator const &) = delete; + BrewingStandContainerScreenValidator() = delete; #endif public: @@ -34,9 +35,5 @@ class BrewingStandContainerScreenValidator : public ContainerScreenValidatorBase * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @symbol ??0BrewingStandContainerScreenValidator\@\@QEAA\@XZ - */ - MCAPI BrewingStandContainerScreenValidator(); }; diff --git a/LiteLoader/include/llapi/mc/BrushEffectsCooldownComponent.hpp b/LiteLoader/include/llapi/mc/BrushEffectsCooldownComponent.hpp new file mode 100644 index 0000000000..a56d2d1af1 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BrushEffectsCooldownComponent.hpp @@ -0,0 +1,36 @@ +/** + * @file BrushEffectsCooldownComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BrushEffectsCooldownComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BRUSHEFFECTSCOOLDOWNCOMPONENT +public: + class BrushEffectsCooldownComponent& operator=(class BrushEffectsCooldownComponent const &) = delete; + BrushEffectsCooldownComponent(class BrushEffectsCooldownComponent const &) = delete; + BrushEffectsCooldownComponent() = delete; +#endif + +public: + +//private: + +private: + /** + * @symbol ?EXPIRED_TICK\@BrushEffectsCooldownComponent\@\@0VExpiringTick\@\@B + */ + MCAPI static class ExpiringTick const EXPIRED_TICK; + +}; diff --git a/LiteLoader/include/llapi/mc/BrushItem.hpp b/LiteLoader/include/llapi/mc/BrushItem.hpp index 0de641bf19..40ac7f2758 100644 --- a/LiteLoader/include/llapi/mc/BrushItem.hpp +++ b/LiteLoader/include/llapi/mc/BrushItem.hpp @@ -98,8 +98,8 @@ class BrushItem : public Item { virtual void __unk_vfn_80(); /** * @vftbl 132 - * @symbol ?_useOn\@BrushItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@BrushItem\@\@MEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; }; diff --git a/LiteLoader/include/llapi/mc/SuspiciousSandBlock.hpp b/LiteLoader/include/llapi/mc/BrushableBlock.hpp similarity index 58% rename from LiteLoader/include/llapi/mc/SuspiciousSandBlock.hpp rename to LiteLoader/include/llapi/mc/BrushableBlock.hpp index 35de32bbc6..6c526fce63 100644 --- a/LiteLoader/include/llapi/mc/SuspiciousSandBlock.hpp +++ b/LiteLoader/include/llapi/mc/BrushableBlock.hpp @@ -1,5 +1,5 @@ /** - * @file SuspiciousSandBlock.hpp + * @file BrushableBlock.hpp * */ #pragma once @@ -12,16 +12,16 @@ #undef BEFORE_EXTRA -class SuspiciousSandBlock : public HeavyBlock { +class BrushableBlock : public HeavyBlock { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SUSPICIOUSSANDBLOCK +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BRUSHABLEBLOCK public: - class SuspiciousSandBlock& operator=(class SuspiciousSandBlock const &) = delete; - SuspiciousSandBlock(class SuspiciousSandBlock const &) = delete; - SuspiciousSandBlock() = delete; + class BrushableBlock& operator=(class BrushableBlock const &) = delete; + BrushableBlock(class BrushableBlock const &) = delete; + BrushableBlock() = delete; #endif public: @@ -150,9 +150,24 @@ class SuspiciousSandBlock : public HeavyBlock { * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); + /** + * @vftbl 86 + * @symbol ?onFertilized\@BrushableBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + */ + virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; + /** + * @vftbl 87 + * @symbol ?mayConsumeFertilizer\@BrushableBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z + */ + virtual bool mayConsumeFertilizer(class BlockSource &) const; + /** + * @vftbl 88 + * @symbol ?canBeFertilized\@BrushableBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + */ + virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** * @vftbl 103 - * @symbol ?asItemInstance\@SuspiciousSandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @symbol ?asItemInstance\@BrushableBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** @@ -176,30 +191,30 @@ class SuspiciousSandBlock : public HeavyBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 - * @symbol ?getVariant\@SuspiciousSandBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 152 - * @symbol ?init\@SuspiciousSandBlock\@\@UEAAAEAVBlockLegacy\@\@XZ + * @vftbl 147 + * @symbol ?getVariant\@BrushableBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual class BlockLegacy & init(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 153 + * @symbol ?init\@BrushableBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ - virtual void __unk_vfn_156(); + virtual class BlockLegacy & init(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,63 +226,72 @@ class SuspiciousSandBlock : public HeavyBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 - * @symbol ?tick\@SuspiciousSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 + * @symbol ?tick\@BrushableBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 - * @symbol ?getResourceItem\@SuspiciousSandBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceItem\@BrushableBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 - * @symbol ?getSilkTouchItemInstance\@SuspiciousSandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 191 + * @symbol ?getSilkTouchItemInstance\@BrushableBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 - * @symbol ?getDustColor\@SuspiciousSandBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z + * @vftbl 195 + * @symbol ?getDustColor\@BrushableBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 - * @symbol ?getDustParticleName\@SuspiciousSandBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 196 + * @symbol ?getDustParticleName\@BrushableBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string getDustParticleName(class Block const &) const; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 197 + * @symbol __unk_vfn_197 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_197(); /** - * @vftbl 197 - * @symbol ?onLand\@SuspiciousSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 198 + * @symbol ?onLand\@BrushableBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLand(class BlockSource &, class BlockPos const &) const; /** - * @symbol ??0SuspiciousSandBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BrushableBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI BrushableBlock(std::string const &, int); + /** + * @symbol ?EmptyBrushedBlock\@BrushableBlock\@\@2VHashedString\@\@B */ - MCAPI SuspiciousSandBlock(std::string const &, int); + MCAPI static class HashedString const EmptyBrushedBlock; }; diff --git a/LiteLoader/include/llapi/mc/BrushableBlockActor.hpp b/LiteLoader/include/llapi/mc/BrushableBlockActor.hpp new file mode 100644 index 0000000000..cc600cdc41 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BrushableBlockActor.hpp @@ -0,0 +1,110 @@ +/** + * @file BrushableBlockActor.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BrushableBlockActor { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BRUSHABLEBLOCKACTOR +public: + class BrushableBlockActor& operator=(class BrushableBlockActor const &) = delete; + BrushableBlockActor(class BrushableBlockActor const &) = delete; + BrushableBlockActor() = delete; +#endif + +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BRUSHABLEBLOCKACTOR + /** + * @symbol ?_getUpdatePacket\@BrushableBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + */ + MCVAPI std::unique_ptr _getUpdatePacket(class BlockSource &); + /** + * @symbol ?_onUpdatePacket\@BrushableBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + */ + MCVAPI void _onUpdatePacket(class CompoundTag const &, class BlockSource &); + /** + * @symbol ?getContainerSize\@BrushableBlockActor\@\@UEBAHXZ + */ + MCVAPI int getContainerSize() const; + /** + * @symbol ?getItem\@BrushableBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z + */ + MCVAPI class ItemStack const & getItem(int) const; + /** + * @symbol ?getMaxStackSize\@BrushableBlockActor\@\@UEBAHXZ + */ + MCVAPI int getMaxStackSize() const; + /** + * @symbol ?load\@BrushableBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + */ + MCVAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &); + /** + * @symbol ?onChanged\@BrushableBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + */ + MCVAPI void onChanged(class BlockSource &); + /** + * @symbol ?onRemoved\@BrushableBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + */ + MCVAPI void onRemoved(class BlockSource &); + /** + * @symbol ?save\@BrushableBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + */ + MCVAPI bool save(class CompoundTag &) const; + /** + * @symbol ?serverInitItemStackIds\@BrushableBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + */ + MCVAPI void serverInitItemStackIds(int, int, class std::function); + /** + * @symbol ?setItem\@BrushableBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z + */ + MCVAPI void setItem(int, class ItemStack const &); + /** + * @symbol ?stopOpen\@BrushableBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + */ + MCVAPI void stopOpen(class Player &); +#endif + /** + * @symbol ??0BrushableBlockActor\@\@QEAA\@AEBVHashedString\@\@AEBVBlockPos\@\@W4Placement\@0\@\@Z + */ + MCAPI BrushableBlockActor(class HashedString const &, class BlockPos const &, enum class BrushableBlockActor::Placement); + /** + * @symbol ?brush\@BrushableBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + */ + MCAPI void brush(class BlockSource &, class BlockPos const &, unsigned char); + /** + * @symbol ?update\@BrushableBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI void update(class BlockSource &, class BlockPos const &); + /** + * @symbol ?getLootTableFromVariant\@BrushableBlockActor\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Placement\@1\@\@Z + */ + MCAPI static std::string getLootTableFromVariant(enum class BrushableBlockActor::Placement); + /** + * @symbol ?tryGet\@BrushableBlockActor\@\@SAPEAV1\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI static class BrushableBlockActor * tryGet(class BlockSource &, class BlockPos const &); + +//private: + /** + * @symbol ?_brushingCompleted\@BrushableBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z + */ + MCAPI void _brushingCompleted(class BlockSource &); + /** + * @symbol ?_removeDisplayEntity\@BrushableBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z + */ + MCAPI void _removeDisplayEntity(class BlockSource &); + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/BrushableBlockUtils.hpp b/LiteLoader/include/llapi/mc/BrushableBlockUtils.hpp new file mode 100644 index 0000000000..8d57ef3716 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BrushableBlockUtils.hpp @@ -0,0 +1,24 @@ +/** + * @file BrushableBlockUtils.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace BrushableBlockUtils { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?getBrushedBlock\@BrushableBlockUtils\@\@YAAEBVHashedString\@\@AEBV2\@\@Z + */ + MCAPI class HashedString const & getBrushedBlock(class HashedString const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp b/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp index 8cac8cf6fe..cf0b1e959d 100644 --- a/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp +++ b/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp @@ -231,30 +231,30 @@ class BubbleColumnBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 140 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 141 * @symbol ?onGraphicsModeChanged\@BubbleColumnBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -267,41 +267,46 @@ class BubbleColumnBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@BubbleColumnBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@BubbleColumnBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/BucketItem.hpp b/LiteLoader/include/llapi/mc/BucketItem.hpp index fba4ec6da5..1c599f499b 100644 --- a/LiteLoader/include/llapi/mc/BucketItem.hpp +++ b/LiteLoader/include/llapi/mc/BucketItem.hpp @@ -173,9 +173,9 @@ class BucketItem : public Item { virtual std::string getAuxValuesDescription() const; /** * @vftbl 132 - * @symbol ?_useOn\@BucketItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@BucketItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BUCKETITEM /** * @symbol ?isBucket\@BucketItem\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/BuddingAmethystBlock.hpp b/LiteLoader/include/llapi/mc/BuddingAmethystBlock.hpp index e7315fbbb2..d1272dd623 100644 --- a/LiteLoader/include/llapi/mc/BuddingAmethystBlock.hpp +++ b/LiteLoader/include/llapi/mc/BuddingAmethystBlock.hpp @@ -181,20 +181,20 @@ class BuddingAmethystBlock : public AmethystBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,30 +206,35 @@ class BuddingAmethystBlock : public AmethystBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 172 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?randomTick\@BuddingAmethystBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BUDDINGAMETHYSTBLOCK /** * @symbol ?canBeSilkTouched\@BuddingAmethystBlock\@\@UEBA_NXZ @@ -249,12 +254,4 @@ class BuddingAmethystBlock : public AmethystBlock { */ MCAPI static bool canBudGrowAtPos(class BlockSource &, class BlockPos const &); -//private: - /** - * @symbol ?_canGrowInDirection\@BuddingAmethystBlock\@\@AEBA_NAEBVBlock\@\@E\@Z - */ - MCAPI bool _canGrowInDirection(class Block const &, unsigned char) const; - -private: - }; diff --git a/LiteLoader/include/llapi/mc/BuiltInBlockStates.hpp b/LiteLoader/include/llapi/mc/BuiltInBlockStates.hpp new file mode 100644 index 0000000000..64b8ca3362 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BuiltInBlockStates.hpp @@ -0,0 +1,32 @@ +/** + * @file BuiltInBlockStates.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace BuiltInBlockStates { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?getNumStates\@BuiltInBlockStates\@\@YA_KXZ + */ + MCAPI unsigned __int64 getNumStates(); + /** + * @symbol ?registerBlockStates\@BuiltInBlockStates\@\@YAXXZ + */ + MCAPI void registerBlockStates(); + /** + * @symbol ?unregisterBlockStates\@BuiltInBlockStates\@\@YAXXZ + */ + MCAPI void unregisterBlockStates(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BuoyancyComponent.hpp b/LiteLoader/include/llapi/mc/BuoyancyComponent.hpp index 5ee6ba425e..c7ea8c72c8 100644 --- a/LiteLoader/include/llapi/mc/BuoyancyComponent.hpp +++ b/LiteLoader/include/llapi/mc/BuoyancyComponent.hpp @@ -24,13 +24,10 @@ class BuoyancyComponent { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BUOYANCYCOMPONENT public: class BuoyancyComponent& operator=(class BuoyancyComponent const &) = delete; + BuoyancyComponent(class BuoyancyComponent const &) = delete; #endif public: - /** - * @symbol ??0BuoyancyComponent\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI BuoyancyComponent(class BuoyancyComponent const &); /** * @symbol ??0BuoyancyComponent\@\@QEAA\@XZ */ @@ -67,10 +64,6 @@ class BuoyancyComponent { * @symbol ?needToResurface\@BuoyancyComponent\@\@QEBA_NAEBVActor\@\@\@Z */ MCAPI bool needToResurface(class Actor const &) const; - /** - * @symbol ??4BuoyancyComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z - */ - MCAPI class BuoyancyComponent & operator=(class BuoyancyComponent &&); /** * @symbol ?shouldApplyGravity\@BuoyancyComponent\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/BuryDescription.hpp b/LiteLoader/include/llapi/mc/BuryDescription.hpp deleted file mode 100644 index 1e1d55b94a..0000000000 --- a/LiteLoader/include/llapi/mc/BuryDescription.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file BuryDescription.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class BuryDescription. - * - */ -class BuryDescription { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BURYDESCRIPTION -public: - class BuryDescription& operator=(class BuryDescription const &) = delete; - BuryDescription(class BuryDescription const &) = delete; - BuryDescription() = delete; -#endif - -public: - /** - * @symbol ??0BuryDescription\@\@QEAA\@AEBVBoundingBox\@\@\@Z - */ - MCAPI BuryDescription(class BoundingBox const &); - /** - * @symbol ?calculateContribution\@BuryDescription\@\@QEBAMAEBVBlockPos\@\@\@Z - */ - MCAPI float calculateContribution(class BlockPos const &) const; - -}; diff --git a/LiteLoader/include/llapi/mc/BushBlock.hpp b/LiteLoader/include/llapi/mc/BushBlock.hpp index bc750539be..93285b486f 100644 --- a/LiteLoader/include/llapi/mc/BushBlock.hpp +++ b/LiteLoader/include/llapi/mc/BushBlock.hpp @@ -191,20 +191,20 @@ class BushBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,37 +216,42 @@ class BushBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@BushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@BushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 194 + * @vftbl 195 * @symbol ?checkAlive\@BushBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/ButtonBlock.hpp b/LiteLoader/include/llapi/mc/ButtonBlock.hpp index b3879aed6e..905d69f51c 100644 --- a/LiteLoader/include/llapi/mc/ButtonBlock.hpp +++ b/LiteLoader/include/llapi/mc/ButtonBlock.hpp @@ -207,9 +207,9 @@ class ButtonBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@ButtonBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@ButtonBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 108 * @symbol ?isAttachedTo\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z @@ -236,40 +236,40 @@ class ButtonBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@ButtonBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 144 + * @vftbl 145 * @symbol ?getUIShape\@ButtonBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ virtual class AABB const & getUIShape(class Block const &, class AABB &) const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@ButtonBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 147 + * @vftbl 148 * @symbol ?canSpawnOn\@ButtonBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -282,44 +282,49 @@ class ButtonBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@ButtonBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@ButtonBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BUTTONBLOCK /** * @symbol ?isButtonBlock\@ButtonBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CachedComponentData.hpp b/LiteLoader/include/llapi/mc/CachedComponentData.hpp index 4990d7d96e..9559d472c9 100644 --- a/LiteLoader/include/llapi/mc/CachedComponentData.hpp +++ b/LiteLoader/include/llapi/mc/CachedComponentData.hpp @@ -33,5 +33,9 @@ class CachedComponentData { * @symbol ?cacheComponentData\@CachedComponentData\@\@QEAAXAEBVBlock\@\@\@Z */ MCAPI void cacheComponentData(class Block const &); + /** + * @symbol ??1CachedComponentData\@\@QEAA\@XZ + */ + MCAPI ~CachedComponentData(); }; diff --git a/LiteLoader/include/llapi/mc/CactusBlock.hpp b/LiteLoader/include/llapi/mc/CactusBlock.hpp index ac489f0ecd..1c8d358106 100644 --- a/LiteLoader/include/llapi/mc/CactusBlock.hpp +++ b/LiteLoader/include/llapi/mc/CactusBlock.hpp @@ -201,30 +201,30 @@ class CactusBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 140 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 141 * @symbol ?onGraphicsModeChanged\@CactusBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 158 + * @vftbl 159 * @symbol ?dealsContactDamage\@CactusBlock\@\@UEBA_NAEBVActor\@\@AEBVBlock\@\@_N\@Z */ virtual bool dealsContactDamage(class Actor const &, class Block const &, bool) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -236,40 +236,45 @@ class CactusBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@CactusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@CactusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@CactusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CACTUSBLOCK /** * @symbol ?canBeSilkTouched\@CactusBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CakeBlock.hpp b/LiteLoader/include/llapi/mc/CakeBlock.hpp index e781709e4d..f0c15eb197 100644 --- a/LiteLoader/include/llapi/mc/CakeBlock.hpp +++ b/LiteLoader/include/llapi/mc/CakeBlock.hpp @@ -201,30 +201,30 @@ class CakeBlock : public BlockLegacy { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@CakeBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@CakeBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -236,40 +236,45 @@ class CakeBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@CakeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@CakeBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@CakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAKEBLOCK /** * @symbol ?canBeSilkTouched\@CakeBlock\@\@EEBA_NXZ @@ -284,10 +289,6 @@ class CakeBlock : public BlockLegacy { * @symbol ??0CakeBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CakeBlock(std::string const &, int); - /** - * @symbol ?getComparatorSignalFromBites\@CakeBlock\@\@SAHH\@Z - */ - MCAPI static int getComparatorSignalFromBites(int); /** * @symbol ?removeCakeSlice\@CakeBlock\@\@SAXAEAVPlayer\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@PEBVBlock\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlock.hpp b/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlock.hpp new file mode 100644 index 0000000000..d43ddf5124 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlock.hpp @@ -0,0 +1,257 @@ +/** + * @file CalibratedSculkSensorBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "SculkSensorBlock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CalibratedSculkSensorBlock : public SculkSensorBlock { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CALIBRATEDSCULKSENSORBLOCK +public: + class CalibratedSculkSensorBlock& operator=(class CalibratedSculkSensorBlock const &) = delete; + CalibratedSculkSensorBlock(class CalibratedSculkSensorBlock const &) = delete; + CalibratedSculkSensorBlock() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); + /** + * @vftbl 29 + * @symbol __unk_vfn_29 + */ + virtual void __unk_vfn_29(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); + /** + * @vftbl 32 + * @symbol __unk_vfn_32 + */ + virtual void __unk_vfn_32(); + /** + * @vftbl 33 + * @symbol __unk_vfn_33 + */ + virtual void __unk_vfn_33(); + /** + * @vftbl 34 + * @symbol __unk_vfn_34 + */ + virtual void __unk_vfn_34(); + /** + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 37 + * @symbol __unk_vfn_37 + */ + virtual void __unk_vfn_37(); + /** + * @vftbl 38 + * @symbol __unk_vfn_38 + */ + virtual void __unk_vfn_38(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 + * @symbol __unk_vfn_40 + */ + virtual void __unk_vfn_40(); + /** + * @vftbl 41 + * @symbol __unk_vfn_41 + */ + virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); + /** + * @vftbl 44 + * @symbol __unk_vfn_44 + */ + virtual void __unk_vfn_44(); + /** + * @vftbl 45 + * @symbol __unk_vfn_45 + */ + virtual void __unk_vfn_45(); + /** + * @vftbl 46 + * @symbol __unk_vfn_46 + */ + virtual void __unk_vfn_46(); + /** + * @vftbl 47 + * @symbol __unk_vfn_47 + */ + virtual void __unk_vfn_47(); + /** + * @vftbl 48 + * @symbol __unk_vfn_48 + */ + virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 54 + * @symbol __unk_vfn_54 + */ + virtual void __unk_vfn_54(); + /** + * @vftbl 60 + * @symbol __unk_vfn_60 + */ + virtual void __unk_vfn_60(); + /** + * @vftbl 61 + * @symbol __unk_vfn_61 + */ + virtual void __unk_vfn_61(); + /** + * @vftbl 75 + * @symbol __unk_vfn_75 + */ + virtual void __unk_vfn_75(); + /** + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@CalibratedSculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 82 + * @symbol __unk_vfn_82 + */ + virtual void __unk_vfn_82(); + /** + * @vftbl 105 + * @symbol __unk_vfn_105 + */ + virtual void __unk_vfn_105(); + /** + * @vftbl 106 + * @symbol ?getPlacementBlock\@CalibratedSculkSensorBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + */ + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + /** + * @vftbl 123 + * @symbol __unk_vfn_123 + */ + virtual void __unk_vfn_123(); + /** + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 + * @symbol __unk_vfn_126 + */ + virtual void __unk_vfn_126(); + /** + * @vftbl 129 + * @symbol __unk_vfn_129 + */ + virtual void __unk_vfn_129(); + /** + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 + * @symbol ?getVariant\@CalibratedSculkSensorBlock\@\@UEBAHAEBVBlock\@\@\@Z + */ + virtual int getVariant(class Block const &) const; + /** + * @vftbl 150 + * @symbol ?getMappedFace\@CalibratedSculkSensorBlock\@\@UEBAEEAEBVBlock\@\@\@Z + */ + virtual unsigned char getMappedFace(unsigned char, class Block const &) const; + /** + * @vftbl 151 + * @symbol ?getFaceFlip\@CalibratedSculkSensorBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z + */ + virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; + /** + * @vftbl 157 + * @symbol __unk_vfn_157 + */ + virtual void __unk_vfn_157(); + /** + * @vftbl 166 + * @symbol __unk_vfn_166 + */ + virtual void __unk_vfn_166(); + /** + * @vftbl 167 + * @symbol __unk_vfn_167 + */ + virtual void __unk_vfn_167(); + /** + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @symbol ??0CalibratedSculkSensorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI CalibratedSculkSensorBlock(std::string const &, int); + /** + * @symbol ?getInputStrength\@CalibratedSculkSensorBlock\@\@SAHAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI static int getInputStrength(class BlockSource const &, class BlockPos const &); + +}; diff --git a/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlockActor.hpp b/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlockActor.hpp new file mode 100644 index 0000000000..4e663985f2 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlockActor.hpp @@ -0,0 +1,78 @@ +/** + * @file CalibratedSculkSensorBlockActor.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "SculkSensorBlockActor.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CalibratedSculkSensorBlockActor : public SculkSensorBlockActor { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CALIBRATEDSCULKSENSORBLOCKACTOR +public: + class CalibratedSculkSensorBlockActor& operator=(class CalibratedSculkSensorBlockActor const &) = delete; + CalibratedSculkSensorBlockActor(class CalibratedSculkSensorBlockActor const &) = delete; + CalibratedSculkSensorBlockActor() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 12 + * @symbol __unk_vfn_12 + */ + virtual void __unk_vfn_12(); + /** + * @vftbl 18 + * @symbol __unk_vfn_18 + */ + virtual void __unk_vfn_18(); + /** + * @vftbl 31 + * @symbol __unk_vfn_31 + */ + virtual void __unk_vfn_31(); + /** + * @vftbl 32 + * @symbol __unk_vfn_32 + */ + virtual void __unk_vfn_32(); + /** + * @vftbl 33 + * @symbol __unk_vfn_33 + */ + virtual void __unk_vfn_33(); + /** + * @vftbl 34 + * @symbol __unk_vfn_34 + */ + virtual void __unk_vfn_34(); + /** + * @vftbl 35 + * @symbol __unk_vfn_35 + */ + virtual void __unk_vfn_35(); + /** + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @symbol ??0CalibratedSculkSensorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + */ + MCAPI CalibratedSculkSensorBlockActor(class BlockPos const &); + +}; diff --git a/LiteLoader/include/llapi/mc/CalibratedSculkSensorVibrationConfig.hpp b/LiteLoader/include/llapi/mc/CalibratedSculkSensorVibrationConfig.hpp new file mode 100644 index 0000000000..0cbdbb23e0 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CalibratedSculkSensorVibrationConfig.hpp @@ -0,0 +1,39 @@ +/** + * @file CalibratedSculkSensorVibrationConfig.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "SculkSensorVibrationConfig.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CalibratedSculkSensorVibrationConfig : public SculkSensorVibrationConfig { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CALIBRATEDSCULKSENSORVIBRATIONCONFIG +public: + class CalibratedSculkSensorVibrationConfig& operator=(class CalibratedSculkSensorVibrationConfig const &) = delete; + CalibratedSculkSensorVibrationConfig(class CalibratedSculkSensorVibrationConfig const &) = delete; + CalibratedSculkSensorVibrationConfig() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 3 + * @symbol ?shouldListen\@CalibratedSculkSensorVibrationConfig\@\@UEAA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z + */ + virtual bool shouldListen(class BlockSource &, class GameEvent const &, struct GameEventContext const &); + +}; diff --git a/LiteLoader/include/llapi/mc/Camel.hpp b/LiteLoader/include/llapi/mc/Camel.hpp index 348452bbef..c08ceb2f00 100644 --- a/LiteLoader/include/llapi/mc/Camel.hpp +++ b/LiteLoader/include/llapi/mc/Camel.hpp @@ -114,11 +114,6 @@ class Camel : public Animal { * @symbol ?causeFallDamage\@Camel\@\@MEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); - /** - * @vftbl 190 - * @symbol ?canBePulledIntoVehicle\@Camel\@\@UEBA_NXZ - */ - virtual bool canBePulledIntoVehicle() const; /** * @vftbl 192 * @symbol __unk_vfn_192 diff --git a/LiteLoader/include/llapi/mc/CameraBlock.hpp b/LiteLoader/include/llapi/mc/CameraBlock.hpp index 12b70e8c6c..58a9b9cf9a 100644 --- a/LiteLoader/include/llapi/mc/CameraBlock.hpp +++ b/LiteLoader/include/llapi/mc/CameraBlock.hpp @@ -181,20 +181,20 @@ class CameraBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,25 +206,30 @@ class CameraBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); /** * @symbol ??0CameraBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/CameraPreset.hpp b/LiteLoader/include/llapi/mc/CameraPreset.hpp new file mode 100644 index 0000000000..40813f8f12 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CameraPreset.hpp @@ -0,0 +1,43 @@ +/** + * @file CameraPreset.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct CameraPreset { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CAMERAPRESET +public: + CameraPreset(struct CameraPreset const &) = delete; + CameraPreset() = delete; +#endif + +public: + /** + * @symbol ??4CameraPreset\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct CameraPreset & operator=(struct CameraPreset const &); + /** + * @symbol ??4CameraPreset\@\@QEAAAEAU0\@$$QEAU0\@\@Z + */ + MCAPI struct CameraPreset & operator=(struct CameraPreset &&); + /** + * @symbol ??1CameraPreset\@\@QEAA\@XZ + */ + MCAPI ~CameraPreset(); + /** + * @symbol ?bindType\@CameraPreset\@\@SAXXZ + */ + MCAPI static void bindType(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/CameraShakeCommand.hpp b/LiteLoader/include/llapi/mc/CameraShakeCommand.hpp index 4425d340e8..b05d3e6987 100644 --- a/LiteLoader/include/llapi/mc/CameraShakeCommand.hpp +++ b/LiteLoader/include/llapi/mc/CameraShakeCommand.hpp @@ -36,7 +36,7 @@ class CameraShakeCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@CameraShakeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/CampfireBlock.hpp b/LiteLoader/include/llapi/mc/CampfireBlock.hpp index 304d19d854..13575552db 100644 --- a/LiteLoader/include/llapi/mc/CampfireBlock.hpp +++ b/LiteLoader/include/llapi/mc/CampfireBlock.hpp @@ -202,9 +202,9 @@ class CampfireBlock : public ActorBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@CampfireBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@CampfireBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 113 * @symbol ?entityInside\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z @@ -226,45 +226,45 @@ class CampfireBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@CampfireBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 147 + * @vftbl 148 * @symbol ?canSpawnOn\@CampfireBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 153 + * @vftbl 154 * @symbol ?getLightEmission\@CampfireBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -277,46 +277,51 @@ class CampfireBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@CampfireBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@CampfireBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@CampfireBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@CampfireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp b/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp index 57cc209b12..f67bea208c 100644 --- a/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp @@ -110,10 +110,6 @@ class CampfireBlockActor : public BlockActor { * @symbol ?_onUpdatePacket\@CampfireBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); - /** - * @symbol ??0CampfireBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z - */ - MCAPI CampfireBlockActor(class BlockPos const &); /** * @symbol ?dropAllItems\@CampfireBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z */ @@ -144,10 +140,6 @@ class CampfireBlockActor : public BlockActor { * @symbol ?_finishCooking\@CampfireBlockActor\@\@AEAAXAEAVBlockSource\@\@H\@Z */ MCAPI void _finishCooking(class BlockSource &, int); - /** - * @symbol ?_removeItem\@CampfireBlockActor\@\@AEAAXH\@Z - */ - MCAPI void _removeItem(int); private: diff --git a/LiteLoader/include/llapi/mc/CandleBlock.hpp b/LiteLoader/include/llapi/mc/CandleBlock.hpp index aad10c18d0..bfd37d91db 100644 --- a/LiteLoader/include/llapi/mc/CandleBlock.hpp +++ b/LiteLoader/include/llapi/mc/CandleBlock.hpp @@ -186,25 +186,25 @@ class CandleBlock : public AbstractCandleBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@CandleBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 144 + * @symbol ?getVisualShape\@CandleBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,80 +216,60 @@ class CandleBlock : public AbstractCandleBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 * @symbol ?use\@CandleBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@CandleBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@CandleBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?_getNumCandles\@CandleBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int _getNumCandles(class Block const &) const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?_iterateCandles\@CandleBlock\@\@MEBAXAEBVBlock\@\@AEBVBlockPos\@\@V?$function\@$$A6AXAEBVVec3\@\@H\@Z\@std\@\@\@Z */ virtual void _iterateCandles(class Block const &, class BlockPos const &, class std::function) const; /** - * @vftbl 196 + * @vftbl 197 * @symbol ?_tryLightOnFire\@CandleBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void _tryLightOnFire(class BlockSource &, class BlockPos const &, class Actor *) const; - /** - * @vftbl 197 - * @symbol __unk_vfn_197 - */ - virtual void __unk_vfn_197(); - /** - * @vftbl 198 - * @symbol __unk_vfn_198 - */ - virtual void __unk_vfn_198(); - /** - * @vftbl 199 - * @symbol __unk_vfn_199 - */ - virtual void __unk_vfn_199(); - /** - * @vftbl 200 - * @symbol __unk_vfn_200 - */ - virtual void __unk_vfn_200(); - /** - * @vftbl 201 - * @symbol __unk_vfn_201 - */ - virtual void __unk_vfn_201(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CANDLEBLOCK /** * @symbol ?isInteractiveBlock\@CandleBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CandleBlockItem.hpp b/LiteLoader/include/llapi/mc/CandleBlockItem.hpp index a6329f75e3..2249ed0798 100644 --- a/LiteLoader/include/llapi/mc/CandleBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/CandleBlockItem.hpp @@ -108,9 +108,9 @@ class CandleBlockItem : public BlockItem { virtual void __unk_vfn_80(); /** * @vftbl 132 - * @symbol ?_useOn\@CandleBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@CandleBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CANDLEBLOCKITEM /** * @symbol ?isCandle\@CandleBlockItem\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CandleCakeBlock.hpp b/LiteLoader/include/llapi/mc/CandleCakeBlock.hpp index eb3b5e815a..4bc9614f9f 100644 --- a/LiteLoader/include/llapi/mc/CandleCakeBlock.hpp +++ b/LiteLoader/include/llapi/mc/CandleCakeBlock.hpp @@ -201,25 +201,25 @@ class CandleCakeBlock : public AbstractCandleBlock { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@CandleCakeBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 144 + * @symbol ?getVisualShape\@CandleCakeBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -231,85 +231,65 @@ class CandleCakeBlock : public AbstractCandleBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol ?use\@CandleCakeBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual bool use(class Player &, class BlockPos const &, unsigned char) const; + virtual void __unk_vfn_175(); /** * @vftbl 178 - * @symbol __unk_vfn_178 + * @symbol ?use\@CandleCakeBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ - virtual void __unk_vfn_178(); + virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 180 * @symbol ?canSurvive\@CandleCakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@CandleCakeBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@CandleCakeBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?_getNumCandles\@CandleCakeBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int _getNumCandles(class Block const &) const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?_iterateCandles\@CandleCakeBlock\@\@MEBAXAEBVBlock\@\@AEBVBlockPos\@\@V?$function\@$$A6AXAEBVVec3\@\@H\@Z\@std\@\@\@Z */ virtual void _iterateCandles(class Block const &, class BlockPos const &, class std::function) const; /** - * @vftbl 196 + * @vftbl 197 * @symbol ?_tryLightOnFire\@CandleCakeBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void _tryLightOnFire(class BlockSource &, class BlockPos const &, class Actor *) const; - /** - * @vftbl 197 - * @symbol __unk_vfn_197 - */ - virtual void __unk_vfn_197(); - /** - * @vftbl 198 - * @symbol __unk_vfn_198 - */ - virtual void __unk_vfn_198(); - /** - * @vftbl 199 - * @symbol __unk_vfn_199 - */ - virtual void __unk_vfn_199(); - /** - * @vftbl 200 - * @symbol __unk_vfn_200 - */ - virtual void __unk_vfn_200(); - /** - * @vftbl 201 - * @symbol __unk_vfn_201 - */ - virtual void __unk_vfn_201(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CANDLECAKEBLOCK /** * @symbol ?canBeSilkTouched\@CandleCakeBlock\@\@EEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CappedSurfaceAttributes.hpp b/LiteLoader/include/llapi/mc/CappedSurfaceAttributes.hpp index 587278a7de..8e246197b8 100644 --- a/LiteLoader/include/llapi/mc/CappedSurfaceAttributes.hpp +++ b/LiteLoader/include/llapi/mc/CappedSurfaceAttributes.hpp @@ -50,10 +50,6 @@ struct MaterialLayer { * @symbol ??4CappedSurfaceAttributes\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct CappedSurfaceAttributes & operator=(struct CappedSurfaceAttributes &&); - /** - * @symbol ??1CappedSurfaceAttributes\@\@QEAA\@XZ - */ - MCAPI ~CappedSurfaceAttributes(); /** * @symbol ?getRandomBlock\@CappedSurfaceAttributes\@\@SAPEBVBlock\@\@AEBV?$vector\@UMaterialLayer\@CappedSurfaceAttributes\@\@V?$allocator\@UMaterialLayer\@CappedSurfaceAttributes\@\@\@std\@\@\@std\@\@AEBVVec3\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CarpetBlock.hpp b/LiteLoader/include/llapi/mc/CarpetBlock.hpp index 3ed426df25..b91435b285 100644 --- a/LiteLoader/include/llapi/mc/CarpetBlock.hpp +++ b/LiteLoader/include/llapi/mc/CarpetBlock.hpp @@ -201,25 +201,25 @@ class CarpetBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@CarpetBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 144 + * @symbol ?getVisualShape\@CarpetBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -232,39 +232,44 @@ class CarpetBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@CarpetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@CarpetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@CarpetBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CARPETBLOCK /** * @symbol ?waterSpreadCausesSpawn\@CarpetBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CarrotBlock.hpp b/LiteLoader/include/llapi/mc/CarrotBlock.hpp index 6bf6b4d310..1b0d71ff46 100644 --- a/LiteLoader/include/llapi/mc/CarrotBlock.hpp +++ b/LiteLoader/include/llapi/mc/CarrotBlock.hpp @@ -181,25 +181,25 @@ class CarrotBlock : public CropBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 - * @symbol ?getVariant\@CarrotBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 147 + * @symbol ?getVariant\@CarrotBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,57 +211,62 @@ class CarrotBlock : public CropBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 180 + * @vftbl 181 * @symbol ?getRenderLayer\@CarrotBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 181 + * @vftbl 182 * @symbol ?getRenderLayer\@CarrotBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@CarrotBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 - * @symbol __unk_vfn_194 + * @vftbl 195 + * @symbol __unk_vfn_195 */ - virtual void __unk_vfn_194(); + virtual void __unk_vfn_195(); /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getBaseSeed\@CarrotBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseSeed() const; /** - * @vftbl 196 + * @vftbl 197 * @symbol ?getBaseCrop\@CarrotBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseCrop() const; /** - * @vftbl 198 + * @vftbl 199 * @symbol ?getCropNum\@CarrotBlock\@\@UEBAHAEAVRandomize\@\@HH\@Z */ virtual int getCropNum(class Randomize &, int, int) const; diff --git a/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp b/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp index 96a6e9415f..fb2175e7ec 100644 --- a/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp @@ -176,20 +176,20 @@ class CartographyTableBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,30 +201,35 @@ class CartographyTableBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 * @symbol ?use\@CartographyTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CARTOGRAPHYTABLEBLOCK /** * @symbol ?isCraftingBlock\@CartographyTableBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CauldronBlock.hpp b/LiteLoader/include/llapi/mc/CauldronBlock.hpp index e8ecf14646..1787233c40 100644 --- a/LiteLoader/include/llapi/mc/CauldronBlock.hpp +++ b/LiteLoader/include/llapi/mc/CauldronBlock.hpp @@ -227,25 +227,25 @@ class CauldronBlock : public ActorBlock { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 - * @symbol ?animateTick\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 152 + * @symbol ?animateTick\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -258,51 +258,56 @@ class CauldronBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@CauldronBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 182 + * @vftbl 183 * @symbol ?getExtraRenderLayers\@CauldronBlock\@\@UEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@CauldronBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@CauldronBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/CauldronBlockActor.hpp b/LiteLoader/include/llapi/mc/CauldronBlockActor.hpp index b0ae89d3f4..d825b8bbfc 100644 --- a/LiteLoader/include/llapi/mc/CauldronBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/CauldronBlockActor.hpp @@ -96,10 +96,6 @@ class CauldronBlockActor { */ MCVAPI void tick(class BlockSource &); #endif - /** - * @symbol ??0CauldronBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z - */ - MCAPI CauldronBlockActor(class BlockPos const &); /** * @symbol ?getColor\@CauldronBlockActor\@\@QEBA?AVColor\@mce\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CaveVinesBlock.hpp b/LiteLoader/include/llapi/mc/CaveVinesBlock.hpp index 7426320c11..8e1ad3f24e 100644 --- a/LiteLoader/include/llapi/mc/CaveVinesBlock.hpp +++ b/LiteLoader/include/llapi/mc/CaveVinesBlock.hpp @@ -221,30 +221,30 @@ class CaveVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 * @symbol ?getVariant\@CaveVinesBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -257,56 +257,61 @@ class CaveVinesBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@CaveVinesBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@CaveVinesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@CaveVinesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/CerealDocumentUpgradeStep.hpp b/LiteLoader/include/llapi/mc/CerealDocumentUpgradeStep.hpp index 9e55f91500..3384cb5060 100644 --- a/LiteLoader/include/llapi/mc/CerealDocumentUpgradeStep.hpp +++ b/LiteLoader/include/llapi/mc/CerealDocumentUpgradeStep.hpp @@ -31,10 +31,6 @@ class CerealDocumentUpgradeStep { */ MCVAPI ~CerealDocumentUpgradeStep(); #endif - /** - * @symbol ??0CerealDocumentUpgradeStep\@\@QEAA\@AEBVSemVersion\@\@\@Z - */ - MCAPI CerealDocumentUpgradeStep(class SemVersion const &); /** * @symbol ??0CerealDocumentUpgradeStep\@\@QEAA\@AEBV0\@\@Z */ @@ -47,21 +43,9 @@ class CerealDocumentUpgradeStep { * @symbol ?apply\@CerealDocumentUpgradeStep\@\@QEAA_NAEAV?$GenericDocument\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@VCrtAllocator\@2\@\@rapidjson\@\@AEBVSemVersion\@\@\@Z */ MCAPI bool apply(class rapidjson::GenericDocument, class rapidjson::MemoryPoolAllocator, class rapidjson::CrtAllocator> &, class SemVersion const &); - /** - * @symbol ?canUpgrade\@CerealDocumentUpgradeStep\@\@QEBA_NAEBVSemVersion\@\@\@Z - */ - MCAPI bool canUpgrade(class SemVersion const &) const; - /** - * @symbol ?getTargetVersion\@CerealDocumentUpgradeStep\@\@QEBAAEBVSemVersion\@\@XZ - */ - MCAPI class SemVersion const & getTargetVersion() const; /** * @symbol ??4CerealDocumentUpgradeStep\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class CerealDocumentUpgradeStep & operator=(class CerealDocumentUpgradeStep const &); - /** - * @symbol ?setSchema\@CerealDocumentUpgradeStep\@\@QEAAXAEBUSchema\@reflection\@\@\@Z - */ - MCAPI void setSchema(struct reflection::Schema const &); }; diff --git a/LiteLoader/include/llapi/mc/CerealHelpers.hpp b/LiteLoader/include/llapi/mc/CerealHelpers.hpp index 85e11bba1e..0f06f9bdbc 100644 --- a/LiteLoader/include/llapi/mc/CerealHelpers.hpp +++ b/LiteLoader/include/llapi/mc/CerealHelpers.hpp @@ -29,6 +29,10 @@ namespace CerealHelpers { * @symbol ?bindColor\@CerealHelpers\@\@YAXXZ */ MCAPI void bindColor(); + /** + * @symbol ?bindGlmVec2\@CerealHelpers\@\@YAXXZ + */ + MCAPI void bindGlmVec2(); /** * @symbol ?bindHelpers\@CerealHelpers\@\@YAXXZ */ @@ -41,10 +45,18 @@ namespace CerealHelpers { * @symbol ?bindIntRange\@CerealHelpers\@\@YAXXZ */ MCAPI void bindIntRange(); + /** + * @symbol ?bindLocIdString\@CerealHelpers\@\@YAXXZ + */ + MCAPI void bindLocIdString(); /** * @symbol ?bindMceUUID\@CerealHelpers\@\@YAXXZ */ MCAPI void bindMceUUID(); + /** + * @symbol ?bindResourcePath\@CerealHelpers\@\@YAXXZ + */ + MCAPI void bindResourcePath(); /** * @symbol ?bindVec2\@CerealHelpers\@\@YAXXZ */ @@ -97,6 +109,10 @@ namespace CerealHelpers { * @symbol ?colorToIntArray4\@CerealHelpers\@\@YA?AV?$array\@H$03\@std\@\@AEBVColor\@mce\@\@\@Z */ MCAPI class std::array colorToIntArray4(class mce::Color const &); + /** + * @symbol ?glmVec2FromArray\@CerealHelpers\@\@YAXAEAU?$vec\@$01M$0A\@\@glm\@\@V?$array\@M$01\@std\@\@\@Z + */ + MCAPI void glmVec2FromArray(struct glm::vec<2, float, 0> &, class std::array); /** * @symbol ?hashedStringFromString\@CerealHelpers\@\@YAXAEAVHashedString\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -106,9 +122,9 @@ namespace CerealHelpers { */ MCAPI void identifierStringFromString(struct CerealHelpers::IdentifierString &, std::string const &); /** - * @symbol ?vec2FromArray\@CerealHelpers\@\@YAXAEAU?$vec\@$01M$0A\@\@glm\@\@V?$array\@M$01\@std\@\@\@Z + * @symbol ?vec2FromArray\@CerealHelpers\@\@YAXAEAVVec2\@\@V?$array\@M$01\@std\@\@\@Z */ - MCAPI void vec2FromArray(struct glm::vec<2, float, 0> &, class std::array); + MCAPI void vec2FromArray(class Vec2 &, class std::array); /** * @symbol ?vec3AsArray\@CerealHelpers\@\@YA?AV?$array\@M$02\@std\@\@AEBVVec3\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CerealItemComponentFactory.hpp b/LiteLoader/include/llapi/mc/CerealItemComponentFactory.hpp index 61f22099a7..d7f8ebb3ae 100644 --- a/LiteLoader/include/llapi/mc/CerealItemComponentFactory.hpp +++ b/LiteLoader/include/llapi/mc/CerealItemComponentFactory.hpp @@ -55,14 +55,6 @@ struct Constructor { * @symbol ?isRegisteredComponent\@CerealItemComponentFactory\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool isRegisteredComponent(std::string const &); - /** - * @symbol ?resetItemContext\@CerealItemComponentFactory\@\@SAXXZ - */ - MCAPI static void resetItemContext(); - /** - * @symbol ?setItemContext\@CerealItemComponentFactory\@\@SAXPEAVComponentItem\@\@\@Z - */ - MCAPI static void setItemContext(class ComponentItem *); //private: diff --git a/LiteLoader/include/llapi/mc/ChainBlock.hpp b/LiteLoader/include/llapi/mc/ChainBlock.hpp index dce979c5f8..1b30bc3a9f 100644 --- a/LiteLoader/include/llapi/mc/ChainBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChainBlock.hpp @@ -196,25 +196,25 @@ class ChainBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@ChainBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 144 + * @symbol ?getVisualShape\@ChainBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,32 +226,37 @@ class ChainBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@ChainBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@ChainBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/ChanceInformation.hpp b/LiteLoader/include/llapi/mc/ChanceInformation.hpp index 044c8db902..6b609be208 100644 --- a/LiteLoader/include/llapi/mc/ChanceInformation.hpp +++ b/LiteLoader/include/llapi/mc/ChanceInformation.hpp @@ -37,13 +37,13 @@ class ChanceInformation { * @symbol ?roll\@ChanceInformation\@\@QEBA_NAEAVRandom\@\@\@Z */ MCAPI bool roll(class Random &) const; - /** - * @symbol ?set\@ChanceInformation\@\@QEAAXM\@Z - */ - MCAPI void set(float); /** * @symbol ?set\@ChanceInformation\@\@QEAAXII\@Z */ MCAPI void set(unsigned int, unsigned int); + /** + * @symbol ?set\@ChanceInformation\@\@QEAAXM\@Z + */ + MCAPI void set(float); }; diff --git a/LiteLoader/include/llapi/mc/ChangeSettingCommand.hpp b/LiteLoader/include/llapi/mc/ChangeSettingCommand.hpp index e9e4e4d685..da88d586dd 100644 --- a/LiteLoader/include/llapi/mc/ChangeSettingCommand.hpp +++ b/LiteLoader/include/llapi/mc/ChangeSettingCommand.hpp @@ -36,7 +36,7 @@ class ChangeSettingCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@ChangeSettingCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ChargeableItemComponent.hpp b/LiteLoader/include/llapi/mc/ChargeableItemComponent.hpp index d601007eaa..a2ea459565 100644 --- a/LiteLoader/include/llapi/mc/ChargeableItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ChargeableItemComponent.hpp @@ -66,14 +66,6 @@ class ChargeableItemComponent { * @symbol ?getMovementModifier\@ChargeableItemComponent\@\@QEBAMXZ */ MCAPI float getMovementModifier() const; - /** - * @symbol ?use\@ChargeableItemComponent\@\@QEBA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z - */ - MCAPI bool use(class ItemStack &, class Player &) const; - /** - * @symbol ?useTimeDepleted\@ChargeableItemComponent\@\@QEBAXAEAVItemStack\@\@AEAVPlayer\@\@AEAVLevel\@\@\@Z - */ - MCAPI void useTimeDepleted(class ItemStack &, class Player &, class Level &) const; /** * @symbol ?bindType\@ChargeableItemComponent\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/CheckFallDamageInMoveSystem.hpp b/LiteLoader/include/llapi/mc/CheckFallDamageInMoveSystem.hpp index c8720cf15e..4af3b6e000 100644 --- a/LiteLoader/include/llapi/mc/CheckFallDamageInMoveSystem.hpp +++ b/LiteLoader/include/llapi/mc/CheckFallDamageInMoveSystem.hpp @@ -32,4 +32,12 @@ class CheckFallDamageInMoveSystem { */ MCAPI static struct TickingSystemWithInfo createSystem(); +//private: + /** + * @symbol ?_tick\@CheckFallDamageInMoveSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUMoveRequestComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UCheckFallDamageRequestComponent\@\@\@\@\@Z + */ + MCAPI static void _tick(class ViewT>, struct MoveRequestComponent const, class Optional const>>, class EntityModifierT); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/CheckFallDamageSystem.hpp b/LiteLoader/include/llapi/mc/CheckFallDamageSystem.hpp index d50bebb5aa..0b382a1aec 100644 --- a/LiteLoader/include/llapi/mc/CheckFallDamageSystem.hpp +++ b/LiteLoader/include/llapi/mc/CheckFallDamageSystem.hpp @@ -31,6 +31,10 @@ class CheckFallDamageSystem { * @symbol ?_checkFallDamage\@CheckFallDamageSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@AEAUCheckFallDamageRequestComponent\@\@\@Z */ MCAPI static void _checkFallDamage(class StrictEntityContext &, class ActorOwnerComponent &, struct CheckFallDamageRequestComponent &); + /** + * @symbol ?_tickCheckFallDamageSystem\@CheckFallDamageSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@VActorOwnerComponent\@\@UCheckFallDamageRequestComponent\@\@\@\@\@Z + */ + MCAPI static void _tickCheckFallDamageSystem(class ViewT); /** * @symbol ?createSystem\@CheckFallDamageSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp b/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp index 09a8893d15..71b07870c0 100644 --- a/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp @@ -181,20 +181,20 @@ class ChemicalHeatBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -207,39 +207,44 @@ class ChemicalHeatBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@ChemicalHeatBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@ChemicalHeatBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 182 + * @vftbl 183 * @symbol ?getExtraRenderLayers\@ChemicalHeatBlock\@\@UEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0ChemicalHeatBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/ChemistryIngredient.hpp b/LiteLoader/include/llapi/mc/ChemistryIngredient.hpp index 86314b6e51..40b6af5a5e 100644 --- a/LiteLoader/include/llapi/mc/ChemistryIngredient.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryIngredient.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class ChemistryIngredient { +struct ChemistryIngredient { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_CHEMISTRYINGREDIENT public: - class ChemistryIngredient& operator=(class ChemistryIngredient const &) = delete; - ChemistryIngredient(class ChemistryIngredient const &) = delete; + struct ChemistryIngredient& operator=(struct ChemistryIngredient const &) = delete; + ChemistryIngredient(struct ChemistryIngredient const &) = delete; ChemistryIngredient() = delete; #endif @@ -29,4 +29,4 @@ class ChemistryIngredient { */ MCAPI ~ChemistryIngredient(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp b/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp index 643828a3e3..a2683d6fe8 100644 --- a/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp @@ -187,9 +187,9 @@ class ChemistryTableBlock : public ActorBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@ChemistryTableBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@ChemistryTableBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,45 +206,45 @@ class ChemistryTableBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@ChemistryTableBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@ChemistryTableBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@ChemistryTableBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 + * @vftbl 150 * @symbol ?getMappedFace\@ChemistryTableBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@ChemistryTableBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -256,32 +256,37 @@ class ChemistryTableBlock : public ActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@ChemistryTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getEntityResourceItem\@ChemistryTableBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; diff --git a/LiteLoader/include/llapi/mc/ChemistryTableBlockActor.hpp b/LiteLoader/include/llapi/mc/ChemistryTableBlockActor.hpp index 0c372ce387..a9489a345b 100644 --- a/LiteLoader/include/llapi/mc/ChemistryTableBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryTableBlockActor.hpp @@ -83,10 +83,6 @@ class ChemistryTableBlockActor { */ MCVAPI void tick(class BlockSource &); #endif - /** - * @symbol ??0ChemistryTableBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z - */ - MCAPI ChemistryTableBlockActor(class BlockPos const &); /** * @symbol ?isSameType\@ChemistryTableBlockActor\@\@QEBA_NW4ChemistryTableType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CherryLeafBlock.hpp b/LiteLoader/include/llapi/mc/CherryLeafBlock.hpp new file mode 100644 index 0000000000..65fe921003 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CherryLeafBlock.hpp @@ -0,0 +1,273 @@ +/** + * @file CherryLeafBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "LeafBlock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CherryLeafBlock : public LeafBlock { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CHERRYLEAFBLOCK +public: + class CherryLeafBlock& operator=(class CherryLeafBlock const &) = delete; + CherryLeafBlock(class CherryLeafBlock const &) = delete; + CherryLeafBlock() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); + /** + * @vftbl 29 + * @symbol __unk_vfn_29 + */ + virtual void __unk_vfn_29(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); + /** + * @vftbl 32 + * @symbol __unk_vfn_32 + */ + virtual void __unk_vfn_32(); + /** + * @vftbl 33 + * @symbol __unk_vfn_33 + */ + virtual void __unk_vfn_33(); + /** + * @vftbl 34 + * @symbol __unk_vfn_34 + */ + virtual void __unk_vfn_34(); + /** + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 37 + * @symbol __unk_vfn_37 + */ + virtual void __unk_vfn_37(); + /** + * @vftbl 38 + * @symbol __unk_vfn_38 + */ + virtual void __unk_vfn_38(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 + * @symbol __unk_vfn_40 + */ + virtual void __unk_vfn_40(); + /** + * @vftbl 41 + * @symbol __unk_vfn_41 + */ + virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); + /** + * @vftbl 44 + * @symbol __unk_vfn_44 + */ + virtual void __unk_vfn_44(); + /** + * @vftbl 45 + * @symbol __unk_vfn_45 + */ + virtual void __unk_vfn_45(); + /** + * @vftbl 46 + * @symbol __unk_vfn_46 + */ + virtual void __unk_vfn_46(); + /** + * @vftbl 47 + * @symbol __unk_vfn_47 + */ + virtual void __unk_vfn_47(); + /** + * @vftbl 48 + * @symbol __unk_vfn_48 + */ + virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 54 + * @symbol __unk_vfn_54 + */ + virtual void __unk_vfn_54(); + /** + * @vftbl 60 + * @symbol __unk_vfn_60 + */ + virtual void __unk_vfn_60(); + /** + * @vftbl 61 + * @symbol __unk_vfn_61 + */ + virtual void __unk_vfn_61(); + /** + * @vftbl 75 + * @symbol __unk_vfn_75 + */ + virtual void __unk_vfn_75(); + /** + * @vftbl 82 + * @symbol __unk_vfn_82 + */ + virtual void __unk_vfn_82(); + /** + * @vftbl 105 + * @symbol __unk_vfn_105 + */ + virtual void __unk_vfn_105(); + /** + * @vftbl 123 + * @symbol __unk_vfn_123 + */ + virtual void __unk_vfn_123(); + /** + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 + * @symbol __unk_vfn_126 + */ + virtual void __unk_vfn_126(); + /** + * @vftbl 129 + * @symbol __unk_vfn_129 + */ + virtual void __unk_vfn_129(); + /** + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 137 + * @symbol ?getColor\@CherryLeafBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + */ + virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; + /** + * @vftbl 140 + * @symbol ?isSeasonTinted\@CherryLeafBlock\@\@UEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual bool isSeasonTinted(class Block const &, class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 141 + * @symbol ?onGraphicsModeChanged\@CherryLeafBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z + */ + virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); + /** + * @vftbl 147 + * @symbol ?getVariant\@CherryLeafBlock\@\@UEBAHAEBVBlock\@\@\@Z + */ + virtual int getVariant(class Block const &) const; + /** + * @vftbl 152 + * @symbol ?animateTick\@CherryLeafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + */ + virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; + /** + * @vftbl 157 + * @symbol __unk_vfn_157 + */ + virtual void __unk_vfn_157(); + /** + * @vftbl 166 + * @symbol __unk_vfn_166 + */ + virtual void __unk_vfn_166(); + /** + * @vftbl 167 + * @symbol __unk_vfn_167 + */ + virtual void __unk_vfn_167(); + /** + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 182 + * @symbol ?getRenderLayer\@CherryLeafBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 186 + * @symbol ?getMapColor\@CherryLeafBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + */ + virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 + * @symbol ?getResourceItem\@CherryLeafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + /** + * @vftbl 191 + * @symbol ?getSilkTouchItemInstance\@CherryLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + */ + virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + /** + * @symbol ??0CherryLeafBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI CherryLeafBlock(std::string const &, int); + +}; diff --git a/LiteLoader/include/llapi/mc/CherrySaplingBlock.hpp b/LiteLoader/include/llapi/mc/CherrySaplingBlock.hpp new file mode 100644 index 0000000000..287db37593 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CherrySaplingBlock.hpp @@ -0,0 +1,279 @@ +/** + * @file CherrySaplingBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BushBlock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CherrySaplingBlock : public BushBlock { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CHERRYSAPLINGBLOCK +public: + class CherrySaplingBlock& operator=(class CherrySaplingBlock const &) = delete; + CherrySaplingBlock(class CherrySaplingBlock const &) = delete; + CherrySaplingBlock() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); + /** + * @vftbl 29 + * @symbol __unk_vfn_29 + */ + virtual void __unk_vfn_29(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); + /** + * @vftbl 32 + * @symbol __unk_vfn_32 + */ + virtual void __unk_vfn_32(); + /** + * @vftbl 33 + * @symbol __unk_vfn_33 + */ + virtual void __unk_vfn_33(); + /** + * @vftbl 34 + * @symbol __unk_vfn_34 + */ + virtual void __unk_vfn_34(); + /** + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 37 + * @symbol __unk_vfn_37 + */ + virtual void __unk_vfn_37(); + /** + * @vftbl 38 + * @symbol __unk_vfn_38 + */ + virtual void __unk_vfn_38(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 + * @symbol __unk_vfn_40 + */ + virtual void __unk_vfn_40(); + /** + * @vftbl 41 + * @symbol __unk_vfn_41 + */ + virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); + /** + * @vftbl 44 + * @symbol __unk_vfn_44 + */ + virtual void __unk_vfn_44(); + /** + * @vftbl 45 + * @symbol __unk_vfn_45 + */ + virtual void __unk_vfn_45(); + /** + * @vftbl 46 + * @symbol __unk_vfn_46 + */ + virtual void __unk_vfn_46(); + /** + * @vftbl 47 + * @symbol __unk_vfn_47 + */ + virtual void __unk_vfn_47(); + /** + * @vftbl 48 + * @symbol __unk_vfn_48 + */ + virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 54 + * @symbol __unk_vfn_54 + */ + virtual void __unk_vfn_54(); + /** + * @vftbl 60 + * @symbol __unk_vfn_60 + */ + virtual void __unk_vfn_60(); + /** + * @vftbl 61 + * @symbol __unk_vfn_61 + */ + virtual void __unk_vfn_61(); + /** + * @vftbl 62 + * @symbol ?canContainLiquid\@CherrySaplingBlock\@\@UEBA_NXZ + */ + virtual bool canContainLiquid() const; + /** + * @vftbl 75 + * @symbol __unk_vfn_75 + */ + virtual void __unk_vfn_75(); + /** + * @vftbl 82 + * @symbol __unk_vfn_82 + */ + virtual void __unk_vfn_82(); + /** + * @vftbl 86 + * @symbol ?onFertilized\@CherrySaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + */ + virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; + /** + * @vftbl 88 + * @symbol ?canBeFertilized\@CherrySaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + */ + virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; + /** + * @vftbl 92 + * @symbol ?mayPlace\@CherrySaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 105 + * @symbol __unk_vfn_105 + */ + virtual void __unk_vfn_105(); + /** + * @vftbl 123 + * @symbol __unk_vfn_123 + */ + virtual void __unk_vfn_123(); + /** + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 + * @symbol __unk_vfn_126 + */ + virtual void __unk_vfn_126(); + /** + * @vftbl 129 + * @symbol __unk_vfn_129 + */ + virtual void __unk_vfn_129(); + /** + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 157 + * @symbol __unk_vfn_157 + */ + virtual void __unk_vfn_157(); + /** + * @vftbl 166 + * @symbol __unk_vfn_166 + */ + virtual void __unk_vfn_166(); + /** + * @vftbl 167 + * @symbol __unk_vfn_167 + */ + virtual void __unk_vfn_167(); + /** + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 + * @symbol ?randomTick\@CherrySaplingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + */ + virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; + /** + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 181 + * @symbol ?getRenderLayer\@CherrySaplingBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ + */ + virtual enum class BlockRenderLayer getRenderLayer() const; + /** + * @vftbl 182 + * @symbol ?getRenderLayer\@CherrySaplingBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @symbol ??0CherrySaplingBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI CherrySaplingBlock(std::string const &, int); + +//protected: + /** + * @symbol ?advanceTree\@CherrySaplingBlock\@\@IEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@PEAVActor\@\@\@Z + */ + MCAPI bool advanceTree(class BlockSource &, class BlockPos const &, class Random &, class Actor *) const; + +//private: + /** + * @symbol ?_growTree\@CherrySaplingBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@_N\@Z + */ + MCAPI bool _growTree(class BlockSource &, class BlockPos const &, class Random &, bool) const; + +protected: + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/CherryTreeCanopy.hpp b/LiteLoader/include/llapi/mc/CherryTreeCanopy.hpp new file mode 100644 index 0000000000..3f5520d120 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CherryTreeCanopy.hpp @@ -0,0 +1,51 @@ +/** + * @file CherryTreeCanopy.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "TreeHelper.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CherryTreeCanopy { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CHERRYTREECANOPY +public: + class CherryTreeCanopy& operator=(class CherryTreeCanopy const &) = delete; + CherryTreeCanopy(class CherryTreeCanopy const &) = delete; + CherryTreeCanopy() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?placeCanopy\@CherryTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z + */ + virtual class std::optional placeCanopy(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &, struct TreeHelper::TreeParams const &, std::vector const &) const; + +//private: + /** + * @symbol ?_placeLayerOfLeaves\@CherryTreeCanopy\@\@AEBAXAEAVIBlockWorldGenAPI\@\@AEAVRandom\@\@AEBVBlockPos\@\@HAEBVBlock\@\@HAEBUTreeParams\@TreeHelper\@\@\@Z + */ + MCAPI void _placeLayerOfLeaves(class IBlockWorldGenAPI &, class Random &, class BlockPos const &, int, class Block const &, int, struct TreeHelper::TreeParams const &) const; + /** + * @symbol ?_placeLayerOfLeavesWithHangingLeavesBelow\@CherryTreeCanopy\@\@AEBAXAEAVIBlockWorldGenAPI\@\@AEAVRandom\@\@AEBVBlockPos\@\@HAEBVBlock\@\@HAEBUTreeParams\@TreeHelper\@\@\@Z + */ + MCAPI void _placeLayerOfLeavesWithHangingLeavesBelow(class IBlockWorldGenAPI &, class Random &, class BlockPos const &, int, class Block const &, int, struct TreeHelper::TreeParams const &) const; + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/CherryTreeTrunk.hpp b/LiteLoader/include/llapi/mc/CherryTreeTrunk.hpp new file mode 100644 index 0000000000..cf6283d521 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CherryTreeTrunk.hpp @@ -0,0 +1,52 @@ +/** + * @file CherryTreeTrunk.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "TreeHelper.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CherryTreeTrunk { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CHERRYTREETRUNK +public: + class CherryTreeTrunk& operator=(class CherryTreeTrunk const &) = delete; + CherryTreeTrunk(class CherryTreeTrunk const &) = delete; + CherryTreeTrunk() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?placeTrunk\@CherryTreeTrunk\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@PEBVITreeCanopy\@\@\@Z + */ + virtual class std::optional placeTrunk(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, int, class RenderParams &, struct TreeHelper::TreeParams const &, class ITreeCanopy const *) const; + /** + * @vftbl 2 + * @symbol ?getTreeHeight\@CherryTreeTrunk\@\@UEBAHAEAVRandom\@\@\@Z + */ + virtual int getTreeHeight(class Random &) const; + +//private: + /** + * @symbol ?_generateBranch\@CherryTreeTrunk\@\@AEBA?AVBlockPos\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@1AEAVRandom\@\@HV2\@AEBUTreeParams\@TreeHelper\@\@3H_N\@Z + */ + MCAPI class BlockPos _generateBranch(class IBlockWorldGenAPI &, class Block const &, class Block const &, class Random &, int, class BlockPos, struct TreeHelper::TreeParams const &, class BlockPos, int, bool) const; + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/ChestBlock.hpp b/LiteLoader/include/llapi/mc/ChestBlock.hpp index b1c09e0365..f566b5d64e 100644 --- a/LiteLoader/include/llapi/mc/ChestBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChestBlock.hpp @@ -202,9 +202,9 @@ class ChestBlock : public ActorBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@ChestBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@ChestBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -226,35 +226,35 @@ class ChestBlock : public ActorBlock { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 149 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 150 * @symbol ?getMappedFace\@ChestBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 152 + * @vftbl 153 * @symbol ?init\@ChestBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -267,34 +267,39 @@ class ChestBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@ChestBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHESTBLOCK /** * @symbol ?detachesOnPistonMove\@ChestBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/Chicken.hpp b/LiteLoader/include/llapi/mc/Chicken.hpp index e06fd01d12..92f3d9fcdc 100644 --- a/LiteLoader/include/llapi/mc/Chicken.hpp +++ b/LiteLoader/include/llapi/mc/Chicken.hpp @@ -151,11 +151,6 @@ class Chicken : public Animal { * @symbol __unk_vfn_275 */ virtual void __unk_vfn_275(); - /** - * @vftbl 288 - * @symbol ?aiStep\@Chicken\@\@UEAAXXZ - */ - virtual void aiStep(); /** * @vftbl 301 * @symbol __unk_vfn_301 @@ -176,8 +171,8 @@ class Chicken : public Animal { */ MCAPI Chicken(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?postAIStep\@Chicken\@\@QEAAXXZ + * @symbol ?postAiStep\@Chicken\@\@QEAAXXZ */ - MCAPI void postAIStep(); + MCAPI void postAiStep(); }; diff --git a/LiteLoader/include/llapi/mc/ChickenPostAIStepSystem.hpp b/LiteLoader/include/llapi/mc/ChickenPostAIStepSystem.hpp deleted file mode 100644 index 060ec70310..0000000000 --- a/LiteLoader/include/llapi/mc/ChickenPostAIStepSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file ChickenPostAIStepSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ChickenPostAIStepSystem. - * - */ -class ChickenPostAIStepSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CHICKENPOSTAISTEPSYSTEM -public: - class ChickenPostAIStepSystem& operator=(class ChickenPostAIStepSystem const &) = delete; - ChickenPostAIStepSystem(class ChickenPostAIStepSystem const &) = delete; - ChickenPostAIStepSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@ChickenPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doChickenPostAIStepSystem\@ChickenPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doChickenPostAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; diff --git a/LiteLoader/include/llapi/mc/ChiseledBookshelfBlock.hpp b/LiteLoader/include/llapi/mc/ChiseledBookshelfBlock.hpp index 44fe0bc246..7a015e60f1 100644 --- a/LiteLoader/include/llapi/mc/ChiseledBookshelfBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChiseledBookshelfBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "FaceDirectionalActorBlock.hpp" +#include "ActorBlock.hpp" #define BEFORE_EXTRA @@ -15,7 +15,7 @@ * @brief MC class ChiseledBookshelfBlock. * */ -class ChiseledBookshelfBlock : public FaceDirectionalActorBlock { +class ChiseledBookshelfBlock : public ActorBlock { #define AFTER_EXTRA @@ -184,25 +184,25 @@ class ChiseledBookshelfBlock : public FaceDirectionalActorBlock { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 162 - * @symbol ?onRemove\@ChiseledBookshelfBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void onRemove(class BlockSource &, class BlockPos const &) const; + virtual void __unk_vfn_157(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol ?onRemove\@ChiseledBookshelfBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_165(); + virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -214,42 +214,47 @@ class ChiseledBookshelfBlock : public FaceDirectionalActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 176 + * @vftbl 177 * @symbol ?use\@ChiseledBookshelfBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@EV?$optional\@VVec3\@\@\@std\@\@\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char, class std::optional) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@ChiseledBookshelfBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@ChiseledBookshelfBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@ChiseledBookshelfBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp b/LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp index b5b8b4e6d2..aeb16ad501 100644 --- a/LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp @@ -201,25 +201,25 @@ class ChorusFlowerBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 - * @symbol ?getVariant\@ChorusFlowerBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 147 + * @symbol ?getVariant\@ChorusFlowerBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -231,47 +231,52 @@ class ChorusFlowerBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@ChorusFlowerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@ChorusFlowerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@ChorusFlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@ChorusFlowerBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@ChorusFlowerBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp b/LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp index 51d574aeff..59b58339ed 100644 --- a/LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp @@ -211,20 +211,20 @@ class ChorusPlantBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -236,45 +236,79 @@ class ChorusPlantBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@ChorusPlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@ChorusPlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@ChorusPlantBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@ChorusPlantBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; + /** + * @vftbl 195 + * @symbol __unk_vfn_195 + */ + virtual void __unk_vfn_195(); + /** + * @vftbl 196 + * @symbol __unk_vfn_196 + */ + virtual void __unk_vfn_196(); + /** + * @vftbl 197 + * @symbol __unk_vfn_197 + */ + virtual void __unk_vfn_197(); + /** + * @vftbl 198 + * @symbol __unk_vfn_198 + */ + virtual void __unk_vfn_198(); + /** + * @vftbl 199 + * @symbol __unk_vfn_199 + */ + virtual void __unk_vfn_199(); + /** + * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + MCAPI std::string const & getDescriptionId() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHORUSPLANTBLOCK /** * @symbol ?canBeSilkTouched\@ChorusPlantBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/ChunkBlender.hpp b/LiteLoader/include/llapi/mc/ChunkBlender.hpp index 546869aba4..434e458b18 100644 --- a/LiteLoader/include/llapi/mc/ChunkBlender.hpp +++ b/LiteLoader/include/llapi/mc/ChunkBlender.hpp @@ -25,10 +25,6 @@ class ChunkBlender { #endif public: - /** - * @symbol ??0ChunkBlender\@\@QEAA\@VChunkPos\@\@$$QEAV?$vector\@V?$array\@UAttenuationData\@ChunkBlenderUtil\@\@$03\@std\@\@V?$allocator\@V?$array\@UAttenuationData\@ChunkBlenderUtil\@\@$03\@std\@\@\@2\@\@std\@\@F\@Z - */ - MCAPI ChunkBlender(class ChunkPos, std::vector> &&, short); /** * @symbol ?attenuateDensity\@ChunkBlender\@\@QEBAMAEBV?$DividedPos2d\@$03\@\@HM\@Z */ diff --git a/LiteLoader/include/llapi/mc/ChunkLoadActionList.hpp b/LiteLoader/include/llapi/mc/ChunkLoadActionList.hpp index 232f5580df..68ca718479 100644 --- a/LiteLoader/include/llapi/mc/ChunkLoadActionList.hpp +++ b/LiteLoader/include/llapi/mc/ChunkLoadActionList.hpp @@ -36,6 +36,10 @@ class ChunkLoadActionList { * @symbol ?addChunkLoadedRequest\@ChunkLoadActionList\@\@QEAAXVChunkLoadedRequest\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ChunksLoadedStatus\@\@AEAVLevelStorage\@\@\@Z */ MCAPI void addChunkLoadedRequest(class ChunkLoadedRequest, std::string const &, enum class ChunksLoadedStatus, class LevelStorage &); + /** + * @symbol ?loadRequest\@ChunkLoadActionList\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@AEAVICommandOriginLoader\@\@0\@Z + */ + MCAPI void loadRequest(std::string const &, class CompoundTag const &, class ICommandOriginLoader &, std::string const &); /** * @symbol ?loadRequests\@ChunkLoadActionList\@\@QEAAXAEAVLevelStorage\@\@AEAVICommandOriginLoader\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ChunkLoadedRequest.hpp b/LiteLoader/include/llapi/mc/ChunkLoadedRequest.hpp index 1988e92919..540f362e4b 100644 --- a/LiteLoader/include/llapi/mc/ChunkLoadedRequest.hpp +++ b/LiteLoader/include/llapi/mc/ChunkLoadedRequest.hpp @@ -50,38 +50,14 @@ class ChunkLoadedRequest { * @symbol ?areaContainsChunk\@ChunkLoadedRequest\@\@QEBA_NAEBVLevelChunk\@\@\@Z */ MCAPI bool areaContainsChunk(class LevelChunk const &) const; - /** - * @symbol ?executeAction\@ChunkLoadedRequest\@\@QEAAXAEAVServerLevel\@\@AEAVDimension\@\@\@Z - */ - MCAPI void executeAction(class ServerLevel &, class Dimension &); - /** - * @symbol ?getSerializationId\@ChunkLoadedRequest\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getSerializationId() const; - /** - * @symbol ?isValid\@ChunkLoadedRequest\@\@QEBA_NXZ - */ - MCAPI bool isValid() const; /** * @symbol ?serialize\@ChunkLoadedRequest\@\@QEAA?AVCompoundTag\@\@W4ChunkRequestListType\@\@\@Z */ MCAPI class CompoundTag serialize(enum class ChunkRequestListType); - /** - * @symbol ?setSerializationId\@ChunkLoadedRequest\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI void setSerializationId(std::string const &); - /** - * @symbol ?tickingAreaMatches\@ChunkLoadedRequest\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI bool tickingAreaMatches(std::string const &) const; /** * @symbol ??1ChunkLoadedRequest\@\@QEAA\@XZ */ MCAPI ~ChunkLoadedRequest(); - /** - * @symbol ?isValidTag\@ChunkLoadedRequest\@\@SA_NAEBVCompoundTag\@\@\@Z - */ - MCAPI static bool isValidTag(class CompoundTag const &); /** * @symbol ?load\@ChunkLoadedRequest\@\@SA?AUDeserializedChunkLoadedRequest\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@AEAVICommandOriginLoader\@\@0\@Z */ diff --git a/LiteLoader/include/llapi/mc/ChunkRecyclerTelemetryData.hpp b/LiteLoader/include/llapi/mc/ChunkRecyclerTelemetryData.hpp index 20f9751ff0..f016395ba7 100644 --- a/LiteLoader/include/llapi/mc/ChunkRecyclerTelemetryData.hpp +++ b/LiteLoader/include/llapi/mc/ChunkRecyclerTelemetryData.hpp @@ -32,10 +32,6 @@ class ChunkRecyclerTelemetryData { * @symbol ?recordCacheCheck\@ChunkRecyclerTelemetryData\@\@QEAAXAEBVLevelChunk\@\@\@Z */ MCAPI void recordCacheCheck(class LevelChunk const &); - /** - * @symbol ?recordChunkDeleted\@ChunkRecyclerTelemetryData\@\@QEAAXAEBVLevelChunk\@\@\@Z - */ - MCAPI void recordChunkDeleted(class LevelChunk const &); /** * @symbol ?recordTaskCompleted\@ChunkRecyclerTelemetryData\@\@QEAAXAEBVLevelChunk\@\@AEBVTaskInfo\@1\@\@Z */ @@ -48,10 +44,6 @@ class ChunkRecyclerTelemetryData { * @symbol ?tickLevel\@ChunkRecyclerTelemetryData\@\@QEAAXAEBVLevel\@\@\@Z */ MCAPI void tickLevel(class Level const &); - /** - * @symbol ?taskStarted\@ChunkRecyclerTelemetryData\@\@SA?AVTaskInfo\@1\@XZ - */ - MCAPI static class ChunkRecyclerTelemetryData::TaskInfo taskStarted(); //private: /** diff --git a/LiteLoader/include/llapi/mc/ChunkSource.hpp b/LiteLoader/include/llapi/mc/ChunkSource.hpp index cec1ec1214..3067876727 100644 --- a/LiteLoader/include/llapi/mc/ChunkSource.hpp +++ b/LiteLoader/include/llapi/mc/ChunkSource.hpp @@ -187,6 +187,16 @@ enum class ChunkSourceViewGenerateMode; * @symbol ?setLevelChunk\@ChunkSource\@\@UEAAXV?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@Z */ virtual void setLevelChunk(class std::shared_ptr); + /** + * @vftbl 30 + * @symbol ?canLaunchTasks\@ChunkSource\@\@UEBA_NXZ + */ + virtual bool canLaunchTasks() const; + /** + * @vftbl 31 + * @symbol ?chunkPosNeedsBlending\@ChunkSource\@\@UEAA_NAEBVChunkPos\@\@\@Z + */ + virtual bool chunkPosNeedsBlending(class ChunkPos const &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHUNKSOURCE /** * @symbol __unk_destructor_-1 @@ -206,9 +216,9 @@ enum class ChunkSourceViewGenerateMode; */ MCAPI void checkAndLaunchChunkGenerationTasks(bool); /** - * @symbol ?createEmptyView\@ChunkSource\@\@QEAA?AV?$GridArea\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@W4LoadMode\@1\@_NV?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@W4ChunkSourceViewGenerateMode\@\@\@Z + * @symbol ?createEmptyView\@ChunkSource\@\@QEAA?AV?$GridArea\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@W4LoadMode\@1\@_NV?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@W4ChunkSourceViewGenerateMode\@\@PEBM\@Z */ - MCAPI class GridArea> createEmptyView(enum class ChunkSource::LoadMode, bool, class std::function>, class buffer_span)>, enum class ChunkSourceViewGenerateMode); + MCAPI class GridArea> createEmptyView(enum class ChunkSource::LoadMode, bool, class std::function>, class buffer_span)>, enum class ChunkSourceViewGenerateMode, float const *); /** * @symbol ?getAvailableChunk\@ChunkSource\@\@QEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z */ @@ -238,9 +248,9 @@ enum class ChunkSourceViewGenerateMode; */ MCAPI void setShuttingDown(bool); /** - * @symbol ?shouldServerGeneratePos\@ChunkSource\@\@QEAA_NAEBVChunkPos\@\@\@Z + * @symbol ?shouldServerGeneratePos\@ChunkSource\@\@QEAA_NAEBVChunkPos\@\@MH\@Z */ - MCAPI bool shouldServerGeneratePos(class ChunkPos const &); + MCAPI bool shouldServerGeneratePos(class ChunkPos const &, float, int); /** * @symbol ?gPerfIsClientSide\@ChunkSource\@\@2_NA */ diff --git a/LiteLoader/include/llapi/mc/ChunkTickRangeManager.hpp b/LiteLoader/include/llapi/mc/ChunkTickRangeManager.hpp new file mode 100644 index 0000000000..258165ee83 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ChunkTickRangeManager.hpp @@ -0,0 +1,48 @@ +/** + * @file ChunkTickRangeManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ChunkTickRangeManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CHUNKTICKRANGEMANAGER +public: + class ChunkTickRangeManager& operator=(class ChunkTickRangeManager const &) = delete; + ChunkTickRangeManager(class ChunkTickRangeManager const &) = delete; + ChunkTickRangeManager() = delete; +#endif + +public: + /** + * @symbol ??0ChunkTickRangeManager\@\@QEAA\@II\@Z + */ + MCAPI ChunkTickRangeManager(unsigned int, unsigned int); + /** + * @symbol ?getAdjustedChunkTickRange\@ChunkTickRangeManager\@\@QEAAIAEBVLevelSettings\@\@\@Z + */ + MCAPI unsigned int getAdjustedChunkTickRange(class LevelSettings const &); + /** + * @symbol ?isChunkInTickRange\@ChunkTickRangeManager\@\@QEBA_NAEBVLevelChunk\@\@V?$optional\@H\@std\@\@\@Z + */ + MCAPI bool isChunkInTickRange(class LevelChunk const &, class std::optional) const; + /** + * @symbol ?isChunkInTickRange\@ChunkTickRangeManager\@\@QEBA_NAEBVChunkPos\@\@AEBVDimension\@\@_NMHH\@Z + */ + MCAPI bool isChunkInTickRange(class ChunkPos const &, class Dimension const &, bool, float, int, int) const; + /** + * @symbol ?setChunkTickRange\@ChunkTickRangeManager\@\@QEAAXI\@Z + */ + MCAPI void setChunkTickRange(unsigned int); + +}; diff --git a/LiteLoader/include/llapi/mc/ChunkViewSource.hpp b/LiteLoader/include/llapi/mc/ChunkViewSource.hpp index 2274726fc8..135ecc2bd0 100644 --- a/LiteLoader/include/llapi/mc/ChunkViewSource.hpp +++ b/LiteLoader/include/llapi/mc/ChunkViewSource.hpp @@ -72,6 +72,10 @@ char filler[0x188]; */ MCVAPI ~ChunkViewSource(); #endif + /** + * @symbol ??0ChunkViewSource\@\@QEAA\@AEAVChunkSource\@\@AEAV?$LevelChunkGridAreaElement\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@\@AEBUBounds\@\@\@Z + */ + MCAPI ChunkViewSource(class ChunkSource &, class LevelChunkGridAreaElement> &, struct Bounds const &); /** * @symbol ??0ChunkViewSource\@\@QEAA\@AEBV0\@\@Z */ @@ -80,10 +84,6 @@ char filler[0x188]; * @symbol ??0ChunkViewSource\@\@QEAA\@AEAVChunkSource\@\@W4LoadMode\@1\@\@Z */ MCAPI ChunkViewSource(class ChunkSource &, enum class ChunkSource::LoadMode); - /** - * @symbol ??0ChunkViewSource\@\@QEAA\@AEAVChunkSource\@\@AEAV?$LevelChunkGridAreaElement\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@\@AEBUBounds\@\@\@Z - */ - MCAPI ChunkViewSource(class ChunkSource &, class LevelChunkGridAreaElement> &, struct Bounds const &); /** * @symbol ?clear\@ChunkViewSource\@\@QEAAXXZ */ @@ -101,17 +101,17 @@ char filler[0x188]; */ MCAPI class GridArea> & getArea(); /** - * @symbol ?move\@ChunkViewSource\@\@QEAAXAEBUBounds\@\@_NW4ChunkSourceViewGenerateMode\@\@V?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@\@Z + * @symbol ?move\@ChunkViewSource\@\@QEAAXAEBUBounds\@\@_NW4ChunkSourceViewGenerateMode\@\@V?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@PEBM\@Z */ - MCAPI void move(struct Bounds const &, bool, enum class ChunkSourceViewGenerateMode, class std::function>, class buffer_span)>); + MCAPI void move(struct Bounds const &, bool, enum class ChunkSourceViewGenerateMode, class std::function>, class buffer_span)>, float const *); /** - * @symbol ?move\@ChunkViewSource\@\@QEAAXAEBVBlockPos\@\@H_NW4ChunkSourceViewGenerateMode\@\@V?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@\@Z + * @symbol ?move\@ChunkViewSource\@\@QEAAXAEBVBlockPos\@\@H_NW4ChunkSourceViewGenerateMode\@\@V?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@PEBM\@Z */ - MCAPI void move(class BlockPos const &, int, bool, enum class ChunkSourceViewGenerateMode, class std::function>, class buffer_span)>); + MCAPI void move(class BlockPos const &, int, bool, enum class ChunkSourceViewGenerateMode, class std::function>, class buffer_span)>, float const *); /** - * @symbol ?move\@ChunkViewSource\@\@QEAAXAEBVBlockPos\@\@0_NW4ChunkSourceViewGenerateMode\@\@V?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@\@Z + * @symbol ?move\@ChunkViewSource\@\@QEAAXAEBVBlockPos\@\@0_NW4ChunkSourceViewGenerateMode\@\@V?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@PEBM\@Z */ - MCAPI void move(class BlockPos const &, class BlockPos const &, bool, enum class ChunkSourceViewGenerateMode, class std::function>, class buffer_span)>); + MCAPI void move(class BlockPos const &, class BlockPos const &, bool, enum class ChunkSourceViewGenerateMode, class std::function>, class buffer_span)>, float const *); /** * @symbol ?rebuildSpecificArea\@ChunkViewSource\@\@QEAAXAEBUBounds\@\@_NV?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CircuitSceneGraph.hpp b/LiteLoader/include/llapi/mc/CircuitSceneGraph.hpp index ab1286196a..55ba1bad0e 100644 --- a/LiteLoader/include/llapi/mc/CircuitSceneGraph.hpp +++ b/LiteLoader/include/llapi/mc/CircuitSceneGraph.hpp @@ -75,14 +75,6 @@ class CircuitSceneGraph { * @symbol ?preSetupPoweredBlocks\@CircuitSceneGraph\@\@QEAAXAEBVChunkPos\@\@\@Z */ MCAPI void preSetupPoweredBlocks(class ChunkPos const &); - /** - * @symbol ?remove\@CircuitSceneGraph\@\@QEAAXAEBVBlockPos\@\@PEAVBaseCircuitComponent\@\@\@Z - */ - MCAPI void remove(class BlockPos const &, class BaseCircuitComponent *); - /** - * @symbol ?update\@CircuitSceneGraph\@\@QEAAXPEAVBlockSource\@\@\@Z - */ - MCAPI void update(class BlockSource *); /** * @symbol ??1CircuitSceneGraph\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CircuitSystem.hpp b/LiteLoader/include/llapi/mc/CircuitSystem.hpp index e81aed2ca1..59b5d47d2c 100644 --- a/LiteLoader/include/llapi/mc/CircuitSystem.hpp +++ b/LiteLoader/include/llapi/mc/CircuitSystem.hpp @@ -63,6 +63,10 @@ class CircuitSystem { * @symbol ?evaluate\@CircuitSystem\@\@QEAAXPEAVBlockSource\@\@\@Z */ MCAPI void evaluate(class BlockSource *); + /** + * @symbol ?getDirection\@CircuitSystem\@\@QEAAEAEBVBlockPos\@\@\@Z + */ + MCAPI unsigned char getDirection(class BlockPos const &); /** * @symbol ?getStrength\@CircuitSystem\@\@QEAAHAEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ClayBlock.hpp b/LiteLoader/include/llapi/mc/ClayBlock.hpp index ba4bd71b9d..03db5f9fe2 100644 --- a/LiteLoader/include/llapi/mc/ClayBlock.hpp +++ b/LiteLoader/include/llapi/mc/ClayBlock.hpp @@ -196,20 +196,20 @@ class ClayBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -221,32 +221,37 @@ class ClayBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@ClayBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@ClayBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/ClearCommand.hpp b/LiteLoader/include/llapi/mc/ClearCommand.hpp index e27f950bd8..9008110b39 100644 --- a/LiteLoader/include/llapi/mc/ClearCommand.hpp +++ b/LiteLoader/include/llapi/mc/ClearCommand.hpp @@ -36,7 +36,7 @@ class ClearCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@ClearCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ClearSpawnPointCommand.hpp b/LiteLoader/include/llapi/mc/ClearSpawnPointCommand.hpp index aaa8cbda74..fd71ee32a8 100644 --- a/LiteLoader/include/llapi/mc/ClearSpawnPointCommand.hpp +++ b/LiteLoader/include/llapi/mc/ClearSpawnPointCommand.hpp @@ -36,7 +36,7 @@ class ClearSpawnPointCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@ClearSpawnPointCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ClientAutoStepSystem.hpp b/LiteLoader/include/llapi/mc/ClientAutoStepSystem.hpp index 8aef5f3ab7..8c38ee5dcb 100644 --- a/LiteLoader/include/llapi/mc/ClientAutoStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/ClientAutoStepSystem.hpp @@ -44,9 +44,14 @@ class ClientAutoStepSystem { virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol ?tick\@ClientAutoStepSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UAutoStepRequestFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UMoveRequestComponent\@\@USlideOffsetComponent\@\@USubBBsComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @symbol __unk_vfn_3 */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct SynchedActorDataComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct MoveRequestComponent, struct SlideOffsetComponent, struct SubBBsComponent, struct SideBySidePlaybackBlocksComponent>, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?tick\@ClientAutoStepSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UAutoStepRequestFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UPlayerGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UMoveRequestComponent\@\@USlideOffsetComponent\@\@USubBBsComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + */ + virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct SynchedActorDataComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct MoveRequestComponent, struct SlideOffsetComponent, struct SubBBsComponent, struct SideBySidePlaybackBlocksComponent>, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** * @symbol ?createClientAutoStepSystem\@ClientAutoStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp b/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp index 369230b091..346a1b7029 100644 --- a/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp @@ -26,6 +26,7 @@ class ClientCacheMissResponsePacket : public Packet { public: class ClientCacheMissResponsePacket& operator=(class ClientCacheMissResponsePacket const &) = delete; ClientCacheMissResponsePacket(class ClientCacheMissResponsePacket const &) = delete; + ClientCacheMissResponsePacket() = delete; #endif public: @@ -60,9 +61,5 @@ class ClientCacheMissResponsePacket : public Packet { */ MCVAPI ~ClientCacheMissResponsePacket(); #endif - /** - * @symbol ??0ClientCacheMissResponsePacket\@\@QEAA\@XZ - */ - MCAPI ClientCacheMissResponsePacket(); }; diff --git a/LiteLoader/include/llapi/mc/ClientChunkGenerationValidationData.hpp b/LiteLoader/include/llapi/mc/ClientChunkGenerationValidationData.hpp index 0a730b5b26..889fc99480 100644 --- a/LiteLoader/include/llapi/mc/ClientChunkGenerationValidationData.hpp +++ b/LiteLoader/include/llapi/mc/ClientChunkGenerationValidationData.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class ClientChunkGenerationValidationData { +struct ClientChunkGenerationValidationData { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_CLIENTCHUNKGENERATIONVALIDATIONDATA public: - class ClientChunkGenerationValidationData& operator=(class ClientChunkGenerationValidationData const &) = delete; - ClientChunkGenerationValidationData(class ClientChunkGenerationValidationData const &) = delete; + struct ClientChunkGenerationValidationData& operator=(struct ClientChunkGenerationValidationData const &) = delete; + ClientChunkGenerationValidationData(struct ClientChunkGenerationValidationData const &) = delete; ClientChunkGenerationValidationData() = delete; #endif @@ -35,6 +35,4 @@ class ClientChunkGenerationValidationData { */ MCAPI void _captureChunkData(class std::map, struct std::less, class std::allocator>>> &, class ChunkSource &); -protected: - -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ClientInputLockComponent.hpp b/LiteLoader/include/llapi/mc/ClientInputLockComponent.hpp index 7c83536389..60f1fc699e 100644 --- a/LiteLoader/include/llapi/mc/ClientInputLockComponent.hpp +++ b/LiteLoader/include/llapi/mc/ClientInputLockComponent.hpp @@ -36,6 +36,10 @@ struct ClientInputLockComponent { * @symbol ?hasLockType\@ClientInputLockComponent\@\@QEBA_NW4ClientInputLockType\@\@\@Z */ MCAPI bool hasLockType(enum class ClientInputLockType) const; + /** + * @symbol ?serialize\@ClientInputLockComponent\@\@QEBAIXZ + */ + MCAPI unsigned int serialize() const; /** * @symbol ?setLockCategory\@ClientInputLockComponent\@\@QEAAXW4ClientInputLockCategory\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/ClientInputUpdateSystem.hpp b/LiteLoader/include/llapi/mc/ClientInputUpdateSystem.hpp index 80509c0ac2..e65e13630a 100644 --- a/LiteLoader/include/llapi/mc/ClientInputUpdateSystem.hpp +++ b/LiteLoader/include/llapi/mc/ClientInputUpdateSystem.hpp @@ -31,6 +31,14 @@ class ClientInputUpdateSystem { * @symbol ?create\@ClientInputUpdateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); + /** + * @symbol ?createAntiCheatApplySystem\@ClientInputUpdateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createAntiCheatApplySystem(); + /** + * @symbol ?createAntiCheatExtractSystem\@ClientInputUpdateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createAntiCheatExtractSystem(); /** * @symbol ?extractRawHIDInput\@ClientInputUpdateSystem\@\@SAXAEBVLayeredAbilities\@\@AEBVSynchedActorData\@\@_NAEAURawMoveInputComponent\@\@AEBVMoveInputHandler\@\@PEBUSneakingComponent\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ClientInputUpdateSystemImpl.hpp b/LiteLoader/include/llapi/mc/ClientInputUpdateSystemImpl.hpp new file mode 100644 index 0000000000..87c4413093 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ClientInputUpdateSystemImpl.hpp @@ -0,0 +1,28 @@ +/** + * @file ClientInputUpdateSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ClientInputUpdateSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?updateMoveInputApply\@ClientInputUpdateSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@AEAUMoveInputComponent\@\@\@Z + */ + MCAPI void updateMoveInputApply(class StrictEntityContext const &, class ActorMovementProxyComponent &, struct MoveInputComponent &); + /** + * @symbol ?updateMoveInputExtract\@ClientInputUpdateSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@AEAUMoveInputComponent\@\@\@Z + */ + MCAPI void updateMoveInputExtract(class StrictEntityContext const &, class ActorMovementProxyComponent &, struct MoveInputComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ClientRequestPlaceholderBlock.hpp b/LiteLoader/include/llapi/mc/ClientRequestPlaceholderBlock.hpp index 3f182723c5..b42c71cb62 100644 --- a/LiteLoader/include/llapi/mc/ClientRequestPlaceholderBlock.hpp +++ b/LiteLoader/include/llapi/mc/ClientRequestPlaceholderBlock.hpp @@ -176,20 +176,20 @@ class ClientRequestPlaceholderBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,30 +201,35 @@ class ClientRequestPlaceholderBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 176 * @symbol ?clip\@ClientRequestPlaceholderBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0ClientRequestPlaceholderBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ClientSideChunkGeneration.hpp b/LiteLoader/include/llapi/mc/ClientSideChunkGeneration.hpp new file mode 100644 index 0000000000..a52391a21d --- /dev/null +++ b/LiteLoader/include/llapi/mc/ClientSideChunkGeneration.hpp @@ -0,0 +1,36 @@ +/** + * @file ClientSideChunkGeneration.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ClientSideChunkGeneration { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?LowTierRadiusThreshold\@ClientSideChunkGeneration\@\@3EB + */ + MCAPI extern unsigned char const LowTierRadiusThreshold; + /** + * @symbol ?ServerBuildRatioOverride\@ClientSideChunkGeneration\@\@3V?$optional\@M\@std\@\@A + */ + MCAPI extern class std::optional ServerBuildRatioOverride; + /** + * @symbol ?getMaxChunkBuildRadius\@ClientSideChunkGeneration\@\@YAEAEBVPlayer\@\@\@Z + */ + MCAPI unsigned char getMaxChunkBuildRadius(class Player const &); + /** + * @symbol ?getOptimalServerChunkBuildRadiusRatio\@ClientSideChunkGeneration\@\@YAMEE\@Z + */ + MCAPI float getOptimalServerChunkBuildRadiusRatio(unsigned char, unsigned char); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ClientStopGlidingSystem.hpp b/LiteLoader/include/llapi/mc/ClientStopGlidingSystem.hpp index 8cac945791..bfe1b35f0a 100644 --- a/LiteLoader/include/llapi/mc/ClientStopGlidingSystem.hpp +++ b/LiteLoader/include/llapi/mc/ClientStopGlidingSystem.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class ClientStopGlidingSystem { +struct ClientStopGlidingSystem { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_CLIENTSTOPGLIDINGSYSTEM public: - class ClientStopGlidingSystem& operator=(class ClientStopGlidingSystem const &) = delete; - ClientStopGlidingSystem(class ClientStopGlidingSystem const &) = delete; + struct ClientStopGlidingSystem& operator=(struct ClientStopGlidingSystem const &) = delete; + ClientStopGlidingSystem(struct ClientStopGlidingSystem const &) = delete; ClientStopGlidingSystem() = delete; #endif @@ -41,12 +41,17 @@ class ClientStopGlidingSystem { virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol ?tick\@ClientStopGlidingSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@\@\@U?$Read\@UStateVectorComponent\@\@UCollisionBoxDefinitionComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UOffsetsComponent\@\@UPlayerActionComponent\@\@USynchedActorDataComponent\@\@\@\@U?$AddRemove\@V?$FlagComponent\@UStopGlidingRequestFlag\@\@\@\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@U?$GlobalRead\@$$V\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @symbol __unk_vfn_3 */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, class FlagComponent>, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?tick\@ClientStopGlidingSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UStateVectorComponent\@\@UCollisionBoxDefinitionComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UOffsetsComponent\@\@UPlayerActionComponent\@\@USynchedActorDataComponent\@\@\@\@U?$AddRemove\@V?$FlagComponent\@UStopGlidingRequestFlag\@\@\@\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@U?$GlobalRead\@$$V\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + */ + virtual void tick(class StrictExecutionContext, class FlagComponent>, struct Read, struct Write, struct AddRemove, class FlagComponent>, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** * @symbol ?createClientStopGlidingSystem\@ClientStopGlidingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createClientStopGlidingSystem(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ClimateParameters.hpp b/LiteLoader/include/llapi/mc/ClimateParameters.hpp index 5aeb3d7391..77bdf96364 100644 --- a/LiteLoader/include/llapi/mc/ClimateParameters.hpp +++ b/LiteLoader/include/llapi/mc/ClimateParameters.hpp @@ -13,7 +13,7 @@ #undef BEFORE_EXTRA -class ClimateParameters { +struct ClimateParameters { #define AFTER_EXTRA // Add Member There @@ -21,8 +21,8 @@ class ClimateParameters { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_CLIMATEPARAMETERS public: - class ClimateParameters& operator=(class ClimateParameters const &) = delete; - ClimateParameters(class ClimateParameters const &) = delete; + struct ClimateParameters& operator=(struct ClimateParameters const &) = delete; + ClimateParameters(struct ClimateParameters const &) = delete; ClimateParameters() = delete; #endif @@ -36,4 +36,4 @@ class ClimateParameters { */ MCAPI __int64 fitness(struct TargetPoint const &) const; -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ClimateUtils.hpp b/LiteLoader/include/llapi/mc/ClimateUtils.hpp index 9068f081d2..113c0d1574 100644 --- a/LiteLoader/include/llapi/mc/ClimateUtils.hpp +++ b/LiteLoader/include/llapi/mc/ClimateUtils.hpp @@ -39,4 +39,4 @@ struct Parameter { */ MCAPI __int64 squareDistance(class std::array const &, struct ClimateUtils::TargetSpace const &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ClockSpriteCalculator.hpp b/LiteLoader/include/llapi/mc/ClockSpriteCalculator.hpp index cfb7453577..369270f5ad 100644 --- a/LiteLoader/include/llapi/mc/ClockSpriteCalculator.hpp +++ b/LiteLoader/include/llapi/mc/ClockSpriteCalculator.hpp @@ -32,10 +32,6 @@ class ClockSpriteCalculator { * @symbol ??0ClockSpriteCalculator\@\@QEAA\@XZ */ MCAPI ClockSpriteCalculator(); - /** - * @symbol ?getFrame\@ClockSpriteCalculator\@\@QEBAHXZ - */ - MCAPI int getFrame() const; /** * @symbol ?update\@ClockSpriteCalculator\@\@QEAAHAEBVBlockSource\@\@AEBVVec3\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/CloneCommand.hpp b/LiteLoader/include/llapi/mc/CloneCommand.hpp index 3e1bc135b9..d8d50f3c91 100644 --- a/LiteLoader/include/llapi/mc/CloneCommand.hpp +++ b/LiteLoader/include/llapi/mc/CloneCommand.hpp @@ -36,7 +36,7 @@ class CloneCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@CloneCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/CloseWebSocketCommand.hpp b/LiteLoader/include/llapi/mc/CloseWebSocketCommand.hpp index f42b2adee6..bc2fb76618 100644 --- a/LiteLoader/include/llapi/mc/CloseWebSocketCommand.hpp +++ b/LiteLoader/include/llapi/mc/CloseWebSocketCommand.hpp @@ -36,7 +36,7 @@ class CloseWebSocketCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@CloseWebSocketCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ClothBlock.hpp b/LiteLoader/include/llapi/mc/ClothBlock.hpp index 65e1f462f9..a3474ff21c 100644 --- a/LiteLoader/include/llapi/mc/ClothBlock.hpp +++ b/LiteLoader/include/llapi/mc/ClothBlock.hpp @@ -176,30 +176,30 @@ class ClothBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@ClothBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@ClothBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,25 +211,30 @@ class ClothBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CLOTHBLOCK /** * @symbol ?canDamperVibrations\@ClothBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CobblestoneBlock.hpp b/LiteLoader/include/llapi/mc/CobblestoneBlock.hpp index 7f02b70703..dca5f7e0e2 100644 --- a/LiteLoader/include/llapi/mc/CobblestoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/CobblestoneBlock.hpp @@ -176,25 +176,25 @@ class CobblestoneBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 159 - * @symbol ?tryGetInfested\@CobblestoneBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual class Block const * tryGetInfested(class Block const &) const; + virtual void __unk_vfn_157(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 160 + * @symbol ?tryGetInfested\@CobblestoneBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ - virtual void __unk_vfn_165(); + virtual class Block const * tryGetInfested(class Block const &) const; /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,25 +206,30 @@ class CobblestoneBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0CobblestoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CocoaBlock.hpp b/LiteLoader/include/llapi/mc/CocoaBlock.hpp index a848c64118..bbff9ed422 100644 --- a/LiteLoader/include/llapi/mc/CocoaBlock.hpp +++ b/LiteLoader/include/llapi/mc/CocoaBlock.hpp @@ -182,9 +182,9 @@ class CocoaBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@CocoaBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@CocoaBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,25 +201,25 @@ class CocoaBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@CocoaBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 144 + * @symbol ?getVisualShape\@CocoaBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -231,47 +231,52 @@ class CocoaBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@CocoaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@CocoaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@CocoaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@CocoaBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@CocoaBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/CodeBuilder.hpp b/LiteLoader/include/llapi/mc/CodeBuilder.hpp index 3f08353942..7c318525ef 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilder.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilder.hpp @@ -52,14 +52,14 @@ struct DataMessage; * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUCommandMessage\@1\@\@Z */ MCAPI std::string serialize(struct CodeBuilder::CommandMessage const &); - /** - * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUChatMessage\@1\@AEBV23\@\@Z - */ - MCAPI std::string serialize(struct CodeBuilder::ChatMessage const &, std::string const &); /** * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUEncryptionResult\@1\@\@Z */ MCAPI std::string serialize(struct CodeBuilder::EncryptionResult const &); + /** + * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUChatMessage\@1\@AEBV23\@\@Z + */ + MCAPI std::string serialize(struct CodeBuilder::ChatMessage const &, std::string const &); /** * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUErrorMessage\@1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CodeBuilderActorInfoCommand.hpp b/LiteLoader/include/llapi/mc/CodeBuilderActorInfoCommand.hpp index bdbffb19cc..95051d5edc 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilderActorInfoCommand.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilderActorInfoCommand.hpp @@ -34,7 +34,7 @@ class CodeBuilderActorInfoCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@CodeBuilderActorInfoCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/CodeBuilderCommand.hpp b/LiteLoader/include/llapi/mc/CodeBuilderCommand.hpp index 2c6794b6db..51c88396da 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilderCommand.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilderCommand.hpp @@ -36,7 +36,7 @@ class CodeBuilderCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@CodeBuilderCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/CodeScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/CodeScreenCapabilities.hpp index d56ae6086f..b1e423f908 100644 --- a/LiteLoader/include/llapi/mc/CodeScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/CodeScreenCapabilities.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -12,7 +13,7 @@ #undef BEFORE_EXTRA -class CodeScreenCapabilities { +struct CodeScreenCapabilities { #define AFTER_EXTRA // Add Member There @@ -20,8 +21,8 @@ class CodeScreenCapabilities { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_CODESCREENCAPABILITIES public: - class CodeScreenCapabilities& operator=(class CodeScreenCapabilities const &) = delete; - CodeScreenCapabilities(class CodeScreenCapabilities const &) = delete; + struct CodeScreenCapabilities& operator=(struct CodeScreenCapabilities const &) = delete; + CodeScreenCapabilities(struct CodeScreenCapabilities const &) = delete; CodeScreenCapabilities() = delete; #endif @@ -33,9 +34,9 @@ class CodeScreenCapabilities { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@UCodeScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @symbol ?isOfType\@?$TypedScreenCapabilities\@UCodeScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@Bedrock\@\@\@Z */ - virtual bool isOfType(class typeid_t) const; + virtual bool isOfType(class Bedrock::typeid_t) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CODESCREENCAPABILITIES /** * @symbol __unk_destructor_-1 @@ -43,4 +44,4 @@ class CodeScreenCapabilities { MCVAPI ~CodeScreenCapabilities(); #endif -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/CollisionBoxDefinition.hpp b/LiteLoader/include/llapi/mc/CollisionBoxDefinition.hpp index d56704c305..c8be4aaf01 100644 --- a/LiteLoader/include/llapi/mc/CollisionBoxDefinition.hpp +++ b/LiteLoader/include/llapi/mc/CollisionBoxDefinition.hpp @@ -30,6 +30,10 @@ struct CollisionBoxDefinition { #endif public: + /** + * @symbol ?initialize\@CollisionBoxDefinition\@\@QEBAXAEAVEntityContext\@\@AEAUCollisionBoxDefinitionComponent\@\@\@Z + */ + MCAPI void initialize(class EntityContext &, struct CollisionBoxDefinitionComponent &) const; /** * @symbol ?setHeight\@CollisionBoxDefinition\@\@QEAAXAEBM\@Z */ diff --git a/LiteLoader/include/llapi/mc/ColorFormat.hpp b/LiteLoader/include/llapi/mc/ColorFormat.hpp index 5763a5a9ef..78d28aa91a 100644 --- a/LiteLoader/include/llapi/mc/ColorFormat.hpp +++ b/LiteLoader/include/llapi/mc/ColorFormat.hpp @@ -125,6 +125,46 @@ LIAPI std::string& transferColorCodeToConsole(std::string& str, bool keepColorCo * @symbol ?LIGHT_PURPLE\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const LIGHT_PURPLE; + /** + * @symbol ?MATERIAL_AMETHYST\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const MATERIAL_AMETHYST; + /** + * @symbol ?MATERIAL_COPPER\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const MATERIAL_COPPER; + /** + * @symbol ?MATERIAL_DIAMOND\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const MATERIAL_DIAMOND; + /** + * @symbol ?MATERIAL_EMERALD\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const MATERIAL_EMERALD; + /** + * @symbol ?MATERIAL_GOLD\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const MATERIAL_GOLD; + /** + * @symbol ?MATERIAL_IRON\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const MATERIAL_IRON; + /** + * @symbol ?MATERIAL_LAPIS\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const MATERIAL_LAPIS; + /** + * @symbol ?MATERIAL_NETHERITE\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const MATERIAL_NETHERITE; + /** + * @symbol ?MATERIAL_QUARTZ\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const MATERIAL_QUARTZ; + /** + * @symbol ?MATERIAL_REDSTONE\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const MATERIAL_REDSTONE; /** * @symbol ?MINECOIN_GOLD\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/ColoredBlock.hpp b/LiteLoader/include/llapi/mc/ColoredBlock.hpp index fb76083872..44c9f86497 100644 --- a/LiteLoader/include/llapi/mc/ColoredBlock.hpp +++ b/LiteLoader/include/llapi/mc/ColoredBlock.hpp @@ -181,30 +181,30 @@ class ColoredBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@ColoredBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@ColoredBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,37 +216,42 @@ class ColoredBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@ColoredBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@ColoredBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@ColoredBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp b/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp index 2259190b6b..0e4f8e0842 100644 --- a/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp @@ -172,9 +172,9 @@ class ColoredTorchBlock : public TorchBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@ColoredTorchBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@ColoredTorchBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -191,40 +191,40 @@ class ColoredTorchBlock : public TorchBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@ColoredTorchBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@ColoredTorchBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@ColoredTorchBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@ColoredTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -236,27 +236,32 @@ class ColoredTorchBlock : public TorchBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@ColoredTorchBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; @@ -269,12 +274,4 @@ class ColoredTorchBlock : public TorchBlock { */ MCAPI static class ItemInstance getItemForColor(enum class ColoredTorchColor); -//private: - /** - * @symbol ?_getColor\@ColoredTorchBlock\@\@AEBA?AW4ColoredTorchColor\@\@AEBVBlock\@\@\@Z - */ - MCAPI enum class ColoredTorchColor _getColor(class Block const &) const; - -private: - }; diff --git a/LiteLoader/include/llapi/mc/Command.hpp b/LiteLoader/include/llapi/mc/Command.hpp index 7fb8b17d1c..1a16793e30 100644 --- a/LiteLoader/include/llapi/mc/Command.hpp +++ b/LiteLoader/include/llapi/mc/Command.hpp @@ -65,7 +65,7 @@ class Command { virtual bool collectOptionalArguments(); /** * @vftbl 2 - * @symbol ?execute\@PlaySoundCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?execute\@SetMaxPlayersCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ public: virtual void execute(class CommandOrigin const &, class CommandOutput &) const = 0; @@ -103,14 +103,14 @@ class Command { * @symbol ?shouldUseCommandOriginRotation\@Command\@\@SA_NAEBVCommandOrigin\@\@H\@Z */ MCAPI static bool shouldUseCommandOriginRotation(class CommandOrigin const &, int); - /** - * @symbol ?validRange\@Command\@\@SA_NMMMAEAVCommandOutput\@\@\@Z - */ - MCAPI static bool validRange(float, float, float, class CommandOutput &); /** * @symbol ?validRange\@Command\@\@SA_NHHHAEAVCommandOutput\@\@\@Z */ MCAPI static bool validRange(int, int, int, class CommandOutput &); + /** + * @symbol ?validRange\@Command\@\@SA_NMMMAEAVCommandOutput\@\@\@Z + */ + MCAPI static bool validRange(float, float, float, class CommandOutput &); //protected: /** diff --git a/LiteLoader/include/llapi/mc/CommandArea.hpp b/LiteLoader/include/llapi/mc/CommandArea.hpp index b4b5483c58..61789c7bd6 100644 --- a/LiteLoader/include/llapi/mc/CommandArea.hpp +++ b/LiteLoader/include/llapi/mc/CommandArea.hpp @@ -27,10 +27,6 @@ class CommandArea { #endif public: - /** - * @symbol ??0CommandArea\@\@QEAA\@V?$unique_ptr\@VChunkViewSource\@\@U?$default_delete\@VChunkViewSource\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI CommandArea(std::unique_ptr); /** * @symbol ?getDimensionBlockSource\@CommandArea\@\@QEAAAEAVBlockSource\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CommandAreaFactory.hpp b/LiteLoader/include/llapi/mc/CommandAreaFactory.hpp index 87cd58000f..6528fceae3 100644 --- a/LiteLoader/include/llapi/mc/CommandAreaFactory.hpp +++ b/LiteLoader/include/llapi/mc/CommandAreaFactory.hpp @@ -37,18 +37,6 @@ class CommandAreaFactory { * @symbol ?findArea\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0_N11\@Z */ MCAPI std::unique_ptr findArea(class BlockPos const &, class BlockPos const &, bool, bool, bool) const; - /** - * @symbol ?findArea\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0H_N1\@Z - */ - MCAPI std::unique_ptr findArea(class BlockPos const &, class BlockPos const &, int, bool, bool) const; - /** - * @symbol ?findArea\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@H_N1\@Z - */ - MCAPI std::unique_ptr findArea(class BlockPos const &, int, bool, bool) const; - /** - * @symbol ?findAreaWithBuffer\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@H_N1\@Z - */ - MCAPI std::unique_ptr findAreaWithBuffer(class BlockPos const &, int, bool, bool) const; /** * @symbol ?findAreaWithBuffer\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0H_N1\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandBlock.hpp b/LiteLoader/include/llapi/mc/CommandBlock.hpp index a1c7b25969..0ff428e667 100644 --- a/LiteLoader/include/llapi/mc/CommandBlock.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlock.hpp @@ -182,9 +182,9 @@ class CommandBlock : public ActorBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@CommandBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@CommandBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,30 +206,30 @@ class CommandBlock : public ActorBlock { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 * @symbol ?getVariant\@CommandBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 + * @vftbl 150 * @symbol ?getMappedFace\@CommandBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -242,69 +242,49 @@ class CommandBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@CommandBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 - */ - virtual void __unk_vfn_178(); - /** - * @vftbl 186 - * @symbol __unk_vfn_186 - */ - virtual void __unk_vfn_186(); - /** - * @vftbl 195 - * @symbol __unk_vfn_195 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_195(); + virtual void __unk_vfn_179(); /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_196(); - /** - * @vftbl 197 - * @symbol __unk_vfn_197 - */ - virtual void __unk_vfn_197(); - /** - * @vftbl 198 - * @symbol __unk_vfn_198 - */ - virtual void __unk_vfn_198(); - /** - * @vftbl 199 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z - */ - virtual void _Delete_this(bool); + virtual void __unk_vfn_187(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMMANDBLOCK /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?canInstatick\@CommandBlock\@\@UEBA_NXZ */ - MCAPI std::string const & getDescriptionId() const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMMANDBLOCK + MCVAPI bool canInstatick() const; /** * @symbol ?hasComparatorSignal\@CommandBlock\@\@UEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/CommandBlockActor.hpp b/LiteLoader/include/llapi/mc/CommandBlockActor.hpp index 406cfc4800..e0445214d9 100644 --- a/LiteLoader/include/llapi/mc/CommandBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockActor.hpp @@ -140,10 +140,6 @@ class CommandBlockActor : public BlockActor { * @symbol ?_playerCanUpdate\@CommandBlockActor\@\@MEBA_NAEBVPlayer\@\@\@Z */ virtual bool _playerCanUpdate(class Player const &) const; - /** - * @symbol ??0CommandBlockActor\@\@QEAA\@AEBVBlockPos\@\@W4CommandBlockMode\@\@\@Z - */ - MCAPI CommandBlockActor(class BlockPos const &, enum class CommandBlockMode); /** * @symbol ?getBaseCommandBlock\@CommandBlockActor\@\@QEAAAEAVBaseCommandBlock\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CommandBlockName.hpp b/LiteLoader/include/llapi/mc/CommandBlockName.hpp index b090ef98f2..b5f17658bc 100644 --- a/LiteLoader/include/llapi/mc/CommandBlockName.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockName.hpp @@ -44,6 +44,10 @@ class CommandBlockName { * @symbol ??BCommandBlockName\@\@QEBA_KXZ */ MCAPI operator unsigned __int64() const; + /** + * @symbol ?resolveBlock\@CommandBlockName\@\@QEBA?AVCommandBlockNameResult\@\@AEBV?$vector\@VBlockStateCommandParam\@\@V?$allocator\@VBlockStateCommandParam\@\@\@std\@\@\@std\@\@AEAVCommandOutput\@\@\@Z + */ + MCAPI class CommandBlockNameResult resolveBlock(std::vector const &, class CommandOutput &) const; /** * @symbol ?resolveBlock\@CommandBlockName\@\@QEBA?AVCommandBlockNameResult\@\@AEBV?$vector\@VBlockStateCommandParam\@\@V?$allocator\@VBlockStateCommandParam\@\@\@std\@\@\@std\@\@HAEAVCommandOutput\@\@\@Z */ @@ -52,9 +56,5 @@ class CommandBlockName { * @symbol ?resolveBlock\@CommandBlockName\@\@QEBA?AVCommandBlockNameResult\@\@H\@Z */ MCAPI class CommandBlockNameResult resolveBlock(int) const; - /** - * @symbol ?resolveBlock\@CommandBlockName\@\@QEBA?AVCommandBlockNameResult\@\@AEBV?$vector\@VBlockStateCommandParam\@\@V?$allocator\@VBlockStateCommandParam\@\@\@std\@\@\@std\@\@AEAVCommandOutput\@\@\@Z - */ - MCAPI class CommandBlockNameResult resolveBlock(std::vector const &, class CommandOutput &) const; }; diff --git a/LiteLoader/include/llapi/mc/CommandChainedSubcommand.hpp b/LiteLoader/include/llapi/mc/CommandChainedSubcommand.hpp index 748554400a..07ef7f09c8 100644 --- a/LiteLoader/include/llapi/mc/CommandChainedSubcommand.hpp +++ b/LiteLoader/include/llapi/mc/CommandChainedSubcommand.hpp @@ -31,9 +31,5 @@ class CommandChainedSubcommand { * @symbol ?getCommand\@CommandChainedSubcommand\@\@QEBAPEBVCommand\@\@XZ */ MCAPI class Command const * getCommand() const; - /** - * @symbol ?setCommand\@CommandChainedSubcommand\@\@QEAAXV?$unique_ptr\@VCommand\@\@U?$default_delete\@VCommand\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI void setCommand(std::unique_ptr); }; diff --git a/LiteLoader/include/llapi/mc/CommandFunctionEntry.hpp b/LiteLoader/include/llapi/mc/CommandFunctionEntry.hpp index 77a515e45e..ac40b004d0 100644 --- a/LiteLoader/include/llapi/mc/CommandFunctionEntry.hpp +++ b/LiteLoader/include/llapi/mc/CommandFunctionEntry.hpp @@ -39,9 +39,5 @@ class CommandFunctionEntry { * @symbol ?execute\@CommandFunctionEntry\@\@UEAAXAEAVFunctionManager\@\@AEBVCommandOrigin\@\@W4FunctionQueueOrder\@\@\@Z */ virtual void execute(class FunctionManager &, class CommandOrigin const &, enum class FunctionQueueOrder); - /** - * @symbol ??0CommandFunctionEntry\@\@QEAA\@V?$unique_ptr\@VCommand\@\@U?$default_delete\@VCommand\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI CommandFunctionEntry(std::unique_ptr); }; diff --git a/LiteLoader/include/llapi/mc/CommandItem.hpp b/LiteLoader/include/llapi/mc/CommandItem.hpp index dc1f426402..736dd149af 100644 --- a/LiteLoader/include/llapi/mc/CommandItem.hpp +++ b/LiteLoader/include/llapi/mc/CommandItem.hpp @@ -39,10 +39,6 @@ class CommandItem { * @symbol ??0CommandItem\@\@QEAA\@HF_N\@Z */ MCAPI CommandItem(int, short, bool); - /** - * @symbol ??0CommandItem\@\@QEAA\@_K\@Z - */ - MCAPI CommandItem(unsigned __int64); /** * @symbol ?createInstance\@CommandItem\@\@QEBA?AV?$optional\@VItemInstance\@\@\@std\@\@HHPEAVCommandOutput\@\@_N\@Z */ @@ -55,9 +51,5 @@ class CommandItem { * @symbol ??BCommandItem\@\@QEBA_NXZ */ MCAPI operator bool() const; - /** - * @symbol ??BCommandItem\@\@QEBA_KXZ - */ - MCAPI operator unsigned __int64() const; }; diff --git a/LiteLoader/include/llapi/mc/CommandLexer.hpp b/LiteLoader/include/llapi/mc/CommandLexer.hpp index 4680954828..ee637b6c3e 100644 --- a/LiteLoader/include/llapi/mc/CommandLexer.hpp +++ b/LiteLoader/include/llapi/mc/CommandLexer.hpp @@ -29,25 +29,9 @@ class CommandLexer { #endif public: - /** - * @symbol ??0CommandLexer\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI CommandLexer(std::string const &); - /** - * @symbol ?next\@CommandLexer\@\@QEBAAEBUToken\@1\@XZ - */ - MCAPI struct CommandLexer::Token const & next() const; /** * @symbol ?step\@CommandLexer\@\@QEAAXXZ */ MCAPI void step(); - /** - * @symbol ?isDigit\@CommandLexer\@\@SA_ND\@Z - */ - MCAPI static bool isDigit(char); - /** - * @symbol ?isFilePathCharacter\@CommandLexer\@\@SA_ND\@Z - */ - MCAPI static bool isFilePathCharacter(char); }; diff --git a/LiteLoader/include/llapi/mc/CommandManager.hpp b/LiteLoader/include/llapi/mc/CommandManager.hpp new file mode 100644 index 0000000000..b0ef43b337 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CommandManager.hpp @@ -0,0 +1,64 @@ +/** + * @file CommandManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CommandManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMMANDMANAGER +public: + class CommandManager& operator=(class CommandManager const &) = delete; + CommandManager(class CommandManager const &) = delete; + CommandManager() = delete; +#endif + +public: + /** + * @symbol ??0CommandManager\@\@QEAA\@AEAVMinecraftCommands\@\@\@Z + */ + MCAPI CommandManager(class MinecraftCommands &); + /** + * @symbol ?getCommands\@CommandManager\@\@QEAAAEAVMinecraftCommands\@\@XZ + */ + MCAPI class MinecraftCommands & getCommands(); + /** + * @symbol ?getFunctionManager\@CommandManager\@\@QEAAAEAVFunctionManager\@\@XZ + */ + MCAPI class FunctionManager & getFunctionManager(); + /** + * @symbol ?initialize\@CommandManager\@\@QEAAXV?$unique_ptr\@VFunctionManager\@\@U?$default_delete\@VFunctionManager\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI void initialize(std::unique_ptr); + /** + * @symbol ?loadFunctionManager\@CommandManager\@\@QEAAXAEAVResourcePackManager\@\@\@Z + */ + MCAPI void loadFunctionManager(class ResourcePackManager &); + /** + * @symbol ?runCommand\@CommandManager\@\@QEAAXAEAVCommand\@\@AEAVCommandOrigin\@\@W4CommandOriginSystem\@\@\@Z + */ + MCAPI void runCommand(class Command &, class CommandOrigin &, enum class CommandOriginSystem); + /** + * @symbol ?runCommand\@CommandManager\@\@QEAAXAEBVHashedString\@\@AEAVCommandOrigin\@\@W4CommandOriginSystem\@\@W4CurrentCmdVersion\@\@\@Z + */ + MCAPI void runCommand(class HashedString const &, class CommandOrigin &, enum class CommandOriginSystem, enum class CurrentCmdVersion); + /** + * @symbol ?tick\@CommandManager\@\@QEAAXXZ + */ + MCAPI void tick(); + /** + * @symbol ??1CommandManager\@\@QEAA\@XZ + */ + MCAPI ~CommandManager(); + +}; diff --git a/LiteLoader/include/llapi/mc/CommandMessage.hpp b/LiteLoader/include/llapi/mc/CommandMessage.hpp index dc65b48103..356bf2ba5f 100644 --- a/LiteLoader/include/llapi/mc/CommandMessage.hpp +++ b/LiteLoader/include/llapi/mc/CommandMessage.hpp @@ -8,7 +8,7 @@ #define BEFORE_EXTRA // Include Headers or Declare Types Here - +#include "CommandSelector.hpp" #undef BEFORE_EXTRA /** @@ -21,7 +21,7 @@ class CommandMessage { // Add Member There struct MessageComponent { std::string string; - std::unique_ptr> selection; + std::unique_ptr> selection; }; /*{ char filler[200]; diff --git a/LiteLoader/include/llapi/mc/CommandOrigin.hpp b/LiteLoader/include/llapi/mc/CommandOrigin.hpp index 13845bf2f9..8b907446bb 100644 --- a/LiteLoader/include/llapi/mc/CommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/CommandOrigin.hpp @@ -49,52 +49,52 @@ LIAPI ServerPlayer* getPlayer() const; virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?getRequestId\@ActorCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getRequestId\@VirtualCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getRequestId() const = 0; /** * @vftbl 2 - * @symbol ?getName\@ActorCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@VirtualCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const = 0; /** * @vftbl 3 - * @symbol ?getBlockPosition\@ActorCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ + * @symbol ?getBlockPosition\@VirtualCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ */ virtual class BlockPos getBlockPosition() const = 0; /** * @vftbl 4 - * @symbol ?getWorldPosition\@ActorCommandOrigin\@\@UEBA?AVVec3\@\@XZ + * @symbol ?getWorldPosition\@VirtualCommandOrigin\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getWorldPosition() const = 0; /** * @vftbl 5 - * @symbol ?getRotation\@ActorCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ + * @symbol ?getRotation\@VirtualCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ */ virtual class std::optional getRotation() const = 0; /** * @vftbl 6 - * @symbol ?getLevel\@ActorCommandOrigin\@\@UEBAPEAVLevel\@\@XZ + * @symbol ?getLevel\@VirtualCommandOrigin\@\@UEBAPEAVLevel\@\@XZ */ virtual class Level * getLevel() const = 0; /** * @vftbl 7 - * @symbol ?getDimension\@ActorCommandOrigin\@\@UEBAPEAVDimension\@\@XZ + * @symbol ?getDimension\@VirtualCommandOrigin\@\@UEBAPEAVDimension\@\@XZ */ virtual class Dimension * getDimension() const = 0; /** * @vftbl 8 - * @symbol ?getEntity\@ActorCommandOrigin\@\@UEBAPEAVActor\@\@XZ + * @symbol ?getEntity\@VirtualCommandOrigin\@\@UEBAPEAVActor\@\@XZ */ virtual class Actor * getEntity() const = 0; /** * @vftbl 9 - * @symbol ?getPermissionsLevel\@ActorCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ + * @symbol ?getPermissionsLevel\@VirtualCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getPermissionsLevel() const = 0; /** * @vftbl 10 - * @symbol ?clone\@ActorCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ + * @symbol ?clone\@VirtualCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const = 0; /** @@ -159,7 +159,7 @@ LIAPI ServerPlayer* getPlayer() const; virtual struct CommandOriginIdentity getIdentity() const; /** * @vftbl 23 - * @symbol ?getOriginType\@ActorCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ + * @symbol ?getOriginType\@VirtualCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ */ virtual enum class CommandOriginType getOriginType() const = 0; /** @@ -194,7 +194,7 @@ LIAPI ServerPlayer* getPlayer() const; virtual class CompoundTag serialize() const; /** * @vftbl 30 - * @symbol ?isValid\@ActorCommandOrigin\@\@UEBA_NXZ + * @symbol ?isValid\@VirtualCommandOrigin\@\@UEBA_NXZ */ virtual bool isValid() const = 0; /** diff --git a/LiteLoader/include/llapi/mc/CommandOriginData.hpp b/LiteLoader/include/llapi/mc/CommandOriginData.hpp index fbd412252b..cfd8caf4b9 100644 --- a/LiteLoader/include/llapi/mc/CommandOriginData.hpp +++ b/LiteLoader/include/llapi/mc/CommandOriginData.hpp @@ -22,14 +22,14 @@ struct CommandOriginData { #undef AFTER_EXTRA public: - /** - * @symbol ??0CommandOriginData\@\@QEAA\@XZ - */ - MCAPI CommandOriginData(); /** * @symbol ??0CommandOriginData\@\@QEAA\@AEBU0\@\@Z */ MCAPI CommandOriginData(struct CommandOriginData const &); + /** + * @symbol ??0CommandOriginData\@\@QEAA\@XZ + */ + MCAPI CommandOriginData(); /** * @symbol ??4CommandOriginData\@\@QEAAAEAU0\@AEBU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandOutput.hpp b/LiteLoader/include/llapi/mc/CommandOutput.hpp index a9277c787f..429f9b5577 100644 --- a/LiteLoader/include/llapi/mc/CommandOutput.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutput.hpp @@ -150,10 +150,6 @@ class CommandOutput { * @symbol ?hasErrorMessage\@CommandOutput\@\@QEBA_NXZ */ MCAPI bool hasErrorMessage() const; - /** - * @symbol ?hasPlayerText\@CommandOutput\@\@QEBA_NXZ - */ - MCAPI bool hasPlayerText() const; /** * @symbol ?load\@CommandOutput\@\@QEAAXW4CommandOutputType\@\@H$$QEAV?$vector\@VCommandOutputMessage\@\@V?$allocator\@VCommandOutputMessage\@\@\@std\@\@\@std\@\@$$QEAV?$unique_ptr\@VCommandPropertyBag\@\@U?$default_delete\@VCommandPropertyBag\@\@\@std\@\@\@4\@\@Z */ @@ -162,14 +158,14 @@ class CommandOutput { * @symbol ?setHasPlayerText\@CommandOutput\@\@QEAAXXZ */ MCAPI void setHasPlayerText(); - /** - * @symbol ?success\@CommandOutput\@\@QEAAXXZ - */ - MCAPI void success(); /** * @symbol ?success\@CommandOutput\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VCommandOutputParameter\@\@V?$allocator\@VCommandOutputParameter\@\@\@std\@\@\@3\@\@Z */ MCAPI void success(std::string const &, std::vector const &); + /** + * @symbol ?success\@CommandOutput\@\@QEAAXXZ + */ + MCAPI void success(); /** * @symbol ?wantsData\@CommandOutput\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/CommandOutputMessage.hpp b/LiteLoader/include/llapi/mc/CommandOutputMessage.hpp index 9d8e1f5dd5..57f17d1e51 100644 --- a/LiteLoader/include/llapi/mc/CommandOutputMessage.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutputMessage.hpp @@ -32,14 +32,14 @@ class CommandOutputMessage { * @symbol ??0CommandOutputMessage\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI CommandOutputMessage(class CommandOutputMessage &&); - /** - * @symbol ??0CommandOutputMessage\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI CommandOutputMessage(class CommandOutputMessage const &); /** * @symbol ??0CommandOutputMessage\@\@QEAA\@W4CommandOutputMessageType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI CommandOutputMessage(enum class CommandOutputMessageType, std::string const &, std::vector &&); + /** + * @symbol ??0CommandOutputMessage\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI CommandOutputMessage(class CommandOutputMessage const &); /** * @symbol ?getMessageId\@CommandOutputMessage\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ @@ -52,10 +52,6 @@ class CommandOutputMessage { * @symbol ?getType\@CommandOutputMessage\@\@QEBA?AW4CommandOutputMessageType\@\@XZ */ MCAPI enum class CommandOutputMessageType getType() const; - /** - * @symbol ?getUserMessage\@CommandOutputMessage\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string getUserMessage() const; /** * @symbol ??1CommandOutputMessage\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp b/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp index 819303b08a..d7058dbee7 100644 --- a/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp @@ -33,45 +33,45 @@ class CommandOutputParameter { */ MCAPI CommandOutputParameter(std::vector const &); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBVActor\@\@\@Z */ - MCAPI CommandOutputParameter(class CommandOutputParameter &&); + MCAPI CommandOutputParameter(class Actor const &); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@VBlockPos\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@PEBVActor\@\@\@Z */ - MCAPI CommandOutputParameter(class BlockPos); + MCAPI CommandOutputParameter(class Actor const *); /** * @symbol ??0CommandOutputParameter\@\@QEAA\@PEBD\@Z */ MCAPI CommandOutputParameter(char const *); - /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@M\@Z - */ - MCAPI CommandOutputParameter(float); /** * @symbol ??0CommandOutputParameter\@\@QEAA\@H\@Z */ MCAPI CommandOutputParameter(int); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@_N\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@W4NoCountType\@0\@\@Z */ - MCAPI CommandOutputParameter(bool); + MCAPI CommandOutputParameter(enum class CommandOutputParameter::NoCountType); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$CommandSelectorResults\@VActor\@\@\@\@\@Z */ - MCAPI CommandOutputParameter(std::string const &); + MCAPI CommandOutputParameter(class CommandSelectorResults const &); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBVActor\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$CommandSelectorResults\@VPlayer\@\@\@\@\@Z */ - MCAPI CommandOutputParameter(class Actor const &); + MCAPI CommandOutputParameter(class CommandSelectorResults const &); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@PEBVActor\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@M\@Z */ - MCAPI CommandOutputParameter(class Actor const *); + MCAPI CommandOutputParameter(float); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@W4NoCountType\@0\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@VBlockPos\@\@\@Z */ - MCAPI CommandOutputParameter(enum class CommandOutputParameter::NoCountType); + MCAPI CommandOutputParameter(class BlockPos); + /** + * @symbol ??0CommandOutputParameter\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI CommandOutputParameter(class CommandOutputParameter &&); /** * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$vector\@PEBVActor\@\@V?$allocator\@PEBVActor\@\@\@std\@\@\@std\@\@\@Z */ @@ -81,17 +81,17 @@ class CommandOutputParameter { */ MCAPI CommandOutputParameter(std::vector const &); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@_N\@Z */ - MCAPI CommandOutputParameter(class CommandOutputParameter const &); + MCAPI CommandOutputParameter(bool); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$CommandSelectorResults\@VActor\@\@\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI CommandOutputParameter(class CommandSelectorResults const &); + MCAPI CommandOutputParameter(std::string const &); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$CommandSelectorResults\@VPlayer\@\@\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV0\@\@Z */ - MCAPI CommandOutputParameter(class CommandSelectorResults const &); + MCAPI CommandOutputParameter(class CommandOutputParameter const &); /** * @symbol ??4CommandOutputParameter\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandOutputSender.hpp b/LiteLoader/include/llapi/mc/CommandOutputSender.hpp index 0b22dd0486..a58aa810f0 100644 --- a/LiteLoader/include/llapi/mc/CommandOutputSender.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutputSender.hpp @@ -44,61 +44,6 @@ class CommandOutputSender { * @symbol ?registerOutputCallback\@CommandOutputSender\@\@UEAAXAEBV?$function\@$$A6AXAEAVAutomationCmdOutput\@\@\@Z\@std\@\@\@Z */ virtual void registerOutputCallback(class std::function const &); - /** - * @vftbl 3 - * @symbol __unk_vfn_3 - */ - virtual void __unk_vfn_3(); - /** - * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 - * @symbol __unk_vfn_5 - */ - virtual void __unk_vfn_5(); - /** - * @vftbl 6 - * @symbol __unk_vfn_6 - */ - virtual void __unk_vfn_6(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); - /** - * @vftbl 8 - * @symbol ?_Get\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEBAPEBXXZ - */ - virtual void const * _Get() const; - /** - * @vftbl 9 - * @symbol __unk_vfn_9 - */ - virtual void __unk_vfn_9(); - /** - * @vftbl 10 - * @symbol __unk_vfn_10 - */ - virtual void __unk_vfn_10(); - /** - * @vftbl 11 - * @symbol __unk_vfn_11 - */ - virtual void __unk_vfn_11(); - /** - * @vftbl 12 - * @symbol __unk_vfn_12 - */ - virtual void __unk_vfn_12(); - /** - * @vftbl 13 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z - */ - virtual void _Delete_this(bool); /** * @symbol ??0CommandOutputSender\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CommandParameterData.hpp b/LiteLoader/include/llapi/mc/CommandParameterData.hpp index 94a2f5ade4..e38d5e8033 100644 --- a/LiteLoader/include/llapi/mc/CommandParameterData.hpp +++ b/LiteLoader/include/llapi/mc/CommandParameterData.hpp @@ -5,12 +5,12 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "CommandRegistry.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here #include -#include "typeid_t.hpp" #include "CommandRegistry.hpp" #undef BEFORE_EXTRA @@ -29,22 +29,22 @@ class CommandParameterData { std::vector&) const; public: - typeid_t tid; // 0 - ParseFn parser; // 8 - std::string name; // 16 - char const* desc; // 48 - int unk56; // 56 - CommandParameterDataType type; // 60 - int offset; // 64 - int flag_offset; // 68 - bool mand; // 72 - unsigned char options; // 73 + Bedrock::typeid_t tid; // 0 + ParseFn parser; // 8 + std::string name; // 16 + char const* desc; // 48 + int unk56; // 56 + CommandParameterDataType type; // 60 + int offset; // 64 + int flag_offset; // 68 + bool mand; // 72 + unsigned char options; // 73 CommandParameterData() : tid(tid){}; CommandParameterData( - typeid_t tid, ParseFn parser, std::string_view describe, + Bedrock::typeid_t tid, ParseFn parser, std::string_view describe, CommandParameterDataType type, char const* enumName, int offset, bool optional, int flag_offset) : tid(tid) , parser(parser) @@ -66,9 +66,9 @@ class CommandParameterData { public: /** - * @symbol ??0CommandParameterData\@\@QEAA\@V?$typeid_t\@VCommandRegistry\@\@\@\@P8CommandRegistry\@\@EBA_NPEAXAEBUParseToken\@2\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@6\@\@ZPEBDW4CommandParameterDataType\@\@7H_NH\@Z + * @symbol ??0CommandParameterData\@\@QEAA\@V?$typeid_t\@VCommandRegistry\@\@\@Bedrock\@\@P8CommandRegistry\@\@EBA_NPEAXAEBUParseToken\@3\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@7\@\@ZPEBDW4CommandParameterDataType\@\@7H_NH\@Z */ - MCAPI CommandParameterData(class typeid_t, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const, char const *, enum class CommandParameterDataType, char const *, int, bool, int); + MCAPI CommandParameterData(class Bedrock::typeid_t, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const, char const *, enum class CommandParameterDataType, char const *, int, bool, int); /** * @symbol ??0CommandParameterData\@\@QEAA\@AEBV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandPermissionLevelConversion.hpp b/LiteLoader/include/llapi/mc/CommandPermissionLevelConversion.hpp new file mode 100644 index 0000000000..446bd5dc59 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CommandPermissionLevelConversion.hpp @@ -0,0 +1,24 @@ +/** + * @file CommandPermissionLevelConversion.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace CommandPermissionLevelConversion { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?fromString\@CommandPermissionLevelConversion\@\@YA?AV?$optional\@W4CommandPermissionLevel\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + */ + MCAPI class std::optional fromString(std::string const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/CommandPosition.hpp b/LiteLoader/include/llapi/mc/CommandPosition.hpp index f12b198f23..01fb4fe58e 100644 --- a/LiteLoader/include/llapi/mc/CommandPosition.hpp +++ b/LiteLoader/include/llapi/mc/CommandPosition.hpp @@ -60,10 +60,6 @@ class CommandPosition { * @symbol ?getPosition\@CommandPosition\@\@QEBA?AVVec3\@\@HAEBVCommandOrigin\@\@AEBV2\@\@Z */ MCAPI class Vec3 getPosition(int, class CommandOrigin const &, class Vec3 const &) const; - /** - * @symbol ?load\@CommandPosition\@\@QEAAXAEBVCompoundTag\@\@\@Z - */ - MCAPI void load(class CompoundTag const &); /** * @symbol ?serialize\@CommandPosition\@\@QEBA?AVCompoundTag\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CommandPropertyBag.hpp b/LiteLoader/include/llapi/mc/CommandPropertyBag.hpp index 7b51d8a834..caf60174b2 100644 --- a/LiteLoader/include/llapi/mc/CommandPropertyBag.hpp +++ b/LiteLoader/include/llapi/mc/CommandPropertyBag.hpp @@ -26,6 +26,7 @@ class CommandPropertyBag { public: class CommandPropertyBag& operator=(class CommandPropertyBag const &) = delete; CommandPropertyBag(class CommandPropertyBag const &) = delete; + CommandPropertyBag() = delete; #endif public: @@ -33,18 +34,10 @@ class CommandPropertyBag { * @symbol ??0CommandPropertyBag\@\@QEAA\@AEBVValue\@Json\@\@\@Z */ MCAPI CommandPropertyBag(class Json::Value const &); - /** - * @symbol ??0CommandPropertyBag\@\@QEAA\@XZ - */ - MCAPI CommandPropertyBag(); /** * @symbol ?addToResultList\@CommandPropertyBag\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI void addToResultList(std::string const &, std::string const &); - /** - * @symbol ?clone\@CommandPropertyBag\@\@QEBA?AV?$unique_ptr\@VCommandPropertyBag\@\@U?$default_delete\@VCommandPropertyBag\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::unique_ptr clone() const; /** * @symbol ?set\@CommandPropertyBag\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VVec3\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandRegistry.hpp b/LiteLoader/include/llapi/mc/CommandRegistry.hpp index a2922acc04..e623b8282a 100644 --- a/LiteLoader/include/llapi/mc/CommandRegistry.hpp +++ b/LiteLoader/include/llapi/mc/CommandRegistry.hpp @@ -6,10 +6,10 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Json.hpp" +#include "Bedrock.hpp" #define BEFORE_EXTRA #include -#include "typeid_t.hpp" // Include Headers or Declare Types Here class CommandParameterData; #include "RelativeFloat.hpp" @@ -145,7 +145,7 @@ class CommandRegistry { struct Enum { std::string name; // 0 - typeid_t type; // 32 + Bedrock::typeid_t type; // 32 ParseFn parse; // 40 std::vector> values; // 48 @@ -282,7 +282,7 @@ class CommandRegistry { std::map mEnumValueLookup; // 304 std::vector mCommandSymbols; // 320 std::map mSignatures; // 344 - std::map, int> mTypeLookup; // 360 + std::map, int> mTypeLookup; // 360 std::map unk376; // 376 std::map mAliases; // 392 std::vector mSemanticConstraints; // 408 @@ -512,8 +512,7 @@ class CommandRegistry { } template > - unsigned addEnumValues( - std::string const& name, typeid_t tid, + unsigned addEnumValues(std::string const& name, Bedrock::typeid_t tid, std::vector> const& values) { std::vector> converted; IDConverter converter; @@ -521,8 +520,7 @@ class CommandRegistry { converted.emplace_back(value.first, converter(value.second)); return _addEnumValuesInternal(name, converted, tid, &CommandRegistry::parseEnum).val; } - unsigned addEnumValues(std::string const& name, - typeid_t tid, + unsigned addEnumValues(std::string const& name, Bedrock::typeid_t tid, std::initializer_list const& values) { std::vector> converted; uint64_t idx = 0; @@ -537,7 +535,7 @@ class CommandRegistry { template CommandRegistry* addEnum(char const* name, std::vector> const& values) { - this->addEnumValues(name, type_id(), values); + this->addEnumValues(name, Bedrock::type_id(), values); return this; } @@ -685,6 +683,22 @@ class CommandRegistry { * @symbol ?HASITEM_PARAM_SLOT\@CommandRegistry\@\@2PEBDEB */ MCAPI static char const * HASITEM_PARAM_SLOT; + /** + * @symbol ?HASPERMISSIONCATEGORY_ENUM_CAMERA\@CommandRegistry\@\@2PEBDEB + */ + MCAPI static char const * HASPERMISSIONCATEGORY_ENUM_CAMERA; + /** + * @symbol ?HASPERMISSIONCATEGORY_ENUM_MOVEMENT\@CommandRegistry\@\@2PEBDEB + */ + MCAPI static char const * HASPERMISSIONCATEGORY_ENUM_MOVEMENT; + /** + * @symbol ?HASPERMISSIONSTATE_ENUM_DISABLED\@CommandRegistry\@\@2PEBDEB + */ + MCAPI static char const * HASPERMISSIONSTATE_ENUM_DISABLED; + /** + * @symbol ?HASPERMISSIONSTATE_ENUM_ENABLED\@CommandRegistry\@\@2PEBDEB + */ + MCAPI static char const * HASPERMISSIONSTATE_ENUM_ENABLED; /** * @symbol ?TAG_VALUES_SOFTENUM_NAME\@CommandRegistry\@\@2PEBDEB */ @@ -692,13 +706,13 @@ class CommandRegistry { //private: /** - * @symbol ?_addEnumValuesInternal\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@_K_K\@std\@\@V?$allocator\@U?$pair\@_K_K\@std\@\@\@2\@\@4\@V?$typeid_t\@VCommandRegistry\@\@\@\@P81\@EBA_NPEAXAEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV34\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z\@Z + * @symbol ?_addEnumValuesInternal\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@_K_K\@std\@\@V?$allocator\@U?$pair\@_K_K\@std\@\@\@2\@\@4\@V?$typeid_t\@VCommandRegistry\@\@\@Bedrock\@\@P81\@EBA_NPEAXAEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV34\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z\@Z */ - MCAPI class CommandRegistry::Symbol _addEnumValuesInternal(std::string const &, std::vector> const &, class typeid_t, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const); + MCAPI class CommandRegistry::Symbol _addEnumValuesInternal(std::string const &, std::vector> const &, class Bedrock::typeid_t, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const); /** - * @symbol ?_addEnumValuesInternal\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@std\@\@\@2\@\@4\@V?$typeid_t\@VCommandRegistry\@\@\@\@P81\@EBA_NPEAXAEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV34\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z\@Z + * @symbol ?_addEnumValuesInternal\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@std\@\@\@2\@\@4\@V?$typeid_t\@VCommandRegistry\@\@\@Bedrock\@\@P81\@EBA_NPEAXAEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV34\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z\@Z */ - MCAPI class CommandRegistry::Symbol _addEnumValuesInternal(std::string const &, std::vector> const &, class typeid_t, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const); + MCAPI class CommandRegistry::Symbol _addEnumValuesInternal(std::string const &, std::vector> const &, class Bedrock::typeid_t, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const); /** * @symbol ?_addFunctionSoftEnum\@CommandRegistry\@\@AEAA?AVSymbol\@1\@XZ */ @@ -752,9 +766,9 @@ class CommandRegistry { */ MCAPI void buildParseTable(unsigned int) const; /** - * @symbol ?buildRules\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEAUSignature\@1\@AEBV?$vector\@PEAUOverload\@CommandRegistry\@\@V?$allocator\@PEAUOverload\@CommandRegistry\@\@\@std\@\@\@std\@\@_K\@Z + * @symbol ?buildRules\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEAUSignature\@1\@AEBV?$vector\@V?$not_null\@PEAUOverload\@CommandRegistry\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEAUOverload\@CommandRegistry\@\@\@gsl\@\@\@std\@\@\@std\@\@_K\@Z */ - MCAPI class CommandRegistry::Symbol buildRules(struct CommandRegistry::Signature &, std::vector const &, unsigned __int64); + MCAPI class CommandRegistry::Symbol buildRules(struct CommandRegistry::Signature &, std::vector> const &, unsigned __int64); /** * @symbol ?checkOriginCommandFlags\@CommandRegistry\@\@AEBA_NAEBVCommandOrigin\@\@UCommandFlag\@\@W4CommandPermissionLevel\@\@\@Z */ @@ -815,22 +829,22 @@ class CommandRegistry { * @symbol ?isValid\@CommandRegistry\@\@AEBA_NVSymbol\@1\@\@Z */ MCAPI bool isValid(class CommandRegistry::Symbol) const; - /** - * @symbol ?originCanRun\@CommandRegistry\@\@AEBA_NAEBVCommandOrigin\@\@AEBUOverload\@1\@\@Z - */ - MCAPI bool originCanRun(class CommandOrigin const &, struct CommandRegistry::Overload const &) const; /** * @symbol ?originCanRun\@CommandRegistry\@\@AEBA_NAEBVCommandOrigin\@\@AEBUSignature\@1\@\@Z */ MCAPI bool originCanRun(class CommandOrigin const &, struct CommandRegistry::Signature const &) const; /** - * @symbol ?parseSelector\@CommandRegistry\@\@AEBA_NAEAUActorSelectorArgs\@\@AEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@6\@\@Z + * @symbol ?originCanRun\@CommandRegistry\@\@AEBA_NAEBVCommandOrigin\@\@AEBUOverload\@1\@\@Z */ - MCAPI bool parseSelector(struct ActorSelectorArgs &, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const; + MCAPI bool originCanRun(class CommandOrigin const &, struct CommandRegistry::Overload const &) const; /** * @symbol ?parseSelector\@CommandRegistry\@\@AEBA_NPEAVCommandSelectorBase\@\@AEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@6\@_N\@Z */ MCAPI bool parseSelector(class CommandSelectorBase *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &, bool) const; + /** + * @symbol ?parseSelector\@CommandRegistry\@\@AEBA_NAEAUActorSelectorArgs\@\@AEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@6\@\@Z + */ + MCAPI bool parseSelector(struct ActorSelectorArgs &, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const; /** * @symbol ?registerOverloadInternal\@CommandRegistry\@\@AEAAXAEAUSignature\@1\@AEAUOverload\@1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp b/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp index 0fcf6464d0..e96dd0cfa5 100644 --- a/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp @@ -61,14 +61,14 @@ class CommandRequestPacket : public Packet { */ MCVAPI ~CommandRequestPacket(); #endif - /** - * @symbol ??0CommandRequestPacket\@\@QEAA\@AEAVCommandContext\@\@_N\@Z - */ - MCAPI CommandRequestPacket(class CommandContext &, bool); /** * @symbol ??0CommandRequestPacket\@\@QEAA\@XZ */ MCAPI CommandRequestPacket(); + /** + * @symbol ??0CommandRequestPacket\@\@QEAA\@AEAVCommandContext\@\@_N\@Z + */ + MCAPI CommandRequestPacket(class CommandContext &, bool); /** * @symbol ?createCommandContext\@CommandRequestPacket\@\@QEBA?AV?$unique_ptr\@VCommandContext\@\@U?$default_delete\@VCommandContext\@\@\@std\@\@\@std\@\@AEBVNetworkIdentifier\@\@AEBV?$NonOwnerPointer\@VILevel\@\@\@Bedrock\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandSelectorBase.hpp b/LiteLoader/include/llapi/mc/CommandSelectorBase.hpp index a7005169d9..f1d1f0ed70 100644 --- a/LiteLoader/include/llapi/mc/CommandSelectorBase.hpp +++ b/LiteLoader/include/llapi/mc/CommandSelectorBase.hpp @@ -59,50 +59,10 @@ class CommandSelectorBase { #endif public: - /** - * @symbol ?addFamilyFilter\@CommandSelectorBase\@\@QEAAXAEBU?$InvertableFilter\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@\@Z - */ - MCAPI void addFamilyFilter(struct InvertableFilter const &); /** * @symbol ?addFilter\@CommandSelectorBase\@\@QEAAXV?$function\@$$A6A_NAEBVCommandOrigin\@\@AEBVActor\@\@\@Z\@std\@\@\@Z */ MCAPI void addFilter(class std::function); - /** - * @symbol ?addGameModeFilter\@CommandSelectorBase\@\@QEAAXAEBU?$InvertableFilter\@W4GameType\@\@\@\@\@Z - */ - MCAPI void addGameModeFilter(struct InvertableFilter const &); - /** - * @symbol ?addHasItemFilter\@CommandSelectorBase\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$optional\@H\@3\@AEBVCommandIntegerRange\@\@W4EquipmentSlot\@\@2\@Z - */ - MCAPI void addHasItemFilter(std::string const &, class std::optional, class CommandIntegerRange const &, enum class EquipmentSlot, class CommandIntegerRange const &); - /** - * @symbol ?addLevelFilter\@CommandSelectorBase\@\@QEAAXAEBU?$pair\@HH\@std\@\@\@Z - */ - MCAPI void addLevelFilter(struct std::pair const &); - /** - * @symbol ?addNameFilter\@CommandSelectorBase\@\@QEAAXAEBU?$InvertableFilter\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@\@Z - */ - MCAPI void addNameFilter(struct InvertableFilter const &); - /** - * @symbol ?addScoreFilter\@CommandSelectorBase\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCommandIntegerRange\@\@V?$function\@$$A6AHAEA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVActor\@\@\@Z\@3\@\@Z - */ - MCAPI void addScoreFilter(std::string const &, class CommandIntegerRange const &, class std::function); - /** - * @symbol ?addTagFilter\@CommandSelectorBase\@\@QEAAXAEBU?$InvertableFilter\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@\@Z - */ - MCAPI void addTagFilter(struct InvertableFilter const &); - /** - * @symbol ?addTypeFilter\@CommandSelectorBase\@\@QEAAXAEBU?$InvertableFilter\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@\@Z - */ - MCAPI void addTypeFilter(struct InvertableFilter const &); - /** - * @symbol ?addXRotationFilter\@CommandSelectorBase\@\@QEAAXAEBU?$pair\@MM\@std\@\@\@Z - */ - MCAPI void addXRotationFilter(struct std::pair const &); - /** - * @symbol ?addYRotationFilter\@CommandSelectorBase\@\@QEAAXAEBU?$pair\@MM\@std\@\@\@Z - */ - MCAPI void addYRotationFilter(struct std::pair const &); /** * @symbol ?compile\@CommandSelectorBase\@\@QEAA_NAEBVCommandOrigin\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -111,10 +71,6 @@ class CommandSelectorBase { * @symbol ?getName\@CommandSelectorBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getName() const; - /** - * @symbol ?getOrder\@CommandSelectorBase\@\@QEBA?AW4CommandSelectionOrder\@\@XZ - */ - MCAPI enum class CommandSelectionOrder getOrder() const; /** * @symbol ?getResultCount\@CommandSelectorBase\@\@QEBA_KXZ */ @@ -127,42 +83,10 @@ class CommandSelectorBase { * @symbol ?isExplicitIdSelector\@CommandSelectorBase\@\@QEBA_NXZ */ MCAPI bool isExplicitIdSelector() const; - /** - * @symbol ?setBox\@CommandSelectorBase\@\@QEAAXAEBVVec3\@\@\@Z - */ - MCAPI void setBox(class Vec3 const &); - /** - * @symbol ?setExcludeAgents\@CommandSelectorBase\@\@QEAAX_N\@Z - */ - MCAPI void setExcludeAgents(bool); - /** - * @symbol ?setExplicitIdSelector\@CommandSelectorBase\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI void setExplicitIdSelector(std::string const &); /** * @symbol ?setIncludeDeadPlayers\@CommandSelectorBase\@\@QEAAX_N\@Z */ MCAPI void setIncludeDeadPlayers(bool); - /** - * @symbol ?setOrder\@CommandSelectorBase\@\@QEAAXW4CommandSelectionOrder\@\@\@Z - */ - MCAPI void setOrder(enum class CommandSelectionOrder); - /** - * @symbol ?setPosition\@CommandSelectorBase\@\@QEAAXAEBVCommandPosition\@\@\@Z - */ - MCAPI void setPosition(class CommandPosition const &); - /** - * @symbol ?setRadiusMax\@CommandSelectorBase\@\@QEAAXM\@Z - */ - MCAPI void setRadiusMax(float); - /** - * @symbol ?setRadiusMin\@CommandSelectorBase\@\@QEAAXM\@Z - */ - MCAPI void setRadiusMin(float); - /** - * @symbol ?setResultCount\@CommandSelectorBase\@\@QEAAX_K_N\@Z - */ - MCAPI void setResultCount(unsigned __int64, bool); /** * @symbol ?setType\@CommandSelectorBase\@\@QEAAXW4CommandSelectionType\@\@\@Z */ @@ -199,6 +123,10 @@ class CommandSelectorBase { * @symbol ?isExpansionAllowed\@CommandSelectorBase\@\@AEBA_NAEBVCommandOrigin\@\@\@Z */ MCAPI bool isExpansionAllowed(class CommandOrigin const &) const; + /** + * @symbol ?isInDimension\@CommandSelectorBase\@\@AEBA_NAEBVCommandOrigin\@\@AEAVActor\@\@\@Z + */ + MCAPI bool isInDimension(class CommandOrigin const &, class Actor &) const; /** * @symbol ?matchFamily\@CommandSelectorBase\@\@AEBA_NAEBVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandSelectorUtil.hpp b/LiteLoader/include/llapi/mc/CommandSelectorUtil.hpp deleted file mode 100644 index 8569ec3e7a..0000000000 --- a/LiteLoader/include/llapi/mc/CommandSelectorUtil.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file CommandSelectorUtil.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace CommandSelectorUtil. - * - */ -namespace CommandSelectorUtil { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?isValidSelector\@CommandSelectorUtil\@\@YA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z - */ - MCAPI bool isValidSelector(class std::basic_string_view>); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/CommandUtils.hpp b/LiteLoader/include/llapi/mc/CommandUtils.hpp index adfb7fd93b..c4a805f191 100644 --- a/LiteLoader/include/llapi/mc/CommandUtils.hpp +++ b/LiteLoader/include/llapi/mc/CommandUtils.hpp @@ -114,10 +114,6 @@ namespace CommandUtils { * @symbol ?isPlayerSpawnedMob\@CommandUtils\@\@YA_NAEBVActor\@\@0\@Z */ MCAPI bool isPlayerSpawnedMob(class Actor const &, class Actor const &); - /** - * @symbol ?isValidCommandEntity\@CommandUtils\@\@YA_NAEBV?$vector\@W4ActorType\@\@V?$allocator\@W4ActorType\@\@\@std\@\@\@std\@\@W4ActorType\@\@\@Z - */ - MCAPI bool isValidCommandEntity(std::vector const &, enum class ActorType); /** * @symbol ?nameEntity\@CommandUtils\@\@YAXAEAVActor\@\@_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandVersion.hpp b/LiteLoader/include/llapi/mc/CommandVersion.hpp index a8af0311c5..0e91ccdd2e 100644 --- a/LiteLoader/include/llapi/mc/CommandVersion.hpp +++ b/LiteLoader/include/llapi/mc/CommandVersion.hpp @@ -49,6 +49,10 @@ class CommandVersion { * @symbol ?isCompatible\@CommandVersion\@\@QEBA_NH\@Z */ MCAPI bool isCompatible(int) const; + /** + * @symbol ??9CommandVersion\@\@QEBA_NAEBV0\@\@Z + */ + MCAPI bool operator!=(class CommandVersion const &) const; /** * @symbol ?CurrentVersion\@CommandVersion\@\@2HB */ diff --git a/LiteLoader/include/llapi/mc/CompactionListenerEnv.hpp b/LiteLoader/include/llapi/mc/CompactionListenerEnv.hpp index a052a56692..709624b765 100644 --- a/LiteLoader/include/llapi/mc/CompactionListenerEnv.hpp +++ b/LiteLoader/include/llapi/mc/CompactionListenerEnv.hpp @@ -129,10 +129,6 @@ class CompactionListenerEnv { * @symbol ?SleepForMicroseconds\@EnvWrapper\@leveldb\@\@UEAAXH\@Z */ virtual void SleepForMicroseconds(int); - /** - * @symbol ??0CompactionListenerEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@\@Z - */ - MCAPI CompactionListenerEnv(class leveldb::Env *); /** * @symbol ?setCompactionCallback\@CompactionListenerEnv\@\@QEAAXV?$function\@$$A6AXW4CompactionStatus\@\@\@Z\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ComparatorBlock.hpp b/LiteLoader/include/llapi/mc/ComparatorBlock.hpp index 178a45f179..85f156bc48 100644 --- a/LiteLoader/include/llapi/mc/ComparatorBlock.hpp +++ b/LiteLoader/include/llapi/mc/ComparatorBlock.hpp @@ -202,9 +202,9 @@ class ComparatorBlock : public ActorBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@ComparatorBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@ComparatorBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 116 * @symbol ?triggerEvent\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z @@ -226,30 +226,30 @@ class ComparatorBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 * @symbol ?getVariant\@ComparatorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 147 + * @vftbl 148 * @symbol ?canSpawnOn\@ComparatorBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -262,46 +262,51 @@ class ComparatorBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@ComparatorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@ComparatorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@ComparatorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp b/LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp index 59a2ebc4ec..090c357fd8 100644 --- a/LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp @@ -100,9 +100,5 @@ class ComparatorBlockActor : public BlockActor { * @symbol ?setOutputSignal\@ComparatorBlockActor\@\@UEAAXH\@Z */ virtual void setOutputSignal(int); - /** - * @symbol ??0ComparatorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z - */ - MCAPI ComparatorBlockActor(class BlockPos const &); }; diff --git a/LiteLoader/include/llapi/mc/CompassItem.hpp b/LiteLoader/include/llapi/mc/CompassItem.hpp index 6439052bdf..0677e5c8c0 100644 --- a/LiteLoader/include/llapi/mc/CompassItem.hpp +++ b/LiteLoader/include/llapi/mc/CompassItem.hpp @@ -103,9 +103,9 @@ class CompassItem : public AbstractCompassItem { virtual void __unk_vfn_80(); /** * @vftbl 132 - * @symbol ?_useOn\@CompassItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@CompassItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0CompassItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/CompassSpriteCalculator.hpp b/LiteLoader/include/llapi/mc/CompassSpriteCalculator.hpp index 415f31ed20..8a6f5d2542 100644 --- a/LiteLoader/include/llapi/mc/CompassSpriteCalculator.hpp +++ b/LiteLoader/include/llapi/mc/CompassSpriteCalculator.hpp @@ -41,10 +41,6 @@ class CompassSpriteCalculator { * @symbol ?update\@CompassSpriteCalculator\@\@QEAAHAEAVActor\@\@_N\@Z */ MCAPI int update(class Actor &, bool); - /** - * @symbol ?updateFromPosition\@CompassSpriteCalculator\@\@QEAAHPEBVBlockSource\@\@AEBVBlockPos\@\@MMM_N22\@Z - */ - MCAPI int updateFromPosition(class BlockSource const *, class BlockPos const &, float, float, float, bool, bool, bool); /** * @symbol ?updateFromPosition\@CompassSpriteCalculator\@\@QEAAHPEBVBlockSource\@\@PEAVActor\@\@MMM_N2\@Z */ diff --git a/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp b/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp index 3adeba82e5..57cd44e665 100644 --- a/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp +++ b/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp @@ -60,13 +60,13 @@ class CompletedUsingItemPacket : public Packet { */ MCVAPI ~CompletedUsingItemPacket(); #endif - /** - * @symbol ??0CompletedUsingItemPacket\@\@QEAA\@XZ - */ - MCAPI CompletedUsingItemPacket(); /** * @symbol ??0CompletedUsingItemPacket\@\@QEAA\@FH\@Z */ MCAPI CompletedUsingItemPacket(short, int); + /** + * @symbol ??0CompletedUsingItemPacket\@\@QEAA\@XZ + */ + MCAPI CompletedUsingItemPacket(); }; diff --git a/LiteLoader/include/llapi/mc/ComplexAliasBlockAchievementEventHelper.hpp b/LiteLoader/include/llapi/mc/ComplexAliasBlockAchievementEventHelper.hpp new file mode 100644 index 0000000000..ea25f7c75c --- /dev/null +++ b/LiteLoader/include/llapi/mc/ComplexAliasBlockAchievementEventHelper.hpp @@ -0,0 +1,28 @@ +/** + * @file ComplexAliasBlockAchievementEventHelper.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ComplexAliasBlockAchievementEventHelper { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?getPostComplexAliasBlockToPreSplitBlockInfo\@ComplexAliasBlockAchievementEventHelper\@\@YA?AV?$optional\@V?$reference_wrapper\@$$CBUComplexAliasBlockPreSplitBlockInfo\@ComplexAliasBlockAchievementEventHelper\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + */ + MCAPI class std::optional> getPostComplexAliasBlockToPreSplitBlockInfo(std::string const &); + /** + * @symbol ?makePostComplexAliasBlockToPreSplitBlockMap\@ComplexAliasBlockAchievementEventHelper\@\@YA?AV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UComplexAliasBlockPreSplitBlockInfo\@ComplexAliasBlockAchievementEventHelper\@\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UComplexAliasBlockPreSplitBlockInfo\@ComplexAliasBlockAchievementEventHelper\@\@\@std\@\@\@2\@\@std\@\@XZ + */ + MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> makePostComplexAliasBlockToPreSplitBlockMap(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp b/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp index 5533b5f27c..d1941d5ba2 100644 --- a/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp @@ -87,14 +87,14 @@ InventoryTransaction data; * @symbol ??0ComplexInventoryTransaction\@\@QEAA\@W4Type\@0\@\@Z */ MCAPI ComplexInventoryTransaction(enum class ComplexInventoryTransaction::Type); - /** - * @symbol ?fromType\@ComplexInventoryTransaction\@\@SA?AV?$unique_ptr\@VComplexInventoryTransaction\@\@U?$default_delete\@VComplexInventoryTransaction\@\@\@std\@\@\@std\@\@W4Type\@1\@AEBVInventoryTransaction\@\@\@Z - */ - MCAPI static std::unique_ptr fromType(enum class ComplexInventoryTransaction::Type, class InventoryTransaction const &); /** * @symbol ?fromType\@ComplexInventoryTransaction\@\@SA?AV?$unique_ptr\@VComplexInventoryTransaction\@\@U?$default_delete\@VComplexInventoryTransaction\@\@\@std\@\@\@std\@\@W4Type\@1\@\@Z */ MCAPI static std::unique_ptr fromType(enum class ComplexInventoryTransaction::Type); + /** + * @symbol ?fromType\@ComplexInventoryTransaction\@\@SA?AV?$unique_ptr\@VComplexInventoryTransaction\@\@U?$default_delete\@VComplexInventoryTransaction\@\@\@std\@\@\@std\@\@W4Type\@1\@AEBVInventoryTransaction\@\@\@Z + */ + MCAPI static std::unique_ptr fromType(enum class ComplexInventoryTransaction::Type, class InventoryTransaction const &); /** * @symbol ?getTransactionTypeName\@ComplexInventoryTransaction\@\@SA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Type\@1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ComponentItem.hpp b/LiteLoader/include/llapi/mc/ComponentItem.hpp index defcb6469b..ab8ea0f58e 100644 --- a/LiteLoader/include/llapi/mc/ComponentItem.hpp +++ b/LiteLoader/include/llapi/mc/ComponentItem.hpp @@ -435,9 +435,9 @@ class ComponentItem : public Item { virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** * @vftbl 132 - * @symbol ?_useOn\@ComponentItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@ComponentItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPONENTITEM /** * @symbol ?getVariant\@ComponentItem\@\@UEBAHHH_N\@Z diff --git a/LiteLoader/include/llapi/mc/CompositeDefinition.hpp b/LiteLoader/include/llapi/mc/CompositeDefinition.hpp index 8a59d17bb8..72012bdae2 100644 --- a/LiteLoader/include/llapi/mc/CompositeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/CompositeDefinition.hpp @@ -6,7 +6,6 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Json.hpp" -#include "BehaviorDefinition.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -17,7 +16,7 @@ * @brief MC class CompositeDefinition. * */ -class CompositeDefinition : public BehaviorDefinition { +class CompositeDefinition { #define AFTER_EXTRA // Add Member There @@ -27,18 +26,10 @@ class CompositeDefinition : public BehaviorDefinition { public: class CompositeDefinition& operator=(class CompositeDefinition const &) = delete; CompositeDefinition(class CompositeDefinition const &) = delete; + CompositeDefinition() = delete; #endif public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @symbol ??0CompositeDefinition\@\@QEAA\@XZ - */ - MCAPI CompositeDefinition(); /** * @symbol ?get\@CompositeDefinition\@\@QEBAPEBVBehaviorDefinition\@\@_K\@Z */ diff --git a/LiteLoader/include/llapi/mc/ComposterBlock.hpp b/LiteLoader/include/llapi/mc/ComposterBlock.hpp index be9ddb26ad..6bfa3e6be0 100644 --- a/LiteLoader/include/llapi/mc/ComposterBlock.hpp +++ b/LiteLoader/include/llapi/mc/ComposterBlock.hpp @@ -217,30 +217,30 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 * @symbol ?getVariant\@ComposterBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -253,68 +253,44 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@ComposterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 - */ - virtual void __unk_vfn_178(); - /** - * @vftbl 186 - * @symbol __unk_vfn_186 - */ - virtual void __unk_vfn_186(); - /** - * @vftbl 194 - * @symbol __unk_vfn_194 - */ - virtual void __unk_vfn_194(); - /** - * @vftbl 195 - * @symbol __unk_vfn_195 - */ - virtual void __unk_vfn_195(); - /** - * @vftbl 196 - * @symbol __unk_vfn_196 - */ - virtual void __unk_vfn_196(); - /** - * @vftbl 197 - * @symbol __unk_vfn_197 - */ - virtual void __unk_vfn_197(); - /** - * @vftbl 198 - * @symbol __unk_vfn_198 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_198(); + virtual void __unk_vfn_179(); /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 187 + * @symbol __unk_vfn_187 */ - MCAPI std::string const & getDescriptionId() const; + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPOSTERBLOCK /** * @symbol ?hasComparatorSignal\@ComposterBlock\@\@UEBA_NXZ @@ -329,14 +305,14 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos * @symbol ?addItem\@ComposterBlock\@\@SA_NAEAVContainer\@\@HAEAVItemStack\@\@AEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool addItem(class Container &, int, class ItemStack &, class BlockSource &, class Block const &, class BlockPos const &); - /** - * @symbol ?addItems\@ComposterBlock\@\@SA_NAEAVContainer\@\@HAEAVItemStack\@\@HAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI static bool addItems(class Container &, int, class ItemStack &, int, class BlockSource &, class Block const &, class BlockPos const &); /** * @symbol ?addItems\@ComposterBlock\@\@SAHAEBVItemStack\@\@HAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCAPI static int addItems(class ItemStack const &, int, class BlockSource &, class Block const &, class BlockPos const &); + /** + * @symbol ?addItems\@ComposterBlock\@\@SA_NAEAVContainer\@\@HAEAVItemStack\@\@HAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI static bool addItems(class Container &, int, class ItemStack &, int, class BlockSource &, class Block const &, class BlockPos const &); /** * @symbol ?empty\@ComposterBlock\@\@SAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CompoundTag.hpp b/LiteLoader/include/llapi/mc/CompoundTag.hpp index caa1bb7a22..eb9122f632 100644 --- a/LiteLoader/include/llapi/mc/CompoundTag.hpp +++ b/LiteLoader/include/llapi/mc/CompoundTag.hpp @@ -158,14 +158,14 @@ class CompoundTag : public Tag { */ MCVAPI ~CompoundTag(); #endif - /** - * @symbol ??0CompoundTag\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI CompoundTag(class CompoundTag &&); /** * @symbol ??0CompoundTag\@\@QEAA\@XZ */ MCAPI CompoundTag(); + /** + * @symbol ??0CompoundTag\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI CompoundTag(class CompoundTag &&); /** * @symbol ?append\@CompoundTag\@\@QEAAXAEBV1\@\@Z */ @@ -192,6 +192,8 @@ class CompoundTag : public Tag { MCAPI bool contains(class std::basic_string_view>) const; /** * @symbol ?deepCopy\@CompoundTag\@\@QEAAXAEBV1\@\@Z + * + * * @brief This function performs a deep copy of a CompoundTag object. * @param[in] tag A constant reference to a CompoundTag object to be copied. * @details A CompoundTag object contains a collection of key-value pairs, where each value can be of various data types. A deep copy of a CompoundTag object creates a new object with a separate memory location that contains the same values and structure as the original object. This function takes a constant reference to a CompoundTag object and performs a deep copy of it. The copied object is not shared with the original object and any changes made to the copied object will not affect the original object. @@ -293,14 +295,14 @@ class CompoundTag : public Tag { * @symbol ??4CompoundTag\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class CompoundTag & operator=(class CompoundTag &&); - /** - * @symbol ?put\@CompoundTag\@\@QEAAAEAVTag\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV2\@\@Z - */ - MCAPI class Tag & put(std::string, class Tag &&); /** * @symbol ?put\@CompoundTag\@\@QEAAPEAVTag\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@4\@\@Z */ MCAPI class Tag * put(std::string, std::unique_ptr); + /** + * @symbol ?put\@CompoundTag\@\@QEAAAEAVTag\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV2\@\@Z + */ + MCAPI class Tag & put(std::string, class Tag &&); /** * @symbol ?putBoolean\@CompoundTag\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/CompoundTagVariant.hpp b/LiteLoader/include/llapi/mc/CompoundTagVariant.hpp index f910a2c9c5..392fc11472 100644 --- a/LiteLoader/include/llapi/mc/CompoundTagVariant.hpp +++ b/LiteLoader/include/llapi/mc/CompoundTagVariant.hpp @@ -89,10 +89,6 @@ char filler[0x30]; // IDA CompoundTagVariant::emplace #endif public: - /** - * @symbol ??0CompoundTagVariant\@\@QEAA\@$$QEAVTag\@\@\@Z - */ - MCAPI CompoundTagVariant(class Tag &&); /** * @symbol ?emplace\@CompoundTagVariant\@\@QEAAAEAVTag\@\@$$QEAV2\@\@Z */ @@ -105,6 +101,10 @@ char filler[0x30]; // IDA CompoundTagVariant::emplace * @symbol ?get\@CompoundTagVariant\@\@QEBAPEBVTag\@\@XZ */ MCAPI class Tag const * get() const; + /** + * @symbol ??CCompoundTagVariant\@\@QEBAPEBVTag\@\@XZ + */ + MCAPI class Tag const * operator->() const; /** * @symbol ??1CompoundTagVariant\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CompressedBiomeDefinitionListPacket.hpp b/LiteLoader/include/llapi/mc/CompressedBiomeDefinitionListPacket.hpp new file mode 100644 index 0000000000..46a9d43206 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CompressedBiomeDefinitionListPacket.hpp @@ -0,0 +1,67 @@ +/** + * @file CompressedBiomeDefinitionListPacket.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Packet.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CompressedBiomeDefinitionListPacket : public Packet { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMPRESSEDBIOMEDEFINITIONLISTPACKET +public: + class CompressedBiomeDefinitionListPacket& operator=(class CompressedBiomeDefinitionListPacket const &) = delete; + CompressedBiomeDefinitionListPacket(class CompressedBiomeDefinitionListPacket const &) = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?getId\@CompressedBiomeDefinitionListPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + */ + virtual enum class MinecraftPacketIds getId() const; + /** + * @vftbl 2 + * @symbol ?getName\@CompressedBiomeDefinitionListPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + virtual std::string getName() const; + /** + * @vftbl 3 + * @symbol ?write\@CompressedBiomeDefinitionListPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + */ + virtual void write(class BinaryStream &) const; + /** + * @vftbl 4 + * @symbol ?readExtended\@CompressedBiomeDefinitionListPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPRESSEDBIOMEDEFINITIONLISTPACKET + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CompressedBiomeDefinitionListPacket(); +#endif + /** + * @symbol ??0CompressedBiomeDefinitionListPacket\@\@QEAA\@VCompoundTag\@\@\@Z + */ + MCAPI CompressedBiomeDefinitionListPacket(class CompoundTag); + /** + * @symbol ??0CompressedBiomeDefinitionListPacket\@\@QEAA\@XZ + */ + MCAPI CompressedBiomeDefinitionListPacket(); + +}; diff --git a/LiteLoader/include/llapi/mc/ConcreteBlock.hpp b/LiteLoader/include/llapi/mc/ConcreteBlock.hpp index 543cdc5bf6..4c4d0c9d7b 100644 --- a/LiteLoader/include/llapi/mc/ConcreteBlock.hpp +++ b/LiteLoader/include/llapi/mc/ConcreteBlock.hpp @@ -186,30 +186,30 @@ class ConcreteBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@ConcreteBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@ConcreteBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -221,37 +221,42 @@ class ConcreteBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@ConcreteBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@ConcreteBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@ConcreteBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp b/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp index 799edfee2c..71b400d949 100644 --- a/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp +++ b/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp @@ -196,30 +196,30 @@ class ConcretePowderBlock : public HeavyBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@ConcretePowderBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@ConcretePowderBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -232,59 +232,64 @@ class ConcretePowderBlock : public HeavyBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@ConcretePowderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@ConcretePowderBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@ConcretePowderBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@ConcretePowderBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getDustColor\@ConcretePowderBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getDustParticleName\@ConcretePowderBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string getDustParticleName(class Block const &) const; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 197 + * @symbol __unk_vfn_197 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_197(); /** * @symbol ??0ConcretePowderBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/ConduitBlock.hpp b/LiteLoader/include/llapi/mc/ConduitBlock.hpp index a13158b6c8..f719fe02ae 100644 --- a/LiteLoader/include/llapi/mc/ConduitBlock.hpp +++ b/LiteLoader/include/llapi/mc/ConduitBlock.hpp @@ -186,20 +186,20 @@ class ConduitBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,25 +211,30 @@ class ConduitBlock : public ActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); /** * @symbol ??0ConduitBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/ConduitBlockActor.hpp b/LiteLoader/include/llapi/mc/ConduitBlockActor.hpp index 5253345a60..51c25ef0f3 100644 --- a/LiteLoader/include/llapi/mc/ConduitBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ConduitBlockActor.hpp @@ -105,10 +105,6 @@ class ConduitBlockActor : public BlockActor { * @symbol ?_onUpdatePacket\@ConduitBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); - /** - * @symbol ??0ConduitBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z - */ - MCAPI ConduitBlockActor(class BlockPos const &); //private: /** diff --git a/LiteLoader/include/llapi/mc/ConnectionRequest.hpp b/LiteLoader/include/llapi/mc/ConnectionRequest.hpp index 395af399bc..3f3f2052f5 100644 --- a/LiteLoader/include/llapi/mc/ConnectionRequest.hpp +++ b/LiteLoader/include/llapi/mc/ConnectionRequest.hpp @@ -166,6 +166,10 @@ class ConnectionRequest { * @symbol ?isClientThirdPartyNameOnly\@ConnectionRequest\@\@QEBA_NXZ */ MCAPI bool isClientThirdPartyNameOnly() const; + /** + * @symbol ?isCompatibleWithClientSideChunkGen\@ConnectionRequest\@\@QEBA_NXZ + */ + MCAPI bool isCompatibleWithClientSideChunkGen() const; /** * @symbol ?isEduMode\@ConnectionRequest\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/ConsoleChunkBlender.hpp b/LiteLoader/include/llapi/mc/ConsoleChunkBlender.hpp index 5848c6429e..b3bc1808c3 100644 --- a/LiteLoader/include/llapi/mc/ConsoleChunkBlender.hpp +++ b/LiteLoader/include/llapi/mc/ConsoleChunkBlender.hpp @@ -28,21 +28,10 @@ enum class BlenderMode; public: class ConsoleChunkBlender& operator=(class ConsoleChunkBlender const &) = delete; ConsoleChunkBlender(class ConsoleChunkBlender const &) = delete; + ConsoleChunkBlender() = delete; #endif public: - /** - * @symbol ??0ConsoleChunkBlender\@\@QEAA\@XZ - */ - MCAPI ConsoleChunkBlender(); - /** - * @symbol ?blendChunk\@ConsoleChunkBlender\@\@QEAAXAEAVLevelChunk\@\@0W4BlenderMode\@1\@\@Z - */ - MCAPI void blendChunk(class LevelChunk &, class LevelChunk &, enum class ConsoleChunkBlender::BlenderMode); - /** - * @symbol ?setInterpolants\@ConsoleChunkBlender\@\@QEAAXMMMM\@Z - */ - MCAPI void setInterpolants(float, float, float, float); /** * @symbol ??1ConsoleChunkBlender\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ConsoleGameTestListener.hpp b/LiteLoader/include/llapi/mc/ConsoleGameTestListener.hpp index d86f901364..b0a67e0d44 100644 --- a/LiteLoader/include/llapi/mc/ConsoleGameTestListener.hpp +++ b/LiteLoader/include/llapi/mc/ConsoleGameTestListener.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "gametest.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/include/llapi/mc/Container.hpp b/LiteLoader/include/llapi/mc/Container.hpp index 2375611f52..282dffbc1e 100644 --- a/LiteLoader/include/llapi/mc/Container.hpp +++ b/LiteLoader/include/llapi/mc/Container.hpp @@ -69,7 +69,7 @@ class Container { virtual void removeContentChangeListener(class ContainerContentChangeListener *); /** * @vftbl 5 - * @symbol ?getItem\@FillingContainer\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getItem\@SimpleContainer\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getItem(int) const = 0; /** @@ -84,84 +84,84 @@ class Container { virtual bool addItem(class ItemStack &); /** * @vftbl 8 + * @symbol ?addItemWithForceBalance\@Container\@\@UEAA_NAEAVItemStack\@\@\@Z + */ + virtual bool addItemWithForceBalance(class ItemStack &); + /** + * @vftbl 9 * @symbol ?addItemToFirstEmptySlot\@Container\@\@UEAA_NAEBVItemStack\@\@\@Z */ virtual bool addItemToFirstEmptySlot(class ItemStack const &); /** - * @vftbl 9 + * @vftbl 10 * @symbol ?setItem\@Inventory\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setItem(int, class ItemStack const &) = 0; /** - * @vftbl 10 + * @vftbl 11 * @symbol ?setItemWithForceBalance\@Container\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setItemWithForceBalance(int, class ItemStack const &, bool); /** - * @vftbl 11 + * @vftbl 12 * @symbol ?removeItem\@Container\@\@UEAAXHH\@Z */ virtual void removeItem(int, int); /** - * @vftbl 12 + * @vftbl 13 * @symbol ?removeAllItems\@Container\@\@UEAAXXZ */ virtual void removeAllItems(); /** - * @vftbl 13 + * @vftbl 14 * @symbol ?dropContents\@Container\@\@UEAAXAEAVBlockSource\@\@AEBVVec3\@\@_N\@Z */ virtual void dropContents(class BlockSource &, class Vec3 const &, bool); /** - * @vftbl 14 + * @vftbl 15 * @symbol ?getContainerSize\@FillingContainer\@\@UEBAHXZ */ virtual int getContainerSize() const = 0; /** - * @vftbl 15 + * @vftbl 16 * @symbol ?getMaxStackSize\@SimpleContainer\@\@UEBAHXZ */ virtual int getMaxStackSize() const = 0; /** - * @vftbl 16 + * @vftbl 17 * @symbol ?startOpen\@FillingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void startOpen(class Player &) = 0; /** - * @vftbl 17 + * @vftbl 18 * @symbol ?stopOpen\@CraftingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void stopOpen(class Player &) = 0; /** - * @vftbl 18 + * @vftbl 19 * @symbol ?getSlotCopies\@Container\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getSlotCopies() const; /** - * @vftbl 19 + * @vftbl 20 * @symbol ?getSlots\@Container\@\@UEBA?BV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const getSlots() const; /** - * @vftbl 20 + * @vftbl 21 * @symbol ?getEmptySlotsCount\@Container\@\@UEBAHXZ */ virtual int getEmptySlotsCount() const; /** - * @vftbl 21 + * @vftbl 22 * @symbol ?getItemCount\@Container\@\@UEBAHAEBVItemStack\@\@\@Z */ virtual int getItemCount(class ItemStack const &) const; /** - * @vftbl 22 + * @vftbl 23 * @symbol ?findFirstSlotForItem\@Container\@\@UEBAHAEBVItemStack\@\@\@Z */ virtual int findFirstSlotForItem(class ItemStack const &) const; - /** - * @vftbl 23 - * @symbol __unk_vfn_23 - */ - virtual void __unk_vfn_23(); /** * @vftbl 24 * @symbol __unk_vfn_24 @@ -169,46 +169,51 @@ class Container { virtual void __unk_vfn_24(); /** * @vftbl 25 + * @symbol __unk_vfn_25 + */ + virtual void __unk_vfn_25(); + /** + * @vftbl 26 * @symbol ?setContainerChanged\@Container\@\@UEAAXH\@Z */ virtual void setContainerChanged(int); /** - * @vftbl 26 + * @vftbl 27 * @symbol ?setContainerMoved\@Container\@\@UEAAXXZ */ virtual void setContainerMoved(); /** - * @vftbl 27 + * @vftbl 28 * @symbol ?setCustomName\@Container\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void setCustomName(std::string const &); /** - * @vftbl 28 + * @vftbl 29 * @symbol ?hasCustomName\@Container\@\@UEBA_NXZ */ virtual bool hasCustomName() const; /** - * @vftbl 29 + * @vftbl 30 * @symbol ?readAdditionalSaveData\@Container\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &); /** - * @vftbl 30 + * @vftbl 31 * @symbol ?addAdditionalSaveData\@Container\@\@UEAAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &); /** - * @vftbl 31 + * @vftbl 32 * @symbol ?createTransactionContext\@Container\@\@UEAAXV?$function\@$$A6AXAEAVContainer\@\@HAEBVItemStack\@\@1\@Z\@std\@\@V?$function\@$$A6AXXZ\@3\@\@Z */ virtual void createTransactionContext(class std::function, class std::function); /** - * @vftbl 32 + * @vftbl 33 * @symbol ?initializeContainerContents\@Container\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void initializeContainerContents(class BlockSource &); /** - * @vftbl 33 + * @vftbl 34 * @symbol ?isEmpty\@Container\@\@UEBA_NXZ */ virtual bool isEmpty() const; @@ -226,14 +231,14 @@ class Container { */ MCVAPI ~Container(); #endif - /** - * @symbol ??0Container\@\@QEAA\@W4ContainerType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z - */ - MCAPI Container(enum class ContainerType, std::string const &, bool); /** * @symbol ??0Container\@\@QEAA\@W4ContainerType\@\@\@Z */ MCAPI Container(enum class ContainerType); + /** + * @symbol ??0Container\@\@QEAA\@W4ContainerType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + */ + MCAPI Container(enum class ContainerType, std::string const &, bool); /** * @symbol ??0Container\@\@QEAA\@AEBV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ContainerComponent.hpp b/LiteLoader/include/llapi/mc/ContainerComponent.hpp index 99e153ce38..8d7e3d66ee 100644 --- a/LiteLoader/include/llapi/mc/ContainerComponent.hpp +++ b/LiteLoader/include/llapi/mc/ContainerComponent.hpp @@ -59,14 +59,14 @@ class ContainerComponent { * @symbol ?addItem\@ContainerComponent\@\@QEAA_NAEAVItemActor\@\@\@Z */ MCAPI bool addItem(class ItemActor &); - /** - * @symbol ?addItem\@ContainerComponent\@\@QEAA_NAEAVItemStack\@\@\@Z - */ - MCAPI bool addItem(class ItemStack &); /** * @symbol ?addItem\@ContainerComponent\@\@QEAA_NAEAVItemStack\@\@HH\@Z */ MCAPI bool addItem(class ItemStack &, int, int); + /** + * @symbol ?addItem\@ContainerComponent\@\@QEAA_NAEAVItemStack\@\@\@Z + */ + MCAPI bool addItem(class ItemStack &); /** * @symbol ?canBeSiphonedFrom\@ContainerComponent\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/ContainerManagerController.hpp b/LiteLoader/include/llapi/mc/ContainerManagerController.hpp new file mode 100644 index 0000000000..7d26d4178f --- /dev/null +++ b/LiteLoader/include/llapi/mc/ContainerManagerController.hpp @@ -0,0 +1,36 @@ +/** + * @file ContainerManagerController.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ContainerManagerController { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CONTAINERMANAGERCONTROLLER +public: + class ContainerManagerController& operator=(class ContainerManagerController const &) = delete; + ContainerManagerController(class ContainerManagerController const &) = delete; + ContainerManagerController() = delete; +#endif + +public: + /** + * @symbol ?TRANSFER_NO_DESTINATION\@ContainerManagerController\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B + */ + MCAPI static class std::basic_string_view> const TRANSFER_NO_DESTINATION; + /** + * @symbol ?TRANSFER_NO_ORIGIN\@ContainerManagerController\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B + */ + MCAPI static class std::basic_string_view> const TRANSFER_NO_ORIGIN; + +}; diff --git a/LiteLoader/include/llapi/mc/ContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/ContainerManagerModel.hpp index 9ba75baea0..2cc0a26524 100644 --- a/LiteLoader/include/llapi/mc/ContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/ContainerManagerModel.hpp @@ -81,7 +81,7 @@ class ContainerManagerModel { virtual void setData(int, int) = 0; /** * @vftbl 10 - * @symbol ?broadcastChanges\@FurnaceContainerManagerModel\@\@UEAAXXZ + * @symbol ?broadcastChanges\@BrewingStandContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges() = 0; /** diff --git a/LiteLoader/include/llapi/mc/ContainerModel.hpp b/LiteLoader/include/llapi/mc/ContainerModel.hpp index 52248af85c..8a83a0e9e8 100644 --- a/LiteLoader/include/llapi/mc/ContainerModel.hpp +++ b/LiteLoader/include/llapi/mc/ContainerModel.hpp @@ -174,72 +174,24 @@ class ContainerModel { * @symbol ??0ContainerModel\@\@QEAA\@W4ContainerEnumName\@\@HW4ContainerCategory\@\@_N\@Z */ MCAPI ContainerModel(enum class ContainerEnumName, int, enum class ContainerCategory, bool); - /** - * @symbol ?_useLegacyTransactions\@ContainerModel\@\@QEBA_NXZ - */ - MCAPI bool _useLegacyTransactions() const; - /** - * @symbol ?getContainerEnumName\@ContainerModel\@\@QEBA?AW4ContainerEnumName\@\@XZ - */ - MCAPI enum class ContainerEnumName getContainerEnumName() const; - /** - * @symbol ?getContainerSlot\@ContainerModel\@\@QEBAHH\@Z - */ - MCAPI int getContainerSlot(int) const; - /** - * @symbol ?getContainerStringName\@ContainerModel\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getContainerStringName() const; - /** - * @symbol ?getModelSlot\@ContainerModel\@\@QEBAHH\@Z - */ - MCAPI int getModelSlot(int) const; - /** - * @symbol ?initContainerRuntimeId\@ContainerModel\@\@QEAAXXZ - */ - MCAPI void initContainerRuntimeId(); /** * @symbol ?isContainerSlotInRange\@ContainerModel\@\@QEBA_NH\@Z */ MCAPI bool isContainerSlotInRange(int) const; - /** - * @symbol ?isIntermediaryCategory\@ContainerModel\@\@QEBA_NXZ - */ - MCAPI bool isIntermediaryCategory() const; /** * @symbol ?networkUpdateItem\@ContainerModel\@\@QEAAXHAEBVItemStack\@\@0\@Z */ MCAPI void networkUpdateItem(int, class ItemStack const &, class ItemStack const &); - /** - * @symbol ?registerOnContainerChangedCallback\@ContainerModel\@\@QEAAXV?$function\@$$A6AXHAEBVItemStack\@\@0\@Z\@std\@\@\@Z - */ - MCAPI void registerOnContainerChangedCallback(class std::function); /** * @symbol ?registerPlayerNotificationCallback\@ContainerModel\@\@QEAAXV?$function\@$$A6AXHAEBVItemStack\@\@0\@Z\@std\@\@\@Z */ MCAPI void registerPlayerNotificationCallback(class std::function); - /** - * @symbol ?serverInitItemStackIds\@ContainerModel\@\@QEAAXXZ - */ - MCAPI void serverInitItemStackIds(); - /** - * @symbol ?setClientUIContainer\@ContainerModel\@\@QEAAXPEAVSparseContainerClient\@\@\@Z - */ - MCAPI void setClientUIContainer(class SparseContainerClient *); - /** - * @symbol ?setItemSource\@ContainerModel\@\@QEAAXHAEBUSlotData\@\@\@Z - */ - MCAPI void setItemSource(int, struct SlotData const &); //protected: /** * @symbol ?_init\@ContainerModel\@\@IEAAXXZ */ MCAPI void _init(); - /** - * @symbol ?_notifyPlayer\@ContainerModel\@\@IEAAXHAEBVItemStack\@\@0\@Z - */ - MCAPI void _notifyPlayer(int, class ItemStack const &, class ItemStack const &); //private: /** diff --git a/LiteLoader/include/llapi/mc/ContainerScreenValidatorBase.hpp b/LiteLoader/include/llapi/mc/ContainerScreenValidatorBase.hpp index 9c26c13519..7cf3c8ca3a 100644 --- a/LiteLoader/include/llapi/mc/ContainerScreenValidatorBase.hpp +++ b/LiteLoader/include/llapi/mc/ContainerScreenValidatorBase.hpp @@ -25,7 +25,6 @@ class ContainerScreenValidatorBase { public: class ContainerScreenValidatorBase& operator=(class ContainerScreenValidatorBase const &) = delete; ContainerScreenValidatorBase(class ContainerScreenValidatorBase const &) = delete; - ContainerScreenValidatorBase() = delete; #endif public: @@ -55,6 +54,10 @@ class ContainerScreenValidatorBase { */ MCVAPI ~ContainerScreenValidatorBase(); #endif + /** + * @symbol ??0ContainerScreenValidatorBase\@\@QEAA\@XZ + */ + MCAPI ContainerScreenValidatorBase(); /** * @symbol ?isValidContainerForScreen\@ContainerScreenValidatorBase\@\@QEBA_NW4ContainerEnumName\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ContainerValidationDebug.hpp b/LiteLoader/include/llapi/mc/ContainerValidationDebug.hpp deleted file mode 100644 index 6ec3e50119..0000000000 --- a/LiteLoader/include/llapi/mc/ContainerValidationDebug.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file ContainerValidationDebug.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ContainerValidationDebug. - * - */ -class ContainerValidationDebug { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CONTAINERVALIDATIONDEBUG -public: - class ContainerValidationDebug& operator=(class ContainerValidationDebug const &) = delete; - ContainerValidationDebug(class ContainerValidationDebug const &) = delete; - ContainerValidationDebug() = delete; -#endif - -public: - /** - * @symbol ??0ContainerValidationDebug\@\@QEAA\@W4ContainerValidationCaller\@\@\@Z - */ - MCAPI ContainerValidationDebug(enum class ContainerValidationCaller); - -}; diff --git a/LiteLoader/include/llapi/mc/ContainerValidationOperation.hpp b/LiteLoader/include/llapi/mc/ContainerValidationOperation.hpp deleted file mode 100644 index affbe8e78b..0000000000 --- a/LiteLoader/include/llapi/mc/ContainerValidationOperation.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file ContainerValidationOperation.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure ContainerValidationOperation. - * - */ -struct ContainerValidationOperation { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CONTAINERVALIDATIONOPERATION -public: - struct ContainerValidationOperation& operator=(struct ContainerValidationOperation const &) = delete; - ContainerValidationOperation(struct ContainerValidationOperation const &) = delete; - ContainerValidationOperation() = delete; -#endif - -public: - /** - * @symbol ??0ContainerValidationOperation\@\@QEAA\@W4ContainerValidationOperationType\@\@AEBUContainerValidationSlotData\@\@HAEBVItemStack\@\@\@Z - */ - MCAPI ContainerValidationOperation(enum class ContainerValidationOperationType, struct ContainerValidationSlotData const &, int, class ItemStack const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ContainerValidationResult.hpp b/LiteLoader/include/llapi/mc/ContainerValidationResult.hpp index ff1b178606..594d9a5c07 100644 --- a/LiteLoader/include/llapi/mc/ContainerValidationResult.hpp +++ b/LiteLoader/include/llapi/mc/ContainerValidationResult.hpp @@ -24,19 +24,18 @@ struct ContainerValidationResult { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_CONTAINERVALIDATIONRESULT public: struct ContainerValidationResult& operator=(struct ContainerValidationResult const &) = delete; - ContainerValidationResult(struct ContainerValidationResult const &) = delete; ContainerValidationResult() = delete; #endif public: - /** - * @symbol ??0ContainerValidationResult\@\@QEAA\@$$QEAV?$vector\@UContainerValidationOperation\@\@V?$allocator\@UContainerValidationOperation\@\@\@std\@\@\@std\@\@W4ContainerValidationOutcome\@\@W4ContainerScreenRequestActionType\@\@\@Z - */ - MCAPI ContainerValidationResult(std::vector &&, enum class ContainerValidationOutcome, enum class ContainerScreenRequestActionType); /** * @symbol ??0ContainerValidationResult\@\@QEAA\@W4ContainerValidationOutcome\@\@\@Z */ MCAPI ContainerValidationResult(enum class ContainerValidationOutcome); + /** + * @symbol ??0ContainerValidationResult\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI ContainerValidationResult(struct ContainerValidationResult const &); /** * @symbol ?isSuccess\@ContainerValidationResult\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/ContainerValidationSlotData.hpp b/LiteLoader/include/llapi/mc/ContainerValidationSlotData.hpp index 3ba11f5261..8392d99f1c 100644 --- a/LiteLoader/include/llapi/mc/ContainerValidationSlotData.hpp +++ b/LiteLoader/include/llapi/mc/ContainerValidationSlotData.hpp @@ -23,21 +23,14 @@ struct ContainerValidationSlotData { public: struct ContainerValidationSlotData& operator=(struct ContainerValidationSlotData const &) = delete; ContainerValidationSlotData(struct ContainerValidationSlotData const &) = delete; + ContainerValidationSlotData() = delete; #endif public: - /** - * @symbol ??0ContainerValidationSlotData\@\@QEAA\@XZ - */ - MCAPI ContainerValidationSlotData(); /** * @symbol ??0ContainerValidationSlotData\@\@QEAA\@W4ContainerEnumName\@\@H\@Z */ MCAPI ContainerValidationSlotData(enum class ContainerEnumName, int); - /** - * @symbol ?matches\@ContainerValidationSlotData\@\@QEBA_NAEBU1\@\@Z - */ - MCAPI bool matches(struct ContainerValidationSlotData const &) const; /** * @symbol ?AUTOPLACE\@ContainerValidationSlotData\@\@2U1\@B */ diff --git a/LiteLoader/include/llapi/mc/ContainerValidationSlotInfo.hpp b/LiteLoader/include/llapi/mc/ContainerValidationSlotInfo.hpp index ebb9f5e418..51f53c8ec4 100644 --- a/LiteLoader/include/llapi/mc/ContainerValidationSlotInfo.hpp +++ b/LiteLoader/include/llapi/mc/ContainerValidationSlotInfo.hpp @@ -27,22 +27,6 @@ struct ContainerValidationSlotInfo { #endif public: - /** - * @symbol ??0ContainerValidationSlotInfo\@\@QEAA\@AEBUContainerValidationSlotData\@\@V?$shared_ptr\@VSimpleSparseContainer\@\@\@std\@\@V?$shared_ptr\@$$CBVContainerValidationBase\@\@\@3\@\@Z - */ - MCAPI ContainerValidationSlotInfo(struct ContainerValidationSlotData const &, class std::shared_ptr, class std::shared_ptr); - /** - * @symbol ?getItem\@ContainerValidationSlotInfo\@\@QEBAAEBVItemStack\@\@XZ - */ - MCAPI class ItemStack const & getItem() const; - /** - * @symbol ??BContainerValidationSlotInfo\@\@QEBA_NXZ - */ - MCAPI operator bool() const; - /** - * @symbol ?setItem\@ContainerValidationSlotInfo\@\@QEAAXAEBVItemStack\@\@\@Z - */ - MCAPI void setItem(class ItemStack const &); /** * @symbol ??1ContainerValidationSlotInfo\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ContainerValidatorFactory.hpp b/LiteLoader/include/llapi/mc/ContainerValidatorFactory.hpp index 0033bfaaf9..51946c1ff4 100644 --- a/LiteLoader/include/llapi/mc/ContainerValidatorFactory.hpp +++ b/LiteLoader/include/llapi/mc/ContainerValidatorFactory.hpp @@ -37,9 +37,5 @@ class ContainerValidatorFactory { * @symbol ?createContainerValidator\@ContainerValidatorFactory\@\@SA?AV?$shared_ptr\@$$CBVContainerValidationBase\@\@\@std\@\@W4ContainerEnumName\@\@AEBVContainerScreenContext\@\@W4ContainerValidationCaller\@\@\@Z */ MCAPI static class std::shared_ptr createContainerValidator(enum class ContainerEnumName, class ContainerScreenContext const &, enum class ContainerValidationCaller); - /** - * @symbol ?getBackingContainer\@ContainerValidatorFactory\@\@SAPEAVContainer\@\@W4ContainerEnumName\@\@AEBVContainerScreenContext\@\@\@Z - */ - MCAPI static class Container * getBackingContainer(enum class ContainerEnumName, class ContainerScreenContext const &); }; diff --git a/LiteLoader/include/llapi/mc/ContentLog.hpp b/LiteLoader/include/llapi/mc/ContentLog.hpp index 73a1b41560..f3542baeb5 100644 --- a/LiteLoader/include/llapi/mc/ContentLog.hpp +++ b/LiteLoader/include/llapi/mc/ContentLog.hpp @@ -32,6 +32,10 @@ class ContentLog { * @symbol ??0ContentLog\@\@QEAA\@XZ */ MCAPI ContentLog(); + /** + * @symbol ?getScope\@ContentLog\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + MCAPI std::string getScope(); /** * @symbol ?isEnabled\@ContentLog\@\@QEBA_NXZ */ @@ -40,10 +44,6 @@ class ContentLog { * @symbol ?log\@ContentLog\@\@QEAAX_NW4LogLevel\@\@W4LogArea\@\@ZZ */ MCAPI void log(bool, enum class LogLevel, enum class LogArea, ...); - /** - * @symbol ?unregisterEndPoint\@ContentLog\@\@QEAAXV?$not_null\@PEAVContentLogEndPoint\@\@\@gsl\@\@\@Z - */ - MCAPI void unregisterEndPoint(class gsl::not_null); /** * @symbol ?updateEnabledStatus\@ContentLog\@\@QEAAXXZ */ @@ -52,10 +52,6 @@ class ContentLog { * @symbol ?getLogAreaName\@ContentLog\@\@SAPEBDW4LogArea\@\@\@Z */ MCAPI static char const * getLogAreaName(enum class LogArea); - /** - * @symbol ?getLogLevelName\@ContentLog\@\@SAPEBDW4LogLevel\@\@\@Z - */ - MCAPI static char const * getLogLevelName(enum class LogLevel); //private: /** diff --git a/LiteLoader/include/llapi/mc/ContextMessageLogger.hpp b/LiteLoader/include/llapi/mc/ContextMessageLogger.hpp deleted file mode 100644 index 6d5d2b67a9..0000000000 --- a/LiteLoader/include/llapi/mc/ContextMessageLogger.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file ContextMessageLogger.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ContextMessageLogger. - * - */ -class ContextMessageLogger { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CONTEXTMESSAGELOGGER -public: - class ContextMessageLogger& operator=(class ContextMessageLogger const &) = delete; - ContextMessageLogger(class ContextMessageLogger const &) = delete; - ContextMessageLogger() = delete; -#endif - -public: - /** - * @symbol ?log\@ContextMessageLogger\@\@QEAAXW4LogArea\@\@W4LogLevel\@\@PEBD\@Z - */ - MCAPI void log(enum class LogArea, enum class LogLevel, char const *); - /** - * @symbol ?shouldMessagePostToParentMessageLoggers\@ContextMessageLogger\@\@QEAA_NXZ - */ - MCAPI bool shouldMessagePostToParentMessageLoggers(); - -}; diff --git a/LiteLoader/include/llapi/mc/ControlledByLocalInstanceSystemImpl.hpp b/LiteLoader/include/llapi/mc/ControlledByLocalInstanceSystemImpl.hpp index 1b1fa32605..9af10c9935 100644 --- a/LiteLoader/include/llapi/mc/ControlledByLocalInstanceSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/ControlledByLocalInstanceSystemImpl.hpp @@ -28,5 +28,9 @@ class ControlledByLocalInstanceSystemImpl { * @symbol ?_wasControlledByLocalInstanceSystem\@ControlledByLocalInstanceSystemImpl\@\@SAXAEBVStrictEntityContext\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UWasControlledByLocalInstanceFlag\@\@\@\@\@\@\@Z */ MCAPI static void _wasControlledByLocalInstanceSystem(class StrictEntityContext const &, class EntityModifierT>); + /** + * @symbol ?wasControlledByLocalInstanceSystem\@ControlledByLocalInstanceSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@URemovePassengersComponent\@\@V?$FlagComponent\@UControlledByLocalInstanceFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UWasControlledByLocalInstanceFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void wasControlledByLocalInstanceSystem(class ViewT>>, class EntityModifierT>); }; diff --git a/LiteLoader/include/llapi/mc/CopperBehavior.hpp b/LiteLoader/include/llapi/mc/CopperBehavior.hpp index d75b427ab9..a4fa5dabf2 100644 --- a/LiteLoader/include/llapi/mc/CopperBehavior.hpp +++ b/LiteLoader/include/llapi/mc/CopperBehavior.hpp @@ -29,18 +29,6 @@ class CopperBehavior { #endif public: - /** - * @symbol ??0CopperBehavior\@\@QEAA\@W4CopperType\@\@AEBVHashedString\@\@11AEBV?$function\@$$A6AAEBVBlock\@\@AEBVHashedString\@\@AEBV1\@\@Z\@std\@\@\@Z - */ - MCAPI CopperBehavior(enum class CopperType, class HashedString const &, class HashedString const &, class HashedString const &, class std::function const &); - /** - * @symbol ??0CopperBehavior\@\@QEAA\@W4CopperType\@\@AEBVHashedString\@\@AEBV?$function\@$$A6AAEBVBlock\@\@AEBVHashedString\@\@AEBV1\@\@Z\@std\@\@\@Z - */ - MCAPI CopperBehavior(enum class CopperType, class HashedString const &, class std::function const &); - /** - * @symbol ?canDecrementAge\@CopperBehavior\@\@QEBA_NXZ - */ - MCAPI bool canDecrementAge() const; /** * @symbol ?getCorrespondingWaxedBlock\@CopperBehavior\@\@QEBAAEBVBlock\@\@AEBV2\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CopperBlock.hpp b/LiteLoader/include/llapi/mc/CopperBlock.hpp index 0c256f8b2d..fbf605d5b6 100644 --- a/LiteLoader/include/llapi/mc/CopperBlock.hpp +++ b/LiteLoader/include/llapi/mc/CopperBlock.hpp @@ -186,20 +186,20 @@ class CopperBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,64 +211,40 @@ class CopperBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 172 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?randomTick\@CopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@CopperBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 - */ - virtual void __unk_vfn_178(); - /** - * @vftbl 186 - * @symbol __unk_vfn_186 - */ - virtual void __unk_vfn_186(); - /** - * @vftbl 194 - * @symbol __unk_vfn_194 - */ - virtual void __unk_vfn_194(); - /** - * @vftbl 195 - * @symbol __unk_vfn_195 - */ - virtual void __unk_vfn_195(); - /** - * @vftbl 196 - * @symbol __unk_vfn_196 - */ - virtual void __unk_vfn_196(); - /** - * @vftbl 197 - * @symbol __unk_vfn_197 - */ - virtual void __unk_vfn_197(); - /** - * @vftbl 198 - * @symbol __unk_vfn_198 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_198(); + virtual void __unk_vfn_179(); /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 187 + * @symbol __unk_vfn_187 */ - MCAPI std::string const & getDescriptionId() const; + virtual void __unk_vfn_187(); /** * @symbol ??0CopperBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4CopperType\@\@AEBVHashedString\@\@22\@Z */ diff --git a/LiteLoader/include/llapi/mc/Coral.hpp b/LiteLoader/include/llapi/mc/Coral.hpp index 856b7ebc5a..33fc1cb7dd 100644 --- a/LiteLoader/include/llapi/mc/Coral.hpp +++ b/LiteLoader/include/llapi/mc/Coral.hpp @@ -226,45 +226,45 @@ class Coral : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@Coral\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@Coral\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@Coral\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColor\@Coral\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@Coral\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -277,51 +277,56 @@ class Coral : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@Coral\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@Coral\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@Coral\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@Coral\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@Coral\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@Coral\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/CoralBlock.hpp b/LiteLoader/include/llapi/mc/CoralBlock.hpp index 8f55732c64..7568180254 100644 --- a/LiteLoader/include/llapi/mc/CoralBlock.hpp +++ b/LiteLoader/include/llapi/mc/CoralBlock.hpp @@ -191,35 +191,35 @@ class CoralBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@CoralBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@CoralBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@CoralBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -232,41 +232,46 @@ class CoralBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@CoralBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@CoralBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@CoralBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@CoralBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/CoralFan.hpp b/LiteLoader/include/llapi/mc/CoralFan.hpp index 6f6bb25163..92c5350a15 100644 --- a/LiteLoader/include/llapi/mc/CoralFan.hpp +++ b/LiteLoader/include/llapi/mc/CoralFan.hpp @@ -231,45 +231,45 @@ class CoralFan : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@CoralFan\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@CoralFan\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@CoralFan\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColor\@CoralFan\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@CoralFan\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -282,56 +282,61 @@ class CoralFan : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@CoralFan\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@CoralFan\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@CoralFan\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@CoralFan\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@CoralFan\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@CoralFan\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?checkAlive\@CoralFan\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp b/LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp index cd69ef3f29..e4e18151c8 100644 --- a/LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp @@ -113,9 +113,9 @@ class CoralFanBlockItem : public BlockItem { virtual void __unk_vfn_80(); /** * @vftbl 132 - * @symbol ?_useOn\@CoralFanBlockItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@CoralFanBlockItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0CoralFanBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/CoralFanHang.hpp b/LiteLoader/include/llapi/mc/CoralFanHang.hpp index 3a39479430..64403d29dc 100644 --- a/LiteLoader/include/llapi/mc/CoralFanHang.hpp +++ b/LiteLoader/include/llapi/mc/CoralFanHang.hpp @@ -201,30 +201,30 @@ class CoralFanHang : public CoralFan { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@CoralFanHang\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@CoralFanHang\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -237,51 +237,56 @@ class CoralFanHang : public CoralFan { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@CoralFanHang\@\@EEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@CoralFanHang\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@CoralFanHang\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@CoralFanHang\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@CoralFanHang\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?checkAlive\@CoralFanHang\@\@EEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/Core.hpp b/LiteLoader/include/llapi/mc/Core.hpp index a2911e329d..09ce53382f 100644 --- a/LiteLoader/include/llapi/mc/Core.hpp +++ b/LiteLoader/include/llapi/mc/Core.hpp @@ -149,6 +149,14 @@ enum class FileAccessType; * @symbol ??UCore\@\@YA?AW4DirectoryIterationFlags\@0\@W410\@0\@Z */ MCAPI enum class Core::DirectoryIterationFlags operator|(enum class Core::DirectoryIterationFlags, enum class Core::DirectoryIterationFlags); + /** + * @symbol ?sLockBlobName\@Core\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const sLockBlobName; + /** + * @symbol ?sMultiChunkTag\@Core\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const sMultiChunkTag; /** * @symbol ?sRootStorageArea\@Core\@\@3V?$shared_ptr\@VFileStorageArea\@Core\@\@\@std\@\@A */ diff --git a/LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp b/LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp index a98f369335..3800b4af28 100644 --- a/LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp @@ -40,9 +40,5 @@ class CraftHandleNonImplemented_DEPRECATEDASKTYLAING : public CraftHandlerBase { * @symbol ?_handleCraftAction\@CraftHandleNonImplemented_DEPRECATEDASKTYLAING\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z */ virtual enum class ItemStackNetResult _handleCraftAction(class ItemStackRequestActionCraftBase const &); - /** - * @symbol ??0CraftHandleNonImplemented_DEPRECATEDASKTYLAING\@\@QEAA\@AEAVItemStackRequestActionCraftHandler\@\@\@Z - */ - MCAPI CraftHandleNonImplemented_DEPRECATEDASKTYLAING(class ItemStackRequestActionCraftHandler &); }; diff --git a/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp b/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp index fc727a87d0..d780cb2ca4 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp @@ -52,7 +52,7 @@ class CraftHandlerBase { virtual void endRequestBatch(); /** * @vftbl 4 - * @symbol ?_handleCraftAction\@CraftHandleNonImplemented_DEPRECATEDASKTYLAING\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z + * @symbol ?_handleCraftAction\@CraftHandlerEnchant\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z */ virtual enum class ItemStackNetResult _handleCraftAction(class ItemStackRequestActionCraftBase const &) = 0; /** @@ -71,45 +71,5 @@ class CraftHandlerBase { */ MCVAPI ~CraftHandlerBase(); #endif - /** - * @symbol ??0CraftHandlerBase\@\@QEAA\@AEAVItemStackRequestActionCraftHandler\@\@\@Z - */ - MCAPI CraftHandlerBase(class ItemStackRequestActionCraftHandler &); - /** - * @symbol ?_isNonImplementedTrustClientResults\@CraftHandlerBase\@\@QEBA_NXZ - */ - MCAPI bool _isNonImplementedTrustClientResults() const; - /** - * @symbol ?endRequest\@CraftHandlerBase\@\@QEAA?AW4ItemStackNetResult\@\@W42\@\@Z - */ - MCAPI enum class ItemStackNetResult endRequest(enum class ItemStackNetResult); - /** - * @symbol ?handleCraftAction\@CraftHandlerBase\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@W42\@\@Z - */ - MCAPI enum class ItemStackNetResult handleCraftAction(class ItemStackRequestActionCraftBase const &, enum class ItemStackNetResult); - /** - * @symbol ?isCraftRequest\@CraftHandlerBase\@\@QEAA_NXZ - */ - MCAPI bool isCraftRequest(); - /** - * @symbol ?postRequest\@CraftHandlerBase\@\@QEAAX_N\@Z - */ - MCAPI void postRequest(bool); - -//protected: - /** - * @symbol ?_getRecipeFromNetId\@CraftHandlerBase\@\@IEAA?AV?$tuple\@W4ItemStackNetResult\@\@PEBVRecipe\@\@\@std\@\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z - */ - MCAPI class std::tuple _getRecipeFromNetId(class TypedServerNetId const &); - /** - * @symbol ?_tryGetSparseContainer\@CraftHandlerBase\@\@IEAA?AV?$shared_ptr\@VSimpleSparseContainer\@\@\@std\@\@W4ContainerEnumName\@\@\@Z - */ - MCAPI class std::shared_ptr _tryGetSparseContainer(enum class ContainerEnumName); - /** - * @symbol ?_validateRequestSlot\@CraftHandlerBase\@\@IEAA?AUItemStackRequestHandlerSlotInfo\@\@UItemStackRequestSlotInfo\@\@\@Z - */ - MCAPI struct ItemStackRequestHandlerSlotInfo _validateRequestSlot(struct ItemStackRequestSlotInfo); - -protected: }; diff --git a/LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp b/LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp index 109f24772b..3b8f759308 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp @@ -64,10 +64,6 @@ class CraftHandlerCrafting { * @symbol ?_getLevelRecipes\@CraftHandlerCrafting\@\@EEBAPEBVRecipes\@\@XZ */ virtual class Recipes const * _getLevelRecipes() const; - /** - * @symbol ??0CraftHandlerCrafting\@\@QEAA\@_NAEAVPlayer\@\@AEAVItemStackRequestActionCraftHandler\@\@\@Z - */ - MCAPI CraftHandlerCrafting(bool, class Player &, class ItemStackRequestActionCraftHandler &); //private: /** diff --git a/LiteLoader/include/llapi/mc/CraftHandlerEnchant.hpp b/LiteLoader/include/llapi/mc/CraftHandlerEnchant.hpp index a8dfed53fc..ed33f80534 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerEnchant.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerEnchant.hpp @@ -50,10 +50,6 @@ class CraftHandlerEnchant : public CraftHandlerBase { * @symbol ?_postCraftRequest\@CraftHandlerEnchant\@\@MEAAX_N\@Z */ virtual void _postCraftRequest(bool); - /** - * @symbol ??0CraftHandlerEnchant\@\@QEAA\@AEAVPlayer\@\@AEAVItemStackRequestActionCraftHandler\@\@\@Z - */ - MCAPI CraftHandlerEnchant(class Player &, class ItemStackRequestActionCraftHandler &); //private: /** diff --git a/LiteLoader/include/llapi/mc/CraftHandlerGrindstone.hpp b/LiteLoader/include/llapi/mc/CraftHandlerGrindstone.hpp index e6a99c488e..dc42b88a00 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerGrindstone.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerGrindstone.hpp @@ -45,10 +45,6 @@ class CraftHandlerGrindstone : public CraftHandlerBase { * @symbol ?_postCraftRequest\@CraftHandlerGrindstone\@\@EEAAX_N\@Z */ virtual void _postCraftRequest(bool); - /** - * @symbol ??0CraftHandlerGrindstone\@\@QEAA\@AEAVPlayer\@\@AEAVItemStackRequestActionCraftHandler\@\@\@Z - */ - MCAPI CraftHandlerGrindstone(class Player &, class ItemStackRequestActionCraftHandler &); //private: /** diff --git a/LiteLoader/include/llapi/mc/CraftHandlerLoom.hpp b/LiteLoader/include/llapi/mc/CraftHandlerLoom.hpp index 4c8a5eda82..3f62855595 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerLoom.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerLoom.hpp @@ -40,9 +40,5 @@ class CraftHandlerLoom : public CraftHandlerBase { * @symbol ?_handleCraftAction\@CraftHandlerLoom\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z */ virtual enum class ItemStackNetResult _handleCraftAction(class ItemStackRequestActionCraftBase const &); - /** - * @symbol ??0CraftHandlerLoom\@\@QEAA\@AEAVItemStackRequestActionCraftHandler\@\@\@Z - */ - MCAPI CraftHandlerLoom(class ItemStackRequestActionCraftHandler &); }; diff --git a/LiteLoader/include/llapi/mc/CraftHandlerSmithingTable.hpp b/LiteLoader/include/llapi/mc/CraftHandlerSmithingTable.hpp index fe61a34fec..8fa34774e0 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerSmithingTable.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerSmithingTable.hpp @@ -43,9 +43,5 @@ class CraftHandlerSmithingTable : public CraftHandlerBase { * @symbol ?_getLevelRecipes\@CraftHandlerSmithingTable\@\@EEBAPEBVRecipes\@\@XZ */ virtual class Recipes const * _getLevelRecipes() const; - /** - * @symbol ??0CraftHandlerSmithingTable\@\@QEAA\@AEAVPlayer\@\@AEAVItemStackRequestActionCraftHandler\@\@\@Z - */ - MCAPI CraftHandlerSmithingTable(class Player &, class ItemStackRequestActionCraftHandler &); }; diff --git a/LiteLoader/include/llapi/mc/CraftHandlerTrade.hpp b/LiteLoader/include/llapi/mc/CraftHandlerTrade.hpp index aba9215a62..3ac9b4aa65 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerTrade.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerTrade.hpp @@ -59,10 +59,6 @@ class CraftHandlerTrade { * @symbol ?_postCraftRequest\@CraftHandlerTrade\@\@EEAAX_N\@Z */ virtual void _postCraftRequest(bool); - /** - * @symbol ??0CraftHandlerTrade\@\@QEAA\@AEBVContainerScreenContext\@\@AEAVItemStackRequestActionCraftHandler\@\@\@Z - */ - MCAPI CraftHandlerTrade(class ContainerScreenContext const &, class ItemStackRequestActionCraftHandler &); //private: /** diff --git a/LiteLoader/include/llapi/mc/CraftingContainer.hpp b/LiteLoader/include/llapi/mc/CraftingContainer.hpp index 92787bfee0..e57a15d107 100644 --- a/LiteLoader/include/llapi/mc/CraftingContainer.hpp +++ b/LiteLoader/include/llapi/mc/CraftingContainer.hpp @@ -46,35 +46,30 @@ class CraftingContainer : public Container { */ virtual class ItemStack const & getItem(int) const; /** - * @vftbl 9 + * @vftbl 10 * @symbol ?setItem\@CraftingContainer\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setItem(int, class ItemStack const &); /** - * @vftbl 14 + * @vftbl 15 * @symbol ?getContainerSize\@CraftingContainer\@\@UEBAHXZ */ virtual int getContainerSize() const; /** - * @vftbl 15 + * @vftbl 16 * @symbol ?getMaxStackSize\@CraftingContainer\@\@UEBAHXZ */ virtual int getMaxStackSize() const; /** - * @vftbl 16 + * @vftbl 17 * @symbol ?startOpen\@CraftingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void startOpen(class Player &); /** - * @vftbl 17 + * @vftbl 18 * @symbol ?stopOpen\@CraftingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void stopOpen(class Player &); - /** - * @vftbl 23 - * @symbol __unk_vfn_23 - */ - virtual void __unk_vfn_23(); /** * @vftbl 24 * @symbol __unk_vfn_24 @@ -82,6 +77,11 @@ class CraftingContainer : public Container { virtual void __unk_vfn_24(); /** * @vftbl 25 + * @symbol __unk_vfn_25 + */ + virtual void __unk_vfn_25(); + /** + * @vftbl 26 * @symbol ?setContainerChanged\@CraftingContainer\@\@UEAAXH\@Z */ virtual void setContainerChanged(int); diff --git a/LiteLoader/include/llapi/mc/CraftingContext.hpp b/LiteLoader/include/llapi/mc/CraftingContext.hpp new file mode 100644 index 0000000000..e2cfc7d7fc --- /dev/null +++ b/LiteLoader/include/llapi/mc/CraftingContext.hpp @@ -0,0 +1,36 @@ +/** + * @file CraftingContext.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct CraftingContext { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CRAFTINGCONTEXT +public: + struct CraftingContext& operator=(struct CraftingContext const &) = delete; + CraftingContext(struct CraftingContext const &) = delete; + CraftingContext() = delete; +#endif + +public: + /** + * @symbol ??1CraftingContext\@\@QEAA\@XZ + */ + MCAPI ~CraftingContext(); + /** + * @symbol ?buildCraftingContext\@CraftingContext\@\@SA?AU1\@AEBVILevel\@\@\@Z + */ + MCAPI static struct CraftingContext buildCraftingContext(class ILevel const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/CreativeGroupInfo.hpp b/LiteLoader/include/llapi/mc/CreativeGroupInfo.hpp index 7d7a4383df..1327ef6da8 100644 --- a/LiteLoader/include/llapi/mc/CreativeGroupInfo.hpp +++ b/LiteLoader/include/llapi/mc/CreativeGroupInfo.hpp @@ -28,35 +28,13 @@ class CreativeGroupInfo { #endif public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CREATIVEGROUPINFO - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~CreativeGroupInfo(); -#endif /** * @symbol ??0CreativeGroupInfo\@\@QEAA\@AEBV0\@\@Z */ MCAPI CreativeGroupInfo(class CreativeGroupInfo const &); - /** - * @symbol ??0CreativeGroupInfo\@\@QEAA\@PEAVCreativeItemRegistry\@\@W4CreativeItemCategory\@\@AEBVHashedString\@\@IAEBVItemInstance\@\@\@Z - */ - MCAPI CreativeGroupInfo(class CreativeItemRegistry *, enum class CreativeItemCategory, class HashedString const &, unsigned int, class ItemInstance const &); /** * @symbol ?addCreativeItem\@CreativeGroupInfo\@\@QEAAXPEAVCreativeItemEntry\@\@\@Z */ MCAPI void addCreativeItem(class CreativeItemEntry *); - /** - * @symbol ?getIcon\@CreativeGroupInfo\@\@QEBA?BVItemInstance\@\@XZ - */ - MCAPI class ItemInstance const getIcon() const; - /** - * @symbol ?getIndex\@CreativeGroupInfo\@\@QEBAIXZ - */ - MCAPI unsigned int getIndex() const; - /** - * @symbol ?getName\@CreativeGroupInfo\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const getName() const; }; diff --git a/LiteLoader/include/llapi/mc/CreativeItemEntry.hpp b/LiteLoader/include/llapi/mc/CreativeItemEntry.hpp index 7a6fe2a640..e487775074 100644 --- a/LiteLoader/include/llapi/mc/CreativeItemEntry.hpp +++ b/LiteLoader/include/llapi/mc/CreativeItemEntry.hpp @@ -33,10 +33,6 @@ class CreativeItemEntry { * @symbol ??0CreativeItemEntry\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI CreativeItemEntry(class CreativeItemEntry &&); - /** - * @symbol ??0CreativeItemEntry\@\@QEAA\@PEAVCreativeItemRegistry\@\@AEBV?$TypedServerNetId\@UCreativeItemNetIdTag\@\@I$0A\@\@\@AEBVItemInstance\@\@I\@Z - */ - MCAPI CreativeItemEntry(class CreativeItemRegistry *, class TypedServerNetId const &, class ItemInstance const &, unsigned int); /** * @symbol ?getCreativeNetId\@CreativeItemEntry\@\@QEBAAEBV?$TypedServerNetId\@UCreativeItemNetIdTag\@\@I$0A\@\@\@XZ */ @@ -54,12 +50,4 @@ class CreativeItemEntry { */ MCAPI class ItemInstance const & getItemInstance() const; -//private: - /** - * @symbol ?_setGroup\@CreativeItemEntry\@\@AEAAXPEAVCreativeGroupInfo\@\@\@Z - */ - MCAPI void _setGroup(class CreativeGroupInfo *); - -private: - }; diff --git a/LiteLoader/include/llapi/mc/CreativeItemGroupCategory.hpp b/LiteLoader/include/llapi/mc/CreativeItemGroupCategory.hpp index 2ab610bf63..5583c27006 100644 --- a/LiteLoader/include/llapi/mc/CreativeItemGroupCategory.hpp +++ b/LiteLoader/include/llapi/mc/CreativeItemGroupCategory.hpp @@ -25,6 +25,7 @@ class CreativeItemGroupCategory { public: class CreativeItemGroupCategory& operator=(class CreativeItemGroupCategory const &) = delete; CreativeItemGroupCategory(class CreativeItemGroupCategory const &) = delete; + CreativeItemGroupCategory() = delete; #endif public: @@ -34,14 +35,6 @@ class CreativeItemGroupCategory { */ MCVAPI ~CreativeItemGroupCategory(); #endif - /** - * @symbol ??0CreativeItemGroupCategory\@\@QEAA\@PEAVCreativeItemRegistry\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CreativeItemCategory\@\@\@Z - */ - MCAPI CreativeItemGroupCategory(class CreativeItemRegistry *, std::string const &, enum class CreativeItemCategory); - /** - * @symbol ??0CreativeItemGroupCategory\@\@QEAA\@XZ - */ - MCAPI CreativeItemGroupCategory(); /** * @symbol ?addAnonymousGroup\@CreativeItemGroupCategory\@\@QEAAPEAVCreativeGroupInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CreativeItemRegistry.hpp b/LiteLoader/include/llapi/mc/CreativeItemRegistry.hpp index 12d5d79930..13270244c4 100644 --- a/LiteLoader/include/llapi/mc/CreativeItemRegistry.hpp +++ b/LiteLoader/include/llapi/mc/CreativeItemRegistry.hpp @@ -50,10 +50,6 @@ class CreativeItemRegistry { * @symbol ?getCreativeCategory\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemGroupCategory\@\@W4CreativeItemCategory\@\@\@Z */ MCAPI class CreativeItemGroupCategory * getCreativeCategory(enum class CreativeItemCategory); - /** - * @symbol ?getCreativeGroup\@CreativeItemRegistry\@\@QEAAPEAVCreativeGroupInfo\@\@I\@Z - */ - MCAPI class CreativeGroupInfo * getCreativeGroup(unsigned int); /** * @symbol ?getCreativeItemEntries\@CreativeItemRegistry\@\@QEAAAEBV?$vector\@VCreativeItemEntry\@\@V?$allocator\@VCreativeItemEntry\@\@\@std\@\@\@std\@\@XZ */ @@ -98,10 +94,6 @@ class CreativeItemRegistry { * @symbol ?mCreativeListMutex\@CreativeItemRegistry\@\@2Vmutex\@std\@\@A */ MCAPI static class std::mutex mCreativeListMutex; - /** - * @symbol ?reset\@CreativeItemRegistry\@\@SAXXZ - */ - MCAPI static void reset(); /** * @symbol ?setCurrentRegistry\@CreativeItemRegistry\@\@SAX$$QEAV?$unique_ptr\@VCreativeItemRegistry\@\@U?$default_delete\@VCreativeItemRegistry\@\@\@std\@\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CreatorMetadataUtils.hpp b/LiteLoader/include/llapi/mc/CreatorMetadataUtils.hpp index 619acb6bbd..a2e2ffd65b 100644 --- a/LiteLoader/include/llapi/mc/CreatorMetadataUtils.hpp +++ b/LiteLoader/include/llapi/mc/CreatorMetadataUtils.hpp @@ -19,14 +19,50 @@ namespace CreatorMetadataUtils { #define AFTER_EXTRA #undef AFTER_EXTRA + /** + * @symbol ?_addCommonVanillaMetadata\@CreatorMetadataUtils\@\@YAXAEAVValue\@Json\@\@PEBD\@Z + */ + MCAPI void _addCommonVanillaMetadata(class Json::Value &, char const *); /** * @symbol ?_generateBlocksMetadataJson\@CreatorMetadataUtils\@\@YA?AVValue\@Json\@\@XZ */ MCAPI class Json::Value _generateBlocksMetadataJson(); + /** + * @symbol ?_generateDimensionsMetadataJson\@CreatorMetadataUtils\@\@YA?AVValue\@Json\@\@XZ + */ + MCAPI class Json::Value _generateDimensionsMetadataJson(); + /** + * @symbol ?_generateEffectsMetadataJson\@CreatorMetadataUtils\@\@YA?AVValue\@Json\@\@XZ + */ + MCAPI class Json::Value _generateEffectsMetadataJson(); + /** + * @symbol ?_generateEnchantmentsMetadataJson\@CreatorMetadataUtils\@\@YA?AVValue\@Json\@\@XZ + */ + MCAPI class Json::Value _generateEnchantmentsMetadataJson(); + /** + * @symbol ?_generateEntitiesMetadataJson\@CreatorMetadataUtils\@\@YA?AVValue\@Json\@\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VActorDefinition\@\@U?$default_delete\@VActorDefinition\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VActorDefinition\@\@U?$default_delete\@VActorDefinition\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@\@Z + */ + MCAPI class Json::Value _generateEntitiesMetadataJson(class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const &); + /** + * @symbol ?_generateItemsMetadataJson\@CreatorMetadataUtils\@\@YA?AVValue\@Json\@\@VItemRegistryRef\@\@\@Z + */ + MCAPI class Json::Value _generateItemsMetadataJson(class ItemRegistryRef); /** * @symbol ?_generateScriptingModuleMetadataJson\@CreatorMetadataUtils\@\@YA?AVValue\@Json\@\@AEBUModuleBinding\@Scripting\@\@AEBUSupportedBindingModule\@5\@AEBUModuleBindingBundle\@5\@\@Z */ MCAPI class Json::Value _generateScriptingModuleMetadataJson(struct Scripting::ModuleBinding const &, struct Scripting::SupportedBindingModule const &, struct Scripting::ModuleBindingBundle const &); + /** + * @symbol ?_getDimensionStringNames\@CreatorMetadataUtils\@\@YA?AV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@XZ + */ + MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> _getDimensionStringNames(); + /** + * @symbol ?_getPropertyToEntityNameMap\@CreatorMetadataUtils\@\@YA?AV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VActorDefinition\@\@U?$default_delete\@VActorDefinition\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VActorDefinition\@\@U?$default_delete\@VActorDefinition\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@3\@\@Z + */ + MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> _getPropertyToEntityNameMap(class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const &); + /** + * @symbol ?_getPropertyToItemNameMap\@CreatorMetadataUtils\@\@YA?AV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$tuple\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$tuple\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@2\@\@std\@\@\@2\@\@std\@\@VItemRegistryRef\@\@\@Z + */ + MCAPI class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> _getPropertyToItemNameMap(class ItemRegistryRef); /** * @symbol ?generateBlocksDocumentation\@CreatorMetadataUtils\@\@YAXAEBVPath\@Core\@\@\@Z */ @@ -35,10 +71,34 @@ namespace CreatorMetadataUtils { * @symbol ?generateCommandsDocumentation\@CreatorMetadataUtils\@\@YAXAEAVCommandRegistry\@\@AEBVPath\@Core\@\@\@Z */ MCAPI void generateCommandsDocumentation(class CommandRegistry &, class Core::Path const &); + /** + * @symbol ?generateDimensionsDocumentation\@CreatorMetadataUtils\@\@YAXAEBVPath\@Core\@\@\@Z + */ + MCAPI void generateDimensionsDocumentation(class Core::Path const &); + /** + * @symbol ?generateEffectsDocumentation\@CreatorMetadataUtils\@\@YAXAEBVPath\@Core\@\@\@Z + */ + MCAPI void generateEffectsDocumentation(class Core::Path const &); + /** + * @symbol ?generateEnchantmentsDocumentation\@CreatorMetadataUtils\@\@YAXAEBVPath\@Core\@\@\@Z + */ + MCAPI void generateEnchantmentsDocumentation(class Core::Path const &); + /** + * @symbol ?generateEntitiesDocumentation\@CreatorMetadataUtils\@\@YAXAEBVPath\@Core\@\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VActorDefinition\@\@U?$default_delete\@VActorDefinition\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VActorDefinition\@\@U?$default_delete\@VActorDefinition\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@\@Z + */ + MCAPI void generateEntitiesDocumentation(class Core::Path const &, class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const &); + /** + * @symbol ?generateItemsDocumentation\@CreatorMetadataUtils\@\@YAXAEBVPath\@Core\@\@VItemRegistryRef\@\@\@Z + */ + MCAPI void generateItemsDocumentation(class Core::Path const &, class ItemRegistryRef); /** * @symbol ?generateScriptingDocumentation\@CreatorMetadataUtils\@\@YAXAEAVScriptEngine\@Scripting\@\@AEBVPath\@Core\@\@\@Z */ MCAPI void generateScriptingDocumentation(class Scripting::ScriptEngine &, class Core::Path const &); + /** + * @symbol ?generateVanillaDataDocumentation\@CreatorMetadataUtils\@\@YAXAEBVPath\@Core\@\@VItemRegistryRef\@\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VActorDefinition\@\@U?$default_delete\@VActorDefinition\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VActorDefinition\@\@U?$default_delete\@VActorDefinition\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@\@Z + */ + MCAPI void generateVanillaDataDocumentation(class Core::Path const &, class ItemRegistryRef, class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const &); /** * @symbol ?getGameSemVersionAsString\@CreatorMetadataUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CropBlock.hpp b/LiteLoader/include/llapi/mc/CropBlock.hpp index 55fd8d5b58..24e2b20e58 100644 --- a/LiteLoader/include/llapi/mc/CropBlock.hpp +++ b/LiteLoader/include/llapi/mc/CropBlock.hpp @@ -226,25 +226,25 @@ class CropBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 - * @symbol ?getVariant\@CropBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 147 + * @symbol ?getVariant\@CropBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -256,57 +256,62 @@ class CropBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 172 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?randomTick\@CropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@CropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 194 - * @symbol __unk_vfn_194 + * @vftbl 195 + * @symbol __unk_vfn_195 */ - virtual void __unk_vfn_194(); + virtual void __unk_vfn_195(); /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getBaseSeed\@CropBlock\@\@MEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseSeed() const; /** - * @vftbl 196 + * @vftbl 197 * @symbol ?getBaseCrop\@CropBlock\@\@MEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseCrop() const; /** - * @vftbl 197 + * @vftbl 198 * @symbol ?getSeedNum\@CropBlock\@\@MEBAHAEAVRandomize\@\@HH\@Z */ virtual int getSeedNum(class Randomize &, int, int) const; /** - * @vftbl 198 + * @vftbl 199 * @symbol ?getCropNum\@CropBlock\@\@MEBAHAEAVRandomize\@\@HH\@Z */ virtual int getCropNum(class Randomize &, int, int) const; diff --git a/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp b/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp index 94a9ffa386..82d3520f55 100644 --- a/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp +++ b/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp @@ -176,25 +176,25 @@ class CryingObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 - * @symbol ?animateTick\@CryingObsidianBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 152 + * @symbol ?animateTick\@CryingObsidianBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,32 +206,37 @@ class CryingObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 188 * @symbol ?playerDestroy\@CryingObsidianBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@CryingObsidianBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/CurrentSwimAmountSystem.hpp b/LiteLoader/include/llapi/mc/CurrentSwimAmountSystem.hpp index a382ae13ec..5eeb82f3af 100644 --- a/LiteLoader/include/llapi/mc/CurrentSwimAmountSystem.hpp +++ b/LiteLoader/include/llapi/mc/CurrentSwimAmountSystem.hpp @@ -31,12 +31,16 @@ class CurrentSwimAmountSystem { * @symbol ?createSystem\@CurrentSwimAmountSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?tick\@CurrentSwimAmountSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@USwimAmountComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@\@Z + */ + MCAPI static void tick(class ViewT>, struct SwimAmountComponent, struct SynchedActorDataComponent const>); //private: /** - * @symbol ?_doCurrentSwimAmountSystem\@CurrentSwimAmountSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUCurrentSwimAmountComponent\@\@AEBUSynchedActorDataComponent\@\@\@Z + * @symbol ?_doCurrentSwimAmountSystem\@CurrentSwimAmountSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUSwimAmountComponent\@\@AEBUSynchedActorDataComponent\@\@\@Z */ - MCAPI static void _doCurrentSwimAmountSystem(class StrictEntityContext const &, struct CurrentSwimAmountComponent &, struct SynchedActorDataComponent const &); + MCAPI static void _doCurrentSwimAmountSystem(class StrictEntityContext const &, struct SwimAmountComponent &, struct SynchedActorDataComponent const &); private: diff --git a/LiteLoader/include/llapi/mc/CurseBindingEnchant.hpp b/LiteLoader/include/llapi/mc/CurseBindingEnchant.hpp index c0685cfc1c..9979239eba 100644 --- a/LiteLoader/include/llapi/mc/CurseBindingEnchant.hpp +++ b/LiteLoader/include/llapi/mc/CurseBindingEnchant.hpp @@ -71,9 +71,5 @@ class CurseBindingEnchant : public Enchant { */ MCVAPI bool isTreasureOnly() const; #endif - /** - * @symbol ??0CurseBindingEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2H_NH\@Z - */ - MCAPI CurseBindingEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, bool, int); }; diff --git a/LiteLoader/include/llapi/mc/CurseVanishingEnchant.hpp b/LiteLoader/include/llapi/mc/CurseVanishingEnchant.hpp index f99396a39b..5f9145694c 100644 --- a/LiteLoader/include/llapi/mc/CurseVanishingEnchant.hpp +++ b/LiteLoader/include/llapi/mc/CurseVanishingEnchant.hpp @@ -71,9 +71,5 @@ class CurseVanishingEnchant : public Enchant { */ MCVAPI bool isTreasureOnly() const; #endif - /** - * @symbol ??0CurseVanishingEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2H_NH\@Z - */ - MCAPI CurseVanishingEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, bool, int); }; diff --git a/LiteLoader/include/llapi/mc/CustomBlockStateVariant.hpp b/LiteLoader/include/llapi/mc/CustomBlockStateVariant.hpp new file mode 100644 index 0000000000..11f287a9c8 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CustomBlockStateVariant.hpp @@ -0,0 +1,43 @@ +/** + * @file CustomBlockStateVariant.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CustomBlockStateVariant { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CUSTOMBLOCKSTATEVARIANT +public: + class CustomBlockStateVariant& operator=(class CustomBlockStateVariant const &) = delete; + CustomBlockStateVariant(class CustomBlockStateVariant const &) = delete; + CustomBlockStateVariant() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?toNBT\@CustomBlockStateVariant\@\@UEBAXAEAVCompoundTag\@\@H\@Z + */ + virtual void toNBT(class CompoundTag &, int) const; + /** + * @vftbl 2 + * @symbol ?fromNBT\@CustomBlockStateVariant\@\@UEBA_NAEBVCompoundTag\@\@AEAH\@Z + */ + virtual bool fromNBT(class CompoundTag const &, int &) const; + +}; diff --git a/LiteLoader/include/llapi/mc/CutCopperSlab.hpp b/LiteLoader/include/llapi/mc/CutCopperSlab.hpp index ceaa8d5f19..52846fced3 100644 --- a/LiteLoader/include/llapi/mc/CutCopperSlab.hpp +++ b/LiteLoader/include/llapi/mc/CutCopperSlab.hpp @@ -186,20 +186,20 @@ class CutCopperSlab : public SlabBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,64 +211,40 @@ class CutCopperSlab : public SlabBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 172 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?randomTick\@CutCopperSlab\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@CutCopperSlab\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 - */ - virtual void __unk_vfn_178(); - /** - * @vftbl 186 - * @symbol __unk_vfn_186 - */ - virtual void __unk_vfn_186(); - /** - * @vftbl 194 - * @symbol __unk_vfn_194 - */ - virtual void __unk_vfn_194(); - /** - * @vftbl 195 - * @symbol __unk_vfn_195 - */ - virtual void __unk_vfn_195(); - /** - * @vftbl 196 - * @symbol __unk_vfn_196 - */ - virtual void __unk_vfn_196(); - /** - * @vftbl 197 - * @symbol __unk_vfn_197 - */ - virtual void __unk_vfn_197(); - /** - * @vftbl 198 - * @symbol __unk_vfn_198 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_198(); + virtual void __unk_vfn_179(); /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 187 + * @symbol __unk_vfn_187 */ - MCAPI std::string const & getDescriptionId() const; + virtual void __unk_vfn_187(); /** * @symbol ??0CutCopperSlab\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NAEBVHashedString\@\@W4CopperType\@\@2\@Z */ diff --git a/LiteLoader/include/llapi/mc/CutCopperStairs.hpp b/LiteLoader/include/llapi/mc/CutCopperStairs.hpp index f94f02e38f..30f77920fe 100644 --- a/LiteLoader/include/llapi/mc/CutCopperStairs.hpp +++ b/LiteLoader/include/llapi/mc/CutCopperStairs.hpp @@ -186,20 +186,20 @@ class CutCopperStairs : public StairBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,64 +211,40 @@ class CutCopperStairs : public StairBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 172 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?randomTick\@CutCopperStairs\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@CutCopperStairs\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 - */ - virtual void __unk_vfn_178(); - /** - * @vftbl 186 - * @symbol __unk_vfn_186 - */ - virtual void __unk_vfn_186(); - /** - * @vftbl 194 - * @symbol __unk_vfn_194 - */ - virtual void __unk_vfn_194(); - /** - * @vftbl 195 - * @symbol __unk_vfn_195 - */ - virtual void __unk_vfn_195(); - /** - * @vftbl 196 - * @symbol __unk_vfn_196 - */ - virtual void __unk_vfn_196(); - /** - * @vftbl 197 - * @symbol __unk_vfn_197 - */ - virtual void __unk_vfn_197(); - /** - * @vftbl 198 - * @symbol __unk_vfn_198 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_198(); + virtual void __unk_vfn_179(); /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 187 + * @symbol __unk_vfn_187 */ - MCAPI std::string const & getDescriptionId() const; + virtual void __unk_vfn_187(); /** * @symbol ??0CutCopperStairs\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlockLegacy\@\@W4CopperType\@\@AEBVHashedString\@\@33\@Z */ diff --git a/LiteLoader/include/llapi/mc/DBChunkStorage.hpp b/LiteLoader/include/llapi/mc/DBChunkStorage.hpp index f95b404a63..c59f19191e 100644 --- a/LiteLoader/include/llapi/mc/DBChunkStorage.hpp +++ b/LiteLoader/include/llapi/mc/DBChunkStorage.hpp @@ -124,13 +124,14 @@ class DBChunkStorage : public ChunkSource { */ virtual class std::shared_ptr loadLevelChunkMetaDataDictionary(); /** - * @symbol ??0DBChunkStorage\@\@QEAA\@V?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@AEAVDBStorage\@\@AEAVScheduler\@\@AEBVExperiments\@\@\@Z + * @vftbl 31 + * @symbol ?chunkPosNeedsBlending\@DBChunkStorage\@\@UEAA_NAEBVChunkPos\@\@\@Z */ - MCAPI DBChunkStorage(std::unique_ptr, class DBStorage &, class Scheduler &, class Experiments const &); + virtual bool chunkPosNeedsBlending(class ChunkPos const &); /** - * @symbol ?freeCaches\@DBChunkStorage\@\@QEAAXXZ + * @symbol ??0DBChunkStorage\@\@QEAA\@V?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@AEAVDBStorage\@\@AEAVScheduler\@\@AEBVExperiments\@\@\@Z */ - MCAPI void freeCaches(); + MCAPI DBChunkStorage(std::unique_ptr, class DBStorage &, class Scheduler &, class Experiments const &); /** * @symbol ?_getBlenderMode\@DBChunkStorage\@\@SA?AW4BlenderMode\@ConsoleChunkBlender\@\@AEBVLevelChunk\@\@AEBVExperiments\@\@\@Z */ @@ -157,6 +158,10 @@ class DBChunkStorage : public ChunkSource { * @symbol ?_getChunkNeighbors\@DBChunkStorage\@\@AEAA?AVNeighbors\@LevelChunk\@\@VChunkPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI class LevelChunk::Neighbors _getChunkNeighbors(class ChunkPos, class AutomaticID); + /** + * @symbol ?_getLevelChunkFormat\@DBChunkStorage\@\@AEAA?AV?$optional\@W4LevelChunkFormat\@\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + */ + MCAPI class std::optional _getLevelChunkFormat(class std::basic_string_view>, std::string &); /** * @symbol ?_hasChunk\@DBChunkStorage\@\@AEAA_NAEBVDBChunkStorageKey\@\@\@Z */ @@ -169,6 +174,10 @@ class DBChunkStorage : public ChunkSource { * @symbol ?_levelChunkCanBeUsedForBlending\@DBChunkStorage\@\@AEAA?AU?$pair\@_NV?$unique_ptr\@UPersistentBlendData\@\@U?$default_delete\@UPersistentBlendData\@\@\@std\@\@\@std\@\@\@std\@\@AEBVDBChunkStorageKey\@\@\@Z */ MCAPI struct std::pair> _levelChunkCanBeUsedForBlending(class DBChunkStorageKey const &); + /** + * @symbol ?_loadAndBlendFromDB\@DBChunkStorage\@\@AEAAXAEAVLevelChunk\@\@0AEAVChunkViewSource\@\@\@Z + */ + MCAPI void _loadAndBlendFromDB(class LevelChunk &, class LevelChunk &, class ChunkViewSource &); /** * @symbol ?_loadChunkFromDB\@DBChunkStorage\@\@AEAA_NAEAVLevelChunk\@\@0AEAVChunkViewSource\@\@\@Z */ @@ -197,6 +206,10 @@ class DBChunkStorage : public ChunkSource { * @symbol ?_writeActorDigest\@DBChunkStorage\@\@AEAAXAEAVLevelStorageWriteBatch\@\@AEBVChunkKey\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _writeActorDigest(class LevelStorageWriteBatch &, class ChunkKey const &, std::string const &); + /** + * @symbol ?_writeActorDigestFormatVersion\@DBChunkStorage\@\@AEAAXAEAVLevelStorageWriteBatch\@\@AEBVChunkKey\@\@W4ActorDigestFormat\@\@\@Z + */ + MCAPI void _writeActorDigestFormatVersion(class LevelStorageWriteBatch &, class ChunkKey const &, enum class ActorDigestFormat); /** * @symbol ?_writeDiscardChunksBatch\@DBChunkStorage\@\@AEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/DBLoggingUtils.hpp b/LiteLoader/include/llapi/mc/DBLoggingUtils.hpp deleted file mode 100644 index 2042dc5f0d..0000000000 --- a/LiteLoader/include/llapi/mc/DBLoggingUtils.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file DBLoggingUtils.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace DBLoggingUtils. - * - */ -namespace DBLoggingUtils { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?toPrintableDBKey\@DBLoggingUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z - */ - MCAPI std::string toPrintableDBKey(class std::basic_string_view> const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/DBStorage.hpp b/LiteLoader/include/llapi/mc/DBStorage.hpp index 22f14df64f..b5e26048eb 100644 --- a/LiteLoader/include/llapi/mc/DBStorage.hpp +++ b/LiteLoader/include/llapi/mc/DBStorage.hpp @@ -203,10 +203,6 @@ struct PendingWriteResult { * @symbol ??0DBStorage\@\@QEAA\@UDBStorageConfig\@\@V?$not_null\@V?$NonOwnerPointer\@VLevelDbEnv\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI DBStorage(struct DBStorageConfig, class gsl::not_null>); - /** - * @symbol ?_notifyChunkStorageDestroyed\@DBStorage\@\@QEAAXAEAVDBChunkStorage\@\@\@Z - */ - MCAPI void _notifyChunkStorageDestroyed(class DBChunkStorage &); /** * @symbol ?tryRepair\@DBStorage\@\@QEBA_NAEBVPath\@Core\@\@\@Z */ @@ -225,6 +221,10 @@ struct PendingWriteResult { * @symbol ?_handleErrorStatus\@DBStorage\@\@IEAAXAEBVStatus\@leveldb\@\@\@Z */ MCAPI void _handleErrorStatus(class leveldb::Status const &); + /** + * @symbol ?_mergeIntoDeleteCache\@DBStorage\@\@IEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Category\@DBHelpers\@\@\@Z + */ + MCAPI void _mergeIntoDeleteCache(std::string const &, enum class DBHelpers::Category); /** * @symbol ?_mergeIntoWriteCache\@DBStorage\@\@IEAAXAEBVLevelStorageWriteBatch\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DBStorageEnvironmentChain.hpp b/LiteLoader/include/llapi/mc/DBStorageEnvironmentChain.hpp index 9a5e02afb2..a52637cefc 100644 --- a/LiteLoader/include/llapi/mc/DBStorageEnvironmentChain.hpp +++ b/LiteLoader/include/llapi/mc/DBStorageEnvironmentChain.hpp @@ -35,30 +35,10 @@ class DBStorageEnvironmentChain { * @symbol ??0DBStorageEnvironmentChain\@\@QEAA\@AEBUDBStorageConfig\@\@AEBVPath\@Core\@\@V?$not_null\@V?$NonOwnerPointer\@VLevelDbEnv\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI DBStorageEnvironmentChain(struct DBStorageConfig const &, class Core::Path const &, class gsl::not_null>); - /** - * @symbol ?getCompactionListenerEnv\@DBStorageEnvironmentChain\@\@QEBAPEAVCompactionListenerEnv\@\@XZ - */ - MCAPI class CompactionListenerEnv * getCompactionListenerEnv() const; - /** - * @symbol ?getFlushableEnv\@DBStorageEnvironmentChain\@\@QEBAPEAVFlushableEnv\@\@XZ - */ - MCAPI class FlushableEnv * getFlushableEnv() const; - /** - * @symbol ?getRootEnv\@DBStorageEnvironmentChain\@\@QEBAPEAVEnv\@leveldb\@\@XZ - */ - MCAPI class leveldb::Env * getRootEnv() const; - /** - * @symbol ?getSnapshotEnv\@DBStorageEnvironmentChain\@\@QEBAPEAVSnapshotEnv\@\@XZ - */ - MCAPI class SnapshotEnv * getSnapshotEnv() const; /** * @symbol ?isChainValid\@DBStorageEnvironmentChain\@\@QEBA?AVResult\@Core\@\@_N\@Z */ MCAPI class Core::Result isChainValid(bool) const; - /** - * @symbol ?onFlush\@DBStorageEnvironmentChain\@\@QEAAXXZ - */ - MCAPI void onFlush(); /** * @symbol ??1DBStorageEnvironmentChain\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/DamageCommand.hpp b/LiteLoader/include/llapi/mc/DamageCommand.hpp index c3ccbaebfb..6514dbe6b3 100644 --- a/LiteLoader/include/llapi/mc/DamageCommand.hpp +++ b/LiteLoader/include/llapi/mc/DamageCommand.hpp @@ -34,7 +34,7 @@ class DamageCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@DamageCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/DanceComponentListener.hpp b/LiteLoader/include/llapi/mc/DanceComponentListener.hpp index ea4de2e1ed..0788fd6c54 100644 --- a/LiteLoader/include/llapi/mc/DanceComponentListener.hpp +++ b/LiteLoader/include/llapi/mc/DanceComponentListener.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "BlockSourceListener.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +15,7 @@ * @brief MC class DanceComponentListener. * */ -class DanceComponentListener : public BlockSourceListener { +class DanceComponentListener { #define AFTER_EXTRA // Add Member There @@ -31,134 +30,20 @@ class DanceComponentListener : public BlockSourceListener { public: /** - * @vftbl 0 - * @symbol __unk_vfn_0 + * @symbol ?setLevel\@DanceComponentListener\@\@QEAAXAEAVLevel\@\@\@Z */ - virtual void __unk_vfn_0(); + MCAPI void setLevel(class Level &); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @symbol ??1DanceComponentListener\@\@QEAA\@XZ */ - virtual void __unk_vfn_1(); - /** - * @vftbl 3 - * @symbol __unk_vfn_3 - */ - virtual void __unk_vfn_3(); - /** - * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 6 - * @symbol __unk_vfn_6 - */ - virtual void __unk_vfn_6(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); - /** - * @vftbl 8 - * @symbol __unk_vfn_8 - */ - virtual void __unk_vfn_8(); - /** - * @vftbl 9 - * @symbol __unk_vfn_9 - */ - virtual void __unk_vfn_9(); - /** - * @vftbl 10 - * @symbol __unk_vfn_10 - */ - virtual void __unk_vfn_10(); - /** - * @vftbl 11 - * @symbol __unk_vfn_11 - */ - virtual void __unk_vfn_11(); - /** - * @vftbl 12 - * @symbol __unk_vfn_12 - */ - virtual void __unk_vfn_12(); - /** - * @vftbl 13 - * @symbol __unk_vfn_13 - */ - virtual void __unk_vfn_13(); - /** - * @vftbl 14 - * @symbol __unk_vfn_14 - */ - virtual void __unk_vfn_14(); - /** - * @vftbl 15 - * @symbol __unk_vfn_15 - */ - virtual void __unk_vfn_15(); - /** - * @vftbl 16 - * @symbol __unk_vfn_16 - */ - virtual void __unk_vfn_16(); - /** - * @vftbl 17 - * @symbol __unk_vfn_17 - */ - virtual void __unk_vfn_17(); - /** - * @vftbl 18 - * @symbol __unk_vfn_18 - */ - virtual void __unk_vfn_18(); - /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 20 - * @symbol __unk_vfn_20 - */ - virtual void __unk_vfn_20(); - /** - * @vftbl 21 - * @symbol __unk_vfn_21 - */ - virtual void __unk_vfn_21(); - /** - * @vftbl 22 - * @symbol __unk_vfn_22 - */ - virtual void __unk_vfn_22(); - /** - * @vftbl 23 - * @symbol __unk_vfn_23 - */ - virtual void __unk_vfn_23(); - /** - * @vftbl 24 - * @symbol __unk_vfn_24 - */ - virtual void __unk_vfn_24(); - /** - * @vftbl 25 - * @symbol __unk_vfn_25 - */ - virtual void __unk_vfn_25(); - /** - * @vftbl 26 - * @symbol __unk_vfn_26 - */ - virtual void __unk_vfn_26(); + MCAPI ~DanceComponentListener(); + +//private: /** - * @vftbl 27 - * @symbol ?levelSoundEvent\@DanceComponentListener\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z + * @symbol ?_onHandleLevelSoundEvent\@DanceComponentListener\@\@AEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z */ - virtual void levelSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + MCAPI void _onHandleLevelSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + +private: }; diff --git a/LiteLoader/include/llapi/mc/DashSystem.hpp b/LiteLoader/include/llapi/mc/DashSystem.hpp index c7f5fff47e..5121f33b18 100644 --- a/LiteLoader/include/llapi/mc/DashSystem.hpp +++ b/LiteLoader/include/llapi/mc/DashSystem.hpp @@ -32,4 +32,12 @@ class DashSystem { */ MCAPI static struct TickingSystemWithInfo createSystem(); +//private: + /** + * @symbol ?_tickDashSystem\@DashSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorTickedFlag\@\@\@\@\@\@VActorOwnerComponent\@\@UDashCooldownTimerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UDashCooldownTimerComponent\@\@\@\@\@Z + */ + MCAPI static void _tickDashSystem(class ViewT>, class ActorOwnerComponent, struct DashCooldownTimerComponent>, class EntityModifierT); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/DayLockCommand.hpp b/LiteLoader/include/llapi/mc/DayLockCommand.hpp index a1de6b700d..82b1a38568 100644 --- a/LiteLoader/include/llapi/mc/DayLockCommand.hpp +++ b/LiteLoader/include/llapi/mc/DayLockCommand.hpp @@ -36,7 +36,7 @@ class DayLockCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@DayLockCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp b/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp index dcaf4969dd..3a25edd032 100644 --- a/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp +++ b/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp @@ -201,30 +201,30 @@ class DaylightDetectorBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 * @symbol ?getVariant\@DaylightDetectorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -237,51 +237,56 @@ class DaylightDetectorBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@DaylightDetectorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@DaylightDetectorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@DaylightDetectorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?updateShape\@DaylightDetectorBlock\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void updateShape(class BlockSource &, class BlockPos const &); /** - * @vftbl 196 + * @vftbl 197 * @symbol ?updateSignalStrength\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void updateSignalStrength(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp b/LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp index 85b8afe6a3..23d2b8e45d 100644 --- a/LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp @@ -80,9 +80,5 @@ class DaylightDetectorBlockActor : public BlockActor { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @symbol ??0DaylightDetectorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z - */ - MCAPI DaylightDetectorBlockActor(class BlockPos const &); }; diff --git a/LiteLoader/include/llapi/mc/DeOpCommand.hpp b/LiteLoader/include/llapi/mc/DeOpCommand.hpp index f870a1edc4..b16400c151 100644 --- a/LiteLoader/include/llapi/mc/DeOpCommand.hpp +++ b/LiteLoader/include/llapi/mc/DeOpCommand.hpp @@ -36,7 +36,7 @@ class DeOpCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@DeOpCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/DeadBush.hpp b/LiteLoader/include/llapi/mc/DeadBush.hpp index ccccce9f8f..c8ca76faf5 100644 --- a/LiteLoader/include/llapi/mc/DeadBush.hpp +++ b/LiteLoader/include/llapi/mc/DeadBush.hpp @@ -181,20 +181,20 @@ class DeadBush : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,40 +206,79 @@ class DeadBush : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 188 * @symbol ?playerDestroy\@DeadBush\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@DeadBush\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@DeadBush\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; + /** + * @vftbl 195 + * @symbol __unk_vfn_195 + */ + virtual void __unk_vfn_195(); + /** + * @vftbl 196 + * @symbol __unk_vfn_196 + */ + virtual void __unk_vfn_196(); + /** + * @vftbl 197 + * @symbol __unk_vfn_197 + */ + virtual void __unk_vfn_197(); + /** + * @vftbl 198 + * @symbol __unk_vfn_198 + */ + virtual void __unk_vfn_198(); + /** + * @vftbl 199 + * @symbol __unk_vfn_199 + */ + virtual void __unk_vfn_199(); + /** + * @vftbl 200 + * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z + */ + virtual void _Delete_this(bool); + /** + * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + MCAPI std::string const & getDescriptionId() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DEADBUSH /** * @symbol ?canBeSilkTouched\@DeadBush\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/DebugAssertException.hpp b/LiteLoader/include/llapi/mc/DebugAssertException.hpp index 8118137ff3..2313b77c25 100644 --- a/LiteLoader/include/llapi/mc/DebugAssertException.hpp +++ b/LiteLoader/include/llapi/mc/DebugAssertException.hpp @@ -49,13 +49,9 @@ class DebugAssertException { */ MCAPI DebugAssertException(class DebugAssertException const &); /** - * @symbol ??0DebugAssertException\@\@QEAA\@PEBD00H00\@Z + * @symbol ??0DebugAssertException\@\@QEAA\@PEBD0H00\@Z */ - MCAPI DebugAssertException(char const *, char const *, char const *, int, char const *, char const *); - /** - * @symbol ?isEnabled\@DebugAssertException\@\@SA_NXZ - */ - MCAPI static bool isEnabled(); + MCAPI DebugAssertException(char const *, char const *, int, char const *, char const *); //private: diff --git a/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp b/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp index a7c27f5ab6..e5abf9672e 100644 --- a/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp +++ b/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp @@ -180,6 +180,11 @@ class DebugInfoComponent { virtual void __unk_vfn_29(); /** * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); + /** + * @vftbl 31 * @symbol ?onEvent\@DebugInfoComponent\@\@UEAA?AW4EventResult\@\@AEBUActorDefinitionTriggeredEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ActorDefinitionTriggeredEvent const &); diff --git a/LiteLoader/include/llapi/mc/DebugUtils.hpp b/LiteLoader/include/llapi/mc/DebugUtils.hpp index d433da9260..0b29c9afa9 100644 --- a/LiteLoader/include/llapi/mc/DebugUtils.hpp +++ b/LiteLoader/include/llapi/mc/DebugUtils.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -21,14 +22,6 @@ namespace DebugUtils { // Add Member There #undef AFTER_EXTRA - /** - * @symbol ?DEFAULT_ASSERT_HANDLER\@DebugUtils\@\@YA_NAEBUAssertHandlerContext\@\@AEA_N\@Z - */ - MCAPI bool DEFAULT_ASSERT_HANDLER(struct AssertHandlerContext const &, bool &); - /** - * @symbol ?SET_THREAD_NAME\@DebugUtils\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI void SET_THREAD_NAME(std::string const &); /** * @symbol ?debugUtilMutex\@DebugUtils\@\@3Vmutex\@std\@\@A */ @@ -42,13 +35,13 @@ namespace DebugUtils { */ MCAPI extern bool gBreakpadSetupFailed; /** - * @symbol ?gDebugAssertCallbacks\@DebugUtils\@\@3V?$vector\@V?$weak_ptr\@V?$function\@$$A6AXAEBUAssertHandlerContext\@\@\@Z\@std\@\@\@std\@\@V?$allocator\@V?$weak_ptr\@V?$function\@$$A6AXAEBUAssertHandlerContext\@\@\@Z\@std\@\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?gDebugAssertCallbacks\@DebugUtils\@\@3V?$Publisher\@$$A6AXAEBUAssertHandlerContext\@\@\@ZUMultiThreaded\@ThreadModel\@PubSub\@Bedrock\@\@\@PubSub\@Bedrock\@\@A */ - MCAPI extern std::vector>> gDebugAssertCallbacks; + MCAPI extern class Bedrock::PubSub::Publisher gDebugAssertCallbacks; /** - * @symbol ?gFireAssertTelemetry\@DebugUtils\@\@3V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z\@std\@\@A + * @symbol ?gFireAssertTelemetry\@DebugUtils\@\@3V?$Publisher\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@ZUMultiThreaded\@ThreadModel\@PubSub\@Bedrock\@\@\@PubSub\@Bedrock\@\@A */ - MCAPI extern class std::function gFireAssertTelemetry; + MCAPI extern class Bedrock::PubSub::Publisher gFireAssertTelemetry; /** * @symbol ?gPublishAssertFullMessage\@DebugUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@A */ @@ -65,9 +58,25 @@ namespace DebugUtils { * @symbol ?gp_assert_handler\@DebugUtils\@\@3V?$ServiceOverrider\@P6A_NAEBUAssertHandlerContext\@\@AEA_N\@Z\@\@A */ MCAPI extern class ServiceOverrider gp_assert_handler; + /** + * @symbol ?handleAssert\@DebugUtils\@\@YA_NPEBD0AEA_NH00ZZ + */ + MCAPI bool handleAssert(char const *, char const *, bool &, int, char const *, char const *, ...); /** * @symbol ?isDebuggerAttached\@DebugUtils\@\@YA_NXZ */ MCAPI bool isDebuggerAttached(); + /** + * @symbol ?optimizedAssertHandler\@DebugUtils\@\@YA_NAEBUAssertHandlerContext\@\@AEA_N\@Z + */ + MCAPI bool optimizedAssertHandler(struct AssertHandlerContext const &, bool &); + /** + * @symbol ?runAssertHandler\@DebugUtils\@\@YA_NAEBV?$bitset\@$06\@std\@\@AEBUAssertHandlerContext\@\@AEA_N\@Z + */ + MCAPI bool runAssertHandler(class std::bitset<7> const &, struct AssertHandlerContext const &, bool &); + /** + * @symbol ?setThreadName\@DebugUtils\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI void setThreadName(std::string const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/DecoratedPotBlock.hpp b/LiteLoader/include/llapi/mc/DecoratedPotBlock.hpp index afd4b6069a..b0ff18191b 100644 --- a/LiteLoader/include/llapi/mc/DecoratedPotBlock.hpp +++ b/LiteLoader/include/llapi/mc/DecoratedPotBlock.hpp @@ -5,14 +5,14 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "FaceDirectionalActorBlock.hpp" +#include "ActorBlock.hpp" #define BEFORE_EXTRA #undef BEFORE_EXTRA -class DecoratedPotBlock : public FaceDirectionalActorBlock { +class DecoratedPotBlock : public ActorBlock { #define AFTER_EXTRA @@ -35,6 +35,11 @@ class DecoratedPotBlock : public FaceDirectionalActorBlock { * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); + /** + * @vftbl 22 + * @symbol ?canProvideSupport\@DecoratedPotBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + */ + virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 29 * @symbol __unk_vfn_29 @@ -201,20 +206,20 @@ class DecoratedPotBlock : public FaceDirectionalActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,27 +231,32 @@ class DecoratedPotBlock : public FaceDirectionalActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getEntityResourceItem\@DecoratedPotBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; diff --git a/LiteLoader/include/llapi/mc/DecoratedPotRecipe.hpp b/LiteLoader/include/llapi/mc/DecoratedPotRecipe.hpp index 9893bcf217..d59a446aa6 100644 --- a/LiteLoader/include/llapi/mc/DecoratedPotRecipe.hpp +++ b/LiteLoader/include/llapi/mc/DecoratedPotRecipe.hpp @@ -32,9 +32,9 @@ class DecoratedPotRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@DecoratedPotRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @symbol ?assemble\@DecoratedPotRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &) const; + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@DecoratedPotRecipe\@\@UEBAHXZ @@ -50,6 +50,11 @@ class DecoratedPotRecipe : public Recipe { * @symbol ?getResultItem\@DecoratedPotRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; + /** + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); /** * @vftbl 6 * @symbol ?matches\@DecoratedPotRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/DedicatedServer.hpp b/LiteLoader/include/llapi/mc/DedicatedServer.hpp index afa13999fe..057fbd0f10 100644 --- a/LiteLoader/include/llapi/mc/DedicatedServer.hpp +++ b/LiteLoader/include/llapi/mc/DedicatedServer.hpp @@ -42,9 +42,9 @@ enum class StartResult; */ MCVAPI class gsl::not_null> getFileArchiver() const; /** - * @symbol ?getGameModule\@DedicatedServer\@\@EEAAAEAVIGameModuleShared\@\@XZ + * @symbol ?getGameModuleShared\@DedicatedServer\@\@EEAAAEAVIGameModuleShared\@\@XZ */ - MCVAPI class IGameModuleShared & getGameModule(); + MCVAPI class IGameModuleShared & getGameModuleShared(); /** * @symbol ?getPrimaryMinecraft\@DedicatedServer\@\@EEAA?AV?$not_null\@V?$NonOwnerPointer\@VMinecraft\@\@\@Bedrock\@\@\@gsl\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/DedicatedServerGameTestRunnerListener.hpp b/LiteLoader/include/llapi/mc/DedicatedServerGameTestRunnerListener.hpp index e0e185b3be..aa7b8da83e 100644 --- a/LiteLoader/include/llapi/mc/DedicatedServerGameTestRunnerListener.hpp +++ b/LiteLoader/include/llapi/mc/DedicatedServerGameTestRunnerListener.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "gametest.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/include/llapi/mc/DedicatedWSServerCommand.hpp b/LiteLoader/include/llapi/mc/DedicatedWSServerCommand.hpp index 6fb52155fc..c607b6812b 100644 --- a/LiteLoader/include/llapi/mc/DedicatedWSServerCommand.hpp +++ b/LiteLoader/include/llapi/mc/DedicatedWSServerCommand.hpp @@ -36,7 +36,7 @@ class DedicatedWSServerCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@DedicatedWSServerCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/DeepslateBlock.hpp b/LiteLoader/include/llapi/mc/DeepslateBlock.hpp index 04e9542279..8a8e3406b0 100644 --- a/LiteLoader/include/llapi/mc/DeepslateBlock.hpp +++ b/LiteLoader/include/llapi/mc/DeepslateBlock.hpp @@ -181,25 +181,25 @@ class DeepslateBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 159 - * @symbol ?tryGetInfested\@DeepslateBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual class Block const * tryGetInfested(class Block const &) const; + virtual void __unk_vfn_157(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 160 + * @symbol ?tryGetInfested\@DeepslateBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ - virtual void __unk_vfn_165(); + virtual class Block const * tryGetInfested(class Block const &) const; /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,32 +211,37 @@ class DeepslateBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@DeepslateBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@DeepslateBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/DeepslateOreBlock.hpp b/LiteLoader/include/llapi/mc/DeepslateOreBlock.hpp index 94d46ab2a3..7ed2f5876d 100644 --- a/LiteLoader/include/llapi/mc/DeepslateOreBlock.hpp +++ b/LiteLoader/include/llapi/mc/DeepslateOreBlock.hpp @@ -186,20 +186,20 @@ class DeepslateOreBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,32 +211,37 @@ class DeepslateOreBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@DeepslateOreBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@DeepslateOreBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/DeepslateRedStoneOreBlock.hpp b/LiteLoader/include/llapi/mc/DeepslateRedStoneOreBlock.hpp index 7834532d12..6c3faac91c 100644 --- a/LiteLoader/include/llapi/mc/DeepslateRedStoneOreBlock.hpp +++ b/LiteLoader/include/llapi/mc/DeepslateRedStoneOreBlock.hpp @@ -181,20 +181,20 @@ class DeepslateRedStoneOreBlock : public RedStoneOreBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,37 +206,42 @@ class DeepslateRedStoneOreBlock : public RedStoneOreBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@DeepslateRedStoneOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@DeepslateRedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?_lightUpBlock\@DeepslateRedStoneOreBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void _lightUpBlock(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/DefaultPlayerNameValidator.hpp b/LiteLoader/include/llapi/mc/DefaultPlayerNameValidator.hpp new file mode 100644 index 0000000000..705ad3b8ff --- /dev/null +++ b/LiteLoader/include/llapi/mc/DefaultPlayerNameValidator.hpp @@ -0,0 +1,24 @@ +/** + * @file DefaultPlayerNameValidator.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace DefaultPlayerNameValidator { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?validatePlayerName\@DefaultPlayerNameValidator\@\@YA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVGameplayUserManager\@\@\@Z + */ + MCAPI class std::optional validatePlayerName(std::string const &, class GameplayUserManager const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/DefaultScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/DefaultScreenCapabilities.hpp index fd72ef8a7e..230f12cd63 100644 --- a/LiteLoader/include/llapi/mc/DefaultScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/DefaultScreenCapabilities.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -12,7 +13,7 @@ #undef BEFORE_EXTRA -class DefaultScreenCapabilities { +struct DefaultScreenCapabilities { #define AFTER_EXTRA // Add Member There @@ -20,8 +21,8 @@ class DefaultScreenCapabilities { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_DEFAULTSCREENCAPABILITIES public: - class DefaultScreenCapabilities& operator=(class DefaultScreenCapabilities const &) = delete; - DefaultScreenCapabilities(class DefaultScreenCapabilities const &) = delete; + struct DefaultScreenCapabilities& operator=(struct DefaultScreenCapabilities const &) = delete; + DefaultScreenCapabilities(struct DefaultScreenCapabilities const &) = delete; DefaultScreenCapabilities() = delete; #endif @@ -33,8 +34,8 @@ class DefaultScreenCapabilities { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@UDefaultScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @symbol ?isOfType\@?$TypedScreenCapabilities\@UDefaultScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@Bedrock\@\@\@Z */ - virtual bool isOfType(class typeid_t) const; + virtual bool isOfType(class Bedrock::typeid_t) const; -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/DeferredCommand.hpp b/LiteLoader/include/llapi/mc/DeferredCommand.hpp index 639bc2f7de..a75c6ceeda 100644 --- a/LiteLoader/include/llapi/mc/DeferredCommand.hpp +++ b/LiteLoader/include/llapi/mc/DeferredCommand.hpp @@ -38,9 +38,5 @@ class DeferredCommand : public Command { * @symbol ?execute\@DeferredCommand\@\@UEAAXAEAVMinecraftCommands\@\@\@Z */ virtual void execute(class MinecraftCommands &); - /** - * @symbol ??0DeferredCommand\@\@QEAA\@V?$unique_ptr\@VCommandContext\@\@U?$default_delete\@VCommandContext\@\@\@std\@\@\@std\@\@_N1V?$function\@$$A6AXUMCRESULT\@\@\@Z\@2\@\@Z - */ - MCAPI DeferredCommand(std::unique_ptr, bool, bool, class std::function); }; diff --git a/LiteLoader/include/llapi/mc/DeferredCommandBlockCommand.hpp b/LiteLoader/include/llapi/mc/DeferredCommandBlockCommand.hpp index 03eb9c30f1..71f18b267c 100644 --- a/LiteLoader/include/llapi/mc/DeferredCommandBlockCommand.hpp +++ b/LiteLoader/include/llapi/mc/DeferredCommandBlockCommand.hpp @@ -38,9 +38,5 @@ class DeferredCommandBlockCommand : public Command { * @symbol ?execute\@DeferredCommandBlockCommand\@\@UEAAXAEAVMinecraftCommands\@\@\@Z */ virtual void execute(class MinecraftCommands &); - /** - * @symbol ??0DeferredCommandBlockCommand\@\@QEAA\@VBlockPos\@\@AEAVBlockSource\@\@\@Z - */ - MCAPI DeferredCommandBlockCommand(class BlockPos, class BlockSource &); }; diff --git a/LiteLoader/include/llapi/mc/DeferredCompiledCommand.hpp b/LiteLoader/include/llapi/mc/DeferredCompiledCommand.hpp index 3d73c85744..7770b3b5ee 100644 --- a/LiteLoader/include/llapi/mc/DeferredCompiledCommand.hpp +++ b/LiteLoader/include/llapi/mc/DeferredCompiledCommand.hpp @@ -38,9 +38,5 @@ class DeferredCompiledCommand : public Command { * @symbol ?execute\@DeferredCompiledCommand\@\@UEAAXAEAVMinecraftCommands\@\@\@Z */ virtual void execute(class MinecraftCommands &); - /** - * @symbol ??0DeferredCompiledCommand\@\@QEAA\@V?$not_null\@PEAVCommand\@\@\@gsl\@\@V?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI DeferredCompiledCommand(class gsl::not_null, std::unique_ptr); }; diff --git a/LiteLoader/include/llapi/mc/DeferredScriptCommand.hpp b/LiteLoader/include/llapi/mc/DeferredScriptCommand.hpp index 1828e7cd80..079d495dd2 100644 --- a/LiteLoader/include/llapi/mc/DeferredScriptCommand.hpp +++ b/LiteLoader/include/llapi/mc/DeferredScriptCommand.hpp @@ -41,8 +41,8 @@ class DeferredScriptCommand : public Command { */ virtual void execute(class MinecraftCommands &); /** - * @symbol ??0DeferredScriptCommand\@\@QEAA\@V?$unique_ptr\@VScriptCommand\@\@U?$default_delete\@VScriptCommand\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VCommandContext\@\@U?$default_delete\@VCommandContext\@\@\@std\@\@\@2\@VWeakLifetimeScope\@Scripting\@\@V?$Promise\@V?$StrongTypedObjectHandle\@UScriptCommandResult\@ScriptModuleMinecraft\@\@\@Scripting\@\@\@5\@\@Z + * @symbol ??0DeferredScriptCommand\@\@QEAA\@V?$unique_ptr\@VScriptCommand\@\@U?$default_delete\@VScriptCommand\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VCommandContext\@\@U?$default_delete\@VCommandContext\@\@\@std\@\@\@2\@VWeakLifetimeScope\@Scripting\@\@V?$Promise\@V?$StrongTypedObjectHandle\@UScriptCommandResult\@ScriptModuleMinecraft\@\@\@Scripting\@\@UError\@2\@X\@5\@\@Z */ - MCAPI DeferredScriptCommand(std::unique_ptr, std::unique_ptr, class Scripting::WeakLifetimeScope, class Scripting::Promise>); + MCAPI DeferredScriptCommand(std::unique_ptr, std::unique_ptr, class Scripting::WeakLifetimeScope, class Scripting::Promise, struct Scripting::Error, void>); }; diff --git a/LiteLoader/include/llapi/mc/DelayRequest.hpp b/LiteLoader/include/llapi/mc/DelayRequest.hpp index c749320092..0f377e1700 100644 --- a/LiteLoader/include/llapi/mc/DelayRequest.hpp +++ b/LiteLoader/include/llapi/mc/DelayRequest.hpp @@ -31,22 +31,6 @@ class DelayRequest { * @symbol ??0DelayRequest\@\@QEAA\@V?$unique_ptr\@VIRequestAction\@\@U?$default_delete\@VIRequestAction\@\@\@std\@\@\@std\@\@_K\@Z */ MCAPI DelayRequest(std::unique_ptr, unsigned __int64); - /** - * @symbol ?executeAction\@DelayRequest\@\@QEAAXAEAVServerLevel\@\@AEAVDimension\@\@\@Z - */ - MCAPI void executeAction(class ServerLevel &, class Dimension &); - /** - * @symbol ?getAction\@DelayRequest\@\@QEBA?AV?$not_null\@PEAVIRequestAction\@\@\@gsl\@\@XZ - */ - MCAPI class gsl::not_null getAction() const; - /** - * @symbol ?getTickToExecuteOn\@DelayRequest\@\@QEBA_KXZ - */ - MCAPI unsigned __int64 getTickToExecuteOn() const; - /** - * @symbol ??ODelayRequest\@\@QEBA_NAEBV0\@\@Z - */ - MCAPI bool operator>(class DelayRequest const &) const; /** * @symbol ??1DelayRequest\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp b/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp index 08154bbf24..baffbf1b8e 100644 --- a/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp @@ -108,9 +108,9 @@ class DeprecatedSlabBlockItem : public BlockItem { virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** * @vftbl 132 - * @symbol ?_useOn\@DeprecatedSlabBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@DeprecatedSlabBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DEPRECATEDSLABBLOCKITEM /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/DeserializeDataParams.hpp b/LiteLoader/include/llapi/mc/DeserializeDataParams.hpp index 90ed0aadbc..9cf577776b 100644 --- a/LiteLoader/include/llapi/mc/DeserializeDataParams.hpp +++ b/LiteLoader/include/llapi/mc/DeserializeDataParams.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class DeserializeDataParams { +struct DeserializeDataParams { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_DESERIALIZEDATAPARAMS public: - class DeserializeDataParams& operator=(class DeserializeDataParams const &) = delete; - DeserializeDataParams(class DeserializeDataParams const &) = delete; + struct DeserializeDataParams& operator=(struct DeserializeDataParams const &) = delete; + DeserializeDataParams(struct DeserializeDataParams const &) = delete; DeserializeDataParams() = delete; #endif @@ -29,4 +29,4 @@ class DeserializeDataParams { */ MCAPI ~DeserializeDataParams(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/DesertPyramidPiece.hpp b/LiteLoader/include/llapi/mc/DesertPyramidPiece.hpp index d2d34dc269..eb2ee81c8c 100644 --- a/LiteLoader/include/llapi/mc/DesertPyramidPiece.hpp +++ b/LiteLoader/include/llapi/mc/DesertPyramidPiece.hpp @@ -45,9 +45,5 @@ class DesertPyramidPiece : public StructurePiece { * @symbol ?postProcess\@DesertPyramidPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); - /** - * @symbol ??0DesertPyramidPiece\@\@QEAA\@FHH\@Z - */ - MCAPI DesertPyramidPiece(short, int, int); }; diff --git a/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp b/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp index a894bd232f..bba3af84ed 100644 --- a/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp @@ -206,25 +206,25 @@ class DetectorRailBlock : public BaseRailBlock { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 - * @symbol ?getVariant\@DetectorRailBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 147 + * @symbol ?getVariant\@DetectorRailBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -236,30 +236,35 @@ class DetectorRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@DetectorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DETECTORRAILBLOCK /** * @symbol ?hasComparatorSignal\@DetectorRailBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/DialogueCommand.hpp b/LiteLoader/include/llapi/mc/DialogueCommand.hpp index 285f7e0f33..d52550e8eb 100644 --- a/LiteLoader/include/llapi/mc/DialogueCommand.hpp +++ b/LiteLoader/include/llapi/mc/DialogueCommand.hpp @@ -36,7 +36,7 @@ class DialogueCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@DialogueCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/DictionaryCompressionUtil.hpp b/LiteLoader/include/llapi/mc/DictionaryCompressionUtil.hpp new file mode 100644 index 0000000000..a92e3a207e --- /dev/null +++ b/LiteLoader/include/llapi/mc/DictionaryCompressionUtil.hpp @@ -0,0 +1,40 @@ +/** + * @file DictionaryCompressionUtil.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace DictionaryCompressionUtil { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?_getDictionary\@DictionaryCompressionUtil\@\@YA?AV?$set\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$less\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + */ + MCAPI class std::set, class std::allocator> _getDictionary(std::string const &); + /** + * @symbol ?_pruneDictionary\@DictionaryCompressionUtil\@\@YA?AV?$set\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$less\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEAV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_KU?$less\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@std\@\@\@2\@\@3\@\@Z + */ + MCAPI class std::set, class std::allocator> _pruneDictionary(class std::map, class std::allocator>> &); + /** + * @symbol ?_tryCompressToken\@DictionaryCompressionUtil\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$set\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$less\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@VBinaryStream\@\@\@Z + */ + MCAPI void _tryCompressToken(std::string const &, class std::set, class std::allocator> &, class BinaryStream); + /** + * @symbol ?dictionaryCompressString\@DictionaryCompressionUtil\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + */ + MCAPI std::string dictionaryCompressString(std::string const &); + /** + * @symbol ?dictionaryDecompressString\@DictionaryCompressionUtil\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + */ + MCAPI std::string dictionaryDecompressString(std::string const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/DiffListPair.hpp b/LiteLoader/include/llapi/mc/DiffListPair.hpp deleted file mode 100644 index f770df7101..0000000000 --- a/LiteLoader/include/llapi/mc/DiffListPair.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file DiffListPair.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure DiffListPair. - * - */ -struct DiffListPair { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_DIFFLISTPAIR -public: - struct DiffListPair& operator=(struct DiffListPair const &) = delete; - DiffListPair(struct DiffListPair const &) = delete; - DiffListPair() = delete; -#endif - -public: - /** - * @symbol ??0DiffListPair\@\@QEAA\@_NPEAVActorDefinitionDescriptor\@\@\@Z - */ - MCAPI DiffListPair(bool, class ActorDefinitionDescriptor *); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/DifficultyCommand.hpp b/LiteLoader/include/llapi/mc/DifficultyCommand.hpp index 734d730276..265e73298d 100644 --- a/LiteLoader/include/llapi/mc/DifficultyCommand.hpp +++ b/LiteLoader/include/llapi/mc/DifficultyCommand.hpp @@ -36,7 +36,7 @@ class DifficultyCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@DifficultyCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/DiggerItemComponent.hpp b/LiteLoader/include/llapi/mc/DiggerItemComponent.hpp index 999bac95f0..49f4012954 100644 --- a/LiteLoader/include/llapi/mc/DiggerItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/DiggerItemComponent.hpp @@ -24,6 +24,7 @@ class DiggerItemComponent { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_DIGGERITEMCOMPONENT public: class DiggerItemComponent& operator=(class DiggerItemComponent const &) = delete; + DiggerItemComponent(class DiggerItemComponent const &) = delete; DiggerItemComponent() = delete; #endif @@ -63,18 +64,6 @@ class DiggerItemComponent { * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VDiggerItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); - /** - * @symbol ??0DiggerItemComponent\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI DiggerItemComponent(class DiggerItemComponent const &); - /** - * @symbol ?canDestroySpecial\@DiggerItemComponent\@\@QEBA_NAEBVBlock\@\@\@Z - */ - MCAPI bool canDestroySpecial(class Block const &) const; - /** - * @symbol ?getDestroySpeed\@DiggerItemComponent\@\@QEAAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z - */ - MCAPI float getDestroySpeed(class ItemStackBase const &, class Block const &); /** * @symbol ?mineBlock\@DiggerItemComponent\@\@QEAA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DiggingEnchant.hpp b/LiteLoader/include/llapi/mc/DiggingEnchant.hpp index fbe6c970cf..7499b63fd3 100644 --- a/LiteLoader/include/llapi/mc/DiggingEnchant.hpp +++ b/LiteLoader/include/llapi/mc/DiggingEnchant.hpp @@ -75,10 +75,6 @@ class DiggingEnchant : public Enchant { * @symbol ?_isValidEnchantmentTypeForCategory\@DiggingEnchant\@\@EEBA_NW4Type\@Enchant\@\@\@Z */ virtual bool _isValidEnchantmentTypeForCategory(enum class Enchant::Type) const; - /** - * @symbol ??0DiggingEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2HH\@Z - */ - MCAPI DiggingEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, int); //private: diff --git a/LiteLoader/include/llapi/mc/Dimension.hpp b/LiteLoader/include/llapi/mc/Dimension.hpp index 4f89ec2d10..184026761d 100644 --- a/LiteLoader/include/llapi/mc/Dimension.hpp +++ b/LiteLoader/include/llapi/mc/Dimension.hpp @@ -216,22 +216,22 @@ class Dimension { * @symbol ?fetchEntity\@Dimension\@\@QEBAPEAVActor\@\@UActorUniqueID\@\@_N\@Z */ MCAPI class Actor * fetchEntity(struct ActorUniqueID, bool) const; - /** - * @symbol ?fetchNearestAttackablePlayer\@Dimension\@\@QEAAPEAVPlayer\@\@AEAVActor\@\@M\@Z - */ - MCAPI class Player * fetchNearestAttackablePlayer(class Actor &, float); /** * @symbol ?fetchNearestAttackablePlayer\@Dimension\@\@QEAAPEAVPlayer\@\@VBlockPos\@\@MPEAVActor\@\@\@Z */ MCAPI class Player * fetchNearestAttackablePlayer(class BlockPos, float, class Actor *); /** - * @symbol ?fetchNearestInteractablePlayer\@Dimension\@\@QEBAPEAVPlayer\@\@AEBVVec3\@\@M\@Z + * @symbol ?fetchNearestAttackablePlayer\@Dimension\@\@QEAAPEAVPlayer\@\@AEAVActor\@\@M\@Z */ - MCAPI class Player * fetchNearestInteractablePlayer(class Vec3 const &, float) const; + MCAPI class Player * fetchNearestAttackablePlayer(class Actor &, float); /** * @symbol ?fetchNearestInteractablePlayer\@Dimension\@\@QEBAPEAVPlayer\@\@AEAVActor\@\@M\@Z */ MCAPI class Player * fetchNearestInteractablePlayer(class Actor &, float) const; + /** + * @symbol ?fetchNearestInteractablePlayer\@Dimension\@\@QEBAPEAVPlayer\@\@AEBVVec3\@\@M\@Z + */ + MCAPI class Player * fetchNearestInteractablePlayer(class Vec3 const &, float) const; /** * @symbol ?fetchNearestPlayer\@Dimension\@\@QEBAPEAVPlayer\@\@AEBVVec3\@\@M_NV?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z */ @@ -464,14 +464,14 @@ class Dimension { * @symbol ?transferEntity\@Dimension\@\@QEAAXAEBVChunkPos\@\@AEBVVec3\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI void transferEntity(class ChunkPos const &, class Vec3 const &, std::unique_ptr, bool); - /** - * @symbol ?transferEntityToUnloadedChunk\@Dimension\@\@QEAAXAEBVChunkPos\@\@0V?$AutomaticID\@VDimension\@\@H\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@5\@\@Z - */ - MCAPI void transferEntityToUnloadedChunk(class ChunkPos const &, class ChunkPos const &, class AutomaticID, std::string &, std::unique_ptr); /** * @symbol ?transferEntityToUnloadedChunk\@Dimension\@\@QEAAXAEAVActor\@\@PEAVLevelChunk\@\@\@Z */ MCAPI void transferEntityToUnloadedChunk(class Actor &, class LevelChunk *); + /** + * @symbol ?transferEntityToUnloadedChunk\@Dimension\@\@QEAAXAEBVChunkPos\@\@0V?$AutomaticID\@VDimension\@\@H\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@5\@\@Z + */ + MCAPI void transferEntityToUnloadedChunk(class ChunkPos const &, class ChunkPos const &, class AutomaticID, std::string &, std::unique_ptr); /** * @symbol ?tryGarbageCollectStructures\@Dimension\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/DimensionConversionData.hpp b/LiteLoader/include/llapi/mc/DimensionConversionData.hpp index bad4635323..b0d171e512 100644 --- a/LiteLoader/include/llapi/mc/DimensionConversionData.hpp +++ b/LiteLoader/include/llapi/mc/DimensionConversionData.hpp @@ -29,10 +29,6 @@ class DimensionConversionData { #endif public: - /** - * @symbol ??0DimensionConversionData\@\@QEAA\@AEBVVec3\@\@H\@Z - */ - MCAPI DimensionConversionData(class Vec3 const &, int); /** * @symbol ?getNetherScale\@DimensionConversionData\@\@QEBAHXZ */ diff --git a/LiteLoader/include/llapi/mc/DimensionManager.hpp b/LiteLoader/include/llapi/mc/DimensionManager.hpp index 7eb40eb59d..e2a1be5275 100644 --- a/LiteLoader/include/llapi/mc/DimensionManager.hpp +++ b/LiteLoader/include/llapi/mc/DimensionManager.hpp @@ -6,6 +6,7 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Bedrock.hpp" +#include "DimensionDefinitionGroup.hpp" #define BEFORE_EXTRA @@ -26,9 +27,9 @@ class DimensionManager { public: /** - * @symbol ??0DimensionManager\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VIDimensionFactory\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ??0DimensionManager\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VIDimensionFactory\@\@\@Bedrock\@\@\@gsl\@\@V?$optional\@VDimensionDefinitionGroup\@\@\@std\@\@\@Z */ - MCAPI DimensionManager(class gsl::not_null>); + MCAPI DimensionManager(class gsl::not_null>, class std::optional); /** * @symbol ?forEachDimension\@DimensionManager\@\@QEAAXV?$function\@$$A6A_NAEAVDimension\@\@\@Z\@std\@\@\@Z */ @@ -41,6 +42,14 @@ class DimensionManager { * @symbol ?getDimension\@DimensionManager\@\@QEBA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VDimension\@\@\@\@\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI class WeakRefT> getDimension(class AutomaticID) const; + /** + * @symbol ?getDimensionDefinition\@DimensionManager\@\@QEBA?AV?$optional\@UDimensionDefinition\@DimensionDefinitionGroup\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + */ + MCAPI class std::optional getDimensionDefinition(std::string const &) const; + /** + * @symbol ?getDimensionDefinitionGroup\@DimensionManager\@\@QEBAAEBV?$optional\@VDimensionDefinitionGroup\@\@\@std\@\@XZ + */ + MCAPI class std::optional const & getDimensionDefinitionGroup() const; /** * @symbol ?getOrCreateDimension\@DimensionManager\@\@QEAA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VDimension\@\@\@\@\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ @@ -57,6 +66,10 @@ class DimensionManager { * @symbol ?registerOnNewDimensionCreated\@DimensionManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVDimension\@\@\@Z\@std\@\@\@Z */ MCAPI class Bedrock::PubSub::Subscription registerOnNewDimensionCreated(class std::function); + /** + * @symbol ?setDimensionDefinitionGroup\@DimensionManager\@\@QEAAXV?$optional\@VDimensionDefinitionGroup\@\@\@std\@\@\@Z + */ + MCAPI void setDimensionDefinitionGroup(class std::optional); /** * @symbol ?shutdown\@DimensionManager\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/DimensionTransitionSystem.hpp b/LiteLoader/include/llapi/mc/DimensionTransitionSystem.hpp index 8d9c2bbf91..6314b84112 100644 --- a/LiteLoader/include/llapi/mc/DimensionTransitionSystem.hpp +++ b/LiteLoader/include/llapi/mc/DimensionTransitionSystem.hpp @@ -27,6 +27,14 @@ class DimensionTransitionSystem { #endif public: + /** + * @symbol ?_tickPortalTransition\@DimensionTransitionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Exclude\@UPassengerComponent\@\@UVehicleComponent\@\@\@\@VActorOwnerComponent\@\@$$CBUDimensionTransitionComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UDimensionTransitionComponent\@\@\@\@\@Z + */ + MCAPI static void _tickPortalTransition(class ViewT, class ActorOwnerComponent, struct DimensionTransitionComponent const>, class EntityModifierT); + /** + * @symbol ?_tickReadyToContinueServer\@DimensionTransitionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Exclude\@UPassengerComponent\@\@UVehicleComponent\@\@UDimensionTransitionComponent\@\@\@\@UPlayerChangeDimensionRequestComponent\@\@\@\@\@Z + */ + MCAPI static void _tickReadyToContinueServer(class ViewT, struct PlayerChangeDimensionRequestComponent>); /** * @symbol ?_tickVehicleDismount\@DimensionTransitionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPlayerChangeDimensionRequestComponent\@\@UPassengerComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPlayerChangeDimensionRequestComponent\@\@\@\@$$CBUVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@V?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DiodeBlock.hpp b/LiteLoader/include/llapi/mc/DiodeBlock.hpp index b380383713..702b3a4c34 100644 --- a/LiteLoader/include/llapi/mc/DiodeBlock.hpp +++ b/LiteLoader/include/llapi/mc/DiodeBlock.hpp @@ -182,9 +182,9 @@ class DiodeBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@DiodeBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@DiodeBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,30 +201,30 @@ class DiodeBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 * @symbol ?getVariant\@DiodeBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 147 + * @vftbl 148 * @symbol ?canSpawnOn\@DiodeBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -236,97 +236,102 @@ class DiodeBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 180 * @symbol ?canSurvive\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getSignal\@DiodeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual int getSignal(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?isLocked\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isLocked(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 196 + * @vftbl 197 * @symbol ?isSameDiode\@DiodeBlock\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool isSameDiode(class Block const &) const; /** - * @vftbl 197 + * @vftbl 198 * @symbol ?shouldPrioritize\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool shouldPrioritize(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 198 + * @vftbl 199 * @symbol ?isOn\@DiodeBlock\@\@MEBA_NXZ */ virtual bool isOn() const; /** - * @vftbl 199 + * @vftbl 200 * @symbol ?shouldTurnOn\@DiodeBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool shouldTurnOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 200 + * @vftbl 201 * @symbol ?getInputSignal\@DiodeBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getInputSignal(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 201 + * @vftbl 202 * @symbol ?isAlternateInput\@DiodeBlock\@\@MEBA_NAEBVBlock\@\@\@Z */ virtual bool isAlternateInput(class Block const &) const; /** - * @vftbl 202 + * @vftbl 203 * @symbol ?getAlternateSignal\@DiodeBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getAlternateSignal(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 203 + * @vftbl 204 * @symbol ?getOutputSignal\@DiodeBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int getOutputSignal(class Block const &) const; /** - * @vftbl 204 + * @vftbl 205 * @symbol ?getTurnOffDelay\@DiodeBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int getTurnOffDelay(class Block const &) const; /** - * @vftbl 205 + * @vftbl 206 * @symbol ?getTurnOnDelay\@RepeaterBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int getTurnOnDelay(class Block const &) const = 0; /** - * @vftbl 206 + * @vftbl 207 * @symbol ?getOnBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z */ virtual class Block const * getOnBlock(class Block const *) const = 0; /** - * @vftbl 207 + * @vftbl 208 * @symbol ?getOffBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z */ virtual class Block const * getOffBlock(class Block const *) const = 0; diff --git a/LiteLoader/include/llapi/mc/DirectAgentMobMovementProxy.hpp b/LiteLoader/include/llapi/mc/DirectAgentMobMovementProxy.hpp index 44de1c6b6f..d3009848cb 100644 --- a/LiteLoader/include/llapi/mc/DirectAgentMobMovementProxy.hpp +++ b/LiteLoader/include/llapi/mc/DirectAgentMobMovementProxy.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class DirectAgentMobMovementProxy { +struct DirectAgentMobMovementProxy { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_DIRECTAGENTMOBMOVEMENTPROXY public: - class DirectAgentMobMovementProxy& operator=(class DirectAgentMobMovementProxy const &) = delete; - DirectAgentMobMovementProxy(class DirectAgentMobMovementProxy const &) = delete; + struct DirectAgentMobMovementProxy& operator=(struct DirectAgentMobMovementProxy const &) = delete; + DirectAgentMobMovementProxy(struct DirectAgentMobMovementProxy const &) = delete; DirectAgentMobMovementProxy() = delete; #endif @@ -43,4 +43,4 @@ class DirectAgentMobMovementProxy { MCVAPI void setSlideOffset(class Vec2 const &); #endif -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/DirectPlayerMovementProxy.hpp b/LiteLoader/include/llapi/mc/DirectPlayerMovementProxy.hpp index b233877a2f..a190a00464 100644 --- a/LiteLoader/include/llapi/mc/DirectPlayerMovementProxy.hpp +++ b/LiteLoader/include/llapi/mc/DirectPlayerMovementProxy.hpp @@ -210,14 +210,14 @@ class DirectPlayerMovementProxy { * @symbol ?sendInput\@DirectPlayerMovementProxy\@\@UEAAXXZ */ MCVAPI void sendInput(); - /** - * @symbol ?sendPacket\@DirectPlayerMovementProxy\@\@UEAAXAEAVPassengerJumpPacket\@\@\@Z - */ - MCVAPI void sendPacket(class PassengerJumpPacket &); /** * @symbol ?sendPacket\@DirectPlayerMovementProxy\@\@UEAAXAEAVPlayerActionPacket\@\@\@Z */ MCVAPI void sendPacket(class PlayerActionPacket &); + /** + * @symbol ?sendPacket\@DirectPlayerMovementProxy\@\@UEAAXAEAVPassengerJumpPacket\@\@\@Z + */ + MCVAPI void sendPacket(class PassengerJumpPacket &); /** * @symbol ?sendPlayerInput\@DirectPlayerMovementProxy\@\@UEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/DirectionalProducerComponent.hpp b/LiteLoader/include/llapi/mc/DirectionalProducerComponent.hpp new file mode 100644 index 0000000000..33ced4dbea --- /dev/null +++ b/LiteLoader/include/llapi/mc/DirectionalProducerComponent.hpp @@ -0,0 +1,56 @@ +/** + * @file DirectionalProducerComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "ProducerComponent.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class DirectionalProducerComponent : public ProducerComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_DIRECTIONALPRODUCERCOMPONENT +public: + class DirectionalProducerComponent& operator=(class DirectionalProducerComponent const &) = delete; + DirectionalProducerComponent(class DirectionalProducerComponent const &) = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 12 + * @symbol ?allowConnection\@DirectionalProducerComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z + */ + virtual bool allowConnection(class CircuitSceneGraph &, class CircuitTrackingInfo const &, bool &); + /** + * @vftbl 17 + * @symbol __unk_vfn_17 + */ + virtual void __unk_vfn_17(); + /** + * @vftbl 20 + * @symbol __unk_vfn_20 + */ + virtual void __unk_vfn_20(); + /** + * @symbol ??0DirectionalProducerComponent\@\@QEAA\@XZ + */ + MCAPI DirectionalProducerComponent(); + /** + * @symbol ?setAllowedConnections\@DirectionalProducerComponent\@\@QEAAXV?$bitset\@$05\@std\@\@\@Z + */ + MCAPI void setAllowedConnections(class std::bitset<6>); + +}; diff --git a/LiteLoader/include/llapi/mc/DirectoryPackWithEncryptionAccessStrategy.hpp b/LiteLoader/include/llapi/mc/DirectoryPackWithEncryptionAccessStrategy.hpp index 4b37fd94d3..ff5995847f 100644 --- a/LiteLoader/include/llapi/mc/DirectoryPackWithEncryptionAccessStrategy.hpp +++ b/LiteLoader/include/llapi/mc/DirectoryPackWithEncryptionAccessStrategy.hpp @@ -127,31 +127,6 @@ class DirectoryPackWithEncryptionAccessStrategy : public PackAccessStrategy { * @symbol ?readContentIdentity\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA?AVContentIdentity\@\@XZ */ virtual class ContentIdentity readContentIdentity() const; - /** - * @vftbl 22 - * @symbol __unk_vfn_22 - */ - virtual void __unk_vfn_22(); - /** - * @vftbl 23 - * @symbol __unk_vfn_23 - */ - virtual void __unk_vfn_23(); - /** - * @vftbl 24 - * @symbol __unk_vfn_24 - */ - virtual void __unk_vfn_24(); - /** - * @vftbl 25 - * @symbol __unk_vfn_25 - */ - virtual void __unk_vfn_25(); - /** - * @vftbl 26 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z - */ - virtual void _Delete_this(bool); /** * @symbol ??0DirectoryPackWithEncryptionAccessStrategy\@\@QEAA\@AEBVResourceLocation\@\@0AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DirtBlock.hpp b/LiteLoader/include/llapi/mc/DirtBlock.hpp index 2641573e62..f04a56d47a 100644 --- a/LiteLoader/include/llapi/mc/DirtBlock.hpp +++ b/LiteLoader/include/llapi/mc/DirtBlock.hpp @@ -211,40 +211,40 @@ class DirtBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@DirtBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@DirtBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@DirtBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 161 + * @vftbl 162 * @symbol ?_addHardCodedBlockComponents\@DirtBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -256,42 +256,47 @@ class DirtBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 * @symbol ?use\@DirtBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@DirtBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@DirtBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@DirtBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/DirtyTicksCounter.hpp b/LiteLoader/include/llapi/mc/DirtyTicksCounter.hpp index 01dccc31ea..ef7401643e 100644 --- a/LiteLoader/include/llapi/mc/DirtyTicksCounter.hpp +++ b/LiteLoader/include/llapi/mc/DirtyTicksCounter.hpp @@ -32,29 +32,5 @@ struct DirtyTicksCounter { * @symbol ??0DirtyTicksCounter\@\@QEAA\@XZ */ MCAPI DirtyTicksCounter(); - /** - * @symbol ?getTicksSinceLastChange\@DirtyTicksCounter\@\@QEBAHXZ - */ - MCAPI int getTicksSinceLastChange() const; - /** - * @symbol ?getTotalDirtyTicks\@DirtyTicksCounter\@\@QEBAHXZ - */ - MCAPI int getTotalDirtyTicks() const; - /** - * @symbol ??EDirtyTicksCounter\@\@QEAAAEAU0\@XZ - */ - MCAPI struct DirtyTicksCounter & operator++(); - /** - * @symbol ?reset\@DirtyTicksCounter\@\@QEAAXXZ - */ - MCAPI void reset(); - /** - * @symbol ?touch\@DirtyTicksCounter\@\@QEAAXXZ - */ - MCAPI void touch(); - /** - * @symbol ?max\@DirtyTicksCounter\@\@SA?AU1\@XZ - */ - MCAPI static struct DirtyTicksCounter max(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/DispatcherUpdateSystem.hpp b/LiteLoader/include/llapi/mc/DispatcherUpdateSystem.hpp index 005ea30faf..8e85e63a34 100644 --- a/LiteLoader/include/llapi/mc/DispatcherUpdateSystem.hpp +++ b/LiteLoader/include/llapi/mc/DispatcherUpdateSystem.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class DispatcherUpdateSystem { +struct DispatcherUpdateSystem { #define AFTER_EXTRA // Add Member There @@ -20,8 +20,8 @@ class DispatcherUpdateSystem { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_DISPATCHERUPDATESYSTEM public: - class DispatcherUpdateSystem& operator=(class DispatcherUpdateSystem const &) = delete; - DispatcherUpdateSystem(class DispatcherUpdateSystem const &) = delete; + struct DispatcherUpdateSystem& operator=(struct DispatcherUpdateSystem const &) = delete; + DispatcherUpdateSystem(struct DispatcherUpdateSystem const &) = delete; DispatcherUpdateSystem() = delete; #endif @@ -42,4 +42,4 @@ class DispatcherUpdateSystem { */ virtual void tick(class EntityRegistry &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/DispenserBlock.hpp b/LiteLoader/include/llapi/mc/DispenserBlock.hpp index fe04e620d2..ccaa0bd710 100644 --- a/LiteLoader/include/llapi/mc/DispenserBlock.hpp +++ b/LiteLoader/include/llapi/mc/DispenserBlock.hpp @@ -172,9 +172,9 @@ class DispenserBlock : public ActorBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@DispenserBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@DispenserBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,35 +196,35 @@ class DispenserBlock : public ActorBlock { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 * @symbol ?getVariant\@DispenserBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 + * @vftbl 150 * @symbol ?getMappedFace\@DispenserBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -237,56 +237,61 @@ class DispenserBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@DispenserBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@DispenserBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@DispenserBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getTickDelay\@DispenserBlock\@\@UEBAHXZ */ virtual int getTickDelay() const; /** - * @vftbl 196 + * @vftbl 197 * @symbol ?dispenseFrom\@DispenserBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void dispenseFrom(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/DispenserBlockActor.hpp b/LiteLoader/include/llapi/mc/DispenserBlockActor.hpp index 2d2ad611c9..90fc331955 100644 --- a/LiteLoader/include/llapi/mc/DispenserBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/DispenserBlockActor.hpp @@ -99,10 +99,6 @@ class DispenserBlockActor { */ MCVAPI ~DispenserBlockActor(); #endif - /** - * @symbol ??0DispenserBlockActor\@\@QEAA\@VBlockPos\@\@\@Z - */ - MCAPI DispenserBlockActor(class BlockPos); /** * @symbol ??0DispenserBlockActor\@\@QEAA\@VBlockPos\@\@W4BlockActorType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DisplayNameItemComponent.hpp b/LiteLoader/include/llapi/mc/DisplayNameItemComponent.hpp index 491e806fc6..78b07e4b58 100644 --- a/LiteLoader/include/llapi/mc/DisplayNameItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/DisplayNameItemComponent.hpp @@ -64,10 +64,6 @@ class DisplayNameItemComponent { * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VDisplayNameItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); - /** - * @symbol ?getDescriptionId\@DisplayNameItemComponent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getDescriptionId() const; /** * @symbol ?bindType\@DisplayNameItemComponent\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/DisplayObjective.hpp b/LiteLoader/include/llapi/mc/DisplayObjective.hpp index a0d881ceaf..0b7a93daed 100644 --- a/LiteLoader/include/llapi/mc/DisplayObjective.hpp +++ b/LiteLoader/include/llapi/mc/DisplayObjective.hpp @@ -29,10 +29,6 @@ class DisplayObjective { #endif public: - /** - * @symbol ??0DisplayObjective\@\@QEAA\@AEBVObjective\@\@W4ObjectiveSortOrder\@\@\@Z - */ - MCAPI DisplayObjective(class Objective const &, enum class ObjectiveSortOrder); /** * @symbol ?getBelowNameStringForId\@DisplayObjective\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUScoreboardId\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DoorBlock.hpp b/LiteLoader/include/llapi/mc/DoorBlock.hpp index 0173632b04..0c35f45d55 100644 --- a/LiteLoader/include/llapi/mc/DoorBlock.hpp +++ b/LiteLoader/include/llapi/mc/DoorBlock.hpp @@ -242,30 +242,30 @@ class DoorBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 142 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 143 * @symbol ?getVisualShapeInWorld\@DoorBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@DoorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -278,56 +278,61 @@ class DoorBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@DoorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@DoorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@DoorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@DoorBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@DoorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; @@ -353,10 +358,6 @@ class DoorBlock : public BlockLegacy { * @symbol ?getBlockedDirection\@DoorBlock\@\@QEBA?AW4Type\@Direction\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI enum class Direction::Type getBlockedDirection(class IConstBlockSource const &, class BlockPos const &) const; - /** - * @symbol ?getDir\@DoorBlock\@\@QEBAHAEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI int getDir(class IConstBlockSource const &, class BlockPos const &) const; /** * @symbol ?getDoorBlocks\@DoorBlock\@\@QEBAXAEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAPEBVBlock\@\@2\@Z */ diff --git a/LiteLoader/include/llapi/mc/DoorInteractGoal.hpp b/LiteLoader/include/llapi/mc/DoorInteractGoal.hpp index 40f7fc0cff..92591eb87a 100644 --- a/LiteLoader/include/llapi/mc/DoorInteractGoal.hpp +++ b/LiteLoader/include/llapi/mc/DoorInteractGoal.hpp @@ -81,20 +81,12 @@ class DoorInteractGoal { */ MCAPI DoorInteractGoal(class Mob &); -//protected: - /** - * @symbol ?_doorBlocksPath\@DoorInteractGoal\@\@IEBA_NXZ - */ - MCAPI bool _doorBlocksPath() const; - //private: /** * @symbol ?_findBlockingDoorAtPos\@DoorInteractGoal\@\@CAPEBVDoorBlock\@\@AEBVBlockPos\@\@AEBVMob\@\@PEAVPath\@\@AEAW4Type\@Direction\@\@3\@Z */ MCAPI static class DoorBlock const * _findBlockingDoorAtPos(class BlockPos const &, class Mob const &, class Path *, enum class Direction::Type &, enum class Direction::Type &); -protected: - private: }; diff --git a/LiteLoader/include/llapi/mc/DoorItem.hpp b/LiteLoader/include/llapi/mc/DoorItem.hpp index 3c11678782..55f46262d1 100644 --- a/LiteLoader/include/llapi/mc/DoorItem.hpp +++ b/LiteLoader/include/llapi/mc/DoorItem.hpp @@ -104,9 +104,9 @@ class DoorItem : public Item { virtual void __unk_vfn_80(); /** * @vftbl 132 - * @symbol ?_useOn\@DoorItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@DoorItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0DoorItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4DoorType\@DoorBlock\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DoublePlantBaseBlock.hpp b/LiteLoader/include/llapi/mc/DoublePlantBaseBlock.hpp new file mode 100644 index 0000000000..7934b1444e --- /dev/null +++ b/LiteLoader/include/llapi/mc/DoublePlantBaseBlock.hpp @@ -0,0 +1,329 @@ +/** + * @file DoublePlantBaseBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BushBlock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class DoublePlantBaseBlock : public BushBlock { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_DOUBLEPLANTBASEBLOCK +public: + class DoublePlantBaseBlock& operator=(class DoublePlantBaseBlock const &) = delete; + DoublePlantBaseBlock(class DoublePlantBaseBlock const &) = delete; + DoublePlantBaseBlock() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 3 + * @symbol ?getNextBlockPermutation\@DoublePlantBaseBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + */ + virtual class Block const * getNextBlockPermutation(class Block const &) const; + /** + * @vftbl 7 + * @symbol ?randomlyModifyPosition\@DoublePlantBaseBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@AEAH\@Z + */ + virtual class Vec3 randomlyModifyPosition(class BlockPos const &, int &) const; + /** + * @vftbl 8 + * @symbol ?randomlyModifyPosition\@DoublePlantBaseBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + */ + virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; + /** + * @vftbl 10 + * @symbol ?getAABB\@DoublePlantBaseBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + */ + virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); + /** + * @vftbl 29 + * @symbol __unk_vfn_29 + */ + virtual void __unk_vfn_29(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); + /** + * @vftbl 32 + * @symbol __unk_vfn_32 + */ + virtual void __unk_vfn_32(); + /** + * @vftbl 33 + * @symbol __unk_vfn_33 + */ + virtual void __unk_vfn_33(); + /** + * @vftbl 34 + * @symbol __unk_vfn_34 + */ + virtual void __unk_vfn_34(); + /** + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 37 + * @symbol __unk_vfn_37 + */ + virtual void __unk_vfn_37(); + /** + * @vftbl 38 + * @symbol __unk_vfn_38 + */ + virtual void __unk_vfn_38(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 + * @symbol __unk_vfn_40 + */ + virtual void __unk_vfn_40(); + /** + * @vftbl 41 + * @symbol __unk_vfn_41 + */ + virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); + /** + * @vftbl 44 + * @symbol __unk_vfn_44 + */ + virtual void __unk_vfn_44(); + /** + * @vftbl 45 + * @symbol __unk_vfn_45 + */ + virtual void __unk_vfn_45(); + /** + * @vftbl 46 + * @symbol __unk_vfn_46 + */ + virtual void __unk_vfn_46(); + /** + * @vftbl 47 + * @symbol __unk_vfn_47 + */ + virtual void __unk_vfn_47(); + /** + * @vftbl 48 + * @symbol __unk_vfn_48 + */ + virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 54 + * @symbol __unk_vfn_54 + */ + virtual void __unk_vfn_54(); + /** + * @vftbl 60 + * @symbol __unk_vfn_60 + */ + virtual void __unk_vfn_60(); + /** + * @vftbl 61 + * @symbol __unk_vfn_61 + */ + virtual void __unk_vfn_61(); + /** + * @vftbl 62 + * @symbol ?canContainLiquid\@DoublePlantBaseBlock\@\@UEBA_NXZ + */ + virtual bool canContainLiquid() const; + /** + * @vftbl 75 + * @symbol __unk_vfn_75 + */ + virtual void __unk_vfn_75(); + /** + * @vftbl 82 + * @symbol __unk_vfn_82 + */ + virtual void __unk_vfn_82(); + /** + * @vftbl 86 + * @symbol ?onFertilized\@DoublePlantBaseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + */ + virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; + /** + * @vftbl 88 + * @symbol ?canBeFertilized\@DoublePlantBaseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + */ + virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; + /** + * @vftbl 91 + * @symbol ?mayPlace\@DoublePlantBaseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + */ + virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; + /** + * @vftbl 92 + * @symbol ?mayPlace\@DoublePlantBaseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 100 + * @symbol ?getSecondPart\@DoublePlantBaseBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z + */ + virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; + /** + * @vftbl 101 + * @symbol ?playerWillDestroy\@DoublePlantBaseBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + */ + virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; + /** + * @vftbl 102 + * @symbol ?spawnResources\@DoublePlantBaseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + */ + virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; + /** + * @vftbl 105 + * @symbol __unk_vfn_105 + */ + virtual void __unk_vfn_105(); + /** + * @vftbl 123 + * @symbol __unk_vfn_123 + */ + virtual void __unk_vfn_123(); + /** + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 + * @symbol __unk_vfn_126 + */ + virtual void __unk_vfn_126(); + /** + * @vftbl 129 + * @symbol __unk_vfn_129 + */ + virtual void __unk_vfn_129(); + /** + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 + * @symbol ?getVisualShape\@DoublePlantBaseBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + */ + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + /** + * @vftbl 157 + * @symbol __unk_vfn_157 + */ + virtual void __unk_vfn_157(); + /** + * @vftbl 166 + * @symbol __unk_vfn_166 + */ + virtual void __unk_vfn_166(); + /** + * @vftbl 167 + * @symbol __unk_vfn_167 + */ + virtual void __unk_vfn_167(); + /** + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 + * @symbol ?onPlace\@DoublePlantBaseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual void onPlace(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 + * @symbol ?tick\@DoublePlantBaseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + */ + virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; + /** + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 180 + * @symbol ?canSurvive\@DoublePlantBaseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 190 + * @symbol ?getResourceCount\@DoublePlantBaseBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual int getResourceCount(class Randomize &, class Block const &, int) const; + /** + * @vftbl 195 + * @symbol ?checkAlive\@DoublePlantBaseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual void checkAlive(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 196 + * @symbol ?_keepRelevantStateForDropping\@DoublePlantBaseBlock\@\@MEBAAEBVBlock\@\@AEBV2\@\@Z + */ + virtual class Block const & _keepRelevantStateForDropping(class Block const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DOUBLEPLANTBASEBLOCK + /** + * @symbol ?canBeSilkTouched\@DoublePlantBaseBlock\@\@MEBA_NXZ + */ + MCVAPI bool canBeSilkTouched() const; +#endif + /** + * @symbol ??0DoublePlantBaseBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI DoublePlantBaseBlock(std::string const &, int); + +}; diff --git a/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp b/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp index b5b9d41ad4..c2cfd4eab7 100644 --- a/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp +++ b/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "BushBlock.hpp" +#include "DoublePlantBaseBlock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class DoublePlantBlock. * */ -class DoublePlantBlock : public BushBlock { +class DoublePlantBlock : public DoublePlantBaseBlock { #define AFTER_EXTRA // Add Member There @@ -35,26 +35,6 @@ class DoublePlantBlock : public BushBlock { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 3 - * @symbol ?getNextBlockPermutation\@DoublePlantBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z - */ - virtual class Block const * getNextBlockPermutation(class Block const &) const; - /** - * @vftbl 7 - * @symbol ?randomlyModifyPosition\@DoublePlantBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@AEAH\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &, int &) const; - /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@DoublePlantBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 10 - * @symbol ?getAABB\@DoublePlantBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z - */ - virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** * @vftbl 19 * @symbol __unk_vfn_19 @@ -165,11 +145,6 @@ class DoublePlantBlock : public BushBlock { * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); - /** - * @vftbl 62 - * @symbol ?canContainLiquid\@DoublePlantBlock\@\@UEBA_NXZ - */ - virtual bool canContainLiquid() const; /** * @vftbl 75 * @symbol __unk_vfn_75 @@ -195,31 +170,6 @@ class DoublePlantBlock : public BushBlock { * @symbol ?canBeFertilized\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 91 - * @symbol ?mayPlace\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z - */ - virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; - /** - * @vftbl 92 - * @symbol ?mayPlace\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 100 - * @symbol ?getSecondPart\@DoublePlantBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z - */ - virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; - /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@DoublePlantBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z - */ - virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 102 - * @symbol ?spawnResources\@DoublePlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z - */ - virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** * @vftbl 103 * @symbol ?asItemInstance\@DoublePlantBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z @@ -251,50 +201,45 @@ class DoublePlantBlock : public BushBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@DoublePlantBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@DoublePlantBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColor\@DoublePlantBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 138 + * @vftbl 139 * @symbol ?getColorForParticle\@DoublePlantBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColorForParticle(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 143 - * @symbol ?getVisualShape\@DoublePlantBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z - */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; - /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@DoublePlantBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -307,83 +252,62 @@ class DoublePlantBlock : public BushBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 - * @symbol ?onPlace\@DoublePlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol __unk_vfn_168 */ - virtual void onPlace(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 170 - * @symbol __unk_vfn_170 - */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 - * @symbol ?tick\@DoublePlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z - */ - virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; - /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** * @vftbl 179 - * @symbol ?canSurvive\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol __unk_vfn_179 */ - virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; + virtual void __unk_vfn_179(); /** - * @vftbl 180 + * @vftbl 181 * @symbol ?getRenderLayer\@DoublePlantBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 181 + * @vftbl 182 * @symbol ?getRenderLayer\@DoublePlantBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@DoublePlantBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@DoublePlantBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getResourceCount\@DoublePlantBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 196 + * @symbol ?_keepRelevantStateForDropping\@DoublePlantBlock\@\@MEBAAEBVBlock\@\@AEBV2\@\@Z */ - virtual int getResourceCount(class Randomize &, class Block const &, int) const; - /** - * @vftbl 194 - * @symbol ?checkAlive\@DoublePlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - virtual void checkAlive(class BlockSource &, class BlockPos const &) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DOUBLEPLANTBLOCK - /** - * @symbol ?canBeSilkTouched\@DoublePlantBlock\@\@MEBA_NXZ - */ - MCVAPI bool canBeSilkTouched() const; -#endif + virtual class Block const & _keepRelevantStateForDropping(class Block const &) const; /** * @symbol ??0DoublePlantBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI DoublePlantBlock(std::string const &, int); /** - * @symbol ?getType\@DoublePlantBlock\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?getType\@DoublePlantBlock\@\@QEBAHAEBVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ - MCAPI int getType(class BlockSource &, class BlockPos const &, class Block const &) const; + MCAPI int getType(class BlockSource const &, class BlockPos const &, class Block const &) const; /** * @symbol ?placeAt\@DoublePlantBlock\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@W4DoublePlantType\@\@HPEAVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DoubleTag.hpp b/LiteLoader/include/llapi/mc/DoubleTag.hpp index fa370d070e..6f8dc6f106 100644 --- a/LiteLoader/include/llapi/mc/DoubleTag.hpp +++ b/LiteLoader/include/llapi/mc/DoubleTag.hpp @@ -35,6 +35,7 @@ double val; public: class DoubleTag& operator=(class DoubleTag const &) = delete; DoubleTag(class DoubleTag const &) = delete; + DoubleTag() = delete; #endif public: @@ -78,9 +79,5 @@ double val; * @symbol ?hash\@DoubleTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; - /** - * @symbol ??0DoubleTag\@\@QEAA\@XZ - */ - MCAPI DoubleTag(); }; diff --git a/LiteLoader/include/llapi/mc/DragonEggBlock.hpp b/LiteLoader/include/llapi/mc/DragonEggBlock.hpp index e4d68b9d71..ac0fc3e9c9 100644 --- a/LiteLoader/include/llapi/mc/DragonEggBlock.hpp +++ b/LiteLoader/include/llapi/mc/DragonEggBlock.hpp @@ -191,20 +191,20 @@ class DragonEggBlock : public HeavyBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,45 +216,50 @@ class DragonEggBlock : public HeavyBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 * @symbol ?use\@DragonEggBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getDustColor\@DragonEggBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getDustParticleName\@DragonEggBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string getDustParticleName(class Block const &) const; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 197 + * @symbol __unk_vfn_197 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_197(); /** * @symbol ??0DragonEggBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/DriedKelpBlock.hpp b/LiteLoader/include/llapi/mc/DriedKelpBlock.hpp index e69c55ff55..56c6ed06d1 100644 --- a/LiteLoader/include/llapi/mc/DriedKelpBlock.hpp +++ b/LiteLoader/include/llapi/mc/DriedKelpBlock.hpp @@ -176,20 +176,20 @@ class DriedKelpBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,25 +201,30 @@ class DriedKelpBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); /** * @symbol ??0DriedKelpBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DropItemForGoal.hpp b/LiteLoader/include/llapi/mc/DropItemForGoal.hpp index 8941a454bf..bcc866deec 100644 --- a/LiteLoader/include/llapi/mc/DropItemForGoal.hpp +++ b/LiteLoader/include/llapi/mc/DropItemForGoal.hpp @@ -95,4 +95,12 @@ class DropItemForGoal : public BaseMoveToBlockGoal { */ MCAPI DropItemForGoal(class Mob &); +//private: + /** + * @symbol ?_getLootTable\@DropItemForGoal\@\@AEAAPEAVLootTable\@\@XZ + */ + MCAPI class LootTable * _getLootTable(); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/DropperBlock.hpp b/LiteLoader/include/llapi/mc/DropperBlock.hpp index 5197724359..3c7a1d2c2c 100644 --- a/LiteLoader/include/llapi/mc/DropperBlock.hpp +++ b/LiteLoader/include/llapi/mc/DropperBlock.hpp @@ -176,20 +176,20 @@ class DropperBlock : public DispenserBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,37 +201,42 @@ class DropperBlock : public DispenserBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@DropperBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@DropperBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 196 + * @vftbl 197 * @symbol ?dispenseFrom\@DropperBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void dispenseFrom(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/DropperBlockActor.hpp b/LiteLoader/include/llapi/mc/DropperBlockActor.hpp index 3b7f56e478..b3bd2b52ce 100644 --- a/LiteLoader/include/llapi/mc/DropperBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/DropperBlockActor.hpp @@ -44,10 +44,6 @@ class DropperBlockActor { */ MCVAPI std::string getName() const; #endif - /** - * @symbol ??0DropperBlockActor\@\@QEAA\@VBlockPos\@\@\@Z - */ - MCAPI DropperBlockActor(class BlockPos); /** * @symbol ?pushOutItems\@DropperBlockActor\@\@QEAA_NAEAVBlockSource\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DurabilityItemComponent.hpp b/LiteLoader/include/llapi/mc/DurabilityItemComponent.hpp index 065a111758..930f23be26 100644 --- a/LiteLoader/include/llapi/mc/DurabilityItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/DurabilityItemComponent.hpp @@ -62,10 +62,6 @@ class DurabilityItemComponent { * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VDurabilityItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); - /** - * @symbol ?getDamageChance\@DurabilityItemComponent\@\@QEBAHH\@Z - */ - MCAPI int getDamageChance(int) const; /** * @symbol ?getDamageChanceRange\@DurabilityItemComponent\@\@QEBA?AUIntRange\@\@XZ */ @@ -74,10 +70,6 @@ class DurabilityItemComponent { * @symbol ?getMaxDamage\@DurabilityItemComponent\@\@QEBAHXZ */ MCAPI int getMaxDamage() const; - /** - * @symbol ?setMaxDamage\@DurabilityItemComponent\@\@QEAAXH\@Z - */ - MCAPI void setMaxDamage(int); /** * @symbol ?bindType\@DurabilityItemComponent\@\@SAXXZ */ @@ -86,9 +78,5 @@ class DurabilityItemComponent { * @symbol ?getIdentifier\@DurabilityItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); - /** - * @symbol ?registerVersionUpgrades\@DurabilityItemComponent\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z - */ - MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); }; diff --git a/LiteLoader/include/llapi/mc/DyePowderItem.hpp b/LiteLoader/include/llapi/mc/DyePowderItem.hpp index 3d6f37f23d..c19658d4c5 100644 --- a/LiteLoader/include/llapi/mc/DyePowderItem.hpp +++ b/LiteLoader/include/llapi/mc/DyePowderItem.hpp @@ -138,9 +138,9 @@ class DyePowderItem : public FertilizerItem { virtual class Item & setIconInfo(std::string const &, int); /** * @vftbl 132 - * @symbol ?_useOn\@DyePowderItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@DyePowderItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0DyePowderItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ItemColor\@\@_N2\@Z */ diff --git a/LiteLoader/include/llapi/mc/EDUWorldsScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/EDUWorldsScreenCapabilities.hpp index 2382db81ce..5a5a3209c3 100644 --- a/LiteLoader/include/llapi/mc/EDUWorldsScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/EDUWorldsScreenCapabilities.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -12,7 +13,7 @@ #undef BEFORE_EXTRA -class EDUWorldsScreenCapabilities { +struct EDUWorldsScreenCapabilities { #define AFTER_EXTRA // Add Member There @@ -20,8 +21,8 @@ class EDUWorldsScreenCapabilities { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_EDUWORLDSSCREENCAPABILITIES public: - class EDUWorldsScreenCapabilities& operator=(class EDUWorldsScreenCapabilities const &) = delete; - EDUWorldsScreenCapabilities(class EDUWorldsScreenCapabilities const &) = delete; + struct EDUWorldsScreenCapabilities& operator=(struct EDUWorldsScreenCapabilities const &) = delete; + EDUWorldsScreenCapabilities(struct EDUWorldsScreenCapabilities const &) = delete; EDUWorldsScreenCapabilities() = delete; #endif @@ -33,8 +34,8 @@ class EDUWorldsScreenCapabilities { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@UEDUWorldsScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @symbol ?isOfType\@?$TypedScreenCapabilities\@UEDUWorldsScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@Bedrock\@\@\@Z */ - virtual bool isOfType(class typeid_t) const; + virtual bool isOfType(class Bedrock::typeid_t) const; -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/EconomyTradeableComponent.hpp b/LiteLoader/include/llapi/mc/EconomyTradeableComponent.hpp index 5757f1b46a..6ff3b15578 100644 --- a/LiteLoader/include/llapi/mc/EconomyTradeableComponent.hpp +++ b/LiteLoader/include/llapi/mc/EconomyTradeableComponent.hpp @@ -34,9 +34,9 @@ class EconomyTradeableComponent { */ MCAPI EconomyTradeableComponent(class Actor &); /** - * @symbol ?addAdditionalSaveData\@EconomyTradeableComponent\@\@QEAAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@EconomyTradeableComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ - MCAPI void addAdditionalSaveData(class CompoundTag &); + MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** * @symbol ?createDataPacket\@EconomyTradeableComponent\@\@QEAA?AVUpdateTradePacket\@\@W4ContainerID\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Editor.hpp b/LiteLoader/include/llapi/mc/Editor.hpp index 6d8465947f..6f89d11642 100644 --- a/LiteLoader/include/llapi/mc/Editor.hpp +++ b/LiteLoader/include/llapi/mc/Editor.hpp @@ -10,3 +10,4 @@ #undef BEFORE_EXTRA + diff --git a/LiteLoader/include/llapi/mc/EditorTickFilterSystem.hpp b/LiteLoader/include/llapi/mc/EditorTickFilterSystem.hpp index 6199c1a039..96a31e43c2 100644 --- a/LiteLoader/include/llapi/mc/EditorTickFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/EditorTickFilterSystem.hpp @@ -31,6 +31,10 @@ class EditorTickFilterSystem { * @symbol ?_addPauseTickNeeded\@EditorTickFilterSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorTickNeededComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UEditorActorPauseTickNeededFlag\@\@\@\@\@\@\@Z */ MCAPI static void _addPauseTickNeeded(class StrictEntityContext &, class ActorTickNeededComponent &, class EntityModifierT> &); + /** + * @symbol ?_tickAddPauseTickNeeded\@EditorTickFilterSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UEditorActorPausedFlag\@\@\@\@\@\@VActorTickNeededComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UEditorActorPauseTickNeededFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void _tickAddPauseTickNeeded(class ViewT>, class ActorTickNeededComponent>, class EntityModifierT>); /** * @symbol ?createAddPauseTickNeeded\@EditorTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp b/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp index 3fa78312e4..7ff21bf899 100644 --- a/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp +++ b/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp @@ -60,13 +60,13 @@ class EduUriResourcePacket : public Packet { */ MCVAPI ~EduUriResourcePacket(); #endif - /** - * @symbol ??0EduUriResourcePacket\@\@QEAA\@XZ - */ - MCAPI EduUriResourcePacket(); /** * @symbol ??0EduUriResourcePacket\@\@QEAA\@AEBUEduSharedUriResource\@\@\@Z */ MCAPI EduUriResourcePacket(struct EduSharedUriResource const &); + /** + * @symbol ??0EduUriResourcePacket\@\@QEAA\@XZ + */ + MCAPI EduUriResourcePacket(); }; diff --git a/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp b/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp index bcc403e9de..e4c9565dde 100644 --- a/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp +++ b/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp @@ -22,14 +22,14 @@ struct EducationLevelSettings { #undef AFTER_EXTRA public: - /** - * @symbol ??0EducationLevelSettings\@\@QEAA\@XZ - */ - MCAPI EducationLevelSettings(); /** * @symbol ??0EducationLevelSettings\@\@QEAA\@AEBU0\@\@Z */ MCAPI EducationLevelSettings(struct EducationLevelSettings const &); + /** + * @symbol ??0EducationLevelSettings\@\@QEAA\@XZ + */ + MCAPI EducationLevelSettings(); /** * @symbol ?getCommandOverrideFunctor\@EducationLevelSettings\@\@QEBA?AV?$function\@$$A6AXAEAUCommandFlag\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/EducationMetadata.hpp b/LiteLoader/include/llapi/mc/EducationMetadata.hpp index 2eb1fe1597..d314d5fc63 100644 --- a/LiteLoader/include/llapi/mc/EducationMetadata.hpp +++ b/LiteLoader/include/llapi/mc/EducationMetadata.hpp @@ -26,10 +26,13 @@ enum class UserType; #ifndef DISABLE_CONSTRUCTOR_PREVENTION_EDUCATIONMETADATA public: struct EducationMetadata& operator=(struct EducationMetadata const &) = delete; - EducationMetadata(struct EducationMetadata const &) = delete; #endif public: + /** + * @symbol ??0EducationMetadata\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI EducationMetadata(struct EducationMetadata const &); /** * @symbol ??0EducationMetadata\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/EducationMetadataError.hpp b/LiteLoader/include/llapi/mc/EducationMetadataError.hpp index 736fee98a2..be3d6ae310 100644 --- a/LiteLoader/include/llapi/mc/EducationMetadataError.hpp +++ b/LiteLoader/include/llapi/mc/EducationMetadataError.hpp @@ -51,9 +51,5 @@ class EducationMetadataError : public PackError { */ MCVAPI ~EducationMetadataError(); #endif - /** - * @symbol ??0EducationMetadataError\@\@QEAA\@W4PackParseErrorType\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z - */ - MCAPI EducationMetadataError(enum class PackParseErrorType, std::vector const &); }; diff --git a/LiteLoader/include/llapi/mc/EffectCommand.hpp b/LiteLoader/include/llapi/mc/EffectCommand.hpp index a51c75865d..f95735c845 100644 --- a/LiteLoader/include/llapi/mc/EffectCommand.hpp +++ b/LiteLoader/include/llapi/mc/EffectCommand.hpp @@ -36,7 +36,7 @@ class EffectCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@EffectCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ElementBlock.hpp b/LiteLoader/include/llapi/mc/ElementBlock.hpp index 031b5a2761..b833a93304 100644 --- a/LiteLoader/include/llapi/mc/ElementBlock.hpp +++ b/LiteLoader/include/llapi/mc/ElementBlock.hpp @@ -181,30 +181,30 @@ class ElementBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@ElementBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 157 + * @vftbl 158 * @symbol ?tryLegacyUpgrade\@ElementBlock\@\@UEBAPEBVBlock\@\@G\@Z */ virtual class Block const * tryLegacyUpgrade(unsigned short) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,30 +216,35 @@ class ElementBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@ElementBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0ElementBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ElementType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EnableEncryptionCommand.hpp b/LiteLoader/include/llapi/mc/EnableEncryptionCommand.hpp index 764e418e69..a78e9455d6 100644 --- a/LiteLoader/include/llapi/mc/EnableEncryptionCommand.hpp +++ b/LiteLoader/include/llapi/mc/EnableEncryptionCommand.hpp @@ -36,7 +36,7 @@ class EnableEncryptionCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@EnableEncryptionCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/EnchantBookForTradingFunction.hpp b/LiteLoader/include/llapi/mc/EnchantBookForTradingFunction.hpp index 7c381467db..2522da80c5 100644 --- a/LiteLoader/include/llapi/mc/EnchantBookForTradingFunction.hpp +++ b/LiteLoader/include/llapi/mc/EnchantBookForTradingFunction.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -48,10 +47,6 @@ class EnchantBookForTradingFunction { */ MCVAPI void apply(class ItemStack &, class Random &, class LootTableContext &); #endif - /** - * @symbol ?deserialize\@EnchantBookForTradingFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); //private: /** diff --git a/LiteLoader/include/llapi/mc/EnchantCommand.hpp b/LiteLoader/include/llapi/mc/EnchantCommand.hpp index 3016fd08de..2a5a050407 100644 --- a/LiteLoader/include/llapi/mc/EnchantCommand.hpp +++ b/LiteLoader/include/llapi/mc/EnchantCommand.hpp @@ -36,7 +36,7 @@ class EnchantCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@EnchantCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/EnchantRandomEquipmentFunction.hpp b/LiteLoader/include/llapi/mc/EnchantRandomEquipmentFunction.hpp index fde67d6098..65385948b7 100644 --- a/LiteLoader/include/llapi/mc/EnchantRandomEquipmentFunction.hpp +++ b/LiteLoader/include/llapi/mc/EnchantRandomEquipmentFunction.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #include "LootItemFunction.hpp" #define BEFORE_EXTRA @@ -46,9 +45,5 @@ class EnchantRandomEquipmentFunction : public LootItemFunction { * @symbol ?apply\@EnchantRandomEquipmentFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); - /** - * @symbol ?deserialize\@EnchantRandomEquipmentFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); }; diff --git a/LiteLoader/include/llapi/mc/EnchantRandomlyFunction.hpp b/LiteLoader/include/llapi/mc/EnchantRandomlyFunction.hpp index 8e9953fbdd..8924496194 100644 --- a/LiteLoader/include/llapi/mc/EnchantRandomlyFunction.hpp +++ b/LiteLoader/include/llapi/mc/EnchantRandomlyFunction.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #include "LootItemFunction.hpp" #define BEFORE_EXTRA @@ -46,9 +45,5 @@ class EnchantRandomlyFunction : public LootItemFunction { * @symbol ?apply\@EnchantRandomlyFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); - /** - * @symbol ?deserialize\@EnchantRandomlyFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); }; diff --git a/LiteLoader/include/llapi/mc/EnchantUtils.hpp b/LiteLoader/include/llapi/mc/EnchantUtils.hpp index 8073f62b16..912f691f19 100644 --- a/LiteLoader/include/llapi/mc/EnchantUtils.hpp +++ b/LiteLoader/include/llapi/mc/EnchantUtils.hpp @@ -46,14 +46,14 @@ class EnchantUtils { * @symbol ?appendEnchantToFormattedText\@EnchantUtils\@\@SAXW4Type\@Enchant\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@5\@\@Z */ MCAPI static void appendEnchantToFormattedText(enum class Enchant::Type, class std::basic_string_view>, std::string &); - /** - * @symbol ?applyEnchant\@EnchantUtils\@\@SAHAEAVItemStackBase\@\@AEBVItemEnchants\@\@_N\@Z - */ - MCAPI static int applyEnchant(class ItemStackBase &, class ItemEnchants const &, bool); /** * @symbol ?applyEnchant\@EnchantUtils\@\@SA_NAEAVItemStackBase\@\@AEBVEnchantmentInstance\@\@_N\@Z */ MCAPI static bool applyEnchant(class ItemStackBase &, class EnchantmentInstance const &, bool); + /** + * @symbol ?applyEnchant\@EnchantUtils\@\@SAHAEAVItemStackBase\@\@AEBVItemEnchants\@\@_N\@Z + */ + MCAPI static int applyEnchant(class ItemStackBase &, class ItemEnchants const &, bool); /** * @symbol ?applyEnchant\@EnchantUtils\@\@SA_NAEAVItemStackBase\@\@W4Type\@Enchant\@\@H_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/EnchantWithLevelsFunction.hpp b/LiteLoader/include/llapi/mc/EnchantWithLevelsFunction.hpp index e9fa9d04a3..b19c0b9ea0 100644 --- a/LiteLoader/include/llapi/mc/EnchantWithLevelsFunction.hpp +++ b/LiteLoader/include/llapi/mc/EnchantWithLevelsFunction.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -48,9 +47,5 @@ class EnchantWithLevelsFunction { */ MCVAPI int apply(class ItemInstance &, class Random &, struct Trade const &, class LootTableContext &); #endif - /** - * @symbol ?deserialize\@EnchantWithLevelsFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); }; diff --git a/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp b/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp index 682c2bc602..c64b6a4125 100644 --- a/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp @@ -186,20 +186,20 @@ class EnchantingTableBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,30 +211,35 @@ class EnchantingTableBlock : public ActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 * @symbol ?use\@EnchantingTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENCHANTINGTABLEBLOCK /** * @symbol ?isCraftingBlock\@EnchantingTableBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/EncryptedProxyEnv.hpp b/LiteLoader/include/llapi/mc/EncryptedProxyEnv.hpp index 6dd11cbcdf..6a84621d53 100644 --- a/LiteLoader/include/llapi/mc/EncryptedProxyEnv.hpp +++ b/LiteLoader/include/llapi/mc/EncryptedProxyEnv.hpp @@ -129,9 +129,5 @@ class EncryptedProxyEnv { * @symbol ?SleepForMicroseconds\@EnvWrapper\@leveldb\@\@UEAAXH\@Z */ virtual void SleepForMicroseconds(int); - /** - * @symbol ??0EncryptedProxyEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@AEBVContentIdentity\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4EncryptedProxyReadMode\@\@\@Z - */ - MCAPI EncryptedProxyEnv(class leveldb::Env *, class ContentIdentity const &, std::string const &, enum class EncryptedProxyReadMode); }; diff --git a/LiteLoader/include/llapi/mc/EndCityPieces.hpp b/LiteLoader/include/llapi/mc/EndCityPieces.hpp index 3c3cc1d4d2..5bf4024ca2 100644 --- a/LiteLoader/include/llapi/mc/EndCityPieces.hpp +++ b/LiteLoader/include/llapi/mc/EndCityPieces.hpp @@ -44,10 +44,6 @@ enum class SectionType; #endif public: - /** - * @symbol ?init\@EndCityPieces\@\@SAXXZ - */ - MCAPI static void init(); /** * @symbol ?startHouseTower\@EndCityPieces\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVBlockPos\@\@W4Rotation\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EndCrystalItem.hpp b/LiteLoader/include/llapi/mc/EndCrystalItem.hpp index 03913e7b90..76c7bbec86 100644 --- a/LiteLoader/include/llapi/mc/EndCrystalItem.hpp +++ b/LiteLoader/include/llapi/mc/EndCrystalItem.hpp @@ -113,9 +113,9 @@ class EndCrystalItem : public Item { virtual void __unk_vfn_80(); /** * @vftbl 132 - * @symbol ?_useOn\@EndCrystalItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@EndCrystalItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0EndCrystalItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/EndDragonFight.hpp b/LiteLoader/include/llapi/mc/EndDragonFight.hpp index cfc0f0581c..8c51612e61 100644 --- a/LiteLoader/include/llapi/mc/EndDragonFight.hpp +++ b/LiteLoader/include/llapi/mc/EndDragonFight.hpp @@ -72,10 +72,6 @@ struct GateWayGenerator { * @symbol ?verifyExitPositions\@EndDragonFight\@\@QEAAXAEAVEndGatewayBlockActor\@\@\@Z */ MCAPI void verifyExitPositions(class EndGatewayBlockActor &); - /** - * @symbol ??1EndDragonFight\@\@QEAA\@XZ - */ - MCAPI ~EndDragonFight(); //private: /** diff --git a/LiteLoader/include/llapi/mc/EndGatewayBlock.hpp b/LiteLoader/include/llapi/mc/EndGatewayBlock.hpp index 97c178c68b..07d79e3094 100644 --- a/LiteLoader/include/llapi/mc/EndGatewayBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndGatewayBlock.hpp @@ -206,25 +206,25 @@ class EndGatewayBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 - * @symbol ?animateTick\@EndGatewayBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 152 + * @symbol ?animateTick\@EndGatewayBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -236,27 +236,32 @@ class EndGatewayBlock : public ActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@EndGatewayBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp b/LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp index 37ee99e0c3..68e5cbbd99 100644 --- a/LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp @@ -122,10 +122,6 @@ class EndGatewayBlockActor : public BlockActor { * @symbol ?getExitPosition\@EndGatewayBlockActor\@\@QEBA?AVBlockPos\@\@XZ */ MCAPI class BlockPos getExitPosition() const; - /** - * @symbol ?getParticleAmount\@EndGatewayBlockActor\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI int getParticleAmount(class BlockSource &, class BlockPos const &) const; /** * @symbol ?setExitPosition\@EndGatewayBlockActor\@\@QEAAXAEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EndPortalBlock.hpp b/LiteLoader/include/llapi/mc/EndPortalBlock.hpp index dc4f8600ed..1cd0e8259a 100644 --- a/LiteLoader/include/llapi/mc/EndPortalBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalBlock.hpp @@ -216,25 +216,25 @@ class EndPortalBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 - * @symbol ?animateTick\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 152 + * @symbol ?animateTick\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -246,37 +246,42 @@ class EndPortalBlock : public ActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 169 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 170 * @symbol ?onFallOn\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@EndPortalBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getEntityResourceItem\@EndPortalBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; diff --git a/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp b/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp index 471b807b09..089bd8f5f3 100644 --- a/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp @@ -177,9 +177,9 @@ class EndPortalFrameBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@EndPortalFrameBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@EndPortalFrameBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,25 +201,25 @@ class EndPortalFrameBlock : public BlockLegacy { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 162 - * @symbol ?onRemove\@EndPortalFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void onRemove(class BlockSource &, class BlockPos const &) const; + virtual void __unk_vfn_157(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol ?onRemove\@EndPortalFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_165(); + virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -231,37 +231,42 @@ class EndPortalFrameBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@EndPortalFrameBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@EndPortalFrameBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@EndPortalFrameBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/EndPortalShape.hpp b/LiteLoader/include/llapi/mc/EndPortalShape.hpp index 830d58b012..2d23ad19e1 100644 --- a/LiteLoader/include/llapi/mc/EndPortalShape.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalShape.hpp @@ -33,10 +33,6 @@ class EndPortalShape { * @symbol ??0EndPortalShape\@\@QEAA\@AEAVBlockSource\@\@VBlockPos\@\@\@Z */ MCAPI EndPortalShape(class BlockSource &, class BlockPos); - /** - * @symbol ?getOrigin\@EndPortalShape\@\@QEBA?AVBlockPos\@\@XZ - */ - MCAPI class BlockPos getOrigin() const; /** * @symbol ?isValid\@EndPortalShape\@\@QEAA_NAEAVBlockSource\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EndRodBlock.hpp b/LiteLoader/include/llapi/mc/EndRodBlock.hpp index 529b6eb7ff..95c0b13ae4 100644 --- a/LiteLoader/include/llapi/mc/EndRodBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndRodBlock.hpp @@ -197,9 +197,9 @@ class EndRodBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@EndRodBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@EndRodBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -216,35 +216,35 @@ class EndRodBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@EndRodBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@EndRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 161 + * @vftbl 162 * @symbol ?_addHardCodedBlockComponents\@EndRodBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -256,35 +256,40 @@ class EndRodBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 180 * @symbol ?canSurvive\@EndRodBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@EndRodBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0EndRodBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/EnderChestBlock.hpp b/LiteLoader/include/llapi/mc/EnderChestBlock.hpp index 2f3ba8c9bc..b93f61b5c6 100644 --- a/LiteLoader/include/llapi/mc/EnderChestBlock.hpp +++ b/LiteLoader/include/llapi/mc/EnderChestBlock.hpp @@ -176,25 +176,25 @@ class EnderChestBlock : public ChestBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 - * @symbol ?animateTick\@EnderChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 152 + * @symbol ?animateTick\@EnderChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,32 +206,37 @@ class EnderChestBlock : public ChestBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@EnderChestBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@EnderChestBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/EnderChestContainer.hpp b/LiteLoader/include/llapi/mc/EnderChestContainer.hpp index 33874c6fff..88dddc0b48 100644 --- a/LiteLoader/include/llapi/mc/EnderChestContainer.hpp +++ b/LiteLoader/include/llapi/mc/EnderChestContainer.hpp @@ -35,25 +35,25 @@ class EnderChestContainer : public FillingContainer { */ virtual void __unk_vfn_0(); /** - * @vftbl 16 + * @vftbl 17 * @symbol ?startOpen\@EnderChestContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void startOpen(class Player &); /** - * @vftbl 17 + * @vftbl 18 * @symbol ?stopOpen\@EnderChestContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void stopOpen(class Player &); - /** - * @vftbl 23 - * @symbol __unk_vfn_23 - */ - virtual void __unk_vfn_23(); /** * @vftbl 24 * @symbol __unk_vfn_24 */ virtual void __unk_vfn_24(); + /** + * @vftbl 25 + * @symbol __unk_vfn_25 + */ + virtual void __unk_vfn_25(); /** * @symbol ??0EnderChestContainer\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/EnderDragon.hpp b/LiteLoader/include/llapi/mc/EnderDragon.hpp index 747f06b4b5..ae9d572114 100644 --- a/LiteLoader/include/llapi/mc/EnderDragon.hpp +++ b/LiteLoader/include/llapi/mc/EnderDragon.hpp @@ -216,11 +216,6 @@ class EnderDragon : public Monster { * @symbol __unk_vfn_275 */ virtual void __unk_vfn_275(); - /** - * @vftbl 288 - * @symbol ?aiStep\@EnderDragon\@\@UEAAXXZ - */ - virtual void aiStep(); /** * @vftbl 301 * @symbol __unk_vfn_301 diff --git a/LiteLoader/include/llapi/mc/EnderDragonPostAIStepSystem.hpp b/LiteLoader/include/llapi/mc/EnderDragonPostAIStepSystem.hpp deleted file mode 100644 index 0d544879be..0000000000 --- a/LiteLoader/include/llapi/mc/EnderDragonPostAIStepSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file EnderDragonPostAIStepSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class EnderDragonPostAIStepSystem. - * - */ -class EnderDragonPostAIStepSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ENDERDRAGONPOSTAISTEPSYSTEM -public: - class EnderDragonPostAIStepSystem& operator=(class EnderDragonPostAIStepSystem const &) = delete; - EnderDragonPostAIStepSystem(class EnderDragonPostAIStepSystem const &) = delete; - EnderDragonPostAIStepSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@EnderDragonPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doEnderDragonPostAIStepSystem\@EnderDragonPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doEnderDragonPostAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; diff --git a/LiteLoader/include/llapi/mc/EnderMan.hpp b/LiteLoader/include/llapi/mc/EnderMan.hpp index 5e8725a56e..337fc92867 100644 --- a/LiteLoader/include/llapi/mc/EnderMan.hpp +++ b/LiteLoader/include/llapi/mc/EnderMan.hpp @@ -209,10 +209,6 @@ class EnderMan : public Monster { * @symbol ?getCarryingBlock\@EnderMan\@\@QEBAAEBVBlock\@\@XZ */ MCAPI class Block const & getCarryingBlock() const; - /** - * @symbol ?setCarryingBlock\@EnderMan\@\@QEAAXAEBVBlock\@\@\@Z - */ - MCAPI void setCarryingBlock(class Block const &); /** * @symbol ?SPEED_MODIFIER_ATTACKING\@EnderMan\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A */ diff --git a/LiteLoader/include/llapi/mc/EnderManPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/EnderManPreAIStepSystem.hpp index aac0f6bc4c..7b3b670aff 100644 --- a/LiteLoader/include/llapi/mc/EnderManPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/EnderManPreAIStepSystem.hpp @@ -31,9 +31,5 @@ class EnderManPreAIStepSystem { * @symbol ?createSystem\@EnderManPreAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); - /** - * @symbol ?tick\@EnderManPreAIStepSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UEnderManFlag\@\@\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z - */ - MCAPI static void tick(class ViewT, class FlagComponent, class FlagComponent>>, class EntityModifierT>); }; diff --git a/LiteLoader/include/llapi/mc/EntitiesEnteredVolumeComponent.hpp b/LiteLoader/include/llapi/mc/EntitiesEnteredVolumeComponent.hpp deleted file mode 100644 index 2ebc1bed3a..0000000000 --- a/LiteLoader/include/llapi/mc/EntitiesEnteredVolumeComponent.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file EntitiesEnteredVolumeComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class EntitiesEnteredVolumeComponent. - * - */ -class EntitiesEnteredVolumeComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ENTITIESENTEREDVOLUMECOMPONENT -public: - class EntitiesEnteredVolumeComponent& operator=(class EntitiesEnteredVolumeComponent const &) = delete; - EntitiesEnteredVolumeComponent(class EntitiesEnteredVolumeComponent const &) = delete; - EntitiesEnteredVolumeComponent() = delete; -#endif - -public: - /** - * @symbol ??1EntitiesEnteredVolumeComponent\@\@QEAA\@XZ - */ - MCAPI ~EntitiesEnteredVolumeComponent(); - -}; diff --git a/LiteLoader/include/llapi/mc/EntitiesExitedVolumeComponent.hpp b/LiteLoader/include/llapi/mc/EntitiesExitedVolumeComponent.hpp deleted file mode 100644 index af6e6de9a0..0000000000 --- a/LiteLoader/include/llapi/mc/EntitiesExitedVolumeComponent.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file EntitiesExitedVolumeComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class EntitiesExitedVolumeComponent. - * - */ -class EntitiesExitedVolumeComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ENTITIESEXITEDVOLUMECOMPONENT -public: - class EntitiesExitedVolumeComponent& operator=(class EntitiesExitedVolumeComponent const &) = delete; - EntitiesExitedVolumeComponent(class EntitiesExitedVolumeComponent const &) = delete; - EntitiesExitedVolumeComponent() = delete; -#endif - -public: - /** - * @symbol ??1EntitiesExitedVolumeComponent\@\@QEAA\@XZ - */ - MCAPI ~EntitiesExitedVolumeComponent(); - -}; diff --git a/LiteLoader/include/llapi/mc/EntitiesInsideVolumeComponent.hpp b/LiteLoader/include/llapi/mc/EntitiesInsideVolumeComponent.hpp deleted file mode 100644 index 1d9b49b4f0..0000000000 --- a/LiteLoader/include/llapi/mc/EntitiesInsideVolumeComponent.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file EntitiesInsideVolumeComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class EntitiesInsideVolumeComponent. - * - */ -class EntitiesInsideVolumeComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ENTITIESINSIDEVOLUMECOMPONENT -public: - class EntitiesInsideVolumeComponent& operator=(class EntitiesInsideVolumeComponent const &) = delete; - EntitiesInsideVolumeComponent(class EntitiesInsideVolumeComponent const &) = delete; - EntitiesInsideVolumeComponent() = delete; -#endif - -public: - /** - * @symbol ??1EntitiesInsideVolumeComponent\@\@QEAA\@XZ - */ - MCAPI ~EntitiesInsideVolumeComponent(); - -}; diff --git a/LiteLoader/include/llapi/mc/EntitiesPendingEnterVolumeComponent.hpp b/LiteLoader/include/llapi/mc/EntitiesPendingEnterVolumeComponent.hpp deleted file mode 100644 index 14bd5db5af..0000000000 --- a/LiteLoader/include/llapi/mc/EntitiesPendingEnterVolumeComponent.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file EntitiesPendingEnterVolumeComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class EntitiesPendingEnterVolumeComponent. - * - */ -class EntitiesPendingEnterVolumeComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ENTITIESPENDINGENTERVOLUMECOMPONENT -public: - class EntitiesPendingEnterVolumeComponent& operator=(class EntitiesPendingEnterVolumeComponent const &) = delete; - EntitiesPendingEnterVolumeComponent(class EntitiesPendingEnterVolumeComponent const &) = delete; - EntitiesPendingEnterVolumeComponent() = delete; -#endif - -public: - /** - * @symbol ??0EntitiesPendingEnterVolumeComponent\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI EntitiesPendingEnterVolumeComponent(class EntitiesPendingEnterVolumeComponent &&); - /** - * @symbol ??1EntitiesPendingEnterVolumeComponent\@\@QEAA\@XZ - */ - MCAPI ~EntitiesPendingEnterVolumeComponent(); - -}; diff --git a/LiteLoader/include/llapi/mc/EntityComponentFactoryCereal.hpp b/LiteLoader/include/llapi/mc/EntityComponentFactoryCereal.hpp index 2e9cdc04e7..7dc7824ea7 100644 --- a/LiteLoader/include/llapi/mc/EntityComponentFactoryCereal.hpp +++ b/LiteLoader/include/llapi/mc/EntityComponentFactoryCereal.hpp @@ -25,13 +25,10 @@ class EntityComponentFactoryCereal { public: class EntityComponentFactoryCereal& operator=(class EntityComponentFactoryCereal const &) = delete; EntityComponentFactoryCereal(class EntityComponentFactoryCereal const &) = delete; + EntityComponentFactoryCereal() = delete; #endif public: - /** - * @symbol ??0EntityComponentFactoryCereal\@\@QEAA\@XZ - */ - MCAPI EntityComponentFactoryCereal(); /** * @symbol ?serializeComponentDefinitions\@EntityComponentFactoryCereal\@\@QEBAXAEAVDefinitionInstanceGroup\@\@AEBV?$GenericValue\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@\@rapidjson\@\@AEBVSemVersion\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EntityContext.hpp b/LiteLoader/include/llapi/mc/EntityContext.hpp index 6d08f0771d..c88ed8f465 100644 --- a/LiteLoader/include/llapi/mc/EntityContext.hpp +++ b/LiteLoader/include/llapi/mc/EntityContext.hpp @@ -21,6 +21,7 @@ class EntityContext : public EntityContextBase { #define AFTER_EXTRA // Add Member There public: + template inline T* tryGetComponent() const { return const_cast(_enttRegistry().try_get(_getEntityId())); diff --git a/LiteLoader/include/llapi/mc/EntityContextBase.hpp b/LiteLoader/include/llapi/mc/EntityContextBase.hpp index d19d84608f..2d4655fea6 100644 --- a/LiteLoader/include/llapi/mc/EntityContextBase.hpp +++ b/LiteLoader/include/llapi/mc/EntityContextBase.hpp @@ -8,7 +8,7 @@ #define BEFORE_EXTRA // Include Headers or Declare Types Here - +#include "EntityRegistryBase.hpp" #undef BEFORE_EXTRA /** @@ -23,6 +23,11 @@ class EntityContextBase { class EntityRegistryBase* mRegistry; const class EntityId mEntity; + + class entt::basic_registry& _enttRegistry() { + return *mRegistry->mRegistry; + } + #define DISABLE_CONSTRUCTOR_PREVENTION_ENTITYCONTEXTBASE #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ENTITYCONTEXTBASE @@ -47,18 +52,6 @@ class EntityContextBase { MCAPI bool operator==(class EntityContextBase const &) const; //protected: - /** - * @symbol ?_assertValid\@EntityContextBase\@\@IEBAXXZ - */ - MCAPI void _assertValid() const; - /** - * @symbol ?_enttRegistry\@EntityContextBase\@\@IEAAAEAV?$basic_registry\@VEntityId\@\@V?$allocator\@VEntityId\@\@\@std\@\@\@entt\@\@XZ - */ - MCAPI class entt::basic_registry> & _enttRegistry(); - /** - * @symbol ?_enttRegistry\@EntityContextBase\@\@IEBAAEBV?$basic_registry\@VEntityId\@\@V?$allocator\@VEntityId\@\@\@std\@\@\@entt\@\@XZ - */ - MCAPI class entt::basic_registry> const & _enttRegistry() const; /** * @symbol ?_getEntityId\@EntityContextBase\@\@IEBA?AVEntityId\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/EntityGlobalComponentsUtility.hpp b/LiteLoader/include/llapi/mc/EntityGlobalComponentsUtility.hpp deleted file mode 100644 index 5c49f4f8a7..0000000000 --- a/LiteLoader/include/llapi/mc/EntityGlobalComponentsUtility.hpp +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @file EntityGlobalComponentsUtility.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace EntityGlobalComponentsUtility. - * - */ -namespace EntityGlobalComponentsUtility { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA - /** - * @symbol ?initializeGlobalComponents\@EntityGlobalComponentsUtility\@\@YAXAEAVEntityRegistry\@\@\@Z - */ - MCAPI void initializeGlobalComponents(class EntityRegistry &); - /** - * @symbol ?removeGlobalComponents\@EntityGlobalComponentsUtility\@\@YAXAEAVEntityRegistry\@\@\@Z - */ - MCAPI void removeGlobalComponents(class EntityRegistry &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/EntityPlacerItemComponent.hpp b/LiteLoader/include/llapi/mc/EntityPlacerItemComponent.hpp index c4b93d9299..a6c7514bbf 100644 --- a/LiteLoader/include/llapi/mc/EntityPlacerItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/EntityPlacerItemComponent.hpp @@ -78,10 +78,6 @@ class EntityPlacerItemComponent { MCAPI static class HashedString const & getIdentifier(); //private: - /** - * @symbol ?_positionAndRotateActor\@EntityPlacerItemComponent\@\@AEBAXAEAVActor\@\@VVec3\@\@EAEBV3\@PEBVBlockLegacy\@\@\@Z - */ - MCAPI void _positionAndRotateActor(class Actor &, class Vec3, unsigned char, class Vec3 const &, class BlockLegacy const *) const; /** * @symbol ?_setActorCustomName\@EntityPlacerItemComponent\@\@AEBAXAEAVActor\@\@AEBVItemStack\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EntitySet.hpp b/LiteLoader/include/llapi/mc/EntitySet.hpp index c12b6d506e..79bd8b2f2f 100644 --- a/LiteLoader/include/llapi/mc/EntitySet.hpp +++ b/LiteLoader/include/llapi/mc/EntitySet.hpp @@ -31,14 +31,14 @@ class EntitySet { * @symbol ??0EntitySet\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI EntitySet(class EntitySet &&); - /** - * @symbol ??0EntitySet\@\@QEAA\@XZ - */ - MCAPI EntitySet(); /** * @symbol ??0EntitySet\@\@QEAA\@AEBV0\@\@Z */ MCAPI EntitySet(class EntitySet const &); + /** + * @symbol ??0EntitySet\@\@QEAA\@XZ + */ + MCAPI EntitySet(); /** * @symbol ?add\@EntitySet\@\@QEAA_NAEBVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EntitySystems.hpp b/LiteLoader/include/llapi/mc/EntitySystems.hpp index 40f2dead8c..165e329ca3 100644 --- a/LiteLoader/include/llapi/mc/EntitySystems.hpp +++ b/LiteLoader/include/llapi/mc/EntitySystems.hpp @@ -31,9 +31,13 @@ class EntitySystems { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENTITYSYSTEMS /** - * @symbol ?registerTickingSystem\@EntitySystems\@\@UEAAXV?$span\@$$CBV?$typeid_t\@USystemCategory\@\@\@\@$0?0\@gsl\@\@V?$unique_ptr\@VITickingSystem\@\@U?$default_delete\@VITickingSystem\@\@\@std\@\@\@std\@\@AEBUSystemInfo\@\@\@Z + * @symbol ?registerSingleTickingSystem\@EntitySystems\@\@UEAAXV?$span\@$$CBV?$typeid_t\@USystemCategory\@\@\@Bedrock\@\@$0?0\@gsl\@\@V?$unique_ptr\@VITickingSystem\@\@U?$default_delete\@VITickingSystem\@\@\@std\@\@\@std\@\@AEBUSystemInfo\@\@\@Z */ - MCVAPI void registerTickingSystem(class gsl::span const, -1>, std::unique_ptr, struct SystemInfo const &); + MCVAPI void registerSingleTickingSystem(class gsl::span const, -1>, std::unique_ptr, struct SystemInfo const &); + /** + * @symbol ?registerTickingSystem\@EntitySystems\@\@UEAAXV?$span\@$$CBV?$typeid_t\@USystemCategory\@\@\@Bedrock\@\@$0?0\@gsl\@\@V?$unique_ptr\@VITickingSystem\@\@U?$default_delete\@VITickingSystem\@\@\@std\@\@\@std\@\@AEBUSystemInfo\@\@\@Z + */ + MCVAPI void registerTickingSystem(class gsl::span const, -1>, std::unique_ptr, struct SystemInfo const &); /** * @symbol ?tickMovementCatchup\@EntitySystems\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EntitySystemsCollection.hpp b/LiteLoader/include/llapi/mc/EntitySystemsCollection.hpp deleted file mode 100644 index 280c510115..0000000000 --- a/LiteLoader/include/llapi/mc/EntitySystemsCollection.hpp +++ /dev/null @@ -1,29 +0,0 @@ -/** - * @file EntitySystemsCollection.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace EntitySystemsCollection. - * - */ -namespace EntitySystemsCollection { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA - /** - * @symbol ?create\@EntitySystemsCollection\@\@YA?AV?$unique_ptr\@UIEntitySystemsCollection\@\@U?$default_delete\@UIEntitySystemsCollection\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::unique_ptr create(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/EventCommand.hpp b/LiteLoader/include/llapi/mc/EventCommand.hpp index a4cf6584e8..cec0d4835d 100644 --- a/LiteLoader/include/llapi/mc/EventCommand.hpp +++ b/LiteLoader/include/llapi/mc/EventCommand.hpp @@ -36,7 +36,7 @@ class EventCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@EventCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/EventPacket.hpp b/LiteLoader/include/llapi/mc/EventPacket.hpp index 68cbf17163..a680033a7e 100644 --- a/LiteLoader/include/llapi/mc/EventPacket.hpp +++ b/LiteLoader/include/llapi/mc/EventPacket.hpp @@ -113,30 +113,34 @@ class EventPacket : public Packet { */ MCVAPI ~EventPacket(); #endif - /** - * @symbol ??0EventPacket\@\@QEAA\@XZ - */ - MCAPI EventPacket(); - /** - * @symbol ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@W4MovementEventType\@\@MMMMM\@Z - */ - MCAPI EventPacket(class Player const &, enum class MovementEventType, float, float, float, float, float); /** * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@PEBVActor\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@W4ActorDamageCause\@\@W4ActorType\@\@\@Z */ MCAPI EventPacket(class Player const *, class Actor const *, class gsl::not_null, enum class ActorDamageCause, enum class ActorType); + /** + * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@\@Z + */ + MCAPI EventPacket(class Player const *, class gsl::not_null); /** * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$not_null\@PEBVActor\@\@\@gsl\@\@W4InteractionType\@MinecraftEventing\@\@\@Z */ MCAPI EventPacket(class Player const *, class gsl::not_null, enum class MinecraftEventing::InteractionType); /** - * @symbol ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@W4MovementEventType\@\@MMMMM\@Z */ - MCAPI EventPacket(class Player const &, std::string const &, int); + MCAPI EventPacket(class Player const &, enum class MovementEventType, float, float, float, float, float); /** * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI EventPacket(class Player const *, class AutomaticID); + /** + * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@HV?$not_null\@PEBVActor\@\@\@gsl\@\@\@Z + */ + MCAPI EventPacket(class Player const *, int, class gsl::not_null); + /** + * @symbol ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI EventPacket(class Player const &, std::string const &, int); /** * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@FIF\@Z */ @@ -145,10 +149,6 @@ class EventPacket : public Packet { * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@HHW4ActorDamageCause\@\@_N\@Z */ MCAPI EventPacket(class Player const *, int, int, enum class ActorDamageCause, bool); - /** - * @symbol ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI EventPacket(class Player const &, std::string const &); /** * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH1\@Z */ @@ -162,17 +162,17 @@ class EventPacket : public Packet { */ MCAPI EventPacket(class Player const *, class Raid const &, bool); /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@\@Z + * @symbol ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI EventPacket(class Player const *, class gsl::not_null); + MCAPI EventPacket(class Player const &, std::string const &); /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z + * @symbol ??0EventPacket\@\@QEAA\@XZ */ - MCAPI EventPacket(class Player const *, class AutomaticID, class AutomaticID); + MCAPI EventPacket(); /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@HV?$not_null\@PEBVActor\@\@\@gsl\@\@\@Z + * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z */ - MCAPI EventPacket(class Player const *, int, class gsl::not_null); + MCAPI EventPacket(class Player const *, class AutomaticID, class AutomaticID); /** * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@AEBUData\@0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EventResponseFactory.hpp b/LiteLoader/include/llapi/mc/EventResponseFactory.hpp index 17221d523b..c8abca5e51 100644 --- a/LiteLoader/include/llapi/mc/EventResponseFactory.hpp +++ b/LiteLoader/include/llapi/mc/EventResponseFactory.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "JsonUtil.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -39,10 +38,6 @@ class EventResponseFactory { * @symbol ??0EventResponseFactory\@\@QEAA\@XZ */ MCAPI EventResponseFactory(); - /** - * @symbol ?getSchema\@EventResponseFactory\@\@QEBAAEBV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@XZ - */ - MCAPI class std::shared_ptr> const & getSchema() const; /** * @symbol ?initSchema\@EventResponseFactory\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EventingRequestQueueComponent.hpp b/LiteLoader/include/llapi/mc/EventingRequestQueueComponent.hpp index a2148c3346..365069e585 100644 --- a/LiteLoader/include/llapi/mc/EventingRequestQueueComponent.hpp +++ b/LiteLoader/include/llapi/mc/EventingRequestQueueComponent.hpp @@ -31,9 +31,5 @@ struct EventingRequestQueueComponent { * @symbol ??0EventingRequestQueueComponent\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI EventingRequestQueueComponent(struct EventingRequestQueueComponent &&); - /** - * @symbol ??1EventingRequestQueueComponent\@\@QEAA\@XZ - */ - MCAPI ~EventingRequestQueueComponent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/EventingRequestSystem.hpp b/LiteLoader/include/llapi/mc/EventingRequestSystem.hpp index fc51b21180..48aa7fe193 100644 --- a/LiteLoader/include/llapi/mc/EventingRequestSystem.hpp +++ b/LiteLoader/include/llapi/mc/EventingRequestSystem.hpp @@ -37,6 +37,10 @@ class EventingRequestSystem { * @symbol ?_eventingRequestSystem\@EventingRequestSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUEventingRequestQueueComponent\@\@AEAVLevelComponent\@\@\@Z */ MCAPI static void _eventingRequestSystem(class StrictEntityContext const &, struct EventingRequestQueueComponent &, class LevelComponent &); + /** + * @symbol ?_tickEventingRequestSystem\@EventingRequestSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UEventingRequestQueueComponent\@\@VLevelComponent\@\@\@\@\@Z + */ + MCAPI static void _tickEventingRequestSystem(class ViewT); private: diff --git a/LiteLoader/include/llapi/mc/ExecuteCommand.hpp b/LiteLoader/include/llapi/mc/ExecuteCommand.hpp index 7e883a8965..8540b2cf4a 100644 --- a/LiteLoader/include/llapi/mc/ExecuteCommand.hpp +++ b/LiteLoader/include/llapi/mc/ExecuteCommand.hpp @@ -36,7 +36,7 @@ class ExecuteCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@ExecuteCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ExitVehicleSystem.hpp b/LiteLoader/include/llapi/mc/ExitVehicleSystem.hpp index f7eb73b52a..28746fe532 100644 --- a/LiteLoader/include/llapi/mc/ExitVehicleSystem.hpp +++ b/LiteLoader/include/llapi/mc/ExitVehicleSystem.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class ExitVehicleSystem { +struct ExitVehicleSystem { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_EXITVEHICLESYSTEM public: - class ExitVehicleSystem& operator=(class ExitVehicleSystem const &) = delete; - ExitVehicleSystem(class ExitVehicleSystem const &) = delete; + struct ExitVehicleSystem& operator=(struct ExitVehicleSystem const &) = delete; + ExitVehicleSystem(struct ExitVehicleSystem const &) = delete; ExitVehicleSystem() = delete; #endif @@ -41,16 +41,21 @@ class ExitVehicleSystem { virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol ?tick\@ExitVehicleSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UMobBodyRotationComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UDimensionTypeComponent\@\@UPassengerComponent\@\@UVehicleComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UActorMoveToRequestComponent\@\@UActorSetPositionRequestComponent\@\@\@\@U?$GlobalRead\@UBaseGameVersionComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @symbol __unk_vfn_3 */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void __unk_vfn_3(); /** - * @symbol ?_tickExitVehicle\@ExitVehicleSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEAUAABBShapeComponent\@\@AEAUActorRotationComponent\@\@AEAUStateVectorComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@AEBVBaseGameVersion\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@$$CBUStateVectorComponent\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UActorMoveToRequestComponent\@\@UActorSetPositionRequestComponent\@\@\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UMobBodyRotationComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UDimensionTypeComponent\@\@UPassengerComponent\@\@UVehicleComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UActorMoveToRequestComponent\@\@UActorSetPositionRequestComponent\@\@\@\@U?$GlobalRead\@UBaseGameVersionComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @vftbl 4 + * @symbol ?tick\@ExitVehicleSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UPlayerGameTypeComponent\@\@UMobBodyRotationComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UDimensionTypeComponent\@\@UPassengerComponent\@\@UVehicleComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UActorMoveToRequestComponent\@\@UActorSetPositionRequestComponent\@\@\@\@U?$GlobalRead\@UBaseGameVersionComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ - MCAPI static void _tickExitVehicle(class StrictEntityContext const &, struct PassengerComponent const &, struct AABBShapeComponent &, struct ActorRotationComponent &, struct StateVectorComponent &, class Optional const>, class Optional const>, class BaseGameVersion const &, class ViewT, class EntityModifierT &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class IConstBlockSource const &); + virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + /** + * @symbol ?_tickExitVehicle\@ExitVehicleSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEAUAABBShapeComponent\@\@AEAUActorRotationComponent\@\@AEAUStateVectorComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@AEBVBaseGameVersion\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@$$CBUStateVectorComponent\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UActorMoveToRequestComponent\@\@UActorSetPositionRequestComponent\@\@\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UPlayerGameTypeComponent\@\@UMobBodyRotationComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UDimensionTypeComponent\@\@UPassengerComponent\@\@UVehicleComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UActorMoveToRequestComponent\@\@UActorSetPositionRequestComponent\@\@\@\@U?$GlobalRead\@UBaseGameVersionComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z + */ + MCAPI static void _tickExitVehicle(class StrictEntityContext const &, struct PassengerComponent const &, struct AABBShapeComponent &, struct ActorRotationComponent &, struct StateVectorComponent &, class Optional const>, class Optional const>, class BaseGameVersion const &, class ViewT, class EntityModifierT &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class IConstBlockSource const &); /** * @symbol ?createSystem\@ExitVehicleSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ExpectedAnywhereConsume.hpp b/LiteLoader/include/llapi/mc/ExpectedAnywhereConsume.hpp deleted file mode 100644 index c0ebf48a30..0000000000 --- a/LiteLoader/include/llapi/mc/ExpectedAnywhereConsume.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file ExpectedAnywhereConsume.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -struct ExpectedAnywhereConsume { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_EXPECTEDANYWHERECONSUME -public: - struct ExpectedAnywhereConsume& operator=(struct ExpectedAnywhereConsume const &) = delete; - ExpectedAnywhereConsume(struct ExpectedAnywhereConsume const &) = delete; - ExpectedAnywhereConsume() = delete; -#endif - -public: - /** - * @symbol ??0ExpectedAnywhereConsume\@\@QEAA\@AEBVItemStack\@\@I\@Z - */ - MCAPI ExpectedAnywhereConsume(class ItemStack const &, unsigned int); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ExperienceCostCommitObject.hpp b/LiteLoader/include/llapi/mc/ExperienceCostCommitObject.hpp index a4d91841c8..4eb5e86461 100644 --- a/LiteLoader/include/llapi/mc/ExperienceCostCommitObject.hpp +++ b/LiteLoader/include/llapi/mc/ExperienceCostCommitObject.hpp @@ -47,9 +47,5 @@ class ExperienceCostCommitObject { * @symbol ?commit\@ExperienceCostCommitObject\@\@UEAAXAEBVContainerScreenContext\@\@\@Z */ virtual void commit(class ContainerScreenContext const &); - /** - * @symbol ??0ExperienceCostCommitObject\@\@QEAA\@H\@Z - */ - MCAPI ExperienceCostCommitObject(int); }; diff --git a/LiteLoader/include/llapi/mc/ExperienceOrb.hpp b/LiteLoader/include/llapi/mc/ExperienceOrb.hpp index 5907616c45..395a693177 100644 --- a/LiteLoader/include/llapi/mc/ExperienceOrb.hpp +++ b/LiteLoader/include/llapi/mc/ExperienceOrb.hpp @@ -194,10 +194,6 @@ enum class DropType; * @symbol ?postNormalTick\@ExperienceOrb\@\@QEAAXXZ */ MCAPI void postNormalTick(); - /** - * @symbol ?setValue\@ExperienceOrb\@\@QEAAXH\@Z - */ - MCAPI void setValue(int); /** * @symbol ?spawnOrbs\@ExperienceOrb\@\@SAXAEAVBlockSource\@\@AEBVVec3\@\@HHW4DropType\@1\@PEAVPlayer\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ExperimentStorage.hpp b/LiteLoader/include/llapi/mc/ExperimentStorage.hpp index 2a8c45b72b..f4144a655a 100644 --- a/LiteLoader/include/llapi/mc/ExperimentStorage.hpp +++ b/LiteLoader/include/llapi/mc/ExperimentStorage.hpp @@ -36,10 +36,6 @@ class ExperimentStorage { * @symbol ??4ExperimentStorage\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class ExperimentStorage & operator=(class ExperimentStorage const &); - /** - * @symbol ?wereAnyExperimentsEverToggled\@ExperimentStorage\@\@QEBA_NXZ - */ - MCAPI bool wereAnyExperimentsEverToggled() const; /** * @symbol ??1ExperimentStorage\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Experiments.hpp b/LiteLoader/include/llapi/mc/Experiments.hpp index 2cc2f15c73..87f4b55f72 100644 --- a/LiteLoader/include/llapi/mc/Experiments.hpp +++ b/LiteLoader/include/llapi/mc/Experiments.hpp @@ -24,7 +24,6 @@ class Experiments { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_EXPERIMENTS public: class Experiments& operator=(class Experiments const &) = delete; - Experiments(class Experiments const &) = delete; #endif public: @@ -36,6 +35,10 @@ class Experiments { * @symbol ?DataDrivenItems\@Experiments\@\@QEBA_NXZ */ MCAPI bool DataDrivenItems() const; + /** + * @symbol ??0Experiments\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI Experiments(class Experiments const &); /** * @symbol ??0Experiments\@\@QEAA\@XZ */ @@ -48,6 +51,10 @@ class Experiments { * @symbol ?NextMajorUpdate\@Experiments\@\@QEBA_NXZ */ MCAPI bool NextMajorUpdate() const; + /** + * @symbol ?ShortSneaking\@Experiments\@\@QEBA_NXZ + */ + MCAPI bool ShortSneaking() const; /** * @symbol ?Sniffer\@Experiments\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/ExplosionDecayFunction.hpp b/LiteLoader/include/llapi/mc/ExplosionDecayFunction.hpp index 50d78ca4c6..54b237f3ab 100644 --- a/LiteLoader/include/llapi/mc/ExplosionDecayFunction.hpp +++ b/LiteLoader/include/llapi/mc/ExplosionDecayFunction.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #include "LootItemFunction.hpp" #define BEFORE_EXTRA @@ -46,9 +45,5 @@ class ExplosionDecayFunction : public LootItemFunction { * @symbol ?apply\@ExplosionDecayFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); - /** - * @symbol ?deserialize\@ExplosionDecayFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); }; diff --git a/LiteLoader/include/llapi/mc/ExpressionNode.hpp b/LiteLoader/include/llapi/mc/ExpressionNode.hpp index be84d70e51..3b8bc9e9a5 100644 --- a/LiteLoader/include/llapi/mc/ExpressionNode.hpp +++ b/LiteLoader/include/llapi/mc/ExpressionNode.hpp @@ -11,6 +11,9 @@ // Include Headers or Declare Types Here #include "Actor.hpp" #include "HashedString.hpp" +enum class MolangVersion : int; + + class MolangInstance { public: LIAPI MolangInstance(const string&); @@ -20,7 +23,7 @@ class MolangInstance { LIAPI string getExpressionString(); LIAPI bool isInitialized(); LIAPI bool isValid(); - LIAPI bool parse(const string& expressionStr, enum class MolangVersion version = (MolangVersion)6, + LIAPI bool parse(const string& expressionStr, MolangVersion version = (MolangVersion)6, gsl::span v = gsl::span( {HashedString("default" /*or "world_gen"*/)})); @@ -42,14 +45,18 @@ class ExpressionNode { #undef AFTER_EXTRA public: + /** + * @symbol ??0ExpressionNode\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4MolangVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z + */ + MCAPI ExpressionNode(std::string const &, enum class MolangVersion, class gsl::span); /** * @symbol ??0ExpressionNode\@\@QEAA\@XZ */ MCAPI ExpressionNode(); /** - * @symbol ??0ExpressionNode\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4MolangVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z + * @symbol ??0ExpressionNode\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ExpressionNode(std::string const &, enum class MolangVersion, class gsl::span); + MCAPI ExpressionNode(class ExpressionNode const &); /** * @symbol ??0ExpressionNode\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z */ @@ -62,22 +69,18 @@ class ExpressionNode { * @symbol ??0ExpressionNode\@\@QEAA\@AEAUMolangScriptArg\@\@W4ExpressionOp\@\@\@Z */ MCAPI ExpressionNode(struct MolangScriptArg &, enum class ExpressionOp); - /** - * @symbol ??0ExpressionNode\@\@QEAA\@M\@Z - */ - MCAPI ExpressionNode(float); /** * @symbol ??0ExpressionNode\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ExpressionNode(class ExpressionNode &&); /** - * @symbol ??0ExpressionNode\@\@QEAA\@AEBVValue\@Json\@\@AEBVSemVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z + * @symbol ??0ExpressionNode\@\@QEAA\@M\@Z */ - MCAPI ExpressionNode(class Json::Value const &, class SemVersion const &, class gsl::span); + MCAPI ExpressionNode(float); /** - * @symbol ??0ExpressionNode\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ExpressionNode\@\@QEAA\@AEBVValue\@Json\@\@AEBVSemVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z */ - MCAPI ExpressionNode(class ExpressionNode const &); + MCAPI ExpressionNode(class Json::Value const &, class SemVersion const &, class gsl::span); /** * @symbol ?clear\@ExpressionNode\@\@QEAAXXZ */ @@ -127,29 +130,25 @@ class ExpressionNode { */ MCAPI bool isInitialized() const; /** - * @symbol ?isValid\@ExpressionNode\@\@QEBA_NXZ + * @symbol ?link\@ExpressionNode\@\@QEBA?AW4MolangCompileResult\@\@W4MolangVersion\@\@\@Z */ - MCAPI bool isValid() const; + MCAPI enum class MolangCompileResult link(enum class MolangVersion) const; /** * @symbol ?link\@ExpressionNode\@\@QEBA?AW4MolangCompileResult\@\@XZ */ MCAPI enum class MolangCompileResult link() const; - /** - * @symbol ?link\@ExpressionNode\@\@QEBA?AW4MolangCompileResult\@\@W4MolangVersion\@\@\@Z - */ - MCAPI enum class MolangCompileResult link(enum class MolangVersion) const; /** * @symbol ?moveConstantChildToValueIfFloatOrHashType\@ExpressionNode\@\@QEAAXH\@Z */ MCAPI void moveConstantChildToValueIfFloatOrHashType(int); - /** - * @symbol ??4ExpressionNode\@\@QEAAAEAV0\@M\@Z - */ - MCAPI class ExpressionNode & operator=(float); /** * @symbol ??4ExpressionNode\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class ExpressionNode & operator=(class ExpressionNode const &); + /** + * @symbol ??4ExpressionNode\@\@QEAAAEAV0\@M\@Z + */ + MCAPI class ExpressionNode & operator=(float); /** * @symbol ??8ExpressionNode\@\@QEBA_NAEBV0\@\@Z */ @@ -174,10 +173,6 @@ class ExpressionNode { * @symbol ?fast_atof_positiveOnly\@ExpressionNode\@\@SAMAEAPEBD\@Z */ MCAPI static float fast_atof_positiveOnly(char const *&); - /** - * @symbol ?getExperiments\@ExpressionNode\@\@SAAEAVExperiments\@\@XZ - */ - MCAPI static class Experiments & getExperiments(); /** * @symbol ?getOpFriendlyName\@ExpressionNode\@\@SAPEBDW4ExpressionOp\@\@\@Z */ @@ -256,6 +251,10 @@ class ExpressionNode { * @symbol ?_validateChildrenAreNumerical\@ExpressionNode\@\@AEBA_NW4MolangVersion\@\@\@Z */ MCAPI bool _validateChildrenAreNumerical(enum class MolangVersion) const; + /** + * @symbol ?executeMolangProgram\@ExpressionNode\@\@AEBAAEBUMolangScriptArg\@\@AEAVRenderParams\@\@AEAUMolangEvalParams\@\@\@Z + */ + MCAPI struct MolangScriptArg const & executeMolangProgram(class RenderParams &, struct MolangEvalParams &) const; /** * @symbol ?findClosingOp\@ExpressionNode\@\@AEBA_NAEA_KW4ExpressionOp\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ExpressionOpBitField.hpp b/LiteLoader/include/llapi/mc/ExpressionOpBitField.hpp index 27a92a301f..5c11e37753 100644 --- a/LiteLoader/include/llapi/mc/ExpressionOpBitField.hpp +++ b/LiteLoader/include/llapi/mc/ExpressionOpBitField.hpp @@ -29,14 +29,6 @@ struct ExpressionOpBitField { #endif public: - /** - * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@00000\@Z - */ - MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const; - /** - * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@00\@Z - */ - MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const; /** * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@0000\@Z */ @@ -45,6 +37,10 @@ struct ExpressionOpBitField { * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@000\@Z */ MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const; + /** + * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@00000\@Z + */ + MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const; /** * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@0000000\@Z */ diff --git a/LiteLoader/include/llapi/mc/ExtendedCertificate.hpp b/LiteLoader/include/llapi/mc/ExtendedCertificate.hpp index be336d054e..8f98a2bd6d 100644 --- a/LiteLoader/include/llapi/mc/ExtendedCertificate.hpp +++ b/LiteLoader/include/llapi/mc/ExtendedCertificate.hpp @@ -37,10 +37,6 @@ class ExtendedCertificate { * @symbol ?getIdentityName\@ExtendedCertificate\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCertificate\@\@\@Z */ MCAPI static std::string getIdentityName(class Certificate const &); - /** - * @symbol ?getXuid\@ExtendedCertificate\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBVCertificate\@\@\@Z - */ - MCAPI static std::string getXuid(class Certificate const *); /** * @symbol ?getXuid\@ExtendedCertificate\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCertificate\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp b/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp index bbd8b4769e..e9188fe78c 100644 --- a/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp +++ b/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp @@ -24,17 +24,10 @@ struct ExtendedStreamReadResult { public: struct ExtendedStreamReadResult& operator=(struct ExtendedStreamReadResult const &) = delete; ExtendedStreamReadResult(struct ExtendedStreamReadResult const &) = delete; + ExtendedStreamReadResult() = delete; #endif public: - /** - * @symbol ??0ExtendedStreamReadResult\@\@QEAA\@XZ - */ - MCAPI ExtendedStreamReadResult(); - /** - * @symbol ??0ExtendedStreamReadResult\@\@QEAA\@W4StreamReadResult\@\@\@Z - */ - MCAPI ExtendedStreamReadResult(enum class StreamReadResult); /** * @symbol ??1ExtendedStreamReadResult\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ExternalDataComponent.hpp b/LiteLoader/include/llapi/mc/ExternalDataComponent.hpp new file mode 100644 index 0000000000..a5f1ff99ba --- /dev/null +++ b/LiteLoader/include/llapi/mc/ExternalDataComponent.hpp @@ -0,0 +1,32 @@ +/** + * @file ExternalDataComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ExternalDataComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_EXTERNALDATACOMPONENT +public: + struct ExternalDataComponent& operator=(struct ExternalDataComponent const &) = delete; + ExternalDataComponent(struct ExternalDataComponent const &) = delete; + ExternalDataComponent() = delete; +#endif + +public: + /** + * @symbol ??1ExternalDataComponent\@\@QEAA\@XZ + */ + MCAPI ~ExternalDataComponent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ExternalDataServerLevel.hpp b/LiteLoader/include/llapi/mc/ExternalDataServerLevel.hpp new file mode 100644 index 0000000000..58cee4a7c3 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ExternalDataServerLevel.hpp @@ -0,0 +1,48 @@ +/** + * @file ExternalDataServerLevel.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ExternalDataServerLevel { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_EXTERNALDATASERVERLEVEL +public: + struct ExternalDataServerLevel& operator=(struct ExternalDataServerLevel const &) = delete; + ExternalDataServerLevel(struct ExternalDataServerLevel const &) = delete; + ExternalDataServerLevel() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?isInGame\@ExternalDataServerLevel\@\@UEBA_NXZ + */ + virtual bool isInGame() const; + /** + * @vftbl 2 + * @symbol ?getDefaultGameType\@ExternalDataServerLevel\@\@UEBA?AW4GameType\@\@XZ + */ + virtual enum class GameType getDefaultGameType() const; + /** + * @symbol ??0ExternalDataServerLevel\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@$$CBVILevel\@\@\@Bedrock\@\@\@gsl\@\@\@Z + */ + MCAPI ExternalDataServerLevel(class gsl::not_null>); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ExternalFileLevelStorageMetadata.hpp b/LiteLoader/include/llapi/mc/ExternalFileLevelStorageMetadata.hpp deleted file mode 100644 index 73214b8d16..0000000000 --- a/LiteLoader/include/llapi/mc/ExternalFileLevelStorageMetadata.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file ExternalFileLevelStorageMetadata.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace ExternalFileLevelStorageMetadata. - * - */ -namespace ExternalFileLevelStorageMetadata { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?saveLevelMetadata\@ExternalFileLevelStorageMetadata\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@\@Z - */ - MCAPI void saveLevelMetadata(std::string const &, class LevelData const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ExternalLinkSettings.hpp b/LiteLoader/include/llapi/mc/ExternalLinkSettings.hpp index 91a6fb2a0d..47293d98b8 100644 --- a/LiteLoader/include/llapi/mc/ExternalLinkSettings.hpp +++ b/LiteLoader/include/llapi/mc/ExternalLinkSettings.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class ExternalLinkSettings { +struct ExternalLinkSettings { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_EXTERNALLINKSETTINGS public: - class ExternalLinkSettings& operator=(class ExternalLinkSettings const &) = delete; - ExternalLinkSettings(class ExternalLinkSettings const &) = delete; + struct ExternalLinkSettings& operator=(struct ExternalLinkSettings const &) = delete; + ExternalLinkSettings(struct ExternalLinkSettings const &) = delete; ExternalLinkSettings() = delete; #endif @@ -29,4 +29,4 @@ class ExternalLinkSettings { */ MCAPI ~ExternalLinkSettings(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ExternalRecipeStore.hpp b/LiteLoader/include/llapi/mc/ExternalRecipeStore.hpp index 39ddeea6d7..aefda5b690 100644 --- a/LiteLoader/include/llapi/mc/ExternalRecipeStore.hpp +++ b/LiteLoader/include/llapi/mc/ExternalRecipeStore.hpp @@ -29,10 +29,6 @@ class ExternalRecipeStore { #endif public: - /** - * @symbol ?registerBlockReduction\@ExternalRecipeStore\@\@QEAAXAEBVItemStack\@\@$$QEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI void registerBlockReduction(class ItemStack const &, std::vector &&); /** * @symbol ?setBlockReducer\@ExternalRecipeStore\@\@QEAAXPEAVBlockReducer\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EyeOfEnderPreNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/EyeOfEnderPreNormalTickSystem.hpp index 2941027717..c241554536 100644 --- a/LiteLoader/include/llapi/mc/EyeOfEnderPreNormalTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/EyeOfEnderPreNormalTickSystem.hpp @@ -37,6 +37,10 @@ class EyeOfEnderPreNormalTickSystem { * @symbol ?_doEyeOfEnderPreNormalTickSystem\@EyeOfEnderPreNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doEyeOfEnderPreNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &); + /** + * @symbol ?_tickEyeOfEnderPreNormalTickSystem\@EyeOfEnderPreNormalTickSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UEyeOfEnderFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void _tickEyeOfEnderPreNormalTickSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>); private: diff --git a/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp b/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp index e67e868bab..cf0b7c022e 100644 --- a/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp +++ b/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp @@ -162,9 +162,9 @@ class FaceDirectionalActorBlock : public ActorBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@FaceDirectionalActorBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@FaceDirectionalActorBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,35 +181,35 @@ class FaceDirectionalActorBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 148 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 149 * @symbol ?getRenderBlock\@FaceDirectionalActorBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getRenderBlock() const; /** - * @vftbl 149 + * @vftbl 150 * @symbol ?getMappedFace\@FaceDirectionalActorBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 150 + * @vftbl 151 * @symbol ?getFaceFlip\@FaceDirectionalActorBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -221,25 +221,30 @@ class FaceDirectionalActorBlock : public ActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FACEDIRECTIONALACTORBLOCK /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp b/LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp index ac0501f11b..99fd5a3b13 100644 --- a/LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp +++ b/LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp @@ -167,9 +167,9 @@ class FaceDirectionalBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@FaceDirectionalBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@FaceDirectionalBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,35 +186,35 @@ class FaceDirectionalBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 148 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 149 * @symbol ?getRenderBlock\@FaceDirectionalBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getRenderBlock() const; /** - * @vftbl 149 + * @vftbl 150 * @symbol ?getMappedFace\@FaceDirectionalBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 150 + * @vftbl 151 * @symbol ?getFaceFlip\@FaceDirectionalBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,25 +226,30 @@ class FaceDirectionalBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FACEDIRECTIONALBLOCK /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/Facing.hpp b/LiteLoader/include/llapi/mc/Facing.hpp index ca32a7cca8..7c77973ff0 100644 --- a/LiteLoader/include/llapi/mc/Facing.hpp +++ b/LiteLoader/include/llapi/mc/Facing.hpp @@ -166,14 +166,14 @@ enum class Axis : int; * @symbol ?getRotationMatrix\@Facing\@\@SA?AU?$mat\@$02$02M$0A\@\@glm\@\@EW4Rotation\@1\@\@Z */ MCAPI static struct glm::mat<3, 3, float, 0> getRotationMatrix(unsigned char, enum class Facing::Rotation); - /** - * @symbol ?getShuffledDirections\@Facing\@\@SA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@XZ - */ - MCAPI static std::vector getShuffledDirections(); /** * @symbol ?getShuffledDirections\@Facing\@\@SA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@AEAVRandom\@\@\@Z */ MCAPI static std::vector getShuffledDirections(class Random &); + /** + * @symbol ?getShuffledDirections\@Facing\@\@SA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@XZ + */ + MCAPI static std::vector getShuffledDirections(); /** * @symbol ?getStepX\@Facing\@\@SAHE\@Z */ diff --git a/LiteLoader/include/llapi/mc/FarmBlock.hpp b/LiteLoader/include/llapi/mc/FarmBlock.hpp index c4b8b5a3c5..d1e62b2340 100644 --- a/LiteLoader/include/llapi/mc/FarmBlock.hpp +++ b/LiteLoader/include/llapi/mc/FarmBlock.hpp @@ -196,25 +196,25 @@ class FarmBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 - * @symbol ?getVariant\@FarmBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 147 + * @symbol ?getVariant\@FarmBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,42 +226,47 @@ class FarmBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@FarmBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@FarmBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/Feature.hpp b/LiteLoader/include/llapi/mc/Feature.hpp index 6ffd769a62..eca5f003df 100644 --- a/LiteLoader/include/llapi/mc/Feature.hpp +++ b/LiteLoader/include/llapi/mc/Feature.hpp @@ -47,7 +47,7 @@ class Feature : public IFeature { virtual bool isValidPlacement(std::string const &); /** * @vftbl 3 - * @symbol ?place\@CoralHangFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?place\@LegacySmallMushroomsFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const = 0; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FEATURE diff --git a/LiteLoader/include/llapi/mc/FeatureToggles.hpp b/LiteLoader/include/llapi/mc/FeatureToggles.hpp index a266c9647f..42b979823c 100644 --- a/LiteLoader/include/llapi/mc/FeatureToggles.hpp +++ b/LiteLoader/include/llapi/mc/FeatureToggles.hpp @@ -49,18 +49,10 @@ class FeatureToggles { MCAPI bool isEnabled(enum class FeatureOptionID) const; //private: - /** - * @symbol ?_getDisableIfOtherOptionDisabledSetupCallback\@FeatureToggles\@\@AEBA?AV?$function\@$$A6AXAEAVOption\@\@\@Z\@std\@\@W4FeatureOptionID\@\@\@Z - */ - MCAPI class std::function _getDisableIfOtherOptionDisabledSetupCallback(enum class FeatureOptionID) const; /** * @symbol ?_getDisabledIfOptionExpectationsNotMetSetupCallback\@FeatureToggles\@\@AEAA?AV?$function\@$$A6AXAEAVOption\@\@\@Z\@std\@\@V?$vector\@W4FeatureOptionID\@\@V?$allocator\@W4FeatureOptionID\@\@\@std\@\@\@3\@0\@Z */ MCAPI class std::function _getDisabledIfOptionExpectationsNotMetSetupCallback(std::vector, std::vector); - /** - * @symbol ?_getDisabledIfOtherOptionsEnabledSetupCallback\@FeatureToggles\@\@AEAA?AV?$function\@$$A6AXAEAVOption\@\@\@Z\@std\@\@V?$vector\@W4FeatureOptionID\@\@V?$allocator\@W4FeatureOptionID\@\@\@std\@\@\@3\@\@Z - */ - MCAPI class std::function _getDisabledIfOtherOptionsEnabledSetupCallback(std::vector); /** * @symbol ?_getLockIfInGameOrOptionExpectationsNotMetLockCallback\@FeatureToggles\@\@AEAA?AV?$function\@$$A6AXAEA_N\@Z\@std\@\@V?$vector\@W4FeatureOptionID\@\@V?$allocator\@W4FeatureOptionID\@\@\@std\@\@\@3\@0\@Z */ diff --git a/LiteLoader/include/llapi/mc/FeedItem.hpp b/LiteLoader/include/llapi/mc/FeedItem.hpp index a548dbcb9b..72bf440d02 100644 --- a/LiteLoader/include/llapi/mc/FeedItem.hpp +++ b/LiteLoader/include/llapi/mc/FeedItem.hpp @@ -28,7 +28,6 @@ struct Effect { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_FEEDITEM public: - struct FeedItem& operator=(struct FeedItem const &) = delete; FeedItem() = delete; #endif @@ -41,6 +40,10 @@ struct Effect { * @symbol ?addEffect\@FeedItem\@\@QEAAXAEBUEffect\@1\@\@Z */ MCAPI void addEffect(struct FeedItem::Effect const &); + /** + * @symbol ??4FeedItem\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct FeedItem & operator=(struct FeedItem const &); /** * @symbol ??4FeedItem\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/FenceBlock.hpp b/LiteLoader/include/llapi/mc/FenceBlock.hpp index 3fa8ab129c..28a1e78ca9 100644 --- a/LiteLoader/include/llapi/mc/FenceBlock.hpp +++ b/LiteLoader/include/llapi/mc/FenceBlock.hpp @@ -221,35 +221,30 @@ class FenceBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@FenceBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual std::string buildDescriptionId(class Block const &) const; + virtual void __unk_vfn_132(); /** * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@FenceBlock\@\@UEBA_NXZ + * @symbol ?buildDescriptionId\@FenceBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ - virtual bool isAuxValueRelevantForPicking() const; + virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 142 + * @vftbl 143 * @symbol ?getVisualShapeInWorld\@FenceBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -261,40 +256,35 @@ class FenceBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol ?use\@FenceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual bool use(class Player &, class BlockPos const &, unsigned char) const; + virtual void __unk_vfn_175(); /** * @vftbl 178 - * @symbol __unk_vfn_178 - */ - virtual void __unk_vfn_178(); - /** - * @vftbl 185 - * @symbol ?getMapColor\@FenceBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?use\@FenceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ - virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; + virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 - * @symbol ?getResourceItem\@FenceBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FENCEBLOCK /** * @symbol ?canBeSilkTouched\@FenceBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/FenceGateBlock.hpp b/LiteLoader/include/llapi/mc/FenceGateBlock.hpp index 6f14b502ad..29ad86b8e2 100644 --- a/LiteLoader/include/llapi/mc/FenceGateBlock.hpp +++ b/LiteLoader/include/llapi/mc/FenceGateBlock.hpp @@ -202,9 +202,9 @@ class FenceGateBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@FenceGateBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@FenceGateBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -221,20 +221,20 @@ class FenceGateBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -247,39 +247,44 @@ class FenceGateBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@FenceGateBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FENCEGATEBLOCK /** * @symbol ?isFenceGateBlock\@FenceGateBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/FertilizerItem.hpp b/LiteLoader/include/llapi/mc/FertilizerItem.hpp index 01a7f341a7..94183285f0 100644 --- a/LiteLoader/include/llapi/mc/FertilizerItem.hpp +++ b/LiteLoader/include/llapi/mc/FertilizerItem.hpp @@ -118,9 +118,9 @@ class FertilizerItem : public Item { virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** * @vftbl 132 - * @symbol ?_useOn\@FertilizerItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@FertilizerItem\@\@MEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FERTILIZERITEM /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/FillCommand.hpp b/LiteLoader/include/llapi/mc/FillCommand.hpp index 56d6d576cb..ca8671aede 100644 --- a/LiteLoader/include/llapi/mc/FillCommand.hpp +++ b/LiteLoader/include/llapi/mc/FillCommand.hpp @@ -36,7 +36,7 @@ class FillCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@FillCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/FillingContainer.hpp b/LiteLoader/include/llapi/mc/FillingContainer.hpp index 6e76f0bd2d..7d956a7171 100644 --- a/LiteLoader/include/llapi/mc/FillingContainer.hpp +++ b/LiteLoader/include/llapi/mc/FillingContainer.hpp @@ -45,72 +45,72 @@ class FillingContainer : public Container { */ virtual class ItemStack const & getItem(int) const; /** - * @vftbl 9 + * @vftbl 10 * @symbol ?setItem\@FillingContainer\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setItem(int, class ItemStack const &); /** - * @vftbl 10 + * @vftbl 11 * @symbol ?setItemWithForceBalance\@FillingContainer\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setItemWithForceBalance(int, class ItemStack const &, bool); /** - * @vftbl 11 + * @vftbl 12 * @symbol ?removeItem\@FillingContainer\@\@UEAAXHH\@Z */ virtual void removeItem(int, int); /** - * @vftbl 14 + * @vftbl 15 * @symbol ?getContainerSize\@FillingContainer\@\@UEBAHXZ */ virtual int getContainerSize() const; /** - * @vftbl 15 + * @vftbl 16 * @symbol ?getMaxStackSize\@FillingContainer\@\@UEBAHXZ */ virtual int getMaxStackSize() const; /** - * @vftbl 16 + * @vftbl 17 * @symbol ?startOpen\@FillingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void startOpen(class Player &); /** - * @vftbl 17 + * @vftbl 18 * @symbol ?stopOpen\@FillingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void stopOpen(class Player &); - /** - * @vftbl 23 - * @symbol __unk_vfn_23 - */ - virtual void __unk_vfn_23(); /** * @vftbl 24 * @symbol __unk_vfn_24 */ virtual void __unk_vfn_24(); /** - * @vftbl 34 + * @vftbl 25 + * @symbol __unk_vfn_25 + */ + virtual void __unk_vfn_25(); + /** + * @vftbl 35 * @symbol ?add\@FillingContainer\@\@UEAA_NAEAVItemStack\@\@\@Z */ virtual bool add(class ItemStack &); /** - * @vftbl 35 + * @vftbl 36 * @symbol ?canAdd\@FillingContainer\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool canAdd(class ItemStack const &) const; /** - * @vftbl 36 + * @vftbl 37 * @symbol ?clearSlot\@FillingContainer\@\@UEAAXH\@Z */ virtual void clearSlot(int); /** - * @vftbl 37 + * @vftbl 38 * @symbol ?clearInventory\@FillingContainer\@\@UEAAHH\@Z */ virtual int clearInventory(int); /** - * @vftbl 38 + * @vftbl 39 * @symbol ?load\@FillingContainer\@\@UEAAXAEBVListTag\@\@AEBVSemVersion\@\@AEAVLevel\@\@\@Z */ virtual void load(class ListTag const &, class SemVersion const &, class Level &); diff --git a/LiteLoader/include/llapi/mc/FilterGroup.hpp b/LiteLoader/include/llapi/mc/FilterGroup.hpp index 6cb07bc01d..def6e9714b 100644 --- a/LiteLoader/include/llapi/mc/FilterGroup.hpp +++ b/LiteLoader/include/llapi/mc/FilterGroup.hpp @@ -39,7 +39,7 @@ enum class CollectionType; virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?_createSubgroup\@ActorFilterGroup\@\@MEBA?AV?$shared_ptr\@VFilterGroup\@\@\@std\@\@W4CollectionType\@FilterGroup\@\@\@Z + * @symbol ?_createSubgroup\@BiomeFilterGroup\@\@MEBA?AV?$shared_ptr\@VFilterGroup\@\@\@std\@\@W4CollectionType\@FilterGroup\@\@\@Z */ virtual class std::shared_ptr _createSubgroup(enum class FilterGroup::CollectionType) const = 0; /** diff --git a/LiteLoader/include/llapi/mc/FilterInput.hpp b/LiteLoader/include/llapi/mc/FilterInput.hpp index f4ecf79e37..de22544e1a 100644 --- a/LiteLoader/include/llapi/mc/FilterInput.hpp +++ b/LiteLoader/include/llapi/mc/FilterInput.hpp @@ -32,14 +32,14 @@ class FilterInput { * @symbol ??0FilterInput\@\@QEAA\@H\@Z */ MCAPI FilterInput(int); - /** - * @symbol ??4FilterInput\@\@QEAAAEAV0\@AEBV0\@\@Z - */ - MCAPI class FilterInput & operator=(class FilterInput const &); /** * @symbol ??4FilterInput\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class FilterInput & operator=(class FilterInput &&); + /** + * @symbol ??4FilterInput\@\@QEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class FilterInput & operator=(class FilterInput const &); /** * @symbol ??1FilterInput\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/FilterInputDefinition.hpp b/LiteLoader/include/llapi/mc/FilterInputDefinition.hpp index 45b3363d6f..c44bd86f11 100644 --- a/LiteLoader/include/llapi/mc/FilterInputDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FilterInputDefinition.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class FilterInputDefinition { +struct FilterInputDefinition { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_FILTERINPUTDEFINITION public: - class FilterInputDefinition& operator=(class FilterInputDefinition const &) = delete; - FilterInputDefinition(class FilterInputDefinition const &) = delete; + struct FilterInputDefinition& operator=(struct FilterInputDefinition const &) = delete; + FilterInputDefinition(struct FilterInputDefinition const &) = delete; FilterInputDefinition() = delete; #endif @@ -33,4 +33,4 @@ class FilterInputDefinition { */ MCAPI ~FilterInputDefinition(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/FilterTest.hpp b/LiteLoader/include/llapi/mc/FilterTest.hpp index 4725db842d..b5a6006323 100644 --- a/LiteLoader/include/llapi/mc/FilterTest.hpp +++ b/LiteLoader/include/llapi/mc/FilterTest.hpp @@ -48,7 +48,7 @@ struct Definition { virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 - * @symbol ?evaluate\@FilterTestGameRule\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @symbol ?evaluate\@ActorInWeatherTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const = 0; /** @@ -58,7 +58,7 @@ struct Definition { virtual void finalizeParsedValue(class IWorldRegistriesProvider &); /** * @vftbl 4 - * @symbol ?getName\@FilterTestGameRule\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ + * @symbol ?getName\@ActorInWeatherTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ virtual class std::basic_string_view> getName() const = 0; /** @@ -68,7 +68,7 @@ struct Definition { virtual class Json::Value _serializeDomain() const; /** * @vftbl 6 - * @symbol ?_serializeValue\@FilterTestGameRule\@\@MEBA?AVValue\@Json\@\@XZ + * @symbol ?_serializeValue\@ActorInWeatherTest\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeValue() const = 0; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTEST @@ -84,21 +84,17 @@ struct Definition { //protected: /** - * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_N_N0\@Z + * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NHH\@Z */ - MCAPI bool _testValuesWithOperator(bool, bool) const; + MCAPI bool _testValuesWithOperator(int, int) const; /** * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NMM\@Z */ MCAPI bool _testValuesWithOperator(float, float) const; /** - * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NAEBVHashedString\@\@0\@Z - */ - MCAPI bool _testValuesWithOperator(class HashedString const &, class HashedString const &) const; - /** - * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NHH\@Z + * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_N_N0\@Z */ - MCAPI bool _testValuesWithOperator(int, int) const; + MCAPI bool _testValuesWithOperator(bool, bool) const; protected: diff --git a/LiteLoader/include/llapi/mc/FinalizeMoveSystem.hpp b/LiteLoader/include/llapi/mc/FinalizeMoveSystem.hpp index 4e2405621f..d37c1a740d 100644 --- a/LiteLoader/include/llapi/mc/FinalizeMoveSystem.hpp +++ b/LiteLoader/include/llapi/mc/FinalizeMoveSystem.hpp @@ -31,5 +31,9 @@ class FinalizeMoveSystem { * @symbol ?create\@FinalizeMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); + /** + * @symbol ?tick\@FinalizeMoveSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAABBShapeComponent\@\@$$CBUMoveRequestComponent\@\@$$CBUOffsetsComponent\@\@$$CBUSlideOffsetComponent\@\@UStateVectorComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBUAbilitiesComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UCollisionFlag\@\@\@\@V?$FlagComponent\@UHorizontalCollisionFlag\@\@\@\@V?$FlagComponent\@UVerticalCollisionFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void tick(class ViewT const>, class Optional>, class EntityModifierT, class FlagComponent, class FlagComponent, class FlagComponent>); }; diff --git a/LiteLoader/include/llapi/mc/FindCoverGoal.hpp b/LiteLoader/include/llapi/mc/FindCoverGoal.hpp index ea9e6cb694..e84d15b083 100644 --- a/LiteLoader/include/llapi/mc/FindCoverGoal.hpp +++ b/LiteLoader/include/llapi/mc/FindCoverGoal.hpp @@ -73,10 +73,6 @@ class FindCoverGoal { * @symbol ??0FindCoverGoal\@\@QEAA\@AEAVMob\@\@MM\@Z */ MCAPI FindCoverGoal(class Mob &, float, float); - /** - * @symbol ?getMob\@FindCoverGoal\@\@QEBAAEBVMob\@\@XZ - */ - MCAPI class Mob const & getMob() const; //private: /** diff --git a/LiteLoader/include/llapi/mc/FireBlock.hpp b/LiteLoader/include/llapi/mc/FireBlock.hpp index 7dbee3598b..71591e96ac 100644 --- a/LiteLoader/include/llapi/mc/FireBlock.hpp +++ b/LiteLoader/include/llapi/mc/FireBlock.hpp @@ -211,25 +211,25 @@ class FireBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 - * @symbol ?animateTick\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 152 + * @symbol ?animateTick\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -242,34 +242,39 @@ class FireBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FIREBLOCK /** * @symbol ?canBeSilkTouched\@FireBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/FireChargeItem.hpp b/LiteLoader/include/llapi/mc/FireChargeItem.hpp index 277b25266e..0eacab3eb0 100644 --- a/LiteLoader/include/llapi/mc/FireChargeItem.hpp +++ b/LiteLoader/include/llapi/mc/FireChargeItem.hpp @@ -118,9 +118,9 @@ class FireChargeItem : public Item { virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** * @vftbl 132 - * @symbol ?_useOn\@FireChargeItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@FireChargeItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0FireChargeItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/FireworksItem.hpp b/LiteLoader/include/llapi/mc/FireworksItem.hpp index 1329d408f5..561d013d58 100644 --- a/LiteLoader/include/llapi/mc/FireworksItem.hpp +++ b/LiteLoader/include/llapi/mc/FireworksItem.hpp @@ -123,9 +123,9 @@ class FireworksItem : public Item { virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** * @vftbl 132 - * @symbol ?_useOn\@FireworksItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@FireworksItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0FireworksItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/FireworksRecipe.hpp b/LiteLoader/include/llapi/mc/FireworksRecipe.hpp index b90c8d9092..46e8665dcf 100644 --- a/LiteLoader/include/llapi/mc/FireworksRecipe.hpp +++ b/LiteLoader/include/llapi/mc/FireworksRecipe.hpp @@ -37,9 +37,9 @@ class FireworksRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@FireworksRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @symbol ?assemble\@FireworksRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &) const; + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@FireworksRecipe\@\@UEBAHXZ @@ -57,9 +57,9 @@ class FireworksRecipe : public Recipe { virtual std::vector const & getResultItem() const; /** * @vftbl 5 - * @symbol ?isShapeless\@FireworksRecipe\@\@UEBA_NXZ + * @symbol __unk_vfn_5 */ - virtual bool isShapeless() const; + virtual void __unk_vfn_5(); /** * @vftbl 6 * @symbol ?matches\@FireworksRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z @@ -70,6 +70,12 @@ class FireworksRecipe : public Recipe { * @symbol ?size\@FireworksRecipe\@\@UEBAHXZ */ virtual int size() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FIREWORKSRECIPE + /** + * @symbol ?isShapeless\@FireworksRecipe\@\@UEBA_NXZ + */ + MCVAPI bool isShapeless() const; +#endif /** * @symbol ??0FireworksRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@PEBVUUID\@mce\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/FlagAllPassengersForPositioningSystem.hpp b/LiteLoader/include/llapi/mc/FlagAllPassengersForPositioningSystem.hpp index b4b24ffcaf..03c78b3ac7 100644 --- a/LiteLoader/include/llapi/mc/FlagAllPassengersForPositioningSystem.hpp +++ b/LiteLoader/include/llapi/mc/FlagAllPassengersForPositioningSystem.hpp @@ -24,6 +24,10 @@ class FlagAllPassengersForPositioningSystem { #endif public: + /** + * @symbol ?_tick\@FlagAllPassengersForPositioningSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@UPassengerComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPositionPassengerRequestComponent\@\@\@\@\@Z + */ + MCAPI static void _tick(class ViewT, struct PassengerComponent>>, class EntityModifierT); /** * @symbol ?create\@FlagAllPassengersForPositioningSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/FlagPassengerRemovalSystem.hpp b/LiteLoader/include/llapi/mc/FlagPassengerRemovalSystem.hpp index 661ca4e612..460baef33f 100644 --- a/LiteLoader/include/llapi/mc/FlagPassengerRemovalSystem.hpp +++ b/LiteLoader/include/llapi/mc/FlagPassengerRemovalSystem.hpp @@ -36,4 +36,12 @@ class FlagPassengerRemovalSystem { */ MCAPI static void tickDeferredPassengerRemoval(class StrictEntityContext const &, struct VehicleComponent const &, class ViewT>>, class EntityModifierT); +//private: + /** + * @symbol ?_tickDeferredRemoval\@FlagPassengerRemovalSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPendingRemovePassengersComponent\@\@\@\@\@Z + */ + MCAPI static void _tickDeferredRemoval(class ViewT, class ViewT>>, class EntityModifierT); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/FlatWorldGeneratorOptions.hpp b/LiteLoader/include/llapi/mc/FlatWorldGeneratorOptions.hpp index 90fe284191..e51b010ff4 100644 --- a/LiteLoader/include/llapi/mc/FlatWorldGeneratorOptions.hpp +++ b/LiteLoader/include/llapi/mc/FlatWorldGeneratorOptions.hpp @@ -30,10 +30,6 @@ class FlatWorldGeneratorOptions { #endif public: - /** - * @symbol ??0FlatWorldGeneratorOptions\@\@QEAA\@AEBVValue\@Json\@\@AEBVBlockPalette\@\@AEBVLevelData\@\@\@Z - */ - MCAPI FlatWorldGeneratorOptions(class Json::Value const &, class BlockPalette const &, class LevelData const &); /** * @symbol ??1FlatWorldGeneratorOptions\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp b/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp index e653a7f291..fc30443147 100644 --- a/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp +++ b/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp @@ -128,9 +128,9 @@ class FlintAndSteelItem : public Item { virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** * @vftbl 132 - * @symbol ?_useOn\@FlintAndSteelItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@FlintAndSteelItem\@\@MEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0FlintAndSteelItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/FlowerBlock.hpp b/LiteLoader/include/llapi/mc/FlowerBlock.hpp index bdbdcedae7..87b59309a7 100644 --- a/LiteLoader/include/llapi/mc/FlowerBlock.hpp +++ b/LiteLoader/include/llapi/mc/FlowerBlock.hpp @@ -216,35 +216,35 @@ class FlowerBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@FlowerBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@FlowerBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 161 + * @vftbl 162 * @symbol ?_addHardCodedBlockComponents\@FlowerBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -256,47 +256,52 @@ class FlowerBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 180 + * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 181 * @symbol ?getRenderLayer\@FlowerBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 181 + * @vftbl 182 * @symbol ?getRenderLayer\@FlowerBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@FlowerBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@FlowerBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@FlowerBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/FlowerPotBlock.hpp b/LiteLoader/include/llapi/mc/FlowerPotBlock.hpp index 50112902b5..ec3c2676c2 100644 --- a/LiteLoader/include/llapi/mc/FlowerPotBlock.hpp +++ b/LiteLoader/include/llapi/mc/FlowerPotBlock.hpp @@ -211,25 +211,25 @@ class FlowerPotBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 162 - * @symbol ?onRemove\@FlowerPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void onRemove(class BlockSource &, class BlockPos const &) const; + virtual void __unk_vfn_157(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol ?onRemove\@FlowerPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_165(); + virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -241,42 +241,47 @@ class FlowerPotBlock : public ActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@FlowerPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@FlowerPotBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@FlowerPotBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@FlowerPotBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/FlushableEnv.hpp b/LiteLoader/include/llapi/mc/FlushableEnv.hpp index 5c44cd8952..426b8664d9 100644 --- a/LiteLoader/include/llapi/mc/FlushableEnv.hpp +++ b/LiteLoader/include/llapi/mc/FlushableEnv.hpp @@ -135,9 +135,5 @@ class FlushableEnv { */ MCVAPI ~FlushableEnv(); #endif - /** - * @symbol ??0FlushableEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@\@Z - */ - MCAPI FlushableEnv(class leveldb::Env *); }; diff --git a/LiteLoader/include/llapi/mc/FlushableStorageAreaEnv.hpp b/LiteLoader/include/llapi/mc/FlushableStorageAreaEnv.hpp index 1d4e95fa8f..4253ad636b 100644 --- a/LiteLoader/include/llapi/mc/FlushableStorageAreaEnv.hpp +++ b/LiteLoader/include/llapi/mc/FlushableStorageAreaEnv.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Core.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -135,9 +134,5 @@ class FlushableStorageAreaEnv { * @symbol ?flushToPermanentStorage\@FlushableStorageAreaEnv\@\@UEAAXXZ */ virtual void flushToPermanentStorage(); - /** - * @symbol ??0FlushableStorageAreaEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@V?$shared_ptr\@VFileStorageArea\@Core\@\@\@std\@\@\@Z - */ - MCAPI FlushableStorageAreaEnv(class leveldb::Env *, class std::shared_ptr); }; diff --git a/LiteLoader/include/llapi/mc/FlyTravelSystem.hpp b/LiteLoader/include/llapi/mc/FlyTravelSystem.hpp index 3d8225db0f..b501510bcb 100644 --- a/LiteLoader/include/llapi/mc/FlyTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/FlyTravelSystem.hpp @@ -35,5 +35,9 @@ class FlyTravelSystem { * @symbol ?getPlayerFlySpeed\@FlyTravelSystem\@\@SAMAEBVLayeredAbilities\@\@VSynchedActorDataReader\@\@\@Z */ MCAPI static float getPlayerFlySpeed(class LayeredAbilities const &, class SynchedActorDataReader); + /** + * @symbol ?tickFlyTravelSystem\@FlyTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@UMobTravelComponent\@\@\@\@$$CBUAbilitiesComponent\@\@$$CBUSynchedActorDataComponent\@\@UFlySpeedComponent\@\@\@\@\@Z + */ + MCAPI static void tickFlyTravelSystem(class ViewT, struct MobTravelComponent>, struct AbilitiesComponent const, struct SynchedActorDataComponent const, struct FlySpeedComponent>); }; diff --git a/LiteLoader/include/llapi/mc/FlyTriggerSystem.hpp b/LiteLoader/include/llapi/mc/FlyTriggerSystem.hpp index 8bddddc7ad..b9b5d143d9 100644 --- a/LiteLoader/include/llapi/mc/FlyTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/FlyTriggerSystem.hpp @@ -36,12 +36,4 @@ class FlyTriggerSystem { */ MCAPI static void tickEntity(class StrictEntityContext &, struct ActorUniqueIDComponent const &, struct AdventureSettingsComponent const &, struct MoveInputComponent const &, class Optional, class Optional, struct AbilitiesComponent &, struct FallDistanceComponent &, struct PlayerInputRequestComponent &, struct SynchedActorDataComponent &, struct VanillaClientGameplayComponent &, class ViewT>, class EntityModifierT); -//private: - /** - * @symbol ?_checkForFlyTrigger\@FlyTriggerSystem\@\@CA_NAEBUAbilitiesComponent\@\@PEBUPassengerComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@\@\@\@Z - */ - MCAPI static bool _checkForFlyTrigger(struct AbilitiesComponent const &, struct PassengerComponent const *, class ViewT>); - -private: - }; diff --git a/LiteLoader/include/llapi/mc/FogCommand.hpp b/LiteLoader/include/llapi/mc/FogCommand.hpp index 59e4ef92be..bbc6b5d4a4 100644 --- a/LiteLoader/include/llapi/mc/FogCommand.hpp +++ b/LiteLoader/include/llapi/mc/FogCommand.hpp @@ -36,7 +36,7 @@ class FogCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@FogCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/FoliageColor.hpp b/LiteLoader/include/llapi/mc/FoliageColor.hpp index 256e38e5b8..abb98f33bb 100644 --- a/LiteLoader/include/llapi/mc/FoliageColor.hpp +++ b/LiteLoader/include/llapi/mc/FoliageColor.hpp @@ -43,14 +43,14 @@ enum class PaletteName; * @symbol ?getEvergreenColor\@FoliageColor\@\@SAHMM\@Z */ MCAPI static int getEvergreenColor(float, float); - /** - * @symbol ?getFoliageColor\@FoliageColor\@\@SAHW4PaletteName\@1\@MM\@Z - */ - MCAPI static int getFoliageColor(enum class FoliageColor::PaletteName, float, float); /** * @symbol ?getFoliageColor\@FoliageColor\@\@SAHMM\@Z */ MCAPI static int getFoliageColor(float, float); + /** + * @symbol ?getFoliageColor\@FoliageColor\@\@SAHW4PaletteName\@1\@MM\@Z + */ + MCAPI static int getFoliageColor(enum class FoliageColor::PaletteName, float, float); /** * @symbol ?getMapBirchColor\@FoliageColor\@\@SAHMM\@Z */ diff --git a/LiteLoader/include/llapi/mc/FramewiseActionOrStopSystem.hpp b/LiteLoader/include/llapi/mc/FramewiseActionOrStopSystem.hpp index f2ac66405d..3a1aee6e41 100644 --- a/LiteLoader/include/llapi/mc/FramewiseActionOrStopSystem.hpp +++ b/LiteLoader/include/llapi/mc/FramewiseActionOrStopSystem.hpp @@ -31,6 +31,10 @@ class FramewiseActionOrStopSystem { * @symbol ?createFramewiseActionOrStopSystem\@FramewiseActionOrStopSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createFramewiseActionOrStopSystem(); + /** + * @symbol ?tickFramewiseActionOrStopSystem\@FramewiseActionOrStopSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@UPlayerInputRequestComponent\@\@\@\@$$CBULocalMoveVelocityComponent\@\@UActionOrStopComponent\@\@\@\@\@Z + */ + MCAPI static void tickFramewiseActionOrStopSystem(class ViewT, class FlagComponent, struct PlayerInputRequestComponent>, struct LocalMoveVelocityComponent const, struct ActionOrStopComponent>); //private: /** diff --git a/LiteLoader/include/llapi/mc/FrogSpawnBlock.hpp b/LiteLoader/include/llapi/mc/FrogSpawnBlock.hpp index 2c8bdd075a..cb6b5da43e 100644 --- a/LiteLoader/include/llapi/mc/FrogSpawnBlock.hpp +++ b/LiteLoader/include/llapi/mc/FrogSpawnBlock.hpp @@ -209,25 +209,25 @@ class FrogSpawnBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@FrogSpawnBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual std::string buildDescriptionId(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 134 + * @symbol ?buildDescriptionId\@FrogSpawnBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -240,39 +240,44 @@ class FrogSpawnBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@FrogSpawnBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FROGSPAWNBLOCK /** * @symbol ?canBeSilkTouched\@FrogSpawnBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/FrogSpawnBlockItem.hpp b/LiteLoader/include/llapi/mc/FrogSpawnBlockItem.hpp index 0621feef70..3fe904a8ee 100644 --- a/LiteLoader/include/llapi/mc/FrogSpawnBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/FrogSpawnBlockItem.hpp @@ -111,9 +111,9 @@ class FrogSpawnBlockItem : public BlockItem { virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** * @vftbl 132 - * @symbol ?_useOn\@FrogSpawnBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@FrogSpawnBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0FrogSpawnBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/FrostWalkSystem.hpp b/LiteLoader/include/llapi/mc/FrostWalkSystem.hpp index 32f639f4d9..46075903a4 100644 --- a/LiteLoader/include/llapi/mc/FrostWalkSystem.hpp +++ b/LiteLoader/include/llapi/mc/FrostWalkSystem.hpp @@ -35,5 +35,9 @@ class FrostWalkSystem { * @symbol ?createSystem\@FrostWalkSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?tickSystem\@FrostWalkSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void tickSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>); }; diff --git a/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp b/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp index 04c132c8df..db4b6cd407 100644 --- a/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp +++ b/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp @@ -191,20 +191,20 @@ class FrostedIceBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -217,36 +217,41 @@ class FrostedIceBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@FrostedIceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@FrostedIceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@FrostedIceBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/FunctionCommand.hpp b/LiteLoader/include/llapi/mc/FunctionCommand.hpp index fad06f789f..9efb71a859 100644 --- a/LiteLoader/include/llapi/mc/FunctionCommand.hpp +++ b/LiteLoader/include/llapi/mc/FunctionCommand.hpp @@ -36,7 +36,7 @@ class FunctionCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@FunctionCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/FunctionEntry.hpp b/LiteLoader/include/llapi/mc/FunctionEntry.hpp index d5dc6e7296..a788a5c922 100644 --- a/LiteLoader/include/llapi/mc/FunctionEntry.hpp +++ b/LiteLoader/include/llapi/mc/FunctionEntry.hpp @@ -39,14 +39,6 @@ class FunctionEntry { * @symbol ?execute\@FunctionEntry\@\@UEAAXAEAVFunctionManager\@\@AEBVCommandOrigin\@\@W4FunctionQueueOrder\@\@\@Z */ virtual void execute(class FunctionManager &, class CommandOrigin const &, enum class FunctionQueueOrder); - /** - * @symbol ??0FunctionEntry\@\@QEAA\@$$QEAV?$vector\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@W4FunctionState\@\@\@Z - */ - MCAPI FunctionEntry(std::vector> &&, enum class FunctionState); - /** - * @symbol ??0FunctionEntry\@\@QEAA\@W4FunctionState\@\@\@Z - */ - MCAPI FunctionEntry(enum class FunctionState); /** * @symbol ?getErrorState\@FunctionEntry\@\@QEBA?AW4FunctionState\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/FunctionManager.hpp b/LiteLoader/include/llapi/mc/FunctionManager.hpp index 2828c0098c..74e5891b0a 100644 --- a/LiteLoader/include/llapi/mc/FunctionManager.hpp +++ b/LiteLoader/include/llapi/mc/FunctionManager.hpp @@ -39,10 +39,6 @@ class FunctionManager { * @symbol ?execute\@FunctionManager\@\@QEAAHAEAVFunctionEntry\@\@AEBVCommandOrigin\@\@W4FunctionQueueOrder\@\@\@Z */ MCAPI int execute(class FunctionEntry &, class CommandOrigin const &, enum class FunctionQueueOrder); - /** - * @symbol ?getCommandDispatcher\@FunctionManager\@\@QEAAAEAVICommandDispatcher\@\@XZ - */ - MCAPI class ICommandDispatcher & getCommandDispatcher(); /** * @symbol ?getFunction\@FunctionManager\@\@QEAAPEAVFunctionEntry\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -51,10 +47,6 @@ class FunctionManager { * @symbol ?load\@FunctionManager\@\@QEAAXAEAVResourcePackManager\@\@AEAVCommandRegistry\@\@\@Z */ MCAPI void load(class ResourcePackManager &, class CommandRegistry &); - /** - * @symbol ?queueCommands\@FunctionManager\@\@QEAAXAEBV?$vector\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVCommandOrigin\@\@W4FunctionQueueOrder\@\@\@Z - */ - MCAPI void queueCommands(std::vector> const &, class CommandOrigin const &, enum class FunctionQueueOrder); /** * @symbol ?tick\@FunctionManager\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/FurnaceBlock.hpp b/LiteLoader/include/llapi/mc/FurnaceBlock.hpp index 53dac89888..29232ec8d8 100644 --- a/LiteLoader/include/llapi/mc/FurnaceBlock.hpp +++ b/LiteLoader/include/llapi/mc/FurnaceBlock.hpp @@ -167,9 +167,9 @@ class FurnaceBlock : public ActorBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@FurnaceBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@FurnaceBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -191,35 +191,35 @@ class FurnaceBlock : public ActorBlock { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 149 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 150 * @symbol ?getMappedFace\@FurnaceBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@FurnaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@FurnaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -232,41 +232,46 @@ class FurnaceBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@FurnaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@FurnaceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@FurnaceBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@FurnaceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/GameDirectorEntityServerCommandOrigin.hpp b/LiteLoader/include/llapi/mc/GameDirectorEntityServerCommandOrigin.hpp index e2e783f9f9..8e1d4bb552 100644 --- a/LiteLoader/include/llapi/mc/GameDirectorEntityServerCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/GameDirectorEntityServerCommandOrigin.hpp @@ -65,9 +65,5 @@ class GameDirectorEntityServerCommandOrigin : public ActorServerCommandOrigin { * @symbol ??0GameDirectorEntityServerCommandOrigin\@\@QEAA\@AEAVActor\@\@\@Z */ MCAPI GameDirectorEntityServerCommandOrigin(class Actor &); - /** - * @symbol ?load\@GameDirectorEntityServerCommandOrigin\@\@SA?AV?$unique_ptr\@VGameDirectorEntityServerCommandOrigin\@\@U?$default_delete\@VGameDirectorEntityServerCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z - */ - MCAPI static std::unique_ptr load(class CompoundTag const &, class Level &); }; diff --git a/LiteLoader/include/llapi/mc/GameEvent.hpp b/LiteLoader/include/llapi/mc/GameEvent.hpp index 46b42ce513..8b6fc99cd2 100644 --- a/LiteLoader/include/llapi/mc/GameEvent.hpp +++ b/LiteLoader/include/llapi/mc/GameEvent.hpp @@ -29,14 +29,6 @@ class GameEvent { #endif public: - /** - * @symbol ?getRadius\@GameEvent\@\@QEBAMXZ - */ - MCAPI float getRadius() const; - /** - * @symbol ?getRadiusSqrd\@GameEvent\@\@QEBAMXZ - */ - MCAPI float getRadiusSqrd() const; /** * @symbol ?getType\@GameEvent\@\@QEBA?BW4GameEventType\@GameEventConfig\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/GameEventContext.hpp b/LiteLoader/include/llapi/mc/GameEventContext.hpp deleted file mode 100644 index 481815fb7a..0000000000 --- a/LiteLoader/include/llapi/mc/GameEventContext.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file GameEventContext.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure GameEventContext. - * - */ -struct GameEventContext { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GAMEEVENTCONTEXT -public: - struct GameEventContext& operator=(struct GameEventContext const &) = delete; - GameEventContext(struct GameEventContext const &) = delete; - GameEventContext() = delete; -#endif - -public: - /** - * @symbol ??0GameEventContext\@\@QEAA\@AEBVVec3\@\@PEAVActor\@\@PEBVBlock\@\@\@Z - */ - MCAPI GameEventContext(class Vec3 const &, class Actor *, class Block const *); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/GameEventListenerComponent.hpp b/LiteLoader/include/llapi/mc/GameEventListenerComponent.hpp index 059635be71..0552d2d4d5 100644 --- a/LiteLoader/include/llapi/mc/GameEventListenerComponent.hpp +++ b/LiteLoader/include/llapi/mc/GameEventListenerComponent.hpp @@ -26,14 +26,14 @@ class GameEventListenerComponent { #endif public: - /** - * @symbol ??0GameEventListenerComponent\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI GameEventListenerComponent(class GameEventListenerComponent &&); /** * @symbol ??0GameEventListenerComponent\@\@QEAA\@XZ */ MCAPI GameEventListenerComponent(); + /** + * @symbol ??0GameEventListenerComponent\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI GameEventListenerComponent(class GameEventListenerComponent &&); /** * @symbol ?initialize\@GameEventListenerComponent\@\@QEAA_NV?$unique_ptr\@VGameEventDynamicRegistration\@\@U?$default_delete\@VGameEventDynamicRegistration\@\@\@std\@\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/GameEventPair.hpp b/LiteLoader/include/llapi/mc/GameEventPair.hpp index 4339582cb0..aa5ddfbc07 100644 --- a/LiteLoader/include/llapi/mc/GameEventPair.hpp +++ b/LiteLoader/include/llapi/mc/GameEventPair.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class GameEventPair { +struct GameEventPair { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_GAMEEVENTPAIR public: - class GameEventPair& operator=(class GameEventPair const &) = delete; - GameEventPair(class GameEventPair const &) = delete; + struct GameEventPair& operator=(struct GameEventPair const &) = delete; + GameEventPair(struct GameEventPair const &) = delete; GameEventPair() = delete; #endif @@ -29,4 +29,4 @@ class GameEventPair { */ MCAPI ~GameEventPair(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/GameEventRegistry.hpp b/LiteLoader/include/llapi/mc/GameEventRegistry.hpp index c78d375706..7f24da1b6e 100644 --- a/LiteLoader/include/llapi/mc/GameEventRegistry.hpp +++ b/LiteLoader/include/llapi/mc/GameEventRegistry.hpp @@ -171,6 +171,66 @@ namespace GameEventRegistry { * @symbol ?projectileShoot\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const projectileShoot; + /** + * @symbol ?resonate1\@GameEventRegistry\@\@3VGameEvent\@\@B + */ + MCAPI extern class GameEvent const resonate1; + /** + * @symbol ?resonate10\@GameEventRegistry\@\@3VGameEvent\@\@B + */ + MCAPI extern class GameEvent const resonate10; + /** + * @symbol ?resonate11\@GameEventRegistry\@\@3VGameEvent\@\@B + */ + MCAPI extern class GameEvent const resonate11; + /** + * @symbol ?resonate12\@GameEventRegistry\@\@3VGameEvent\@\@B + */ + MCAPI extern class GameEvent const resonate12; + /** + * @symbol ?resonate13\@GameEventRegistry\@\@3VGameEvent\@\@B + */ + MCAPI extern class GameEvent const resonate13; + /** + * @symbol ?resonate14\@GameEventRegistry\@\@3VGameEvent\@\@B + */ + MCAPI extern class GameEvent const resonate14; + /** + * @symbol ?resonate15\@GameEventRegistry\@\@3VGameEvent\@\@B + */ + MCAPI extern class GameEvent const resonate15; + /** + * @symbol ?resonate2\@GameEventRegistry\@\@3VGameEvent\@\@B + */ + MCAPI extern class GameEvent const resonate2; + /** + * @symbol ?resonate3\@GameEventRegistry\@\@3VGameEvent\@\@B + */ + MCAPI extern class GameEvent const resonate3; + /** + * @symbol ?resonate4\@GameEventRegistry\@\@3VGameEvent\@\@B + */ + MCAPI extern class GameEvent const resonate4; + /** + * @symbol ?resonate5\@GameEventRegistry\@\@3VGameEvent\@\@B + */ + MCAPI extern class GameEvent const resonate5; + /** + * @symbol ?resonate6\@GameEventRegistry\@\@3VGameEvent\@\@B + */ + MCAPI extern class GameEvent const resonate6; + /** + * @symbol ?resonate7\@GameEventRegistry\@\@3VGameEvent\@\@B + */ + MCAPI extern class GameEvent const resonate7; + /** + * @symbol ?resonate8\@GameEventRegistry\@\@3VGameEvent\@\@B + */ + MCAPI extern class GameEvent const resonate8; + /** + * @symbol ?resonate9\@GameEventRegistry\@\@3VGameEvent\@\@B + */ + MCAPI extern class GameEvent const resonate9; /** * @symbol ?sculkSensorTendrilsClicking\@GameEventRegistry\@\@3VGameEvent\@\@B */ diff --git a/LiteLoader/include/llapi/mc/GameMode.hpp b/LiteLoader/include/llapi/mc/GameMode.hpp index 4dee9b453e..452084f2eb 100644 --- a/LiteLoader/include/llapi/mc/GameMode.hpp +++ b/LiteLoader/include/llapi/mc/GameMode.hpp @@ -92,9 +92,9 @@ class GameMode { virtual bool useItem(class ItemStack &); /** * @vftbl 12 - * @symbol ?useItemOn\@GameMode\@\@UEAA_NAEAVItemStack\@\@AEBVBlockPos\@\@EAEBVVec3\@\@PEBVBlock\@\@\@Z + * @symbol ?useItemOn\@GameMode\@\@UEAA?AVInteractionResult\@\@AEAVItemStack\@\@AEBVBlockPos\@\@EAEBVVec3\@\@PEBVBlock\@\@\@Z */ - virtual bool useItemOn(class ItemStack &, class BlockPos const &, unsigned char, class Vec3 const &, class Block const *); + virtual class InteractionResult useItemOn(class ItemStack &, class BlockPos const &, unsigned char, class Vec3 const &, class Block const *); /** * @vftbl 13 * @symbol ?interact\@GameMode\@\@UEAA_NAEAVActor\@\@AEBVVec3\@\@\@Z @@ -125,12 +125,6 @@ class GameMode { * @symbol ?registerUpsellScreenCallback\@GameMode\@\@UEAAXV?$function\@$$A6AX_N\@Z\@std\@\@\@Z */ virtual void registerUpsellScreenCallback(class std::function); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_GAMEMODE - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~GameMode(); -#endif /** * @symbol ??0GameMode\@\@QEAA\@AEAVPlayer\@\@V?$unique_ptr\@UIGameModeTimer\@\@U?$default_delete\@UIGameModeTimer\@\@\@std\@\@\@std\@\@V?$unique_ptr\@UIGameModeMessenger\@\@U?$default_delete\@UIGameModeMessenger\@\@\@std\@\@\@3\@\@Z */ @@ -159,10 +153,6 @@ class GameMode { * @symbol ?getDestroyBlockPos\@GameMode\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getDestroyBlockPos() const; - /** - * @symbol ?getDestroyProgress\@GameMode\@\@QEAAMXZ - */ - MCAPI float getDestroyProgress(); /** * @symbol ?getDestroyRate\@GameMode\@\@QEAAMAEBVBlock\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/GameModeCommand.hpp b/LiteLoader/include/llapi/mc/GameModeCommand.hpp index 58e2e88190..e07bf28018 100644 --- a/LiteLoader/include/llapi/mc/GameModeCommand.hpp +++ b/LiteLoader/include/llapi/mc/GameModeCommand.hpp @@ -36,7 +36,7 @@ class GameModeCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@GameModeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GameRule.hpp b/LiteLoader/include/llapi/mc/GameRule.hpp index 842fda1b77..b5fe4a75cc 100644 --- a/LiteLoader/include/llapi/mc/GameRule.hpp +++ b/LiteLoader/include/llapi/mc/GameRule.hpp @@ -127,14 +127,14 @@ enum class Type : char{ MCAPI ~GameRule(); //protected: - /** - * @symbol ?_setDefaultValue\@GameRule\@\@IEAAAEAV1\@H\@Z - */ - MCAPI class GameRule & _setDefaultValue(int); /** * @symbol ?_setDefaultValue\@GameRule\@\@IEAAAEAV1\@_N\@Z */ MCAPI class GameRule & _setDefaultValue(bool); + /** + * @symbol ?_setDefaultValue\@GameRule\@\@IEAAAEAV1\@H\@Z + */ + MCAPI class GameRule & _setDefaultValue(int); //private: /** diff --git a/LiteLoader/include/llapi/mc/GameRuleCommand.hpp b/LiteLoader/include/llapi/mc/GameRuleCommand.hpp index 50abb0de71..36a27cefae 100644 --- a/LiteLoader/include/llapi/mc/GameRuleCommand.hpp +++ b/LiteLoader/include/llapi/mc/GameRuleCommand.hpp @@ -43,7 +43,7 @@ struct InitProxy { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@GameRuleCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GameRules.hpp b/LiteLoader/include/llapi/mc/GameRules.hpp index ee56b10b4a..1021a96ab3 100644 --- a/LiteLoader/include/llapi/mc/GameRules.hpp +++ b/LiteLoader/include/llapi/mc/GameRules.hpp @@ -28,14 +28,14 @@ class GameRules { #endif public: - /** - * @symbol ??0GameRules\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI GameRules(class GameRules const &); /** * @symbol ??0GameRules\@\@QEAA\@XZ */ MCAPI GameRules(); + /** + * @symbol ??0GameRules\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI GameRules(class GameRules const &); /** * @symbol ?createAllGameRulesPacket\@GameRules\@\@QEBA?AV?$unique_ptr\@VGameRulesChangedPacket\@\@U?$default_delete\@VGameRulesChangedPacket\@\@\@std\@\@\@std\@\@XZ */ @@ -142,6 +142,10 @@ class GameRules { * @symbol ?_setRule\@GameRules\@\@AEAA?AV?$unique_ptr\@VGameRulesChangedPacket\@\@U?$default_delete\@VGameRulesChangedPacket\@\@\@std\@\@\@std\@\@UGameRuleId\@\@TValue\@GameRule\@\@W4Type\@6\@_NPEA_N4PEAVValidationError\@6\@\@Z */ MCAPI std::unique_ptr _setRule(struct GameRuleId, union GameRule::Value, enum class GameRule::Type, bool, bool *, bool *, class GameRule::ValidationError *); + /** + * @symbol ?_getMarketplaceGameRulesDefaultMap\@GameRules\@\@CAAEBV?$map\@UGameRuleId\@\@VGameRule\@\@U?$less\@UGameRuleId\@\@\@std\@\@V?$allocator\@U?$pair\@$$CBUGameRuleId\@\@VGameRule\@\@\@std\@\@\@4\@\@std\@\@XZ + */ + MCAPI static class std::map, class std::allocator>> const & _getMarketplaceGameRulesDefaultMap(); private: diff --git a/LiteLoader/include/llapi/mc/GameTestClearTask.hpp b/LiteLoader/include/llapi/mc/GameTestClearTask.hpp index 6fe30fae38..c436c31860 100644 --- a/LiteLoader/include/llapi/mc/GameTestClearTask.hpp +++ b/LiteLoader/include/llapi/mc/GameTestClearTask.hpp @@ -33,10 +33,6 @@ class GameTestClearTask { * @symbol ??0GameTestClearTask\@\@QEAA\@AEAVDimension\@\@AEBVBoundingBox\@\@\@Z */ MCAPI GameTestClearTask(class Dimension &, class BoundingBox const &); - /** - * @symbol ?isDone\@GameTestClearTask\@\@QEBA_NXZ - */ - MCAPI bool isDone() const; /** * @symbol ?tick\@GameTestClearTask\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/GameTestCommand.hpp b/LiteLoader/include/llapi/mc/GameTestCommand.hpp index 5fd199633a..50a4faffd8 100644 --- a/LiteLoader/include/llapi/mc/GameTestCommand.hpp +++ b/LiteLoader/include/llapi/mc/GameTestCommand.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "gametest.hpp" #include "Command.hpp" #define BEFORE_EXTRA @@ -36,7 +37,7 @@ class GameTestCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@GameTestCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; @@ -67,9 +68,9 @@ class GameTestCommand : public Command { */ MCAPI void _handleRunNearbyTests(class MinecraftGameTest &, class BlockSource &, class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?_handleRunSet\@GameTestCommand\@\@AEBAXAEAVMinecraftGameTest\@\@AEAVBlockSource\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_handleRunSet\@GameTestCommand\@\@AEBAXAEAVMinecraftGameTest\@\@AEAVBlockSource\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@_N\@Z */ - MCAPI void _handleRunSet(class MinecraftGameTest &, class BlockSource &, class CommandOrigin const &, class CommandOutput &) const; + MCAPI void _handleRunSet(class MinecraftGameTest &, class BlockSource &, class CommandOrigin const &, class CommandOutput &, bool) const; /** * @symbol ?_handleRunThis\@GameTestCommand\@\@AEBAXAEAVMinecraftGameTest\@\@AEAVBlockSource\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/GameTestInstanceLedger.hpp b/LiteLoader/include/llapi/mc/GameTestInstanceLedger.hpp index 49d1287bb7..f251eaa7cf 100644 --- a/LiteLoader/include/llapi/mc/GameTestInstanceLedger.hpp +++ b/LiteLoader/include/llapi/mc/GameTestInstanceLedger.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "gametest.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/include/llapi/mc/GameTestLevelListener.hpp b/LiteLoader/include/llapi/mc/GameTestLevelListener.hpp index 4532ecf762..76f9db6861 100644 --- a/LiteLoader/include/llapi/mc/GameTestLevelListener.hpp +++ b/LiteLoader/include/llapi/mc/GameTestLevelListener.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "gametest.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -29,66 +30,16 @@ class GameTestLevelListener { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_GAMETESTLEVELLISTENER /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol __unk_vfn_1 - */ - virtual void __unk_vfn_1(); - /** - * @vftbl 2 - * @symbol __unk_vfn_2 - */ - virtual void __unk_vfn_2(); - /** - * @vftbl 3 - * @symbol __unk_vfn_3 - */ - virtual void __unk_vfn_3(); - /** - * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 - * @symbol __unk_vfn_5 - */ - virtual void __unk_vfn_5(); - /** - * @vftbl 6 - * @symbol __unk_vfn_6 - */ - virtual void __unk_vfn_6(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); - /** - * @vftbl 8 - * @symbol ?onLevelTickEnd\@GameTestLevelListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z - */ - virtual enum class EventResult onLevelTickEnd(class Level &); - /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @symbol ?onEvent\@GameTestLevelListener\@\@UEAA?AW4EventResult\@\@AEBULevelNotificationEvent\@\@\@Z */ - virtual void __unk_vfn_9(); + MCVAPI enum class EventResult onEvent(struct LevelNotificationEvent const &); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @symbol ?onLevelTickEnd\@GameTestLevelListener\@\@UEAAXXZ */ - virtual void __unk_vfn_10(); - /** - * @vftbl 11 - * @symbol ?onEvent\@GameTestLevelListener\@\@UEAA?AW4EventResult\@\@AEBULevelNotificationEvent\@\@\@Z - */ - virtual enum class EventResult onEvent(struct LevelNotificationEvent const &); + MCVAPI void onLevelTickEnd(); +#endif /** * @symbol ??0GameTestLevelListener\@\@QEAA\@AEAVGameTestTicker\@gametest\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/GameTestNetworkAdapter.hpp b/LiteLoader/include/llapi/mc/GameTestNetworkAdapter.hpp index 77dc997835..b51385fdef 100644 --- a/LiteLoader/include/llapi/mc/GameTestNetworkAdapter.hpp +++ b/LiteLoader/include/llapi/mc/GameTestNetworkAdapter.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "gametest.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp b/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp index 1c4e3590c8..b398c13e4c 100644 --- a/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "gametest.hpp" #include "Packet.hpp" #define BEFORE_EXTRA diff --git a/LiteLoader/include/llapi/mc/GameTestRunner.hpp b/LiteLoader/include/llapi/mc/GameTestRunner.hpp index 33ad53b1db..108c7201db 100644 --- a/LiteLoader/include/llapi/mc/GameTestRunner.hpp +++ b/LiteLoader/include/llapi/mc/GameTestRunner.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "gametest.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -29,10 +30,6 @@ class GameTestRunner { #endif public: - /** - * @symbol ?clearAllTests\@GameTestRunner\@\@SAXAEAVBlockSource\@\@AEAVGameTestTicker\@gametest\@\@AEBV?$vector\@VBoundingBox\@\@V?$allocator\@VBoundingBox\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI static void clearAllTests(class BlockSource &, class gametest::GameTestTicker &, std::vector const &); /** * @symbol ?clearMarkers\@GameTestRunner\@\@SAXAEAVLevel\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/GameVersion.hpp b/LiteLoader/include/llapi/mc/GameVersion.hpp index 3da509437c..5e9a206d73 100644 --- a/LiteLoader/include/llapi/mc/GameVersion.hpp +++ b/LiteLoader/include/llapi/mc/GameVersion.hpp @@ -28,21 +28,21 @@ class GameVersion { public: /** - * @symbol ??0GameVersion\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0GameVersion\@\@QEAA\@XZ */ - MCAPI GameVersion(class GameVersion const &); + MCAPI GameVersion(); /** * @symbol ??0GameVersion\@\@QEAA\@IIIII\@Z */ MCAPI GameVersion(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int); - /** - * @symbol ??0GameVersion\@\@QEAA\@XZ - */ - MCAPI GameVersion(); /** * @symbol ??0GameVersion\@\@QEAA\@AEBVListTag\@\@\@Z */ MCAPI GameVersion(class ListTag const &); + /** + * @symbol ??0GameVersion\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI GameVersion(class GameVersion const &); /** * @symbol ?asString\@GameVersion\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/GameplayUserManager.hpp b/LiteLoader/include/llapi/mc/GameplayUserManager.hpp index b3f327d867..aef31bafb9 100644 --- a/LiteLoader/include/llapi/mc/GameplayUserManager.hpp +++ b/LiteLoader/include/llapi/mc/GameplayUserManager.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA @@ -23,26 +24,28 @@ class GameplayUserManager { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_GAMEPLAYUSERMANAGER /** - * @symbol ??0GameplayUserManager\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI GameplayUserManager(); + MCVAPI ~GameplayUserManager(); +#endif /** - * @symbol ?forEachActiveGameplayUser\@GameplayUserManager\@\@QEAAXV?$function\@$$A6A_NAEAVEntityContext\@\@\@Z\@std\@\@\@Z + * @symbol ??0GameplayUserManager\@\@QEAA\@XZ */ - MCAPI void forEachActiveGameplayUser(class std::function); + MCAPI GameplayUserManager(); /** - * @symbol ?forEachActiveGameplayUser\@GameplayUserManager\@\@QEBAXV?$function\@$$A6A_NAEBVEntityContext\@\@\@Z\@std\@\@\@Z + * @symbol ?addGameplayUser\@GameplayUserManager\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ - MCAPI void forEachActiveGameplayUser(class std::function) const; + MCAPI void addGameplayUser(class OwnerPtrT); /** - * @symbol ?forEachActivePlayer\@GameplayUserManager\@\@QEAAXV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachActiveGameplayUser\@GameplayUserManager\@\@QEBAXV?$function\@$$A6A_NAEAVEntityContext\@\@\@Z\@std\@\@\@Z */ - MCAPI void forEachActivePlayer(class std::function); + MCAPI void forEachActiveGameplayUser(class std::function) const; /** - * @symbol ?forEachActivePlayer\@GameplayUserManager\@\@QEBAXV?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachActivePlayer\@GameplayUserManager\@\@QEBAXV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@std\@\@\@Z */ - MCAPI void forEachActivePlayer(class std::function) const; + MCAPI void forEachActivePlayer(class std::function) const; /** * @symbol ?getActiveGameplayUserCount\@GameplayUserManager\@\@QEBA_KXZ */ @@ -72,12 +75,48 @@ class GameplayUserManager { */ MCAPI std::vector & getSuspendedGameplayUsers(); /** - * @symbol ?getSuspendedGameplayUsers\@GameplayUserManager\@\@QEBAAEBV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@XZ + * @symbol ?initializeWithGameplayUserManagerProxy\@GameplayUserManager\@\@QEAAXV?$unique_ptr\@VGameplayUserManagerProxy\@\@U?$default_delete\@VGameplayUserManagerProxy\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI void initializeWithGameplayUserManagerProxy(std::unique_ptr); + /** + * @symbol ?isGameplayUserSuspended\@GameplayUserManager\@\@QEBA_NVWeakEntityRef\@\@\@Z + */ + MCAPI bool isGameplayUserSuspended(class WeakEntityRef) const; + /** + * @symbol ?queueResumePlayer\@GameplayUserManager\@\@QEAAXAEBVEntityContext\@\@\@Z */ - MCAPI std::vector const & getSuspendedGameplayUsers() const; + MCAPI void queueResumePlayer(class EntityContext const &); /** - * @symbol ??1GameplayUserManager\@\@QEAA\@XZ + * @symbol ?queueSuspendPlayer\@GameplayUserManager\@\@QEAAXAEBVEntityContext\@\@\@Z */ - MCAPI ~GameplayUserManager(); + MCAPI void queueSuspendPlayer(class EntityContext const &); + /** + * @symbol ?registerGameplayUserAddedCallback\@GameplayUserManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVEntityContext\@\@\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerGameplayUserAddedCallback(class std::function); + /** + * @symbol ?registerGameplayUserResumedCallback\@GameplayUserManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEBVEntityContext\@\@\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerGameplayUserResumedCallback(class std::function); + /** + * @symbol ?registerGameplayUserSuspendedCallback\@GameplayUserManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEBVEntityContext\@\@\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerGameplayUserSuspendedCallback(class std::function); + /** + * @symbol ?tickSuspensions\@GameplayUserManager\@\@QEAAXXZ + */ + MCAPI void tickSuspensions(); + +//private: + /** + * @symbol ?_getGameplayUserManagerProxy\@GameplayUserManager\@\@AEAAAEAVGameplayUserManagerProxy\@\@XZ + */ + MCAPI class GameplayUserManagerProxy & _getGameplayUserManagerProxy(); + /** + * @symbol ?_getNewPlayerId\@GameplayUserManager\@\@AEBAHXZ + */ + MCAPI int _getNewPlayerId() const; + +private: }; diff --git a/LiteLoader/include/llapi/mc/GameplayUserManagerProxy.hpp b/LiteLoader/include/llapi/mc/GameplayUserManagerProxy.hpp new file mode 100644 index 0000000000..714d162a05 --- /dev/null +++ b/LiteLoader/include/llapi/mc/GameplayUserManagerProxy.hpp @@ -0,0 +1,54 @@ +/** + * @file GameplayUserManagerProxy.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class GameplayUserManagerProxy { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GAMEPLAYUSERMANAGERPROXY +public: + class GameplayUserManagerProxy& operator=(class GameplayUserManagerProxy const &) = delete; + GameplayUserManagerProxy(class GameplayUserManagerProxy const &) = delete; + GameplayUserManagerProxy() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?validatePlayerName\@GameplayUserManagerProxy\@\@UEBA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVGameplayUserManager\@\@\@Z + */ + virtual class std::optional validatePlayerName(std::string const &, class GameplayUserManager const &) const; + /** + * @vftbl 2 + * @symbol ?shouldGeneratePlayerIndex\@GameplayUserManagerProxy\@\@UEBA_NXZ + */ + virtual bool shouldGeneratePlayerIndex() const; + /** + * @vftbl 3 + * @symbol ?reloadActor\@GameplayUserManagerProxy\@\@UEBAXAEAVActor\@\@\@Z + */ + virtual void reloadActor(class Actor &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_GAMEPLAYUSERMANAGERPROXY + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~GameplayUserManagerProxy(); +#endif + +}; diff --git a/LiteLoader/include/llapi/mc/GameplayUserSuspension.hpp b/LiteLoader/include/llapi/mc/GameplayUserSuspension.hpp new file mode 100644 index 0000000000..978497b0ff --- /dev/null +++ b/LiteLoader/include/llapi/mc/GameplayUserSuspension.hpp @@ -0,0 +1,32 @@ +/** + * @file GameplayUserSuspension.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class GameplayUserSuspension { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GAMEPLAYUSERSUSPENSION +public: + class GameplayUserSuspension& operator=(class GameplayUserSuspension const &) = delete; + GameplayUserSuspension(class GameplayUserSuspension const &) = delete; + GameplayUserSuspension() = delete; +#endif + +public: + /** + * @symbol ??0GameplayUserSuspension\@\@QEAA\@VWeakEntityRef\@\@W4State\@0\@\@Z + */ + MCAPI GameplayUserSuspension(class WeakEntityRef, enum class GameplayUserSuspension::State); + +}; diff --git a/LiteLoader/include/llapi/mc/GeneticsComponent.hpp b/LiteLoader/include/llapi/mc/GeneticsComponent.hpp index a97289215b..231fe298fb 100644 --- a/LiteLoader/include/llapi/mc/GeneticsComponent.hpp +++ b/LiteLoader/include/llapi/mc/GeneticsComponent.hpp @@ -31,13 +31,10 @@ struct Gene { public: class GeneticsComponent& operator=(class GeneticsComponent const &) = delete; GeneticsComponent(class GeneticsComponent const &) = delete; + GeneticsComponent() = delete; #endif public: - /** - * @symbol ??0GeneticsComponent\@\@QEAA\@XZ - */ - MCAPI GeneticsComponent(); /** * @symbol ?addAdditionalSaveData\@GeneticsComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/GetAttachPosRequestComponent.hpp b/LiteLoader/include/llapi/mc/GetAttachPosRequestComponent.hpp index 69bdd9c47b..384f39c440 100644 --- a/LiteLoader/include/llapi/mc/GetAttachPosRequestComponent.hpp +++ b/LiteLoader/include/llapi/mc/GetAttachPosRequestComponent.hpp @@ -28,9 +28,5 @@ struct GetAttachPosRequestComponent { * @symbol ??4GetAttachPosRequestComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct GetAttachPosRequestComponent & operator=(struct GetAttachPosRequestComponent &&); - /** - * @symbol ??1GetAttachPosRequestComponent\@\@QEAA\@XZ - */ - MCAPI ~GetAttachPosRequestComponent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/GetChunkDataCommand.hpp b/LiteLoader/include/llapi/mc/GetChunkDataCommand.hpp index b919d3ea5f..9f7d63e5db 100644 --- a/LiteLoader/include/llapi/mc/GetChunkDataCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetChunkDataCommand.hpp @@ -36,7 +36,7 @@ class GetChunkDataCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@GetChunkDataCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GetChunksCommand.hpp b/LiteLoader/include/llapi/mc/GetChunksCommand.hpp index feb8ca7c0d..451e4ace54 100644 --- a/LiteLoader/include/llapi/mc/GetChunksCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetChunksCommand.hpp @@ -36,13 +36,9 @@ class GetChunksCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@GetChunksCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; - /** - * @symbol ?setup\@GetChunksCommand\@\@SAXAEAVCommandRegistry\@\@\@Z - */ - MCAPI static void setup(class CommandRegistry &); }; diff --git a/LiteLoader/include/llapi/mc/GetEduServerInfoCommand.hpp b/LiteLoader/include/llapi/mc/GetEduServerInfoCommand.hpp index 94e8bb7d9e..e8d181c83e 100644 --- a/LiteLoader/include/llapi/mc/GetEduServerInfoCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetEduServerInfoCommand.hpp @@ -36,7 +36,7 @@ class GetEduServerInfoCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@GetEduServerInfoCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GetInterpolatedRidingPositionSystem.hpp b/LiteLoader/include/llapi/mc/GetInterpolatedRidingPositionSystem.hpp index 18dbd45a4a..d5c23bfb2b 100644 --- a/LiteLoader/include/llapi/mc/GetInterpolatedRidingPositionSystem.hpp +++ b/LiteLoader/include/llapi/mc/GetInterpolatedRidingPositionSystem.hpp @@ -35,5 +35,9 @@ class GetInterpolatedRidingPositionSystem { * @symbol ?getInterpolatedRidingPosition\@GetInterpolatedRidingPositionSystem\@\@SA?AVVec3\@\@AEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UParrotFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCamelFlag\@\@\@\@\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUStandAnimationComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUMobBodyRotationComponent\@\@\@\@M\@Z */ MCAPI static class Vec3 getInterpolatedRidingPosition(class StrictEntityContext const &, class ViewT, class ViewT, class ViewT>>, class ViewT>, class ViewT>, struct SynchedActorDataComponent const>, class ViewT>, struct StandAnimationComponent const>, class ViewT>, struct MobBodyRotationComponent const>, float); + /** + * @symbol ?processView\@GetInterpolatedRidingPositionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UGetAttachPosRequestComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UParrotFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCamelFlag\@\@\@\@\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUStandAnimationComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUMobBodyRotationComponent\@\@\@\@\@Z + */ + MCAPI static void processView(class ViewT, class ViewT, class ViewT, class ViewT>>, class ViewT>, class ViewT>, struct SynchedActorDataComponent const>, class ViewT>, struct StandAnimationComponent const>, class ViewT>, struct MobBodyRotationComponent const>); }; diff --git a/LiteLoader/include/llapi/mc/GetSpawnPointCommand.hpp b/LiteLoader/include/llapi/mc/GetSpawnPointCommand.hpp index 9ca2108cd5..a66480c782 100644 --- a/LiteLoader/include/llapi/mc/GetSpawnPointCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetSpawnPointCommand.hpp @@ -36,7 +36,7 @@ class GetSpawnPointCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@GetSpawnPointCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GetTopSolidBlockCommand.hpp b/LiteLoader/include/llapi/mc/GetTopSolidBlockCommand.hpp index cba3333816..c2ed0b52cf 100644 --- a/LiteLoader/include/llapi/mc/GetTopSolidBlockCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetTopSolidBlockCommand.hpp @@ -36,7 +36,7 @@ class GetTopSolidBlockCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@GetTopSolidBlockCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GildedBlackstone.hpp b/LiteLoader/include/llapi/mc/GildedBlackstone.hpp index 03a772721e..4ce43e6ef5 100644 --- a/LiteLoader/include/llapi/mc/GildedBlackstone.hpp +++ b/LiteLoader/include/llapi/mc/GildedBlackstone.hpp @@ -176,20 +176,20 @@ class GildedBlackstone : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,32 +201,37 @@ class GildedBlackstone : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@GildedBlackstone\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@GildedBlackstone\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/GiveCommand.hpp b/LiteLoader/include/llapi/mc/GiveCommand.hpp index 873156df5c..361278b65c 100644 --- a/LiteLoader/include/llapi/mc/GiveCommand.hpp +++ b/LiteLoader/include/llapi/mc/GiveCommand.hpp @@ -36,7 +36,7 @@ class GiveCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@GiveCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GiveableComponent.hpp b/LiteLoader/include/llapi/mc/GiveableComponent.hpp index 70abc65e0b..96342f47bb 100644 --- a/LiteLoader/include/llapi/mc/GiveableComponent.hpp +++ b/LiteLoader/include/llapi/mc/GiveableComponent.hpp @@ -33,9 +33,5 @@ class GiveableComponent { * @symbol ?getInteraction\@GiveableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); - /** - * @symbol ??1GiveableComponent\@\@QEAA\@XZ - */ - MCAPI ~GiveableComponent(); }; diff --git a/LiteLoader/include/llapi/mc/GlassBlock.hpp b/LiteLoader/include/llapi/mc/GlassBlock.hpp index 5c77600e3f..4632bc040f 100644 --- a/LiteLoader/include/llapi/mc/GlassBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlassBlock.hpp @@ -191,20 +191,20 @@ class GlassBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,27 +216,32 @@ class GlassBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 189 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 190 * @symbol ?getResourceCount\@GlassBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp b/LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp index 3984ca46f1..76aa4e4d04 100644 --- a/LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp @@ -5,7 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "FaceDirectionalBlock.hpp" +#include "BlockLegacy.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +16,7 @@ * @brief MC class GlazedTerracottaBlock. * */ -class GlazedTerracottaBlock : public FaceDirectionalBlock { +class GlazedTerracottaBlock : public BlockLegacy { #define AFTER_EXTRA // Add Member There @@ -167,9 +167,9 @@ class GlazedTerracottaBlock : public FaceDirectionalBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@GlazedTerracottaBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@GlazedTerracottaBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,20 +186,20 @@ class GlazedTerracottaBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,25 +211,30 @@ class GlazedTerracottaBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); /** * @symbol ??0GlazedTerracottaBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/GlideTriggerSystem.hpp b/LiteLoader/include/llapi/mc/GlideTriggerSystem.hpp index d15b047b9f..b5a60dd3eb 100644 --- a/LiteLoader/include/llapi/mc/GlideTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/GlideTriggerSystem.hpp @@ -31,10 +31,6 @@ class GlideTriggerSystem { * @symbol ?_tickGlideTriggerSystem\@GlideTriggerSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUAbilitiesComponent\@\@AEBUFallFlyTicksComponent\@\@AEBUMoveInputComponent\@\@AEBUStateVectorComponent\@\@AEBUSynchedActorDataComponent\@\@AEBUVanillaClientGameplayComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UArmorFlyEnabledFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UStopGlidingRequestFlag\@\@\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI static void _tickGlideTriggerSystem(class StrictEntityContext const &, struct AABBShapeComponent const &, struct AbilitiesComponent const &, struct FallFlyTicksComponent const &, struct MoveInputComponent const &, struct StateVectorComponent const &, struct SynchedActorDataComponent const &, struct VanillaClientGameplayComponent const &, class Optional const>, class Optional const>, class Optional const>, class Optional const>, class EntityModifierT> &, class IConstBlockSource const &); - /** - * @symbol ?createSideBySideSystem\@GlideTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSideBySideSystem(); /** * @symbol ?createSystem\@GlideTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/GlidingMoveFinalizeSystem.hpp b/LiteLoader/include/llapi/mc/GlidingMoveFinalizeSystem.hpp index 2b5b7ea4af..ccc31ffd2d 100644 --- a/LiteLoader/include/llapi/mc/GlidingMoveFinalizeSystem.hpp +++ b/LiteLoader/include/llapi/mc/GlidingMoveFinalizeSystem.hpp @@ -44,5 +44,9 @@ class GlidingMoveFinalizeSystem { * @symbol ?createCollisionDamageHurtSystem\@GlidingMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createCollisionDamageHurtSystem(); + /** + * @symbol ?tickCollisionDamageHurt\@GlidingMoveFinalizeSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@VActorOwnerComponent\@\@$$CBUGlidingCollisionDamageComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UGlidingCollisionDamageComponent\@\@\@\@\@Z + */ + MCAPI static void tickCollisionDamageHurt(class ViewT>, class ActorOwnerComponent, struct GlidingCollisionDamageComponent const>, class EntityModifierT); }; diff --git a/LiteLoader/include/llapi/mc/GlobalPauseCommand.hpp b/LiteLoader/include/llapi/mc/GlobalPauseCommand.hpp index ad90313f12..cb27ec8d68 100644 --- a/LiteLoader/include/llapi/mc/GlobalPauseCommand.hpp +++ b/LiteLoader/include/llapi/mc/GlobalPauseCommand.hpp @@ -36,7 +36,7 @@ class GlobalPauseCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@GlobalPauseCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GlowItemFrameBlock.hpp b/LiteLoader/include/llapi/mc/GlowItemFrameBlock.hpp index 73db357061..3635c7f9f2 100644 --- a/LiteLoader/include/llapi/mc/GlowItemFrameBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlowItemFrameBlock.hpp @@ -176,20 +176,20 @@ class GlowItemFrameBlock : public ItemFrameBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,27 +201,32 @@ class GlowItemFrameBlock : public ItemFrameBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 195 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 196 * @symbol ?getSpawnedItemName\@GlowItemFrameBlock\@\@UEBA?AVHashedString\@\@XZ */ virtual class HashedString getSpawnedItemName() const; diff --git a/LiteLoader/include/llapi/mc/GlowLichenBlock.hpp b/LiteLoader/include/llapi/mc/GlowLichenBlock.hpp index 545edc0174..1ca830788d 100644 --- a/LiteLoader/include/llapi/mc/GlowLichenBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlowLichenBlock.hpp @@ -186,25 +186,25 @@ class GlowLichenBlock : public MultifaceBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 152 - * @symbol ?init\@GlowLichenBlock\@\@UEAAAEAVBlockLegacy\@\@XZ + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class BlockLegacy & init(); + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 153 + * @symbol ?init\@GlowLichenBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ - virtual void __unk_vfn_156(); + virtual class BlockLegacy & init(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,42 +216,47 @@ class GlowLichenBlock : public MultifaceBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 188 * @symbol ?playerDestroy\@GlowLichenBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@GlowLichenBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getMultifaceBlock\@GlowLichenBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getMultifaceBlock() const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getMultifaceSpreader\@GlowLichenBlock\@\@UEBAAEBVMultifaceSpreader\@\@XZ */ virtual class MultifaceSpreader const & getMultifaceSpreader() const; diff --git a/LiteLoader/include/llapi/mc/GoHomeGoal.hpp b/LiteLoader/include/llapi/mc/GoHomeGoal.hpp index adc7aa3baa..c832001399 100644 --- a/LiteLoader/include/llapi/mc/GoHomeGoal.hpp +++ b/LiteLoader/include/llapi/mc/GoHomeGoal.hpp @@ -83,10 +83,6 @@ class GoHomeGoal { * @symbol ?_getHomePos\@GoHomeGoal\@\@AEBA?AVBlockPos\@\@XZ */ MCAPI class BlockPos _getHomePos() const; - /** - * @symbol ?_hasRequiredComponents\@GoHomeGoal\@\@AEBA_NXZ - */ - MCAPI bool _hasRequiredComponents() const; /** * @symbol ?_triggerOnFailedEvents\@GoHomeGoal\@\@AEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/GrassBlock.hpp b/LiteLoader/include/llapi/mc/GrassBlock.hpp index 2f4dad8d6c..25f87bd4cf 100644 --- a/LiteLoader/include/llapi/mc/GrassBlock.hpp +++ b/LiteLoader/include/llapi/mc/GrassBlock.hpp @@ -201,30 +201,30 @@ class GrassBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 135 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 136 * @symbol ?getColor\@GrassBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColor\@GrassBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -236,42 +236,47 @@ class GrassBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 172 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?randomTick\@GrassBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@GrassBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@GrassBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@GrassBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/GrassPathBlock.hpp b/LiteLoader/include/llapi/mc/GrassPathBlock.hpp index be500ce162..c1cff29db6 100644 --- a/LiteLoader/include/llapi/mc/GrassPathBlock.hpp +++ b/LiteLoader/include/llapi/mc/GrassPathBlock.hpp @@ -201,20 +201,20 @@ class GrassPathBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,42 +226,47 @@ class GrassPathBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@GrassPathBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@GrassPathBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@GrassPathBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@GrassPathBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/GravelBlock.hpp b/LiteLoader/include/llapi/mc/GravelBlock.hpp index c6c888722f..82156c68af 100644 --- a/LiteLoader/include/llapi/mc/GravelBlock.hpp +++ b/LiteLoader/include/llapi/mc/GravelBlock.hpp @@ -196,20 +196,20 @@ class GravelBlock : public HeavyBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -221,45 +221,50 @@ class GravelBlock : public HeavyBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@GravelBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getDustColor\@GravelBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getDustParticleName\@GravelBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string getDustParticleName(class Block const &) const; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 197 + * @symbol __unk_vfn_197 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_197(); /** * @symbol ??0GravelBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/GrindstoneBlock.hpp b/LiteLoader/include/llapi/mc/GrindstoneBlock.hpp index 3e6c9086c4..4c666c3e41 100644 --- a/LiteLoader/include/llapi/mc/GrindstoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/GrindstoneBlock.hpp @@ -177,9 +177,9 @@ class GrindstoneBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@GrindstoneBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@GrindstoneBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,25 +196,25 @@ class GrindstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@GrindstoneBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 144 + * @symbol ?getVisualShape\@GrindstoneBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,42 +226,47 @@ class GrindstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@GrindstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@GrindstoneBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@GrindstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@GrindstoneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/GuardianPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/GuardianPreAIStepSystem.hpp index a3037088ee..8753699b17 100644 --- a/LiteLoader/include/llapi/mc/GuardianPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/GuardianPreAIStepSystem.hpp @@ -37,6 +37,10 @@ class GuardianPreAIStepSystem { * @symbol ?_doGuardianPreAIStepSystem\@GuardianPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doGuardianPreAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); + /** + * @symbol ?_tickGuardianPreAIStepSystem\@GuardianPreAIStepSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UGuardianFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void _tickGuardianPreAIStepSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>); private: diff --git a/LiteLoader/include/llapi/mc/HC_CALL.hpp b/LiteLoader/include/llapi/mc/HC_CALL.hpp index 46cffe4f45..5511a3d6a4 100644 --- a/LiteLoader/include/llapi/mc/HC_CALL.hpp +++ b/LiteLoader/include/llapi/mc/HC_CALL.hpp @@ -23,6 +23,7 @@ struct HC_CALL { public: struct HC_CALL& operator=(struct HC_CALL const &) = delete; HC_CALL(struct HC_CALL const &) = delete; + HC_CALL() = delete; #endif public: @@ -33,8 +34,56 @@ struct HC_CALL { MCVAPI ~HC_CALL(); #endif /** - * @symbol ??0HC_CALL\@\@QEAA\@XZ + * @symbol ?PerformAsync\@HC_CALL\@\@QEAAJPEAUXAsyncBlock\@\@\@Z */ - MCAPI HC_CALL(); + MCAPI long PerformAsync(struct XAsyncBlock *); + /** + * @symbol ?Initialize\@HC_CALL\@\@SA?AV?$Result\@V?$unique_ptr\@UHC_CALL\@\@U?$http_alloc_deleter\@UHC_CALL\@\@\@\@\@std\@\@\@\@XZ + */ + MCAPI static class Result>> Initialize(); + /** + * @symbol ?ReadRequestBody\@HC_CALL\@\@SAJPEAU1\@_K1PEAXPEAEPEA_K\@Z + */ + MCAPI static long ReadRequestBody(struct HC_CALL *, unsigned __int64, unsigned __int64, void *, unsigned char *, unsigned __int64 *); + /** + * @symbol ?ResponseBodyWrite\@HC_CALL\@\@SAJPEAU1\@PEBE_KPEAX\@Z + */ + MCAPI static long ResponseBodyWrite(struct HC_CALL *, unsigned char const *, unsigned __int64, void *); + +//protected: + /** + * @symbol ??0HC_CALL\@\@IEAA\@_K\@Z + */ + MCAPI HC_CALL(unsigned __int64); + +//private: + /** + * @symbol ?GetRetryAfterHeaderTime\@HC_CALL\@\@AEAA?AV?$Result\@V?$duration\@_JU?$ratio\@$00$00\@std\@\@\@chrono\@std\@\@\@\@XZ + */ + MCAPI class Result>> GetRetryAfterHeaderTime(); + /** + * @symbol ?ShouldFailFast\@HC_CALL\@\@AEAA?AV?$Result\@_N\@\@AEAI\@Z + */ + MCAPI class Result ShouldFailFast(unsigned int &); + /** + * @symbol ?ShouldRetry\@HC_CALL\@\@AEAA_NAEAI\@Z + */ + MCAPI bool ShouldRetry(unsigned int &); + /** + * @symbol ?PerfomAsyncProvider\@HC_CALL\@\@CAJW4XAsyncOp\@\@PEBUXAsyncProviderData\@\@\@Z + */ + MCAPI static long PerfomAsyncProvider(enum class XAsyncOp, struct XAsyncProviderData const *); + /** + * @symbol ?PerformSingleRequest\@HC_CALL\@\@CAXPEAX_N\@Z + */ + MCAPI static void PerformSingleRequest(void *, bool); + /** + * @symbol ?PerformSingleRequestAsyncProvider\@HC_CALL\@\@CAJW4XAsyncOp\@\@PEBUXAsyncProviderData\@\@\@Z + */ + MCAPI static long PerformSingleRequestAsyncProvider(enum class XAsyncOp, struct XAsyncProviderData const *); + /** + * @symbol ?PerformSingleRequestComplete\@HC_CALL\@\@CAXPEAUXAsyncBlock\@\@\@Z + */ + MCAPI static void PerformSingleRequestComplete(struct XAsyncBlock *); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/HC_PERFORM_ENV.hpp b/LiteLoader/include/llapi/mc/HC_PERFORM_ENV.hpp index 13d9790d06..c8de6172df 100644 --- a/LiteLoader/include/llapi/mc/HC_PERFORM_ENV.hpp +++ b/LiteLoader/include/llapi/mc/HC_PERFORM_ENV.hpp @@ -27,5 +27,57 @@ struct HC_PERFORM_ENV { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_HC_PERFORM_ENV + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~HC_PERFORM_ENV(); +#endif + /** + * @symbol ?HttpCallPerformAsyncShim\@HC_PERFORM_ENV\@\@QEAAJPEAUHC_CALL\@\@PEAUXAsyncBlock\@\@\@Z + */ + MCAPI long HttpCallPerformAsyncShim(struct HC_CALL *, struct XAsyncBlock *); + /** + * @symbol ?WebSocketConnectAsyncShim\@HC_PERFORM_ENV\@\@QEAAJ$$QEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$http_stl_allocator\@D\@\@\@std\@\@0PEAUHC_WEBSOCKET_OBSERVER\@\@PEAUXAsyncBlock\@\@\@Z + */ + MCAPI long WebSocketConnectAsyncShim(class std::basic_string, class http_stl_allocator> &&, class std::basic_string, class http_stl_allocator> &&, struct HC_WEBSOCKET_OBSERVER *, struct XAsyncBlock *); + /** + * @symbol ?GetPlatformDefaultHttpHandlers\@HC_PERFORM_ENV\@\@SA?AUHttpPerformInfo\@\@XZ + */ + MCAPI static struct HttpPerformInfo GetPlatformDefaultHttpHandlers(); + /** + * @symbol ?GetPlatformDefaultWebSocketHandlers\@HC_PERFORM_ENV\@\@SA?AUWebSocketPerformInfo\@\@XZ + */ + MCAPI static struct WebSocketPerformInfo GetPlatformDefaultWebSocketHandlers(); + /** + * @symbol ?Initialize\@HC_PERFORM_ENV\@\@SA?AV?$Result\@V?$unique_ptr\@UHC_PERFORM_ENV\@\@U?$http_alloc_deleter\@UHC_PERFORM_ENV\@\@\@\@\@std\@\@\@\@PEAUHCInitArgs\@\@\@Z + */ + MCAPI static class Result>> Initialize(struct HCInitArgs *); + +//private: + /** + * @symbol ?HttpPerformAsyncShimProvider\@HC_PERFORM_ENV\@\@CAJW4XAsyncOp\@\@PEBUXAsyncProviderData\@\@\@Z + */ + MCAPI static long HttpPerformAsyncShimProvider(enum class XAsyncOp, struct XAsyncProviderData const *); + /** + * @symbol ?HttpPerformComplete\@HC_PERFORM_ENV\@\@CAXPEAUXAsyncBlock\@\@\@Z + */ + MCAPI static void HttpPerformComplete(struct XAsyncBlock *); + /** + * @symbol ?ProviderCleanup\@HC_PERFORM_ENV\@\@CAXPEAX_N\@Z + */ + MCAPI static void ProviderCleanup(void *, bool); + /** + * @symbol ?WebSocketClosed\@HC_PERFORM_ENV\@\@CAXPEAUHC_WEBSOCKET_OBSERVER\@\@W4HCWebSocketCloseStatus\@\@PEAX\@Z + */ + MCAPI static void WebSocketClosed(struct HC_WEBSOCKET_OBSERVER *, enum class HCWebSocketCloseStatus, void *); + /** + * @symbol ?WebSocketConnectAsyncShimProvider\@HC_PERFORM_ENV\@\@CAJW4XAsyncOp\@\@PEBUXAsyncProviderData\@\@\@Z + */ + MCAPI static long WebSocketConnectAsyncShimProvider(enum class XAsyncOp, struct XAsyncProviderData const *); + /** + * @symbol ?WebSocketConnectComplete\@HC_PERFORM_ENV\@\@CAXPEAUXAsyncBlock\@\@\@Z + */ + MCAPI static void WebSocketConnectComplete(struct XAsyncBlock *); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/HC_WEBSOCKET.hpp b/LiteLoader/include/llapi/mc/HC_WEBSOCKET.hpp deleted file mode 100644 index 299b30972f..0000000000 --- a/LiteLoader/include/llapi/mc/HC_WEBSOCKET.hpp +++ /dev/null @@ -1,79 +0,0 @@ -/** - * @file HC_WEBSOCKET.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure HC_WEBSOCKET. - * - */ -struct HC_WEBSOCKET { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_HC_WEBSOCKET -public: - struct HC_WEBSOCKET& operator=(struct HC_WEBSOCKET const &) = delete; - HC_WEBSOCKET(struct HC_WEBSOCKET const &) = delete; - HC_WEBSOCKET() = delete; -#endif - -public: - /** - * @symbol ?AddRef\@HC_WEBSOCKET\@\@QEAAXXZ - */ - MCAPI void AddRef(); - /** - * @symbol ?Connect\@HC_WEBSOCKET\@\@QEAAJPEBD0PEAUXAsyncBlock\@\@\@Z - */ - MCAPI long Connect(char const *, char const *, struct XAsyncBlock *); - /** - * @symbol ?DecRef\@HC_WEBSOCKET\@\@QEAAXXZ - */ - MCAPI void DecRef(); - /** - * @symbol ?Disconnect\@HC_WEBSOCKET\@\@QEAAJXZ - */ - MCAPI long Disconnect(); - /** - * @symbol ?Headers\@HC_WEBSOCKET\@\@QEBAAEBV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$http_stl_allocator\@D\@\@\@std\@\@V12\@Uhttp_header_compare\@\@V?$http_stl_allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$http_stl_allocator\@D\@\@\@std\@\@V12\@\@std\@\@\@\@\@std\@\@XZ - */ - MCAPI class std::map, class http_stl_allocator>, class std::basic_string, class http_stl_allocator>, struct http_header_compare, class http_stl_allocator, class http_stl_allocator> const, class std::basic_string, class http_stl_allocator>>>> const & Headers() const; - /** - * @symbol ?ProxyDecryptsHttps\@HC_WEBSOCKET\@\@QEBA?B_NXZ - */ - MCAPI bool const ProxyDecryptsHttps() const; - /** - * @symbol ?ProxyUri\@HC_WEBSOCKET\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$http_stl_allocator\@D\@\@\@std\@\@XZ - */ - MCAPI class std::basic_string, class http_stl_allocator> const & ProxyUri() const; - /** - * @symbol ?Send\@HC_WEBSOCKET\@\@QEAAJPEBDPEAUXAsyncBlock\@\@\@Z - */ - MCAPI long Send(char const *, struct XAsyncBlock *); - /** - * @symbol ?Uri\@HC_WEBSOCKET\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$http_stl_allocator\@D\@\@\@std\@\@XZ - */ - MCAPI class std::basic_string, class http_stl_allocator> const & Uri() const; - /** - * @symbol ?BinaryMessageFunc\@HC_WEBSOCKET\@\@SAXPEAU1\@PEBEIPEAX\@Z - */ - MCAPI static void BinaryMessageFunc(struct HC_WEBSOCKET *, unsigned char const *, unsigned int, void *); - /** - * @symbol ?CloseFunc\@HC_WEBSOCKET\@\@SAXPEAU1\@W4HCWebSocketCloseStatus\@\@PEAX\@Z - */ - MCAPI static void CloseFunc(struct HC_WEBSOCKET *, enum class HCWebSocketCloseStatus, void *); - /** - * @symbol ?MessageFunc\@HC_WEBSOCKET\@\@SAXPEAU1\@PEBDPEAX\@Z - */ - MCAPI static void MessageFunc(struct HC_WEBSOCKET *, char const *, void *); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/HC_WEBSOCKET_OBSERVER.hpp b/LiteLoader/include/llapi/mc/HC_WEBSOCKET_OBSERVER.hpp new file mode 100644 index 0000000000..ec16cc2098 --- /dev/null +++ b/LiteLoader/include/llapi/mc/HC_WEBSOCKET_OBSERVER.hpp @@ -0,0 +1,50 @@ +/** + * @file HC_WEBSOCKET_OBSERVER.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct HC_WEBSOCKET_OBSERVER { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_HC_WEBSOCKET_OBSERVER +public: + struct HC_WEBSOCKET_OBSERVER& operator=(struct HC_WEBSOCKET_OBSERVER const &) = delete; + HC_WEBSOCKET_OBSERVER(struct HC_WEBSOCKET_OBSERVER const &) = delete; + HC_WEBSOCKET_OBSERVER() = delete; +#endif + +public: + /** + * @symbol ?Initialize\@HC_WEBSOCKET_OBSERVER\@\@SA?AV?$unique_ptr\@UHC_WEBSOCKET_OBSERVER\@\@U?$http_alloc_deleter\@UHC_WEBSOCKET_OBSERVER\@\@\@\@\@std\@\@V?$shared_ptr\@VWebSocket\@httpclient\@xbox\@\@\@3\@P6AXPEAU1\@PEBDPEAX\@ZP6AX1PEBEI3\@ZP6AX15I_N3\@ZP6AX1W4HCWebSocketCloseStatus\@\@3\@Z3\@Z + */ + MCAPI static class std::unique_ptr> Initialize(class std::shared_ptr, void ( *)(struct HC_WEBSOCKET_OBSERVER *, char const *, void *), void ( *)(struct HC_WEBSOCKET_OBSERVER *, unsigned char const *, unsigned int, void *), void ( *)(struct HC_WEBSOCKET_OBSERVER *, unsigned char const *, unsigned int, bool, void *), void ( *)(struct HC_WEBSOCKET_OBSERVER *, enum class HCWebSocketCloseStatus, void *), void *); + +//private: + /** + * @symbol ?BinaryMessageFragmentFunc\@HC_WEBSOCKET_OBSERVER\@\@CAXPEAU1\@PEBEI_NPEAX\@Z + */ + MCAPI static void BinaryMessageFragmentFunc(struct HC_WEBSOCKET_OBSERVER *, unsigned char const *, unsigned int, bool, void *); + /** + * @symbol ?BinaryMessageFunc\@HC_WEBSOCKET_OBSERVER\@\@CAXPEAU1\@PEBEIPEAX\@Z + */ + MCAPI static void BinaryMessageFunc(struct HC_WEBSOCKET_OBSERVER *, unsigned char const *, unsigned int, void *); + /** + * @symbol ?CloseFunc\@HC_WEBSOCKET_OBSERVER\@\@CAXPEAU1\@W4HCWebSocketCloseStatus\@\@PEAX\@Z + */ + MCAPI static void CloseFunc(struct HC_WEBSOCKET_OBSERVER *, enum class HCWebSocketCloseStatus, void *); + /** + * @symbol ?MessageFunc\@HC_WEBSOCKET_OBSERVER\@\@CAXPEAU1\@PEBDPEAX\@Z + */ + MCAPI static void MessageFunc(struct HC_WEBSOCKET_OBSERVER *, char const *, void *); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/HangingActor.hpp b/LiteLoader/include/llapi/mc/HangingActor.hpp index 7f460a8c25..79b45c75b0 100644 --- a/LiteLoader/include/llapi/mc/HangingActor.hpp +++ b/LiteLoader/include/llapi/mc/HangingActor.hpp @@ -202,17 +202,17 @@ class HangingActor : public Actor { virtual void setDir(int); /** * @vftbl 277 - * @symbol ?getWidth\@LeashFenceKnotActor\@\@UEBAHXZ + * @symbol ?getWidth\@Painting\@\@UEBAHXZ */ virtual int getWidth() const = 0; /** * @vftbl 278 - * @symbol ?getHeight\@LeashFenceKnotActor\@\@UEBAHXZ + * @symbol ?getHeight\@Painting\@\@UEBAHXZ */ virtual int getHeight() const = 0; /** * @vftbl 279 - * @symbol ?dropItem\@LeashFenceKnotActor\@\@UEAAXXZ + * @symbol ?dropItem\@Painting\@\@UEAAXXZ */ virtual void dropItem() = 0; /** diff --git a/LiteLoader/include/llapi/mc/HangingActorItem.hpp b/LiteLoader/include/llapi/mc/HangingActorItem.hpp index 25f14f0027..0da620c551 100644 --- a/LiteLoader/include/llapi/mc/HangingActorItem.hpp +++ b/LiteLoader/include/llapi/mc/HangingActorItem.hpp @@ -103,9 +103,9 @@ class HangingActorItem : public Item { virtual void __unk_vfn_80(); /** * @vftbl 132 - * @symbol ?_useOn\@HangingActorItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@HangingActorItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0HangingActorItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ActorType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/HangingRoots.hpp b/LiteLoader/include/llapi/mc/HangingRoots.hpp index 3e17faafd1..f82fe83870 100644 --- a/LiteLoader/include/llapi/mc/HangingRoots.hpp +++ b/LiteLoader/include/llapi/mc/HangingRoots.hpp @@ -201,20 +201,20 @@ class HangingRoots : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,42 +226,47 @@ class HangingRoots : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@HangingRoots\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@HangingRoots\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@HangingRoots\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@HangingRoots\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/HangingSignBlock.hpp b/LiteLoader/include/llapi/mc/HangingSignBlock.hpp index d6de7bae38..e44c1521d9 100644 --- a/LiteLoader/include/llapi/mc/HangingSignBlock.hpp +++ b/LiteLoader/include/llapi/mc/HangingSignBlock.hpp @@ -200,25 +200,25 @@ class HangingSignBlock : public SignBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@HangingSignBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 144 + * @symbol ?getVisualShape\@HangingSignBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -230,37 +230,47 @@ class HangingSignBlock : public SignBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 180 * @symbol ?canSurvive\@HangingSignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @vftbl 196 + * @symbol ?getYRotationInDegrees\@HangingSignBlock\@\@UEBAMAEBVBlock\@\@\@Z + */ + virtual float getYRotationInDegrees(class Block const &) const; + /** + * @vftbl 198 * @symbol ?_getItemInstance\@HangingSignBlock\@\@MEBA?AVItemInstance\@\@XZ */ virtual class ItemInstance _getItemInstance() const; /** - * @vftbl 197 + * @vftbl 199 * @symbol ?_getShape\@HangingSignBlock\@\@MEBAXHAEAVAABB\@\@\@Z */ virtual void _getShape(int, class AABB &) const; diff --git a/LiteLoader/include/llapi/mc/HayBlockBlock.hpp b/LiteLoader/include/llapi/mc/HayBlockBlock.hpp index 97b7a1ff03..553101cf4d 100644 --- a/LiteLoader/include/llapi/mc/HayBlockBlock.hpp +++ b/LiteLoader/include/llapi/mc/HayBlockBlock.hpp @@ -181,25 +181,25 @@ class HayBlockBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 - * @symbol ?getVariant\@HayBlockBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 147 + * @symbol ?getVariant\@HayBlockBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,30 +211,35 @@ class HayBlockBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 169 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 170 * @symbol ?onFallOn\@HayBlockBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0HayBlockBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/HeavyBlock.hpp b/LiteLoader/include/llapi/mc/HeavyBlock.hpp index 0aaae009e3..276f2ce2ac 100644 --- a/LiteLoader/include/llapi/mc/HeavyBlock.hpp +++ b/LiteLoader/include/llapi/mc/HeavyBlock.hpp @@ -181,25 +181,25 @@ class HeavyBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 - * @symbol ?animateTick\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 152 + * @symbol ?animateTick\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -212,61 +212,66 @@ class HeavyBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 194 - * @symbol ?getDustColor\@SuspiciousSandBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z + * @vftbl 195 + * @symbol ?getDustColor\@ConcretePowderBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const = 0; /** - * @vftbl 195 - * @symbol ?getDustParticleName\@SuspiciousSandBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 196 + * @symbol ?getDustParticleName\@ConcretePowderBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string getDustParticleName(class Block const &) const = 0; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 197 + * @symbol __unk_vfn_197 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_197(); /** - * @vftbl 197 + * @vftbl 198 * @symbol ?onLand\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLand(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 198 + * @vftbl 199 * @symbol ?isFreeToFall\@HeavyBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isFreeToFall(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 199 + * @vftbl 200 * @symbol ?startFalling\@HeavyBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@_N\@Z */ virtual void startFalling(class BlockSource &, class BlockPos const &, class Block const &, bool) const; diff --git a/LiteLoader/include/llapi/mc/HeightmapWrapper.hpp b/LiteLoader/include/llapi/mc/HeightmapWrapper.hpp index ca2237a13f..af2e60bd1d 100644 --- a/LiteLoader/include/llapi/mc/HeightmapWrapper.hpp +++ b/LiteLoader/include/llapi/mc/HeightmapWrapper.hpp @@ -35,9 +35,5 @@ class HeightmapWrapper { * @symbol ?getHeightAt\@HeightmapWrapper\@\@QEBAFAEBVPos\@\@\@Z */ MCAPI short getHeightAt(class Pos const &) const; - /** - * @symbol ?create\@HeightmapWrapper\@\@SA?AV1\@PEBV?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@F\@Z - */ - MCAPI static class HeightmapWrapper create(std::vector const *, short); }; diff --git a/LiteLoader/include/llapi/mc/HelpCommand.hpp b/LiteLoader/include/llapi/mc/HelpCommand.hpp index b17ed24163..367e2749d6 100644 --- a/LiteLoader/include/llapi/mc/HelpCommand.hpp +++ b/LiteLoader/include/llapi/mc/HelpCommand.hpp @@ -36,7 +36,7 @@ class HelpCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@HelpCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/HitResult.hpp b/LiteLoader/include/llapi/mc/HitResult.hpp index 00f25a7605..a5e4bfd422 100644 --- a/LiteLoader/include/llapi/mc/HitResult.hpp +++ b/LiteLoader/include/llapi/mc/HitResult.hpp @@ -67,6 +67,10 @@ class HitResult { * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEAVActor\@\@\@Z */ MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Actor &); + /** + * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEAVActor\@\@0\@Z + */ + MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Actor &, class Vec3 const &); /** * @symbol ??0HitResult\@\@QEAA\@AEBV0\@\@Z */ @@ -76,17 +80,13 @@ class HitResult { */ MCAPI HitResult(); /** - * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEAVActor\@\@0\@Z + * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@00\@Z */ - MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Actor &, class Vec3 const &); + MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Vec3 const &); /** * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEBVBlockPos\@\@E0\@Z */ MCAPI HitResult(class Vec3 const &, class Vec3 const &, class BlockPos const &, unsigned char, class Vec3 const &); - /** - * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@00\@Z - */ - MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Vec3 const &); /** * @symbol ??0HitResult\@\@QEAA\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/HoneyBlock.hpp b/LiteLoader/include/llapi/mc/HoneyBlock.hpp index 15a9037503..7fd5a7548d 100644 --- a/LiteLoader/include/llapi/mc/HoneyBlock.hpp +++ b/LiteLoader/include/llapi/mc/HoneyBlock.hpp @@ -186,30 +186,30 @@ class HoneyBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@HoneyBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 164 + * @vftbl 165 * @symbol ?onStandOn\@HoneyBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -221,35 +221,40 @@ class HoneyBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 169 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 170 * @symbol ?onFallOn\@HoneyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 182 + * @vftbl 183 * @symbol ?getExtraRenderLayers\@HoneyBlock\@\@UEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0HoneyBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/HoneycombBlock.hpp b/LiteLoader/include/llapi/mc/HoneycombBlock.hpp index a56e696b96..e70695a762 100644 --- a/LiteLoader/include/llapi/mc/HoneycombBlock.hpp +++ b/LiteLoader/include/llapi/mc/HoneycombBlock.hpp @@ -176,20 +176,20 @@ class HoneycombBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,25 +201,30 @@ class HoneycombBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); /** * @symbol ??0HoneycombBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/HopMoveControl.hpp b/LiteLoader/include/llapi/mc/HopMoveControl.hpp index 513fde6c5c..fa953c9d0e 100644 --- a/LiteLoader/include/llapi/mc/HopMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/HopMoveControl.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "MoveControl.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +15,7 @@ * @brief MC class HopMoveControl. * */ -class HopMoveControl : public MoveControl { +class HopMoveControl { #define AFTER_EXTRA // Add Member There @@ -34,6 +33,11 @@ class HopMoveControl : public MoveControl { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol __unk_vfn_1 + */ + virtual void __unk_vfn_1(); /** * @vftbl 2 * @symbol ?tick\@HopMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/HopperBlock.hpp b/LiteLoader/include/llapi/mc/HopperBlock.hpp index dd99c79745..50ea641e96 100644 --- a/LiteLoader/include/llapi/mc/HopperBlock.hpp +++ b/LiteLoader/include/llapi/mc/HopperBlock.hpp @@ -202,9 +202,9 @@ class HopperBlock : public ActorBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@HopperBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@HopperBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -226,25 +226,25 @@ class HopperBlock : public ActorBlock { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 162 - * @symbol ?onRemove\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void onRemove(class BlockSource &, class BlockPos const &) const; + virtual void __unk_vfn_157(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol ?onRemove\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_165(); + virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -257,41 +257,46 @@ class HopperBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 175 + * @vftbl 176 * @symbol ?clip\@HopperBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@HopperBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@HopperBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/Horse.hpp b/LiteLoader/include/llapi/mc/Horse.hpp index 3e70f667c0..6d02f144d3 100644 --- a/LiteLoader/include/llapi/mc/Horse.hpp +++ b/LiteLoader/include/llapi/mc/Horse.hpp @@ -241,11 +241,6 @@ class Horse : public Animal { * @symbol ?travel\@Horse\@\@UEAAXMMM_N\@Z */ virtual void travel(float, float, float, bool); - /** - * @vftbl 288 - * @symbol ?aiStep\@Horse\@\@UEAAXXZ - */ - virtual void aiStep(); /** * @vftbl 301 * @symbol __unk_vfn_301 @@ -303,16 +298,11 @@ class Horse : public Animal { virtual bool isMouthOpen() const; /** * @vftbl 360 - * @symbol ?isTailMoving\@Horse\@\@UEBA_NXZ - */ - virtual bool isTailMoving() const; - /** - * @vftbl 361 * @symbol ?makeMad\@Horse\@\@UEAAXXZ */ virtual void makeMad(); /** - * @vftbl 362 + * @vftbl 361 * @symbol ?tameToPlayer\@Horse\@\@UEAA_NAEAVPlayer\@\@_N\@Z */ virtual bool tameToPlayer(class Player &, bool); @@ -336,14 +326,14 @@ class Horse : public Animal { * @symbol ?postTravel\@Horse\@\@QEAAXPEAVActor\@\@_NW4HorsePostTravelType\@\@\@Z */ MCAPI void postTravel(class Actor *, bool, enum class HorsePostTravelType); - /** - * @symbol ?getInterpolatedRidingOffset\@Horse\@\@SA?AVVec3\@\@AEBVVec2\@\@MMM\@Z - */ - MCAPI static class Vec3 getInterpolatedRidingOffset(class Vec2 const &, float, float, float); /** * @symbol ?getInterpolatedRidingOffset\@Horse\@\@SA?AVVec3\@\@AEBURenderRotationComponent\@\@AEBUStandAnimationComponent\@\@M\@Z */ MCAPI static class Vec3 getInterpolatedRidingOffset(struct RenderRotationComponent const &, struct StandAnimationComponent const &, float); + /** + * @symbol ?getInterpolatedRidingOffset\@Horse\@\@SA?AVVec3\@\@AEBVVec2\@\@MMM\@Z + */ + MCAPI static class Vec3 getInterpolatedRidingOffset(class Vec2 const &, float, float, float); /** * @symbol ?getNewPassengerPos\@Horse\@\@SA?AVVec3\@\@AEBURenderPositionComponent\@\@AEBURenderRotationComponent\@\@AEBUStandAnimationComponent\@\@MM\@Z */ diff --git a/LiteLoader/include/llapi/mc/HorseArmorItem.hpp b/LiteLoader/include/llapi/mc/HorseArmorItem.hpp index 0dba7c1ccc..e2e3c0c4f6 100644 --- a/LiteLoader/include/llapi/mc/HorseArmorItem.hpp +++ b/LiteLoader/include/llapi/mc/HorseArmorItem.hpp @@ -156,4 +156,12 @@ enum class Tier; */ MCAPI static int const mHealthPerTier[]; +//private: + /** + * @symbol ?_tryEquipHorseArmor\@HorseArmorItem\@\@CA_NPEAVActor\@\@AEBVItemStack\@\@\@Z + */ + MCAPI static bool _tryEquipHorseArmor(class Actor *, class ItemStack const &); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/HorseMovement.hpp b/LiteLoader/include/llapi/mc/HorseMovement.hpp index 95a11f9fc1..04fa0727d1 100644 --- a/LiteLoader/include/llapi/mc/HorseMovement.hpp +++ b/LiteLoader/include/llapi/mc/HorseMovement.hpp @@ -20,9 +20,25 @@ namespace HorseMovement { * @symbol ?allowStandSliding\@HorseMovement\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool allowStandSliding(class EntityContext const &); + /** + * @symbol ?initializeHorse\@HorseMovement\@\@YAXAEAVEntityContext\@\@\@Z + */ + MCAPI void initializeHorse(class EntityContext &); + /** + * @symbol ?resetStandCounter\@HorseMovement\@\@YAXAEAVEntityContext\@\@\@Z + */ + MCAPI void resetStandCounter(class EntityContext &); /** * @symbol ?setAllowStandSliding\@HorseMovement\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setAllowStandSliding(class EntityContext &, bool); + /** + * @symbol ?startStandCounter\@HorseMovement\@\@YAXAEAVEntityContext\@\@\@Z + */ + MCAPI void startStandCounter(class EntityContext &); + /** + * @symbol ?tickStandCounter\@HorseMovement\@\@YA_NAEAVEntityContext\@\@H\@Z + */ + MCAPI bool tickStandCounter(class EntityContext &, int); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/HorsePreTravelSystem.hpp b/LiteLoader/include/llapi/mc/HorsePreTravelSystem.hpp index 0d594edad4..bf8bca2466 100644 --- a/LiteLoader/include/llapi/mc/HorsePreTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/HorsePreTravelSystem.hpp @@ -28,5 +28,9 @@ class HorsePreTravelSystem { * @symbol ?createHorsePreTravelSystem\@HorsePreTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createHorsePreTravelSystem(); + /** + * @symbol ?tickHorsePreTravelSystem\@HorsePreTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@V?$Optional\@UVehicleComponent\@\@\@\@$$CBUSynchedActorDataComponent\@\@UFlySpeedComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UMobFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UWasOnGroundPreTravelFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void tickHorsePreTravelSystem(class ViewT, class FlagComponent, class FlagComponent>, class Optional, struct SynchedActorDataComponent const, struct FlySpeedComponent>, class ViewT>, struct VehicleComponent const, struct SynchedActorDataComponent const>, class ViewT const>, class ViewT const>, class ViewT const>, class EntityModifierT>); }; diff --git a/LiteLoader/include/llapi/mc/HttpHeaders.hpp b/LiteLoader/include/llapi/mc/HttpHeaders.hpp index ff7865bb89..8400f4f01f 100644 --- a/LiteLoader/include/llapi/mc/HttpHeaders.hpp +++ b/LiteLoader/include/llapi/mc/HttpHeaders.hpp @@ -28,13 +28,10 @@ enum class ParseState; public: class HttpHeaders& operator=(class HttpHeaders const &) = delete; HttpHeaders(class HttpHeaders const &) = delete; + HttpHeaders() = delete; #endif public: - /** - * @symbol ??0HttpHeaders\@\@QEAA\@XZ - */ - MCAPI HttpHeaders(); /** * @symbol ?clear\@HttpHeaders\@\@QEAAXXZ */ @@ -43,10 +40,6 @@ enum class ParseState; * @symbol ?getHeader\@HttpHeaders\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@\@Z */ MCAPI bool getHeader(std::string const &, std::string &) const; - /** - * @symbol ?getState\@HttpHeaders\@\@QEAA?AW4ParseState\@1\@XZ - */ - MCAPI enum class HttpHeaders::ParseState getState(); /** * @symbol ?getStatusCode\@HttpHeaders\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/HudContainerModel.hpp b/LiteLoader/include/llapi/mc/HudContainerModel.hpp index 4eb6456842..7f7d79ff10 100644 --- a/LiteLoader/include/llapi/mc/HudContainerModel.hpp +++ b/LiteLoader/include/llapi/mc/HudContainerModel.hpp @@ -80,10 +80,6 @@ class HudContainerModel : public ContainerModel { * @symbol ?_getContainer\@HudContainerModel\@\@EEBAPEAVContainer\@\@XZ */ virtual class Container * _getContainer() const; - /** - * @symbol ??0HudContainerModel\@\@QEAA\@W4ContainerEnumName\@\@AEAVPlayer\@\@\@Z - */ - MCAPI HudContainerModel(enum class ContainerEnumName, class Player &); //private: /** diff --git a/LiteLoader/include/llapi/mc/HudScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/HudScreenCapabilities.hpp index e4d63cf6eb..4be4201e2c 100644 --- a/LiteLoader/include/llapi/mc/HudScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/HudScreenCapabilities.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -12,7 +13,7 @@ #undef BEFORE_EXTRA -class HudScreenCapabilities { +struct HudScreenCapabilities { #define AFTER_EXTRA // Add Member There @@ -20,8 +21,8 @@ class HudScreenCapabilities { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_HUDSCREENCAPABILITIES public: - class HudScreenCapabilities& operator=(class HudScreenCapabilities const &) = delete; - HudScreenCapabilities(class HudScreenCapabilities const &) = delete; + struct HudScreenCapabilities& operator=(struct HudScreenCapabilities const &) = delete; + HudScreenCapabilities(struct HudScreenCapabilities const &) = delete; HudScreenCapabilities() = delete; #endif @@ -33,8 +34,8 @@ class HudScreenCapabilities { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@UHudScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @symbol ?isOfType\@?$TypedScreenCapabilities\@UHudScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@Bedrock\@\@\@Z */ - virtual bool isOfType(class typeid_t) const; + virtual bool isOfType(class Bedrock::typeid_t) const; -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp b/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp index a19465d9b6..212ac85a70 100644 --- a/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp +++ b/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp @@ -181,30 +181,30 @@ class HugeMushroomBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@HugeMushroomBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@HugeMushroomBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,42 +216,47 @@ class HugeMushroomBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@HugeMushroomBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@HugeMushroomBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@HugeMushroomBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@HugeMushroomBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/I18n.hpp b/LiteLoader/include/llapi/mc/I18n.hpp index 877123062e..0edf63acd3 100644 --- a/LiteLoader/include/llapi/mc/I18n.hpp +++ b/LiteLoader/include/llapi/mc/I18n.hpp @@ -69,14 +69,14 @@ class I18n { * @symbol ?findAvailableLanguages\@I18n\@\@SA?AV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEAVResourcePackManager\@\@\@Z */ MCAPI static std::vector findAvailableLanguages(class ResourcePackManager &); - /** - * @symbol ?get\@I18n\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@PEBVLocalization\@\@\@Z - */ - MCAPI static std::string get(std::string const &, class Localization const *); /** * @symbol ?get\@I18n\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@PEBVLocalization\@\@\@Z */ MCAPI static std::string get(std::string const &, std::vector const &, class Localization const *); + /** + * @symbol ?get\@I18n\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@PEBVLocalization\@\@\@Z + */ + MCAPI static std::string get(std::string const &, class Localization const *); /** * @symbol ?getCurrentLanguage\@I18n\@\@SA?AV?$optional_ref\@$$CBVLocalization\@\@\@\@XZ */ @@ -85,6 +85,10 @@ class I18n { * @symbol ?getLanguageCodesFromPack\@I18n\@\@SA?AV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBVPackAccessStrategy\@\@\@Z */ MCAPI static std::vector getLanguageCodesFromPack(class PackAccessStrategy const &); + /** + * @symbol ?getLocaleCodeFor\@I18n\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + */ + MCAPI static std::string const & getLocaleCodeFor(std::string const &); /** * @symbol ?getLocaleFor\@I18n\@\@SAAEBVLocalization\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -131,10 +135,6 @@ class I18n { * @symbol ?_getAdditionalTranslationsBackupLocale\@I18n\@\@CAPEAVLocalization\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI static class Localization * _getAdditionalTranslationsBackupLocale(std::string const &, bool); - /** - * @symbol ?_getLocaleCodeFor\@I18n\@\@CAAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z - */ - MCAPI static std::string & _getLocaleCodeFor(std::string const &); /** * @symbol ?_getPackKeywordLocale\@I18n\@\@CAAEAVLocalization\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/IConnectionEventing.hpp b/LiteLoader/include/llapi/mc/IConnectionEventing.hpp index 4cef2e94c2..6271d0ad6e 100644 --- a/LiteLoader/include/llapi/mc/IConnectionEventing.hpp +++ b/LiteLoader/include/llapi/mc/IConnectionEventing.hpp @@ -33,11 +33,5 @@ enum class ConnectionFailureReason; #endif public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ICONNECTIONEVENTING - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~IConnectionEventing(); -#endif }; diff --git a/LiteLoader/include/llapi/mc/IDefinitionInstance.hpp b/LiteLoader/include/llapi/mc/IDefinitionInstance.hpp index b07e6963c2..d03885ac1b 100644 --- a/LiteLoader/include/llapi/mc/IDefinitionInstance.hpp +++ b/LiteLoader/include/llapi/mc/IDefinitionInstance.hpp @@ -61,7 +61,7 @@ class IDefinitionInstance { virtual void __unk_vfn_5() = 0; /** * @vftbl 6 - * @symbol ?getDefinitionTypeId\@?$DefinitionInstance\@UPushThroughDefinition\@\@\@\@UEBAGXZ + * @symbol ?getDefinitionTypeId\@?$DefinitionInstance\@UWaterMovementDescription\@\@\@\@UEBAGXZ */ virtual unsigned short getDefinitionTypeId() const = 0; /** diff --git a/LiteLoader/include/llapi/mc/IDimensionFactory.hpp b/LiteLoader/include/llapi/mc/IDimensionFactory.hpp index 341d911490..1a14765af1 100644 --- a/LiteLoader/include/llapi/mc/IDimensionFactory.hpp +++ b/LiteLoader/include/llapi/mc/IDimensionFactory.hpp @@ -11,10 +11,24 @@ #undef BEFORE_EXTRA -namespace IDimensionFactory { +class IDimensionFactory { #define AFTER_EXTRA #undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_IDIMENSIONFACTORY +public: + class IDimensionFactory& operator=(class IDimensionFactory const &) = delete; + IDimensionFactory(class IDimensionFactory const &) = delete; + IDimensionFactory() = delete; +#endif -}; \ No newline at end of file +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IDIMENSIONFACTORY + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IDimensionFactory(); +#endif + +}; diff --git a/LiteLoader/include/llapi/mc/IEntityRegistryOwner.hpp b/LiteLoader/include/llapi/mc/IEntityRegistryOwner.hpp index 80c9380680..914d93ba8d 100644 --- a/LiteLoader/include/llapi/mc/IEntityRegistryOwner.hpp +++ b/LiteLoader/include/llapi/mc/IEntityRegistryOwner.hpp @@ -11,10 +11,24 @@ #undef BEFORE_EXTRA -namespace IEntityRegistryOwner { +class IEntityRegistryOwner { #define AFTER_EXTRA #undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_IENTITYREGISTRYOWNER +public: + class IEntityRegistryOwner& operator=(class IEntityRegistryOwner const &) = delete; + IEntityRegistryOwner(class IEntityRegistryOwner const &) = delete; + IEntityRegistryOwner() = delete; +#endif -}; \ No newline at end of file +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IENTITYREGISTRYOWNER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IEntityRegistryOwner(); +#endif + +}; diff --git a/LiteLoader/include/llapi/mc/INpcDialogueData.hpp b/LiteLoader/include/llapi/mc/INpcDialogueData.hpp index 8c4edb30d6..93b2b219d5 100644 --- a/LiteLoader/include/llapi/mc/INpcDialogueData.hpp +++ b/LiteLoader/include/llapi/mc/INpcDialogueData.hpp @@ -12,11 +12,29 @@ #undef BEFORE_EXTRA -namespace INpcDialogueData { +struct INpcDialogueData { #define AFTER_EXTRA // Add Member There #undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_INPCDIALOGUEDATA +public: + struct INpcDialogueData& operator=(struct INpcDialogueData const &) = delete; + INpcDialogueData(struct INpcDialogueData const &) = delete; + INpcDialogueData() = delete; +#endif + +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_INPCDIALOGUEDATA + /** + * @symbol ?getRawDialogueText\@INpcDialogueData\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + MCVAPI std::string const & getRawDialogueText() const; + /** + * @symbol ?isRemoteFire\@INpcDialogueData\@\@UEAA_NXZ + */ + MCVAPI bool isRemoteFire(); +#endif }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/IPackTelemetry.hpp b/LiteLoader/include/llapi/mc/IPackTelemetry.hpp index 0322cf81a4..12a3c3aa92 100644 --- a/LiteLoader/include/llapi/mc/IPackTelemetry.hpp +++ b/LiteLoader/include/llapi/mc/IPackTelemetry.hpp @@ -29,11 +29,5 @@ class IPackTelemetry { #endif public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IPACKTELEMETRY - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~IPackTelemetry(); -#endif }; diff --git a/LiteLoader/include/llapi/mc/IPacketObserver.hpp b/LiteLoader/include/llapi/mc/IPacketObserver.hpp index e159e19572..fdb998856c 100644 --- a/LiteLoader/include/llapi/mc/IPacketObserver.hpp +++ b/LiteLoader/include/llapi/mc/IPacketObserver.hpp @@ -11,10 +11,24 @@ #undef BEFORE_EXTRA -namespace IPacketObserver { +class IPacketObserver { #define AFTER_EXTRA #undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_IPACKETOBSERVER +public: + class IPacketObserver& operator=(class IPacketObserver const &) = delete; + IPacketObserver(class IPacketObserver const &) = delete; + IPacketObserver() = delete; +#endif -}; \ No newline at end of file +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IPACKETOBSERVER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IPacketObserver(); +#endif + +}; diff --git a/LiteLoader/include/llapi/mc/IScreenChangedEventing.hpp b/LiteLoader/include/llapi/mc/IScreenChangedEventing.hpp index 3c014b0537..7aa2ef8e36 100644 --- a/LiteLoader/include/llapi/mc/IScreenChangedEventing.hpp +++ b/LiteLoader/include/llapi/mc/IScreenChangedEventing.hpp @@ -29,11 +29,5 @@ class IScreenChangedEventing { #endif public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ISCREENCHANGEDEVENTING - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~IScreenChangedEventing(); -#endif }; diff --git a/LiteLoader/include/llapi/mc/IStructurePoolBlockPredicate.hpp b/LiteLoader/include/llapi/mc/IStructurePoolBlockPredicate.hpp new file mode 100644 index 0000000000..39e93b769c --- /dev/null +++ b/LiteLoader/include/llapi/mc/IStructurePoolBlockPredicate.hpp @@ -0,0 +1,34 @@ +/** + * @file IStructurePoolBlockPredicate.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class IStructurePoolBlockPredicate { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ISTRUCTUREPOOLBLOCKPREDICATE +public: + class IStructurePoolBlockPredicate& operator=(class IStructurePoolBlockPredicate const &) = delete; + IStructurePoolBlockPredicate(class IStructurePoolBlockPredicate const &) = delete; + IStructurePoolBlockPredicate() = delete; +#endif + +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ISTRUCTUREPOOLBLOCKPREDICATE + /** + * @symbol ?finalize\@IStructurePoolBlockPredicate\@\@UEAA_NAEAVBlockSource\@\@AEAVIRandom\@\@\@Z + */ + MCVAPI bool finalize(class BlockSource &, class IRandom &); +#endif + +}; diff --git a/LiteLoader/include/llapi/mc/ITickingSystem.hpp b/LiteLoader/include/llapi/mc/ITickingSystem.hpp new file mode 100644 index 0000000000..d0a82f3a14 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ITickingSystem.hpp @@ -0,0 +1,34 @@ +/** + * @file ITickingSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ITickingSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITICKINGSYSTEM +public: + class ITickingSystem& operator=(class ITickingSystem const &) = delete; + ITickingSystem(class ITickingSystem const &) = delete; + ITickingSystem() = delete; +#endif + +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITICKINGSYSTEM + /** + * @symbol ?singleTick\@ITickingSystem\@\@UEAAXAEAVEntityRegistry\@\@AEAVEntityContext\@\@\@Z + */ + MCVAPI void singleTick(class EntityRegistry &, class EntityContext &); +#endif + +}; diff --git a/LiteLoader/include/llapi/mc/IWebviewTelemetry.hpp b/LiteLoader/include/llapi/mc/IWebviewTelemetry.hpp index de5976162e..bc85b87ff7 100644 --- a/LiteLoader/include/llapi/mc/IWebviewTelemetry.hpp +++ b/LiteLoader/include/llapi/mc/IWebviewTelemetry.hpp @@ -11,77 +11,12 @@ #undef BEFORE_EXTRA -/** - * @brief MC class IWebviewTelemetry. - * - */ -class IWebviewTelemetry { + +namespace IWebviewTelemetry { #define AFTER_EXTRA // Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_IWEBVIEWTELEMETRY -public: - class IWebviewTelemetry& operator=(class IWebviewTelemetry const &) = delete; - IWebviewTelemetry(class IWebviewTelemetry const &) = delete; - IWebviewTelemetry() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol __unk_vfn_1 - */ - virtual void __unk_vfn_1(); - /** - * @vftbl 2 - * @symbol __unk_vfn_2 - */ - virtual void __unk_vfn_2(); - /** - * @vftbl 3 - * @symbol __unk_vfn_3 - */ - virtual void __unk_vfn_3(); - /** - * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 - * @symbol __unk_vfn_5 - */ - virtual void __unk_vfn_5(); - /** - * @vftbl 6 - * @symbol ?onDownloadBegin\@IWebviewTelemetry\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z - */ - virtual void onDownloadBegin(struct WebviewDownloadInfo const &); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); - /** - * @vftbl 8 - * @symbol ?onDownloadComplete\@IWebviewTelemetry\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z - */ - virtual void onDownloadComplete(struct WebviewDownloadInfo const &); - /** - * @vftbl 9 - * @symbol ?onDownloadCanceled\@IWebviewTelemetry\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z - */ - virtual void onDownloadCanceled(struct WebviewDownloadInfo const &); - /** - * @symbol ??0IWebviewTelemetry\@\@QEAA\@AEBVIMinecraftEventing\@\@\@Z - */ - MCAPI IWebviewTelemetry(class IMinecraftEventing const &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/IceBlock.hpp b/LiteLoader/include/llapi/mc/IceBlock.hpp index 2760cc4e52..1448c8f3c8 100644 --- a/LiteLoader/include/llapi/mc/IceBlock.hpp +++ b/LiteLoader/include/llapi/mc/IceBlock.hpp @@ -186,25 +186,25 @@ class IceBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@IceBlock\@\@UEAAXXZ + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void _addHardCodedBlockComponents(); + virtual void __unk_vfn_157(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol ?_addHardCodedBlockComponents\@IceBlock\@\@UEAAXXZ */ - virtual void __unk_vfn_165(); + virtual void _addHardCodedBlockComponents(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,32 +216,37 @@ class IceBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@IceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@IceBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/IdentityDefinition.hpp b/LiteLoader/include/llapi/mc/IdentityDefinition.hpp index fee8c80851..51b7c3f937 100644 --- a/LiteLoader/include/llapi/mc/IdentityDefinition.hpp +++ b/LiteLoader/include/llapi/mc/IdentityDefinition.hpp @@ -39,22 +39,10 @@ enum class Type : char * @symbol ??0IdentityDefinition\@\@QEAA\@AEBV0\@\@Z */ MCAPI IdentityDefinition(class IdentityDefinition const &); - /** - * @symbol ??0IdentityDefinition\@\@QEAA\@AEBUScoreboardId\@\@AEBUActorUniqueID\@\@\@Z - */ - MCAPI IdentityDefinition(struct ScoreboardId const &, struct ActorUniqueID const &); - /** - * @symbol ??0IdentityDefinition\@\@QEAA\@AEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI IdentityDefinition(struct ScoreboardId const &, std::string const &); /** * @symbol ??0IdentityDefinition\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI IdentityDefinition(class IdentityDefinition &&); - /** - * @symbol ??0IdentityDefinition\@\@QEAA\@AEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z - */ - MCAPI IdentityDefinition(struct ScoreboardId const &, struct PlayerScoreboardId const &); /** * @symbol ?getEntityId\@IdentityDefinition\@\@QEBAAEBUActorUniqueID\@\@XZ */ @@ -83,14 +71,6 @@ enum class Type : char * @symbol ?isEntityType\@IdentityDefinition\@\@QEBA_NXZ */ MCAPI bool isEntityType() const; - /** - * @symbol ?isFakeType\@IdentityDefinition\@\@QEBA_NXZ - */ - MCAPI bool isFakeType() const; - /** - * @symbol ?isHiddenFakePlayerType\@IdentityDefinition\@\@QEBA_NXZ - */ - MCAPI bool isHiddenFakePlayerType() const; /** * @symbol ?isPlayerType\@IdentityDefinition\@\@QEBA_NXZ */ @@ -99,10 +79,6 @@ enum class Type : char * @symbol ?isValid\@IdentityDefinition\@\@QEBA_NXZ */ MCAPI bool isValid() const; - /** - * @symbol ??BIdentityDefinition\@\@QEBA_NXZ - */ - MCAPI operator bool() const; /** * @symbol ??4IdentityDefinition\@\@QEAAAEAV0\@AEBV0\@\@Z */ @@ -119,13 +95,5 @@ enum class Type : char * @symbol ?Invalid\@IdentityDefinition\@\@2V1\@B */ MCAPI static class IdentityDefinition const Invalid; - /** - * @symbol ?convertFakeToReal\@IdentityDefinition\@\@SA_NAEAV1\@AEBUPlayerScoreboardId\@\@\@Z - */ - MCAPI static bool convertFakeToReal(class IdentityDefinition &, struct PlayerScoreboardId const &); - /** - * @symbol ?isHiddenFakePlayerNameString\@IdentityDefinition\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI static bool isHiddenFakePlayerNameString(std::string const &); }; diff --git a/LiteLoader/include/llapi/mc/IdentityDictionary.hpp b/LiteLoader/include/llapi/mc/IdentityDictionary.hpp index 95b0ae1ecd..452b990618 100644 --- a/LiteLoader/include/llapi/mc/IdentityDictionary.hpp +++ b/LiteLoader/include/llapi/mc/IdentityDictionary.hpp @@ -40,34 +40,10 @@ class IdentityDictionary { * @symbol ?convertFakeToReal\@IdentityDictionary\@\@QEAAAEBUScoreboardId\@\@AEBU2\@AEBUPlayerScoreboardId\@\@\@Z */ MCAPI struct ScoreboardId const & convertFakeToReal(struct ScoreboardId const &, struct PlayerScoreboardId const &); - /** - * @symbol ?getAllScoreboardIds\@IdentityDictionary\@\@QEBA?AV?$vector\@UScoreboardId\@\@V?$allocator\@UScoreboardId\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector getAllScoreboardIds() const; - /** - * @symbol ?getScoreboardId\@IdentityDictionary\@\@QEBAAEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI struct ScoreboardId const & getScoreboardId(std::string const &) const; /** * @symbol ?getScoreboardId\@IdentityDictionary\@\@QEBAAEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z */ MCAPI struct ScoreboardId const & getScoreboardId(struct PlayerScoreboardId const &) const; - /** - * @symbol ?getScoreboardId\@IdentityDictionary\@\@QEBAAEBUScoreboardId\@\@AEBUActorUniqueID\@\@\@Z - */ - MCAPI struct ScoreboardId const & getScoreboardId(struct ActorUniqueID const &) const; - /** - * @symbol ?registerIdentity\@IdentityDictionary\@\@QEAAAEBUScoreboardId\@\@AEBU2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI struct ScoreboardId const & registerIdentity(struct ScoreboardId const &, std::string const &); - /** - * @symbol ?registerIdentity\@IdentityDictionary\@\@QEAAAEBUScoreboardId\@\@AEBU2\@AEBUPlayerScoreboardId\@\@\@Z - */ - MCAPI struct ScoreboardId const & registerIdentity(struct ScoreboardId const &, struct PlayerScoreboardId const &); - /** - * @symbol ?registerIdentity\@IdentityDictionary\@\@QEAAAEBUScoreboardId\@\@AEBU2\@AEBUActorUniqueID\@\@\@Z - */ - MCAPI struct ScoreboardId const & registerIdentity(struct ScoreboardId const &, struct ActorUniqueID const &); /** * @symbol ?shouldConvertFakePlayer\@IdentityDictionary\@\@QEAA_NAEBUPlayerScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/IdleState.hpp b/LiteLoader/include/llapi/mc/IdleState.hpp index 9d4370e443..441bc375bb 100644 --- a/LiteLoader/include/llapi/mc/IdleState.hpp +++ b/LiteLoader/include/llapi/mc/IdleState.hpp @@ -50,9 +50,5 @@ class IdleState : public PetSleepWithOwnerState { * @symbol ?stop\@PetSleepWithOwnerState\@\@UEAAXXZ */ virtual void stop(); - /** - * @symbol ?create\@IdleState\@\@SA?AV?$unique_ptr\@VIdleState\@\@U?$default_delete\@VIdleState\@\@\@std\@\@\@std\@\@AEAVPetSleepWithOwnerGoal\@\@\@Z - */ - MCAPI static std::unique_ptr create(class PetSleepWithOwnerGoal &); }; diff --git a/LiteLoader/include/llapi/mc/Igloo.hpp b/LiteLoader/include/llapi/mc/Igloo.hpp index 981e7cae73..aaab5c8c17 100644 --- a/LiteLoader/include/llapi/mc/Igloo.hpp +++ b/LiteLoader/include/llapi/mc/Igloo.hpp @@ -50,10 +50,6 @@ class Igloo : public StructurePiece { * @symbol ?postProcessMobsAt\@Igloo\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual void postProcessMobsAt(class BlockSource &, class Random &, class BoundingBox const &); - /** - * @symbol ??0Igloo\@\@QEAA\@FHH\@Z - */ - MCAPI Igloo(short, int, int); //private: diff --git a/LiteLoader/include/llapi/mc/IllagerBeast.hpp b/LiteLoader/include/llapi/mc/IllagerBeast.hpp index 1f18b93a14..5ab7e91d79 100644 --- a/LiteLoader/include/llapi/mc/IllagerBeast.hpp +++ b/LiteLoader/include/llapi/mc/IllagerBeast.hpp @@ -146,11 +146,6 @@ class IllagerBeast : public Monster { * @symbol __unk_vfn_275 */ virtual void __unk_vfn_275(); - /** - * @vftbl 288 - * @symbol ?aiStep\@IllagerBeast\@\@UEAAXXZ - */ - virtual void aiStep(); /** * @vftbl 301 * @symbol __unk_vfn_301 diff --git a/LiteLoader/include/llapi/mc/ImguiProfiler.hpp b/LiteLoader/include/llapi/mc/ImguiProfiler.hpp index ddc331a80b..f4804fd05f 100644 --- a/LiteLoader/include/llapi/mc/ImguiProfiler.hpp +++ b/LiteLoader/include/llapi/mc/ImguiProfiler.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class ImguiProfiler { +struct ImguiProfiler { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_IMGUIPROFILER public: - class ImguiProfiler& operator=(class ImguiProfiler const &) = delete; - ImguiProfiler(class ImguiProfiler const &) = delete; + struct ImguiProfiler& operator=(struct ImguiProfiler const &) = delete; + ImguiProfiler(struct ImguiProfiler const &) = delete; ImguiProfiler() = delete; #endif @@ -28,21 +28,7 @@ class ImguiProfiler { * @symbol ?getTimeAccumulator\@ImguiProfiler\@\@QEAA?AVTimeAccumulator\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z */ MCAPI class TimeAccumulator getTimeAccumulator(std::string const &, std::string const &, bool); - /** - * @symbol ?reset\@ImguiProfiler\@\@QEAAXXZ - */ - MCAPI void reset(); //private: -private: - /** - * @symbol ?sPendingRecords\@ImguiProfiler\@\@0V?$vector\@URecord\@ImguiProfiler\@\@V?$allocator\@URecord\@ImguiProfiler\@\@\@std\@\@\@std\@\@A - */ - MCAPI static std::vector sPendingRecords; - /** - * @symbol ?sRecordMutex\@ImguiProfiler\@\@0Vmutex\@std\@\@A - */ - MCAPI static class std::mutex sRecordMutex; - -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ImmobileSystem.hpp b/LiteLoader/include/llapi/mc/ImmobileSystem.hpp index a4eb4aa301..1dd7392a9c 100644 --- a/LiteLoader/include/llapi/mc/ImmobileSystem.hpp +++ b/LiteLoader/include/llapi/mc/ImmobileSystem.hpp @@ -28,6 +28,10 @@ class ImmobileSystem { * @symbol ?createSystem\@ImmobileSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?tickImmobileSystem\@ImmobileSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UMobIsImmobileFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@\@\@ULocalMoveVelocityComponent\@\@UMobRotationComponent\@\@UStateVectorComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void tickImmobileSystem(class ViewT, class FlagComponent, class FlagComponent>, struct LocalMoveVelocityComponent, struct MobRotationComponent, struct StateVectorComponent>, class EntityModifierT>); //private: /** diff --git a/LiteLoader/include/llapi/mc/ImmutableWorldCommand.hpp b/LiteLoader/include/llapi/mc/ImmutableWorldCommand.hpp index 188a1c7083..bce4677aff 100644 --- a/LiteLoader/include/llapi/mc/ImmutableWorldCommand.hpp +++ b/LiteLoader/include/llapi/mc/ImmutableWorldCommand.hpp @@ -36,7 +36,7 @@ class ImmutableWorldCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@ImmutableWorldCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ImportStructureMetaData.hpp b/LiteLoader/include/llapi/mc/ImportStructureMetaData.hpp index d364268f59..20813ef089 100644 --- a/LiteLoader/include/llapi/mc/ImportStructureMetaData.hpp +++ b/LiteLoader/include/llapi/mc/ImportStructureMetaData.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class ImportStructureMetaData { +struct ImportStructureMetaData { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_IMPORTSTRUCTUREMETADATA public: - class ImportStructureMetaData& operator=(class ImportStructureMetaData const &) = delete; - ImportStructureMetaData(class ImportStructureMetaData const &) = delete; + struct ImportStructureMetaData& operator=(struct ImportStructureMetaData const &) = delete; + ImportStructureMetaData(struct ImportStructureMetaData const &) = delete; ImportStructureMetaData() = delete; #endif @@ -37,4 +37,4 @@ class ImportStructureMetaData { */ MCAPI void setSpecificStructureDirty(std::string const &, bool); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ImprovedNoise.hpp b/LiteLoader/include/llapi/mc/ImprovedNoise.hpp index 6eb7daabcd..2e920eed56 100644 --- a/LiteLoader/include/llapi/mc/ImprovedNoise.hpp +++ b/LiteLoader/include/llapi/mc/ImprovedNoise.hpp @@ -29,14 +29,6 @@ class ImprovedNoise { #endif public: - /** - * @symbol ??0ImprovedNoise\@\@QEAA\@AEAVIRandom\@\@UYBlendingBugSettings\@\@\@Z - */ - MCAPI ImprovedNoise(class IRandom &, struct YBlendingBugSettings); - /** - * @symbol ?_getValue\@ImprovedNoise\@\@QEBAMAEBVVec3\@\@\@Z - */ - MCAPI float _getValue(class Vec3 const &) const; /** * @symbol ?_readArea\@ImprovedNoise\@\@QEBAXPEAMAEBVVec3\@\@HHH1M\@Z */ diff --git a/LiteLoader/include/llapi/mc/InMemoryEnv.hpp b/LiteLoader/include/llapi/mc/InMemoryEnv.hpp index 6a87d309d7..86019090e2 100644 --- a/LiteLoader/include/llapi/mc/InMemoryEnv.hpp +++ b/LiteLoader/include/llapi/mc/InMemoryEnv.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Core.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -135,10 +134,6 @@ class InMemoryEnv { * @symbol ?flushToPermanentStorage\@InMemoryEnv\@\@UEAAXXZ */ virtual void flushToPermanentStorage(); - /** - * @symbol ??0InMemoryEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@AEBVPath\@Core\@\@\@Z - */ - MCAPI InMemoryEnv(class leveldb::Env *, class Core::Path const &); //private: /** diff --git a/LiteLoader/include/llapi/mc/InMemoryFile.hpp b/LiteLoader/include/llapi/mc/InMemoryFile.hpp index 71aaca95db..1b56bcc764 100644 --- a/LiteLoader/include/llapi/mc/InMemoryFile.hpp +++ b/LiteLoader/include/llapi/mc/InMemoryFile.hpp @@ -30,10 +30,6 @@ class InMemoryFile { #endif public: - /** - * @symbol ??0InMemoryFile\@\@QEAA\@AEBVPath\@Core\@\@\@Z - */ - MCAPI InMemoryFile(class Core::Path const &); /** * @symbol ?append\@InMemoryFile\@\@QEAA?AVStatus\@leveldb\@\@AEBVSlice\@3\@\@Z */ @@ -42,26 +38,10 @@ class InMemoryFile { * @symbol ?close\@InMemoryFile\@\@QEAA?AVStatus\@leveldb\@\@W4InMemoryAccessMode\@\@\@Z */ MCAPI class leveldb::Status close(enum class InMemoryAccessMode); - /** - * @symbol ?flushToDisk\@InMemoryFile\@\@QEAA?AVStatus\@leveldb\@\@PEAVEnv\@3\@\@Z - */ - MCAPI class leveldb::Status flushToDisk(class leveldb::Env *); /** * @symbol ?getFilename\@InMemoryFile\@\@QEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer getFilename() const; - /** - * @symbol ?isMarkedDirty\@InMemoryFile\@\@QEBA_NXZ - */ - MCAPI bool isMarkedDirty() const; - /** - * @symbol ?isSafeToDelete\@InMemoryFile\@\@QEBA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI bool isSafeToDelete(std::string &) const; - /** - * @symbol ?markForDelete\@InMemoryFile\@\@QEAAXXZ - */ - MCAPI void markForDelete(); /** * @symbol ?open\@InMemoryFile\@\@QEAA?AVStatus\@leveldb\@\@W4InMemoryAccessMode\@\@\@Z */ @@ -70,13 +50,5 @@ class InMemoryFile { * @symbol ?read\@InMemoryFile\@\@QEBA?AVStatus\@leveldb\@\@_K0PEAVSlice\@3\@PEADAEA_K\@Z */ MCAPI class leveldb::Status read(unsigned __int64, unsigned __int64, class leveldb::Slice *, char *, unsigned __int64 &) const; - /** - * @symbol ?rename\@InMemoryFile\@\@QEAAXAEBVPath\@Core\@\@\@Z - */ - MCAPI void rename(class Core::Path const &); - /** - * @symbol ??1InMemoryFile\@\@QEAA\@XZ - */ - MCAPI ~InMemoryFile(); }; diff --git a/LiteLoader/include/llapi/mc/InMemoryFileStorage.hpp b/LiteLoader/include/llapi/mc/InMemoryFileStorage.hpp index 9d1912f2cc..69a1f462fb 100644 --- a/LiteLoader/include/llapi/mc/InMemoryFileStorage.hpp +++ b/LiteLoader/include/llapi/mc/InMemoryFileStorage.hpp @@ -30,10 +30,6 @@ class InMemoryFileStorage { #endif public: - /** - * @symbol ??0InMemoryFileStorage\@\@QEAA\@PEAVEnv\@leveldb\@\@\@Z - */ - MCAPI InMemoryFileStorage(class leveldb::Env *); /** * @symbol ?createFile\@InMemoryFileStorage\@\@QEAA?AV?$shared_ptr\@VInMemoryFile\@\@\@std\@\@AEBVPath\@Core\@\@\@Z */ @@ -42,10 +38,6 @@ class InMemoryFileStorage { * @symbol ?deleteFile\@InMemoryFileStorage\@\@QEAA_NAEBVPath\@Core\@\@\@Z */ MCAPI bool deleteFile(class Core::Path const &); - /** - * @symbol ?findFile\@InMemoryFileStorage\@\@QEAA_NAEBVPath\@Core\@\@AEAV?$shared_ptr\@VInMemoryFile\@\@\@std\@\@\@Z - */ - MCAPI bool findFile(class Core::Path const &, class std::shared_ptr &); /** * @symbol ?flushToDisk\@InMemoryFileStorage\@\@QEAAXXZ */ @@ -54,9 +46,5 @@ class InMemoryFileStorage { * @symbol ?populateFileList\@InMemoryFileStorage\@\@QEAAXAEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void populateFileList(std::vector &); - /** - * @symbol ??1InMemoryFileStorage\@\@QEAA\@XZ - */ - MCAPI ~InMemoryFileStorage(); }; diff --git a/LiteLoader/include/llapi/mc/InWaterSensingSystem.hpp b/LiteLoader/include/llapi/mc/InWaterSensingSystem.hpp index 26ac841658..def664c9c3 100644 --- a/LiteLoader/include/llapi/mc/InWaterSensingSystem.hpp +++ b/LiteLoader/include/llapi/mc/InWaterSensingSystem.hpp @@ -37,6 +37,10 @@ class InWaterSensingSystem { * @symbol ?doInWaterSensing\@InWaterSensingSystem\@\@CAXAEAVStrictEntityContext\@\@AEBUUpdateWaterStateRequestComponent\@\@AEAUFallDistanceComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@UVehicleComponent\@\@\@\@\@\@\@Z */ MCAPI static void doInWaterSensing(class StrictEntityContext &, struct UpdateWaterStateRequestComponent const &, struct FallDistanceComponent &, class Optional const>, class Optional, class Optional const>, class EntityModifierT>, class ViewT, struct VehicleComponent>>); + /** + * @symbol ?tickInWaterSensing\@InWaterSensingSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUUpdateWaterStateRequestComponent\@\@UFallDistanceComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@UVehicleComponent\@\@\@\@\@\@\@Z + */ + MCAPI static void tickInWaterSensing(class ViewT const>, class Optional, class Optional const>>, class EntityModifierT>, class ViewT, struct VehicleComponent>>); private: diff --git a/LiteLoader/include/llapi/mc/IndexSet.hpp b/LiteLoader/include/llapi/mc/IndexSet.hpp index 5e5e96d153..12589f7ce7 100644 --- a/LiteLoader/include/llapi/mc/IndexSet.hpp +++ b/LiteLoader/include/llapi/mc/IndexSet.hpp @@ -31,14 +31,14 @@ class IndexSet { * @symbol ??0IndexSet\@\@QEAA\@XZ */ MCAPI IndexSet(); - /** - * @symbol ??0IndexSet\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI IndexSet(class IndexSet &&); /** * @symbol ??0IndexSet\@\@QEAA\@AEBV0\@\@Z */ MCAPI IndexSet(class IndexSet const &); + /** + * @symbol ??0IndexSet\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI IndexSet(class IndexSet &&); /** * @symbol ?contains\@IndexSet\@\@QEBA_N_K\@Z */ diff --git a/LiteLoader/include/llapi/mc/InfestedBlock.hpp b/LiteLoader/include/llapi/mc/InfestedBlock.hpp index ff8bb26ab5..2a225fe48b 100644 --- a/LiteLoader/include/llapi/mc/InfestedBlock.hpp +++ b/LiteLoader/include/llapi/mc/InfestedBlock.hpp @@ -181,20 +181,20 @@ class InfestedBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,32 +206,37 @@ class InfestedBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 189 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 190 * @symbol ?getResourceCount\@InfestedBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@InfestedBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/InfestedDeepslateBlock.hpp b/LiteLoader/include/llapi/mc/InfestedDeepslateBlock.hpp index 76c41087c2..e80dfe13a5 100644 --- a/LiteLoader/include/llapi/mc/InfestedDeepslateBlock.hpp +++ b/LiteLoader/include/llapi/mc/InfestedDeepslateBlock.hpp @@ -176,25 +176,25 @@ class InfestedDeepslateBlock : public RotatedPillarInfestedBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 160 - * @symbol ?tryGetUninfested\@InfestedDeepslateBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual class Block const * tryGetUninfested(class Block const &) const; + virtual void __unk_vfn_157(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 161 + * @symbol ?tryGetUninfested\@InfestedDeepslateBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ - virtual void __unk_vfn_165(); + virtual class Block const * tryGetUninfested(class Block const &) const; /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,25 +206,30 @@ class InfestedDeepslateBlock : public RotatedPillarInfestedBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0InfestedDeepslateBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/InitialTickFilterSystem.hpp b/LiteLoader/include/llapi/mc/InitialTickFilterSystem.hpp index b15240a4fe..8b8ec8c844 100644 --- a/LiteLoader/include/llapi/mc/InitialTickFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/InitialTickFilterSystem.hpp @@ -49,6 +49,10 @@ class InitialTickFilterSystem { * @symbol ?_blockFilterTickView\@InitialTickFilterSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUStateVectorComponent\@\@U?$Exclude\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UGlobalActorFlag\@\@\@\@USideBySideSimulatorComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUDimensionTypeComponent\@\@\@\@V?$OptionalGlobalT\@$$CBULocalConstBlockSourceFactoryComponent\@\@VEntityRegistryBase\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@\@Z */ MCAPI static void _blockFilterTickView(class ViewT>, struct StateVectorComponent const, struct Exclude, class FlagComponent, struct SideBySideSimulatorComponent>>, class ViewT, class OptionalGlobalT, class EntityModifierT>); + /** + * @symbol ?_tickingAreaFilterTickView\@InitialTickFilterSystem\@\@CAXV?$OptionalGlobalT\@$$CBUCurrentTickComponent\@\@VEntityRegistryBase\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@VTickWorldComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void _tickingAreaFilterTickView(class OptionalGlobalT, class ViewT>, class TickWorldComponent>, class EntityModifierT>); private: diff --git a/LiteLoader/include/llapi/mc/InputPermissionCommand.hpp b/LiteLoader/include/llapi/mc/InputPermissionCommand.hpp new file mode 100644 index 0000000000..cf6b7641cc --- /dev/null +++ b/LiteLoader/include/llapi/mc/InputPermissionCommand.hpp @@ -0,0 +1,59 @@ +/** + * @file InputPermissionCommand.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Command.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class InputPermissionCommand : public Command { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_INPUTPERMISSIONCOMMAND +public: + class InputPermissionCommand& operator=(class InputPermissionCommand const &) = delete; + InputPermissionCommand(class InputPermissionCommand const &) = delete; + InputPermissionCommand() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 2 + * @symbol ?execute\@InputPermissionCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + */ + virtual void execute(class CommandOrigin const &, class CommandOutput &) const; + /** + * @symbol ?setup\@InputPermissionCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + */ + MCAPI static void setup(class CommandRegistry &); + +//private: + /** + * @symbol ?_executeQuery\@InputPermissionCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + */ + MCAPI void _executeQuery(class CommandOrigin const &, class CommandOutput &) const; + /** + * @symbol ?_executeQueryVerbose\@InputPermissionCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + */ + MCAPI void _executeQueryVerbose(class CommandOrigin const &, class CommandOutput &) const; + /** + * @symbol ?_executeSet\@InputPermissionCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + */ + MCAPI void _executeSet(class CommandOrigin const &, class CommandOutput &) const; + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/InsideBlockEventMap.hpp b/LiteLoader/include/llapi/mc/InsideBlockEventMap.hpp index 3fe967b89d..1cb3a3b76f 100644 --- a/LiteLoader/include/llapi/mc/InsideBlockEventMap.hpp +++ b/LiteLoader/include/llapi/mc/InsideBlockEventMap.hpp @@ -27,18 +27,10 @@ class InsideBlockEventMap { #endif public: - /** - * @symbol ??0InsideBlockEventMap\@\@QEAA\@AEBVBlock\@\@_N11AEBVActorDefinitionTrigger\@\@2\@Z - */ - MCAPI InsideBlockEventMap(class Block const &, bool, bool, bool, class ActorDefinitionTrigger const &, class ActorDefinitionTrigger const &); /** * @symbol ??0InsideBlockEventMap\@\@QEAA\@AEBV0\@\@Z */ MCAPI InsideBlockEventMap(class InsideBlockEventMap const &); - /** - * @symbol ?getBlock\@InsideBlockEventMap\@\@QEBA?AV?$not_null\@PEBVBlock\@\@\@gsl\@\@XZ - */ - MCAPI class gsl::not_null getBlock() const; /** * @symbol ?getEnteredEvent\@InsideBlockEventMap\@\@QEBAAEBVActorDefinitionTrigger\@\@XZ */ @@ -51,10 +43,6 @@ class InsideBlockEventMap { * @symbol ?isActorCurrentlyInside\@InsideBlockEventMap\@\@QEBA_NXZ */ MCAPI bool isActorCurrentlyInside() const; - /** - * @symbol ?isIgnoringStates\@InsideBlockEventMap\@\@QEBA_NXZ - */ - MCAPI bool isIgnoringStates() const; /** * @symbol ?isWatchingIfActorEnters\@InsideBlockEventMap\@\@QEBA_NXZ */ @@ -67,14 +55,6 @@ class InsideBlockEventMap { * @symbol ??4InsideBlockEventMap\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class InsideBlockEventMap & operator=(class InsideBlockEventMap const &); - /** - * @symbol ?setCurrentlyInside\@InsideBlockEventMap\@\@QEAAX_N\@Z - */ - MCAPI void setCurrentlyInside(bool); - /** - * @symbol ?setWasInside\@InsideBlockEventMap\@\@QEAAX_N\@Z - */ - MCAPI void setWasInside(bool); /** * @symbol ?wasActorInsideLastTick\@InsideBlockEventMap\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/InsideBubbleColumnBlockComponent.hpp b/LiteLoader/include/llapi/mc/InsideBubbleColumnBlockComponent.hpp index d9137c3473..a38ea305f9 100644 --- a/LiteLoader/include/llapi/mc/InsideBubbleColumnBlockComponent.hpp +++ b/LiteLoader/include/llapi/mc/InsideBubbleColumnBlockComponent.hpp @@ -31,9 +31,5 @@ struct InsideBubbleColumnBlockComponent { * @symbol ??4InsideBubbleColumnBlockComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct InsideBubbleColumnBlockComponent & operator=(struct InsideBubbleColumnBlockComponent &&); - /** - * @symbol ??1InsideBubbleColumnBlockComponent\@\@QEAA\@XZ - */ - MCAPI ~InsideBubbleColumnBlockComponent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/InsideBubbleColumnSystemImpl.hpp b/LiteLoader/include/llapi/mc/InsideBubbleColumnSystemImpl.hpp new file mode 100644 index 0000000000..e81d5d0d92 --- /dev/null +++ b/LiteLoader/include/llapi/mc/InsideBubbleColumnSystemImpl.hpp @@ -0,0 +1,32 @@ +/** + * @file InsideBubbleColumnSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class InsideBubbleColumnSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_INSIDEBUBBLECOLUMNSYSTEMIMPL +public: + class InsideBubbleColumnSystemImpl& operator=(class InsideBubbleColumnSystemImpl const &) = delete; + InsideBubbleColumnSystemImpl(class InsideBubbleColumnSystemImpl const &) = delete; + InsideBubbleColumnSystemImpl() = delete; +#endif + +public: + /** + * @symbol ?boatInsideBubbleColumn\@InsideBubbleColumnSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUInsideBubbleColumnBlockComponent\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void boatInsideBubbleColumn(class ViewT>, class ActorOwnerComponent>); + +}; diff --git a/LiteLoader/include/llapi/mc/InsideCactusBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsideCactusBlockSystem.hpp index 9ca5f9524a..8c8fe8efed 100644 --- a/LiteLoader/include/llapi/mc/InsideCactusBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsideCactusBlockSystem.hpp @@ -31,5 +31,9 @@ class InsideCactusBlockSystem { * @symbol ?createSystem\@InsideCactusBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?tick\@InsideCactusBlockSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBU?$InsideBlockWithPosAndBlockComponent\@UCactusBlockFlag\@\@\@\@UInsideBlockComponent\@\@\@\@\@Z + */ + MCAPI static void tick(class ViewT const, struct InsideBlockComponent>); }; diff --git a/LiteLoader/include/llapi/mc/InsideEndPortalBlockSystemImpl.hpp b/LiteLoader/include/llapi/mc/InsideEndPortalBlockSystemImpl.hpp index 43f0831464..47f2e6aeec 100644 --- a/LiteLoader/include/llapi/mc/InsideEndPortalBlockSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/InsideEndPortalBlockSystemImpl.hpp @@ -31,5 +31,9 @@ class InsideEndPortalBlockSystemImpl { * @symbol ?_tickInsideEndPortalBlockSystem\@InsideEndPortalBlockSystemImpl\@\@SAXAEAVStrictEntityContext\@\@AEBU?$InsideBlockWithPosAndBlockComponent\@UEndPortalBlockFlag\@\@\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _tickInsideEndPortalBlockSystem(class StrictEntityContext &, struct InsideBlockWithPosAndBlockComponent const &, class ActorOwnerComponent &); + /** + * @symbol ?tickInsideEndPortalBlockSystem\@InsideEndPortalBlockSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBU?$InsideBlockWithPosAndBlockComponent\@UEndPortalBlockFlag\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void tickInsideEndPortalBlockSystem(class ViewT const, class ActorOwnerComponent>); }; diff --git a/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystemImpl.hpp b/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystemImpl.hpp index 4a6f90fe1e..01ea761373 100644 --- a/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystemImpl.hpp @@ -31,5 +31,13 @@ class InsidePowderSnowBlockSystemImpl { * @symbol ?SLOWDOWN_MODIFIER\@InsidePowderSnowBlockSystemImpl\@\@2VVec3\@\@B */ MCAPI static class Vec3 const SLOWDOWN_MODIFIER; + /** + * @symbol ?movementSlowdownSystem\@InsidePowderSnowBlockSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UBlockMovementSlowdownMultiplierComponent\@\@U?$Include\@U?$InsideBlockWithPosAndBlockComponent\@UPowderSnowBlockFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z + */ + MCAPI static void movementSlowdownSystem(class ViewT>>, class EntityModifierT); + /** + * @symbol ?serverSideFreezingSystem\@InsidePowderSnowBlockSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@U?$InsideBlockWithPosAndBlockComponent\@UPowderSnowBlockFlag\@\@\@\@\@\@U?$Exclude\@VFreezingComponent\@\@V?$FlagComponent\@UFreezeImmuneFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@U?$InsideBlockWithPosAndBlockComponent\@UPowderSnowBlockFlag\@\@\@\@\@\@U?$Exclude\@VFreezingComponent\@\@V?$FlagComponent\@UFreezeImmuneFlag\@\@\@\@\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UIsDeadFlag\@\@\@\@\@\@$$CBUPlayerGameTypeComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@VFreezingComponent\@\@\@\@\@Z + */ + MCAPI static void serverSideFreezingSystem(class ViewT>, struct Exclude>, struct Exclude>>, class ViewT>, struct Exclude>, struct Include>, struct Exclude>, struct PlayerGameTypeComponent const>, class EntityModifierT); }; diff --git a/LiteLoader/include/llapi/mc/InsideSweetBerryBushBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsideSweetBerryBushBlockSystem.hpp index 433ca7a54b..b2dd47be1e 100644 --- a/LiteLoader/include/llapi/mc/InsideSweetBerryBushBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsideSweetBerryBushBlockSystem.hpp @@ -31,5 +31,9 @@ class InsideSweetBerryBushBlockSystem { * @symbol ?createSystem\@InsideSweetBerryBushBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?tick\@InsideSweetBerryBushBlockSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBU?$InsideBlockWithPosAndBlockComponent\@USweetBerryBushBlockFlag\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void tick(class ViewT const, class ActorOwnerComponent>); }; diff --git a/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystemImpl.hpp b/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystemImpl.hpp index 894d8303ad..8ef0730553 100644 --- a/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystemImpl.hpp @@ -31,5 +31,13 @@ class InsideWaterlilyBlockSystemImpl { * @symbol ?_tickMovementSystem\@InsideWaterlilyBlockSystemImpl\@\@SAXAEBVStrictEntityContext\@\@AEBU?$InsideBlockWithPosComponent\@UWaterlilyBlockFlag\@\@\@\@AEAUStateVectorComponent\@\@\@Z */ MCAPI static void _tickMovementSystem(class StrictEntityContext const &, struct InsideBlockWithPosComponent const &, struct StateVectorComponent &); + /** + * @symbol ?tickDestroyWaterlilySystem\@InsideWaterlilyBlockSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@\@\@$$CBU?$InsideBlockWithPosComponent\@UWaterlilyBlockFlag\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void tickDestroyWaterlilySystem(class ViewT>, struct InsideBlockWithPosComponent const, class ActorOwnerComponent>); + /** + * @symbol ?tickMovementSystem\@InsideWaterlilyBlockSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@\@\@$$CBU?$InsideBlockWithPosComponent\@UWaterlilyBlockFlag\@\@\@\@UStateVectorComponent\@\@\@\@\@Z + */ + MCAPI static void tickMovementSystem(class ViewT>, struct InsideBlockWithPosComponent const, struct StateVectorComponent>); }; diff --git a/LiteLoader/include/llapi/mc/InsideWebBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsideWebBlockSystem.hpp index e546fe7c1c..98b1bb8bc6 100644 --- a/LiteLoader/include/llapi/mc/InsideWebBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsideWebBlockSystem.hpp @@ -39,5 +39,9 @@ class InsideWebBlockSystem { * @symbol ?createSlowdownSystem\@InsideWebBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSlowdownSystem(); + /** + * @symbol ?webSlowdownSystem\@InsideWebBlockSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UWebBlockTag\@\@\@\@\@\@UBlockMovementSlowdownMultiplierComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z + */ + MCAPI static void webSlowdownSystem(class ViewT>, struct BlockMovementSlowdownMultiplierComponent>, class EntityModifierT); }; diff --git a/LiteLoader/include/llapi/mc/Int64Tag.hpp b/LiteLoader/include/llapi/mc/Int64Tag.hpp index 0dbc4c1645..e1e874619e 100644 --- a/LiteLoader/include/llapi/mc/Int64Tag.hpp +++ b/LiteLoader/include/llapi/mc/Int64Tag.hpp @@ -35,6 +35,7 @@ int64_t val; public: class Int64Tag& operator=(class Int64Tag const &) = delete; Int64Tag(class Int64Tag const &) = delete; + Int64Tag() = delete; #endif public: @@ -82,9 +83,5 @@ int64_t val; * @symbol ??0Int64Tag\@\@QEAA\@_J\@Z */ MCAPI Int64Tag(__int64); - /** - * @symbol ??0Int64Tag\@\@QEAA\@XZ - */ - MCAPI Int64Tag(); }; diff --git a/LiteLoader/include/llapi/mc/IntArrayTag.hpp b/LiteLoader/include/llapi/mc/IntArrayTag.hpp index 94e0fed77e..befcd16501 100644 --- a/LiteLoader/include/llapi/mc/IntArrayTag.hpp +++ b/LiteLoader/include/llapi/mc/IntArrayTag.hpp @@ -37,6 +37,7 @@ class IntArrayTag : public Tag { public: class IntArrayTag& operator=(class IntArrayTag const &) = delete; IntArrayTag(class IntArrayTag const &) = delete; + IntArrayTag() = delete; #endif public: @@ -80,9 +81,5 @@ class IntArrayTag : public Tag { * @symbol ?hash\@IntArrayTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; - /** - * @symbol ??0IntArrayTag\@\@QEAA\@XZ - */ - MCAPI IntArrayTag(); }; diff --git a/LiteLoader/include/llapi/mc/IntComponent.hpp b/LiteLoader/include/llapi/mc/IntComponent.hpp index c47a76f6ea..c17a100cd4 100644 --- a/LiteLoader/include/llapi/mc/IntComponent.hpp +++ b/LiteLoader/include/llapi/mc/IntComponent.hpp @@ -24,6 +24,10 @@ struct IntComponent { #endif public: + /** + * @symbol ?toString\@IntComponent\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + MCAPI std::string toString() const; /** * @symbol ?getDiff\@IntComponent\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBU1\@0\@Z */ diff --git a/LiteLoader/include/llapi/mc/Interaction.hpp b/LiteLoader/include/llapi/mc/Interaction.hpp index d116cf33f9..41b23f3d54 100644 --- a/LiteLoader/include/llapi/mc/Interaction.hpp +++ b/LiteLoader/include/llapi/mc/Interaction.hpp @@ -27,6 +27,10 @@ struct Interaction { #endif public: + /** + * @symbol ??0Interaction\@\@QEAA\@XZ + */ + MCAPI Interaction(); /** * @symbol ??0Interaction\@\@QEAA\@$$QEAU0\@\@Z */ @@ -35,10 +39,6 @@ struct Interaction { * @symbol ??0Interaction\@\@QEAA\@AEBU0\@\@Z */ MCAPI Interaction(struct Interaction const &); - /** - * @symbol ??0Interaction\@\@QEAA\@XZ - */ - MCAPI Interaction(); /** * @symbol ?addActorDefinitionIdentifierByName\@Interaction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/InternalItemDescriptor.hpp b/LiteLoader/include/llapi/mc/InternalItemDescriptor.hpp index 20a6e2068a..317833306f 100644 --- a/LiteLoader/include/llapi/mc/InternalItemDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/InternalItemDescriptor.hpp @@ -13,15 +13,15 @@ #undef BEFORE_EXTRA -class InternalItemDescriptor { +struct InternalItemDescriptor { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_INTERNALITEMDESCRIPTOR public: - class InternalItemDescriptor& operator=(class InternalItemDescriptor const &) = delete; - InternalItemDescriptor(class InternalItemDescriptor const &) = delete; + struct InternalItemDescriptor& operator=(struct InternalItemDescriptor const &) = delete; + InternalItemDescriptor(struct InternalItemDescriptor const &) = delete; InternalItemDescriptor() = delete; #endif @@ -76,4 +76,4 @@ class InternalItemDescriptor { */ MCAPI static std::unique_ptr deserialize(class ReadOnlyBinaryStream &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/InternalSystemInfo.hpp b/LiteLoader/include/llapi/mc/InternalSystemInfo.hpp index 1c31d9ebc5..aff070e59c 100644 --- a/LiteLoader/include/llapi/mc/InternalSystemInfo.hpp +++ b/LiteLoader/include/llapi/mc/InternalSystemInfo.hpp @@ -27,10 +27,6 @@ struct InternalSystemInfo { #endif public: - /** - * @symbol ??0InternalSystemInfo\@\@QEAA\@$$QEAU0\@\@Z - */ - MCAPI InternalSystemInfo(struct InternalSystemInfo &&); /** * @symbol ??1InternalSystemInfo\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/InterpolatedRidingPositionCalculationHelper.hpp b/LiteLoader/include/llapi/mc/InterpolatedRidingPositionCalculationHelper.hpp index ff8c44abf2..093f8498a7 100644 --- a/LiteLoader/include/llapi/mc/InterpolatedRidingPositionCalculationHelper.hpp +++ b/LiteLoader/include/llapi/mc/InterpolatedRidingPositionCalculationHelper.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class InterpolatedRidingPositionCalculationHelper { +struct InterpolatedRidingPositionCalculationHelper { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_INTERPOLATEDRIDINGPOSITIONCALCULATIONHELPER public: - class InterpolatedRidingPositionCalculationHelper& operator=(class InterpolatedRidingPositionCalculationHelper const &) = delete; - InterpolatedRidingPositionCalculationHelper(class InterpolatedRidingPositionCalculationHelper const &) = delete; + struct InterpolatedRidingPositionCalculationHelper& operator=(struct InterpolatedRidingPositionCalculationHelper const &) = delete; + InterpolatedRidingPositionCalculationHelper(struct InterpolatedRidingPositionCalculationHelper const &) = delete; InterpolatedRidingPositionCalculationHelper() = delete; #endif @@ -45,4 +45,4 @@ class InterpolatedRidingPositionCalculationHelper { */ MCAPI static class Vec3 getInterpolatedPosition(class StrictEntityContext const &, class ViewT, float); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Inventory.hpp b/LiteLoader/include/llapi/mc/Inventory.hpp index a2386aedb4..77c3eb131c 100644 --- a/LiteLoader/include/llapi/mc/Inventory.hpp +++ b/LiteLoader/include/llapi/mc/Inventory.hpp @@ -41,87 +41,54 @@ class Inventory : public FillingContainer { */ virtual void init(); /** - * @vftbl 9 + * @vftbl 10 * @symbol ?setItem\@Inventory\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setItem(int, class ItemStack const &); /** - * @vftbl 10 + * @vftbl 11 * @symbol ?setItemWithForceBalance\@Inventory\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setItemWithForceBalance(int, class ItemStack const &, bool); /** - * @vftbl 20 + * @vftbl 21 * @symbol ?getEmptySlotsCount\@Inventory\@\@UEBAHXZ */ virtual int getEmptySlotsCount() const; - /** - * @vftbl 23 - * @symbol __unk_vfn_23 - */ - virtual void __unk_vfn_23(); /** * @vftbl 24 * @symbol __unk_vfn_24 */ virtual void __unk_vfn_24(); /** - * @vftbl 34 + * @vftbl 25 + * @symbol __unk_vfn_25 + */ + virtual void __unk_vfn_25(); + /** + * @vftbl 35 * @symbol ?add\@Inventory\@\@UEAA_NAEAVItemStack\@\@\@Z */ virtual bool add(class ItemStack &); /** - * @vftbl 35 + * @vftbl 36 * @symbol ?canAdd\@Inventory\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool canAdd(class ItemStack const &) const; /** - * @vftbl 39 + * @vftbl 40 * @symbol ?getFirstEmptySlot\@Inventory\@\@UEBAHXZ */ virtual int getFirstEmptySlot() const; /** - * @vftbl 40 + * @vftbl 41 * @symbol ?setContainerSize\@Inventory\@\@UEAAXH\@Z */ virtual void setContainerSize(int); - /** - * @vftbl 41 - * @symbol __unk_vfn_41 - */ - virtual void __unk_vfn_41(); - /** - * @vftbl 42 - * @symbol __unk_vfn_42 - */ - virtual void __unk_vfn_42(); - /** - * @vftbl 43 - * @symbol __unk_vfn_43 - */ - virtual void __unk_vfn_43(); - /** - * @vftbl 44 - * @symbol __unk_vfn_44 - */ - virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z - */ - virtual void _Delete_this(bool); - /** - * @symbol ??0Inventory\@\@QEAA\@PEAVPlayer\@\@\@Z - */ - MCAPI Inventory(class Player *); /** * @symbol ?dropSlot\@Inventory\@\@QEAAXH_N00\@Z */ MCAPI void dropSlot(int, bool, bool, bool); - /** - * @symbol ?getComplexItems\@Inventory\@\@QEAA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector getComplexItems(); /** * @symbol ?setupDefault\@Inventory\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/InventoryAction.hpp b/LiteLoader/include/llapi/mc/InventoryAction.hpp index e49076336e..cb9b7834e7 100644 --- a/LiteLoader/include/llapi/mc/InventoryAction.hpp +++ b/LiteLoader/include/llapi/mc/InventoryAction.hpp @@ -55,10 +55,6 @@ class InventoryAction { * @symbol ??4InventoryAction\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class InventoryAction & operator=(class InventoryAction const &); - /** - * @symbol ?postLoadItems\@InventoryAction\@\@QEAAXAEAVBlockPalette\@\@_N\@Z - */ - MCAPI void postLoadItems(class BlockPalette &, bool); /** * @symbol ??1InventoryAction\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp b/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp index cd39d8aa8f..816866d3f5 100644 --- a/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp +++ b/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp @@ -60,13 +60,13 @@ class InventorySlotPacket : public Packet { */ MCVAPI ~InventorySlotPacket(); #endif - /** - * @symbol ??0InventorySlotPacket\@\@QEAA\@XZ - */ - MCAPI InventorySlotPacket(); /** * @symbol ??0InventorySlotPacket\@\@QEAA\@W4ContainerID\@\@IAEBVItemStack\@\@\@Z */ MCAPI InventorySlotPacket(enum class ContainerID, unsigned int, class ItemStack const &); + /** + * @symbol ??0InventorySlotPacket\@\@QEAA\@XZ + */ + MCAPI InventorySlotPacket(); }; diff --git a/LiteLoader/include/llapi/mc/InventoryTransaction.hpp b/LiteLoader/include/llapi/mc/InventoryTransaction.hpp index 6059785417..9db01fa484 100644 --- a/LiteLoader/include/llapi/mc/InventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/InventoryTransaction.hpp @@ -65,22 +65,10 @@ class InventoryTransaction { * @symbol ?postLoadItems\@InventoryTransaction\@\@QEAAXAEAVBlockPalette\@\@_N\@Z */ MCAPI void postLoadItems(class BlockPalette &, bool); - /** - * @symbol ?recalculateBalance\@InventoryTransaction\@\@QEAAXXZ - */ - MCAPI void recalculateBalance(); /** * @symbol ?serialize\@InventoryTransaction\@\@QEBAXAEAVBinaryStream\@\@_N\@Z */ MCAPI void serialize(class BinaryStream &, bool) const; - /** - * @symbol ?verifyBalance\@InventoryTransaction\@\@QEBA_NXZ - */ - MCAPI bool verifyBalance() const; - /** - * @symbol ?verifyFull\@InventoryTransaction\@\@QEBA?AW4InventoryTransactionError\@\@AEAVPlayer\@\@_N\@Z - */ - MCAPI enum class InventoryTransactionError verifyFull(class Player &, bool) const; /** * @symbol ??1InventoryTransaction\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/InventoryTransactionManager.hpp b/LiteLoader/include/llapi/mc/InventoryTransactionManager.hpp index ec1438a96c..ec99660be0 100644 --- a/LiteLoader/include/llapi/mc/InventoryTransactionManager.hpp +++ b/LiteLoader/include/llapi/mc/InventoryTransactionManager.hpp @@ -45,10 +45,6 @@ class InventoryTransactionManager { * @symbol ?addExpectedAction\@InventoryTransactionManager\@\@QEAAXAEBVInventoryAction\@\@\@Z */ MCAPI void addExpectedAction(class InventoryAction const &); - /** - * @symbol ?checkActionExpected\@InventoryTransactionManager\@\@QEAA_NAEBVInventoryAction\@\@\@Z - */ - MCAPI bool checkActionExpected(class InventoryAction const &); /** * @symbol ?forceBalanceTransaction\@InventoryTransactionManager\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/InvisibleBlock.hpp b/LiteLoader/include/llapi/mc/InvisibleBlock.hpp index d5c629bf2f..ed6a01a579 100644 --- a/LiteLoader/include/llapi/mc/InvisibleBlock.hpp +++ b/LiteLoader/include/llapi/mc/InvisibleBlock.hpp @@ -176,20 +176,20 @@ class InvisibleBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,30 +201,35 @@ class InvisibleBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 176 * @symbol ?clip\@InvisibleBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0InvisibleBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/IsSpawnableDescription.hpp b/LiteLoader/include/llapi/mc/IsSpawnableDescription.hpp index 30e8229576..28a7ecd303 100644 --- a/LiteLoader/include/llapi/mc/IsSpawnableDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsSpawnableDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -40,9 +39,5 @@ class IsSpawnableDescription { * @symbol ?getJsonName\@IsSpawnableDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; - /** - * @symbol ?parse\@IsSpawnableDescription\@\@QEAAXAEBVValue\@Json\@\@\@Z - */ - MCAPI void parse(class Json::Value const &); }; diff --git a/LiteLoader/include/llapi/mc/IsSummonableDescription.hpp b/LiteLoader/include/llapi/mc/IsSummonableDescription.hpp index a851f457e2..4d08c975f6 100644 --- a/LiteLoader/include/llapi/mc/IsSummonableDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsSummonableDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -40,9 +39,5 @@ class IsSummonableDescription { * @symbol ?getJsonName\@IsSummonableDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; - /** - * @symbol ?parse\@IsSummonableDescription\@\@QEAAXAEBVValue\@Json\@\@\@Z - */ - MCAPI void parse(class Json::Value const &); }; diff --git a/LiteLoader/include/llapi/mc/IsTakingFireDamageTest.hpp b/LiteLoader/include/llapi/mc/IsTakingFireDamageTest.hpp new file mode 100644 index 0000000000..90b1033841 --- /dev/null +++ b/LiteLoader/include/llapi/mc/IsTakingFireDamageTest.hpp @@ -0,0 +1,65 @@ +/** + * @file IsTakingFireDamageTest.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "FilterTest.hpp" +#include "Json.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class IsTakingFireDamageTest { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ISTAKINGFIREDAMAGETEST +public: + class IsTakingFireDamageTest& operator=(class IsTakingFireDamageTest const &) = delete; + IsTakingFireDamageTest(class IsTakingFireDamageTest const &) = delete; + IsTakingFireDamageTest() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@IsTakingFireDamageTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + */ + virtual bool evaluate(struct FilterContext const &) const; + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@IsTakingFireDamageTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ + */ + virtual class std::basic_string_view> getName() const; + /** + * @vftbl 5 + * @symbol ?_serializeDomain\@FilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; + +}; diff --git a/LiteLoader/include/llapi/mc/Item.hpp b/LiteLoader/include/llapi/mc/Item.hpp index d73985d1c4..9c61ac914b 100644 --- a/LiteLoader/include/llapi/mc/Item.hpp +++ b/LiteLoader/include/llapi/mc/Item.hpp @@ -9,7 +9,7 @@ #define BEFORE_EXTRA // Include Headers or Declare Types Here - +#define ENABLE_VIRTUAL_FAKESYMBOL_ITEM #undef BEFORE_EXTRA /** @@ -699,9 +699,9 @@ class Tier { virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** * @vftbl 132 - * @symbol ?_useOn\@Item\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@Item\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEM /** * @symbol ?getBaseColor\@Item\@\@UEBA?AVColor\@mce\@\@AEBVItemStack\@\@\@Z @@ -780,10 +780,6 @@ class Tier { * @symbol ?addTags\@Item\@\@QEAAAEAV1\@V?$initializer_list\@V?$reference_wrapper\@$$CBUItemTag\@\@\@std\@\@\@std\@\@\@Z */ MCAPI class Item & addTags(class std::initializer_list>); - /** - * @symbol ?allowOffhand\@Item\@\@QEBA_NXZ - */ - MCAPI bool allowOffhand() const; /** * @symbol ?buildDescriptor\@Item\@\@QEBA?AVItemDescriptor\@\@FPEBVCompoundTag\@\@\@Z */ @@ -796,14 +792,6 @@ class Tier { * @symbol ?destroySpeedBonus\@Item\@\@QEBAMAEBVItemStackBase\@\@\@Z */ MCAPI float destroySpeedBonus(class ItemStackBase const &) const; - /** - * @symbol ?fixupOnLoad\@Item\@\@QEBAXAEAVItemStackBase\@\@AEAVLevel\@\@\@Z - */ - MCAPI void fixupOnLoad(class ItemStackBase &, class Level &) const; - /** - * @symbol ?fixupOnLoad\@Item\@\@QEBAXAEAVItemStackBase\@\@\@Z - */ - MCAPI void fixupOnLoad(class ItemStackBase &) const; /** * @symbol ?getCommandNames\@Item\@\@QEBA?AV?$vector\@UCommandName\@\@V?$allocator\@UCommandName\@\@\@std\@\@\@std\@\@XZ */ @@ -856,18 +844,6 @@ class Tier { * @symbol ?getSerializedName\@Item\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getSerializedName() const; - /** - * @symbol ?getUseAnimation\@Item\@\@QEBA?AW4UseAnimation\@\@XZ - */ - MCAPI enum class UseAnimation getUseAnimation() const; - /** - * @symbol ?hasDamageValue\@Item\@\@QEBA_NPEBVCompoundTag\@\@\@Z - */ - MCAPI bool hasDamageValue(class CompoundTag const *) const; - /** - * @symbol ?hasTag\@Item\@\@QEBA_NAEB_K\@Z - */ - MCAPI bool hasTag(unsigned __int64 const &) const; /** * @symbol ?isCommandOnly\@Item\@\@QEBA_NAEBVBaseGameVersion\@\@\@Z */ @@ -876,14 +852,6 @@ class Tier { * @symbol ?isElytra\@Item\@\@QEBA_NXZ */ MCAPI bool isElytra() const; - /** - * @symbol ?isExplodable\@Item\@\@QEBA_NXZ - */ - MCAPI bool isExplodable() const; - /** - * @symbol ?isFireResistant\@Item\@\@QEBA_NXZ - */ - MCAPI bool isFireResistant() const; /** * @symbol ?isNameTag\@Item\@\@QEBA_NXZ */ @@ -896,10 +864,6 @@ class Tier { * @symbol ??8Item\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class Item const &) const; - /** - * @symbol ?removeDamageValue\@Item\@\@QEBAXAEAVItemStackBase\@\@\@Z - */ - MCAPI void removeDamageValue(class ItemStackBase &) const; /** * @symbol ?setAllowOffhand\@Item\@\@QEAAAEAV1\@_N\@Z */ @@ -937,9 +901,9 @@ class Tier { */ MCAPI bool updateCustomBlockEntityTag(class BlockSource &, class ItemStackBase &, class BlockPos const &) const; /** - * @symbol ?useOn\@Item\@\@QEBA_NAEAVItemStack\@\@AEAVActor\@\@HHHEAEBVVec3\@\@\@Z + * @symbol ?useOn\@Item\@\@QEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@HHHEAEBVVec3\@\@\@Z */ - MCAPI bool useOn(class ItemStack &, class Actor &, int, int, int, unsigned char, class Vec3 const &) const; + MCAPI class InteractionResult useOn(class ItemStack &, class Actor &, int, int, int, unsigned char, class Vec3 const &) const; /** * @symbol ?ICON_DESCRIPTION_PREFIX\@Item\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/ItemColorUtil.hpp b/LiteLoader/include/llapi/mc/ItemColorUtil.hpp index bfb82d3953..188dfbd33d 100644 --- a/LiteLoader/include/llapi/mc/ItemColorUtil.hpp +++ b/LiteLoader/include/llapi/mc/ItemColorUtil.hpp @@ -25,10 +25,18 @@ namespace ItemColorUtil { * @symbol ?fromBlockColor\@ItemColorUtil\@\@YA?AW4ItemColor\@\@W4BlockColor\@\@\@Z */ MCAPI enum class ItemColor fromBlockColor(enum class BlockColor); + /** + * @symbol ?fromColor\@ItemColorUtil\@\@YA?AW4ItemColor\@\@AEBVColor\@mce\@\@\@Z + */ + MCAPI enum class ItemColor fromColor(class mce::Color const &); /** * @symbol ?fromInt\@ItemColorUtil\@\@YA?AW4ItemColor\@\@H\@Z */ MCAPI enum class ItemColor fromInt(int); + /** + * @symbol ?getColor\@ItemColorUtil\@\@YA?AVColor\@mce\@\@W4ItemColor\@\@\@Z + */ + MCAPI class mce::Color getColor(enum class ItemColor); /** * @symbol ?getName\@ItemColorUtil\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ItemColor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemContext.hpp b/LiteLoader/include/llapi/mc/ItemContext.hpp index 014568744a..af0fee45b0 100644 --- a/LiteLoader/include/llapi/mc/ItemContext.hpp +++ b/LiteLoader/include/llapi/mc/ItemContext.hpp @@ -29,21 +29,21 @@ class ItemContext { */ MCAPI ItemContext(class BlockSource &, class BlockPos const &, int); /** - * @symbol ??0ItemContext\@\@QEAA\@AEBVWeakEntityRef\@\@H\@Z + * @symbol ??0ItemContext\@\@QEAA\@AEBVWeakEntityRef\@\@W4EquipmentSlot\@\@\@Z */ - MCAPI ItemContext(class WeakEntityRef const &, int); + MCAPI ItemContext(class WeakEntityRef const &, enum class EquipmentSlot); /** - * @symbol ?clone\@ItemContext\@\@QEBA?AVItemStack\@\@XZ + * @symbol ??0ItemContext\@\@QEAA\@AEBVWeakEntityRef\@\@H\@Z */ - MCAPI class ItemStack clone() const; + MCAPI ItemContext(class WeakEntityRef const &, int); /** - * @symbol ?getAmount\@ItemContext\@\@QEBAHXZ + * @symbol ?clone\@ItemContext\@\@QEBA?AV?$optional\@VItemStack\@\@\@std\@\@XZ */ - MCAPI int getAmount() const; + MCAPI class std::optional clone() const; /** - * @symbol ?getData\@ItemContext\@\@QEBAHXZ + * @symbol ?getAmount\@ItemContext\@\@QEBA?AV?$optional\@H\@std\@\@XZ */ - MCAPI int getData() const; + MCAPI class std::optional getAmount() const; /** * @symbol ?getId\@ItemContext\@\@QEBA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@XZ */ @@ -53,79 +53,99 @@ class ItemContext { */ MCAPI class ItemStack const & getItem() const; /** - * @symbol ?getKeepOnDeath\@ItemContext\@\@QEBA_NXZ + * @symbol ?getKeepOnDeath\@ItemContext\@\@QEBA?AV?$optional\@_N\@std\@\@XZ */ - MCAPI bool getKeepOnDeath() const; + MCAPI class std::optional getKeepOnDeath() const; /** - * @symbol ?getLockMode\@ItemContext\@\@QEBA?AW4ItemLockMode\@\@XZ + * @symbol ?getLockMode\@ItemContext\@\@QEBA?AV?$optional\@W4ItemLockMode\@\@\@std\@\@XZ */ - MCAPI enum class ItemLockMode getLockMode() const; + MCAPI class std::optional getLockMode() const; /** * @symbol ?getLore\@ItemContext\@\@QEBA?AV?$optional\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@std\@\@XZ */ MCAPI class std::optional> getLore() const; /** - * @symbol ?getMaxAmount\@ItemContext\@\@QEBAHXZ + * @symbol ?getMaxAmount\@ItemContext\@\@QEBA?AV?$optional\@H\@std\@\@XZ */ - MCAPI int getMaxAmount() const; + MCAPI class std::optional getMaxAmount() const; /** * @symbol ?getNameTag\@ItemContext\@\@QEBA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@XZ */ MCAPI class std::optional getNameTag() const; /** - * @symbol ?isStackable\@ItemContext\@\@QEBA_NXZ + * @symbol ?getTags\@ItemContext\@\@QEBA?AV?$optional\@V?$vector\@UItemTag\@\@V?$allocator\@UItemTag\@\@\@std\@\@\@std\@\@\@std\@\@XZ */ - MCAPI bool isStackable() const; + MCAPI class std::optional> getTags() const; /** - * @symbol ?isStackableWith\@ItemContext\@\@QEBA_NAEBVItemStackBase\@\@\@Z + * @symbol ?hasTag\@ItemContext\@\@QEBA?AV?$optional\@_N\@std\@\@AEBUItemTag\@\@\@Z */ - MCAPI bool isStackableWith(class ItemStackBase const &) const; + MCAPI class std::optional hasTag(struct ItemTag const &) const; /** - * @symbol ?isValid\@ItemContext\@\@QEBA_NXZ + * @symbol ?isStackable\@ItemContext\@\@QEBA?AV?$optional\@_N\@std\@\@XZ */ - MCAPI bool isValid() const; + MCAPI class std::optional isStackable() const; + /** + * @symbol ?isStackableWith\@ItemContext\@\@QEBA?AV?$optional\@_N\@std\@\@AEBVItemStackBase\@\@\@Z + */ + MCAPI class std::optional isStackableWith(class ItemStackBase const &) const; /** - * @symbol ?setAmount\@ItemContext\@\@QEAAXH\@Z + * @symbol ?isValid\@ItemContext\@\@QEBA_NXZ */ - MCAPI void setAmount(int); + MCAPI bool isValid() const; /** - * @symbol ?setCanDestroy\@ItemContext\@\@QEAA_NAEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?setAmount\@ItemContext\@\@QEAA_NH\@Z */ - MCAPI bool setCanDestroy(std::vector const &); + MCAPI bool setAmount(int); /** - * @symbol ?setCanPlaceOn\@ItemContext\@\@QEAA_NAEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?setCanDestroy\@ItemContext\@\@QEAA?AV?$optional\@_N\@std\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z */ - MCAPI bool setCanPlaceOn(std::vector const &); + MCAPI class std::optional setCanDestroy(std::vector const &); /** - * @symbol ?setData\@ItemContext\@\@QEAAXH\@Z + * @symbol ?setCanPlaceOn\@ItemContext\@\@QEAA?AV?$optional\@_N\@std\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z */ - MCAPI void setData(int); + MCAPI class std::optional setCanPlaceOn(std::vector const &); /** - * @symbol ?setItem\@ItemContext\@\@QEAAXAEBVItemStack\@\@\@Z + * @symbol ?setItem\@ItemContext\@\@QEAA_NAEBVItemStack\@\@\@Z */ - MCAPI void setItem(class ItemStack const &); + MCAPI bool setItem(class ItemStack const &); /** - * @symbol ?setKeepOnDeath\@ItemContext\@\@QEAAX_N\@Z + * @symbol ?setKeepOnDeath\@ItemContext\@\@QEAA_N_N\@Z */ - MCAPI void setKeepOnDeath(bool); + MCAPI bool setKeepOnDeath(bool); /** - * @symbol ?setLockMode\@ItemContext\@\@QEAAXW4ItemLockMode\@\@\@Z + * @symbol ?setLockMode\@ItemContext\@\@QEAA_NW4ItemLockMode\@\@\@Z */ - MCAPI void setLockMode(enum class ItemLockMode); + MCAPI bool setLockMode(enum class ItemLockMode); /** - * @symbol ?setLore\@ItemContext\@\@QEAAXAEBV?$optional\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@Z + * @symbol ?setLore\@ItemContext\@\@QEAA_NAEBV?$optional\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@Z */ - MCAPI void setLore(class std::optional> const &); + MCAPI bool setLore(class std::optional> const &); /** - * @symbol ?setNameTag\@ItemContext\@\@QEAAXV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@Z + * @symbol ?setNameTag\@ItemContext\@\@QEAA_NV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@Z */ - MCAPI void setNameTag(class std::optional); + MCAPI bool setNameTag(class std::optional); /** * @symbol ??1ItemContext\@\@QEAA\@XZ */ MCAPI ~ItemContext(); + /** + * @symbol ?setEquipment\@ItemContext\@\@SAXAEBVItemStack\@\@W4EquipmentSlot\@\@AEAVMob\@\@\@Z + */ + MCAPI static void setEquipment(class ItemStack const &, enum class EquipmentSlot, class Mob &); //private: + /** + * @symbol ?_getItem\@ItemContext\@\@AEBAAEBVItemStack\@\@XZ + */ + MCAPI class ItemStack const & _getItem() const; + /** + * @symbol ?_setItem\@ItemContext\@\@AEAAXAEBVItemStack\@\@\@Z + */ + MCAPI void _setItem(class ItemStack const &); + /** + * @symbol ?_tryGetChestContainer\@ItemContext\@\@AEBAPEAVContainer\@\@XZ + */ + MCAPI class Container * _tryGetChestContainer() const; /** * @symbol ?_tryGetContainerFromEntity\@ItemContext\@\@AEBAPEAVContainer\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemDescriptor.hpp b/LiteLoader/include/llapi/mc/ItemDescriptor.hpp index 98edcb58ab..b7bc93418b 100644 --- a/LiteLoader/include/llapi/mc/ItemDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/ItemDescriptor.hpp @@ -55,10 +55,6 @@ class ItemDescriptor { * @symbol ??0ItemDescriptor\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@H\@Z */ MCAPI ItemDescriptor(class std::basic_string_view>, int); - /** - * @symbol ??0ItemDescriptor\@\@QEAA\@XZ - */ - MCAPI ItemDescriptor(); /** * @symbol ??0ItemDescriptor\@\@QEAA\@AEBV0\@\@Z */ @@ -68,13 +64,13 @@ class ItemDescriptor { */ MCAPI ItemDescriptor(class ReadOnlyBinaryStream &); /** - * @symbol ??0ItemDescriptor\@\@QEAA\@AEBUItemTag\@\@\@Z + * @symbol ??0ItemDescriptor\@\@QEAA\@XZ */ - MCAPI ItemDescriptor(struct ItemTag const &); + MCAPI ItemDescriptor(); /** - * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVBlockLegacy\@\@\@Z + * @symbol ??0ItemDescriptor\@\@QEAA\@AEBUItemTag\@\@\@Z */ - MCAPI ItemDescriptor(class BlockLegacy const &); + MCAPI ItemDescriptor(struct ItemTag const &); /** * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ @@ -87,6 +83,10 @@ class ItemDescriptor { * @symbol ??0ItemDescriptor\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ItemDescriptor(class ItemDescriptor &&); + /** + * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVBlockLegacy\@\@\@Z + */ + MCAPI ItemDescriptor(class BlockLegacy const &); /** * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVBlock\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp b/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp index 910dfe9f25..30ad562416 100644 --- a/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp +++ b/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp @@ -29,7 +29,6 @@ class ItemDescriptorCount : public ItemDescriptor { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMDESCRIPTORCOUNT public: class ItemDescriptorCount& operator=(class ItemDescriptorCount const &) = delete; - ItemDescriptorCount(class ItemDescriptorCount const &) = delete; #endif public: @@ -54,9 +53,9 @@ class ItemDescriptorCount : public ItemDescriptor { */ MCAPI ItemDescriptorCount(class ReadOnlyBinaryStream &); /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z + * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ItemDescriptorCount(class BlockLegacy const &, unsigned short); + MCAPI ItemDescriptorCount(class ItemDescriptorCount const &); /** * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlock\@\@G\@Z */ @@ -69,10 +68,6 @@ class ItemDescriptorCount : public ItemDescriptor { * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVItem\@\@HG\@Z */ MCAPI ItemDescriptorCount(class Item const &, int, unsigned short); - /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBUItemTag\@\@G\@Z - */ - MCAPI ItemDescriptorCount(struct ItemTag const &, unsigned short); /** * @symbol ??0ItemDescriptorCount\@\@QEAA\@XZ */ @@ -81,6 +76,14 @@ class ItemDescriptorCount : public ItemDescriptor { * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVItemDescriptor\@\@G\@Z */ MCAPI ItemDescriptorCount(class ItemDescriptor const &, unsigned short); + /** + * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z + */ + MCAPI ItemDescriptorCount(class BlockLegacy const &, unsigned short); + /** + * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBUItemTag\@\@G\@Z + */ + MCAPI ItemDescriptorCount(struct ItemTag const &, unsigned short); /** * @symbol ?getStackSize\@ItemDescriptorCount\@\@QEBAFXZ */ diff --git a/LiteLoader/include/llapi/mc/ItemEnchants.hpp b/LiteLoader/include/llapi/mc/ItemEnchants.hpp index fcaf7c1f4d..ff820e0a27 100644 --- a/LiteLoader/include/llapi/mc/ItemEnchants.hpp +++ b/LiteLoader/include/llapi/mc/ItemEnchants.hpp @@ -42,10 +42,6 @@ class ItemEnchants { * @symbol ?addEnchant\@ItemEnchants\@\@QEAA_NVEnchantmentInstance\@\@_N\@Z */ MCAPI bool addEnchant(class EnchantmentInstance, bool); - /** - * @symbol ?addEnchants\@ItemEnchants\@\@QEAAHAEBV1\@_N\@Z - */ - MCAPI int addEnchants(class ItemEnchants const &, bool); /** * @symbol ?canEnchant\@ItemEnchants\@\@QEAA?AUEnchantResult\@\@VEnchantmentInstance\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemEventResponseFactory.hpp b/LiteLoader/include/llapi/mc/ItemEventResponseFactory.hpp index f7acbbc5c4..b3a79a56e4 100644 --- a/LiteLoader/include/llapi/mc/ItemEventResponseFactory.hpp +++ b/LiteLoader/include/llapi/mc/ItemEventResponseFactory.hpp @@ -44,11 +44,5 @@ class ItemEventResponseFactory { * @symbol ?initSchema\@ItemEventResponseFactory\@\@UEAAXXZ */ virtual void initSchema(); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMEVENTRESPONSEFACTORY - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~ItemEventResponseFactory(); -#endif }; diff --git a/LiteLoader/include/llapi/mc/ItemFrameBlock.hpp b/LiteLoader/include/llapi/mc/ItemFrameBlock.hpp index f1c2e3edf4..b1b8abbdfe 100644 --- a/LiteLoader/include/llapi/mc/ItemFrameBlock.hpp +++ b/LiteLoader/include/llapi/mc/ItemFrameBlock.hpp @@ -207,9 +207,9 @@ class ItemFrameBlock : public ActorBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@ItemFrameBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@ItemFrameBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 109 * @symbol ?attack\@ItemFrameBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z @@ -236,30 +236,30 @@ class ItemFrameBlock : public ActorBlock { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@ItemFrameBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -272,88 +272,64 @@ class ItemFrameBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@ItemFrameBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@ItemFrameBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@ItemFrameBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getEntityResourceItem\@ItemFrameBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getSpawnedItemName\@ItemFrameBlock\@\@UEBA?AVHashedString\@\@XZ */ virtual class HashedString getSpawnedItemName() const; - /** - * @vftbl 196 - * @symbol __unk_vfn_196 - */ - virtual void __unk_vfn_196(); - /** - * @vftbl 197 - * @symbol __unk_vfn_197 - */ - virtual void __unk_vfn_197(); - /** - * @vftbl 198 - * @symbol __unk_vfn_198 - */ - virtual void __unk_vfn_198(); - /** - * @vftbl 199 - * @symbol __unk_vfn_199 - */ - virtual void __unk_vfn_199(); - /** - * @vftbl 200 - * @symbol __unk_vfn_200 - */ - virtual void __unk_vfn_200(); - /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getDescriptionId() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMFRAMEBLOCK /** * @symbol ?hasComparatorSignal\@ItemFrameBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp b/LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp index d27868cbbd..d5b16dc26c 100644 --- a/LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp @@ -168,9 +168,9 @@ class ItemFrameBlockActor : public BlockActor { */ MCAPI void _checkMapRemoval(class BlockSource &, class ItemInstance &); /** - * @symbol ?_updateBit\@ItemFrameBlockActor\@\@AEAAXAEAVBlockSource\@\@AEBV?$ItemStateVariant\@_N\@\@AEBVHashedString\@\@\@Z + * @symbol ?_updateBit\@ItemFrameBlockActor\@\@AEAAXAEAVBlockSource\@\@AEBV?$BlockStateVariant\@_N\@\@AEBVHashedString\@\@\@Z */ - MCAPI void _updateBit(class BlockSource &, class ItemStateVariant const &, class HashedString const &); + MCAPI void _updateBit(class BlockSource &, class BlockStateVariant const &, class HashedString const &); private: diff --git a/LiteLoader/include/llapi/mc/ItemInstance.hpp b/LiteLoader/include/llapi/mc/ItemInstance.hpp index 1926048748..f08141be4e 100644 --- a/LiteLoader/include/llapi/mc/ItemInstance.hpp +++ b/LiteLoader/include/llapi/mc/ItemInstance.hpp @@ -53,22 +53,10 @@ class ItemInstance : public ItemStackBase { * @symbol ??0ItemInstance\@\@QEAA\@XZ */ MCAPI ItemInstance(); - /** - * @symbol ??0ItemInstance\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHPEBVCompoundTag\@\@\@Z - */ - MCAPI ItemInstance(class std::basic_string_view>, int, int, class CompoundTag const *); /** * @symbol ??0ItemInstance\@\@QEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z */ MCAPI ItemInstance(class Block const &, int, class CompoundTag const *); - /** - * @symbol ??0ItemInstance\@\@QEAA\@AEBVBlockLegacy\@\@H\@Z - */ - MCAPI ItemInstance(class BlockLegacy const &, int); - /** - * @symbol ??0ItemInstance\@\@QEAA\@AEBVItem\@\@HHPEBVCompoundTag\@\@\@Z - */ - MCAPI ItemInstance(class Item const &, int, int, class CompoundTag const *); /** * @symbol ??0ItemInstance\@\@QEAA\@AEBV0\@\@Z */ @@ -77,6 +65,18 @@ class ItemInstance : public ItemStackBase { * @symbol ??0ItemInstance\@\@QEAA\@AEBVItemStackBase\@\@\@Z */ MCAPI ItemInstance(class ItemStackBase const &); + /** + * @symbol ??0ItemInstance\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHPEBVCompoundTag\@\@\@Z + */ + MCAPI ItemInstance(class std::basic_string_view>, int, int, class CompoundTag const *); + /** + * @symbol ??0ItemInstance\@\@QEAA\@AEBVBlockLegacy\@\@H\@Z + */ + MCAPI ItemInstance(class BlockLegacy const &, int); + /** + * @symbol ??0ItemInstance\@\@QEAA\@AEBVItem\@\@HHPEBVCompoundTag\@\@\@Z + */ + MCAPI ItemInstance(class Item const &, int, int, class CompoundTag const *); /** * @symbol ?clone\@ItemInstance\@\@QEBA?AV1\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemLockHelper.hpp b/LiteLoader/include/llapi/mc/ItemLockHelper.hpp index 58fcb667f9..ecae1edb98 100644 --- a/LiteLoader/include/llapi/mc/ItemLockHelper.hpp +++ b/LiteLoader/include/llapi/mc/ItemLockHelper.hpp @@ -30,10 +30,6 @@ class ItemLockHelper { #endif public: - /** - * @symbol ?addItemLockMode\@ItemLockHelper\@\@SA_NAEAVItemStackBase\@\@AEBVValue\@Json\@\@\@Z - */ - MCAPI static bool addItemLockMode(class ItemStackBase &, class Json::Value const &); /** * @symbol ?addKeepOnDeath\@ItemLockHelper\@\@SA_NAEAVItemStackBase\@\@AEBVValue\@Json\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemRegistry.hpp b/LiteLoader/include/llapi/mc/ItemRegistry.hpp index 94f61d2ad8..34b1000b5a 100644 --- a/LiteLoader/include/llapi/mc/ItemRegistry.hpp +++ b/LiteLoader/include/llapi/mc/ItemRegistry.hpp @@ -50,10 +50,6 @@ struct ComplexAlias { * @symbol ??0ItemRegistry\@\@QEAA\@XZ */ MCAPI ItemRegistry(); - /** - * @symbol ?allowTagUpdate\@ItemRegistry\@\@QEAA?AVTagUpdateToken\@\@XZ - */ - MCAPI class TagUpdateToken allowTagUpdate(); /** * @symbol ??1ItemRegistry\@\@QEAA\@XZ */ @@ -81,17 +77,9 @@ struct ComplexAlias { */ MCAPI void addItemToTagMap(class Item const &); /** - * @symbol ?alterAvailableCreativeItems\@ItemRegistry\@\@AEAAXPEAVActorInfoRegistry\@\@AEAVLevelData\@\@\@Z - */ - MCAPI void alterAvailableCreativeItems(class ActorInfoRegistry *, class LevelData &); - /** - * @symbol ?canAddTags\@ItemRegistry\@\@AEBA_NXZ - */ - MCAPI bool canAddTags() const; - /** - * @symbol ?clearDeadItemRegistry\@ItemRegistry\@\@AEAAXXZ + * @symbol ?clearItemAndCreativeItemRegistry\@ItemRegistry\@\@AEAAXXZ */ - MCAPI void clearDeadItemRegistry(); + MCAPI void clearItemAndCreativeItemRegistry(); /** * @symbol ?digestServerItemComponents\@ItemRegistry\@\@AEAAXAEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@\@2\@\@std\@\@\@Z */ @@ -100,10 +88,6 @@ struct ComplexAlias { * @symbol ?finishedRegistration\@ItemRegistry\@\@AEAAXXZ */ MCAPI void finishedRegistration(); - /** - * @symbol ?getComplexAliasSplitNames\@ItemRegistry\@\@AEBAAEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@AEBVHashedString\@\@\@Z - */ - MCAPI std::vector const & getComplexAliasSplitNames(class HashedString const &) const; /** * @symbol ?getItem\@ItemRegistry\@\@AEAA?AV?$WeakPtr\@VItem\@\@\@\@F\@Z */ @@ -112,34 +96,14 @@ struct ComplexAlias { * @symbol ?getItem\@ItemRegistry\@\@AEAA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z */ MCAPI class WeakPtr getItem(class HashedString const &); - /** - * @symbol ?getItemCount\@ItemRegistry\@\@AEAAHXZ - */ - MCAPI int getItemCount(); - /** - * @symbol ?getItemResponseFactory\@ItemRegistry\@\@AEAAPEAVItemEventResponseFactory\@\@XZ - */ - MCAPI class ItemEventResponseFactory * getItemResponseFactory(); /** * @symbol ?getNameFromAlias\@ItemRegistry\@\@AEBA?AU?$pair\@VHashedString\@\@H\@std\@\@AEBVHashedString\@\@H\@Z */ MCAPI struct std::pair getNameFromAlias(class HashedString const &, int) const; - /** - * @symbol ?getNameFromLegacyID\@ItemRegistry\@\@AEAA?AVHashedString\@\@F\@Z - */ - MCAPI class HashedString getNameFromLegacyID(short); - /** - * @symbol ?getNameToItemMap\@ItemRegistry\@\@AEAAAEBV?$unordered_map\@VHashedString\@\@V?$WeakPtr\@VItem\@\@\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@4\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$WeakPtr\@VItem\@\@\@\@\@std\@\@\@4\@\@std\@\@XZ - */ - MCAPI class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const & getNameToItemMap(); /** * @symbol ?getRef\@ItemRegistry\@\@AEAA?AVItemRegistryRef\@\@XZ */ MCAPI class ItemRegistryRef getRef(); - /** - * @symbol ?getWorldBaseGameVersion\@ItemRegistry\@\@AEBA?AVBaseGameVersion\@\@XZ - */ - MCAPI class BaseGameVersion getWorldBaseGameVersion() const; /** * @symbol ?init\@ItemRegistry\@\@AEAAXAEBVExperiments\@\@AEBVBaseGameVersion\@\@PEAVResourcePackManager\@\@\@Z */ @@ -152,26 +116,10 @@ struct ComplexAlias { * @symbol ?initServerData\@ItemRegistry\@\@AEAAXAEAVResourcePackManager\@\@AEBVExperiments\@\@W4ItemVersion\@\@\@Z */ MCAPI void initServerData(class ResourcePackManager &, class Experiments const &, enum class ItemVersion); - /** - * @symbol ?isComplexAlias\@ItemRegistry\@\@AEBA_NAEBVHashedString\@\@\@Z - */ - MCAPI bool isComplexAlias(class HashedString const &) const; /** * @symbol ?isComponentBasedItemSchema\@ItemRegistry\@\@AEAA_NAEBVSemVersion\@\@\@Z */ MCAPI bool isComponentBasedItemSchema(class SemVersion const &); - /** - * @symbol ?isCreativeItem\@ItemRegistry\@\@AEAA_NAEBVItemInstance\@\@\@Z - */ - MCAPI bool isCreativeItem(class ItemInstance const &); - /** - * @symbol ?isServerInitializingCreativeItems\@ItemRegistry\@\@AEBA_NXZ - */ - MCAPI bool isServerInitializingCreativeItems() const; - /** - * @symbol ?lookupByName\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAH0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z - */ - MCAPI class WeakPtr lookupByName(int &, int &, class std::basic_string_view>) const; /** * @symbol ?lookupByName\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z */ @@ -184,22 +132,10 @@ struct ComplexAlias { * @symbol ?lookupByNameNoAlias\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ MCAPI class WeakPtr lookupByNameNoAlias(class std::basic_string_view>) const; - /** - * @symbol ?lookupByNameNoAlias\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z - */ - MCAPI class WeakPtr lookupByNameNoAlias(class HashedString const &) const; /** * @symbol ?lookupByNameNoParsing\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAHAEBVHashedString\@\@\@Z */ MCAPI class WeakPtr lookupByNameNoParsing(int &, class HashedString const &) const; - /** - * @symbol ?lookupByTag\@ItemRegistry\@\@AEBAAEBV?$unordered_set\@PEBVItem\@\@U?$hash\@PEBVItem\@\@\@std\@\@U?$equal_to\@PEBVItem\@\@\@3\@V?$allocator\@PEBVItem\@\@\@3\@\@std\@\@AEBUItemTag\@\@\@Z - */ - MCAPI class std::unordered_set, struct std::equal_to, class std::allocator> const & lookupByTag(struct ItemTag const &) const; - /** - * @symbol ?lookupByVanillaName\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z - */ - MCAPI class WeakPtr lookupByVanillaName(class HashedString const &) const; /** * @symbol ?registerAlias\@ItemRegistry\@\@AEAAXAEBVHashedString\@\@0AEBVBaseGameVersion\@\@\@Z */ @@ -208,10 +144,6 @@ struct ComplexAlias { * @symbol ?registerComplexAlias\@ItemRegistry\@\@AEAA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@AEBUComplexAlias\@1\@\@Z */ MCAPI class WeakPtr registerComplexAlias(class HashedString const &, struct ItemRegistry::ComplexAlias const &); - /** - * @symbol ?registerExtraItemInitCallback\@ItemRegistry\@\@AEAAXV?$function\@$$A6AXVItemRegistryRef\@\@\@Z\@std\@\@\@Z - */ - MCAPI void registerExtraItemInitCallback(class std::function); /** * @symbol ?registerItem\@ItemRegistry\@\@AEAAXV?$SharedPtr\@VItem\@\@\@\@\@Z */ @@ -224,34 +156,6 @@ struct ComplexAlias { * @symbol ?registerLegacyMapping\@ItemRegistry\@\@AEAAXAEBVHashedString\@\@0AEBVBaseGameVersion\@\@\@Z */ MCAPI void registerLegacyMapping(class HashedString const &, class HashedString const &, class BaseGameVersion const &); - /** - * @symbol ?remapToFullLegacyNameByHash\@ItemRegistry\@\@AEAA_K_K\@Z - */ - MCAPI unsigned __int64 remapToFullLegacyNameByHash(unsigned __int64); - /** - * @symbol ?remapToLegacyNameByHash\@ItemRegistry\@\@AEAA_K_K\@Z - */ - MCAPI unsigned __int64 remapToLegacyNameByHash(unsigned __int64); - /** - * @symbol ?setCheckForItemWorldCompatibility\@ItemRegistry\@\@AEAAX_N\@Z - */ - MCAPI void setCheckForItemWorldCompatibility(bool); - /** - * @symbol ?setOwningThreadId\@ItemRegistry\@\@AEAAXVid\@thread\@std\@\@\@Z - */ - MCAPI void setOwningThreadId(class std::thread::id); - /** - * @symbol ?setServerInitializingCreativeItems\@ItemRegistry\@\@AEAAX_N\@Z - */ - MCAPI void setServerInitializingCreativeItems(bool); - /** - * @symbol ?shouldCheckForItemWorldCompatibility\@ItemRegistry\@\@AEAA_NXZ - */ - MCAPI bool shouldCheckForItemWorldCompatibility(); - /** - * @symbol ?shutdown\@ItemRegistry\@\@AEAAXXZ - */ - MCAPI void shutdown(); /** * @symbol ?unregisterItem\@ItemRegistry\@\@AEAAXAEBVHashedString\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemRegistryRef.hpp b/LiteLoader/include/llapi/mc/ItemRegistryRef.hpp index 4fb19aa06f..be8f8bccd4 100644 --- a/LiteLoader/include/llapi/mc/ItemRegistryRef.hpp +++ b/LiteLoader/include/llapi/mc/ItemRegistryRef.hpp @@ -60,14 +60,14 @@ class ItemRegistryRef { * @symbol ?getComplexAliasSplitNames\@ItemRegistryRef\@\@QEBAAEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@AEBVHashedString\@\@\@Z */ MCAPI std::vector const & getComplexAliasSplitNames(class HashedString const &) const; - /** - * @symbol ?getItem\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@F\@Z - */ - MCAPI class WeakPtr getItem(short) const; /** * @symbol ?getItem\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z */ MCAPI class WeakPtr getItem(class HashedString const &) const; + /** + * @symbol ?getItem\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@F\@Z + */ + MCAPI class WeakPtr getItem(short) const; /** * @symbol ?getItemCount\@ItemRegistryRef\@\@QEBAHXZ */ @@ -116,10 +116,6 @@ class ItemRegistryRef { * @symbol ?lockItemWorldCompatibilityMutex\@ItemRegistryRef\@\@QEBA?AVLockGuard\@1\@XZ */ MCAPI class ItemRegistryRef::LockGuard lockItemWorldCompatibilityMutex() const; - /** - * @symbol ?lookupByName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAHV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z - */ - MCAPI class WeakPtr lookupByName(int &, class std::basic_string_view>) const; /** * @symbol ?lookupByName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAH0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ @@ -129,13 +125,17 @@ class ItemRegistryRef { */ MCAPI class WeakPtr lookupByName(class HashedString const &) const; /** - * @symbol ?lookupByNameNoAlias\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z + * @symbol ?lookupByName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAHV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class WeakPtr lookupByNameNoAlias(class HashedString const &) const; + MCAPI class WeakPtr lookupByName(int &, class std::basic_string_view>) const; /** * @symbol ?lookupByNameNoAlias\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ MCAPI class WeakPtr lookupByNameNoAlias(class std::basic_string_view>) const; + /** + * @symbol ?lookupByNameNoAlias\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z + */ + MCAPI class WeakPtr lookupByNameNoAlias(class HashedString const &) const; /** * @symbol ?lookupByNameNoParsing\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAHAEBVHashedString\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStack.hpp b/LiteLoader/include/llapi/mc/ItemStack.hpp index f2488a4232..ad4951d1bc 100644 --- a/LiteLoader/include/llapi/mc/ItemStack.hpp +++ b/LiteLoader/include/llapi/mc/ItemStack.hpp @@ -105,14 +105,14 @@ class ItemStack : public ItemStackBase { */ MCVAPI ~ItemStack(); #endif - /** - * @symbol ??0ItemStack\@\@QEAA\@AEBVItemInstance\@\@\@Z - */ - MCAPI ItemStack(class ItemInstance const &); /** * @symbol ??0ItemStack\@\@QEAA\@AEBVRecipeIngredient\@\@\@Z */ MCAPI ItemStack(class RecipeIngredient const &); + /** + * @symbol ??0ItemStack\@\@QEAA\@AEBVItemInstance\@\@\@Z + */ + MCAPI ItemStack(class ItemInstance const &); /** * @symbol ??0ItemStack\@\@QEAA\@XZ */ @@ -126,17 +126,17 @@ class ItemStack : public ItemStackBase { */ MCAPI ItemStack(class Item const &, int, int, class CompoundTag const *); /** - * @symbol ??0ItemStack\@\@QEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z + * @symbol ??0ItemStack\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ItemStack(class Block const &, int, class CompoundTag const *); + MCAPI ItemStack(class ItemStack const &); /** * @symbol ??0ItemStack\@\@QEAA\@AEBVBlockLegacy\@\@H\@Z */ MCAPI ItemStack(class BlockLegacy const &, int); /** - * @symbol ??0ItemStack\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ItemStack\@\@QEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z */ - MCAPI ItemStack(class ItemStack const &); + MCAPI ItemStack(class Block const &, int, class CompoundTag const *); /** * @symbol ?_assignNetIdVariant\@ItemStack\@\@QEBAXAEBV1\@\@Z */ @@ -218,9 +218,9 @@ class ItemStack : public ItemStackBase { */ MCAPI void useAsFuel(); /** - * @symbol ?useOn\@ItemStack\@\@QEAA_NAEAVActor\@\@HHHEAEBVVec3\@\@\@Z + * @symbol ?useOn\@ItemStack\@\@QEAA?AVInteractionResult\@\@AEAVActor\@\@HHHEAEBVVec3\@\@\@Z */ - MCAPI bool useOn(class Actor &, int, int, int, unsigned char, class Vec3 const &); + MCAPI class InteractionResult useOn(class Actor &, int, int, int, unsigned char, class Vec3 const &); /** * @symbol ?useTimeDepleted\@ItemStack\@\@QEAA?AW4ItemUseMethod\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackBase.hpp b/LiteLoader/include/llapi/mc/ItemStackBase.hpp index bf6e008f5a..718f7b126f 100644 --- a/LiteLoader/include/llapi/mc/ItemStackBase.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackBase.hpp @@ -83,14 +83,14 @@ class ItemStackBase { * @symbol ?addComponents\@ItemStackBase\@\@QEAA_NAEBVValue\@Json\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool addComponents(class Json::Value const &, std::string &); - /** - * @symbol ?addCustomUserData\@ItemStackBase\@\@QEAAXAEAVContainerComponent\@\@\@Z - */ - MCAPI void addCustomUserData(class ContainerComponent &); /** * @symbol ?addCustomUserData\@ItemStackBase\@\@QEAAXAEAVBlockActor\@\@AEAVBlockSource\@\@\@Z */ MCAPI void addCustomUserData(class BlockActor &, class BlockSource &); + /** + * @symbol ?addCustomUserData\@ItemStackBase\@\@QEAAXAEAVContainerComponent\@\@\@Z + */ + MCAPI void addCustomUserData(class ContainerComponent &); /** * @symbol ?canBeCharged\@ItemStackBase\@\@QEBA_NXZ */ @@ -123,10 +123,6 @@ class ItemStackBase { * @symbol ?constructItemEnchantsFromUserData\@ItemStackBase\@\@QEBA?AVItemEnchants\@\@XZ */ MCAPI class ItemEnchants constructItemEnchantsFromUserData() const; - /** - * @symbol ?deserializeComponents\@ItemStackBase\@\@QEAAXAEAVIDataInput\@\@\@Z - */ - MCAPI void deserializeComponents(class IDataInput &); /** * @symbol ?executeEvent\@ItemStackBase\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z */ @@ -155,10 +151,6 @@ class ItemStackBase { * @symbol ?getBlockingTick\@ItemStackBase\@\@QEBAAEBUTick\@\@XZ */ MCAPI struct Tick const & getBlockingTick() const; - /** - * @symbol ?getCategoryName\@ItemStackBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string getCategoryName() const; /** * @symbol ?getChargedItem\@ItemStackBase\@\@QEBAAEBVItemInstance\@\@XZ */ @@ -255,10 +247,6 @@ class ItemStackBase { * @symbol ?getRawNameId\@ItemStackBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getRawNameId() const; - /** - * @symbol ?getRequiredBaseGameVersion\@ItemStackBase\@\@QEBAAEBVBaseGameVersion\@\@XZ - */ - MCAPI class BaseGameVersion const & getRequiredBaseGameVersion() const; /** * @symbol ?getUseAnimation\@ItemStackBase\@\@QEBA?AW4UseAnimation\@\@XZ */ @@ -303,14 +291,14 @@ class ItemStackBase { * @symbol ?hasSameUserData\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool hasSameUserData(class ItemStackBase const &) const; - /** - * @symbol ?hasTag\@ItemStackBase\@\@QEBA_NAEB_K\@Z - */ - MCAPI bool hasTag(unsigned __int64 const &) const; /** * @symbol ?hasTag\@ItemStackBase\@\@QEBA_NAEBUItemTag\@\@\@Z */ MCAPI bool hasTag(struct ItemTag const &) const; + /** + * @symbol ?hasTag\@ItemStackBase\@\@QEBA_NAEB_K\@Z + */ + MCAPI bool hasTag(unsigned __int64 const &) const; /** * @symbol ?hasUserData\@ItemStackBase\@\@QEBA_NXZ */ @@ -379,10 +367,6 @@ class ItemStackBase { * @symbol ?isLiquidClipItem\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isLiquidClipItem() const; - /** - * @symbol ?isMusicDiscItem\@ItemStackBase\@\@QEBA_NXZ - */ - MCAPI bool isMusicDiscItem() const; /** * @symbol ?isNull\@ItemStackBase\@\@QEBA_NXZ */ @@ -427,14 +411,14 @@ class ItemStackBase { * @symbol ?isWearableItem\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isWearableItem() const; - /** - * @symbol ?load\@ItemStackBase\@\@QEAAXAEBVCompoundTag\@\@\@Z - */ - MCAPI void load(class CompoundTag const &); /** * @symbol ?load\@ItemStackBase\@\@QEAAXAEBVCompoundTag\@\@AEAVLevel\@\@\@Z */ MCAPI void load(class CompoundTag const &, class Level &); + /** + * @symbol ?load\@ItemStackBase\@\@QEAAXAEBVCompoundTag\@\@\@Z + */ + MCAPI void load(class CompoundTag const &); /** * @symbol ?matches\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z */ @@ -479,14 +463,14 @@ class ItemStackBase { * @symbol ?resetHoverName\@ItemStackBase\@\@QEAAXXZ */ MCAPI void resetHoverName(); - /** - * @symbol ?sameItem\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z - */ - MCAPI bool sameItem(class ItemStackBase const &) const; /** * @symbol ?sameItem\@ItemStackBase\@\@QEBA_NHH\@Z */ MCAPI bool sameItem(int, int) const; + /** + * @symbol ?sameItem\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z + */ + MCAPI bool sameItem(class ItemStackBase const &) const; /** * @symbol ?sameItemAndAux\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z */ @@ -503,10 +487,6 @@ class ItemStackBase { * @symbol ?sendEventTriggered\@ItemStackBase\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVRenderParams\@\@\@Z */ MCAPI bool sendEventTriggered(std::string const &, class RenderParams const &); - /** - * @symbol ?serializeComponents\@ItemStackBase\@\@QEBAXAEAVIDataOutput\@\@\@Z - */ - MCAPI void serializeComponents(class IDataOutput &) const; /** * @symbol ?set\@ItemStackBase\@\@QEAAXH\@Z */ @@ -563,10 +543,6 @@ class ItemStackBase { * @symbol ?setShowPickUp\@ItemStackBase\@\@QEAAX_N\@Z */ MCAPI void setShowPickUp(bool); - /** - * @symbol ?setStackSize\@ItemStackBase\@\@QEAAXE\@Z - */ - MCAPI void setStackSize(unsigned char); /** * @symbol ?setUserData\@ItemStackBase\@\@QEAAXV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@Z */ @@ -619,6 +595,10 @@ class ItemStackBase { * @symbol ?TAG_REPAIR_COST\@ItemStackBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_REPAIR_COST; + /** + * @symbol ?isValidComponent\@ItemStackBase\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI static bool isValidComponent(std::string const &); //protected: /** @@ -630,9 +610,9 @@ class ItemStackBase { */ MCAPI ItemStackBase(class ItemStackBase const &); /** - * @symbol ??0ItemStackBase\@\@IEAA\@AEBVBlockLegacy\@\@H\@Z + * @symbol ??0ItemStackBase\@\@IEAA\@XZ */ - MCAPI ItemStackBase(class BlockLegacy const &, int); + MCAPI ItemStackBase(); /** * @symbol ??0ItemStackBase\@\@IEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z */ @@ -642,13 +622,13 @@ class ItemStackBase { */ MCAPI ItemStackBase(class std::basic_string_view>, int, int, class CompoundTag const *); /** - * @symbol ??0ItemStackBase\@\@IEAA\@AEBVRecipeIngredient\@\@\@Z + * @symbol ??0ItemStackBase\@\@IEAA\@AEBVBlockLegacy\@\@H\@Z */ - MCAPI ItemStackBase(class RecipeIngredient const &); + MCAPI ItemStackBase(class BlockLegacy const &, int); /** - * @symbol ??0ItemStackBase\@\@IEAA\@XZ + * @symbol ??0ItemStackBase\@\@IEAA\@AEBVRecipeIngredient\@\@\@Z */ - MCAPI ItemStackBase(); + MCAPI ItemStackBase(class RecipeIngredient const &); /** * @symbol ?_getHoverFormattingPrefix\@ItemStackBase\@\@IEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ @@ -657,10 +637,6 @@ class ItemStackBase { * @symbol ?_setItem\@ItemStackBase\@\@IEAA_NH_N\@Z */ MCAPI bool _setItem(int, bool); - /** - * @symbol ?init\@ItemStackBase\@\@IEAAXHHH_N\@Z - */ - MCAPI void init(int, int, int, bool); /** * @symbol ?init\@ItemStackBase\@\@IEAAXAEBVBlockLegacy\@\@H\@Z */ @@ -669,6 +645,10 @@ class ItemStackBase { * @symbol ?init\@ItemStackBase\@\@IEAAXAEBVItem\@\@HHPEBVCompoundTag\@\@_N\@Z */ MCAPI void init(class Item const &, int, int, class CompoundTag const *, bool); + /** + * @symbol ?init\@ItemStackBase\@\@IEAAXHHH_N\@Z + */ + MCAPI void init(int, int, int, bool); /** * @symbol ??4ItemStackBase\@\@IEAAAEAV0\@AEBV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackBaseComponentsHelper.hpp b/LiteLoader/include/llapi/mc/ItemStackBaseComponentsHelper.hpp deleted file mode 100644 index 7464a423eb..0000000000 --- a/LiteLoader/include/llapi/mc/ItemStackBaseComponentsHelper.hpp +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @file ItemStackBaseComponentsHelper.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "Json.hpp" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ItemStackBaseComponentsHelper. - * - */ -class ItemStackBaseComponentsHelper { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMSTACKBASECOMPONENTSHELPER -public: - class ItemStackBaseComponentsHelper& operator=(class ItemStackBaseComponentsHelper const &) = delete; - ItemStackBaseComponentsHelper(class ItemStackBaseComponentsHelper const &) = delete; - ItemStackBaseComponentsHelper() = delete; -#endif - -public: - /** - * @symbol ?isValidComponent\@ItemStackBaseComponentsHelper\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI static bool isValidComponent(std::string const &); - /** - * @symbol ?updateComponent\@ItemStackBaseComponentsHelper\@\@SA_NAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z - */ - MCAPI static bool updateComponent(class ItemStackBase &, std::string const &, class Json::Value const &); - -}; diff --git a/LiteLoader/include/llapi/mc/ItemStackDescriptor.hpp b/LiteLoader/include/llapi/mc/ItemStackDescriptor.hpp index 9869e61d19..6d8856034e 100644 --- a/LiteLoader/include/llapi/mc/ItemStackDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackDescriptor.hpp @@ -42,14 +42,14 @@ class ItemStackDescriptor : public ItemDescriptorCount { */ MCVAPI ~ItemStackDescriptor(); #endif - /** - * @symbol ??0ItemStackDescriptor\@\@QEAA\@AEBVItem\@\@HGPEBVCompoundTag\@\@\@Z - */ - MCAPI ItemStackDescriptor(class Item const &, int, unsigned short, class CompoundTag const *); /** * @symbol ??0ItemStackDescriptor\@\@QEAA\@XZ */ MCAPI ItemStackDescriptor(); + /** + * @symbol ??0ItemStackDescriptor\@\@QEAA\@AEBVItem\@\@HGPEBVCompoundTag\@\@\@Z + */ + MCAPI ItemStackDescriptor(class Item const &, int, unsigned short, class CompoundTag const *); /** * @symbol ??4ItemStackDescriptor\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp b/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp index dd9a6a65d8..b4aef8a093 100644 --- a/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp @@ -86,14 +86,6 @@ struct ItemStackNetIdVariant { * @symbol ?toString\@ItemStackNetIdVariant\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string toString() const; - /** - * @symbol ?tryGetLegacyRequestId\@ItemStackNetIdVariant\@\@QEBAPEBV?$TypedClientNetId\@UItemStackLegacyRequestIdTag\@\@H$0A\@\@\@XZ - */ - MCAPI class TypedClientNetId const * tryGetLegacyRequestId() const; - /** - * @symbol ?tryGetRequestId\@ItemStackNetIdVariant\@\@QEBAPEBV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@XZ - */ - MCAPI class TypedClientNetId const * tryGetRequestId() const; /** * @symbol ?tryGetServerNetId\@ItemStackNetIdVariant\@\@QEBAPEBV?$TypedServerNetId\@UItemStackNetIdTag\@\@H$0A\@\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemStackNetManagerBase.hpp b/LiteLoader/include/llapi/mc/ItemStackNetManagerBase.hpp index 014fbb3ebf..bf2be13326 100644 --- a/LiteLoader/include/llapi/mc/ItemStackNetManagerBase.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackNetManagerBase.hpp @@ -94,10 +94,6 @@ class ItemStackNetManagerBase { * @symbol ??0ItemStackNetManagerBase\@\@QEAA\@AEAVPlayer\@\@_N1\@Z */ MCAPI ItemStackNetManagerBase(class Player &, bool, bool); - /** - * @symbol ?_getScreenStack\@ItemStackNetManagerBase\@\@QEAAAEAVItemStackNetManagerScreenStack\@\@XZ - */ - MCAPI class ItemStackNetManagerScreenStack & _getScreenStack(); /** * @symbol ?getScreenContext\@ItemStackNetManagerBase\@\@QEBAAEBVContainerScreenContext\@\@XZ */ @@ -125,6 +121,14 @@ class ItemStackNetManagerBase { */ MCAPI bool _isRequestActionAllowed(class ItemStackRequestAction const &); +//private: + /** + * @symbol ?_pushScreen\@ItemStackNetManagerBase\@\@AEAAXVContainerScreenContext\@\@\@Z + */ + MCAPI void _pushScreen(class ContainerScreenContext); + protected: +private: + }; diff --git a/LiteLoader/include/llapi/mc/ItemStackNetManagerScreen.hpp b/LiteLoader/include/llapi/mc/ItemStackNetManagerScreen.hpp index 80d67b4878..a9c0b3332d 100644 --- a/LiteLoader/include/llapi/mc/ItemStackNetManagerScreen.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackNetManagerScreen.hpp @@ -29,17 +29,5 @@ class ItemStackNetManagerScreen { #endif public: - /** - * @symbol ??0ItemStackNetManagerScreen\@\@QEAA\@AEAVEntityRegistry\@\@\@Z - */ - MCAPI ItemStackNetManagerScreen(class EntityRegistry &); - /** - * @symbol ?getEntity\@ItemStackNetManagerScreen\@\@QEAAAEAVEntityContext\@\@XZ - */ - MCAPI class EntityContext & getEntity(); - /** - * @symbol ?getEntity\@ItemStackNetManagerScreen\@\@QEBAAEBVEntityContext\@\@XZ - */ - MCAPI class EntityContext const & getEntity() const; }; diff --git a/LiteLoader/include/llapi/mc/ItemStackNetManagerScreenStack.hpp b/LiteLoader/include/llapi/mc/ItemStackNetManagerScreenStack.hpp index 8e72c1ebad..ed259b5cfb 100644 --- a/LiteLoader/include/llapi/mc/ItemStackNetManagerScreenStack.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackNetManagerScreenStack.hpp @@ -33,33 +33,5 @@ class ItemStackNetManagerScreenStack { * @symbol ?foreachScreen\@ItemStackNetManagerScreenStack\@\@QEAAXV?$function\@$$A6A_NAEAVItemStackNetManagerScreen\@\@\@Z\@std\@\@\@Z */ MCAPI void foreachScreen(class std::function); - /** - * @symbol ?getScreenForRequest\@ItemStackNetManagerScreenStack\@\@QEAAPEAVItemStackNetManagerScreen\@\@AEBVItemStackRequestData\@\@\@Z - */ - MCAPI class ItemStackNetManagerScreen * getScreenForRequest(class ItemStackRequestData const &); - /** - * @symbol ?pop\@ItemStackNetManagerScreenStack\@\@QEAA_NXZ - */ - MCAPI bool pop(); - /** - * @symbol ?push\@ItemStackNetManagerScreenStack\@\@QEAAPEAVItemStackNetManagerScreen\@\@V?$unique_ptr\@VItemStackNetManagerScreen\@\@U?$default_delete\@VItemStackNetManagerScreen\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI class ItemStackNetManagerScreen * push(std::unique_ptr); - /** - * @symbol ?size\@ItemStackNetManagerScreenStack\@\@QEBA_KXZ - */ - MCAPI unsigned __int64 size() const; - /** - * @symbol ?top\@ItemStackNetManagerScreenStack\@\@QEAAPEAVItemStackNetManagerScreen\@\@XZ - */ - MCAPI class ItemStackNetManagerScreen * top(); - /** - * @symbol ?top\@ItemStackNetManagerScreenStack\@\@QEBAPEBVItemStackNetManagerScreen\@\@XZ - */ - MCAPI class ItemStackNetManagerScreen const * top() const; - /** - * @symbol ??1ItemStackNetManagerScreenStack\@\@QEAA\@XZ - */ - MCAPI ~ItemStackNetManagerScreenStack(); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp index 8c9c63479e..4e2f72b1a4 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp @@ -25,6 +25,7 @@ class ItemStackRequestActionBeaconPayment { public: class ItemStackRequestActionBeaconPayment& operator=(class ItemStackRequestActionBeaconPayment const &) = delete; ItemStackRequestActionBeaconPayment(class ItemStackRequestActionBeaconPayment const &) = delete; + ItemStackRequestActionBeaconPayment() = delete; #endif public: @@ -58,10 +59,6 @@ class ItemStackRequestActionBeaconPayment { * @symbol ?_read\@ItemStackRequestActionBeaconPayment\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ virtual bool _read(class ReadOnlyBinaryStream &); - /** - * @symbol ??0ItemStackRequestActionBeaconPayment\@\@QEAA\@XZ - */ - MCAPI ItemStackRequestActionBeaconPayment(); /** * @symbol ?getPrimaryEffectId\@ItemStackRequestActionBeaconPayment\@\@QEBAHXZ */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionConsume.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionConsume.hpp index 648083149f..f003157d4b 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionConsume.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionConsume.hpp @@ -26,6 +26,7 @@ class ItemStackRequestActionConsume : public ItemStackRequestActionTransferBase public: class ItemStackRequestActionConsume& operator=(class ItemStackRequestActionConsume const &) = delete; ItemStackRequestActionConsume(class ItemStackRequestActionConsume const &) = delete; + ItemStackRequestActionConsume() = delete; #endif public: @@ -50,8 +51,14 @@ class ItemStackRequestActionConsume : public ItemStackRequestActionTransferBase */ virtual void __unk_vfn_3(); /** - * @symbol ??0ItemStackRequestActionConsume\@\@QEAA\@XZ + * @vftbl 4 + * @symbol ?_write\@ItemStackRequestActionTransferBase\@\@MEBAXAEAVBinaryStream\@\@\@Z */ - MCAPI ItemStackRequestActionConsume(); + virtual void _write(class BinaryStream &) const; + /** + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual bool _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftGrindstone.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftGrindstone.hpp index 0be0e476db..91d6cd6c51 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftGrindstone.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftGrindstone.hpp @@ -67,9 +67,5 @@ class ItemStackRequestActionCraftGrindstone { * @symbol ??0ItemStackRequestActionCraftGrindstone\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionCraftGrindstone(); - /** - * @symbol ?getRepairCost\@ItemStackRequestActionCraftGrindstone\@\@QEBAHXZ - */ - MCAPI int getRepairCost() const; }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp index 9aca49a46c..f1346fd659 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp @@ -33,10 +33,6 @@ class ItemStackRequestActionCraftHandler { * @symbol ??0ItemStackRequestActionCraftHandler\@\@QEAA\@AEAVItemStackRequestActionHandler\@\@AEAVPlayer\@\@\@Z */ MCAPI ItemStackRequestActionCraftHandler(class ItemStackRequestActionHandler &, class Player &); - /** - * @symbol ?_getOrInitSparseContainer\@ItemStackRequestActionCraftHandler\@\@QEAA?AV?$shared_ptr\@VSimpleSparseContainer\@\@\@std\@\@W4ContainerEnumName\@\@\@Z - */ - MCAPI class std::shared_ptr _getOrInitSparseContainer(enum class ContainerEnumName); /** * @symbol ?_initCraftResults\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@E\@Z */ @@ -45,10 +41,6 @@ class ItemStackRequestActionCraftHandler { * @symbol ?_initSingleCraftResult\@ItemStackRequestActionCraftHandler\@\@QEAAPEAVItemInstance\@\@AEBV2\@\@Z */ MCAPI class ItemInstance * _initSingleCraftResult(class ItemInstance const &); - /** - * @symbol ?_validateRequestSlot\@ItemStackRequestActionCraftHandler\@\@QEAA?AUItemStackRequestHandlerSlotInfo\@\@AEBUItemStackRequestSlotInfo\@\@\@Z - */ - MCAPI struct ItemStackRequestHandlerSlotInfo _validateRequestSlot(struct ItemStackRequestSlotInfo const &); /** * @symbol ?endRequest\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@W42\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftLoom.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftLoom.hpp index f30fa4c701..7631565d4d 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftLoom.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftLoom.hpp @@ -62,9 +62,5 @@ class ItemStackRequestActionCraftLoom { * @symbol ??0ItemStackRequestActionCraftLoom\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionCraftLoom(); - /** - * @symbol ?getPatternNameId\@ItemStackRequestActionCraftLoom\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getPatternNameId() const; }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeAuto.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeAuto.hpp index 077f80e7e8..3cfdd5a137 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeAuto.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeAuto.hpp @@ -62,13 +62,5 @@ class ItemStackRequestActionCraftRecipeAuto { * @symbol ??0ItemStackRequestActionCraftRecipeAuto\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionCraftRecipeAuto(); - /** - * @symbol ?getIngredients\@ItemStackRequestActionCraftRecipeAuto\@\@QEBAPEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector const * getIngredients() const; - /** - * @symbol ?getNumCrafts\@ItemStackRequestActionCraftRecipeAuto\@\@QEBAEXZ - */ - MCAPI unsigned char getNumCrafts() const; }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeOptional.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeOptional.hpp index 4567fbfb8e..90ed3e9061 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeOptional.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeOptional.hpp @@ -62,9 +62,5 @@ class ItemStackRequestActionCraftRecipeOptional { * @symbol ??0ItemStackRequestActionCraftRecipeOptional\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionCraftRecipeOptional(); - /** - * @symbol ?getRecipeNetId\@ItemStackRequestActionCraftRecipeOptional\@\@QEBAAEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@XZ - */ - MCAPI class TypedServerNetId const & getRecipeNetId() const; }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp index c1a6b6ff1b..cc52bf75da 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp @@ -46,13 +46,5 @@ class ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING { * @symbol ??0ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING(); - /** - * @symbol ?getNumCrafts\@ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@QEBAEXZ - */ - MCAPI unsigned char getNumCrafts() const; - /** - * @symbol ?getResults\@ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@QEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector const & getResults() const; }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCreate.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCreate.hpp index ad7fb2462b..61e508edd5 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCreate.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCreate.hpp @@ -25,6 +25,7 @@ class ItemStackRequestActionCreate { public: class ItemStackRequestActionCreate& operator=(class ItemStackRequestActionCreate const &) = delete; ItemStackRequestActionCreate(class ItemStackRequestActionCreate const &) = delete; + ItemStackRequestActionCreate() = delete; #endif public: @@ -58,10 +59,6 @@ class ItemStackRequestActionCreate { * @symbol ?_read\@ItemStackRequestActionCreate\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ virtual bool _read(class ReadOnlyBinaryStream &); - /** - * @symbol ??0ItemStackRequestActionCreate\@\@QEAA\@XZ - */ - MCAPI ItemStackRequestActionCreate(); /** * @symbol ?getResultsIndex\@ItemStackRequestActionCreate\@\@QEBAEXZ */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionDestroy.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionDestroy.hpp index 934e51a0aa..84e8c25ad6 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionDestroy.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionDestroy.hpp @@ -26,6 +26,7 @@ class ItemStackRequestActionDestroy : public ItemStackRequestActionTransferBase public: class ItemStackRequestActionDestroy& operator=(class ItemStackRequestActionDestroy const &) = delete; ItemStackRequestActionDestroy(class ItemStackRequestActionDestroy const &) = delete; + ItemStackRequestActionDestroy() = delete; #endif public: @@ -50,8 +51,14 @@ class ItemStackRequestActionDestroy : public ItemStackRequestActionTransferBase */ virtual void __unk_vfn_3(); /** - * @symbol ??0ItemStackRequestActionDestroy\@\@QEAA\@XZ + * @vftbl 4 + * @symbol ?_write\@ItemStackRequestActionTransferBase\@\@MEBAXAEAVBinaryStream\@\@\@Z */ - MCAPI ItemStackRequestActionDestroy(); + virtual void _write(class BinaryStream &) const; + /** + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual bool _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionDrop.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionDrop.hpp index c9b149c876..5686e166f3 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionDrop.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionDrop.hpp @@ -25,6 +25,7 @@ class ItemStackRequestActionDrop { public: class ItemStackRequestActionDrop& operator=(class ItemStackRequestActionDrop const &) = delete; ItemStackRequestActionDrop(class ItemStackRequestActionDrop const &) = delete; + ItemStackRequestActionDrop() = delete; #endif public: @@ -58,13 +59,5 @@ class ItemStackRequestActionDrop { * @symbol ?_read\@ItemStackRequestActionDrop\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ virtual bool _read(class ReadOnlyBinaryStream &); - /** - * @symbol ??0ItemStackRequestActionDrop\@\@QEAA\@XZ - */ - MCAPI ItemStackRequestActionDrop(); - /** - * @symbol ?getRandomly\@ItemStackRequestActionDrop\@\@QEBA_NXZ - */ - MCAPI bool getRandomly() const; }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionHandler.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionHandler.hpp index dce2873f79..93769fa0a6 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionHandler.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionHandler.hpp @@ -77,18 +77,10 @@ struct ScreenData { * @symbol ?addFilteredStrings\@ItemStackRequestActionHandler\@\@QEAAXV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void addFilteredStrings(class TypedClientNetId, std::vector); - /** - * @symbol ?beginRequest\@ItemStackRequestActionHandler\@\@QEAAXAEBV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@AEAVItemStackNetManagerScreen\@\@\@Z - */ - MCAPI void beginRequest(class TypedClientNetId const &, class ItemStackNetManagerScreen &); /** * @symbol ?endRequest\@ItemStackRequestActionHandler\@\@QEAA?AV?$tuple\@W4ItemStackNetResult\@\@V?$vector\@UItemStackResponseContainerInfo\@\@V?$allocator\@UItemStackResponseContainerInfo\@\@\@std\@\@\@std\@\@\@std\@\@W4ItemStackNetResult\@\@\@Z */ MCAPI class std::tuple> endRequest(enum class ItemStackNetResult); - /** - * @symbol ?endRequestBatch\@ItemStackRequestActionHandler\@\@QEAAXXZ - */ - MCAPI void endRequestBatch(); /** * @symbol ?getFilteredStrings\@ItemStackRequestActionHandler\@\@QEBAAEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@V?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@\@Z */ @@ -105,26 +97,14 @@ struct ScreenData { * @symbol ?handleRequestAction\@ItemStackRequestActionHandler\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestAction\@\@\@Z */ MCAPI enum class ItemStackNetResult handleRequestAction(class ItemStackRequestAction const &); - /** - * @symbol ?hasFilteredStrings\@ItemStackRequestActionHandler\@\@QEBA_NV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@\@Z - */ - MCAPI bool hasFilteredStrings(class TypedClientNetId) const; /** * @symbol ?isValidationCraftingImplemented\@ItemStackRequestActionHandler\@\@QEAA_NXZ */ MCAPI bool isValidationCraftingImplemented(); - /** - * @symbol ?normalTick\@ItemStackRequestActionHandler\@\@QEAAXXZ - */ - MCAPI void normalTick(); /** * @symbol ?tryCraft\@ItemStackRequestActionHandler\@\@QEAA?AV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@3\@\@Z */ MCAPI std::vector tryCraft(std::unique_ptr); - /** - * @symbol ??1ItemStackRequestActionHandler\@\@QEAA\@XZ - */ - MCAPI ~ItemStackRequestActionHandler(); //private: /** @@ -143,10 +123,6 @@ struct ScreenData { * @symbol ?_handleTransfer\@ItemStackRequestActionHandler\@\@AEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionTransferBase\@\@_N11\@Z */ MCAPI enum class ItemStackNetResult _handleTransfer(class ItemStackRequestActionTransferBase const &, bool, bool, bool); - /** - * @symbol ?_initScreenValidation\@ItemStackRequestActionHandler\@\@AEAAXXZ - */ - MCAPI void _initScreenValidation(); /** * @symbol ?_resolveSlotIdAssignment\@ItemStackRequestActionHandler\@\@AEAA?AV?$optional\@URequestSlotIdAssignment\@ItemStackRequestActionHandler\@\@\@std\@\@AEBUItemStackRequestSlotInfo\@\@AEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionMineBlock.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionMineBlock.hpp index 8902552c92..f79a375f84 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionMineBlock.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionMineBlock.hpp @@ -27,6 +27,7 @@ enum class PreValidationStatus; public: class ItemStackRequestActionMineBlock& operator=(class ItemStackRequestActionMineBlock const &) = delete; ItemStackRequestActionMineBlock(class ItemStackRequestActionMineBlock const &) = delete; + ItemStackRequestActionMineBlock() = delete; #endif public: @@ -60,10 +61,6 @@ enum class PreValidationStatus; * @symbol ?_read\@ItemStackRequestActionMineBlock\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ virtual bool _read(class ReadOnlyBinaryStream &); - /** - * @symbol ??0ItemStackRequestActionMineBlock\@\@QEAA\@XZ - */ - MCAPI ItemStackRequestActionMineBlock(); /** * @symbol ?getPreValidationStatus\@ItemStackRequestActionMineBlock\@\@QEBA?AW4PreValidationStatus\@1\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionPlace.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionPlace.hpp index 61927126e8..ba0130d414 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionPlace.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionPlace.hpp @@ -26,6 +26,7 @@ class ItemStackRequestActionPlace : public ItemStackRequestActionTransferBase { public: class ItemStackRequestActionPlace& operator=(class ItemStackRequestActionPlace const &) = delete; ItemStackRequestActionPlace(class ItemStackRequestActionPlace const &) = delete; + ItemStackRequestActionPlace() = delete; #endif public: @@ -50,8 +51,14 @@ class ItemStackRequestActionPlace : public ItemStackRequestActionTransferBase { */ virtual void __unk_vfn_3(); /** - * @symbol ??0ItemStackRequestActionPlace\@\@QEAA\@XZ + * @vftbl 4 + * @symbol ?_write\@ItemStackRequestActionTransferBase\@\@MEBAXAEAVBinaryStream\@\@\@Z */ - MCAPI ItemStackRequestActionPlace(); + virtual void _write(class BinaryStream &) const; + /** + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual bool _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionPlaceInItemContainer.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionPlaceInItemContainer.hpp index 9b6d037633..9aea5f1a56 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionPlaceInItemContainer.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionPlaceInItemContainer.hpp @@ -24,6 +24,7 @@ class ItemStackRequestActionPlaceInItemContainer : public ItemStackRequestAction public: class ItemStackRequestActionPlaceInItemContainer& operator=(class ItemStackRequestActionPlaceInItemContainer const &) = delete; ItemStackRequestActionPlaceInItemContainer(class ItemStackRequestActionPlaceInItemContainer const &) = delete; + ItemStackRequestActionPlaceInItemContainer() = delete; #endif public: @@ -48,8 +49,14 @@ class ItemStackRequestActionPlaceInItemContainer : public ItemStackRequestAction */ virtual void __unk_vfn_3(); /** - * @symbol ??0ItemStackRequestActionPlaceInItemContainer\@\@QEAA\@XZ + * @vftbl 4 + * @symbol ?_write\@ItemStackRequestActionTransferBase\@\@MEBAXAEAVBinaryStream\@\@\@Z */ - MCAPI ItemStackRequestActionPlaceInItemContainer(); + virtual void _write(class BinaryStream &) const; + /** + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual bool _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionSwap.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionSwap.hpp index 26da749b07..c5de22dd8a 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionSwap.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionSwap.hpp @@ -26,6 +26,7 @@ class ItemStackRequestActionSwap : public ItemStackRequestActionTransferBase { public: class ItemStackRequestActionSwap& operator=(class ItemStackRequestActionSwap const &) = delete; ItemStackRequestActionSwap(class ItemStackRequestActionSwap const &) = delete; + ItemStackRequestActionSwap() = delete; #endif public: @@ -50,8 +51,14 @@ class ItemStackRequestActionSwap : public ItemStackRequestActionTransferBase { */ virtual void __unk_vfn_3(); /** - * @symbol ??0ItemStackRequestActionSwap\@\@QEAA\@XZ + * @vftbl 4 + * @symbol ?_write\@ItemStackRequestActionTransferBase\@\@MEBAXAEAVBinaryStream\@\@\@Z */ - MCAPI ItemStackRequestActionSwap(); + virtual void _write(class BinaryStream &) const; + /** + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual bool _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionTake.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionTake.hpp index d8e401cd2f..fca350bcc7 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionTake.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionTake.hpp @@ -26,6 +26,7 @@ class ItemStackRequestActionTake : public ItemStackRequestActionTransferBase { public: class ItemStackRequestActionTake& operator=(class ItemStackRequestActionTake const &) = delete; ItemStackRequestActionTake(class ItemStackRequestActionTake const &) = delete; + ItemStackRequestActionTake() = delete; #endif public: @@ -50,8 +51,14 @@ class ItemStackRequestActionTake : public ItemStackRequestActionTransferBase { */ virtual void __unk_vfn_3(); /** - * @symbol ??0ItemStackRequestActionTake\@\@QEAA\@XZ + * @vftbl 4 + * @symbol ?_write\@ItemStackRequestActionTransferBase\@\@MEBAXAEAVBinaryStream\@\@\@Z */ - MCAPI ItemStackRequestActionTake(); + virtual void _write(class BinaryStream &) const; + /** + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual bool _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionTakeFromItemContainer.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionTakeFromItemContainer.hpp index 6d42f5838e..ea4a687d66 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionTakeFromItemContainer.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionTakeFromItemContainer.hpp @@ -24,6 +24,7 @@ class ItemStackRequestActionTakeFromItemContainer : public ItemStackRequestActio public: class ItemStackRequestActionTakeFromItemContainer& operator=(class ItemStackRequestActionTakeFromItemContainer const &) = delete; ItemStackRequestActionTakeFromItemContainer(class ItemStackRequestActionTakeFromItemContainer const &) = delete; + ItemStackRequestActionTakeFromItemContainer() = delete; #endif public: @@ -48,8 +49,14 @@ class ItemStackRequestActionTakeFromItemContainer : public ItemStackRequestActio */ virtual void __unk_vfn_3(); /** - * @symbol ??0ItemStackRequestActionTakeFromItemContainer\@\@QEAA\@XZ + * @vftbl 4 + * @symbol ?_write\@ItemStackRequestActionTransferBase\@\@MEBAXAEAVBinaryStream\@\@\@Z */ - MCAPI ItemStackRequestActionTakeFromItemContainer(); + virtual void _write(class BinaryStream &) const; + /** + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual bool _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionTransferBase.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionTransferBase.hpp index 9fb0f7b1d7..2b2fdbcdde 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionTransferBase.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionTransferBase.hpp @@ -29,50 +29,20 @@ class ItemStackRequestActionTransferBase { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTACKREQUESTACTIONTRANSFERBASE /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol __unk_vfn_1 - */ - virtual void __unk_vfn_1(); - /** - * @vftbl 2 - * @symbol __unk_vfn_2 - */ - virtual void __unk_vfn_2(); - /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ - virtual void __unk_vfn_3(); + MCVAPI bool _read(class ReadOnlyBinaryStream &); /** - * @vftbl 4 * @symbol ?_write\@ItemStackRequestActionTransferBase\@\@MEBAXAEAVBinaryStream\@\@\@Z */ - virtual void _write(class BinaryStream &) const; - /** - * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z - */ - virtual bool _read(class ReadOnlyBinaryStream &); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTACKREQUESTACTIONTRANSFERBASE + MCVAPI void _write(class BinaryStream &) const; /** * @symbol __unk_destructor_-1 */ MCVAPI ~ItemStackRequestActionTransferBase(); #endif - /** - * @symbol ?getAmount\@ItemStackRequestActionTransferBase\@\@QEBAEXZ - */ - MCAPI unsigned char getAmount() const; - /** - * @symbol ?getDst\@ItemStackRequestActionTransferBase\@\@QEBAAEBUItemStackRequestSlotInfo\@\@XZ - */ - MCAPI struct ItemStackRequestSlotInfo const & getDst() const; /** * @symbol ?getSrc\@ItemStackRequestActionTransferBase\@\@QEBAAEBUItemStackRequestSlotInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestHandlerSlotInfo.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestHandlerSlotInfo.hpp index 915f96b94a..058f938d6c 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestHandlerSlotInfo.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestHandlerSlotInfo.hpp @@ -25,13 +25,10 @@ struct ItemStackRequestHandlerSlotInfo { public: struct ItemStackRequestHandlerSlotInfo& operator=(struct ItemStackRequestHandlerSlotInfo const &) = delete; ItemStackRequestHandlerSlotInfo(struct ItemStackRequestHandlerSlotInfo const &) = delete; + ItemStackRequestHandlerSlotInfo() = delete; #endif public: - /** - * @symbol ??0ItemStackRequestHandlerSlotInfo\@\@QEAA\@XZ - */ - MCAPI ItemStackRequestHandlerSlotInfo(); /** * @symbol ??BItemStackRequestHandlerSlotInfo\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestSlotInfo.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestSlotInfo.hpp index f2d1f7b0c0..ab3fd008a5 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestSlotInfo.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestSlotInfo.hpp @@ -30,10 +30,6 @@ struct ItemStackRequestSlotInfo { #endif public: - /** - * @symbol ?matchesContainerAndSlot\@ItemStackRequestSlotInfo\@\@QEBA_NAEBU1\@\@Z - */ - MCAPI bool matchesContainerAndSlot(struct ItemStackRequestSlotInfo const &) const; /** * @symbol ??1ItemStackRequestSlotInfo\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemState.hpp b/LiteLoader/include/llapi/mc/ItemState.hpp deleted file mode 100644 index fc6a411d2b..0000000000 --- a/LiteLoader/include/llapi/mc/ItemState.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file ItemState.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class ItemState. - * - */ -class ItemState { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMSTATE -public: - class ItemState& operator=(class ItemState const &) = delete; - ItemState(class ItemState const &) = delete; - ItemState() = delete; -#endif - -public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTATE - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~ItemState(); -#endif - /** - * @symbol ?forEachState\@ItemState\@\@SAXV?$function\@$$A6A_NAEBVItemState\@\@\@Z\@std\@\@\@Z - */ - MCAPI static void forEachState(class std::function); - -}; diff --git a/LiteLoader/include/llapi/mc/ItemStateInstance.hpp b/LiteLoader/include/llapi/mc/ItemStateInstance.hpp deleted file mode 100644 index 1c320c0f7d..0000000000 --- a/LiteLoader/include/llapi/mc/ItemStateInstance.hpp +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @file ItemStateInstance.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class ItemStateInstance. - * - */ -class ItemStateInstance { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMSTATEINSTANCE -public: - class ItemStateInstance& operator=(class ItemStateInstance const &) = delete; - ItemStateInstance(class ItemStateInstance const &) = delete; - ItemStateInstance() = delete; -#endif - -public: - /** - * @symbol ?initState\@ItemStateInstance\@\@QEAAXAEAIIIAEBVItemState\@\@\@Z - */ - MCAPI void initState(unsigned int &, unsigned int, unsigned int, class ItemState const &); - /** - * @symbol ?isValidData\@ItemStateInstance\@\@QEBA_NI\@Z - */ - MCAPI bool isValidData(unsigned int) const; - -}; diff --git a/LiteLoader/include/llapi/mc/ItemTagDescriptor.hpp b/LiteLoader/include/llapi/mc/ItemTagDescriptor.hpp index 671000495a..b2cde2c68f 100644 --- a/LiteLoader/include/llapi/mc/ItemTagDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/ItemTagDescriptor.hpp @@ -13,15 +13,15 @@ #undef BEFORE_EXTRA -class ItemTagDescriptor { +struct ItemTagDescriptor { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMTAGDESCRIPTOR public: - class ItemTagDescriptor& operator=(class ItemTagDescriptor const &) = delete; - ItemTagDescriptor(class ItemTagDescriptor const &) = delete; + struct ItemTagDescriptor& operator=(struct ItemTagDescriptor const &) = delete; + ItemTagDescriptor(struct ItemTagDescriptor const &) = delete; ItemTagDescriptor() = delete; #endif @@ -96,4 +96,4 @@ class ItemTagDescriptor { */ MCAPI static std::unique_ptr deserialize(class ReadOnlyBinaryStream &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ItemTransactionLogger.hpp b/LiteLoader/include/llapi/mc/ItemTransactionLogger.hpp index f36a83a831..3b59677f13 100644 --- a/LiteLoader/include/llapi/mc/ItemTransactionLogger.hpp +++ b/LiteLoader/include/llapi/mc/ItemTransactionLogger.hpp @@ -25,6 +25,10 @@ namespace ItemTransactionLogger { * @symbol ?initializeLogger\@ItemTransactionLogger\@\@YAX_N\@Z */ MCAPI void initializeLogger(bool); + /** + * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI void log(std::string const &); /** * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVInventoryAction\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -37,10 +41,6 @@ namespace ItemTransactionLogger { * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVItemStack\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void log(class ItemStack const &, std::string const &); - /** - * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI void log(std::string const &); /** * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVItemStackResponsePacket\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/JigsawBlock.hpp b/LiteLoader/include/llapi/mc/JigsawBlock.hpp index e071c1f471..5ed7b21cd4 100644 --- a/LiteLoader/include/llapi/mc/JigsawBlock.hpp +++ b/LiteLoader/include/llapi/mc/JigsawBlock.hpp @@ -167,9 +167,9 @@ class JigsawBlock : public ActorBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@JigsawBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@JigsawBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,35 +186,35 @@ class JigsawBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 148 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 149 * @symbol ?getRenderBlock\@JigsawBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getRenderBlock() const; /** - * @vftbl 149 + * @vftbl 150 * @symbol ?getMappedFace\@JigsawBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 150 + * @vftbl 151 * @symbol ?getFaceFlip\@JigsawBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,32 +226,37 @@ class JigsawBlock : public ActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@JigsawBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@JigsawBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/JigsawEditorData.hpp b/LiteLoader/include/llapi/mc/JigsawEditorData.hpp index e3069cb479..3a09ee3eb3 100644 --- a/LiteLoader/include/llapi/mc/JigsawEditorData.hpp +++ b/LiteLoader/include/llapi/mc/JigsawEditorData.hpp @@ -56,10 +56,6 @@ class JigsawEditorData { * @symbol ?getTarget\@JigsawEditorData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getTarget() const; - /** - * @symbol ?getTargetPool\@JigsawEditorData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getTargetPool() const; /** * @symbol ?load\@JigsawEditorData\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/JigsawJunction.hpp b/LiteLoader/include/llapi/mc/JigsawJunction.hpp deleted file mode 100644 index 432437183e..0000000000 --- a/LiteLoader/include/llapi/mc/JigsawJunction.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file JigsawJunction.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure JigsawJunction. - * - */ -struct JigsawJunction { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_JIGSAWJUNCTION -public: - struct JigsawJunction& operator=(struct JigsawJunction const &) = delete; - JigsawJunction(struct JigsawJunction const &) = delete; - JigsawJunction() = delete; -#endif - -public: - /** - * @symbol ??0JigsawJunction\@\@QEAA\@HHHHW4Projection\@\@0\@Z - */ - MCAPI JigsawJunction(int, int, int, int, enum class Projection, enum class Projection); - /** - * @symbol ?getDeltaTargetY\@JigsawJunction\@\@QEBAHXZ - */ - MCAPI int getDeltaTargetY() const; - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/JigsawStructureActorRulesRegistry.hpp b/LiteLoader/include/llapi/mc/JigsawStructureActorRulesRegistry.hpp index dc6a452362..739154aeb7 100644 --- a/LiteLoader/include/llapi/mc/JigsawStructureActorRulesRegistry.hpp +++ b/LiteLoader/include/llapi/mc/JigsawStructureActorRulesRegistry.hpp @@ -32,10 +32,6 @@ class JigsawStructureActorRulesRegistry { * @symbol ??0JigsawStructureActorRulesRegistry\@\@QEAA\@XZ */ MCAPI JigsawStructureActorRulesRegistry(); - /** - * @symbol ?clear\@JigsawStructureActorRulesRegistry\@\@QEAAXXZ - */ - MCAPI void clear(); /** * @symbol ?lookupByName\@JigsawStructureActorRulesRegistry\@\@QEBAPEBV?$vector\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/JigsawStructureBlockInfo.hpp b/LiteLoader/include/llapi/mc/JigsawStructureBlockInfo.hpp index af376fadb1..5833b74634 100644 --- a/LiteLoader/include/llapi/mc/JigsawStructureBlockInfo.hpp +++ b/LiteLoader/include/llapi/mc/JigsawStructureBlockInfo.hpp @@ -33,10 +33,6 @@ class JigsawStructureBlockInfo { * @symbol ??0JigsawStructureBlockInfo\@\@QEAA\@AEBVBlockPos\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBVBlock\@\@\@Z */ MCAPI JigsawStructureBlockInfo(class BlockPos const &, std::unique_ptr, class Block const &); - /** - * @symbol ??0JigsawStructureBlockInfo\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI JigsawStructureBlockInfo(class JigsawStructureBlockInfo &&); /** * @symbol ?getNonEmptyTag\@JigsawStructureBlockInfo\@\@QEAAPEAVCompoundTag\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/JigsawStructureBlockRulesRegistry.hpp b/LiteLoader/include/llapi/mc/JigsawStructureBlockRulesRegistry.hpp index 0cfb56ee58..d34a4213c4 100644 --- a/LiteLoader/include/llapi/mc/JigsawStructureBlockRulesRegistry.hpp +++ b/LiteLoader/include/llapi/mc/JigsawStructureBlockRulesRegistry.hpp @@ -32,10 +32,6 @@ class JigsawStructureBlockRulesRegistry { * @symbol ??0JigsawStructureBlockRulesRegistry\@\@QEAA\@XZ */ MCAPI JigsawStructureBlockRulesRegistry(); - /** - * @symbol ?clear\@JigsawStructureBlockRulesRegistry\@\@QEAAXXZ - */ - MCAPI void clear(); /** * @symbol ?lookupByName\@JigsawStructureBlockRulesRegistry\@\@QEBAPEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/JigsawStructureBlockTagRulesRegistry.hpp b/LiteLoader/include/llapi/mc/JigsawStructureBlockTagRulesRegistry.hpp index 8296fca0f1..1da971887c 100644 --- a/LiteLoader/include/llapi/mc/JigsawStructureBlockTagRulesRegistry.hpp +++ b/LiteLoader/include/llapi/mc/JigsawStructureBlockTagRulesRegistry.hpp @@ -32,10 +32,6 @@ class JigsawStructureBlockTagRulesRegistry { * @symbol ??0JigsawStructureBlockTagRulesRegistry\@\@QEAA\@XZ */ MCAPI JigsawStructureBlockTagRulesRegistry(); - /** - * @symbol ?clear\@JigsawStructureBlockTagRulesRegistry\@\@QEAAXXZ - */ - MCAPI void clear(); /** * @symbol ?lookupByName\@JigsawStructureBlockTagRulesRegistry\@\@QEBAPEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/JigsawStructureElementRegistry.hpp b/LiteLoader/include/llapi/mc/JigsawStructureElementRegistry.hpp index 8630b28a6f..aafd03c1c8 100644 --- a/LiteLoader/include/llapi/mc/JigsawStructureElementRegistry.hpp +++ b/LiteLoader/include/llapi/mc/JigsawStructureElementRegistry.hpp @@ -32,10 +32,6 @@ class JigsawStructureElementRegistry { * @symbol ??0JigsawStructureElementRegistry\@\@QEAA\@XZ */ MCAPI JigsawStructureElementRegistry(); - /** - * @symbol ?clear\@JigsawStructureElementRegistry\@\@QEAAXXZ - */ - MCAPI void clear(); /** * @symbol ?lookupByName\@JigsawStructureElementRegistry\@\@QEBAPEBVStructurePoolElement\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -44,9 +40,5 @@ class JigsawStructureElementRegistry { * @symbol ?registerStructureElement\@JigsawStructureElementRegistry\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$unique_ptr\@VStructurePoolElement\@\@U?$default_delete\@VStructurePoolElement\@\@\@std\@\@\@3\@\@Z */ MCAPI void registerStructureElement(std::string, std::unique_ptr &&); - /** - * @symbol ??1JigsawStructureElementRegistry\@\@QEAA\@XZ - */ - MCAPI ~JigsawStructureElementRegistry(); }; diff --git a/LiteLoader/include/llapi/mc/Json.hpp b/LiteLoader/include/llapi/mc/Json.hpp index ff135b399f..359cb2314b 100644 --- a/LiteLoader/include/llapi/mc/Json.hpp +++ b/LiteLoader/include/llapi/mc/Json.hpp @@ -476,10 +476,6 @@ class StyledWriter : public Writer { * @symbol ?valueToQuotedString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z */ MCAPI std::string valueToQuotedString(char const *); - /** - * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@N\@Z - */ - MCAPI std::string valueToString(double); /** * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@Z */ @@ -488,5 +484,9 @@ class StyledWriter : public Writer { * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_J\@Z */ MCAPI std::string valueToString(__int64); + /** + * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@N\@Z + */ + MCAPI std::string valueToString(double); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/JukeboxBlock.hpp b/LiteLoader/include/llapi/mc/JukeboxBlock.hpp index f0f7d3ce2b..3f0e9bad8e 100644 --- a/LiteLoader/include/llapi/mc/JukeboxBlock.hpp +++ b/LiteLoader/include/llapi/mc/JukeboxBlock.hpp @@ -196,25 +196,25 @@ class JukeboxBlock : public ActorBlock { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 162 - * @symbol ?onRemove\@JukeboxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void onRemove(class BlockSource &, class BlockPos const &) const; + virtual void __unk_vfn_157(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol ?onRemove\@JukeboxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_165(); + virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -227,34 +227,39 @@ class JukeboxBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@JukeboxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@JukeboxBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_JUKEBOXBLOCK /** * @symbol ?hasComparatorSignal\@JukeboxBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/JunglePyramidPiece.hpp b/LiteLoader/include/llapi/mc/JunglePyramidPiece.hpp index fa7a0533d6..fcb545238b 100644 --- a/LiteLoader/include/llapi/mc/JunglePyramidPiece.hpp +++ b/LiteLoader/include/llapi/mc/JunglePyramidPiece.hpp @@ -45,9 +45,5 @@ class JunglePyramidPiece : public StructurePiece { * @symbol ?postProcess\@JunglePyramidPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); - /** - * @symbol ??0JunglePyramidPiece\@\@QEAA\@FHH\@Z - */ - MCAPI JunglePyramidPiece(short, int, int); }; diff --git a/LiteLoader/include/llapi/mc/KelpBlock.hpp b/LiteLoader/include/llapi/mc/KelpBlock.hpp index 6b93b9ac3e..28e916ebfa 100644 --- a/LiteLoader/include/llapi/mc/KelpBlock.hpp +++ b/LiteLoader/include/llapi/mc/KelpBlock.hpp @@ -216,30 +216,30 @@ class KelpBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 135 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 136 * @symbol ?getColor\@KelpBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 140 + * @vftbl 141 * @symbol ?onGraphicsModeChanged\@KelpBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -252,41 +252,46 @@ class KelpBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@KelpBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@KelpBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@KelpBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; @@ -310,10 +315,6 @@ class KelpBlock : public BlockLegacy { MCAPI bool shouldGrow(class BlockSource &, class BlockPos const &) const; //private: - /** - * @symbol ?_getAge\@KelpBlock\@\@AEBAHAEBVBlock\@\@\@Z - */ - MCAPI int _getAge(class Block const &) const; /** * @symbol ?_tryGrow\@KelpBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/KeyFrameLerpMode.hpp b/LiteLoader/include/llapi/mc/KeyFrameLerpMode.hpp index 3384ed05a1..781c3457fb 100644 --- a/LiteLoader/include/llapi/mc/KeyFrameLerpMode.hpp +++ b/LiteLoader/include/llapi/mc/KeyFrameLerpMode.hpp @@ -36,9 +36,5 @@ class KeyFrameLerpMode { * @symbol ??4KeyFrameLerpMode\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class KeyFrameLerpMode & operator=(class KeyFrameLerpMode const &); - /** - * @symbol ?setLerpStyle\@KeyFrameLerpMode\@\@QEAAXW4KeyFrameLerpStyle\@\@\@Z - */ - MCAPI void setLerpStyle(enum class KeyFrameLerpStyle); }; diff --git a/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp b/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp index 5642524747..d7ce15a1f2 100644 --- a/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp +++ b/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp @@ -33,10 +33,6 @@ class KeyFrameTransform { * @symbol ??0KeyFrameTransform\@\@QEAA\@M\@Z */ MCAPI KeyFrameTransform(float); - /** - * @symbol ?getLerpMode\@KeyFrameTransform\@\@QEAAAEAVKeyFrameLerpMode\@\@XZ - */ - MCAPI class KeyFrameLerpMode & getLerpMode(); /** * @symbol ??4KeyFrameTransform\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ @@ -45,26 +41,14 @@ class KeyFrameTransform { * @symbol ?optimizeAndGetDataValues\@KeyFrameTransform\@\@QEAA_NAEAVVec3\@\@0\@Z */ MCAPI bool optimizeAndGetDataValues(class Vec3 &, class Vec3 &); - /** - * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@H\@Z - */ - MCAPI void set(class ExpressionNode const &, int); /** * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@\@Z */ MCAPI void set(class ExpressionNode const &); /** - * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@AEBVVec3\@\@\@Z - */ - MCAPI void set(class ExpressionNode const &, class Vec3 const &); - /** - * @symbol ?setPost\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@H\@Z - */ - MCAPI void setPost(class ExpressionNode const &, int); - /** - * @symbol ?setPre\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@H\@Z + * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@H\@Z */ - MCAPI void setPre(class ExpressionNode const &, int); + MCAPI void set(class ExpressionNode const &, int); /** * @symbol ??1KeyFrameTransform\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/KeyFrameTransformData.hpp b/LiteLoader/include/llapi/mc/KeyFrameTransformData.hpp index 2b18a998f4..94318063ab 100644 --- a/LiteLoader/include/llapi/mc/KeyFrameTransformData.hpp +++ b/LiteLoader/include/llapi/mc/KeyFrameTransformData.hpp @@ -36,6 +36,10 @@ class KeyFrameTransformData { * @symbol ?addChannelTransform\@KeyFrameTransformData\@\@QEAAXAEBVExpressionNode\@\@H\@Z */ MCAPI void addChannelTransform(class ExpressionNode const &, int); + /** + * @symbol ?addChannelTransform\@KeyFrameTransformData\@\@QEAAXAEBVExpressionNode\@\@AEBVVec3\@\@\@Z + */ + MCAPI void addChannelTransform(class ExpressionNode const &, class Vec3 const &); /** * @symbol ??8KeyFrameTransformData\@\@QEBA_NAEBV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/KeyManager.hpp b/LiteLoader/include/llapi/mc/KeyManager.hpp index 29985ee0b9..c29361f60b 100644 --- a/LiteLoader/include/llapi/mc/KeyManager.hpp +++ b/LiteLoader/include/llapi/mc/KeyManager.hpp @@ -54,9 +54,5 @@ class KeyManager { * @symbol ?getPublicKey\@KeyManager\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getPublicKey() const; - /** - * @symbol ?verify\@KeyManager\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4HashType\@Hash\@Crypto\@\@\@Z - */ - MCAPI bool verify(std::string const &, std::string const &, enum class Crypto::Hash::HashType) const; }; diff --git a/LiteLoader/include/llapi/mc/KickCommand.hpp b/LiteLoader/include/llapi/mc/KickCommand.hpp index 9ce099f691..79b0462d37 100644 --- a/LiteLoader/include/llapi/mc/KickCommand.hpp +++ b/LiteLoader/include/llapi/mc/KickCommand.hpp @@ -36,7 +36,7 @@ class KickCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@KickCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; @@ -58,14 +58,14 @@ class KickCommand : public Command { * @symbol ?_generateSuccessOutput\@KickCommand\@\@AEBAXAEAVCommandOutput\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z */ MCAPI void _generateSuccessOutput(class CommandOutput &, std::string const &, std::string const &) const; - /** - * @symbol ?_kickPlayer\@KickCommand\@\@AEBAXAEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI void _kickPlayer(class Player const &, std::string const &) const; /** * @symbol ?_loopPlayers\@KickCommand\@\@AEBAPEBVPlayer\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@3V?$function\@$$A6A_NPEBVPlayer\@\@\@Z\@7\@\@Z */ MCAPI class Player const * _loopPlayers(class CommandOrigin const &, class CommandOutput &, class Level &, std::string const &, std::string const &, class std::function) const; + /** + * @symbol ?_kickPlayer\@KickCommand\@\@CAXPEAVMinecraft\@\@AEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI static void _kickPlayer(class Minecraft *, class Player const &, std::string const &); private: diff --git a/LiteLoader/include/llapi/mc/KillCommand.hpp b/LiteLoader/include/llapi/mc/KillCommand.hpp index 266a477043..73fbf20e21 100644 --- a/LiteLoader/include/llapi/mc/KillCommand.hpp +++ b/LiteLoader/include/llapi/mc/KillCommand.hpp @@ -36,7 +36,7 @@ class KillCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@KillCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp b/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp index 74d03ed84b..b7d99909fb 100644 --- a/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp +++ b/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp @@ -161,6 +161,11 @@ class KnockbackArmorUpdater { virtual void __unk_vfn_25(); /** * @vftbl 26 + * @symbol __unk_vfn_26 + */ + virtual void __unk_vfn_26(); + /** + * @vftbl 27 * @symbol ?onEvent\@KnockbackArmorUpdater\@\@UEAA?AW4EventResult\@\@AEBUActorEquippedArmorEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ActorEquippedArmorEvent const &); diff --git a/LiteLoader/include/llapi/mc/KnockbackRules.hpp b/LiteLoader/include/llapi/mc/KnockbackRules.hpp index 8ea58c60f2..1e8319fbc6 100644 --- a/LiteLoader/include/llapi/mc/KnockbackRules.hpp +++ b/LiteLoader/include/llapi/mc/KnockbackRules.hpp @@ -21,14 +21,14 @@ namespace KnockbackRules { // Add Member There #undef AFTER_EXTRA - /** - * @symbol ?doKnockbackAttack\@KnockbackRules\@\@YAXAEAVMob\@\@0AEBVVec2\@\@MM\@Z - */ - MCAPI void doKnockbackAttack(class Mob &, class Mob &, class Vec2 const &, float, float); /** * @symbol ?doKnockbackAttack\@KnockbackRules\@\@YAXAEAVMob\@\@0AEBVVec3\@\@MM\@Z */ MCAPI void doKnockbackAttack(class Mob &, class Mob &, class Vec3 const &, float, float); + /** + * @symbol ?doKnockbackAttack\@KnockbackRules\@\@YAXAEAVMob\@\@0AEBVVec2\@\@MM\@Z + */ + MCAPI void doKnockbackAttack(class Mob &, class Mob &, class Vec2 const &, float, float); /** * @symbol ?getScaledKnockbackForce\@KnockbackRules\@\@YAMAEBVActor\@\@M\@Z */ @@ -37,10 +37,6 @@ namespace KnockbackRules { * @symbol ?isKnockbackResistant\@KnockbackRules\@\@YA_NAEBVActor\@\@\@Z */ MCAPI bool isKnockbackResistant(class Actor const &); - /** - * @symbol ?shouldApplyKnockback\@KnockbackRules\@\@YA_NAEBVMob\@\@\@Z - */ - MCAPI bool shouldApplyKnockback(class Mob const &); /** * @symbol ?useLegacyKnockback\@KnockbackRules\@\@YA_NAEBVLevel\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LabTablePacket.hpp b/LiteLoader/include/llapi/mc/LabTablePacket.hpp index 37f07c67a8..fee5bbc69c 100644 --- a/LiteLoader/include/llapi/mc/LabTablePacket.hpp +++ b/LiteLoader/include/llapi/mc/LabTablePacket.hpp @@ -64,13 +64,13 @@ class LabTablePacket : public Packet { * @symbol ??0LabTablePacket\@\@QEAA\@XZ */ MCAPI LabTablePacket(); - /** - * @symbol ??0LabTablePacket\@\@QEAA\@AEBVBlockPos\@\@W4LabTableReactionType\@\@\@Z - */ - MCAPI LabTablePacket(class BlockPos const &, enum class LabTableReactionType); /** * @symbol ??0LabTablePacket\@\@QEAA\@W4Type\@0\@AEBVBlockPos\@\@\@Z */ MCAPI LabTablePacket(enum class LabTablePacket::Type, class BlockPos const &); + /** + * @symbol ??0LabTablePacket\@\@QEAA\@AEBVBlockPos\@\@W4LabTableReactionType\@\@\@Z + */ + MCAPI LabTablePacket(class BlockPos const &, enum class LabTableReactionType); }; diff --git a/LiteLoader/include/llapi/mc/LadderBlock.hpp b/LiteLoader/include/llapi/mc/LadderBlock.hpp index 8eaa966fbb..a2ca13ac82 100644 --- a/LiteLoader/include/llapi/mc/LadderBlock.hpp +++ b/LiteLoader/include/llapi/mc/LadderBlock.hpp @@ -197,9 +197,9 @@ class LadderBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@LadderBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@LadderBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -216,25 +216,25 @@ class LadderBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@LadderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 144 + * @symbol ?getVisualShape\@LadderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -246,35 +246,40 @@ class LadderBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@LadderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@LadderBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LADDERBLOCK /** * @symbol ?canBeSilkTouched\@LadderBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/LanternBlock.hpp b/LiteLoader/include/llapi/mc/LanternBlock.hpp index 1136e0ec79..ee83383cbf 100644 --- a/LiteLoader/include/llapi/mc/LanternBlock.hpp +++ b/LiteLoader/include/llapi/mc/LanternBlock.hpp @@ -187,9 +187,9 @@ class LanternBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@LanternBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@LanternBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,25 +206,25 @@ class LanternBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@LanternBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 144 + * @symbol ?getVisualShape\@LanternBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -236,47 +236,52 @@ class LanternBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@LanternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@LanternBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@LanternBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@LanternBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@LanternBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/LavaTravelSystem.hpp b/LiteLoader/include/llapi/mc/LavaTravelSystem.hpp index e4cfa63712..3ac7cfd990 100644 --- a/LiteLoader/include/llapi/mc/LavaTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/LavaTravelSystem.hpp @@ -28,5 +28,9 @@ class LavaTravelSystem { * @symbol ?createLavaTravelSystem\@LavaTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createLavaTravelSystem(); + /** + * @symbol ?tickLavaTravelSystem\@LavaTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@V?$FlagComponent\@ULavaTravelFlag\@\@\@\@\@\@$$CBUAttributesComponent\@\@UMobTravelComponent\@\@\@\@\@Z + */ + MCAPI static void tickLavaTravelSystem(class ViewT, class FlagComponent, class FlagComponent>, struct AttributesComponent const, struct MobTravelComponent>); }; diff --git a/LiteLoader/include/llapi/mc/LayeredAbilities.hpp b/LiteLoader/include/llapi/mc/LayeredAbilities.hpp index 1d4f21c758..a0625706b1 100644 --- a/LiteLoader/include/llapi/mc/LayeredAbilities.hpp +++ b/LiteLoader/include/llapi/mc/LayeredAbilities.hpp @@ -21,7 +21,7 @@ class LayeredAbilities { #define AFTER_EXTRA private: PermissionsHandler mPermissions; - std::array mLayers; // May not correct + std::array mLayers; // May not correct #undef AFTER_EXTRA public: /** @@ -52,14 +52,14 @@ class LayeredAbilities { * @symbol ?forEachLayer\@LayeredAbilities\@\@QEBAXAEBV?$function\@$$A6AXW4AbilitiesLayer\@\@AEBVAbilities\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachLayer(class std::function const &) const; - /** - * @symbol ?getAbility\@LayeredAbilities\@\@QEBAAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z - */ - MCAPI class Ability const & getAbility(enum class AbilitiesIndex) const; /** * @symbol ?getAbility\@LayeredAbilities\@\@QEAAAEAVAbility\@\@W4AbilitiesLayer\@\@W4AbilitiesIndex\@\@\@Z */ MCAPI class Ability & getAbility(enum class AbilitiesLayer, enum class AbilitiesIndex); + /** + * @symbol ?getAbility\@LayeredAbilities\@\@QEBAAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z + */ + MCAPI class Ability const & getAbility(enum class AbilitiesIndex) const; /** * @symbol ?getBool\@LayeredAbilities\@\@QEBA_NW4AbilitiesIndex\@\@\@Z */ @@ -84,10 +84,6 @@ class LayeredAbilities { * @symbol ?getPlayerPermissions\@LayeredAbilities\@\@QEBA?AW4PlayerPermissionLevel\@\@XZ */ MCAPI enum class PlayerPermissionLevel getPlayerPermissions() const; - /** - * @symbol ?loadSaveData\@LayeredAbilities\@\@QEAA_NAEBVCompoundTag\@\@\@Z - */ - MCAPI bool loadSaveData(class CompoundTag const &); /** * @symbol ??4LayeredAbilities\@\@QEAAAEAV0\@AEBV0\@\@Z */ @@ -104,10 +100,6 @@ class LayeredAbilities { * @symbol ?setCommandPermissions\@LayeredAbilities\@\@QEAAXW4CommandPermissionLevel\@\@\@Z */ MCAPI void setCommandPermissions(enum class CommandPermissionLevel); - /** - * @symbol ?setPermissions\@LayeredAbilities\@\@QEAAXAEBVPermissionsHandler\@\@\@Z - */ - MCAPI void setPermissions(class PermissionsHandler const &); /** * @symbol ?setPlayerPermissions\@LayeredAbilities\@\@QEAAXW4PlayerPermissionLevel\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LeadItem.hpp b/LiteLoader/include/llapi/mc/LeadItem.hpp index 13d6d4cc50..0421d77f6b 100644 --- a/LiteLoader/include/llapi/mc/LeadItem.hpp +++ b/LiteLoader/include/llapi/mc/LeadItem.hpp @@ -103,9 +103,9 @@ class LeadItem : public Item { virtual void __unk_vfn_80(); /** * @vftbl 132 - * @symbol ?_useOn\@LeadItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@LeadItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0LeadItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/LeafBlock.hpp b/LiteLoader/include/llapi/mc/LeafBlock.hpp index 1d2f9a5d05..037f10421c 100644 --- a/LiteLoader/include/llapi/mc/LeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/LeafBlock.hpp @@ -187,9 +187,9 @@ class LeafBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@LeafBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@LeafBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,40 +206,40 @@ class LeafBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 136 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 137 * @symbol ?getColor\@LeafBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 139 + * @vftbl 140 * @symbol ?isSeasonTinted\@LeafBlock\@\@UEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isSeasonTinted(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 140 + * @vftbl 141 * @symbol ?onGraphicsModeChanged\@LeafBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@LeafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -251,52 +251,57 @@ class LeafBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@LeafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 181 + * @vftbl 182 * @symbol ?getRenderLayer\@LeafBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@LeafBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@LeafBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@LeafBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getExtraResourceItem\@LeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getExtraResourceItem(class Block const &) const; @@ -324,10 +329,6 @@ class LeafBlock : public BlockLegacy { * @symbol ?_getSapling\@LeafBlock\@\@IEBAAEBVBlock\@\@XZ */ MCAPI class Block const & _getSapling() const; - /** - * @symbol ?_isTransparent\@LeafBlock\@\@KA_NAEBVBlock\@\@AEBW4BlockProperty\@\@\@Z - */ - MCAPI static bool _isTransparent(class Block const &, enum class BlockProperty const &); protected: diff --git a/LiteLoader/include/llapi/mc/LecternBlock.hpp b/LiteLoader/include/llapi/mc/LecternBlock.hpp index b3ffc7f8d9..df9d9d3e07 100644 --- a/LiteLoader/include/llapi/mc/LecternBlock.hpp +++ b/LiteLoader/include/llapi/mc/LecternBlock.hpp @@ -197,9 +197,9 @@ class LecternBlock : public ActorBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@LecternBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@LecternBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 109 * @symbol ?attack\@LecternBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z @@ -226,25 +226,25 @@ class LecternBlock : public ActorBlock { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@LecternBlock\@\@UEAAXXZ + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void _addHardCodedBlockComponents(); + virtual void __unk_vfn_157(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol ?_addHardCodedBlockComponents\@LecternBlock\@\@UEAAXXZ */ - virtual void __unk_vfn_165(); + virtual void _addHardCodedBlockComponents(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -257,39 +257,44 @@ class LecternBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@LecternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@LecternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@LecternBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LECTERNBLOCK /** * @symbol ?hasComparatorSignal\@LecternBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/LegacyBlockPlacementProcessor.hpp b/LiteLoader/include/llapi/mc/LegacyBlockPlacementProcessor.hpp index d206911976..7cd543adec 100644 --- a/LiteLoader/include/llapi/mc/LegacyBlockPlacementProcessor.hpp +++ b/LiteLoader/include/llapi/mc/LegacyBlockPlacementProcessor.hpp @@ -41,10 +41,6 @@ class LegacyBlockPlacementProcessor { * @symbol ?applyGravity\@LegacyBlockPlacementProcessor\@\@QEBAAEAVBlockPos\@\@AEAVBlockSource\@\@HAEAV2\@\@Z */ MCAPI class BlockPos & applyGravity(class BlockSource &, int, class BlockPos &) const; - /** - * @symbol ?canPlace\@LegacyBlockPlacementProcessor\@\@QEAA_NXZ - */ - MCAPI bool canPlace(); /** * @symbol ??1LegacyBlockPlacementProcessor\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LegacyStructureActorInfo.hpp b/LiteLoader/include/llapi/mc/LegacyStructureActorInfo.hpp deleted file mode 100644 index 16dc815592..0000000000 --- a/LiteLoader/include/llapi/mc/LegacyStructureActorInfo.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file LegacyStructureActorInfo.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class LegacyStructureActorInfo. - * - */ -class LegacyStructureActorInfo { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEGACYSTRUCTUREACTORINFO -public: - class LegacyStructureActorInfo& operator=(class LegacyStructureActorInfo const &) = delete; - LegacyStructureActorInfo(class LegacyStructureActorInfo const &) = delete; - LegacyStructureActorInfo() = delete; -#endif - -public: - /** - * @symbol ??0LegacyStructureActorInfo\@\@QEAA\@AEBVVec3\@\@AEBVBlockPos\@\@VCompoundTag\@\@\@Z - */ - MCAPI LegacyStructureActorInfo(class Vec3 const &, class BlockPos const &, class CompoundTag); - -}; diff --git a/LiteLoader/include/llapi/mc/LegacyStructureBlockInfo.hpp b/LiteLoader/include/llapi/mc/LegacyStructureBlockInfo.hpp deleted file mode 100644 index 7cb85ed7ad..0000000000 --- a/LiteLoader/include/llapi/mc/LegacyStructureBlockInfo.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file LegacyStructureBlockInfo.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class LegacyStructureBlockInfo. - * - */ -class LegacyStructureBlockInfo { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEGACYSTRUCTUREBLOCKINFO -public: - class LegacyStructureBlockInfo& operator=(class LegacyStructureBlockInfo const &) = delete; - LegacyStructureBlockInfo(class LegacyStructureBlockInfo const &) = delete; - LegacyStructureBlockInfo() = delete; -#endif - -public: - /** - * @symbol ??0LegacyStructureBlockInfo\@\@QEAA\@AEBVBlockPos\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBVBlock\@\@2\@Z - */ - MCAPI LegacyStructureBlockInfo(class BlockPos const &, std::unique_ptr, class Block const &, class Block const &); - -}; diff --git a/LiteLoader/include/llapi/mc/LegacyStructureBlockPalette.hpp b/LiteLoader/include/llapi/mc/LegacyStructureBlockPalette.hpp index d30d22d679..81ddb9202f 100644 --- a/LiteLoader/include/llapi/mc/LegacyStructureBlockPalette.hpp +++ b/LiteLoader/include/llapi/mc/LegacyStructureBlockPalette.hpp @@ -32,14 +32,6 @@ class LegacyStructureBlockPalette { * @symbol ??0LegacyStructureBlockPalette\@\@QEAA\@XZ */ MCAPI LegacyStructureBlockPalette(); - /** - * @symbol ?addMapping\@LegacyStructureBlockPalette\@\@QEAAXHAEBVBlock\@\@\@Z - */ - MCAPI void addMapping(int, class Block const &); - /** - * @symbol ?clearMap\@LegacyStructureBlockPalette\@\@QEAAXXZ - */ - MCAPI void clearMap(); /** * @symbol ?getBlock\@LegacyStructureBlockPalette\@\@QEAAAEBVBlock\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/LegacyStructureSettings.hpp b/LiteLoader/include/llapi/mc/LegacyStructureSettings.hpp index 42ea15bef1..afd605e789 100644 --- a/LiteLoader/include/llapi/mc/LegacyStructureSettings.hpp +++ b/LiteLoader/include/llapi/mc/LegacyStructureSettings.hpp @@ -24,7 +24,6 @@ class LegacyStructureSettings { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEGACYSTRUCTURESETTINGS public: class LegacyStructureSettings& operator=(class LegacyStructureSettings const &) = delete; - LegacyStructureSettings(class LegacyStructureSettings const &) = delete; #endif public: @@ -32,6 +31,10 @@ class LegacyStructureSettings { * @symbol ??0LegacyStructureSettings\@\@QEAA\@XZ */ MCAPI LegacyStructureSettings(); + /** + * @symbol ??0LegacyStructureSettings\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI LegacyStructureSettings(class LegacyStructureSettings const &); /** * @symbol ??0LegacyStructureSettings\@\@QEAA\@W4Mirror\@\@W4Rotation\@\@PEBVBlock\@\@AEBVBoundingBox\@\@\@Z */ @@ -44,10 +47,6 @@ class LegacyStructureSettings { * @symbol ?getBoundingBox\@LegacyStructureSettings\@\@QEAAAEBVBoundingBox\@\@XZ */ MCAPI class BoundingBox const & getBoundingBox(); - /** - * @symbol ?getIgnoreBlock\@LegacyStructureSettings\@\@QEBAPEBVBlock\@\@XZ - */ - MCAPI class Block const * getIgnoreBlock() const; /** * @symbol ?getMirror\@LegacyStructureSettings\@\@QEBAAEBW4Mirror\@\@XZ */ @@ -64,18 +63,6 @@ class LegacyStructureSettings { * @symbol ?getSwappedBlock\@LegacyStructureSettings\@\@QEBAAEBVBlock\@\@AEBVBlockPalette\@\@AEBV2\@\@Z */ MCAPI class Block const & getSwappedBlock(class BlockPalette const &, class Block const &) const; - /** - * @symbol ?isIgnoreJigsawBlocks\@LegacyStructureSettings\@\@QEBA_NXZ - */ - MCAPI bool isIgnoreJigsawBlocks() const; - /** - * @symbol ?isIgnoreStructureBlocks\@LegacyStructureSettings\@\@QEBA_NXZ - */ - MCAPI bool isIgnoreStructureBlocks() const; - /** - * @symbol ?isPlacingWaterBelowSeaLevel\@LegacyStructureSettings\@\@QEBA_NXZ - */ - MCAPI bool isPlacingWaterBelowSeaLevel() const; /** * @symbol ?placeWaterBelowSeaLevel\@LegacyStructureSettings\@\@QEAAX_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/LegacyStructureTemplate.hpp b/LiteLoader/include/llapi/mc/LegacyStructureTemplate.hpp index e81069ef2d..da7ec94832 100644 --- a/LiteLoader/include/llapi/mc/LegacyStructureTemplate.hpp +++ b/LiteLoader/include/llapi/mc/LegacyStructureTemplate.hpp @@ -46,6 +46,10 @@ class LegacyStructureTemplate { * @symbol ?calculateConnectedPosition\@LegacyStructureTemplate\@\@QEBA?AVBlockPos\@\@AEBVLegacyStructureSettings\@\@AEBV2\@01\@Z */ MCAPI class BlockPos calculateConnectedPosition(class LegacyStructureSettings const &, class BlockPos const &, class LegacyStructureSettings const &, class BlockPos const &) const; + /** + * @symbol ?finalizeBlockRules\@LegacyStructureTemplate\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVLegacyStructureSettings\@\@AEAVRandom\@\@\@Z + */ + MCAPI void finalizeBlockRules(class BlockSource &, class BlockPos const &, class LegacyStructureSettings &, class Random &) const; /** * @symbol ?getJigsawMarkers\@LegacyStructureTemplate\@\@QEBA?AV?$vector\@VJigsawStructureBlockInfo\@\@V?$allocator\@VJigsawStructureBlockInfo\@\@\@std\@\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LessonCommand.hpp b/LiteLoader/include/llapi/mc/LessonCommand.hpp index e2d3e1cfd5..920e487ee0 100644 --- a/LiteLoader/include/llapi/mc/LessonCommand.hpp +++ b/LiteLoader/include/llapi/mc/LessonCommand.hpp @@ -34,7 +34,7 @@ class LessonCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@LessonCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/Level.hpp b/LiteLoader/include/llapi/mc/Level.hpp index 0c7691e521..392487b3e0 100644 --- a/LiteLoader/include/llapi/mc/Level.hpp +++ b/LiteLoader/include/llapi/mc/Level.hpp @@ -6,7 +6,6 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Bedrock.hpp" -#include "PlayerCapabilities.hpp" #define BEFORE_EXTRA // Add include headers & pre-declares @@ -16,6 +15,7 @@ #include "ILevel.hpp" #include "DimensionDefinitionGroup.hpp" #include "Social.hpp" +#include "PlayerCapabilities.hpp" class Actor; class ActorDamageSource; class ItemStack; @@ -29,6 +29,8 @@ class Container; class Dimension; struct ActorUniqueID; class Packet; + + #undef BEFORE_EXTRA /** @@ -312,10 +314,6 @@ class Level { * @symbol ?addBlockSourceForValidityTracking\@Level\@\@UEAAXPEAVBlockSource\@\@\@Z */ MCVAPI void addBlockSourceForValidityTracking(class BlockSource *); - /** - * @symbol ?addBossEventListener\@Level\@\@UEAAXPEAVBossEventListener\@\@\@Z - */ - MCVAPI void addBossEventListener(class BossEventListener *); /** * @symbol ?addBreakingItemParticleEffect\@Level\@\@UEAAXAEBVVec3\@\@W4ParticleType\@\@AEBUResolvedItemIconInfo\@\@\@Z */ @@ -372,42 +370,34 @@ class Level { * @symbol ?applyLiquidPhysicsToActor\@Level\@\@UEAA_NPEAVActor\@\@W4MaterialType\@\@\@Z */ MCVAPI bool applyLiquidPhysicsToActor(class Actor *, enum class MaterialType); - /** - * @symbol ?areBossEventListenersReady\@Level\@\@UEAA_NXZ - */ - MCVAPI bool areBossEventListenersReady(); /** * @symbol ?asLevel\@Level\@\@UEAAPEAV1\@XZ */ MCVAPI class Level * asLevel(); /** - * @symbol ?broadcastActorEvent\@Level\@\@UEAAXAEAVActor\@\@W4ActorEvent\@\@H\@Z + * @symbol ?blockNetworkIdsAreHashes\@Level\@\@UEAA_NXZ */ - MCVAPI void broadcastActorEvent(class Actor &, enum class ActorEvent, int); + MCVAPI bool blockNetworkIdsAreHashes(); /** - * @symbol ?broadcastBossEvent\@Level\@\@UEAAXW4BossEventUpdateType\@\@AEBUActorUniqueID\@\@AEBVBossEventPacket\@\@\@Z + * @symbol ?broadcastActorEvent\@Level\@\@UEAAXAEAVActor\@\@W4ActorEvent\@\@H\@Z */ - MCVAPI void broadcastBossEvent(enum class BossEventUpdateType, struct ActorUniqueID const &, class BossEventPacket const &); + MCVAPI void broadcastActorEvent(class Actor &, enum class ActorEvent, int); /** - * @symbol ?broadcastBossEvent\@Level\@\@UEAAXW4BossEventUpdateType\@\@\@Z + * @symbol ?broadcastLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVVec3\@\@HPEBVUserEntityIdentifierComponent\@\@\@Z */ - MCVAPI void broadcastBossEvent(enum class BossEventUpdateType); + MCVAPI void broadcastLevelEvent(enum class LevelEvent, class Vec3 const &, int, class UserEntityIdentifierComponent const *); /** * @symbol ?broadcastLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVCompoundTag\@\@PEBVUserEntityIdentifierComponent\@\@\@Z */ MCVAPI void broadcastLevelEvent(enum class LevelEvent, class CompoundTag const &, class UserEntityIdentifierComponent const *); /** - * @symbol ?broadcastLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVVec3\@\@HPEBVUserEntityIdentifierComponent\@\@\@Z + * @symbol ?broadcastLocalEvent\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelEvent\@\@AEBVVec3\@\@H\@Z */ - MCVAPI void broadcastLevelEvent(enum class LevelEvent, class Vec3 const &, int, class UserEntityIdentifierComponent const *); + MCVAPI void broadcastLocalEvent(class BlockSource &, enum class LevelEvent, class Vec3 const &, int); /** * @symbol ?broadcastLocalEvent\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelEvent\@\@AEBVVec3\@\@AEBVBlock\@\@\@Z */ MCVAPI void broadcastLocalEvent(class BlockSource &, enum class LevelEvent, class Vec3 const &, class Block const &); - /** - * @symbol ?broadcastLocalEvent\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelEvent\@\@AEBVVec3\@\@H\@Z - */ - MCVAPI void broadcastLocalEvent(class BlockSource &, enum class LevelEvent, class Vec3 const &, int); /** * @symbol ?broadcastSoundEvent\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z */ @@ -436,14 +426,14 @@ class Level { * @symbol ?countUsersWithMatchingNetworkId\@Level\@\@UEBAHAEBVNetworkIdentifier\@\@\@Z */ MCVAPI int countUsersWithMatchingNetworkId(class NetworkIdentifier const &) const; - /** - * @symbol ?createMapSavedData\@Level\@\@UEAAAEAVMapItemSavedData\@\@AEBUActorUniqueID\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@H\@Z - */ - MCVAPI class MapItemSavedData & createMapSavedData(struct ActorUniqueID const &, class BlockPos const &, class AutomaticID, int); /** * @symbol ?createMapSavedData\@Level\@\@UEAAAEAVMapItemSavedData\@\@AEBV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@H\@Z */ MCVAPI class MapItemSavedData & createMapSavedData(std::vector const &, class BlockPos const &, class AutomaticID, int); + /** + * @symbol ?createMapSavedData\@Level\@\@UEAAAEAVMapItemSavedData\@\@AEBUActorUniqueID\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@H\@Z + */ + MCVAPI class MapItemSavedData & createMapSavedData(struct ActorUniqueID const &, class BlockPos const &, class AutomaticID, int); /** * @symbol ?createPhotoStorage\@Level\@\@UEAAXXZ */ @@ -480,14 +470,14 @@ class Level { * @symbol ?expandMapByID\@Level\@\@UEAA?AUActorUniqueID\@\@U2\@_N\@Z */ MCVAPI struct ActorUniqueID expandMapByID(struct ActorUniqueID, bool); - /** - * @symbol ?explode\@Level\@\@UEAAXAEAVExplosion\@\@\@Z - */ - MCVAPI void explode(class Explosion &); /** * @symbol ?explode\@Level\@\@UEAAXAEAVBlockSource\@\@PEAVActor\@\@AEBVVec3\@\@M_N3M3\@Z */ MCVAPI void explode(class BlockSource &, class Actor *, class Vec3 const &, float, bool, bool, float, bool); + /** + * @symbol ?explode\@Level\@\@UEAAXAEAVExplosion\@\@\@Z + */ + MCVAPI void explode(class Explosion &); /** * @symbol ?extinguishFire\@Level\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ @@ -496,22 +486,22 @@ class Level { * @symbol ?fetchEntity\@Level\@\@UEBAPEAVActor\@\@UActorUniqueID\@\@_N\@Z */ MCVAPI class Actor * fetchEntity(struct ActorUniqueID, bool) const; - /** - * @symbol ?findPath\@Level\@\@UEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVActor\@\@HHHAEAVNavigationComponent\@\@\@Z - */ - MCVAPI std::unique_ptr findPath(class Actor &, int, int, int, class NavigationComponent &); /** * @symbol ?findPath\@Level\@\@UEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVActor\@\@0AEAVNavigationComponent\@\@\@Z */ MCVAPI std::unique_ptr findPath(class Actor &, class Actor &, class NavigationComponent &); /** - * @symbol ?findPlayer\@Level\@\@UEBAPEAVPlayer\@\@V?$function\@$$A6A_NAEBVWeakEntityRef\@\@\@Z\@std\@\@\@Z + * @symbol ?findPath\@Level\@\@UEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVActor\@\@HHHAEAVNavigationComponent\@\@\@Z */ - MCVAPI class Player * findPlayer(class std::function) const; + MCVAPI std::unique_ptr findPath(class Actor &, int, int, int, class NavigationComponent &); /** * @symbol ?findPlayer\@Level\@\@UEBAPEAVPlayer\@\@V?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z */ MCVAPI class Player * findPlayer(class std::function) const; + /** + * @symbol ?findPlayer\@Level\@\@UEBAPEAVPlayer\@\@V?$function\@$$A6A_NAEBVWeakEntityRef\@\@\@Z\@std\@\@\@Z + */ + MCVAPI class Player * findPlayer(class std::function) const; /** * @symbol ?flushRunTimeLighting\@Level\@\@UEAAXXZ */ @@ -524,14 +514,14 @@ class Level { * @symbol ?forEachDimension\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVDimension\@\@\@Z\@std\@\@\@Z */ MCVAPI void forEachDimension(class std::function) const; - /** - * @symbol ?forEachPlayer\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z - */ - MCVAPI void forEachPlayer(class std::function) const; /** * @symbol ?forEachPlayer\@Level\@\@UEAAXV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@std\@\@\@Z */ MCVAPI void forEachPlayer(class std::function); + /** + * @symbol ?forEachPlayer\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z + */ + MCVAPI void forEachPlayer(class std::function) const; /** * @symbol ?forEachUser\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVEntityContext\@\@\@Z\@std\@\@\@Z */ @@ -576,14 +566,14 @@ class Level { * @symbol ?getActorEventCoordinator\@Level\@\@UEAAAEAVActorEventCoordinator\@\@XZ */ MCVAPI class ActorEventCoordinator & getActorEventCoordinator(); - /** - * @symbol ?getActorFactory\@Level\@\@UEAAAEAVActorFactory\@\@XZ - */ - MCVAPI class ActorFactory & getActorFactory(); /** * @symbol ?getActorFactory\@Level\@\@UEBAAEBVActorFactory\@\@XZ */ MCVAPI class ActorFactory const & getActorFactory() const; + /** + * @symbol ?getActorFactory\@Level\@\@UEAAAEAVActorFactory\@\@XZ + */ + MCVAPI class ActorFactory & getActorFactory(); /** * @symbol ?getActorInfoRegistry\@Level\@\@UEAAPEAVActorInfoRegistry\@\@XZ */ @@ -596,6 +586,10 @@ class Level { * @symbol ?getAdventureSettings\@Level\@\@UEAAAEAUAdventureSettings\@\@XZ */ MCVAPI struct AdventureSettings & getAdventureSettings(); + /** + * @symbol ?getArmorTrimUnloader\@Level\@\@UEAAPEAVArmorTrimUnloader\@\@XZ + */ + MCVAPI class ArmorTrimUnloader * getArmorTrimUnloader(); /** * @symbol ?getBehaviorFactory\@Level\@\@UEBAAEAVBehaviorFactory\@\@XZ */ @@ -612,22 +606,22 @@ class Level { * @symbol ?getBiomeComponentFactory\@Level\@\@UEAAAEAVBiomeComponentFactory\@\@XZ */ MCVAPI class BiomeComponentFactory & getBiomeComponentFactory(); - /** - * @symbol ?getBiomeRegistry\@Level\@\@UEBAAEBVBiomeRegistry\@\@XZ - */ - MCVAPI class BiomeRegistry const & getBiomeRegistry() const; /** * @symbol ?getBiomeRegistry\@Level\@\@UEAAAEAVBiomeRegistry\@\@XZ */ MCVAPI class BiomeRegistry & getBiomeRegistry(); /** - * @symbol ?getBlockComponentFactory\@Level\@\@UEAAAEAVBlockComponentFactory\@\@XZ + * @symbol ?getBiomeRegistry\@Level\@\@UEBAAEBVBiomeRegistry\@\@XZ */ - MCVAPI class BlockComponentFactory & getBlockComponentFactory(); + MCVAPI class BiomeRegistry const & getBiomeRegistry() const; /** * @symbol ?getBlockComponentFactory\@Level\@\@UEBAAEBVBlockComponentFactory\@\@XZ */ MCVAPI class BlockComponentFactory const & getBlockComponentFactory() const; + /** + * @symbol ?getBlockComponentFactory\@Level\@\@UEAAAEAVBlockComponentFactory\@\@XZ + */ + MCVAPI class BlockComponentFactory & getBlockComponentFactory(); /** * @symbol ?getBlockDefinitions\@Level\@\@UEBAPEAVBlockDefinitionGroup\@\@XZ */ @@ -636,14 +630,14 @@ class Level { * @symbol ?getBlockEventCoordinator\@Level\@\@UEAAAEAVBlockEventCoordinator\@\@XZ */ MCVAPI class BlockEventCoordinator & getBlockEventCoordinator(); - /** - * @symbol ?getBlockPalette\@Level\@\@UEBAAEBVBlockPalette\@\@XZ - */ - MCVAPI class BlockPalette const & getBlockPalette() const; /** * @symbol ?getBlockPalette\@Level\@\@UEAAAEAVBlockPalette\@\@XZ */ MCVAPI class BlockPalette & getBlockPalette(); + /** + * @symbol ?getBlockPalette\@Level\@\@UEBAAEBVBlockPalette\@\@XZ + */ + MCVAPI class BlockPalette const & getBlockPalette() const; /** * @symbol ?getBlockReducer\@Level\@\@UEBAPEAVBlockReducer\@\@XZ */ @@ -652,6 +646,10 @@ class Level { * @symbol ?getBlockRegistry\@Level\@\@UEBA?AV?$weak_ptr\@VBlockTypeRegistry\@\@\@std\@\@XZ */ MCVAPI class std::weak_ptr getBlockRegistry() const; + /** + * @symbol ?getBossEventSubscriptionManager\@Level\@\@UEAA?AV?$not_null\@V?$NonOwnerPointer\@VBossEventSubscriptionManager\@\@\@Bedrock\@\@\@gsl\@\@XZ + */ + MCVAPI class gsl::not_null> getBossEventSubscriptionManager(); /** * @symbol ?getCameraPresets\@Level\@\@UEAAAEAVCameraPresets\@\@XZ */ @@ -660,10 +658,18 @@ class Level { * @symbol ?getCameraPresets\@Level\@\@UEBAAEBVCameraPresets\@\@XZ */ MCVAPI class CameraPresets const & getCameraPresets() const; + /** + * @symbol ?getCapabilities\@Level\@\@UEBAAEBUISharedController\@PlayerCapabilities\@\@XZ + */ + MCVAPI struct PlayerCapabilities::ISharedController const & getCapabilities() const; /** * @symbol ?getChunkTickRange\@Level\@\@UEBAIXZ */ MCVAPI unsigned int getChunkTickRange() const; + /** + * @symbol ?getChunkTickRangeManager\@Level\@\@UEBAAEBVChunkTickRangeManager\@\@XZ + */ + MCVAPI class ChunkTickRangeManager const & getChunkTickRangeManager() const; /** * @symbol ?getClientPlayerEventCoordinator\@Level\@\@UEAAAEAVClientPlayerEventCoordinator\@\@XZ */ @@ -692,14 +698,14 @@ class Level { * @symbol ?getDefaultGameType\@Level\@\@UEBA?AW4GameType\@\@XZ */ MCVAPI enum class GameType getDefaultGameType() const; - /** - * @symbol ?getDefaultPermissions\@Level\@\@UEBAAEBVPermissionsHandler\@\@XZ - */ - MCVAPI class PermissionsHandler const & getDefaultPermissions() const; /** * @symbol ?getDefaultPermissions\@Level\@\@UEAAAEAVPermissionsHandler\@\@XZ */ MCVAPI class PermissionsHandler & getDefaultPermissions(); + /** + * @symbol ?getDefaultPermissions\@Level\@\@UEBAAEBVPermissionsHandler\@\@XZ + */ + MCVAPI class PermissionsHandler const & getDefaultPermissions() const; /** * @symbol ?getDefaultSpawn\@Level\@\@UEBAAEBVBlockPos\@\@XZ */ @@ -716,14 +722,6 @@ class Level { * @symbol ?getDimensionConversionData\@Level\@\@UEBA?AVDimensionConversionData\@\@XZ */ MCVAPI class DimensionConversionData getDimensionConversionData() const; - /** - * @symbol ?getDimensionDefinition\@Level\@\@UEBA?AV?$optional\@UDimensionDefinition\@DimensionDefinitionGroup\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z - */ - MCVAPI class std::optional getDimensionDefinition(std::string const &) const; - /** - * @symbol ?getDimensionDefinitionGroup\@Level\@\@UEBA?BV?$optional\@VDimensionDefinitionGroup\@\@\@std\@\@XZ - */ - MCVAPI class std::optional const getDimensionDefinitionGroup() const; /** * @symbol ?getDimensionFactory\@Level\@\@UEAAAEAV?$OwnerPtrFactory\@VDimension\@\@AEAVILevel\@\@AEAVScheduler\@\@\@\@XZ */ @@ -732,6 +730,14 @@ class Level { * @symbol ?getDimensionFactory\@Level\@\@UEBAAEBV?$OwnerPtrFactory\@VDimension\@\@AEAVILevel\@\@AEAVScheduler\@\@\@\@XZ */ MCVAPI class OwnerPtrFactory const & getDimensionFactory() const; + /** + * @symbol ?getDimensionManager\@Level\@\@UEBAAEBVDimensionManager\@\@XZ + */ + MCVAPI class DimensionManager const & getDimensionManager() const; + /** + * @symbol ?getDimensionManager\@Level\@\@UEAAAEAVDimensionManager\@\@XZ + */ + MCVAPI class DimensionManager & getDimensionManager(); /** * @symbol ?getDisablePlayerInteractions\@Level\@\@UEBA_NXZ */ @@ -764,22 +770,22 @@ class Level { * @symbol ?getEventing\@Level\@\@UEAAAEAVIMinecraftEventing\@\@XZ */ MCVAPI class IMinecraftEventing & getEventing(); - /** - * @symbol ?getFeatureRegistry\@Level\@\@UEAAAEAVFeatureRegistry\@\@XZ - */ - MCVAPI class FeatureRegistry & getFeatureRegistry(); /** * @symbol ?getFeatureRegistry\@Level\@\@UEBAAEBVFeatureRegistry\@\@XZ */ MCVAPI class FeatureRegistry const & getFeatureRegistry() const; /** - * @symbol ?getFeatureTypeFactory\@Level\@\@UEAAAEAVFeatureTypeFactory\@\@XZ + * @symbol ?getFeatureRegistry\@Level\@\@UEAAAEAVFeatureRegistry\@\@XZ */ - MCVAPI class FeatureTypeFactory & getFeatureTypeFactory(); + MCVAPI class FeatureRegistry & getFeatureRegistry(); /** * @symbol ?getFeatureTypeFactory\@Level\@\@UEBAAEBVFeatureTypeFactory\@\@XZ */ MCVAPI class FeatureTypeFactory const & getFeatureTypeFactory() const; + /** + * @symbol ?getFeatureTypeFactory\@Level\@\@UEAAAEAVFeatureTypeFactory\@\@XZ + */ + MCVAPI class FeatureTypeFactory & getFeatureTypeFactory(); /** * @symbol ?getGameRules\@Level\@\@UEBAAEBVGameRules\@\@XZ */ @@ -812,14 +818,14 @@ class Level { * @symbol ?getItemRegistry\@Level\@\@UEBA?AVItemRegistryRef\@\@XZ */ MCVAPI class ItemRegistryRef getItemRegistry() const; - /** - * @symbol ?getJigsawStructureRegistry\@Level\@\@UEBAAEBVJigsawStructureRegistry\@\@XZ - */ - MCVAPI class JigsawStructureRegistry const & getJigsawStructureRegistry() const; /** * @symbol ?getJigsawStructureRegistry\@Level\@\@UEAAAEAVJigsawStructureRegistry\@\@XZ */ MCVAPI class JigsawStructureRegistry & getJigsawStructureRegistry(); + /** + * @symbol ?getJigsawStructureRegistry\@Level\@\@UEBAAEBVJigsawStructureRegistry\@\@XZ + */ + MCVAPI class JigsawStructureRegistry const & getJigsawStructureRegistry() const; /** * @symbol ?getLANBroadcast\@Level\@\@UEBA_NXZ */ @@ -836,14 +842,14 @@ class Level { * @symbol ?getLevelChunkMetaDataDictionary\@Level\@\@UEBA?AV?$shared_ptr\@VLevelChunkMetaDataDictionary\@\@\@std\@\@XZ */ MCVAPI class std::shared_ptr getLevelChunkMetaDataDictionary() const; - /** - * @symbol ?getLevelData\@Level\@\@UEBAAEBVLevelData\@\@XZ - */ - MCVAPI class LevelData const & getLevelData() const; /** * @symbol ?getLevelData\@Level\@\@UEAAAEAVLevelData\@\@XZ */ MCVAPI class LevelData & getLevelData(); + /** + * @symbol ?getLevelData\@Level\@\@UEBAAEBVLevelData\@\@XZ + */ + MCVAPI class LevelData const & getLevelData() const; /** * @symbol ?getLevelEntity\@Level\@\@UEAA?AV?$WeakRefT\@UEntityRefTraits\@\@\@\@XZ */ @@ -856,14 +862,14 @@ class Level { * @symbol ?getLevelId\@Level\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getLevelId() const; - /** - * @symbol ?getLevelStorage\@Level\@\@UEAAAEAVLevelStorage\@\@XZ - */ - MCVAPI class LevelStorage & getLevelStorage(); /** * @symbol ?getLevelStorage\@Level\@\@UEBAAEBVLevelStorage\@\@XZ */ MCVAPI class LevelStorage const & getLevelStorage() const; + /** + * @symbol ?getLevelStorage\@Level\@\@UEAAAEAVLevelStorage\@\@XZ + */ + MCVAPI class LevelStorage & getLevelStorage(); /** * @symbol ?getLightTextureImageBuilderFactory\@Level\@\@UEAAAEAV?$Factory\@VBaseLightTextureImageBuilder\@\@AEAVLevel\@\@AEAVScheduler\@\@\@\@XZ */ @@ -984,10 +990,6 @@ class Level { * @symbol ?getPlayerFromServerId\@Level\@\@UEBAPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI class Player * getPlayerFromServerId(std::string const &) const; - /** - * @symbol ?getPlayerFromUnknownIdentifier\@Level\@\@UEBAPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCVAPI class Player * getPlayerFromUnknownIdentifier(std::string const &) const; /** * @symbol ?getPlayerList\@Level\@\@UEAAAEAV?$unordered_map\@VUUID\@mce\@\@VPlayerListEntry\@\@U?$hash\@VUUID\@mce\@\@\@std\@\@U?$equal_to\@VUUID\@mce\@\@\@5\@V?$allocator\@U?$pair\@$$CBVUUID\@mce\@\@VPlayerListEntry\@\@\@std\@\@\@5\@\@std\@\@XZ */ @@ -1076,6 +1078,10 @@ class Level { * @symbol ?getScreenshotsFolder\@Level\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getScreenshotsFolder() const; + /** + * @symbol ?getScriptDeferredEventCoordinator\@Level\@\@UEAAAEAVScriptDeferredEventCoordinator\@\@XZ + */ + MCVAPI class ScriptDeferredEventCoordinator & getScriptDeferredEventCoordinator(); /** * @symbol ?getScriptingEventCoordinator\@Level\@\@UEAAAEAVScriptingEventCoordinator\@\@XZ */ @@ -1105,9 +1111,9 @@ class Level { */ MCVAPI bool getSimPaused(); /** - * @symbol ?getSleepStatus\@Level\@\@UEBA?AUSleepStatus\@ILevel\@\@XZ + * @symbol ?getSleepStatus\@Level\@\@UEBA?AUPlayerSleepStatus\@\@XZ */ - MCVAPI struct ILevel::SleepStatus getSleepStatus() const; + MCVAPI struct PlayerSleepStatus getSleepStatus() const; /** * @symbol ?getSoundPlayer\@Level\@\@UEBA?AV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@XZ */ @@ -1124,14 +1130,14 @@ class Level { * @symbol ?getSpecialMultiplier\@Level\@\@UEBAMV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCVAPI float getSpecialMultiplier(class AutomaticID) const; - /** - * @symbol ?getStructureManager\@Level\@\@UEBA?BV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@XZ - */ - MCVAPI class gsl::not_null> const getStructureManager() const; /** * @symbol ?getStructureManager\@Level\@\@UEAA?AV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@XZ */ MCVAPI class gsl::not_null> getStructureManager(); + /** + * @symbol ?getStructureManager\@Level\@\@UEBA?BV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@XZ + */ + MCVAPI class gsl::not_null> const getStructureManager() const; /** * @symbol ?getSubChunkRequestManager\@Level\@\@UEAAPEAVSubChunkRequestManager\@\@XZ */ @@ -1180,6 +1186,22 @@ class Level { * @symbol ?getTradeTables\@Level\@\@UEAAPEAVTradeTables\@\@XZ */ MCVAPI class TradeTables * getTradeTables(); + /** + * @symbol ?getTrimMaterialRegistry\@Level\@\@UEBA?AV?$weak_ptr\@$$CBVTrimMaterialRegistry\@\@\@std\@\@XZ + */ + MCVAPI class std::weak_ptr getTrimMaterialRegistry() const; + /** + * @symbol ?getTrimMaterialRegistry\@Level\@\@UEAA?AV?$weak_ptr\@VTrimMaterialRegistry\@\@\@std\@\@XZ + */ + MCVAPI class std::weak_ptr getTrimMaterialRegistry(); + /** + * @symbol ?getTrimPatternRegistry\@Level\@\@UEAA?AV?$weak_ptr\@VTrimPatternRegistry\@\@\@std\@\@XZ + */ + MCVAPI class std::weak_ptr getTrimPatternRegistry(); + /** + * @symbol ?getTrimPatternRegistry\@Level\@\@UEBA?AV?$weak_ptr\@$$CBVTrimPatternRegistry\@\@\@std\@\@XZ + */ + MCVAPI class std::weak_ptr getTrimPatternRegistry() const; /** * @symbol ?getUnknownBlockTypeRegistry\@Level\@\@UEAA?AV?$NonOwnerPointer\@VIUnknownBlockTypeRegistry\@\@\@Bedrock\@\@XZ */ @@ -1368,14 +1390,6 @@ class Level { * @symbol ?pauseAndFlushTaskGroups\@Level\@\@UEAAXXZ */ MCVAPI void pauseAndFlushTaskGroups(); - /** - * @symbol ?playSound\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z - */ - MCVAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, float, float); - /** - * @symbol ?playSound\@Level\@\@UEAAXAEBVIConstBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z - */ - MCVAPI void playSound(class IConstBlockSource const &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** * @symbol ?playSound\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z */ @@ -1385,17 +1399,25 @@ class Level { */ MCVAPI void playSound(class AutomaticID, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z + * @symbol ?playSound\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z */ - MCVAPI void playSynchronizedSound(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + MCVAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, float, float); /** - * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@AEBUActorDefinitionIdentifier\@\@_N5\@Z + * @symbol ?playSound\@Level\@\@UEAAXAEBVIConstBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z */ - MCVAPI void playSynchronizedSound(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, class Block const &, struct ActorDefinitionIdentifier const &, bool, bool); + MCVAPI void playSound(class IConstBlockSource const &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + /** + * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z + */ + MCVAPI void playSynchronizedSound(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVIDimension\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z */ MCVAPI void playSynchronizedSound(class IDimension &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + /** + * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@AEBUActorDefinitionIdentifier\@\@_N5\@Z + */ + MCVAPI void playSynchronizedSound(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, class Block const &, struct ActorDefinitionIdentifier const &, bool, bool); /** * @symbol ?potionSplash\@Level\@\@UEAAXAEBVVec3\@\@AEBVColor\@mce\@\@_N\@Z */ @@ -1428,10 +1450,6 @@ class Level { * @symbol ?removeBlockSourceFromValidityTracking\@Level\@\@UEAAXPEAVBlockSource\@\@\@Z */ MCVAPI void removeBlockSourceFromValidityTracking(class BlockSource *); - /** - * @symbol ?removeBossEventListener\@Level\@\@UEAAXPEAVBossEventListener\@\@\@Z - */ - MCVAPI void removeBossEventListener(class BossEventListener *); /** * @symbol ?removeDisplayEntity\@Level\@\@UEAAXVWeakEntityRef\@\@\@Z */ @@ -1636,6 +1654,10 @@ class Level { * @symbol ?setRemotePlayerEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VPlayerEventCoordinator\@\@U?$default_delete\@VPlayerEventCoordinator\@\@\@std\@\@\@std\@\@\@Z */ MCVAPI void setRemotePlayerEventCoordinator(std::unique_ptr &&); + /** + * @symbol ?setScriptDeferredEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VScriptDeferredEventCoordinator\@\@U?$default_delete\@VScriptDeferredEventCoordinator\@\@\@std\@\@\@std\@\@\@Z + */ + MCVAPI void setScriptDeferredEventCoordinator(std::unique_ptr &&); /** * @symbol ?setScriptingEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VScriptingEventCoordinator\@\@U?$default_delete\@VScriptingEventCoordinator\@\@\@std\@\@\@std\@\@\@Z */ @@ -1653,9 +1675,9 @@ class Level { */ MCVAPI void setSimPaused(bool); /** - * @symbol ?setSleepStatus\@Level\@\@UEAAXAEBUSleepStatus\@ILevel\@\@\@Z + * @symbol ?setSleepStatus\@Level\@\@UEAAXAEBUPlayerSleepStatus\@\@\@Z */ - MCVAPI void setSleepStatus(struct ILevel::SleepStatus const &); + MCVAPI void setSleepStatus(struct PlayerSleepStatus const &); /** * @symbol ?setTime\@Level\@\@UEAAXH\@Z */ @@ -1742,9 +1764,9 @@ class Level { MCVAPI ~Level(); #endif /** - * @symbol ??0Level\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@V?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VLevelLooseFileStorage\@\@U?$default_delete\@VLevelLooseFileStorage\@\@\@std\@\@\@4\@AEAVIMinecraftEventing\@\@_NW4SubClientId\@\@AEAVScheduler\@\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@2\@AEAVResourcePackManager\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VIEntityRegistryOwner\@\@\@Bedrock\@\@\@2\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@V?$unique_ptr\@VBlockComponentFactory\@\@U?$default_delete\@VBlockComponentFactory\@\@\@std\@\@\@4\@V?$unique_ptr\@VBlockDefinitionGroup\@\@U?$default_delete\@VBlockDefinitionGroup\@\@\@std\@\@\@4\@VItemRegistryRef\@\@V?$weak_ptr\@VBlockTypeRegistry\@\@\@4\@4V?$optional\@VDimensionDefinitionGroup\@\@\@4\@\@Z + * @symbol ??0Level\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@V?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VLevelLooseFileStorage\@\@U?$default_delete\@VLevelLooseFileStorage\@\@\@std\@\@\@4\@AEAVIMinecraftEventing\@\@_NW4SubClientId\@\@AEAVScheduler\@\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@2\@AEAVResourcePackManager\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VIEntityRegistryOwner\@\@\@Bedrock\@\@\@2\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@V?$unique_ptr\@VBlockComponentFactory\@\@U?$default_delete\@VBlockComponentFactory\@\@\@std\@\@\@4\@V?$unique_ptr\@VBlockDefinitionGroup\@\@U?$default_delete\@VBlockDefinitionGroup\@\@\@std\@\@\@4\@VItemRegistryRef\@\@V?$weak_ptr\@VBlockTypeRegistry\@\@\@4\@44V?$optional\@VDimensionDefinitionGroup\@\@\@4\@\@Z */ - MCAPI Level(class gsl::not_null> const &, std::unique_ptr, std::unique_ptr, class IMinecraftEventing &, bool, enum class SubClientId, class Scheduler &, class gsl::not_null>, class ResourcePackManager &, class gsl::not_null> const &, class WeakRefT, std::unique_ptr, std::unique_ptr, class ItemRegistryRef, class std::weak_ptr, bool, class std::optional); + MCAPI Level(class gsl::not_null> const &, std::unique_ptr, std::unique_ptr, class IMinecraftEventing &, bool, enum class SubClientId, class Scheduler &, class gsl::not_null>, class ResourcePackManager &, class gsl::not_null> const &, class WeakRefT, std::unique_ptr, std::unique_ptr, class ItemRegistryRef, class std::weak_ptr, bool, bool, class std::optional); /** * @symbol ?canChangeDimension\@Level\@\@QEAA_NAEAVActor\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ @@ -1761,18 +1783,14 @@ class Level { * @symbol ?getAutonomousActorManager\@Level\@\@QEBAAEBVAutonomousActorManager\@\@XZ */ MCAPI class AutonomousActorManager const & getAutonomousActorManager() const; - /** - * @symbol ?getCapabilities\@Level\@\@QEBAAEBUISharedController\@PlayerCapabilities\@\@XZ - */ - MCAPI struct PlayerCapabilities::ISharedController const & getCapabilities() const; - /** - * @symbol ?getDimensionManager\@Level\@\@QEAAAEAVDimensionManager\@\@XZ - */ - MCAPI class DimensionManager & getDimensionManager(); /** * @symbol ?getLevelSeed64\@Level\@\@QEBA?AVLevelSeed64\@\@XZ */ MCAPI class LevelSeed64 getLevelSeed64() const; + /** + * @symbol ?getLevelSoundManager\@Level\@\@QEAA?AV?$not_null\@V?$NonOwnerPointer\@VLevelSoundManager\@\@\@Bedrock\@\@\@gsl\@\@XZ + */ + MCAPI class gsl::not_null> getLevelSoundManager(); /** * @symbol ?getNpcDialogueStorage\@Level\@\@QEAAPEAVNpcDialogueStorage\@\@XZ */ @@ -1793,14 +1811,6 @@ class Level { * @symbol ?getTickDeltaTime\@Level\@\@QEBANXZ */ MCAPI double getTickDeltaTime() const; - /** - * @symbol ?isChunkInTickRange\@Level\@\@QEBA_NAEBVLevelChunk\@\@V?$optional\@H\@std\@\@\@Z - */ - MCAPI bool isChunkInTickRange(class LevelChunk const &, class std::optional) const; - /** - * @symbol ?isChunkInTickRange\@Level\@\@QEAAXAEBVChunkPos\@\@AEBVDimension\@\@AEA_N\@Z - */ - MCAPI void isChunkInTickRange(class ChunkPos const &, class Dimension const &, bool &); /** * @symbol ?isFree\@Level\@\@QEAA?AW4NodeType\@\@AEAVNavigationComponent\@\@AEAVActor\@\@AEBVBlockPos\@\@22W4CanJumpIntoNode\@\@\@Z */ @@ -1854,6 +1864,12 @@ class Level { */ MCAPI static class LevelSeed64 parseLevelSeed64(std::string const &); +//protected: + /** + * @symbol ?_getGameplayUserManager\@Level\@\@IEAAAEAVGameplayUserManager\@\@XZ + */ + MCAPI class GameplayUserManager & _getGameplayUserManager(); + //private: /** * @symbol ?_checkBlockSourceValidity\@Level\@\@AEAAXXZ @@ -1875,10 +1891,6 @@ class Level { * @symbol ?_getCrashDumpLogCategory\@Level\@\@AEAA?AW4CrashDumpLogStringID\@\@XZ */ MCAPI enum class CrashDumpLogStringID _getCrashDumpLogCategory(); - /** - * @symbol ?_getValidatedPlayerName\@Level\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z - */ - MCAPI std::string _getValidatedPlayerName(std::string const &); /** * @symbol ?_handleChangeDimensionRequests\@Level\@\@AEAAXXZ */ @@ -1887,10 +1899,6 @@ class Level { * @symbol ?_initializeActorManager\@Level\@\@AEAAXXZ */ MCAPI void _initializeActorManager(); - /** - * @symbol ?_initializeLevelSoundManager\@Level\@\@AEAAXXZ - */ - MCAPI void _initializeLevelSoundManager(); /** * @symbol ?_loadAutonomousEntities\@Level\@\@AEAAXXZ */ @@ -1908,29 +1916,9 @@ class Level { */ MCAPI void _loadOwnedEntityLimbo(); /** - * @symbol ?_onHandleLevelSoundEvent\@Level\@\@AEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z - */ - MCAPI void _onHandleLevelSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); - /** - * @symbol ?_onHandleLevelSoundEventWithVolumeAndPitch\@Level\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z - */ - MCAPI void _onHandleLevelSoundEventWithVolumeAndPitch(std::string const &, class Vec3 const &, float, float); - /** - * @symbol ?_onHandleStopAllLevelSoundsEvent\@Level\@\@AEAAXXZ - */ - MCAPI void _onHandleStopAllLevelSoundsEvent(); - /** - * @symbol ?_onHandleStopLevelSoundEvent\@Level\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI void _onHandleStopLevelSoundEvent(std::string const &); - /** - * @symbol ?_onLevelSoundEvent\@Level\@\@AEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z - */ - MCAPI void _onLevelSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); - /** - * @symbol ?_onLevelSoundEventWithVolumeAndPitch\@Level\@\@AEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z + * @symbol ?_onGameplayUserAdded\@Level\@\@AEAAXAEAVEntityContext\@\@\@Z */ - MCAPI void _onLevelSoundEventWithVolumeAndPitch(enum class LevelSoundEvent, class Vec3 const &, float, float); + MCAPI void _onGameplayUserAdded(class EntityContext &); /** * @symbol ?_onRemoveActorEntityReferences\@Level\@\@AEAAXAEAVActor\@\@\@Z */ @@ -1955,14 +1943,6 @@ class Level { * @symbol ?_processPlayerNetworking\@Level\@\@AEAAXXZ */ MCAPI void _processPlayerNetworking(); - /** - * @symbol ?_removePlayerFromPlayerList\@Level\@\@AEAA?AVUUID\@mce\@\@QEBVPlayer\@\@\@Z - */ - MCAPI class mce::UUID _removePlayerFromPlayerList(class Player const *const); - /** - * @symbol ?_resumePlayer\@Level\@\@AEAAXAEBVUUID\@mce\@\@\@Z - */ - MCAPI void _resumePlayer(class mce::UUID const &); /** * @symbol ?_saveAutonomousEntities\@Level\@\@AEAAXXZ */ @@ -1975,10 +1955,6 @@ class Level { * @symbol ?_saveSomeChunks\@Level\@\@AEAAXXZ */ MCAPI void _saveSomeChunks(); - /** - * @symbol ?_suspendPlayer\@Level\@\@AEAAXAEBVUUID\@mce\@\@\@Z - */ - MCAPI void _suspendPlayer(class mce::UUID const &); /** * @symbol ?_syncTime\@Level\@\@AEAAXH\@Z */ @@ -1988,6 +1964,8 @@ class Level { */ MCAPI void processOwnedEntityLimboForPlayer(class Player const &); +protected: + private: }; diff --git a/LiteLoader/include/llapi/mc/LevelChunk.hpp b/LiteLoader/include/llapi/mc/LevelChunk.hpp index 51479f5d5c..e3a1bf25db 100644 --- a/LiteLoader/include/llapi/mc/LevelChunk.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunk.hpp @@ -250,14 +250,14 @@ struct HardcodedSpawningArea { * @symbol ?getDimension\@LevelChunk\@\@QEBAAEAVDimension\@\@XZ */ MCAPI class Dimension & getDimension() const; - /** - * @symbol ?getEntities\@LevelChunk\@\@QEBAXV?$span\@V?$not_null\@PEBVActor\@\@\@gsl\@\@$0?0\@gsl\@\@AEBVAABB\@\@AEAV?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@_N\@Z - */ - MCAPI void getEntities(class gsl::span, -1>, class AABB const &, std::vector &, bool) const; /** * @symbol ?getEntities\@LevelChunk\@\@QEBAXW4ActorType\@\@AEBVAABB\@\@AEAV?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI void getEntities(enum class ActorType, class AABB const &, std::vector &, bool) const; + /** + * @symbol ?getEntities\@LevelChunk\@\@QEBAXV?$span\@V?$not_null\@PEBVActor\@\@\@gsl\@\@$0?0\@gsl\@\@AEBVAABB\@\@AEAV?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@_N\@Z + */ + MCAPI void getEntities(class gsl::span, -1>, class AABB const &, std::vector &, bool) const; /** * @symbol ?getEntity\@LevelChunk\@\@QEBAPEAVActor\@\@AEBUActorUniqueID\@\@\@Z */ @@ -350,14 +350,14 @@ struct HardcodedSpawningArea { * @symbol ?getPosition\@LevelChunk\@\@QEBAAEBVChunkPos\@\@XZ */ MCAPI class ChunkPos const & getPosition() const; - /** - * @symbol ?getPreWorldGenHeightmap\@LevelChunk\@\@QEBA?AVChunkLocalHeight\@\@AEBVChunkBlockPos\@\@\@Z - */ - MCAPI class ChunkLocalHeight getPreWorldGenHeightmap(class ChunkBlockPos const &) const; /** * @symbol ?getPreWorldGenHeightmap\@LevelChunk\@\@QEBA?AVHeightmapWrapper\@\@XZ */ MCAPI class HeightmapWrapper getPreWorldGenHeightmap() const; + /** + * @symbol ?getPreWorldGenHeightmap\@LevelChunk\@\@QEBA?AVChunkLocalHeight\@\@AEBVChunkBlockPos\@\@\@Z + */ + MCAPI class ChunkLocalHeight getPreWorldGenHeightmap(class ChunkBlockPos const &) const; /** * @symbol ?getPreservedBlockEntities\@LevelChunk\@\@QEBAAEBV?$vector\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@2\@\@std\@\@XZ */ @@ -378,14 +378,14 @@ struct HardcodedSpawningArea { * @symbol ?getState\@LevelChunk\@\@QEBAAEBU?$atomic\@W4ChunkState\@\@\@std\@\@XZ */ MCAPI struct std::atomic const & getState() const; - /** - * @symbol ?getSubChunk\@LevelChunk\@\@QEAAPEAUSubChunk\@\@F\@Z - */ - MCAPI struct SubChunk * getSubChunk(short); /** * @symbol ?getSubChunk\@LevelChunk\@\@QEBAPEBUSubChunk\@\@F\@Z */ MCAPI struct SubChunk const * getSubChunk(short) const; + /** + * @symbol ?getSubChunk\@LevelChunk\@\@QEAAPEAUSubChunk\@\@F\@Z + */ + MCAPI struct SubChunk * getSubChunk(short); /** * @symbol ?getSurfaceBiome\@LevelChunk\@\@QEBAAEBVBiome\@\@VChunkBlockPos\@\@\@Z */ @@ -426,6 +426,10 @@ struct HardcodedSpawningArea { * @symbol ?hasEntity\@LevelChunk\@\@QEAA_NVWeakEntityRef\@\@\@Z */ MCAPI bool hasEntity(class WeakEntityRef); + /** + * @symbol ?isAnyBlockEntityDirty\@LevelChunk\@\@QEAA_NXZ + */ + MCAPI bool isAnyBlockEntityDirty(); /** * @symbol ?isBlockInChunk\@LevelChunk\@\@QEBA_NAEBVBlockPos\@\@\@Z */ @@ -450,10 +454,6 @@ struct HardcodedSpawningArea { * @symbol ?isReadOnly\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool isReadOnly() const; - /** - * @symbol ?isServerGeneratedClientChunk\@LevelChunk\@\@QEBA_NXZ - */ - MCAPI bool isServerGeneratedClientChunk() const; /** * @symbol ?isSkyLit\@LevelChunk\@\@QEBA_NAEBVChunkBlockPos\@\@\@Z */ @@ -514,14 +514,6 @@ struct HardcodedSpawningArea { * @symbol ?populateHeightMapDataForSubChunkPacket\@LevelChunk\@\@QEBAXFAEAUSubChunkPacketData\@SubChunkPacket\@\@\@Z */ MCAPI void populateHeightMapDataForSubChunkPacket(short, struct SubChunkPacket::SubChunkPacketData &) const; - /** - * @symbol ?pruneBiomesAboveHeightmap\@LevelChunk\@\@QEAAXXZ - */ - MCAPI void pruneBiomesAboveHeightmap(); - /** - * @symbol ?recalculateSubchunkHashes\@LevelChunk\@\@QEAAX_N\@Z - */ - MCAPI void recalculateSubchunkHashes(bool); /** * @symbol ?recomputeHeightMap\@LevelChunk\@\@QEAAX_N\@Z */ @@ -654,10 +646,6 @@ struct HardcodedSpawningArea { * @symbol ?setHadSerializedEntities\@LevelChunk\@\@QEAAXXZ */ MCAPI void setHadSerializedEntities(); - /** - * @symbol ?setIsClientGeneratedChunk\@LevelChunk\@\@QEAAX_N\@Z - */ - MCAPI void setIsClientGeneratedChunk(bool); /** * @symbol ?setMetaData\@LevelChunk\@\@QEAAXV?$shared_ptr\@VLevelChunkMetaData\@\@\@std\@\@\@Z */ @@ -710,10 +698,6 @@ struct HardcodedSpawningArea { * @symbol ?toWorldPos\@LevelChunk\@\@QEBA?AVBlockPos\@\@AEBVChunkBlockPos\@\@\@Z */ MCAPI class BlockPos toWorldPos(class ChunkBlockPos const &) const; - /** - * @symbol ?tryChangeState\@LevelChunk\@\@QEAA_NW4ChunkState\@\@0\@Z - */ - MCAPI bool tryChangeState(enum class ChunkState, enum class ChunkState); /** * @symbol ?trySpawnSkeletonTrap\@LevelChunk\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelChunkAndSubChunkLoggingData.hpp b/LiteLoader/include/llapi/mc/LevelChunkAndSubChunkLoggingData.hpp index d8bba644f5..9e261d9352 100644 --- a/LiteLoader/include/llapi/mc/LevelChunkAndSubChunkLoggingData.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkAndSubChunkLoggingData.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class LevelChunkAndSubChunkLoggingData { +struct LevelChunkAndSubChunkLoggingData { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEVELCHUNKANDSUBCHUNKLOGGINGDATA public: - class LevelChunkAndSubChunkLoggingData& operator=(class LevelChunkAndSubChunkLoggingData const &) = delete; - LevelChunkAndSubChunkLoggingData(class LevelChunkAndSubChunkLoggingData const &) = delete; + struct LevelChunkAndSubChunkLoggingData& operator=(struct LevelChunkAndSubChunkLoggingData const &) = delete; + LevelChunkAndSubChunkLoggingData(struct LevelChunkAndSubChunkLoggingData const &) = delete; LevelChunkAndSubChunkLoggingData() = delete; #endif @@ -33,4 +33,4 @@ class LevelChunkAndSubChunkLoggingData { */ MCAPI static void logSubChunkEvent(class SubChunkPos const &, char const *, bool); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/LevelChunkFinalDeleter.hpp b/LiteLoader/include/llapi/mc/LevelChunkFinalDeleter.hpp index b1714c20d5..5d58fdddaa 100644 --- a/LiteLoader/include/llapi/mc/LevelChunkFinalDeleter.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkFinalDeleter.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class LevelChunkFinalDeleter { +struct LevelChunkFinalDeleter { #define AFTER_EXTRA // Add Member There @@ -20,8 +20,8 @@ class LevelChunkFinalDeleter { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEVELCHUNKFINALDELETER public: - class LevelChunkFinalDeleter& operator=(class LevelChunkFinalDeleter const &) = delete; - LevelChunkFinalDeleter(class LevelChunkFinalDeleter const &) = delete; + struct LevelChunkFinalDeleter& operator=(struct LevelChunkFinalDeleter const &) = delete; + LevelChunkFinalDeleter(struct LevelChunkFinalDeleter const &) = delete; LevelChunkFinalDeleter() = delete; #endif @@ -31,4 +31,4 @@ class LevelChunkFinalDeleter { */ MCAPI void operator()(class LevelChunk *); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/LevelChunkGarbageCollector.hpp b/LiteLoader/include/llapi/mc/LevelChunkGarbageCollector.hpp index e3ae73ef5e..63be1fad52 100644 --- a/LiteLoader/include/llapi/mc/LevelChunkGarbageCollector.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkGarbageCollector.hpp @@ -33,10 +33,6 @@ class LevelChunkGarbageCollector { * @symbol ??0LevelChunkGarbageCollector\@\@QEAA\@AEAVDimension\@\@\@Z */ MCAPI LevelChunkGarbageCollector(class Dimension &); - /** - * @symbol ?acquireDiscardedChunk\@LevelChunkGarbageCollector\@\@QEAAXV?$unique_ptr\@VLevelChunk\@\@U?$default_delete\@VLevelChunk\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI void acquireDiscardedChunk(std::unique_ptr); /** * @symbol ?getPendingDeletesCount\@LevelChunkGarbageCollector\@\@QEBA_KXZ */ diff --git a/LiteLoader/include/llapi/mc/LevelChunkMetaData.hpp b/LiteLoader/include/llapi/mc/LevelChunkMetaData.hpp index aef0bf7153..a4b220714c 100644 --- a/LiteLoader/include/llapi/mc/LevelChunkMetaData.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkMetaData.hpp @@ -30,18 +30,10 @@ class LevelChunkMetaData { * @symbol ??0LevelChunkMetaData\@\@QEAA\@AEBV0\@\@Z */ MCAPI LevelChunkMetaData(class LevelChunkMetaData const &); - /** - * @symbol ??0LevelChunkMetaData\@\@QEAA\@AEAVIDataInput\@\@\@Z - */ - MCAPI LevelChunkMetaData(class IDataInput &); /** * @symbol ?getCurrentHash\@LevelChunkMetaData\@\@QEBA_KXZ */ MCAPI unsigned __int64 getCurrentHash() const; - /** - * @symbol ?serialize\@LevelChunkMetaData\@\@QEBAXAEAVIDataOutput\@\@\@Z - */ - MCAPI void serialize(class IDataOutput &) const; /** * @symbol ??1LevelChunkMetaData\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LevelContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/LevelContainerManagerModel.hpp index f8bba1f145..fac9161b3d 100644 --- a/LiteLoader/include/llapi/mc/LevelContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/LevelContainerManagerModel.hpp @@ -76,14 +76,14 @@ class LevelContainerManagerModel : public ContainerManagerModel { */ MCVAPI ~LevelContainerManagerModel(); #endif - /** - * @symbol ??0LevelContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@UActorUniqueID\@\@\@Z - */ - MCAPI LevelContainerManagerModel(enum class ContainerID, class Player &, struct ActorUniqueID); /** * @symbol ??0LevelContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@W4BlockActorType\@\@\@Z */ MCAPI LevelContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &, enum class BlockActorType); + /** + * @symbol ??0LevelContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@UActorUniqueID\@\@\@Z + */ + MCAPI LevelContainerManagerModel(enum class ContainerID, class Player &, struct ActorUniqueID); /** * @symbol ?getBlockPos\@LevelContainerManagerModel\@\@QEBAAEBVBlockPos\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LevelContainerModel.hpp b/LiteLoader/include/llapi/mc/LevelContainerModel.hpp index 8f8af34bcb..1504b32081 100644 --- a/LiteLoader/include/llapi/mc/LevelContainerModel.hpp +++ b/LiteLoader/include/llapi/mc/LevelContainerModel.hpp @@ -116,10 +116,6 @@ class LevelContainerModel : public ContainerModel { * @symbol ?getContainerHelper\@LevelContainerModel\@\@SAPEAVContainer\@\@AEAVPlayer\@\@W4BlockActorType\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class Container * getContainerHelper(class Player &, enum class BlockActorType, class BlockPos const &); - /** - * @symbol ?getContainerHelper\@LevelContainerModel\@\@SAPEAVContainer\@\@AEAVPlayer\@\@AEBUActorUniqueID\@\@\@Z - */ - MCAPI static class Container * getContainerHelper(class Player &, struct ActorUniqueID const &); //private: /** diff --git a/LiteLoader/include/llapi/mc/LevelData.hpp b/LiteLoader/include/llapi/mc/LevelData.hpp index 99d8716494..d2fd841408 100644 --- a/LiteLoader/include/llapi/mc/LevelData.hpp +++ b/LiteLoader/include/llapi/mc/LevelData.hpp @@ -32,10 +32,6 @@ class LevelData { #endif public: - /** - * @symbol ??0LevelData\@\@QEAA\@_N\@Z - */ - MCAPI LevelData(bool); /** * @symbol ??0LevelData\@\@QEAA\@AEBVLevelSettings\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4GeneratorType\@\@AEBVBlockPos\@\@_NW4EducationEditionOffer\@\@MM\@Z */ @@ -45,9 +41,9 @@ class LevelData { */ MCAPI LevelData(class LevelData &&); /** - * @symbol ?_getValue\@LevelData\@\@QEBAPEBULevelDataValue\@\@AEBVHashedString\@\@\@Z + * @symbol ??0LevelData\@\@QEAA\@_N\@Z */ - MCAPI struct LevelDataValue const * _getValue(class HashedString const &) const; + MCAPI LevelData(bool); /** * @symbol ?achievementsWillBeDisabledOnLoad\@LevelData\@\@QEBA_NXZ */ @@ -65,13 +61,17 @@ class LevelData { */ MCAPI bool educationFeaturesEnabled() const; /** - * @symbol ?getAdventureSettings\@LevelData\@\@QEBAAEBUAdventureSettings\@\@XZ + * @symbol ?getAdventureModeOverridesEnabled\@LevelData\@\@QEBA_NXZ */ - MCAPI struct AdventureSettings const & getAdventureSettings() const; + MCAPI bool getAdventureModeOverridesEnabled() const; /** * @symbol ?getAdventureSettings\@LevelData\@\@QEAAAEAUAdventureSettings\@\@XZ */ MCAPI struct AdventureSettings & getAdventureSettings(); + /** + * @symbol ?getAdventureSettings\@LevelData\@\@QEBAAEBUAdventureSettings\@\@XZ + */ + MCAPI struct AdventureSettings const & getAdventureSettings() const; /** * @symbol ?getBaseGameVersion\@LevelData\@\@QEBAAEBVBaseGameVersion\@\@XZ */ @@ -96,6 +96,10 @@ class LevelData { * @symbol ?getCustomSkinsDisabled\@LevelData\@\@QEBA_NXZ */ MCAPI bool getCustomSkinsDisabled() const; + /** + * @symbol ?getDaylightCycle\@LevelData\@\@QEBA?AW4DaylightCycle\@\@XZ + */ + MCAPI enum class DaylightCycle getDaylightCycle() const; /** * @symbol ?getDefaultAbilities\@LevelData\@\@QEAAAEAVAbilities\@\@XZ */ @@ -164,10 +168,6 @@ class LevelData { * @symbol ?getGenerator\@LevelData\@\@QEBA?AW4GeneratorType\@\@XZ */ MCAPI enum class GeneratorType getGenerator() const; - /** - * @symbol ?getIsSingleUseWorld\@LevelData\@\@QEBA?B_NXZ - */ - MCAPI bool const getIsSingleUseWorld() const; /** * @symbol ?getLANBroadcast\@LevelData\@\@QEBA_NXZ */ @@ -176,10 +176,6 @@ class LevelData { * @symbol ?getLANBroadcastIntent\@LevelData\@\@QEBA_NXZ */ MCAPI bool getLANBroadcastIntent() const; - /** - * @symbol ?getLastPlayed\@LevelData\@\@QEBA_JXZ - */ - MCAPI __int64 getLastPlayed() const; /** * @symbol ?getLevelName\@LevelData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ @@ -200,14 +196,6 @@ class LevelData { * @symbol ?getLimitedWorldWidth\@LevelData\@\@QEBAHXZ */ MCAPI int getLimitedWorldWidth() const; - /** - * @symbol ?getLoadedPlayerTag\@LevelData\@\@QEAAAEAVCompoundTag\@\@XZ - */ - MCAPI class CompoundTag & getLoadedPlayerTag(); - /** - * @symbol ?getMinCompatibleClientVersion\@LevelData\@\@QEBAAEBVGameVersion\@\@XZ - */ - MCAPI class GameVersion const & getMinCompatibleClientVersion() const; /** * @symbol ?getMultiplayerGameIntent\@LevelData\@\@QEBA_NXZ */ @@ -220,10 +208,6 @@ class LevelData { * @symbol ?getNetherType\@LevelData\@\@QEBA?AW4NetherWorldType\@\@XZ */ MCAPI enum class NetherWorldType getNetherType() const; - /** - * @symbol ?getNetworkVersion\@LevelData\@\@QEBAHXZ - */ - MCAPI int getNetworkVersion() const; /** * @symbol ?getOnlySpawnV1Villagers\@LevelData\@\@QEBA_NXZ */ @@ -320,6 +304,10 @@ class LevelData { * @symbol ?hasBonusChestEnabled\@LevelData\@\@QEBA_NXZ */ MCAPI bool hasBonusChestEnabled() const; + /** + * @symbol ?hasCheatsEnabled\@LevelData\@\@QEBA_NXZ + */ + MCAPI bool hasCheatsEnabled() const; /** * @symbol ?hasCommandsEnabled\@LevelData\@\@QEBA_NXZ */ @@ -348,6 +336,10 @@ class LevelData { * @symbol ?incrementTick\@LevelData\@\@QEAAXXZ */ MCAPI void incrementTick(); + /** + * @symbol ?isCreatedInEditor\@LevelData\@\@QEBA_NXZ + */ + MCAPI bool isCreatedInEditor() const; /** * @symbol ?isEditorWorld\@LevelData\@\@QEBA_NXZ */ @@ -356,6 +348,10 @@ class LevelData { * @symbol ?isEducationEditionLevel\@LevelData\@\@QEBA_NXZ */ MCAPI bool isEducationEditionLevel() const; + /** + * @symbol ?isExportedFromEditor\@LevelData\@\@QEBA_NXZ + */ + MCAPI bool isExportedFromEditor() const; /** * @symbol ?isFromLockedTemplate\@LevelData\@\@QEBA_NXZ */ @@ -400,6 +396,10 @@ class LevelData { * @symbol ?recordStartUp\@LevelData\@\@QEAAXXZ */ MCAPI void recordStartUp(); + /** + * @symbol ?setAdventureModeOverridesEnabled\@LevelData\@\@QEAAX_N\@Z + */ + MCAPI void setAdventureModeOverridesEnabled(bool); /** * @symbol ?setBaseGameVersion\@LevelData\@\@QEAAXAEBVBaseGameVersion\@\@\@Z */ @@ -598,6 +598,10 @@ class LevelData { MCAPI ~LevelData(); //private: + /** + * @symbol ?_determineMaxBaseGameVersion\@LevelData\@\@AEAAXXZ + */ + MCAPI void _determineMaxBaseGameVersion(); /** * @symbol ?_setValue\@LevelData\@\@AEAAXAEBVHashedString\@\@$$QEAULevelDataValue\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelDataKeys.hpp b/LiteLoader/include/llapi/mc/LevelDataKeys.hpp index 2d46aa4efb..29be0ebe12 100644 --- a/LiteLoader/include/llapi/mc/LevelDataKeys.hpp +++ b/LiteLoader/include/llapi/mc/LevelDataKeys.hpp @@ -21,6 +21,10 @@ namespace LevelDataKeys { // Add Member There #undef AFTER_EXTRA + /** + * @symbol ?DAYLIGHT_CYCLE\@LevelDataKeys\@\@3VHashedString\@\@A + */ + MCAPI extern class HashedString DAYLIGHT_CYCLE; /** * @symbol ?EDUCATION_OID\@LevelDataKeys\@\@3VHashedString\@\@A */ diff --git a/LiteLoader/include/llapi/mc/LevelDbRandomAccessFile.hpp b/LiteLoader/include/llapi/mc/LevelDbRandomAccessFile.hpp index e1ca10edcf..780443c1ec 100644 --- a/LiteLoader/include/llapi/mc/LevelDbRandomAccessFile.hpp +++ b/LiteLoader/include/llapi/mc/LevelDbRandomAccessFile.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Core.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -40,9 +39,5 @@ class LevelDbRandomAccessFile { * @symbol ?Read\@LevelDbRandomAccessFile\@\@UEBA?AVStatus\@leveldb\@\@_K0PEAVSlice\@3\@PEAD\@Z */ virtual class leveldb::Status Read(unsigned __int64, unsigned __int64, class leveldb::Slice *, char *) const; - /** - * @symbol ??0LevelDbRandomAccessFile\@\@QEAA\@$$QEAVFile\@Core\@\@\@Z - */ - MCAPI LevelDbRandomAccessFile(class Core::File &&); }; diff --git a/LiteLoader/include/llapi/mc/LevelDbSequentialFile.hpp b/LiteLoader/include/llapi/mc/LevelDbSequentialFile.hpp index a5886b1473..e919a01b33 100644 --- a/LiteLoader/include/llapi/mc/LevelDbSequentialFile.hpp +++ b/LiteLoader/include/llapi/mc/LevelDbSequentialFile.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Core.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -45,9 +44,5 @@ class LevelDbSequentialFile { * @symbol ?Skip\@LevelDbSequentialFile\@\@UEAA?AVStatus\@leveldb\@\@_K\@Z */ virtual class leveldb::Status Skip(unsigned __int64); - /** - * @symbol ??0LevelDbSequentialFile\@\@QEAA\@$$QEAVFile\@Core\@\@\@Z - */ - MCAPI LevelDbSequentialFile(class Core::File &&); }; diff --git a/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp b/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp index b2af42a6fe..dc756c3dfa 100644 --- a/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp @@ -62,10 +62,6 @@ class LevelEventCoordinator { * @symbol ?sendLevelTick\@LevelEventCoordinator\@\@QEAAXAEAVLevel\@\@\@Z */ MCAPI void sendLevelTick(class Level &); - /** - * @symbol ?sendLevelTickEnd\@LevelEventCoordinator\@\@QEAAXAEAVLevel\@\@\@Z - */ - MCAPI void sendLevelTickEnd(class Level &); /** * @symbol ?sendLevelTickStart\@LevelEventCoordinator\@\@QEAAXAEAVLevel\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelEventListener.hpp b/LiteLoader/include/llapi/mc/LevelEventListener.hpp index d7440b5059..e0a1ab35bb 100644 --- a/LiteLoader/include/llapi/mc/LevelEventListener.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventListener.hpp @@ -62,10 +62,6 @@ class LevelEventListener { * @symbol ?onLevelTick\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z */ MCVAPI enum class EventResult onLevelTick(class Level &); - /** - * @symbol ?onLevelTickEnd\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z - */ - MCVAPI enum class EventResult onLevelTickEnd(class Level &); /** * @symbol ?onLevelTickStart\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelEventPacket.hpp b/LiteLoader/include/llapi/mc/LevelEventPacket.hpp index 7eff97ff52..8328b3c189 100644 --- a/LiteLoader/include/llapi/mc/LevelEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventPacket.hpp @@ -64,13 +64,13 @@ class LevelEventPacket : public Packet { * @symbol ??0LevelEventPacket\@\@QEAA\@W4LevelEvent\@\@MMMH\@Z */ MCAPI LevelEventPacket(enum class LevelEvent, float, float, float, int); - /** - * @symbol ??0LevelEventPacket\@\@QEAA\@XZ - */ - MCAPI LevelEventPacket(); /** * @symbol ??0LevelEventPacket\@\@QEAA\@W4LevelEvent\@\@AEBVVec3\@\@H\@Z */ MCAPI LevelEventPacket(enum class LevelEvent, class Vec3 const &, int); + /** + * @symbol ??0LevelEventPacket\@\@QEAA\@XZ + */ + MCAPI LevelEventPacket(); }; diff --git a/LiteLoader/include/llapi/mc/LevelListener.hpp b/LiteLoader/include/llapi/mc/LevelListener.hpp index a7fceee3f2..4ee116d4d1 100644 --- a/LiteLoader/include/llapi/mc/LevelListener.hpp +++ b/LiteLoader/include/llapi/mc/LevelListener.hpp @@ -79,14 +79,6 @@ class LevelListener : public BlockSourceListener { * @symbol ?levelEvent\@LevelListener\@\@UEAAXW4LevelEvent\@\@AEBVVec3\@\@H\@Z */ MCVAPI void levelEvent(enum class LevelEvent, class Vec3 const &, int); - /** - * @symbol ?levelSoundEvent\@LevelListener\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z - */ - MCVAPI void levelSoundEvent(std::string const &, class Vec3 const &, float, float); - /** - * @symbol ?levelSoundEvent\@LevelListener\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z - */ - MCVAPI void levelSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** * @symbol ?onChunkLoaded\@LevelListener\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z */ @@ -131,14 +123,6 @@ class LevelListener : public BlockSourceListener { * @symbol ?sendServerLegacyParticle\@LevelListener\@\@UEAAXW4ParticleType\@\@AEBVVec3\@\@1H\@Z */ MCVAPI void sendServerLegacyParticle(enum class ParticleType, class Vec3 const &, class Vec3 const &, int); - /** - * @symbol ?stopAllSounds\@LevelListener\@\@UEAAXXZ - */ - MCVAPI void stopAllSounds(); - /** - * @symbol ?stopSoundEvent\@LevelListener\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCVAPI void stopSoundEvent(std::string const &); /** * @symbol ?takePicture\@LevelListener\@\@UEAAXAEAVImageBuffer\@cg\@\@PEAVActor\@\@1AEAUScreenshotOptions\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelProvider.hpp b/LiteLoader/include/llapi/mc/LevelProvider.hpp new file mode 100644 index 0000000000..8d242e793d --- /dev/null +++ b/LiteLoader/include/llapi/mc/LevelProvider.hpp @@ -0,0 +1,40 @@ +/** + * @file LevelProvider.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace LevelProvider { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?initializeGlobalComponents\@LevelProvider\@\@YAXAEAVEntityRegistry\@\@\@Z + */ + MCAPI void initializeGlobalComponents(class EntityRegistry &); + /** + * @symbol ?registerExternalDataComponent\@LevelProvider\@\@YAXAEAVEntityRegistry\@\@V?$unique_ptr\@UExternalDataInterface\@\@U?$default_delete\@UExternalDataInterface\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI void registerExternalDataComponent(class EntityRegistry &, std::unique_ptr); + /** + * @symbol ?registerLevelGlobalComponents\@LevelProvider\@\@YAXAEAVEntityRegistry\@\@AEAVILevel\@\@\@Z + */ + MCAPI void registerLevelGlobalComponents(class EntityRegistry &, class ILevel &); + /** + * @symbol ?removeGlobalComponents\@LevelProvider\@\@YAXAEAVEntityRegistry\@\@\@Z + */ + MCAPI void removeGlobalComponents(class EntityRegistry &); + /** + * @symbol ?unregisterLevelGlobalComponents\@LevelProvider\@\@YAXAEAVEntityRegistry\@\@\@Z + */ + MCAPI void unregisterLevelGlobalComponents(class EntityRegistry &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/LevelSettings.hpp b/LiteLoader/include/llapi/mc/LevelSettings.hpp index 1bc9b1d031..2d65aafb67 100644 --- a/LiteLoader/include/llapi/mc/LevelSettings.hpp +++ b/LiteLoader/include/llapi/mc/LevelSettings.hpp @@ -32,6 +32,10 @@ class LevelSettings { * @symbol ??0LevelSettings\@\@QEAA\@AEBVLevelData\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI LevelSettings(class LevelData const &, class AutomaticID); + /** + * @symbol ??0LevelSettings\@\@QEAA\@XZ + */ + MCAPI LevelSettings(); /** * @symbol ??0LevelSettings\@\@QEAA\@$$QEAV0\@\@Z */ @@ -40,10 +44,6 @@ class LevelSettings { * @symbol ??0LevelSettings\@\@QEAA\@AEBV0\@\@Z */ MCAPI LevelSettings(class LevelSettings const &); - /** - * @symbol ??0LevelSettings\@\@QEAA\@XZ - */ - MCAPI LevelSettings(); /** * @symbol ?achievementsWillBeDisabledOnLoad\@LevelSettings\@\@QEBA_NXZ */ @@ -60,6 +60,10 @@ class LevelSettings { * @symbol ?forceGameType\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool forceGameType() const; + /** + * @symbol ?getAdventureModeOverridesEnabled\@LevelSettings\@\@QEBA_NXZ + */ + MCAPI bool getAdventureModeOverridesEnabled() const; /** * @symbol ?getBaseGameVersion\@LevelSettings\@\@QEBAAEBVBaseGameVersion\@\@XZ */ @@ -77,13 +81,13 @@ class LevelSettings { */ MCAPI bool getCustomSkinsDisabled() const; /** - * @symbol ?getDefaultPermissions\@LevelSettings\@\@QEBAAEBVPermissionsHandler\@\@XZ + * @symbol ?getDaylightCycle\@LevelSettings\@\@QEBA?AW4DaylightCycle\@\@XZ */ - MCAPI class PermissionsHandler const & getDefaultPermissions() const; + MCAPI enum class DaylightCycle getDaylightCycle() const; /** - * @symbol ?getDefaultSpawn\@LevelSettings\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getDefaultPermissions\@LevelSettings\@\@QEBAAEBVPermissionsHandler\@\@XZ */ - MCAPI class BlockPos const & getDefaultSpawn() const; + MCAPI class PermissionsHandler const & getDefaultPermissions() const; /** * @symbol ?getDisablePlayerInteractions\@LevelSettings\@\@QEBA_NXZ */ @@ -92,10 +96,6 @@ class LevelSettings { * @symbol ?getEduSharedUriResource\@LevelSettings\@\@QEBAAEBUEduSharedUriResource\@\@XZ */ MCAPI struct EduSharedUriResource const & getEduSharedUriResource() const; - /** - * @symbol ?getEducationEditionOffer\@LevelSettings\@\@QEBA?AW4EducationEditionOffer\@\@XZ - */ - MCAPI enum class EducationEditionOffer getEducationEditionOffer() const; /** * @symbol ?getEducationLevelSettings\@LevelSettings\@\@QEBAAEBV?$optional\@UEducationLevelSettings\@\@\@std\@\@XZ */ @@ -120,10 +120,6 @@ class LevelSettings { * @symbol ?getGameType\@LevelSettings\@\@QEBA?AW4GameType\@\@XZ */ MCAPI enum class GameType getGameType() const; - /** - * @symbol ?getGenerator\@LevelSettings\@\@QEBA?AW4GeneratorType\@\@XZ - */ - MCAPI enum class GeneratorType getGenerator() const; /** * @symbol ?getImmutableWorld\@LevelSettings\@\@QEBA_NXZ */ @@ -132,10 +128,6 @@ class LevelSettings { * @symbol ?getLanBroadcastIntent\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool getLanBroadcastIntent() const; - /** - * @symbol ?getLightningLevel\@LevelSettings\@\@QEBAMXZ - */ - MCAPI float getLightningLevel() const; /** * @symbol ?getLimitedWorldDepth\@LevelSettings\@\@QEBAHXZ */ @@ -164,10 +156,6 @@ class LevelSettings { * @symbol ?getPlatformBroadcastIntent\@LevelSettings\@\@QEBA?AW4GamePublishSetting\@Social\@\@XZ */ MCAPI enum class Social::GamePublishSetting getPlatformBroadcastIntent() const; - /** - * @symbol ?getRainLevel\@LevelSettings\@\@QEBAMXZ - */ - MCAPI float getRainLevel() const; /** * @symbol ?getSeed\@LevelSettings\@\@QEBA?AVLevelSeed64\@\@XZ */ @@ -192,14 +180,14 @@ class LevelSettings { * @symbol ?getXBLBroadcastIntent\@LevelSettings\@\@QEBA?AW4GamePublishSetting\@Social\@\@XZ */ MCAPI enum class Social::GamePublishSetting getXBLBroadcastIntent() const; - /** - * @symbol ?hasAchievementsDisabled\@LevelSettings\@\@QEBA_NXZ - */ - MCAPI bool hasAchievementsDisabled() const; /** * @symbol ?hasBonusChestEnabled\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool hasBonusChestEnabled() const; + /** + * @symbol ?hasCheatsEnabled\@LevelSettings\@\@QEBA_NXZ + */ + MCAPI bool hasCheatsEnabled() const; /** * @symbol ?hasCommandsEnabled\@LevelSettings\@\@QEBA_NXZ */ @@ -220,10 +208,18 @@ class LevelSettings { * @symbol ?hasStartWithMapEnabled\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool hasStartWithMapEnabled() const; + /** + * @symbol ?isCreatedInEditor\@LevelSettings\@\@QEBA_NXZ + */ + MCAPI bool isCreatedInEditor() const; /** * @symbol ?isEditorWorld\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool isEditorWorld() const; + /** + * @symbol ?isExportedFromEditor\@LevelSettings\@\@QEBA_NXZ + */ + MCAPI bool isExportedFromEditor() const; /** * @symbol ?isFromLockedTemplate\@LevelSettings\@\@QEBA_NXZ */ @@ -245,9 +241,9 @@ class LevelSettings { */ MCAPI class LevelSettings & operator=(class LevelSettings &&); /** - * @symbol ?overrideSavedSettings\@LevelSettings\@\@QEBAXAEAVLevelData\@\@\@Z + * @symbol ?setAdventureModeOverridesEnabled\@LevelSettings\@\@QEAAAEAV1\@_N\@Z */ - MCAPI void overrideSavedSettings(class LevelData &) const; + MCAPI class LevelSettings & setAdventureModeOverridesEnabled(bool); /** * @symbol ?setBaseGameVersion\@LevelSettings\@\@QEAAAEAV1\@AEBVBaseGameVersion\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelSoundManager.hpp b/LiteLoader/include/llapi/mc/LevelSoundManager.hpp index 60165a45a7..53dd6b7fbb 100644 --- a/LiteLoader/include/llapi/mc/LevelSoundManager.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundManager.hpp @@ -25,6 +25,12 @@ class LevelSoundManager { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELSOUNDMANAGER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LevelSoundManager(); +#endif /** * @symbol ??0LevelSoundManager\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@_N\@Z */ @@ -73,26 +79,6 @@ class LevelSoundManager { * @symbol ?registerOnHandleLevelSoundEventCallback\@LevelSoundManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z\@std\@\@\@Z */ MCAPI class Bedrock::PubSub::Subscription registerOnHandleLevelSoundEventCallback(class std::function); - /** - * @symbol ?registerOnHandleLevelSoundEventWithVolumeAndPitchCallback\@LevelSoundManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z\@std\@\@\@Z - */ - MCAPI class Bedrock::PubSub::Subscription registerOnHandleLevelSoundEventWithVolumeAndPitchCallback(class std::function); - /** - * @symbol ?registerOnHandleStopAllLevelSoundsEventCallback\@LevelSoundManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXXZ\@std\@\@\@Z - */ - MCAPI class Bedrock::PubSub::Subscription registerOnHandleStopAllLevelSoundsEventCallback(class std::function); - /** - * @symbol ?registerOnHandleStopLevelSoundEventCallback\@LevelSoundManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z - */ - MCAPI class Bedrock::PubSub::Subscription registerOnHandleStopLevelSoundEventCallback(class std::function); - /** - * @symbol ?registerOnLevelSoundEventCallback\@LevelSoundManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z\@std\@\@\@Z - */ - MCAPI class Bedrock::PubSub::Subscription registerOnLevelSoundEventCallback(class std::function); - /** - * @symbol ?registerOnLevelSoundEventWithVolumeAndPitchCallback\@LevelSoundManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z\@std\@\@\@Z - */ - MCAPI class Bedrock::PubSub::Subscription registerOnLevelSoundEventWithVolumeAndPitchCallback(class std::function); /** * @symbol ?setLevelEventCoordinator\@LevelSoundManager\@\@QEAAXV?$shared_ptr\@VLevelEventCoordinator\@\@\@std\@\@\@Z */ @@ -101,9 +87,5 @@ class LevelSoundManager { * @symbol ?setPacketSender\@LevelSoundManager\@\@QEAAXAEAVPacketSender\@\@\@Z */ MCAPI void setPacketSender(class PacketSender &); - /** - * @symbol ??1LevelSoundManager\@\@QEAA\@XZ - */ - MCAPI ~LevelSoundManager(); }; diff --git a/LiteLoader/include/llapi/mc/LevelStorageEventingContext.hpp b/LiteLoader/include/llapi/mc/LevelStorageEventingContext.hpp new file mode 100644 index 0000000000..62c7c1a93f --- /dev/null +++ b/LiteLoader/include/llapi/mc/LevelStorageEventingContext.hpp @@ -0,0 +1,32 @@ +/** + * @file LevelStorageEventingContext.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct LevelStorageEventingContext { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEVELSTORAGEEVENTINGCONTEXT +public: + struct LevelStorageEventingContext& operator=(struct LevelStorageEventingContext const &) = delete; + LevelStorageEventingContext(struct LevelStorageEventingContext const &) = delete; + LevelStorageEventingContext() = delete; +#endif + +public: + /** + * @symbol ??1LevelStorageEventingContext\@\@QEAA\@XZ + */ + MCAPI ~LevelStorageEventingContext(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/LevelStorageObserver.hpp b/LiteLoader/include/llapi/mc/LevelStorageObserver.hpp index 036add5df9..ed032fd7b6 100644 --- a/LiteLoader/include/llapi/mc/LevelStorageObserver.hpp +++ b/LiteLoader/include/llapi/mc/LevelStorageObserver.hpp @@ -29,10 +29,6 @@ class LevelStorageObserver { #endif public: - /** - * @symbol ??0LevelStorageObserver\@\@QEAA\@V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z - */ - MCAPI LevelStorageObserver(class std::function); /** * @symbol ?onSave\@LevelStorageObserver\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelSummary.hpp b/LiteLoader/include/llapi/mc/LevelSummary.hpp index 906d5ebd06..c41c618633 100644 --- a/LiteLoader/include/llapi/mc/LevelSummary.hpp +++ b/LiteLoader/include/llapi/mc/LevelSummary.hpp @@ -25,10 +25,6 @@ struct LevelSummary { * @symbol ??0LevelSummary\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_JW4GameType\@\@W4Difficulty\@\@VLevelSeed64\@\@H_K_N6W4GamePublishSetting\@Social\@\@6W4EducationEditionOffer\@\@AEBVGameVersion\@\@9W4StorageVersion\@\@AEBVPath\@Core\@\@AEBVContentIdentity\@\@0_NAEBUEduSharedUriResource\@\@AEBVExperiments\@\@AEBVBaseGameVersion\@\@6\@Z */ MCAPI LevelSummary(std::string const &, std::string const &, __int64, enum class GameType, enum class Difficulty, class LevelSeed64, int, unsigned __int64, bool, bool, enum class Social::GamePublishSetting, bool, enum class EducationEditionOffer, class GameVersion const &, class GameVersion const &, enum class StorageVersion, class Core::Path const &, class ContentIdentity const &, std::string const &, bool, struct EduSharedUriResource const &, class Experiments const &, class BaseGameVersion const &, bool); - /** - * @symbol ??0LevelSummary\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI LevelSummary(struct LevelSummary const &); /** * @symbol ??0LevelSummary\@\@QEAA\@XZ */ @@ -38,17 +34,13 @@ struct LevelSummary { */ MCAPI LevelSummary(std::string const &, class LevelData const &, class Core::Path const &, class Core::Path const &, bool); /** - * @symbol ??4LevelSummary\@\@QEAAAEAU0\@AEBU0\@\@Z - */ - MCAPI struct LevelSummary & operator=(struct LevelSummary const &); - /** - * @symbol ?reinitializeWorldIconPath\@LevelSummary\@\@QEAAXAEBVPath\@Core\@\@\@Z + * @symbol ??0LevelSummary\@\@QEAA\@AEBU0\@\@Z */ - MCAPI void reinitializeWorldIconPath(class Core::Path const &); + MCAPI LevelSummary(struct LevelSummary const &); /** - * @symbol ?reinitializeWorldSize\@LevelSummary\@\@QEAAXAEBVPath\@Core\@\@\@Z + * @symbol ??4LevelSummary\@\@QEAAAEAU0\@AEBU0\@\@Z */ - MCAPI void reinitializeWorldSize(class Core::Path const &); + MCAPI struct LevelSummary & operator=(struct LevelSummary const &); /** * @symbol ?setName\@LevelSummary\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LeverBlock.hpp b/LiteLoader/include/llapi/mc/LeverBlock.hpp index 89cf0ed3ca..29baa6f257 100644 --- a/LiteLoader/include/llapi/mc/LeverBlock.hpp +++ b/LiteLoader/include/llapi/mc/LeverBlock.hpp @@ -202,9 +202,9 @@ class LeverBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@LeverBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@LeverBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 108 * @symbol ?isAttachedTo\@LeverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z @@ -226,35 +226,35 @@ class LeverBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@LeverBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 147 + * @vftbl 148 * @symbol ?canSpawnOn\@LeverBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -267,46 +267,51 @@ class LeverBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@LeverBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@LeverBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 194 + * @vftbl 195 * @symbol ?updateShape\@LeverBlock\@\@UEAAXPEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void updateShape(class BlockSource *, class BlockPos const &); diff --git a/LiteLoader/include/llapi/mc/LibraryScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/LibraryScreenCapabilities.hpp index 703e4b4849..65082e6433 100644 --- a/LiteLoader/include/llapi/mc/LibraryScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/LibraryScreenCapabilities.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -12,7 +13,7 @@ #undef BEFORE_EXTRA -class LibraryScreenCapabilities { +struct LibraryScreenCapabilities { #define AFTER_EXTRA // Add Member There @@ -20,8 +21,8 @@ class LibraryScreenCapabilities { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_LIBRARYSCREENCAPABILITIES public: - class LibraryScreenCapabilities& operator=(class LibraryScreenCapabilities const &) = delete; - LibraryScreenCapabilities(class LibraryScreenCapabilities const &) = delete; + struct LibraryScreenCapabilities& operator=(struct LibraryScreenCapabilities const &) = delete; + LibraryScreenCapabilities(struct LibraryScreenCapabilities const &) = delete; LibraryScreenCapabilities() = delete; #endif @@ -33,9 +34,9 @@ class LibraryScreenCapabilities { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@ULibraryScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @symbol ?isOfType\@?$TypedScreenCapabilities\@ULibraryScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@Bedrock\@\@\@Z */ - virtual bool isOfType(class typeid_t) const; + virtual bool isOfType(class Bedrock::typeid_t) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LIBRARYSCREENCAPABILITIES /** * @symbol __unk_destructor_-1 @@ -43,4 +44,4 @@ class LibraryScreenCapabilities { MCVAPI ~LibraryScreenCapabilities(); #endif -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/LightBlock.hpp b/LiteLoader/include/llapi/mc/LightBlock.hpp index d98a41ce29..d7d5012daf 100644 --- a/LiteLoader/include/llapi/mc/LightBlock.hpp +++ b/LiteLoader/include/llapi/mc/LightBlock.hpp @@ -207,9 +207,9 @@ class LightBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@LightBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@LightBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 114 * @symbol ?canBeBuiltOver\@LightBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z @@ -231,35 +231,35 @@ class LightBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 134 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@LightBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 152 + * @vftbl 153 * @symbol ?init\@LightBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 153 + * @vftbl 154 * @symbol ?getLightEmission\@LightBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -271,30 +271,35 @@ class LightBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@LightBlock\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0LightBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LightGemBlock.hpp b/LiteLoader/include/llapi/mc/LightGemBlock.hpp index 44f848fba6..215e499e42 100644 --- a/LiteLoader/include/llapi/mc/LightGemBlock.hpp +++ b/LiteLoader/include/llapi/mc/LightGemBlock.hpp @@ -181,20 +181,20 @@ class LightGemBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,32 +206,37 @@ class LightGemBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@LightGemBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@LightGemBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/LightningRod.hpp b/LiteLoader/include/llapi/mc/LightningRod.hpp index 26a8e17169..aec4f87ee9 100644 --- a/LiteLoader/include/llapi/mc/LightningRod.hpp +++ b/LiteLoader/include/llapi/mc/LightningRod.hpp @@ -207,9 +207,9 @@ class LightningRod : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@LightningRod\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@LightningRod\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -226,30 +226,30 @@ class LightningRod : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@LightningRod\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -262,34 +262,39 @@ class LightningRod : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0LightningRod\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LiquidBlock.hpp b/LiteLoader/include/llapi/mc/LiquidBlock.hpp index 4e31c053a8..5d705dd12b 100644 --- a/LiteLoader/include/llapi/mc/LiquidBlock.hpp +++ b/LiteLoader/include/llapi/mc/LiquidBlock.hpp @@ -206,40 +206,40 @@ class LiquidBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 135 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 136 * @symbol ?getColor\@LiquidBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 137 + * @vftbl 138 * @symbol ?getColorAtPos\@LiquidBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 140 + * @vftbl 141 * @symbol ?onGraphicsModeChanged\@LiquidBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@LiquidBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -252,36 +252,41 @@ class LiquidBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@LiquidBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@LiquidBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@LiquidBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp b/LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp index ed4dcf7535..4af2aeecd1 100644 --- a/LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp +++ b/LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp @@ -181,20 +181,20 @@ class LiquidBlockDynamic : public LiquidBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -207,34 +207,39 @@ class LiquidBlockDynamic : public LiquidBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@LiquidBlockDynamic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@LiquidBlockDynamic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0LiquidBlockDynamic\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp b/LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp index f707a79a14..1ce039f725 100644 --- a/LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp +++ b/LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp @@ -186,20 +186,20 @@ class LiquidBlockStatic : public LiquidBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,30 +211,35 @@ class LiquidBlockStatic : public LiquidBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 172 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?randomTick\@LiquidBlockStatic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0LiquidBlockStatic\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LiquidSplashRequestSystem.hpp b/LiteLoader/include/llapi/mc/LiquidSplashRequestSystem.hpp index e109fe7f59..ba39995450 100644 --- a/LiteLoader/include/llapi/mc/LiquidSplashRequestSystem.hpp +++ b/LiteLoader/include/llapi/mc/LiquidSplashRequestSystem.hpp @@ -37,6 +37,10 @@ class LiquidSplashRequestSystem { * @symbol ?_liquidSplashRequest\@LiquidSplashRequestSystem\@\@CAXAEAVStrictEntityContext\@\@AEBUUpdateWaterStateRequestComponent\@\@V?$Optional\@$$CBUPlayerGameTypeComponent\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInLavaFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UPostSplashGameEventRequestFlag\@\@\@\@V?$FlagComponent\@UWaterSplashEffectRequestFlag\@\@\@\@\@\@\@Z */ MCAPI static void _liquidSplashRequest(class StrictEntityContext &, struct UpdateWaterStateRequestComponent const &, class Optional, class Optional const>, class Optional const>, class EntityModifierT, class FlagComponent>); + /** + * @symbol ?_tick\@LiquidSplashRequestSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Exclude\@UPassengerComponent\@\@\@\@$$CBUUpdateWaterStateRequestComponent\@\@V?$Optional\@$$CBUPlayerGameTypeComponent\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInLavaFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UPostSplashGameEventRequestFlag\@\@\@\@V?$FlagComponent\@UWaterSplashEffectRequestFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void _tick(class ViewT, struct UpdateWaterStateRequestComponent const, class Optional, class Optional const>, class Optional const>>, class EntityModifierT, class FlagComponent>); private: diff --git a/LiteLoader/include/llapi/mc/LiquidSplashSystem.hpp b/LiteLoader/include/llapi/mc/LiquidSplashSystem.hpp index a0118bd6c4..3dbe401ad3 100644 --- a/LiteLoader/include/llapi/mc/LiquidSplashSystem.hpp +++ b/LiteLoader/include/llapi/mc/LiquidSplashSystem.hpp @@ -32,4 +32,12 @@ class LiquidSplashSystem { */ MCAPI static struct TickingSystemWithInfo createSystem(); +//private: + /** + * @symbol ?_tickLiquidSplash\@LiquidSplashSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UWaterSplashEffectRequestFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPostSplashGameEventRequestFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void _tickLiquidSplash(class ViewT>, class ActorOwnerComponent>, class ViewT>, class ActorOwnerComponent>); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/ListCommand.hpp b/LiteLoader/include/llapi/mc/ListCommand.hpp index b2453b5c39..5f50efd127 100644 --- a/LiteLoader/include/llapi/mc/ListCommand.hpp +++ b/LiteLoader/include/llapi/mc/ListCommand.hpp @@ -36,7 +36,7 @@ class ListCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@ListCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ListDCommand.hpp b/LiteLoader/include/llapi/mc/ListDCommand.hpp index e99d9b0ac5..3f4b3e6cca 100644 --- a/LiteLoader/include/llapi/mc/ListDCommand.hpp +++ b/LiteLoader/include/llapi/mc/ListDCommand.hpp @@ -36,7 +36,7 @@ class ListDCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@ListDCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/Localization.hpp b/LiteLoader/include/llapi/mc/Localization.hpp index bb38eba7ef..3783c40ba1 100644 --- a/LiteLoader/include/llapi/mc/Localization.hpp +++ b/LiteLoader/include/llapi/mc/Localization.hpp @@ -54,10 +54,6 @@ class Localization { * @symbol ?getFullLanguageCode\@Localization\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getFullLanguageCode() const; - /** - * @symbol ?getStringIdExists\@Localization\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI bool getStringIdExists(std::string const &) const; /** * @symbol ?loadFromPack\@Localization\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPackAccessStrategy\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LocateCommand.hpp b/LiteLoader/include/llapi/mc/LocateCommand.hpp index dfefac7001..30ed29a39f 100644 --- a/LiteLoader/include/llapi/mc/LocateCommand.hpp +++ b/LiteLoader/include/llapi/mc/LocateCommand.hpp @@ -36,7 +36,7 @@ class LocateCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@LocateCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/LodestoneBlock.hpp b/LiteLoader/include/llapi/mc/LodestoneBlock.hpp index 0727f98b91..8ca81cde78 100644 --- a/LiteLoader/include/llapi/mc/LodestoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneBlock.hpp @@ -181,20 +181,20 @@ class LodestoneBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,25 +206,30 @@ class LodestoneBlock : public ActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); /** * @symbol ??0LodestoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp b/LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp index a4c6a8469c..32828b0952 100644 --- a/LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp @@ -108,9 +108,9 @@ class LodestoneCompassItem : public AbstractCompassItem { virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; /** * @vftbl 132 - * @symbol ?_useOn\@LodestoneCompassItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@LodestoneCompassItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0LodestoneCompassItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/LogBlock.hpp b/LiteLoader/include/llapi/mc/LogBlock.hpp index 4adf02d63f..a65a4c5519 100644 --- a/LiteLoader/include/llapi/mc/LogBlock.hpp +++ b/LiteLoader/include/llapi/mc/LogBlock.hpp @@ -176,25 +176,25 @@ class LogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 162 - * @symbol ?onRemove\@LogBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void onRemove(class BlockSource &, class BlockPos const &) const; + virtual void __unk_vfn_157(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol ?onRemove\@LogBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_165(); + virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,48 +206,59 @@ class LogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 * @symbol ?use\@LogBlock\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@LogBlock\@\@MEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@LogBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@LogBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LOGBLOCK + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LogBlock(); +#endif /** - * @symbol ??0LogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@V?$optional\@ULogMapColors\@LogBlock\@\@\@2\@\@Z + * @symbol ??0LogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@V?$optional\@ULogBlockMapColors\@\@\@2\@\@Z */ - MCAPI LogBlock(std::string const &, int, class WeakPtr, class std::optional); + MCAPI LogBlock(std::string const &, int, class WeakPtr, class std::optional); }; diff --git a/LiteLoader/include/llapi/mc/LoomBlock.hpp b/LiteLoader/include/llapi/mc/LoomBlock.hpp index 7322242347..93170ca627 100644 --- a/LiteLoader/include/llapi/mc/LoomBlock.hpp +++ b/LiteLoader/include/llapi/mc/LoomBlock.hpp @@ -176,20 +176,20 @@ class LoomBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,30 +201,35 @@ class LoomBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 * @symbol ?use\@LoomBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LOOMBLOCK /** * @symbol ?isCraftingBlock\@LoomBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/LootCommand.hpp b/LiteLoader/include/llapi/mc/LootCommand.hpp index 8f74499d0f..29d82dccb6 100644 --- a/LiteLoader/include/llapi/mc/LootCommand.hpp +++ b/LiteLoader/include/llapi/mc/LootCommand.hpp @@ -35,7 +35,7 @@ class LootCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@LootCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/LootItemActorHasMarkVariantCondition.hpp b/LiteLoader/include/llapi/mc/LootItemActorHasMarkVariantCondition.hpp index 483a536c13..f9703ba88b 100644 --- a/LiteLoader/include/llapi/mc/LootItemActorHasMarkVariantCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemActorHasMarkVariantCondition.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -40,9 +39,5 @@ class LootItemActorHasMarkVariantCondition { * @symbol ?applies\@LootItemActorHasMarkVariantCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); - /** - * @symbol ?deserialize\@LootItemActorHasMarkVariantCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value); }; diff --git a/LiteLoader/include/llapi/mc/LootItemActorHasVariantCondition.hpp b/LiteLoader/include/llapi/mc/LootItemActorHasVariantCondition.hpp index 101180033b..d2b197a73a 100644 --- a/LiteLoader/include/llapi/mc/LootItemActorHasVariantCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemActorHasVariantCondition.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA @@ -38,9 +37,5 @@ class LootItemActorHasVariantCondition { * @symbol ?applies\@LootItemActorHasVariantCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); - /** - * @symbol ?deserialize\@LootItemActorHasVariantCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value); }; diff --git a/LiteLoader/include/llapi/mc/LootItemFunction.hpp b/LiteLoader/include/llapi/mc/LootItemFunction.hpp index 7f0c0b5400..1d4efd77ec 100644 --- a/LiteLoader/include/llapi/mc/LootItemFunction.hpp +++ b/LiteLoader/include/llapi/mc/LootItemFunction.hpp @@ -61,10 +61,6 @@ class LootItemFunction { */ MCVAPI ~LootItemFunction(); #endif - /** - * @symbol ?getConditions\@LootItemFunction\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI std::vector> const & getConditions() const; /** * @symbol ?deserialize\@LootItemFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LootItemKilledByPlayerCondition.hpp b/LiteLoader/include/llapi/mc/LootItemKilledByPlayerCondition.hpp index 61b4c76f41..d0f76f8ee5 100644 --- a/LiteLoader/include/llapi/mc/LootItemKilledByPlayerCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemKilledByPlayerCondition.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -40,9 +39,5 @@ class LootItemKilledByPlayerCondition { * @symbol ?applies\@LootItemKilledByPlayerCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); - /** - * @symbol ?deserialize\@LootItemKilledByPlayerCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value); }; diff --git a/LiteLoader/include/llapi/mc/LootItemKilledByPlayerOrPetsCondition.hpp b/LiteLoader/include/llapi/mc/LootItemKilledByPlayerOrPetsCondition.hpp index 83a1886489..cbd7f7e2b3 100644 --- a/LiteLoader/include/llapi/mc/LootItemKilledByPlayerOrPetsCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemKilledByPlayerOrPetsCondition.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -40,9 +39,5 @@ class LootItemKilledByPlayerOrPetsCondition { * @symbol ?applies\@LootItemKilledByPlayerOrPetsCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); - /** - * @symbol ?deserialize\@LootItemKilledByPlayerOrPetsCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value); }; diff --git a/LiteLoader/include/llapi/mc/LootItemRandomChanceCondition.hpp b/LiteLoader/include/llapi/mc/LootItemRandomChanceCondition.hpp index a7adbd678f..db24bc4935 100644 --- a/LiteLoader/include/llapi/mc/LootItemRandomChanceCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemRandomChanceCondition.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -40,9 +39,5 @@ class LootItemRandomChanceCondition { * @symbol ?applies\@LootItemRandomChanceCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); - /** - * @symbol ?deserialize\@LootItemRandomChanceCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value); }; diff --git a/LiteLoader/include/llapi/mc/LootItemRandomChanceWithLootingCondition.hpp b/LiteLoader/include/llapi/mc/LootItemRandomChanceWithLootingCondition.hpp index 32c9f12bb9..d525b14002 100644 --- a/LiteLoader/include/llapi/mc/LootItemRandomChanceWithLootingCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemRandomChanceWithLootingCondition.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -40,9 +39,5 @@ class LootItemRandomChanceWithLootingCondition { * @symbol ?applies\@LootItemRandomChanceWithLootingCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); - /** - * @symbol ?deserialize\@LootItemRandomChanceWithLootingCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value); }; diff --git a/LiteLoader/include/llapi/mc/LootItemRandomChanceWithSpecialModifierCondition.hpp b/LiteLoader/include/llapi/mc/LootItemRandomChanceWithSpecialModifierCondition.hpp index 2e5c594b2e..7084f23a9d 100644 --- a/LiteLoader/include/llapi/mc/LootItemRandomChanceWithSpecialModifierCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemRandomChanceWithSpecialModifierCondition.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -40,9 +39,5 @@ class LootItemRandomChanceWithSpecialModifierCondition { * @symbol ?applies\@LootItemRandomChanceWithSpecialModifierCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); - /** - * @symbol ?deserialize\@LootItemRandomChanceWithSpecialModifierCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value); }; diff --git a/LiteLoader/include/llapi/mc/LootItemRandomDifficultyChanceCondition.hpp b/LiteLoader/include/llapi/mc/LootItemRandomDifficultyChanceCondition.hpp index b050d55e0e..a567958d46 100644 --- a/LiteLoader/include/llapi/mc/LootItemRandomDifficultyChanceCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemRandomDifficultyChanceCondition.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -40,9 +39,5 @@ class LootItemRandomDifficultyChanceCondition { * @symbol ?applies\@LootItemRandomDifficultyChanceCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); - /** - * @symbol ?deserialize\@LootItemRandomDifficultyChanceCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value); }; diff --git a/LiteLoader/include/llapi/mc/LootPoolTiers.hpp b/LiteLoader/include/llapi/mc/LootPoolTiers.hpp deleted file mode 100644 index af2a70becb..0000000000 --- a/LiteLoader/include/llapi/mc/LootPoolTiers.hpp +++ /dev/null @@ -1,36 +0,0 @@ -/** - * @file LootPoolTiers.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "Json.hpp" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class LootPoolTiers. - * - */ -class LootPoolTiers { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LOOTPOOLTIERS -public: - class LootPoolTiers& operator=(class LootPoolTiers const &) = delete; - LootPoolTiers(class LootPoolTiers const &) = delete; - LootPoolTiers() = delete; -#endif - -public: - /** - * @symbol ?deserialize\@LootPoolTiers\@\@SA?AV?$unique_ptr\@VLootPoolTiers\@\@U?$default_delete\@VLootPoolTiers\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value); - -}; diff --git a/LiteLoader/include/llapi/mc/LootTable.hpp b/LiteLoader/include/llapi/mc/LootTable.hpp index 9cc80f336e..1aada6087c 100644 --- a/LiteLoader/include/llapi/mc/LootTable.hpp +++ b/LiteLoader/include/llapi/mc/LootTable.hpp @@ -30,10 +30,6 @@ class LootTable { #endif public: - /** - * @symbol ??0LootTable\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI LootTable(std::string); /** * @symbol ?deserialize\@LootTable\@\@QEAAXAEBVValue\@Json\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LootTableContext.hpp b/LiteLoader/include/llapi/mc/LootTableContext.hpp index d7e67c632d..730ad23f89 100644 --- a/LiteLoader/include/llapi/mc/LootTableContext.hpp +++ b/LiteLoader/include/llapi/mc/LootTableContext.hpp @@ -33,10 +33,6 @@ class LootTableContext { * @symbol ??0LootTableContext\@\@QEAA\@MPEAVILevel\@\@UActorUniqueID\@\@PEAVPlayer\@\@PEAVActor\@\@PEBVActorDamageSource\@\@MV?$AutomaticID\@VDimension\@\@H\@\@PEBVItemStack\@\@\@Z */ MCAPI LootTableContext(float, class ILevel *, struct ActorUniqueID, class Player *, class Actor *, class ActorDamageSource const *, float, class AutomaticID, class ItemStack const *); - /** - * @symbol ?addVisitedTable\@LootTableContext\@\@QEAA_NPEBVLootTable\@\@\@Z - */ - MCAPI bool addVisitedTable(class LootTable const *); /** * @symbol ?getDimensionId\@LootTableContext\@\@QEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ */ @@ -45,10 +41,6 @@ class LootTableContext { * @symbol ?getEntity\@LootTableContext\@\@QEBAPEAVActor\@\@W4ActorTarget\@\@\@Z */ MCAPI class Actor * getEntity(enum class ActorTarget) const; - /** - * @symbol ?getExplosionRadius\@LootTableContext\@\@QEBAMXZ - */ - MCAPI float getExplosionRadius() const; /** * @symbol ?getKilledEntity\@LootTableContext\@\@QEBAPEAVActor\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LootTableEntry.hpp b/LiteLoader/include/llapi/mc/LootTableEntry.hpp index 7f08482d2e..ccd2443f8b 100644 --- a/LiteLoader/include/llapi/mc/LootTableEntry.hpp +++ b/LiteLoader/include/llapi/mc/LootTableEntry.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -35,9 +34,5 @@ class LootTableEntry { * @symbol ?_createItem\@LootTableEntry\@\@MEAA_NAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool _createItem(std::vector &, class Random &, class LootTableContext &); - /** - * @symbol ?deserialize\@LootTableEntry\@\@SA?AV?$unique_ptr\@VLootPoolEntry\@\@U?$default_delete\@VLootPoolEntry\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value); }; diff --git a/LiteLoader/include/llapi/mc/LootingEnchantFunction.hpp b/LiteLoader/include/llapi/mc/LootingEnchantFunction.hpp index 7d503e6452..b9fc62e8d3 100644 --- a/LiteLoader/include/llapi/mc/LootingEnchantFunction.hpp +++ b/LiteLoader/include/llapi/mc/LootingEnchantFunction.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #include "LootItemFunction.hpp" #define BEFORE_EXTRA @@ -46,9 +45,5 @@ class LootingEnchantFunction : public LootItemFunction { * @symbol ?apply\@LootingEnchantFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); - /** - * @symbol ?deserialize\@LootingEnchantFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); }; diff --git a/LiteLoader/include/llapi/mc/LowMemoryWatcher.hpp b/LiteLoader/include/llapi/mc/LowMemoryWatcher.hpp new file mode 100644 index 0000000000..1869bfe3eb --- /dev/null +++ b/LiteLoader/include/llapi/mc/LowMemoryWatcher.hpp @@ -0,0 +1,44 @@ +/** + * @file LowMemoryWatcher.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class LowMemoryWatcher { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LOWMEMORYWATCHER +public: + class LowMemoryWatcher& operator=(class LowMemoryWatcher const &) = delete; + LowMemoryWatcher(class LowMemoryWatcher const &) = delete; + LowMemoryWatcher() = delete; +#endif + +public: + +//private: + +private: + /** + * @symbol ?mPlatformToldUsLowMemory\@LowMemoryWatcher\@\@0_NA + */ + MCAPI static bool mPlatformToldUsLowMemory; + /** + * @symbol ?mPleaseLeakMemory\@LowMemoryWatcher\@\@0V?$list\@V?$vector\@DV?$allocator\@D\@std\@\@\@std\@\@V?$allocator\@V?$vector\@DV?$allocator\@D\@std\@\@\@std\@\@\@2\@\@std\@\@A + */ + MCAPI static std::list>> mPleaseLeakMemory; + /** + * @symbol ?mTimeToResetWarning\@LowMemoryWatcher\@\@0V?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@A + */ + MCAPI static class std::chrono::time_point>> mTimeToResetWarning; + +}; diff --git a/LiteLoader/include/llapi/mc/MCRESULT.hpp b/LiteLoader/include/llapi/mc/MCRESULT.hpp index bc47d9874a..6acb653d72 100644 --- a/LiteLoader/include/llapi/mc/MCRESULT.hpp +++ b/LiteLoader/include/llapi/mc/MCRESULT.hpp @@ -42,5 +42,9 @@ struct MCRESULT { * @symbol ?isSuccess\@MCRESULT\@\@QEBA_NXZ */ MCAPI bool isSuccess() const; + /** + * @symbol ??8MCRESULT\@\@QEBA_NAEBU0\@\@Z + */ + MCAPI bool operator==(struct MCRESULT const &) const; }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MC_ANONYMOUS.hpp b/LiteLoader/include/llapi/mc/MC_ANONYMOUS.hpp new file mode 100644 index 0000000000..30c4ab9800 --- /dev/null +++ b/LiteLoader/include/llapi/mc/MC_ANONYMOUS.hpp @@ -0,0 +1,24 @@ +/** + * @file MC_ANONYMOUS.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace MC_ANONYMOUS { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?sendMessage\@MC_ANONYMOUS\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUCommandOriginIdentity\@\@AEBVLevel\@\@\@Z + */ + MCAPI void sendMessage(std::string const &, struct CommandOriginIdentity const &, class Level const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MagmaBlock.hpp b/LiteLoader/include/llapi/mc/MagmaBlock.hpp index 869012e988..2307e0eafc 100644 --- a/LiteLoader/include/llapi/mc/MagmaBlock.hpp +++ b/LiteLoader/include/llapi/mc/MagmaBlock.hpp @@ -181,30 +181,30 @@ class MagmaBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 * @symbol ?getVariant\@MagmaBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,40 +216,45 @@ class MagmaBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 184 + * @vftbl 185 * @symbol ?getEmissiveBrightness\@MagmaBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getEmissiveBrightness(class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MAGMABLOCK /** * @symbol ?shouldTickOnSetBlock\@MagmaBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/MangroveLeafBlock.hpp b/LiteLoader/include/llapi/mc/MangroveLeafBlock.hpp index 7d10452682..cda33623d0 100644 --- a/LiteLoader/include/llapi/mc/MangroveLeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/MangroveLeafBlock.hpp @@ -184,20 +184,20 @@ class MangroveLeafBlock : public LeafBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -209,32 +209,37 @@ class MangroveLeafBlock : public LeafBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@MangroveLeafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@MangroveLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/MangrovePropagule.hpp b/LiteLoader/include/llapi/mc/MangrovePropagule.hpp index 70229e48ba..b340a52eb9 100644 --- a/LiteLoader/include/llapi/mc/MangrovePropagule.hpp +++ b/LiteLoader/include/llapi/mc/MangrovePropagule.hpp @@ -204,35 +204,35 @@ class MangrovePropagule : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@MangrovePropagule\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@MangrovePropagule\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 152 + * @vftbl 153 * @symbol ?init\@MangrovePropagule\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -244,50 +244,89 @@ class MangrovePropagule : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 172 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?randomTick\@MangrovePropagule\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@MangrovePropagule\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@MangrovePropagule\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@MangrovePropagule\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@MangrovePropagule\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + /** + * @vftbl 195 + * @symbol __unk_vfn_195 + */ + virtual void __unk_vfn_195(); + /** + * @vftbl 196 + * @symbol __unk_vfn_196 + */ + virtual void __unk_vfn_196(); + /** + * @vftbl 197 + * @symbol __unk_vfn_197 + */ + virtual void __unk_vfn_197(); + /** + * @vftbl 198 + * @symbol __unk_vfn_198 + */ + virtual void __unk_vfn_198(); + /** + * @vftbl 199 + * @symbol __unk_vfn_199 + */ + virtual void __unk_vfn_199(); + /** + * @vftbl 200 + * @symbol __unk_vfn_200 + */ + virtual void __unk_vfn_200(); + /** + * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + MCAPI std::string const & getDescriptionId() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MANGROVEPROPAGULE /** * @symbol ?waterSpreadCausesSpawn\@MangrovePropagule\@\@UEBA_NXZ @@ -309,9 +348,9 @@ class MangrovePropagule : public BlockLegacy { */ MCAPI bool _isFullyGrown(class Block const &) const; /** - * @symbol ?_isHanging\@MangrovePropagule\@\@AEBA_NAEBVBlock\@\@\@Z + * @symbol ?_shouldDropMangrovePropaguleItem\@MangrovePropagule\@\@AEBA_NAEBVBlock\@\@\@Z */ - MCAPI bool _isHanging(class Block const &) const; + MCAPI bool _shouldDropMangrovePropaguleItem(class Block const &) const; private: diff --git a/LiteLoader/include/llapi/mc/MangroveRootBlock.hpp b/LiteLoader/include/llapi/mc/MangroveRootBlock.hpp index 0164b75063..7db4907607 100644 --- a/LiteLoader/include/llapi/mc/MangroveRootBlock.hpp +++ b/LiteLoader/include/llapi/mc/MangroveRootBlock.hpp @@ -184,20 +184,20 @@ class MangroveRootBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -209,25 +209,30 @@ class MangroveRootBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); /** * @symbol ??0MangroveRootBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MangroveTreeRoots.hpp b/LiteLoader/include/llapi/mc/MangroveTreeRoots.hpp index 8c23bd16a2..b92c5e7230 100644 --- a/LiteLoader/include/llapi/mc/MangroveTreeRoots.hpp +++ b/LiteLoader/include/llapi/mc/MangroveTreeRoots.hpp @@ -40,6 +40,10 @@ class MangroveTreeRoots { virtual class std::optional placeRoots(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, int, class RenderParams &, struct TreeHelper::TreeParams const &) const; //private: + /** + * @symbol ?_canPlaceRoot\@MangroveTreeRoots\@\@AEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI bool _canPlaceRoot(class IBlockWorldGenAPI &, class BlockPos const &) const; /** * @symbol ?_placeRoot\@MangroveTreeRoots\@\@AEBAXAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MapCloningRecipe.hpp b/LiteLoader/include/llapi/mc/MapCloningRecipe.hpp index 95444b712e..a816c2e2bb 100644 --- a/LiteLoader/include/llapi/mc/MapCloningRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MapCloningRecipe.hpp @@ -37,9 +37,9 @@ class MapCloningRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@MapCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @symbol ?assemble\@MapCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &) const; + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@MapCloningRecipe\@\@UEBAHXZ @@ -55,6 +55,11 @@ class MapCloningRecipe : public Recipe { * @symbol ?getResultItem\@MapCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; + /** + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); /** * @vftbl 6 * @symbol ?matches\@MapCloningRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/MapDecoration.hpp b/LiteLoader/include/llapi/mc/MapDecoration.hpp index 3a7dfb3df1..b386cd9c26 100644 --- a/LiteLoader/include/llapi/mc/MapDecoration.hpp +++ b/LiteLoader/include/llapi/mc/MapDecoration.hpp @@ -27,13 +27,10 @@ enum class Type; public: class MapDecoration& operator=(class MapDecoration const &) = delete; MapDecoration(class MapDecoration const &) = delete; + MapDecoration() = delete; #endif public: - /** - * @symbol ??0MapDecoration\@\@QEAA\@XZ - */ - MCAPI MapDecoration(); /** * @symbol ??0MapDecoration\@\@QEAA\@W4Type\@0\@CCCAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVColor\@mce\@\@\@Z */ @@ -62,14 +59,6 @@ enum class Type; * @symbol ?getY\@MapDecoration\@\@QEBACXZ */ MCAPI signed char getY() const; - /** - * @symbol ?load\@MapDecoration\@\@QEAAXAEBVCompoundTag\@\@\@Z - */ - MCAPI void load(class CompoundTag const &); - /** - * @symbol ?save\@MapDecoration\@\@QEAAXAEAVCompoundTag\@\@\@Z - */ - MCAPI void save(class CompoundTag &); /** * @symbol ??1MapDecoration\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/MapExtendingRecipe.hpp b/LiteLoader/include/llapi/mc/MapExtendingRecipe.hpp index 0b9a82e3ed..4cc67565a0 100644 --- a/LiteLoader/include/llapi/mc/MapExtendingRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MapExtendingRecipe.hpp @@ -37,9 +37,9 @@ class MapExtendingRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@MapExtendingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @symbol ?assemble\@MapExtendingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &) const; + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@MapExtendingRecipe\@\@UEBAHXZ @@ -55,6 +55,11 @@ class MapExtendingRecipe : public Recipe { * @symbol ?getResultItem\@MapExtendingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; + /** + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); /** * @vftbl 6 * @symbol ?matches\@MapExtendingRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp b/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp index da4ea1c375..969616664d 100644 --- a/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp @@ -61,17 +61,17 @@ class MapInfoRequestPacket : public Packet { MCVAPI ~MapInfoRequestPacket(); #endif /** - * @symbol ??0MapInfoRequestPacket\@\@QEAA\@XZ + * @symbol ??0MapInfoRequestPacket\@\@QEAA\@UActorUniqueID\@\@AEAVMapItemSavedData\@\@\@Z */ - MCAPI MapInfoRequestPacket(); + MCAPI MapInfoRequestPacket(struct ActorUniqueID, class MapItemSavedData &); /** * @symbol ??0MapInfoRequestPacket\@\@QEAA\@UActorUniqueID\@\@\@Z */ MCAPI MapInfoRequestPacket(struct ActorUniqueID); /** - * @symbol ??0MapInfoRequestPacket\@\@QEAA\@UActorUniqueID\@\@AEAVMapItemSavedData\@\@\@Z + * @symbol ??0MapInfoRequestPacket\@\@QEAA\@XZ */ - MCAPI MapInfoRequestPacket(struct ActorUniqueID, class MapItemSavedData &); + MCAPI MapInfoRequestPacket(); /** * @symbol ?getMapId\@MapInfoRequestPacket\@\@QEBA?AUActorUniqueID\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/MapItemTrackedActor.hpp b/LiteLoader/include/llapi/mc/MapItemTrackedActor.hpp index 784f552158..fecd0155a4 100644 --- a/LiteLoader/include/llapi/mc/MapItemTrackedActor.hpp +++ b/LiteLoader/include/llapi/mc/MapItemTrackedActor.hpp @@ -43,10 +43,6 @@ struct UniqueId { * @symbol ?getDecorationRotation\@MapItemTrackedActor\@\@QEAAMAEAVBlockSource\@\@\@Z */ MCAPI float getDecorationRotation(class BlockSource &); - /** - * @symbol ?getEntity\@MapItemTrackedActor\@\@QEAAPEAVActor\@\@AEAVBlockSource\@\@\@Z - */ - MCAPI class Actor * getEntity(class BlockSource &); /** * @symbol ?nextUpdatePacket\@MapItemTrackedActor\@\@QEAA?AV?$unique_ptr\@VPacket\@\@U?$default_delete\@VPacket\@\@\@std\@\@\@std\@\@AEBVMapItemSavedData\@\@\@Z */ @@ -55,9 +51,5 @@ struct UniqueId { * @symbol ?setNeedsResend\@MapItemTrackedActor\@\@QEAAXXZ */ MCAPI void setNeedsResend(); - /** - * @symbol ?setPixelDirty\@MapItemTrackedActor\@\@QEAAXII\@Z - */ - MCAPI void setPixelDirty(unsigned int, unsigned int); }; diff --git a/LiteLoader/include/llapi/mc/MapLockingRecipe.hpp b/LiteLoader/include/llapi/mc/MapLockingRecipe.hpp index 754d6417f3..4db3b151da 100644 --- a/LiteLoader/include/llapi/mc/MapLockingRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MapLockingRecipe.hpp @@ -37,9 +37,9 @@ class MapLockingRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@MapLockingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @symbol ?assemble\@MapLockingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &) const; + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@MapLockingRecipe\@\@UEBAHXZ @@ -55,6 +55,11 @@ class MapLockingRecipe : public Recipe { * @symbol ?getResultItem\@MapLockingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; + /** + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); /** * @vftbl 6 * @symbol ?matches\@MapLockingRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/MapUpgradingRecipe.hpp b/LiteLoader/include/llapi/mc/MapUpgradingRecipe.hpp index f396c3f499..8f0150f1c9 100644 --- a/LiteLoader/include/llapi/mc/MapUpgradingRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MapUpgradingRecipe.hpp @@ -37,9 +37,9 @@ class MapUpgradingRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@MapUpgradingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @symbol ?assemble\@MapUpgradingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &) const; + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@MapUpgradingRecipe\@\@UEBAHXZ @@ -55,6 +55,11 @@ class MapUpgradingRecipe : public Recipe { * @symbol ?getResultItem\@MapUpgradingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; + /** + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); /** * @vftbl 6 * @symbol ?matches\@MapUpgradingRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/Matrix.hpp b/LiteLoader/include/llapi/mc/Matrix.hpp index 84ba131125..dd103f7f53 100644 --- a/LiteLoader/include/llapi/mc/Matrix.hpp +++ b/LiteLoader/include/llapi/mc/Matrix.hpp @@ -29,9 +29,17 @@ class Matrix { #endif public: + /** + * @symbol ??0Matrix\@\@QEAA\@AEBU?$qua\@M$0A\@\@glm\@\@\@Z + */ + MCAPI Matrix(struct glm::qua const &); /** * @symbol ?transform3\@Matrix\@\@QEBAXAEAU?$vec\@$02M$0A\@\@glm\@\@AEAM\@Z */ MCAPI void transform3(struct glm::vec<3, float, 0> &, float &) const; + /** + * @symbol ?IDENTITY\@Matrix\@\@2V1\@B + */ + MCAPI static class Matrix const IDENTITY; }; diff --git a/LiteLoader/include/llapi/mc/MeCommand.hpp b/LiteLoader/include/llapi/mc/MeCommand.hpp index f888723310..db5b61d00e 100644 --- a/LiteLoader/include/llapi/mc/MeCommand.hpp +++ b/LiteLoader/include/llapi/mc/MeCommand.hpp @@ -36,7 +36,7 @@ class MeCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@MeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; @@ -45,12 +45,4 @@ class MeCommand : public Command { */ MCAPI static void setup(class CommandRegistry &); -//private: - /** - * @symbol ?_sendMessage\@MeCommand\@\@AEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUCommandOriginIdentity\@\@AEBVLevel\@\@\@Z - */ - MCAPI void _sendMessage(std::string const &, struct CommandOriginIdentity const &, class Level const &) const; - -private: - }; diff --git a/LiteLoader/include/llapi/mc/MelonBlock.hpp b/LiteLoader/include/llapi/mc/MelonBlock.hpp index 701ec2a056..3df1130923 100644 --- a/LiteLoader/include/llapi/mc/MelonBlock.hpp +++ b/LiteLoader/include/llapi/mc/MelonBlock.hpp @@ -181,20 +181,20 @@ class MelonBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,32 +206,37 @@ class MelonBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@MelonBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@MelonBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/MerchantRecipe.hpp b/LiteLoader/include/llapi/mc/MerchantRecipe.hpp index dcebfcb7b1..b4cfb3171d 100644 --- a/LiteLoader/include/llapi/mc/MerchantRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MerchantRecipe.hpp @@ -51,18 +51,14 @@ class MerchantRecipe { * @symbol ??0MerchantRecipe\@\@QEAA\@AEBVItemInstance\@\@00\@Z */ MCAPI MerchantRecipe(class ItemInstance const &, class ItemInstance const &, class ItemInstance const &); - /** - * @symbol ??0MerchantRecipe\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI MerchantRecipe(class MerchantRecipe const &); - /** - * @symbol ??0MerchantRecipe\@\@QEAA\@PEBVCompoundTag\@\@\@Z - */ - MCAPI MerchantRecipe(class CompoundTag const *); /** * @symbol ??0MerchantRecipe\@\@QEAA\@AEBVItemInstance\@\@0\@Z */ MCAPI MerchantRecipe(class ItemInstance const &, class ItemInstance const &); + /** + * @symbol ??0MerchantRecipe\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI MerchantRecipe(class MerchantRecipe const &); /** * @symbol ?calculateDemandPrices\@MerchantRecipe\@\@QEAAXHHH_N\@Z */ @@ -95,10 +91,6 @@ class MerchantRecipe { * @symbol ?getMaxUses\@MerchantRecipe\@\@QEBAHXZ */ MCAPI int getMaxUses() const; - /** - * @symbol ?getNetId\@MerchantRecipe\@\@QEBAAEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@XZ - */ - MCAPI class TypedServerNetId const & getNetId() const; /** * @symbol ?getSellItem\@MerchantRecipe\@\@QEBAAEBVItemInstance\@\@XZ */ @@ -139,10 +131,6 @@ class MerchantRecipe { * @symbol ?isSame\@MerchantRecipe\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool isSame(class MerchantRecipe const &) const; - /** - * @symbol ?isSameButBetter\@MerchantRecipe\@\@QEBA_NAEAV1\@\@Z - */ - MCAPI bool isSameButBetter(class MerchantRecipe &) const; /** * @symbol ?legacyCalculateDemandPrices\@MerchantRecipe\@\@QEAAXHH\@Z */ @@ -163,10 +151,6 @@ class MerchantRecipe { * @symbol ?setMaxUses\@MerchantRecipe\@\@QEAAXH\@Z */ MCAPI void setMaxUses(int); - /** - * @symbol ?setNetId\@MerchantRecipe\@\@QEAAXAEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z - */ - MCAPI void setNetId(class TypedServerNetId const &); /** * @symbol ?setPriceMultiplierA\@MerchantRecipe\@\@QEAAXM\@Z */ diff --git a/LiteLoader/include/llapi/mc/MessagingCommand.hpp b/LiteLoader/include/llapi/mc/MessagingCommand.hpp index 1b51116181..168f0bfd39 100644 --- a/LiteLoader/include/llapi/mc/MessagingCommand.hpp +++ b/LiteLoader/include/llapi/mc/MessagingCommand.hpp @@ -52,13 +52,13 @@ class MessagingCommand : public Command { */ MCAPI bool checkChatPermissions(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?checkMutedAndSendToastIfMuted\@MessagingCommand\@\@IEBAXAEBVPlayer\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?checkMutedAndSendToastIfMuted\@MessagingCommand\@\@KAXAEBVPlayer\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ - MCAPI void checkMutedAndSendToastIfMuted(class Player const &, std::vector const &) const; + MCAPI static void checkMutedAndSendToastIfMuted(class Player const &, std::vector const &); /** - * @symbol ?checkMutedAndSendToastIfMuted\@MessagingCommand\@\@IEBAXAEBUCommandOriginIdentity\@\@AEBVLevel\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?checkMutedAndSendToastIfMuted\@MessagingCommand\@\@KAXAEBUCommandOriginIdentity\@\@AEBVLevel\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ - MCAPI void checkMutedAndSendToastIfMuted(struct CommandOriginIdentity const &, class Level const &, std::vector const &) const; + MCAPI static void checkMutedAndSendToastIfMuted(struct CommandOriginIdentity const &, class Level const &, std::vector const &); protected: diff --git a/LiteLoader/include/llapi/mc/MetalBlock.hpp b/LiteLoader/include/llapi/mc/MetalBlock.hpp index 46cb93ce93..e5120f5c29 100644 --- a/LiteLoader/include/llapi/mc/MetalBlock.hpp +++ b/LiteLoader/include/llapi/mc/MetalBlock.hpp @@ -176,20 +176,20 @@ class MetalBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,25 +201,30 @@ class MetalBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); /** * @symbol ??0MetalBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/Minecart.hpp b/LiteLoader/include/llapi/mc/Minecart.hpp index 37a63913d8..ea31dfa381 100644 --- a/LiteLoader/include/llapi/mc/Minecart.hpp +++ b/LiteLoader/include/llapi/mc/Minecart.hpp @@ -217,7 +217,7 @@ class Minecart : public Actor { virtual void destroy(class ActorDamageSource const &, bool); /** * @vftbl 277 - * @symbol ?getType\@MinecartRideable\@\@UEAA?AW4MinecartType\@\@XZ + * @symbol ?getType\@MinecartHopper\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType() = 0; /** @@ -275,10 +275,6 @@ class Minecart : public Actor { * @symbol ?preNormalTick\@Minecart\@\@QEAA?AVBlockPos\@\@XZ */ MCAPI class BlockPos preNormalTick(); - /** - * @symbol ?setCustomDisplay\@Minecart\@\@QEAAX_N\@Z - */ - MCAPI void setCustomDisplay(bool); /** * @symbol ?setDisplayBlock\@Minecart\@\@QEAAXAEBVBlock\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MinecartBlockCommandOrigin.hpp b/LiteLoader/include/llapi/mc/MinecartBlockCommandOrigin.hpp index f5eeb55e49..0e8266d11a 100644 --- a/LiteLoader/include/llapi/mc/MinecartBlockCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/MinecartBlockCommandOrigin.hpp @@ -95,9 +95,5 @@ class MinecartBlockCommandOrigin : public BlockCommandOrigin { * @symbol ??0MinecartBlockCommandOrigin\@\@QEAA\@AEAVBlockSource\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI MinecartBlockCommandOrigin(class BlockSource &, struct ActorUniqueID const &); - /** - * @symbol ?load\@MinecartBlockCommandOrigin\@\@SA?AV?$unique_ptr\@VMinecartBlockCommandOrigin\@\@U?$default_delete\@VMinecartBlockCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z - */ - MCAPI static std::unique_ptr load(class CompoundTag const &, class Level &); }; diff --git a/LiteLoader/include/llapi/mc/MinecartComeOffRailSystem.hpp b/LiteLoader/include/llapi/mc/MinecartComeOffRailSystem.hpp index 5fb0f42cca..d38fb64676 100644 --- a/LiteLoader/include/llapi/mc/MinecartComeOffRailSystem.hpp +++ b/LiteLoader/include/llapi/mc/MinecartComeOffRailSystem.hpp @@ -36,4 +36,12 @@ class MinecartComeOffRailSystem { */ MCAPI static struct TickingSystemWithInfo createSystem(); +//private: + /** + * @symbol ?_tickMinecartComeOffRailSystem\@MinecartComeOffRailSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Exclude\@USnapOnRailComponent\@\@\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBVRailMovementComponent\@\@UStateVectorComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@\@Z + */ + MCAPI static void _tickMinecartComeOffRailSystem(class ViewT, struct Include>, class RailMovementComponent const, struct StateVectorComponent, class Optional const>>, class EntityModifierT); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/MinecartItem.hpp b/LiteLoader/include/llapi/mc/MinecartItem.hpp index 8e20afbe83..a52696839f 100644 --- a/LiteLoader/include/llapi/mc/MinecartItem.hpp +++ b/LiteLoader/include/llapi/mc/MinecartItem.hpp @@ -113,9 +113,9 @@ class MinecartItem : public Item { virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** * @vftbl 132 - * @symbol ?_useOn\@MinecartItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@MinecartItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0MinecartItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4MinecartType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MinecartMoveAlongRailSystem.hpp b/LiteLoader/include/llapi/mc/MinecartMoveAlongRailSystem.hpp index a214b6575f..7557494f9d 100644 --- a/LiteLoader/include/llapi/mc/MinecartMoveAlongRailSystem.hpp +++ b/LiteLoader/include/llapi/mc/MinecartMoveAlongRailSystem.hpp @@ -61,6 +61,10 @@ class MinecartMoveAlongRailSystem { * @symbol ?_preRailMovementCalculateMinecartPositionSystem\@MinecartMoveAlongRailSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUOffsetsComponent\@\@AEBUStateVectorComponent\@\@AEAUFallDistanceComponent\@\@AEAUSnapOnRailComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UActorSetPositionRequestComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI static void _preRailMovementCalculateMinecartPositionSystem(class StrictEntityContext const &, struct OffsetsComponent const &, struct StateVectorComponent const &, struct FallDistanceComponent &, struct SnapOnRailComponent &, class EntityModifierT, class IConstBlockSource const &); + /** + * @symbol ?_tickCalculateRailMovementSystem\@MinecartMoveAlongRailSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBVRailMovementComponent\@\@USnapOnRailComponent\@\@UStateVectorComponent\@\@V?$Optional\@$$CBUVehicleComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@$$CBUActorRotationComponent\@\@$$CBULocalMoveVelocityComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@\@Z + */ + MCAPI static void _tickCalculateRailMovementSystem(class ViewT>, class ViewT>, struct ActorRotationComponent const, struct LocalMoveVelocityComponent const>, class EntityModifierT); private: diff --git a/LiteLoader/include/llapi/mc/MinecartPreNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/MinecartPreNormalTickSystem.hpp index 53993d6db7..a94c238f7c 100644 --- a/LiteLoader/include/llapi/mc/MinecartPreNormalTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/MinecartPreNormalTickSystem.hpp @@ -37,6 +37,10 @@ class MinecartPreNormalTickSystem { * @symbol ?_doMinecartPreNormalTickSystem\@MinecartPreNormalTickSystem\@\@CAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMinecartPreNormalTickBlockPosComponent\@\@\@\@\@Z */ MCAPI static void _doMinecartPreNormalTickSystem(class StrictEntityContext &, class ActorOwnerComponent &, class EntityModifierT); + /** + * @symbol ?_tickMinecartPreNormalTickSystem\@MinecartPreNormalTickSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UMinecartFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMinecartPreNormalTickBlockPosComponent\@\@\@\@\@Z + */ + MCAPI static void _tickMinecartPreNormalTickSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>, class EntityModifierT); private: diff --git a/LiteLoader/include/llapi/mc/Minecraft.hpp b/LiteLoader/include/llapi/mc/Minecraft.hpp index 193cc70ee5..06fa9d721a 100644 --- a/LiteLoader/include/llapi/mc/Minecraft.hpp +++ b/LiteLoader/include/llapi/mc/Minecraft.hpp @@ -141,9 +141,9 @@ class Minecraft { */ MCAPI bool hasCommands(); /** - * @symbol ?hostMultiplayer\@Minecraft\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$pair\@V?$unique_ptr\@VLevel\@\@U?$default_delete\@VLevel\@\@\@std\@\@\@std\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@3\@PEAVPlayer\@\@AEBVUUID\@mce\@\@V?$unique_ptr\@VNetEventCallback\@\@U?$default_delete\@VNetEventCallback\@\@\@std\@\@\@3\@H_N5AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@V23\@AEBUConnectionDefinition\@\@AEBV?$unordered_map\@UPackIdVersion\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@UPackIdVersion\@\@\@3\@U?$equal_to\@UPackIdVersion\@\@\@3\@V?$allocator\@U?$pair\@$$CBUPackIdVersion\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@3\@AEAVScheduler\@\@PEAVTextFilteringProcessor\@\@\@Z + * @symbol ?hostMultiplayer\@Minecraft\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$pair\@V?$unique_ptr\@VLevel\@\@U?$default_delete\@VLevel\@\@\@std\@\@\@std\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@3\@PEAVPlayer\@\@AEBVUUID\@mce\@\@V?$unique_ptr\@VNetEventCallback\@\@U?$default_delete\@VNetEventCallback\@\@\@std\@\@\@3\@H_N5AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@V23\@AEBUConnectionDefinition\@\@AEBV?$unordered_map\@UPackIdVersion\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@UPackIdVersion\@\@\@3\@U?$equal_to\@UPackIdVersion\@\@\@3\@V?$allocator\@U?$pair\@$$CBUPackIdVersion\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@3\@AEAVScheduler\@\@PEAVTextFilteringProcessor\@\@AEBUNetworkPermissions\@\@\@Z */ - MCAPI bool hostMultiplayer(std::string const &, struct std::pair, class OwnerPtrT>, class Player *, class mce::UUID const &, std::unique_ptr, int, bool, bool, std::vector const &, std::string, struct ConnectionDefinition const &, class std::unordered_map, struct std::equal_to, class std::allocator>> const &, class Scheduler &, class TextFilteringProcessor *); + MCAPI bool hostMultiplayer(std::string const &, struct std::pair, class OwnerPtrT>, class Player *, class mce::UUID const &, std::unique_ptr, int, bool, bool, std::vector const &, std::string, struct ConnectionDefinition const &, class std::unordered_map, struct std::equal_to, class std::allocator>> const &, class Scheduler &, class TextFilteringProcessor *, struct NetworkPermissions const &); /** * @symbol ?init\@Minecraft\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/MinecraftCommands.hpp b/LiteLoader/include/llapi/mc/MinecraftCommands.hpp index 00509d35ce..29b0822e3a 100644 --- a/LiteLoader/include/llapi/mc/MinecraftCommands.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftCommands.hpp @@ -112,14 +112,14 @@ class MinecraftCommands { * @symbol ?runCommand\@MinecraftCommands\@\@QEAAXAEBVHashedString\@\@AEAVCommandOrigin\@\@W4CurrentCmdVersion\@\@\@Z */ MCAPI void runCommand(class HashedString const &, class CommandOrigin &, enum class CurrentCmdVersion); - /** - * @symbol ?runOrDeferCommand\@MinecraftCommands\@\@QEAAXV?$not_null\@PEAVCommand\@\@\@gsl\@\@AEAVCommandOrigin\@\@W4CurrentCmdVersion\@\@\@Z - */ - MCAPI void runOrDeferCommand(class gsl::not_null, class CommandOrigin &, enum class CurrentCmdVersion); /** * @symbol ?runOrDeferCommand\@MinecraftCommands\@\@QEAAXAEBVHashedString\@\@AEAVCommandOrigin\@\@W4CurrentCmdVersion\@\@\@Z */ MCAPI void runOrDeferCommand(class HashedString const &, class CommandOrigin &, enum class CurrentCmdVersion); + /** + * @symbol ?runOrDeferCommand\@MinecraftCommands\@\@QEAAXV?$not_null\@PEAVCommand\@\@\@gsl\@\@AEAVCommandOrigin\@\@W4CurrentCmdVersion\@\@\@Z + */ + MCAPI void runOrDeferCommand(class gsl::not_null, class CommandOrigin &, enum class CurrentCmdVersion); /** * @symbol ?setRegistryNetworkUpdateCallback\@MinecraftCommands\@\@QEBAXV?$function\@$$A6AXAEBVPacket\@\@\@Z\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MinecraftEventing.hpp b/LiteLoader/include/llapi/mc/MinecraftEventing.hpp index a493bf7435..168b6c748b 100644 --- a/LiteLoader/include/llapi/mc/MinecraftEventing.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftEventing.hpp @@ -55,6 +55,10 @@ enum class AcquisitionMethod; * @symbol ?fileEventCloudWorldPullFailed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z */ MCVAPI void fileEventCloudWorldPullFailed(std::string const &, std::string const &, bool); + /** + * @symbol ?fireBannedSkinVerificationEvent\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1_N\@Z + */ + MCVAPI void fireBannedSkinVerificationEvent(unsigned int const &, std::string const &, std::string const &, bool); /** * @symbol ?fireChatUsedEvent\@MinecraftEventing\@\@UEAAXI_N\@Z */ @@ -72,9 +76,9 @@ enum class AcquisitionMethod; */ MCVAPI void fireClubsEngagementEvent(enum class IMinecraftEventing::ClubsEngagementAction, enum class IMinecraftEventing::ClubsEngagementTargetType, char const *, struct Realms::RealmId, std::string const &); /** - * @symbol ?fireClubsOpenFeedScreenEvent\@MinecraftEventing\@\@UEAAXW4ClubsFeedScreenSource\@IMinecraftEventing\@\@URealmId\@Realms\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireClubsOpenFeedScreenEvent\@MinecraftEventing\@\@UEAAXW4ClubsFeedScreenSource\@IMinecraftEventing\@\@URealmId\@Realms\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCVAPI void fireClubsOpenFeedScreenEvent(enum class IMinecraftEventing::ClubsFeedScreenSource, struct Realms::RealmId, std::string const &); + MCVAPI void fireClubsOpenFeedScreenEvent(enum class IMinecraftEventing::ClubsFeedScreenSource, struct Realms::RealmId, std::string const &, int); /** * @symbol ?fireCodeCommandButtonPressed\@MinecraftEventing\@\@UEAAXXZ */ @@ -332,17 +336,17 @@ enum class AcquisitionMethod; */ MCVAPI void fireEventEntitySpawned(class Player *, int, unsigned int); /** - * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAXHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAX_N0AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCVAPI void fireEventGameRulesUpdated(int, int, std::string const &); + MCVAPI void fireEventGameRulesUpdated(bool, bool, std::string const &); /** * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAXMMAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventGameRulesUpdated(float, float, std::string const &); /** - * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAX_N0AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAXHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCVAPI void fireEventGameRulesUpdated(bool, bool, std::string const &); + MCVAPI void fireEventGameRulesUpdated(int, int, std::string const &); /** * @symbol ?fireEventGoogleAccountHoldWarning\@MinecraftEventing\@\@UEAAX_N\@Z */ @@ -355,6 +359,10 @@ enum class AcquisitionMethod; * @symbol ?fireEventHowToPlayTopicChanged\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4InputMode\@\@\@Z */ MCVAPI void fireEventHowToPlayTopicChanged(std::string const &, enum class InputMode); + /** + * @symbol ?fireEventHttpClientError\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCVAPI void fireEventHttpClientError(std::string const &); /** * @symbol ?fireEventIAPPurchaseAttempt\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVOffer\@\@W4PurchasePath\@\@\@Z */ @@ -567,14 +575,14 @@ enum class AcquisitionMethod; * @symbol ?fireEventPlayerDamaged\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@W4ActorDamageCause\@\@\@Z */ MCVAPI void fireEventPlayerDamaged(class Player *, enum class ActorDamageCause); - /** - * @symbol ?fireEventPlayerJoinWorld\@MinecraftEventing\@\@UEAAXAEBIW4SubClientId\@\@W4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4TransportLayer\@\@\@Z - */ - MCVAPI void fireEventPlayerJoinWorld(unsigned int const &, enum class SubClientId, enum class IConnectionEventing::PlayerJoinWorldAttemptState, int, enum class TransportLayer); /** * @symbol ?fireEventPlayerJoinWorld\@MinecraftEventing\@\@UEAAXAEBIW4SubClientId\@\@W4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4DisconnectFailReason\@Connection\@\@W4TransportLayer\@\@\@Z */ MCVAPI void fireEventPlayerJoinWorld(unsigned int const &, enum class SubClientId, enum class IConnectionEventing::PlayerJoinWorldAttemptState, int, enum class Connection::DisconnectFailReason, enum class TransportLayer); + /** + * @symbol ?fireEventPlayerJoinWorld\@MinecraftEventing\@\@UEAAXAEBIW4SubClientId\@\@W4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4TransportLayer\@\@\@Z + */ + MCVAPI void fireEventPlayerJoinWorld(unsigned int const &, enum class SubClientId, enum class IConnectionEventing::PlayerJoinWorldAttemptState, int, enum class TransportLayer); /** * @symbol ?fireEventPlayerKicked\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ @@ -708,9 +716,9 @@ enum class AcquisitionMethod; */ MCVAPI void fireEventScreenChanged(unsigned int const &, std::string const &, class std::unordered_map, struct std::equal_to, class std::allocator>> const &); /** - * @symbol ?fireEventScreenLoaded\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@NNN\@Z + * @symbol ?fireEventScreenLoaded\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@NNNN\@Z */ - MCVAPI void fireEventScreenLoaded(unsigned int const &, std::string const &, double, double, double); + MCVAPI void fireEventScreenLoaded(unsigned int const &, std::string const &, double, double, double, double); /** * @symbol ?fireEventScriptDebuggerConnect\@MinecraftEventing\@\@UEAAX_N\@Z */ @@ -975,6 +983,10 @@ enum class AcquisitionMethod; * @symbol ?fireIDESelected\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireIDESelected(std::string const &) const; + /** + * @symbol ?fireIgnoredNotificationsEvent\@MinecraftEventing\@\@UEAAXW4IgnoredNotificationsType\@IMinecraftEventing\@\@HV?$set\@W4IgnoredNotificationSource\@IMinecraftEventing\@\@U?$less\@W4IgnoredNotificationSource\@IMinecraftEventing\@\@\@std\@\@V?$allocator\@W4IgnoredNotificationSource\@IMinecraftEventing\@\@\@4\@\@std\@\@\@Z + */ + MCVAPI void fireIgnoredNotificationsEvent(enum class IMinecraftEventing::IgnoredNotificationsType, int, class std::set, class std::allocator>); /** * @symbol ?fireInAppCodeBuilderActivated\@MinecraftEventing\@\@UEBAXW4OpenCodeMethod\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -1356,6 +1368,10 @@ enum class AcquisitionMethod; * @symbol ?mUseMethodMap\@MinecraftEventing\@\@0V?$unordered_map\@W4ItemUseMethod\@\@W4UseMethod\@MinecraftEventing\@\@U?$hash\@W4ItemUseMethod\@\@\@std\@\@U?$equal_to\@W4ItemUseMethod\@\@\@5\@V?$allocator\@U?$pair\@$$CBW4ItemUseMethod\@\@W4UseMethod\@MinecraftEventing\@\@\@std\@\@\@5\@\@std\@\@B */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> const mUseMethodMap; + /** + * @symbol ?sHeartbeatMutex\@MinecraftEventing\@\@0Vmutex\@std\@\@A + */ + MCAPI static class std::mutex sHeartbeatMutex; /** * @symbol ?sMutex\@MinecraftEventing\@\@0Vmutex\@std\@\@A */ diff --git a/LiteLoader/include/llapi/mc/MinecraftGameTest.hpp b/LiteLoader/include/llapi/mc/MinecraftGameTest.hpp index e0f28367ea..86336c002c 100644 --- a/LiteLoader/include/llapi/mc/MinecraftGameTest.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftGameTest.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "gametest.hpp" #include "BlockSourceListener.hpp" #define BEFORE_EXTRA @@ -184,6 +185,10 @@ class MinecraftGameTest : public BlockSourceListener { * @symbol ?runTests\@MinecraftGameTest\@\@QEAAAEBV?$vector\@V?$shared_ptr\@VBaseGameTestInstance\@gametest\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VBaseGameTestInstance\@gametest\@\@\@std\@\@\@2\@\@std\@\@AEAVDimension\@\@$$QEAUTestParameters\@gametest\@\@\@Z */ MCAPI std::vector> const & runTests(class Dimension &, struct gametest::TestParameters &&); + /** + * @symbol ?stopAllTests\@MinecraftGameTest\@\@QEAAXXZ + */ + MCAPI void stopAllTests(); //private: /** diff --git a/LiteLoader/include/llapi/mc/MinecraftGameTestBatchRunner.hpp b/LiteLoader/include/llapi/mc/MinecraftGameTestBatchRunner.hpp index 3c8e41fba4..885818d7b5 100644 --- a/LiteLoader/include/llapi/mc/MinecraftGameTestBatchRunner.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftGameTestBatchRunner.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "gametest.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -44,9 +45,5 @@ class MinecraftGameTestBatchRunner { * @symbol ?_runTest\@MinecraftGameTestBatchRunner\@\@MEAAXV?$shared_ptr\@VBaseGameTestInstance\@gametest\@\@\@std\@\@AEAVGameTestTicker\@gametest\@\@\@Z */ virtual void _runTest(class std::shared_ptr, class gametest::GameTestTicker &); - /** - * @symbol ??0MinecraftGameTestBatchRunner\@\@QEAA\@$$QEAV?$vector\@VGameTestBatch\@gametest\@\@V?$allocator\@VGameTestBatch\@gametest\@\@\@std\@\@\@std\@\@AEAVGameTestTicker\@gametest\@\@$$QEAUTestParameters\@4\@V?$unique_ptr\@VIGameTestHelperProvider\@gametest\@\@U?$default_delete\@VIGameTestHelperProvider\@gametest\@\@\@std\@\@\@2\@AEAVDimension\@\@\@Z - */ - MCAPI MinecraftGameTestBatchRunner(std::vector &&, class gametest::GameTestTicker &, struct gametest::TestParameters &&, std::unique_ptr, class Dimension &); }; diff --git a/LiteLoader/include/llapi/mc/MinecraftGameTestHelper.hpp b/LiteLoader/include/llapi/mc/MinecraftGameTestHelper.hpp index c4a500e613..8e382a8be5 100644 --- a/LiteLoader/include/llapi/mc/MinecraftGameTestHelper.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftGameTestHelper.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "gametest.hpp" #include "ScriptModuleMinecraft.hpp" #include "Bedrock.hpp" @@ -346,10 +347,6 @@ class MinecraftGameTestHelper { * @symbol ?onPlayerJump\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEAVMob\@\@H\@Z */ virtual class std::optional onPlayerJump(class Mob &, int); - /** - * @symbol ??0MinecraftGameTestHelper\@\@QEAA\@AEAVMinecraftGameTestInstance\@\@\@Z - */ - MCAPI MinecraftGameTestHelper(class MinecraftGameTestInstance &); //private: /** diff --git a/LiteLoader/include/llapi/mc/MinecraftGameTestHelperProvider.hpp b/LiteLoader/include/llapi/mc/MinecraftGameTestHelperProvider.hpp index e3e094637b..926fc1b97b 100644 --- a/LiteLoader/include/llapi/mc/MinecraftGameTestHelperProvider.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftGameTestHelperProvider.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "gametest.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/include/llapi/mc/MinecraftGameTestInstance.hpp b/LiteLoader/include/llapi/mc/MinecraftGameTestInstance.hpp index 8995627133..38231da686 100644 --- a/LiteLoader/include/llapi/mc/MinecraftGameTestInstance.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftGameTestInstance.hpp @@ -94,9 +94,5 @@ class MinecraftGameTestInstance { * @symbol ?getBlockSource\@MinecraftGameTestInstance\@\@UEBAAEAVBlockSource\@\@XZ */ virtual class BlockSource & getBlockSource() const; - /** - * @symbol ??0MinecraftGameTestInstance\@\@QEAA\@AEBVBaseGameTestFunction\@gametest\@\@V?$unique_ptr\@VIGameTestHelperProvider\@gametest\@\@U?$default_delete\@VIGameTestHelperProvider\@gametest\@\@\@std\@\@\@std\@\@AEAVDimension\@\@\@Z - */ - MCAPI MinecraftGameTestInstance(class gametest::BaseGameTestFunction const &, std::unique_ptr, class Dimension &); }; diff --git a/LiteLoader/include/llapi/mc/MinecraftReportGameListener.hpp b/LiteLoader/include/llapi/mc/MinecraftReportGameListener.hpp index e3912a8864..ce306e9e21 100644 --- a/LiteLoader/include/llapi/mc/MinecraftReportGameListener.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftReportGameListener.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "gametest.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/include/llapi/mc/MineshaftData.hpp b/LiteLoader/include/llapi/mc/MineshaftData.hpp deleted file mode 100644 index 645a211fb6..0000000000 --- a/LiteLoader/include/llapi/mc/MineshaftData.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file MineshaftData.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure MineshaftData. - * - */ -struct MineshaftData { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MINESHAFTDATA -public: - struct MineshaftData& operator=(struct MineshaftData const &) = delete; - MineshaftData(struct MineshaftData const &) = delete; - MineshaftData() = delete; -#endif - -public: - /** - * @symbol ??0MineshaftData\@\@QEAA\@_N\@Z - */ - MCAPI MineshaftData(bool); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MineshaftRoom.hpp b/LiteLoader/include/llapi/mc/MineshaftRoom.hpp index b964aa98eb..0dce16a758 100644 --- a/LiteLoader/include/llapi/mc/MineshaftRoom.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftRoom.hpp @@ -55,9 +55,5 @@ class MineshaftRoom : public MineshaftPiece { * @symbol ?postProcess\@MineshaftRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); - /** - * @symbol ??0MineshaftRoom\@\@QEAA\@AEAUMineshaftData\@\@HAEAVRandom\@\@HH\@Z - */ - MCAPI MineshaftRoom(struct MineshaftData &, int, class Random &, int, int); }; diff --git a/LiteLoader/include/llapi/mc/MineshaftUtil.hpp b/LiteLoader/include/llapi/mc/MineshaftUtil.hpp index e9d0dd5951..2cae9d3e33 100644 --- a/LiteLoader/include/llapi/mc/MineshaftUtil.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftUtil.hpp @@ -27,9 +27,5 @@ namespace MineshaftUtil { * @symbol ?fillColumnBetween\@MineshaftUtil\@\@YAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@HH\@Z */ MCAPI void fillColumnBetween(class BlockSource &, class Block const &, class BlockPos const &, int, int); - /** - * @symbol ?isCavesAndCliffs\@MineshaftUtil\@\@YA_NAEBVLevel\@\@\@Z - */ - MCAPI bool isCavesAndCliffs(class Level const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Mob.hpp b/LiteLoader/include/llapi/mc/Mob.hpp index 15be54ba86..f80ebb3344 100644 --- a/LiteLoader/include/llapi/mc/Mob.hpp +++ b/LiteLoader/include/llapi/mc/Mob.hpp @@ -832,14 +832,14 @@ struct JumpPreventionResult { */ MCVAPI ~Mob(); #endif - /** - * @symbol ??0Mob\@\@QEAA\@AEAVLevel\@\@AEAVEntityContext\@\@\@Z - */ - MCAPI Mob(class Level &, class EntityContext &); /** * @symbol ??0Mob\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Mob(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); + /** + * @symbol ??0Mob\@\@QEAA\@AEAVLevel\@\@AEAVEntityContext\@\@\@Z + */ + MCAPI Mob(class Level &, class EntityContext &); /** * @symbol ?_endJump\@Mob\@\@QEAAXXZ */ @@ -900,26 +900,26 @@ struct JumpPreventionResult { * @symbol ?getJumpEffectAmplifierValue\@Mob\@\@QEAAMXZ */ MCAPI float getJumpEffectAmplifierValue(); - /** - * @symbol ?getJumpMultiplier\@Mob\@\@QEAAMAEBVIConstBlockSource\@\@\@Z - */ - MCAPI float getJumpMultiplier(class IConstBlockSource const &); /** * @symbol ?getJumpMultiplier\@Mob\@\@QEAAMXZ */ MCAPI float getJumpMultiplier(); /** - * @symbol ?getJumpPower\@Mob\@\@QEBAMXZ + * @symbol ?getJumpMultiplier\@Mob\@\@QEAAMAEBVIConstBlockSource\@\@\@Z */ - MCAPI float getJumpPower() const; + MCAPI float getJumpMultiplier(class IConstBlockSource const &); /** - * @symbol ?getJumpPrevention\@Mob\@\@QEAA?AUJumpPreventionResult\@\@XZ + * @symbol ?getJumpPower\@Mob\@\@QEBAMXZ */ - MCAPI struct JumpPreventionResult getJumpPrevention(); + MCAPI float getJumpPower() const; /** * @symbol ?getJumpPrevention\@Mob\@\@QEAA?AUJumpPreventionResult\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI struct JumpPreventionResult getJumpPrevention(class IConstBlockSource const &); + /** + * @symbol ?getJumpPrevention\@Mob\@\@QEAA?AUJumpPreventionResult\@\@XZ + */ + MCAPI struct JumpPreventionResult getJumpPrevention(); /** * @symbol ?getJumpTicks\@Mob\@\@QEBAHXZ */ diff --git a/LiteLoader/include/llapi/mc/MobAnimation.hpp b/LiteLoader/include/llapi/mc/MobAnimation.hpp index e9b2ddc571..91b8856eb0 100644 --- a/LiteLoader/include/llapi/mc/MobAnimation.hpp +++ b/LiteLoader/include/llapi/mc/MobAnimation.hpp @@ -20,9 +20,29 @@ namespace MobAnimation { * @symbol ?decrementHurtTime\@MobAnimation\@\@YAXV?$not_null\@PEAUMobHurtTimeComponent\@\@\@gsl\@\@\@Z */ MCAPI void decrementHurtTime(class gsl::not_null); + /** + * @symbol ?getStandAnim\@MobAnimation\@\@YAMAEBVEntityContext\@\@\@Z + */ + MCAPI float getStandAnim(class EntityContext const &); + /** + * @symbol ?getStandAnimNewOld\@MobAnimation\@\@YA?AUInterpolationPair\@\@AEBVEntityContext\@\@\@Z + */ + MCAPI struct InterpolationPair getStandAnimNewOld(class EntityContext const &); /** * @symbol ?getWalkAnimSpeedNewOld\@MobAnimation\@\@YA?AUInterpolationPair\@\@V?$not_null\@PEBUActorWalkAnimationComponent\@\@\@gsl\@\@\@Z */ MCAPI struct InterpolationPair getWalkAnimSpeedNewOld(class gsl::not_null); + /** + * @symbol ?initializeHorse\@MobAnimation\@\@YAXAEAVEntityContext\@\@\@Z + */ + MCAPI void initializeHorse(class EntityContext &); + /** + * @symbol ?setStandAnim\@MobAnimation\@\@YAXAEAVEntityContext\@\@M\@Z + */ + MCAPI void setStandAnim(class EntityContext &, float); + /** + * @symbol ?setStandAnimO\@MobAnimation\@\@YAXAEAVEntityContext\@\@M\@Z + */ + MCAPI void setStandAnimO(class EntityContext &, float); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MobEffect.hpp b/LiteLoader/include/llapi/mc/MobEffect.hpp index 06316af89f..aaaeb258cd 100644 --- a/LiteLoader/include/llapi/mc/MobEffect.hpp +++ b/LiteLoader/include/llapi/mc/MobEffect.hpp @@ -121,14 +121,6 @@ class MobEffect { * @symbol ?addAttributeModifier\@MobEffect\@\@QEAAXAEBVAttribute\@\@V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z */ MCAPI void addAttributeModifier(class Attribute const &, class std::shared_ptr); - /** - * @symbol ?getColor\@MobEffect\@\@QEBAAEBVColor\@mce\@\@XZ - */ - MCAPI class mce::Color const & getColor() const; - /** - * @symbol ?getComponentName\@MobEffect\@\@QEBAAEBVHashedString\@\@XZ - */ - MCAPI class HashedString const & getComponentName() const; /** * @symbol ?getDescriptionId\@MobEffect\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ @@ -137,10 +129,6 @@ class MobEffect { * @symbol ?getDurationModifier\@MobEffect\@\@QEBAMXZ */ MCAPI float getDurationModifier() const; - /** - * @symbol ?getFactorCalculationData\@MobEffect\@\@QEBAAEBUFactorCalculationData\@1\@XZ - */ - MCAPI struct MobEffect::FactorCalculationData const & getFactorCalculationData() const; /** * @symbol ?getId\@MobEffect\@\@QEBAIXZ */ diff --git a/LiteLoader/include/llapi/mc/MobEffectInstance.hpp b/LiteLoader/include/llapi/mc/MobEffectInstance.hpp index 084dc245f3..b78833d75b 100644 --- a/LiteLoader/include/llapi/mc/MobEffectInstance.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectInstance.hpp @@ -31,33 +31,33 @@ char filler[122]; public: /** - * @symbol ??0MobEffectInstance\@\@QEAA\@IHH\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@IH\@Z */ - MCAPI MobEffectInstance(unsigned int, int, int); + MCAPI MobEffectInstance(unsigned int, int); /** - * @symbol ??0MobEffectInstance\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@AEBV0\@\@Z */ - MCAPI MobEffectInstance(class MobEffectInstance &&); + MCAPI MobEffectInstance(class MobEffectInstance const &); /** - * @symbol ??0MobEffectInstance\@\@QEAA\@IHH_N00\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@IHH\@Z */ - MCAPI MobEffectInstance(unsigned int, int, int, bool, bool, bool); + MCAPI MobEffectInstance(unsigned int, int, int); /** - * @symbol ??0MobEffectInstance\@\@QEAA\@I\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@IHHHHH_N00\@Z */ - MCAPI MobEffectInstance(unsigned int); + MCAPI MobEffectInstance(unsigned int, int, int, int, int, int, bool, bool, bool); /** - * @symbol ??0MobEffectInstance\@\@QEAA\@IH\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@IHH_N00\@Z */ - MCAPI MobEffectInstance(unsigned int, int); + MCAPI MobEffectInstance(unsigned int, int, int, bool, bool, bool); /** - * @symbol ??0MobEffectInstance\@\@QEAA\@IHHHHH_N00\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI MobEffectInstance(unsigned int, int, int, int, int, int, bool, bool, bool); + MCAPI MobEffectInstance(class MobEffectInstance &&); /** - * @symbol ??0MobEffectInstance\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@I\@Z */ - MCAPI MobEffectInstance(class MobEffectInstance const &); + MCAPI MobEffectInstance(unsigned int); /** * @symbol ?applyEffects\@MobEffectInstance\@\@QEAAXPEAVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MobEvent.hpp b/LiteLoader/include/llapi/mc/MobEvent.hpp index 04d266ef2c..b14f412140 100644 --- a/LiteLoader/include/llapi/mc/MobEvent.hpp +++ b/LiteLoader/include/llapi/mc/MobEvent.hpp @@ -28,14 +28,14 @@ class MobEvent { #endif public: - /** - * @symbol ??0MobEvent\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z - */ - MCAPI MobEvent(std::string, std::string, bool); /** * @symbol ??0MobEvent\@\@QEAA\@AEBV0\@\@Z */ MCAPI MobEvent(class MobEvent const &); + /** + * @symbol ??0MobEvent\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z + */ + MCAPI MobEvent(std::string, std::string, bool); /** * @symbol ?getLocalizableName\@MobEvent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/MobEventCommand.hpp b/LiteLoader/include/llapi/mc/MobEventCommand.hpp index 6dacae162b..606d31fa85 100644 --- a/LiteLoader/include/llapi/mc/MobEventCommand.hpp +++ b/LiteLoader/include/llapi/mc/MobEventCommand.hpp @@ -42,7 +42,7 @@ struct InitProxy { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@MobEventCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/MobIsImmobileFilterSystem.hpp b/LiteLoader/include/llapi/mc/MobIsImmobileFilterSystem.hpp index fbf6621da0..5226704047 100644 --- a/LiteLoader/include/llapi/mc/MobIsImmobileFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobIsImmobileFilterSystem.hpp @@ -28,6 +28,10 @@ class MobIsImmobileFilterSystem { * @symbol ?createSystem\@MobIsImmobileFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?tick\@MobIsImmobileFilterSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@$$CBV?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@$$CBV?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@$$CBV?$FlagComponent\@UMobFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsImmobileFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUAttributesComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsKnockedBackOnDeathFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@U?$Include\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UMobAllowStandSlidingFlag\@\@\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@$$CBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobIsImmobileFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void tick(class ViewT const, class FlagComponent const, class FlagComponent const>>, class ViewT>>, class ViewT>, struct AttributesComponent const, class Optional>>, class ViewT, class FlagComponent>, struct Exclude, class FlagComponent>>, class ViewT>, class ViewT const, class FlagComponent const>, class EntityModifierT>); //private: /** diff --git a/LiteLoader/include/llapi/mc/MobOnPlayerJumpSystem.hpp b/LiteLoader/include/llapi/mc/MobOnPlayerJumpSystem.hpp index f5fa8a66b5..189d631764 100644 --- a/LiteLoader/include/llapi/mc/MobOnPlayerJumpSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobOnPlayerJumpSystem.hpp @@ -41,6 +41,10 @@ class MobOnPlayerJumpSystem { * @symbol ?_tickMobOnPlayerJumpSystem\@MobOnPlayerJumpSystem\@\@CAXAEAVStrictEntityContext\@\@AEBUMobOnPlayerJumpRequestComponent\@\@AEAUJumpPendingScaleComponent\@\@AEAUSynchedActorDataComponent\@\@V?$Optional\@UHorseStandCounterComponent\@\@\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobAllowStandSlidingFlag\@\@\@\@V?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@UMobOnPlayerJumpRequestComponent\@\@\@\@_N\@Z */ MCAPI static void _tickMobOnPlayerJumpSystem(class StrictEntityContext &, struct MobOnPlayerJumpRequestComponent const &, struct JumpPendingScaleComponent &, struct SynchedActorDataComponent &, class Optional, class Optional, class EntityModifierT, class FlagComponent, class FlagComponent, struct MobOnPlayerJumpRequestComponent> &, bool); + /** + * @symbol ?tickMobOnPlayerJumpClientSystem\@MobOnPlayerJumpSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@$$CBUMobOnPlayerJumpRequestComponent\@\@UJumpPendingScaleComponent\@\@USynchedActorDataComponent\@\@V?$Optional\@UHorseStandCounterComponent\@\@\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobAllowStandSlidingFlag\@\@\@\@V?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@UMobOnPlayerJumpRequestComponent\@\@\@\@\@Z + */ + MCAPI static void tickMobOnPlayerJumpClientSystem(class ViewT, struct MobOnPlayerJumpRequestComponent const, struct JumpPendingScaleComponent, struct SynchedActorDataComponent, class Optional, class Optional>, class EntityModifierT, class FlagComponent, class FlagComponent, struct MobOnPlayerJumpRequestComponent>); private: diff --git a/LiteLoader/include/llapi/mc/MobPredicates.hpp b/LiteLoader/include/llapi/mc/MobPredicates.hpp new file mode 100644 index 0000000000..bd3adea695 --- /dev/null +++ b/LiteLoader/include/llapi/mc/MobPredicates.hpp @@ -0,0 +1,32 @@ +/** + * @file MobPredicates.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace MobPredicates { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?_mobHasFamilies\@MobPredicates\@\@YA_NAEBUActorTargetFilter\@\@AEAVActor\@\@\@Z + */ + MCAPI bool _mobHasFamilies(struct ActorTargetFilter const &, class Actor &); + /** + * @symbol ?_mobHoldingItem\@MobPredicates\@\@YA_NAEBUActorTargetFilter\@\@AEAVActor\@\@\@Z + */ + MCAPI bool _mobHoldingItem(struct ActorTargetFilter const &, class Actor &); + /** + * @symbol ?_mobWearingArmor\@MobPredicates\@\@YA_NAEBUActorTargetFilter\@\@AEAVActor\@\@\@Z + */ + MCAPI bool _mobWearingArmor(struct ActorTargetFilter const &, class Actor &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MobResetPassengerYRotLimitSystem.hpp b/LiteLoader/include/llapi/mc/MobResetPassengerYRotLimitSystem.hpp index ecc1163364..a46333f81f 100644 --- a/LiteLoader/include/llapi/mc/MobResetPassengerYRotLimitSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobResetPassengerYRotLimitSystem.hpp @@ -31,6 +31,10 @@ class MobResetPassengerYRotLimitSystem { * @symbol ?createSystem\@MobResetPassengerYRotLimitSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?tick\@MobResetPassengerYRotLimitSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@UPassengerYRotLimitComponent\@\@\@\@\@Z + */ + MCAPI static void tick(class ViewT>, struct PassengerYRotLimitComponent>); //private: /** diff --git a/LiteLoader/include/llapi/mc/MobSetPreviousRotSystem.hpp b/LiteLoader/include/llapi/mc/MobSetPreviousRotSystem.hpp index 5a1f5ac801..fc7a8b64e6 100644 --- a/LiteLoader/include/llapi/mc/MobSetPreviousRotSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobSetPreviousRotSystem.hpp @@ -31,6 +31,10 @@ class MobSetPreviousRotSystem { * @symbol ?createSystem\@MobSetPreviousRotSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?tick\@MobSetPreviousRotSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@UActorHeadRotationComponent\@\@UActorRotationComponent\@\@UMobBodyRotationComponent\@\@\@\@\@Z + */ + MCAPI static void tick(class ViewT, class FlagComponent>, struct ActorHeadRotationComponent, struct ActorRotationComponent, struct MobBodyRotationComponent>); //private: /** diff --git a/LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp b/LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp index 79f4a3c84a..5d6942a054 100644 --- a/LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp @@ -191,20 +191,20 @@ class MobSpawnerBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,32 +216,37 @@ class MobSpawnerBlock : public ActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@MobSpawnerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@MobSpawnerBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/MobTravelUpdateSpeedsSystem.hpp b/LiteLoader/include/llapi/mc/MobTravelUpdateSpeedsSystem.hpp index 24d914c7b9..3ceb0e7cc3 100644 --- a/LiteLoader/include/llapi/mc/MobTravelUpdateSpeedsSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobTravelUpdateSpeedsSystem.hpp @@ -28,5 +28,9 @@ class MobTravelUpdateSpeedsSystem { * @symbol ?createMobTravelUpdateSpeedsSystem\@MobTravelUpdateSpeedsSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createMobTravelUpdateSpeedsSystem(); + /** + * @symbol ?tickMobTravelUpdateSpeedsSystem\@MobTravelUpdateSpeedsSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UMobTravelComponent\@\@\@\@$$CBUSynchedActorDataComponent\@\@$$CBUVehicleComponent\@\@UFlySpeedComponent\@\@$$CBUAttributesComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UCanVehicleSprintFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAttributesComponent\@\@$$CBUMovementSpeedComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UMovementSpeedComponent\@\@ULocalMoveVelocityComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@\@\@\@Z + */ + MCAPI static void tickMobTravelUpdateSpeedsSystem(class ViewT, struct SynchedActorDataComponent const, struct VehicleComponent const, struct FlySpeedComponent, struct AttributesComponent const, class Optional const>>, class ViewT, class ViewT, class ViewT>>, class ViewT); }; diff --git a/LiteLoader/include/llapi/mc/MockUnknownBlockTypeRegistry.hpp b/LiteLoader/include/llapi/mc/MockUnknownBlockTypeRegistry.hpp deleted file mode 100644 index 1cbd6c89b5..0000000000 --- a/LiteLoader/include/llapi/mc/MockUnknownBlockTypeRegistry.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file MockUnknownBlockTypeRegistry.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class MockUnknownBlockTypeRegistry. - * - */ -class MockUnknownBlockTypeRegistry { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOCKUNKNOWNBLOCKTYPEREGISTRY -public: - class MockUnknownBlockTypeRegistry& operator=(class MockUnknownBlockTypeRegistry const &) = delete; - MockUnknownBlockTypeRegistry(class MockUnknownBlockTypeRegistry const &) = delete; - MockUnknownBlockTypeRegistry() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?getUnknownBlock\@MockUnknownBlockTypeRegistry\@\@UEAAAEBVBlock\@\@AEBVCompoundTag\@\@\@Z - */ - virtual class Block const & getUnknownBlock(class CompoundTag const &); - -}; diff --git a/LiteLoader/include/llapi/mc/MolangActorArrayPtr.hpp b/LiteLoader/include/llapi/mc/MolangActorArrayPtr.hpp index 4232ca1496..f0dae7b000 100644 --- a/LiteLoader/include/llapi/mc/MolangActorArrayPtr.hpp +++ b/LiteLoader/include/llapi/mc/MolangActorArrayPtr.hpp @@ -27,6 +27,10 @@ struct MolangActorArrayPtr { #endif public: + /** + * @symbol ??0MolangActorArrayPtr\@\@QEAA\@V?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI MolangActorArrayPtr(std::vector); /** * @symbol ??1MolangActorArrayPtr\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/MolangArrayVariable.hpp b/LiteLoader/include/llapi/mc/MolangArrayVariable.hpp index 4bd1848431..f6b92e93e6 100644 --- a/LiteLoader/include/llapi/mc/MolangArrayVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangArrayVariable.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class MolangArrayVariable { +struct MolangArrayVariable { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOLANGARRAYVARIABLE public: - class MolangArrayVariable& operator=(class MolangArrayVariable const &) = delete; - MolangArrayVariable(class MolangArrayVariable const &) = delete; + struct MolangArrayVariable& operator=(struct MolangArrayVariable const &) = delete; + MolangArrayVariable(struct MolangArrayVariable const &) = delete; MolangArrayVariable() = delete; #endif @@ -29,4 +29,4 @@ class MolangArrayVariable { */ MCAPI ~MolangArrayVariable(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MolangDescriptor.hpp b/LiteLoader/include/llapi/mc/MolangDescriptor.hpp index 5ef892fb9f..176e4505ea 100644 --- a/LiteLoader/include/llapi/mc/MolangDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/MolangDescriptor.hpp @@ -13,15 +13,15 @@ #undef BEFORE_EXTRA -class MolangDescriptor { +struct MolangDescriptor { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOLANGDESCRIPTOR public: - class MolangDescriptor& operator=(class MolangDescriptor const &) = delete; - MolangDescriptor(class MolangDescriptor const &) = delete; + struct MolangDescriptor& operator=(struct MolangDescriptor const &) = delete; + MolangDescriptor(struct MolangDescriptor const &) = delete; MolangDescriptor() = delete; #endif @@ -81,4 +81,4 @@ class MolangDescriptor { */ MCAPI static std::unique_ptr fromExpressionTag(std::string const &, enum class MolangVersion); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MolangEvalStackState.hpp b/LiteLoader/include/llapi/mc/MolangEvalStackState.hpp deleted file mode 100644 index 88d63f6025..0000000000 --- a/LiteLoader/include/llapi/mc/MolangEvalStackState.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file MolangEvalStackState.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -struct MolangEvalStackState { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOLANGEVALSTACKSTATE -public: - struct MolangEvalStackState& operator=(struct MolangEvalStackState const &) = delete; - MolangEvalStackState(struct MolangEvalStackState const &) = delete; - MolangEvalStackState() = delete; -#endif - -public: - /** - * @symbol ??0MolangEvalStackState\@\@QEAA\@AEAUMolangEvalParams\@\@\@Z - */ - MCAPI MolangEvalStackState(struct MolangEvalParams &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MolangMemberArray.hpp b/LiteLoader/include/llapi/mc/MolangMemberArray.hpp index 5d26c0112f..d05bdb64fd 100644 --- a/LiteLoader/include/llapi/mc/MolangMemberArray.hpp +++ b/LiteLoader/include/llapi/mc/MolangMemberArray.hpp @@ -29,6 +29,10 @@ struct MolangMemberArray { #endif public: + /** + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_TentacleAngleAndSwimRotation\@\@MM\@Z + */ + MCAPI MolangMemberArray(enum class MolangStruct_TentacleAngleAndSwimRotation, float, float); /** * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_BaseAndPattern\@\@HH\@Z */ @@ -53,14 +57,6 @@ struct MolangMemberArray { * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_SpeedAndDirection\@\@MAEBVVec3\@\@\@Z */ MCAPI MolangMemberArray(enum class MolangStruct_SpeedAndDirection, float, class Vec3 const &); - /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_TentacleAngleAndSwimRotation\@\@MM\@Z - */ - MCAPI MolangMemberArray(enum class MolangStruct_TentacleAngleAndSwimRotation, float, float); - /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_RotYAndPosY\@\@MM\@Z - */ - MCAPI MolangMemberArray(enum class MolangStruct_RotYAndPosY, float, float); /** * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_TRS\@\@$$QEAU0\@11\@Z */ @@ -77,6 +73,10 @@ struct MolangMemberArray { * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_UV\@\@MM\@Z */ MCAPI MolangMemberArray(enum class MolangStruct_UV, float, float); + /** + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_RotYAndPosY\@\@MM\@Z + */ + MCAPI MolangMemberArray(enum class MolangStruct_RotYAndPosY, float, float); /** * @symbol ?add\@MolangMemberArray\@\@QEAAXAEBVHashedString\@\@AEBUMolangScriptArg\@\@\@Z */ @@ -85,10 +85,6 @@ struct MolangMemberArray { * @symbol ?get\@MolangMemberArray\@\@QEBAPEBUMolangScriptArg\@\@AEBVHashedString\@\@\@Z */ MCAPI struct MolangScriptArg const * get(class HashedString const &) const; - /** - * @symbol ?getMembers\@MolangMemberArray\@\@QEBAPEBV?$vector\@UMolangMemberVariable\@\@V?$allocator\@UMolangMemberVariable\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector const * getMembers() const; /** * @symbol ?getOrAdd\@MolangMemberArray\@\@QEAAAEAUMolangScriptArg\@\@AEBVHashedString\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MolangScriptArg.hpp b/LiteLoader/include/llapi/mc/MolangScriptArg.hpp index ef17c548f5..15e2cf30f3 100644 --- a/LiteLoader/include/llapi/mc/MolangScriptArg.hpp +++ b/LiteLoader/include/llapi/mc/MolangScriptArg.hpp @@ -27,22 +27,22 @@ struct MolangScriptArg { #endif public: - /** - * @symbol ??0MolangScriptArg\@\@QEAA\@H\@Z - */ - MCAPI MolangScriptArg(int); /** * @symbol ??0MolangScriptArg\@\@QEAA\@AEBU0\@\@Z */ MCAPI MolangScriptArg(struct MolangScriptArg const &); + /** + * @symbol ??0MolangScriptArg\@\@QEAA\@H\@Z + */ + MCAPI MolangScriptArg(int); /** * @symbol ??0MolangScriptArg\@\@QEAA\@M\@Z */ MCAPI MolangScriptArg(float); /** - * @symbol ?clear\@MolangScriptArg\@\@QEAAXXZ + * @symbol ?getAsNonConstMolangMemberArray\@MolangScriptArg\@\@QEAAPEAUMolangMemberArray\@\@XZ */ - MCAPI void clear(); + MCAPI struct MolangMemberArray * getAsNonConstMolangMemberArray(); /** * @symbol ??4MolangScriptArg\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MolangVariable.hpp b/LiteLoader/include/llapi/mc/MolangVariable.hpp index 10c3365a70..fd7b2fc93d 100644 --- a/LiteLoader/include/llapi/mc/MolangVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangVariable.hpp @@ -37,14 +37,14 @@ class MolangVariable { * @symbol ??1MolangVariable\@\@QEAA\@XZ */ MCAPI ~MolangVariable(); - /** - * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@_KPEBD_N\@Z - */ - MCAPI static enum class MolangVariableIndex getVariableIndex(unsigned __int64, char const *, bool); /** * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@_K\@Z */ MCAPI static enum class MolangVariableIndex getVariableIndex(unsigned __int64); + /** + * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@_KPEBD_N\@Z + */ + MCAPI static enum class MolangVariableIndex getVariableIndex(unsigned __int64, char const *, bool); /** * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@AEBVHashedString\@\@\@Z */ @@ -53,10 +53,6 @@ class MolangVariable { * @symbol ?getVariableName\@MolangVariable\@\@SAAEBVHashedString\@\@W4MolangVariableIndex\@\@\@Z */ MCAPI static class HashedString const & getVariableName(enum class MolangVariableIndex); - /** - * @symbol ?initVariableMaps\@MolangVariable\@\@SAXXZ - */ - MCAPI static void initVariableMaps(); /** * @symbol ?processWaterMark\@MolangVariable\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/MolangVariableMap.hpp b/LiteLoader/include/llapi/mc/MolangVariableMap.hpp index 1d3341796f..86ce00b9b0 100644 --- a/LiteLoader/include/llapi/mc/MolangVariableMap.hpp +++ b/LiteLoader/include/llapi/mc/MolangVariableMap.hpp @@ -39,38 +39,10 @@ class MolangVariableMap { * @symbol ?clear\@MolangVariableMap\@\@QEAAAEAV1\@XZ */ MCAPI class MolangVariableMap & clear(); - /** - * @symbol ?getConstScriptArgReference\@MolangVariableMap\@\@QEBAPEBUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@\@Z - */ - MCAPI struct MolangScriptArg const * getConstScriptArgReference(enum class MolangVariableIndex const &) const; - /** - * @symbol ?getMolangVariable\@MolangVariableMap\@\@QEBAAEBUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@AEA_N\@Z - */ - MCAPI struct MolangScriptArg const & getMolangVariable(enum class MolangVariableIndex const &, bool &) const; /** * @symbol ?getMolangVariable\@MolangVariableMap\@\@QEBAAEBUMolangScriptArg\@\@_KPEBD\@Z */ MCAPI struct MolangScriptArg const & getMolangVariable(unsigned __int64, char const *) const; - /** - * @symbol ?getMolangVariable\@MolangVariableMap\@\@QEBAAEBUMolangScriptArg\@\@AEB_KAEA_N\@Z - */ - MCAPI struct MolangScriptArg const & getMolangVariable(unsigned __int64 const &, bool &) const; - /** - * @symbol ?getNonConstScriptArgReference\@MolangVariableMap\@\@QEAAPEAUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@\@Z - */ - MCAPI struct MolangScriptArg * getNonConstScriptArgReference(enum class MolangVariableIndex const &); - /** - * @symbol ?getOrAddNonConstScriptArgReference\@MolangVariableMap\@\@QEAAPEAUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@\@Z - */ - MCAPI struct MolangScriptArg * getOrAddNonConstScriptArgReference(enum class MolangVariableIndex const &); - /** - * @symbol ?getPublicMolangVariable\@MolangVariableMap\@\@QEBAAEBUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@AEA_N\@Z - */ - MCAPI struct MolangScriptArg const & getPublicMolangVariable(enum class MolangVariableIndex const &, bool &) const; - /** - * @symbol ?getVariables\@MolangVariableMap\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VMolangVariable\@\@U?$default_delete\@VMolangVariable\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VMolangVariable\@\@U?$default_delete\@VMolangVariable\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI std::vector> const & getVariables() const; /** * @symbol ??4MolangVariableMap\@\@QEAAAEAV0\@AEBV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MonsterAiStepSystem.hpp b/LiteLoader/include/llapi/mc/MonsterAiStepSystem.hpp index 16c05ed513..1a965ce463 100644 --- a/LiteLoader/include/llapi/mc/MonsterAiStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/MonsterAiStepSystem.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class MonsterAiStepSystem { +struct MonsterAiStepSystem { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_MONSTERAISTEPSYSTEM public: - class MonsterAiStepSystem& operator=(class MonsterAiStepSystem const &) = delete; - MonsterAiStepSystem(class MonsterAiStepSystem const &) = delete; + struct MonsterAiStepSystem& operator=(struct MonsterAiStepSystem const &) = delete; + MonsterAiStepSystem(struct MonsterAiStepSystem const &) = delete; MonsterAiStepSystem() = delete; #endif @@ -41,6 +41,11 @@ class MonsterAiStepSystem { virtual void __unk_vfn_2(); /** * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 * @symbol ?tick\@MonsterAiStepSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UBlazeFlag\@\@\@\@V?$FlagComponent\@ULavaSlimeFlag\@\@\@\@V?$FlagComponent\@UMonsterFlag\@\@\@\@\@\@U?$Read\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@UOffsetsComponent\@\@UStateVectorComponent\@\@\@\@U?$Write\@UNoActionTimeComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); @@ -53,4 +58,4 @@ class MonsterAiStepSystem { */ MCAPI static void tickMonsterAiStep(class StrictEntityContext const &, struct AABBShapeComponent const &, struct OffsetsComponent const &, struct StateVectorComponent const &, struct NoActionTimeComponent &, class ViewT>>, class ViewT>>, class IConstBlockSource const &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MonsterEggBlock.hpp b/LiteLoader/include/llapi/mc/MonsterEggBlock.hpp index b56f1ceb93..6e2725ca23 100644 --- a/LiteLoader/include/llapi/mc/MonsterEggBlock.hpp +++ b/LiteLoader/include/llapi/mc/MonsterEggBlock.hpp @@ -181,40 +181,40 @@ class MonsterEggBlock : public InfestedBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@MonsterEggBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@MonsterEggBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@MonsterEggBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 160 + * @vftbl 161 * @symbol ?tryGetUninfested\@MonsterEggBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetUninfested(class Block const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,25 +226,30 @@ class MonsterEggBlock : public InfestedBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0MonsterEggBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/MossBlock.hpp b/LiteLoader/include/llapi/mc/MossBlock.hpp index 492c02384d..b3a10d0e21 100644 --- a/LiteLoader/include/llapi/mc/MossBlock.hpp +++ b/LiteLoader/include/llapi/mc/MossBlock.hpp @@ -186,20 +186,20 @@ class MossBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,25 +211,30 @@ class MossBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); /** * @symbol ??0MossBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/Motive.hpp b/LiteLoader/include/llapi/mc/Motive.hpp index 1d6ba746e3..e8a1ff54aa 100644 --- a/LiteLoader/include/llapi/mc/Motive.hpp +++ b/LiteLoader/include/llapi/mc/Motive.hpp @@ -29,22 +29,10 @@ class Motive { #endif public: - /** - * @symbol ?getHeight\@Motive\@\@QEBAHXZ - */ - MCAPI int getHeight() const; /** * @symbol ?getName\@Motive\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const getName() const; - /** - * @symbol ?getWidth\@Motive\@\@QEBAHXZ - */ - MCAPI int getWidth() const; - /** - * @symbol ?isPublic\@Motive\@\@QEBA_NXZ - */ - MCAPI bool isPublic() const; /** * @symbol ?getAllMotivesAsList\@Motive\@\@SA?AV?$vector\@PEBVMotive\@\@V?$allocator\@PEBVMotive\@\@\@std\@\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp b/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp index bdb34730b1..482fec5cf3 100644 --- a/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp +++ b/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp @@ -60,13 +60,13 @@ class MoveActorAbsolutePacket : public Packet { */ MCVAPI ~MoveActorAbsolutePacket(); #endif - /** - * @symbol ??0MoveActorAbsolutePacket\@\@QEAA\@XZ - */ - MCAPI MoveActorAbsolutePacket(); /** * @symbol ??0MoveActorAbsolutePacket\@\@QEAA\@AEBVMoveActorAbsoluteData\@\@\@Z */ MCAPI MoveActorAbsolutePacket(class MoveActorAbsoluteData const &); + /** + * @symbol ??0MoveActorAbsolutePacket\@\@QEAA\@XZ + */ + MCAPI MoveActorAbsolutePacket(); }; diff --git a/LiteLoader/include/llapi/mc/MoveCollisionSystem.hpp b/LiteLoader/include/llapi/mc/MoveCollisionSystem.hpp index eabb9af633..47b83886b3 100644 --- a/LiteLoader/include/llapi/mc/MoveCollisionSystem.hpp +++ b/LiteLoader/include/llapi/mc/MoveCollisionSystem.hpp @@ -44,9 +44,14 @@ class MoveCollisionSystem { virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol ?tick\@MoveCollisionSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UTerrainSurfaceOffsetComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @symbol __unk_vfn_3 */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?tick\@MoveCollisionSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UPlayerGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UTerrainSurfaceOffsetComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + */ + virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** * @symbol ?createSideBySideSystem\@MoveCollisionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ @@ -56,8 +61,8 @@ class MoveCollisionSystem { */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?tickMoveCollisionSystem\@MoveCollisionSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEAUMoveRequestComponent\@\@AEAUTerrainSurfaceOffsetComponent\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UTerrainSurfaceOffsetComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?tickMoveCollisionSystem\@MoveCollisionSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEAUMoveRequestComponent\@\@AEAUTerrainSurfaceOffsetComponent\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UPlayerGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UTerrainSurfaceOffsetComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static void tickMoveCollisionSystem(class StrictEntityContext const &, struct AABBShapeComponent const &, struct MoveRequestComponent &, struct TerrainSurfaceOffsetComponent &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class IConstBlockSource const &); + MCAPI static void tickMoveCollisionSystem(class StrictEntityContext const &, struct AABBShapeComponent const &, struct MoveRequestComponent &, struct TerrainSurfaceOffsetComponent &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class IConstBlockSource const &); }; diff --git a/LiteLoader/include/llapi/mc/MoveInputHandler.hpp b/LiteLoader/include/llapi/mc/MoveInputHandler.hpp index 13b0953eed..57cfc52e6c 100644 --- a/LiteLoader/include/llapi/mc/MoveInputHandler.hpp +++ b/LiteLoader/include/llapi/mc/MoveInputHandler.hpp @@ -26,6 +26,7 @@ class MoveInputHandler : public MoveInput { public: class MoveInputHandler& operator=(class MoveInputHandler const &) = delete; MoveInputHandler(class MoveInputHandler const &) = delete; + MoveInputHandler() = delete; #endif public: @@ -99,51 +100,13 @@ class MoveInputHandler : public MoveInput { * @symbol ?getClientRawInputStateCopy\@MoveInputHandler\@\@UEBA?AUMoveInputState\@\@XZ */ virtual struct MoveInputState getClientRawInputStateCopy() const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVEINPUTHANDLER - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~MoveInputHandler(); -#endif - /** - * @symbol ?isAscendBlock\@MoveInputHandler\@\@QEBA_NXZ - */ - MCAPI bool isAscendBlock() const; - /** - * @symbol ?isDescendBlock\@MoveInputHandler\@\@QEBA_NXZ - */ - MCAPI bool isDescendBlock() const; /** * @symbol ?isSneakDown\@MoveInputHandler\@\@QEBA_NXZ */ MCAPI bool isSneakDown() const; - /** - * @symbol ?isSneakToggleButtonDown\@MoveInputHandler\@\@QEBA_NXZ - */ - MCAPI bool isSneakToggleButtonDown() const; /** * @symbol ?setInputState\@MoveInputHandler\@\@QEAAXAEAUMoveInputState\@\@\@Z */ MCAPI void setInputState(struct MoveInputState &); - /** - * @symbol ?wantsDownSlow\@MoveInputHandler\@\@QEBA_NXZ - */ - MCAPI bool wantsDownSlow() const; - /** - * @symbol ?wantsMoveForward\@MoveInputHandler\@\@QEBA_NXZ - */ - MCAPI bool wantsMoveForward() const; - /** - * @symbol ?wantsUpSlow\@MoveInputHandler\@\@QEBA_NXZ - */ - MCAPI bool wantsUpSlow() const; - -//protected: - /** - * @symbol ??0MoveInputHandler\@\@IEAA\@XZ - */ - MCAPI MoveInputHandler(); - -protected: }; diff --git a/LiteLoader/include/llapi/mc/MoveInputState.hpp b/LiteLoader/include/llapi/mc/MoveInputState.hpp index 7d274a79ef..ad714249d9 100644 --- a/LiteLoader/include/llapi/mc/MoveInputState.hpp +++ b/LiteLoader/include/llapi/mc/MoveInputState.hpp @@ -24,17 +24,9 @@ struct MoveInputState { #endif public: - /** - * @symbol ?clear\@MoveInputState\@\@QEAAX_N\@Z - */ - MCAPI void clear(bool); /** * @symbol ??8MoveInputState\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator==(struct MoveInputState const &) const; - /** - * @symbol ?wantsSneak\@MoveInputState\@\@QEBA_NXZ - */ - MCAPI bool wantsSneak() const; }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp b/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp index 181bb9b902..2ce1e7978a 100644 --- a/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp +++ b/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp @@ -100,13 +100,13 @@ class MovePlayerPacket : public Packet { * @symbol ??0MovePlayerPacket\@\@QEAA\@AEBVPlayer\@\@W4PositionMode\@PlayerPositionModeComponent\@\@HH\@Z */ MCAPI MovePlayerPacket(class Player const &, enum class PlayerPositionModeComponent::PositionMode, int, int); - /** - * @symbol ??0MovePlayerPacket\@\@QEAA\@AEBVPlayer\@\@AEBVVec3\@\@\@Z - */ - MCAPI MovePlayerPacket(class Player const &, class Vec3 const &); /** * @symbol ??0MovePlayerPacket\@\@QEAA\@XZ */ MCAPI MovePlayerPacket(); + /** + * @symbol ??0MovePlayerPacket\@\@QEAA\@AEBVPlayer\@\@AEBVVec3\@\@\@Z + */ + MCAPI MovePlayerPacket(class Player const &, class Vec3 const &); }; diff --git a/LiteLoader/include/llapi/mc/MoveRequestComponent.hpp b/LiteLoader/include/llapi/mc/MoveRequestComponent.hpp index cba8c98207..d8f0a9c101 100644 --- a/LiteLoader/include/llapi/mc/MoveRequestComponent.hpp +++ b/LiteLoader/include/llapi/mc/MoveRequestComponent.hpp @@ -31,9 +31,5 @@ struct MoveRequestComponent { * @symbol ??4MoveRequestComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct MoveRequestComponent & operator=(struct MoveRequestComponent &&); - /** - * @symbol ??1MoveRequestComponent\@\@QEAA\@XZ - */ - MCAPI ~MoveRequestComponent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystemFromActorContext.hpp b/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystemFromActorContext.hpp index e1ef6cc4c8..66ed693f2d 100644 --- a/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystemFromActorContext.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystemFromActorContext.hpp @@ -32,4 +32,12 @@ class MoveTowardsClosestSpaceSystemFromActorContext { */ MCAPI static struct TickingSystemWithInfo createSystem(); +//private: + /** + * @symbol ?tickSystem\@MoveTowardsClosestSpaceSystemFromActorContext\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@UShouldMoveTowardClosestSpaceFlagComponent\@\@\@\@VActorOwnerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UShouldMoveTowardClosestSpaceFlagComponent\@\@\@\@\@Z + */ + MCAPI static void tickSystem(class ViewT, struct ShouldMoveTowardClosestSpaceFlagComponent>, class ActorOwnerComponent>, class EntityModifierT); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/MoveTowardsDwellingRestrictionGoal.hpp b/LiteLoader/include/llapi/mc/MoveTowardsDwellingRestrictionGoal.hpp index af8659d79c..9b06d78cb9 100644 --- a/LiteLoader/include/llapi/mc/MoveTowardsDwellingRestrictionGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsDwellingRestrictionGoal.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "MoveTowardsRestrictionGoal.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +15,7 @@ * @brief MC class MoveTowardsDwellingRestrictionGoal. * */ -class MoveTowardsDwellingRestrictionGoal : public MoveTowardsRestrictionGoal { +class MoveTowardsDwellingRestrictionGoal { #define AFTER_EXTRA // Add Member There @@ -40,11 +39,21 @@ class MoveTowardsDwellingRestrictionGoal : public MoveTowardsRestrictionGoal { * @symbol ?canUse\@MoveTowardsDwellingRestrictionGoal\@\@UEAA_NXZ */ virtual bool canUse(); + /** + * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); /** * @vftbl 3 * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); /** * @vftbl 5 * @symbol __unk_vfn_5 diff --git a/LiteLoader/include/llapi/mc/MoveTowardsHomeRestrictionGoal.hpp b/LiteLoader/include/llapi/mc/MoveTowardsHomeRestrictionGoal.hpp index a0c0875bf3..9bac5f209b 100644 --- a/LiteLoader/include/llapi/mc/MoveTowardsHomeRestrictionGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsHomeRestrictionGoal.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "MoveTowardsRestrictionGoal.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +15,7 @@ * @brief MC class MoveTowardsHomeRestrictionGoal. * */ -class MoveTowardsHomeRestrictionGoal : public MoveTowardsRestrictionGoal { +class MoveTowardsHomeRestrictionGoal { #define AFTER_EXTRA // Add Member There @@ -40,11 +39,21 @@ class MoveTowardsHomeRestrictionGoal : public MoveTowardsRestrictionGoal { * @symbol ?canUse\@MoveTowardsHomeRestrictionGoal\@\@UEAA_NXZ */ virtual bool canUse(); + /** + * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); /** * @vftbl 3 * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); /** * @vftbl 5 * @symbol __unk_vfn_5 diff --git a/LiteLoader/include/llapi/mc/MoveTowardsRestrictionDefinition.hpp b/LiteLoader/include/llapi/mc/MoveTowardsRestrictionDefinition.hpp index 029da7d072..8f65cb6a6d 100644 --- a/LiteLoader/include/llapi/mc/MoveTowardsRestrictionDefinition.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsRestrictionDefinition.hpp @@ -25,19 +25,10 @@ class MoveTowardsRestrictionDefinition { public: class MoveTowardsRestrictionDefinition& operator=(class MoveTowardsRestrictionDefinition const &) = delete; MoveTowardsRestrictionDefinition(class MoveTowardsRestrictionDefinition const &) = delete; + MoveTowardsRestrictionDefinition() = delete; #endif public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVETOWARDSRESTRICTIONDEFINITION - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~MoveTowardsRestrictionDefinition(); -#endif - /** - * @symbol ??0MoveTowardsRestrictionDefinition\@\@QEAA\@XZ - */ - MCAPI MoveTowardsRestrictionDefinition(); /** * @symbol ?initialize\@MoveTowardsRestrictionDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVMoveTowardsRestrictionGoal\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MoveTowardsRestrictionGoal.hpp b/LiteLoader/include/llapi/mc/MoveTowardsRestrictionGoal.hpp index 02824d2365..7a9d0728b1 100644 --- a/LiteLoader/include/llapi/mc/MoveTowardsRestrictionGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsRestrictionGoal.hpp @@ -33,12 +33,12 @@ class MoveTowardsRestrictionGoal { * @vftbl 0 * @symbol __unk_vfn_0 */ - virtual void __unk_vfn_0(); + virtual void __unk_vfn_0() = 0; /** * @vftbl 1 - * @symbol ?canUse\@MoveTowardsDwellingRestrictionGoal\@\@UEAA_NXZ + * @symbol __unk_vfn_1 */ - virtual bool canUse() = 0; + virtual void __unk_vfn_1(); /** * @vftbl 2 * @symbol ?canContinueToUse\@MoveTowardsRestrictionGoal\@\@UEAA_NXZ @@ -54,37 +54,8 @@ class MoveTowardsRestrictionGoal { * @symbol ?start\@MoveTowardsRestrictionGoal\@\@UEAAXXZ */ virtual void start(); - /** - * @vftbl 5 - * @symbol __unk_vfn_5 - */ - virtual void __unk_vfn_5(); - /** - * @vftbl 6 - * @symbol __unk_vfn_6 - */ - virtual void __unk_vfn_6(); - /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MoveTowardsDwellingRestrictionGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - virtual void appendDebugInfo(std::string &) const = 0; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVETOWARDSRESTRICTIONGOAL - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~MoveTowardsRestrictionGoal(); -#endif - /** - * @symbol ??0MoveTowardsRestrictionGoal\@\@QEAA\@AEAVMob\@\@\@Z - */ - MCAPI MoveTowardsRestrictionGoal(class Mob &); //protected: - /** - * @symbol ?_getMob\@MoveTowardsRestrictionGoal\@\@IEBAAEBVMob\@\@XZ - */ - MCAPI class Mob const & _getMob() const; /** * @symbol ?_randomizeWantedPositionTowardsRestriction\@MoveTowardsRestrictionGoal\@\@IEAA_NAEBVVec3\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MovingBlock.hpp b/LiteLoader/include/llapi/mc/MovingBlock.hpp index 04d2ad69d7..936d942fb8 100644 --- a/LiteLoader/include/llapi/mc/MovingBlock.hpp +++ b/LiteLoader/include/llapi/mc/MovingBlock.hpp @@ -201,25 +201,25 @@ class MovingBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 142 - * @symbol ?getVisualShapeInWorld\@MovingBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 143 + * @symbol ?getVisualShapeInWorld\@MovingBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -231,30 +231,35 @@ class MovingBlock : public ActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 169 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 170 * @symbol ?onFallOn\@MovingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVINGBLOCK /** * @symbol ?pushesUpFallingBlocks\@MovingBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/MovingBlockActor.hpp b/LiteLoader/include/llapi/mc/MovingBlockActor.hpp index 6fb460e4cc..d35077ee70 100644 --- a/LiteLoader/include/llapi/mc/MovingBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/MovingBlockActor.hpp @@ -128,41 +128,13 @@ class MovingBlockActor : public BlockActor { * @symbol ?_validPistonPos\@MovingBlockActor\@\@QEBA_NAEBVIConstBlockSource\@\@\@Z */ MCAPI bool _validPistonPos(class IConstBlockSource const &) const; - /** - * @symbol ?aquireWrappedBlockActor\@MovingBlockActor\@\@QEAA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@XZ - */ - MCAPI class std::shared_ptr aquireWrappedBlockActor(); /** * @symbol ?getDrawPos\@MovingBlockActor\@\@QEBA?AVVec3\@\@AEBVIConstBlockSource\@\@M\@Z */ MCAPI class Vec3 getDrawPos(class IConstBlockSource const &, float) const; - /** - * @symbol ?getWrappedBlock\@MovingBlockActor\@\@QEBAAEBVBlock\@\@XZ - */ - MCAPI class Block const & getWrappedBlock() const; - /** - * @symbol ?getWrappedExtraBlock\@MovingBlockActor\@\@QEAAAEBVBlock\@\@XZ - */ - MCAPI class Block const & getWrappedExtraBlock(); /** * @symbol ?moveCollidedEntities\@MovingBlockActor\@\@QEAAXAEAVPistonBlockActor\@\@AEAVBlockSource\@\@\@Z */ MCAPI void moveCollidedEntities(class PistonBlockActor &, class BlockSource &); - /** - * @symbol ?registerPiston\@MovingBlockActor\@\@QEAAXAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI void registerPiston(class BlockSource const &, class BlockPos const &); - /** - * @symbol ?setWrappedBlock\@MovingBlockActor\@\@QEAAXAEBVBlock\@\@\@Z - */ - MCAPI void setWrappedBlock(class Block const &); - /** - * @symbol ?setWrappedBlockActor\@MovingBlockActor\@\@QEAAXV?$shared_ptr\@VBlockActor\@\@\@std\@\@\@Z - */ - MCAPI void setWrappedBlockActor(class std::shared_ptr); - /** - * @symbol ?setWrappedExtraBlock\@MovingBlockActor\@\@QEAAXAEBVBlock\@\@\@Z - */ - MCAPI void setWrappedExtraBlock(class Block const &); }; diff --git a/LiteLoader/include/llapi/mc/MudBlock.hpp b/LiteLoader/include/llapi/mc/MudBlock.hpp index 97db09e5b4..efa9a9a3ea 100644 --- a/LiteLoader/include/llapi/mc/MudBlock.hpp +++ b/LiteLoader/include/llapi/mc/MudBlock.hpp @@ -194,20 +194,20 @@ class MudBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -219,30 +219,35 @@ class MudBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 172 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?randomTick\@MudBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0MudBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/MultiRecipe.hpp b/LiteLoader/include/llapi/mc/MultiRecipe.hpp index 605221530b..494d23584b 100644 --- a/LiteLoader/include/llapi/mc/MultiRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MultiRecipe.hpp @@ -37,14 +37,25 @@ class MultiRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 5 - * @symbol ?isShapeless\@MultiRecipe\@\@EEBA_NXZ + * @symbol __unk_vfn_5 */ - virtual bool isShapeless() const; + virtual void __unk_vfn_5(); /** * @vftbl 9 * @symbol ?isMultiRecipe\@MultiRecipe\@\@EEBA_NXZ */ virtual bool isMultiRecipe() const; + /** + * @vftbl 10 + * @symbol ?hasDataDrivenResult\@MultiRecipe\@\@EEBA_NXZ + */ + virtual bool hasDataDrivenResult() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MULTIRECIPE + /** + * @symbol ?isShapeless\@MultiRecipe\@\@EEBA_NXZ + */ + MCVAPI bool isShapeless() const; +#endif /** * @symbol ??0MultiRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@VHashedString\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MultifaceBlock.hpp b/LiteLoader/include/llapi/mc/MultifaceBlock.hpp index 7525b92a3a..4c399f629e 100644 --- a/LiteLoader/include/llapi/mc/MultifaceBlock.hpp +++ b/LiteLoader/include/llapi/mc/MultifaceBlock.hpp @@ -187,9 +187,9 @@ class MultifaceBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@MultifaceBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@MultifaceBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,25 +206,25 @@ class MultifaceBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 142 - * @symbol ?getVisualShapeInWorld\@MultifaceBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 143 + * @symbol ?getVisualShapeInWorld\@MultifaceBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -236,47 +236,52 @@ class MultifaceBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@MultifaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 175 + * @vftbl 176 * @symbol ?clip\@MultifaceBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@MultifaceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getMultifaceBlock\@GlowLichenBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getMultifaceBlock() const = 0; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getMultifaceSpreader\@GlowLichenBlock\@\@UEBAAEBVMultifaceSpreader\@\@XZ */ virtual class MultifaceSpreader const & getMultifaceSpreader() const = 0; diff --git a/LiteLoader/include/llapi/mc/MushroomBlock.hpp b/LiteLoader/include/llapi/mc/MushroomBlock.hpp index 37f8a12295..4eda0b8a46 100644 --- a/LiteLoader/include/llapi/mc/MushroomBlock.hpp +++ b/LiteLoader/include/llapi/mc/MushroomBlock.hpp @@ -201,20 +201,20 @@ class MushroomBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,45 +226,50 @@ class MushroomBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 172 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?randomTick\@MushroomBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 180 + * @vftbl 181 * @symbol ?getRenderLayer\@MushroomBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 181 + * @vftbl 182 * @symbol ?getRenderLayer\@MushroomBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0MushroomBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/MusicCommand.hpp b/LiteLoader/include/llapi/mc/MusicCommand.hpp index a959bacfc3..4f59659f9f 100644 --- a/LiteLoader/include/llapi/mc/MusicCommand.hpp +++ b/LiteLoader/include/llapi/mc/MusicCommand.hpp @@ -36,7 +36,7 @@ class MusicCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@MusicCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/MyceliumBlock.hpp b/LiteLoader/include/llapi/mc/MyceliumBlock.hpp index 6beca33d3e..11b641a155 100644 --- a/LiteLoader/include/llapi/mc/MyceliumBlock.hpp +++ b/LiteLoader/include/llapi/mc/MyceliumBlock.hpp @@ -176,25 +176,25 @@ class MyceliumBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 - * @symbol ?animateTick\@MyceliumBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 152 + * @symbol ?animateTick\@MyceliumBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,32 +206,37 @@ class MyceliumBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@MyceliumBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@MyceliumBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/NBTSchemaWriter.hpp b/LiteLoader/include/llapi/mc/NBTSchemaWriter.hpp index 62cc80d118..f57a3dc8f9 100644 --- a/LiteLoader/include/llapi/mc/NBTSchemaWriter.hpp +++ b/LiteLoader/include/llapi/mc/NBTSchemaWriter.hpp @@ -129,14 +129,6 @@ class NBTSchemaWriter { * @symbol ?write\@NBTSchemaWriter\@\@UEAA_N_J\@Z */ MCVAPI bool write(__int64); - /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NH\@Z - */ - MCVAPI bool write(int); - /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NI\@Z - */ - MCVAPI bool write(unsigned int); /** * @symbol ?write\@NBTSchemaWriter\@\@UEAA_N_N\@Z */ @@ -157,6 +149,14 @@ class NBTSchemaWriter { * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NG\@Z */ MCVAPI bool write(unsigned short); + /** + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NH\@Z + */ + MCVAPI bool write(int); + /** + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NI\@Z + */ + MCVAPI bool write(unsigned int); /** * @symbol __unk_destructor_-1 */ diff --git a/LiteLoader/include/llapi/mc/NavigationComponent.hpp b/LiteLoader/include/llapi/mc/NavigationComponent.hpp index c8f386146b..06aa750eba 100644 --- a/LiteLoader/include/llapi/mc/NavigationComponent.hpp +++ b/LiteLoader/include/llapi/mc/NavigationComponent.hpp @@ -35,14 +35,14 @@ class NavigationComponent { * @symbol ??0NavigationComponent\@\@QEAA\@XZ */ MCAPI NavigationComponent(); - /** - * @symbol ?createPath\@NavigationComponent\@\@QEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVMob\@\@AEAVActor\@\@\@Z - */ - MCAPI std::unique_ptr createPath(class Mob &, class Actor &); /** * @symbol ?createPath\@NavigationComponent\@\@QEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVMob\@\@AEBVVec3\@\@\@Z */ MCAPI std::unique_ptr createPath(class Mob &, class Vec3 const &); + /** + * @symbol ?createPath\@NavigationComponent\@\@QEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVMob\@\@AEAVActor\@\@\@Z + */ + MCAPI std::unique_ptr createPath(class Mob &, class Actor &); /** * @symbol ?getAvoidDamageBlocks\@NavigationComponent\@\@QEBA_NXZ */ @@ -171,6 +171,10 @@ class NavigationComponent { * @symbol ?isStuck\@NavigationComponent\@\@QEBA_NH\@Z */ MCAPI bool isStuck(int) const; + /** + * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEBVVec3\@\@M\@Z + */ + MCAPI bool moveTo(class Mob &, class Vec3 const &, float); /** * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEAVActor\@\@M\@Z */ @@ -183,10 +187,6 @@ class NavigationComponent { * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@V?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@M\@Z */ MCAPI bool moveTo(class Mob &, std::unique_ptr, float); - /** - * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEBVVec3\@\@M\@Z - */ - MCAPI bool moveTo(class Mob &, class Vec3 const &, float); /** * @symbol ??4NavigationComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NavigationTravelSystem.hpp b/LiteLoader/include/llapi/mc/NavigationTravelSystem.hpp index e7ff0dafa5..4644b2a95b 100644 --- a/LiteLoader/include/llapi/mc/NavigationTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/NavigationTravelSystem.hpp @@ -28,5 +28,9 @@ class NavigationTravelSystem { * @symbol ?createNavigationTravelSystem\@NavigationTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createNavigationTravelSystem(); + /** + * @symbol ?tickNavigationTravelSystem\@NavigationTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@VActorOwnerComponent\@\@UMobTravelComponent\@\@VNavigationComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMobTravelComponent\@\@\@\@\@Z + */ + MCAPI static void tickNavigationTravelSystem(class ViewT, class EntityModifierT); }; diff --git a/LiteLoader/include/llapi/mc/NearestAttackableTargetGoal.hpp b/LiteLoader/include/llapi/mc/NearestAttackableTargetGoal.hpp index 07f6cf9085..f749c5a9ee 100644 --- a/LiteLoader/include/llapi/mc/NearestAttackableTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/NearestAttackableTargetGoal.hpp @@ -86,10 +86,6 @@ class NearestAttackableTargetGoal : public TargetGoal { * @symbol ?_canStartSearching\@NearestAttackableTargetGoal\@\@IEAA_NXZ */ MCAPI bool _canStartSearching(); - /** - * @symbol ?_getNearbyActors\@NearestAttackableTargetGoal\@\@IEAA?AV?$vector\@UDistanceSortedActor\@\@V?$allocator\@UDistanceSortedActor\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector _getNearbyActors(); /** * @symbol ?_isTargetVisible\@NearestAttackableTargetGoal\@\@IEBA_NAEBVMob\@\@MM\@Z */ diff --git a/LiteLoader/include/llapi/mc/NetEventCallback.hpp b/LiteLoader/include/llapi/mc/NetEventCallback.hpp index 939e2a8582..360207b539 100644 --- a/LiteLoader/include/llapi/mc/NetEventCallback.hpp +++ b/LiteLoader/include/llapi/mc/NetEventCallback.hpp @@ -574,6 +574,10 @@ class NetEventCallback { * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookDeletePagePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class BookDeletePagePacket const &); + /** + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTrimDataPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class TrimDataPacket const &); /** * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNpcDialoguePacket\@\@\@Z */ @@ -782,6 +786,10 @@ class NetEventCallback { * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEditorNetworkPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class EditorNetworkPacket const &); + /** + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCompressedBiomeDefinitionListPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class CompressedBiomeDefinitionListPacket const &); /** * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDimensionDataPacket\@\@\@Z */ @@ -838,6 +846,10 @@ class NetEventCallback { * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnvilDamagePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AnvilDamagePacket const &); + /** + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVOpenSignPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class OpenSignPacket const &); /** * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubChunkPacket\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp b/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp index 342711f840..ba85adfc7c 100644 --- a/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp @@ -211,20 +211,20 @@ class NetherFungusBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -236,35 +236,40 @@ class NetherFungusBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@NetherFungusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERFUNGUSBLOCK /** * @symbol ?waterSpreadCausesSpawn\@NetherFungusBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/NetherNetConnector.hpp b/LiteLoader/include/llapi/mc/NetherNetConnector.hpp index 508d2ac351..0bacc99e02 100644 --- a/LiteLoader/include/llapi/mc/NetherNetConnector.hpp +++ b/LiteLoader/include/llapi/mc/NetherNetConnector.hpp @@ -11,23 +11,31 @@ #undef BEFORE_EXTRA -class NetherNetConnector { +struct NetherNetConnector { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETHERNETCONNECTOR public: - class NetherNetConnector& operator=(class NetherNetConnector const &) = delete; - NetherNetConnector(class NetherNetConnector const &) = delete; + struct NetherNetConnector& operator=(struct NetherNetConnector const &) = delete; + NetherNetConnector(struct NetherNetConnector const &) = delete; NetherNetConnector() = delete; #endif public: + /** + * @symbol ?disableBroadcastDiscovery\@NetherNetConnector\@\@QEAAXXZ + */ + MCAPI void disableBroadcastDiscovery(); /** * @symbol ?enableBroadcastDiscovery\@NetherNetConnector\@\@QEAAXXZ */ MCAPI void enableBroadcastDiscovery(); + /** + * @symbol ?isBroadcastDiscoveryEnabled\@NetherNetConnector\@\@QEAA_NXZ + */ + MCAPI bool isBroadcastDiscoveryEnabled(); /** * @symbol ?setBroadcastRequestCallback\@NetherNetConnector\@\@QEAAX$$QEAV?$function\@$$A6A_NPEAXPEAH\@Z\@std\@\@\@Z */ @@ -37,4 +45,4 @@ class NetherNetConnector { */ MCAPI void setBroadcastResponseCallback(class std::function &&); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/NetherNetTransportStub.hpp b/LiteLoader/include/llapi/mc/NetherNetTransportStub.hpp index 2a888d51b7..93c1879b7a 100644 --- a/LiteLoader/include/llapi/mc/NetherNetTransportStub.hpp +++ b/LiteLoader/include/llapi/mc/NetherNetTransportStub.hpp @@ -58,9 +58,9 @@ class NetherNetTransportStub { */ MCVAPI bool GetSessionState(struct NetherNet::NetworkID, struct NetherNet::SessionState *); /** - * @symbol ?IsLANBroadcastModeAvailable\@NetherNetTransportStub\@\@UEBA_NXZ + * @symbol ?IsBroadcastDiscoveryEnabled\@NetherNetTransportStub\@\@UEAA_NXZ */ - MCVAPI bool IsLANBroadcastModeAvailable() const; + MCVAPI bool IsBroadcastDiscoveryEnabled(); /** * @symbol ?IsPacketAvailable\@NetherNetTransportStub\@\@UEAA_NUNetworkID\@NetherNet\@\@PEAI\@Z */ diff --git a/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp b/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp index 9ecc3775a9..cbf00571f1 100644 --- a/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp @@ -181,20 +181,20 @@ class NetherReactorBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,27 +206,32 @@ class NetherReactorBlock : public ActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 189 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 190 * @symbol ?getResourceCount\@NetherReactorBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/NetherSprouts.hpp b/LiteLoader/include/llapi/mc/NetherSprouts.hpp index c55602fc94..c5268d1d03 100644 --- a/LiteLoader/include/llapi/mc/NetherSprouts.hpp +++ b/LiteLoader/include/llapi/mc/NetherSprouts.hpp @@ -211,20 +211,20 @@ class NetherSprouts : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -236,42 +236,47 @@ class NetherSprouts : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@NetherSprouts\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@NetherSprouts\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@NetherSprouts\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@NetherSprouts\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/NetherWartBlock.hpp b/LiteLoader/include/llapi/mc/NetherWartBlock.hpp index 196d3ab6f3..68887f07da 100644 --- a/LiteLoader/include/llapi/mc/NetherWartBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherWartBlock.hpp @@ -196,20 +196,20 @@ class NetherWartBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -221,42 +221,47 @@ class NetherWartBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 172 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?randomTick\@NetherWartBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@NetherWartBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@NetherWartBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@NetherWartBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp b/LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp index fbc63fcff2..795c0e002d 100644 --- a/LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp +++ b/LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp @@ -161,6 +161,11 @@ class NetheriteArmorEquippedListener { virtual void __unk_vfn_25(); /** * @vftbl 26 + * @symbol __unk_vfn_26 + */ + virtual void __unk_vfn_26(); + /** + * @vftbl 27 * @symbol ?onEvent\@NetheriteArmorEquippedListener\@\@UEAA?AW4EventResult\@\@AEBUActorEquippedArmorEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ActorEquippedArmorEvent const &); diff --git a/LiteLoader/include/llapi/mc/NetherrackBlock.hpp b/LiteLoader/include/llapi/mc/NetherrackBlock.hpp index 1726a9e6a9..bb935a46e8 100644 --- a/LiteLoader/include/llapi/mc/NetherrackBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherrackBlock.hpp @@ -186,20 +186,20 @@ class NetherrackBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,54 +211,30 @@ class NetherrackBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 194 - * @symbol __unk_vfn_194 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_194(); - /** - * @vftbl 195 - * @symbol __unk_vfn_195 - */ - virtual void __unk_vfn_195(); - /** - * @vftbl 196 - * @symbol __unk_vfn_196 - */ - virtual void __unk_vfn_196(); - /** - * @vftbl 197 - * @symbol __unk_vfn_197 - */ - virtual void __unk_vfn_197(); - /** - * @vftbl 198 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z - */ - virtual void _Delete_this(bool); - /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getDescriptionId() const; + virtual void __unk_vfn_187(); /** * @symbol ??0NetherrackBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/NetworkChunkPublisher.hpp b/LiteLoader/include/llapi/mc/NetworkChunkPublisher.hpp index 88559d8169..b0b473ab4f 100644 --- a/LiteLoader/include/llapi/mc/NetworkChunkPublisher.hpp +++ b/LiteLoader/include/llapi/mc/NetworkChunkPublisher.hpp @@ -35,12 +35,6 @@ class NetworkChunkPublisher { #endif public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETWORKCHUNKPUBLISHER - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~NetworkChunkPublisher(); -#endif /** * @symbol ??0NetworkChunkPublisher\@\@QEAA\@AEAVLevel\@\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp b/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp index 0fa9ac9c58..07c0bef074 100644 --- a/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp @@ -60,13 +60,13 @@ class NetworkChunkPublisherUpdatePacket : public Packet { */ MCVAPI ~NetworkChunkPublisherUpdatePacket(); #endif - /** - * @symbol ??0NetworkChunkPublisherUpdatePacket\@\@QEAA\@XZ - */ - MCAPI NetworkChunkPublisherUpdatePacket(); /** * @symbol ??0NetworkChunkPublisherUpdatePacket\@\@QEAA\@AEBVBlockPos\@\@I\@Z */ MCAPI NetworkChunkPublisherUpdatePacket(class BlockPos const &, unsigned int); + /** + * @symbol ??0NetworkChunkPublisherUpdatePacket\@\@QEAA\@XZ + */ + MCAPI NetworkChunkPublisherUpdatePacket(); }; diff --git a/LiteLoader/include/llapi/mc/NetworkIdentifier.hpp b/LiteLoader/include/llapi/mc/NetworkIdentifier.hpp index 6e95a8bee0..1000b45e32 100644 --- a/LiteLoader/include/llapi/mc/NetworkIdentifier.hpp +++ b/LiteLoader/include/llapi/mc/NetworkIdentifier.hpp @@ -61,6 +61,10 @@ class NetworkIdentifier { * @symbol ?isUnassigned\@NetworkIdentifier\@\@QEBA_NXZ */ MCAPI bool isUnassigned() const; + /** + * @symbol ??8NetworkIdentifier\@\@QEBA_NAEBV0\@\@Z + */ + MCAPI bool operator==(class NetworkIdentifier const &) const; /** * @symbol ?toString\@NetworkIdentifier\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp b/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp index 17aef8d479..6f85c0a0a8 100644 --- a/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp @@ -43,17 +43,17 @@ class NetworkItemInstanceDescriptor : public ItemDescriptorCount { MCVAPI ~NetworkItemInstanceDescriptor(); #endif /** - * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemInstance\@\@\@Z + * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z */ - MCAPI NetworkItemInstanceDescriptor(class ItemInstance const &); + MCAPI NetworkItemInstanceDescriptor(class ItemStackDescriptor const &); /** * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI NetworkItemInstanceDescriptor(class NetworkItemInstanceDescriptor &&); /** - * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z + * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemInstance\@\@\@Z */ - MCAPI NetworkItemInstanceDescriptor(class ItemStackDescriptor const &); + MCAPI NetworkItemInstanceDescriptor(class ItemInstance const &); /** * @symbol ?getItemInstance\@NetworkItemInstanceDescriptor\@\@QEBA?AVItemInstance\@\@AEBVBlockPalette\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp b/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp index 2a516712a8..d0af4bf373 100644 --- a/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp @@ -44,26 +44,26 @@ class NetworkItemStackDescriptor : public ItemDescriptorCount { */ MCVAPI ~NetworkItemStackDescriptor(); #endif - /** - * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBVItemStack\@\@\@Z - */ - MCAPI NetworkItemStackDescriptor(class ItemStack const &); /** * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@XZ */ MCAPI NetworkItemStackDescriptor(); /** - * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z */ - MCAPI NetworkItemStackDescriptor(class NetworkItemStackDescriptor const &); + MCAPI NetworkItemStackDescriptor(class ItemStackDescriptor const &); /** * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI NetworkItemStackDescriptor(class NetworkItemStackDescriptor &&); /** - * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z + * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBV0\@\@Z */ - MCAPI NetworkItemStackDescriptor(class ItemStackDescriptor const &); + MCAPI NetworkItemStackDescriptor(class NetworkItemStackDescriptor const &); + /** + * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBVItemStack\@\@\@Z + */ + MCAPI NetworkItemStackDescriptor(class ItemStack const &); /** * @symbol ?read\@NetworkItemStackDescriptor\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NetworkSystem.hpp b/LiteLoader/include/llapi/mc/NetworkSystem.hpp index e336211f92..cf61f59d34 100644 --- a/LiteLoader/include/llapi/mc/NetworkSystem.hpp +++ b/LiteLoader/include/llapi/mc/NetworkSystem.hpp @@ -171,6 +171,10 @@ class NetworkSystem { * @symbol ?sendToMultiple\@NetworkSystem\@\@QEAAXAEBV?$vector\@UNetworkIdentifierWithSubId\@\@V?$allocator\@UNetworkIdentifierWithSubId\@\@\@std\@\@\@std\@\@AEBVPacket\@\@\@Z */ MCAPI void sendToMultiple(std::vector const &, class Packet const &); + /** + * @symbol ?setClientUpdateAndRenderThrottle\@NetworkSystem\@\@QEAAX_NHM\@Z + */ + MCAPI void setClientUpdateAndRenderThrottle(bool, int, float); /** * @symbol ?setCloseConnection\@NetworkSystem\@\@QEAAXAEBVNetworkIdentifier\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NewExecuteCommand.hpp b/LiteLoader/include/llapi/mc/NewExecuteCommand.hpp index 4b080893c1..930f1a0c22 100644 --- a/LiteLoader/include/llapi/mc/NewExecuteCommand.hpp +++ b/LiteLoader/include/llapi/mc/NewExecuteCommand.hpp @@ -33,7 +33,7 @@ class NewExecuteCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@NewExecuteCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/NewLeafBlock.hpp b/LiteLoader/include/llapi/mc/NewLeafBlock.hpp index c948683248..d6929507b3 100644 --- a/LiteLoader/include/llapi/mc/NewLeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/NewLeafBlock.hpp @@ -181,35 +181,35 @@ class NewLeafBlock : public LeafBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@NewLeafBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@NewLeafBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@NewLeafBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -221,37 +221,42 @@ class NewLeafBlock : public LeafBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@NewLeafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@NewLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getExtraResourceItem\@NewLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getExtraResourceItem(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/NewLogBlock.hpp b/LiteLoader/include/llapi/mc/NewLogBlock.hpp index 09cdf96213..7182164953 100644 --- a/LiteLoader/include/llapi/mc/NewLogBlock.hpp +++ b/LiteLoader/include/llapi/mc/NewLogBlock.hpp @@ -155,11 +155,6 @@ class NewLogBlock : public LogBlock { * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); - /** - * @vftbl 103 - * @symbol ?asItemInstance\@NewLogBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z - */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** * @vftbl 105 * @symbol __unk_vfn_105 @@ -181,35 +176,20 @@ class NewLogBlock : public LogBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 - */ - virtual void __unk_vfn_131(); - /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@NewLogBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z - */ - virtual std::string buildDescriptionId(class Block const &) const; - /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@NewLogBlock\@\@UEBA_NXZ - */ - virtual bool isAuxValueRelevantForPicking() const; - /** - * @vftbl 146 - * @symbol ?getVariant\@NewLogBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -221,48 +201,33 @@ class NewLogBlock : public LogBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 - */ - virtual void __unk_vfn_170(); - /** - * @vftbl 174 - * @symbol __unk_vfn_174 - */ - virtual void __unk_vfn_174(); - /** - * @vftbl 177 - * @symbol ?use\@NewLogBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z - */ - virtual bool use(class Player &, class BlockPos const &, unsigned char) const; - /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_168(); /** - * @vftbl 185 - * @symbol ?getMapColor\@NewLogBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; + virtual void __unk_vfn_171(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_175(); /** - * @vftbl 188 - * @symbol ?getResourceItem\@NewLogBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_179(); /** - * @vftbl 190 - * @symbol ?getSilkTouchItemInstance\@NewLogBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + virtual void __unk_vfn_187(); /** - * @symbol ??0NewLogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0NewLogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@V?$optional\@ULogBlockMapColors\@\@\@2\@W4NewLogType\@\@\@Z */ - MCAPI NewLogBlock(std::string const &, int); + MCAPI NewLogBlock(std::string const &, int, class WeakPtr, class std::optional, enum class NewLogType); }; diff --git a/LiteLoader/include/llapi/mc/NormalTickFilterSystem.hpp b/LiteLoader/include/llapi/mc/NormalTickFilterSystem.hpp index 19acfc7182..00b3515ac9 100644 --- a/LiteLoader/include/llapi/mc/NormalTickFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/NormalTickFilterSystem.hpp @@ -35,5 +35,13 @@ class NormalTickFilterSystem { * @symbol ?createLocalPlayerSystem\@NormalTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createLocalPlayerSystem(); + /** + * @symbol ?tickGenericSystem\@NormalTickFilterSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@V?$Optional\@$$CBVDimensionStateComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@USkipNormalTick\@\@\@\@\@\@\@Z + */ + MCAPI static void tickGenericSystem(class ViewT, class FlagComponent>, class Optional>, class EntityModifierT>); + /** + * @symbol ?tickLocalPlayerSystem\@NormalTickFilterSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@V?$Optional\@$$CBVLoadingStateComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@USkipNormalTick\@\@\@\@\@\@\@Z + */ + MCAPI static void tickLocalPlayerSystem(class ViewT, class FlagComponent>, class Optional>, class EntityModifierT>); }; diff --git a/LiteLoader/include/llapi/mc/NoteBlock.hpp b/LiteLoader/include/llapi/mc/NoteBlock.hpp index 8e89d3b9f1..cc908e7554 100644 --- a/LiteLoader/include/llapi/mc/NoteBlock.hpp +++ b/LiteLoader/include/llapi/mc/NoteBlock.hpp @@ -196,20 +196,20 @@ class NoteBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -222,34 +222,39 @@ class NoteBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@NoteBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@NoteBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NOTEBLOCK /** * @symbol ?isInteractiveBlock\@NoteBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/Npc.hpp b/LiteLoader/include/llapi/mc/Npc.hpp index 71bf76e496..4758394ce6 100644 --- a/LiteLoader/include/llapi/mc/Npc.hpp +++ b/LiteLoader/include/llapi/mc/Npc.hpp @@ -1,260 +1,237 @@ /** - * @file Npc.hpp + * @file npc.hpp * */ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Actor.hpp" -#include "Mob.hpp" +#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class Npc. - * - */ -class Npc : public Mob { + +namespace npc { #define AFTER_EXTRA // Add Member There -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NPC +struct UrlAction { + public: - class Npc& operator=(class Npc const &) = delete; - Npc(class Npc const &) = delete; - Npc() = delete; -#endif + struct UrlAction& operator=(struct UrlAction const&) = delete; + UrlAction(struct UrlAction const&) = delete; + UrlAction() = delete; public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Npc\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z - */ - virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); - /** - * @vftbl 12 - * @symbol ?initializeComponents\@Npc\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z - */ - virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); - /** - * @vftbl 16 - * @symbol __unk_vfn_16 - */ - virtual void __unk_vfn_16(); - /** - * @vftbl 41 - * @symbol __unk_vfn_41 - */ - virtual void __unk_vfn_41(); - /** - * @vftbl 61 - * @symbol ?canShowNameTag\@Npc\@\@UEBA_NXZ - */ - virtual bool canShowNameTag() const; - /** - * @vftbl 62 - * @symbol __unk_vfn_62 - */ - virtual void __unk_vfn_62(); - /** - * @vftbl 66 - * @symbol ?getFormattedNameTag\@Npc\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - virtual std::string getFormattedNameTag() const; - /** - * @vftbl 69 - * @symbol __unk_vfn_69 - */ - virtual void __unk_vfn_69(); - /** - * @vftbl 82 - * @symbol __unk_vfn_82 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 85 - * @symbol __unk_vfn_85 - */ - virtual void __unk_vfn_85(); - /** - * @vftbl 88 - * @symbol __unk_vfn_88 + * @symbol ??9UrlAction\@npc\@\@QEBA_NAEBU01\@\@Z */ - virtual void __unk_vfn_88(); + MCAPI bool operator!=(struct UrlAction const&) const; /** - * @vftbl 96 - * @symbol __unk_vfn_96 + * @symbol ??1UrlAction\@npc\@\@QEAA\@XZ */ - virtual void __unk_vfn_96(); - /** - * @vftbl 99 - * @symbol __unk_vfn_99 - */ - virtual void __unk_vfn_99(); - /** - * @vftbl 106 - * @symbol __unk_vfn_106 - */ - virtual void __unk_vfn_106(); + MCAPI ~UrlAction(); +}; + +struct ActionValue { + std::string mRawText; + std::string mText; + +public: + struct ActionValue& operator=(struct ActionValue const&) = delete; + ActionValue(struct ActionValue const&) = delete; +// ActionValue() = delete; + +public: /** - * @vftbl 108 - * @symbol __unk_vfn_108 + * @symbol ??0ActionValue\@npc\@\@QEAA\@XZ */ - virtual void __unk_vfn_108(); + MCAPI ActionValue(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @symbol ??4ActionValue\@npc\@\@QEAAAEAU01\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - virtual void __unk_vfn_109(); + MCAPI struct ActionValue& operator=(class std::basic_string_view>); /** - * @vftbl 111 - * @symbol __unk_vfn_111 + * @symbol ?rawValue\@ActionValue\@npc\@\@QEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual void __unk_vfn_111(); + MCAPI class std::basic_string_view> rawValue() const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @symbol ??1ActionValue\@npc\@\@QEAA\@XZ */ - virtual void __unk_vfn_178(); + MCAPI ~ActionValue(); +}; + +struct StoredCommand { + +public: + struct StoredCommand& operator=(struct StoredCommand const&) = delete; + StoredCommand(struct StoredCommand const&) = delete; + StoredCommand() = delete; + +public: /** - * @vftbl 190 - * @symbol ?canBePulledIntoVehicle\@Npc\@\@UEBA_NXZ + * @symbol + * ??0StoredCommand\@npc\@\@QEAA\@W4CurrentCmdVersion\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - virtual bool canBePulledIntoVehicle() const; + MCAPI StoredCommand(enum class CurrentCmdVersion, + class std::basic_string_view>); /** - * @vftbl 192 - * @symbol __unk_vfn_192 + * @symbol ??1StoredCommand\@npc\@\@QEAA\@XZ */ - virtual void __unk_vfn_192(); + MCAPI ~StoredCommand(); +}; + +struct Button { + +public: + struct Button& operator=(struct Button const&) = delete; + Button(struct Button const&) = delete; +// Button() = delete; + +public: /** - * @vftbl 199 - * @symbol ?buildDebugInfo\@Npc\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0Button\@npc\@\@QEAA\@XZ */ - virtual void buildDebugInfo(std::string &) const; + MCAPI Button(); /** - * @vftbl 207 - * @symbol ?canBeAffected\@Npc\@\@UEBA_NI\@Z + * @symbol ??4Button\@npc\@\@QEAAAEAU01\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - virtual bool canBeAffected(unsigned int) const; + MCAPI struct Button& operator=(class std::basic_string_view>); /** - * @vftbl 217 - * @symbol __unk_vfn_217 + * @symbol ??1Button\@npc\@\@QEAA\@XZ */ - virtual void __unk_vfn_217(); + MCAPI ~Button(); +}; + +enum class ActionMode : __int8 { + BUTTON = 0x0, + CLOSE = 0x1, + OPEN = 0x2, +}; + +struct CommandAction { + npc::ActionValue mActionValue; + npc::Button mButton; + npc::ActionMode mActionMode; + std::vector mCmds; + +public: + struct CommandAction& operator=(struct CommandAction const&) = delete; + CommandAction(struct CommandAction const&) = delete; + CommandAction() = delete; + +public: /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @symbol ??9CommandAction\@npc\@\@QEBA_NAEBU01\@\@Z */ - virtual void __unk_vfn_218(); + MCAPI bool operator!=(struct CommandAction const&) const; /** - * @vftbl 240 - * @symbol __unk_vfn_240 + * @symbol ??1CommandAction\@npc\@\@QEAA\@XZ */ - virtual void __unk_vfn_240(); + MCAPI ~CommandAction(); +}; + + +struct ActionContainer { + +public: + struct ActionContainer& operator=(struct ActionContainer const&) = delete; + ActionContainer(struct ActionContainer const&) = delete; + ActionContainer() = delete; + +public: /** - * @vftbl 243 - * @symbol __unk_vfn_243 + * @symbol ?at\@ActionContainer\@npc\@\@QEAAPEAV?$variant\@UCommandAction\@npc\@\@UUrlAction\@2\@\@std\@\@_K\@Z */ - virtual void __unk_vfn_243(); + MCAPI class std::variant* at(unsigned __int64); /** - * @vftbl 245 - * @symbol ?die\@Npc\@\@UEAAXAEBVActorDamageSource\@\@\@Z + * @symbol ?at\@ActionContainer\@npc\@\@QEBAPEBV?$variant\@UCommandAction\@npc\@\@UUrlAction\@2\@\@std\@\@_K\@Z */ - virtual void die(class ActorDamageSource const &); + MCAPI class std::variant const* at(unsigned __int64) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @symbol ?countUrl\@ActionContainer\@npc\@\@QEBA_KXZ */ - virtual void __unk_vfn_260(); + MCAPI unsigned __int64 countUrl() const; /** - * @vftbl 261 - * @symbol ?_hurt\@Npc\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @symbol + * ?data\@ActionContainer\@npc\@\@QEBAAEBV?$vector\@V?$variant\@UCommandAction\@npc\@\@UUrlAction\@2\@\@std\@\@V?$allocator\@V?$variant\@UCommandAction\@npc\@\@UUrlAction\@2\@\@std\@\@\@2\@\@std\@\@XZ */ - virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); + MCAPI std::vector> const& data() const; /** - * @vftbl 268 - * @symbol __unk_vfn_268 + * @symbol ?push\@ActionContainer\@npc\@\@QEAAX$$QEAV?$variant\@UCommandAction\@npc\@\@UUrlAction\@2\@\@std\@\@\@Z */ - virtual void __unk_vfn_268(); + MCAPI void push(class std::variant&&); /** - * @vftbl 274 - * @symbol ?_onSizeUpdated\@Npc\@\@EEAAXXZ + * @symbol + * ?reset\@ActionContainer\@npc\@\@QEAAX$$QEAV?$vector\@V?$variant\@UCommandAction\@npc\@\@UUrlAction\@2\@\@std\@\@V?$allocator\@V?$variant\@UCommandAction\@npc\@\@UUrlAction\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ - virtual void _onSizeUpdated(); + MCAPI void reset(std::vector>&&); /** - * @vftbl 275 - * @symbol __unk_vfn_275 + * @symbol ?size\@ActionContainer\@npc\@\@QEBA_KXZ */ - virtual void __unk_vfn_275(); + MCAPI unsigned __int64 size() const; /** - * @vftbl 276 - * @symbol ?knockback\@Npc\@\@UEAAXPEAVActor\@\@HMMMMM\@Z + * @symbol ??1ActionContainer\@npc\@\@QEAA\@XZ */ - virtual void knockback(class Actor *, int, float, float, float, float, float); + MCAPI ~ActionContainer(); +}; + + +#undef AFTER_EXTRA /** - * @vftbl 301 - * @symbol __unk_vfn_301 + * @symbol ?COMMAND_DELIMITER\@npc\@\@3DB */ - virtual void __unk_vfn_301(); + MCAPI extern char const COMMAND_DELIMITER; /** - * @vftbl 305 - * @symbol __unk_vfn_305 + * @symbol ?COMMAND_PERMISSION\@npc\@\@3W4CommandPermissionLevel\@\@B */ - virtual void __unk_vfn_305(); + MCAPI extern enum class CommandPermissionLevel const COMMAND_PERMISSION; /** - * @vftbl 338 - * @symbol ?canExistWhenDisallowMob\@Npc\@\@UEBA_NXZ + * @symbol ?MAX_NAME_LENGTH\@npc\@\@3_KB */ - virtual bool canExistWhenDisallowMob() const; + MCAPI extern unsigned __int64 const MAX_NAME_LENGTH; /** - * @vftbl 346 - * @symbol ?newServerAiStep\@Npc\@\@UEAAXXZ + * @symbol ?UNUSED_ACTION_INDEX\@npc\@\@3_KB */ - virtual void newServerAiStep(); + MCAPI extern unsigned __int64 const UNUSED_ACTION_INDEX; /** - * @vftbl 347 - * @symbol ?_serverAiMobStep\@Npc\@\@MEAAXXZ + * @symbol ?fillCommands\@npc\@\@YAXAEAUCommandAction\@1\@AEBV?$vector\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@V?$allocator\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@2\@\@std\@\@W4CurrentCmdVersion\@\@\@Z */ - virtual void _serverAiMobStep(); + MCAPI void fillCommands(struct npc::CommandAction &, std::vector>> const &, enum class CurrentCmdVersion); /** - * @vftbl 351 - * @symbol __unk_vfn_351 + * @symbol ?fromJson\@npc\@\@YA?AV?$optional\@V?$variant\@UCommandAction\@npc\@\@UUrlAction\@2\@\@std\@\@\@std\@\@AEBVValue\@Json\@\@\@Z */ - virtual void __unk_vfn_351(); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NPC + MCAPI class std::optional> fromJson(class Json::Value const &); /** - * @symbol ?breaksFallingBlocks\@Npc\@\@UEBA_NXZ + * @symbol ?handlePacket\@npc\@\@YAXAEAVActor\@\@AEAVPlayer\@\@AEAVNpcComponent\@\@AEBVNpcRequestPacket\@\@\@Z */ - MCVAPI bool breaksFallingBlocks() const; + MCAPI void handlePacket(class Actor &, class Player &, class NpcComponent &, class NpcRequestPacket const &); /** - * @symbol ?interactPreventDefault\@Npc\@\@UEAA_NXZ + * @symbol ?hasCreatePermission\@npc\@\@YA_NAEAVActor\@\@\@Z */ - MCVAPI bool interactPreventDefault(); + MCAPI bool hasCreatePermission(class Actor &); /** - * @symbol ?isFishable\@Npc\@\@UEBA_NXZ + * @symbol ?toJson\@npc\@\@YA?AVValue\@Json\@\@AEBV?$variant\@UCommandAction\@npc\@\@UUrlAction\@2\@\@std\@\@\@Z */ - MCVAPI bool isFishable() const; + MCAPI class Json::Value toJson(class std::variant const &); /** - * @symbol ?isTargetable\@Npc\@\@UEBA_NXZ + * @symbol ?toJson\@npc\@\@YA?AVValue\@Json\@\@AEBUActionContainer\@1\@\@Z */ - MCVAPI bool isTargetable() const; -#endif + MCAPI class Json::Value toJson(struct npc::ActionContainer const &); /** - * @symbol ??0Npc\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ?toJson\@npc\@\@YA?AVValue\@Json\@\@AEBUCommandAction\@1\@\@Z */ - MCAPI Npc(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); + MCAPI class Json::Value toJson(struct npc::CommandAction const &); /** - * @symbol ?SKIN_ID_TAG\@Npc\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?toJson\@npc\@\@YA?AVValue\@Json\@\@AEBUUrlAction\@1\@\@Z */ - MCAPI static std::string const SKIN_ID_TAG; + MCAPI class Json::Value toJson(struct npc::UrlAction const &); /** - * @symbol ?Skins\@Npc\@\@2V?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@B + * @symbol ?toString\@npc\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUActionContainer\@1\@\@Z */ - MCAPI static std::vector> const Skins; + MCAPI std::string toString(struct npc::ActionContainer const &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/NpcAction.hpp b/LiteLoader/include/llapi/mc/NpcAction.hpp deleted file mode 100644 index fb6e168475..0000000000 --- a/LiteLoader/include/llapi/mc/NpcAction.hpp +++ /dev/null @@ -1,127 +0,0 @@ -/** - * @file NpcAction.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "Json.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class NpcAction. - * - */ -class NpcAction { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NPCACTION -public: - class NpcAction& operator=(class NpcAction const &) = delete; - NpcAction(class NpcAction const &) = delete; - NpcAction() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0() = 0; - /** - * @vftbl 1 - * @symbol __unk_vfn_1 - */ - virtual void __unk_vfn_1(); - /** - * @vftbl 2 - * @symbol ?fromJson\@NpcAction\@\@UEAA_NAEBVValue\@Json\@\@\@Z - */ - virtual bool fromJson(class Json::Value const &); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NPCACTION - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~NpcAction(); -#endif - /** - * @symbol ?getMode\@NpcAction\@\@QEBA?AW4NpcActionMode\@\@XZ - */ - MCAPI enum class NpcActionMode getMode() const; - /** - * @symbol ?getText\@NpcAction\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getText() const; - /** - * @symbol ?getType\@NpcAction\@\@QEBA?AW4NpcActionType\@\@XZ - */ - MCAPI enum class NpcActionType getType() const; - /** - * @symbol ??9NpcAction\@\@QEBA_NAEBV0\@\@Z - */ - MCAPI bool operator!=(class NpcAction const &) const; - /** - * @symbol ??8NpcAction\@\@QEBA_NAEBV0\@\@Z - */ - MCAPI bool operator==(class NpcAction const &) const; - /** - * @symbol ?setButtonName\@NpcAction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI void setButtonName(std::string const &); - /** - * @symbol ?setMode\@NpcAction\@\@QEAAXW4NpcActionMode\@\@\@Z - */ - MCAPI void setMode(enum class NpcActionMode); - /** - * @symbol ?setText\@NpcAction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI void setText(std::string const &); - /** - * @symbol ?read\@NpcAction\@\@SA?AV?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@AEBVValue\@Json\@\@\@Z - */ - MCAPI static std::unique_ptr read(class Json::Value const &); - -//protected: - /** - * @symbol ?toJsonBase\@NpcAction\@\@IEAA?AVValue\@Json\@\@AEAV23\@\@Z - */ - MCAPI class Json::Value toJsonBase(class Json::Value &); - -//private: - -protected: - -private: - /** - * @symbol ?BUTTON_NAME_KEY\@NpcAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B - */ - MCAPI static std::string const BUTTON_NAME_KEY; - /** - * @symbol ?DATA_KEY\@NpcAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B - */ - MCAPI static std::string const DATA_KEY; - /** - * @symbol ?MAX_BUTTON_NAME_LENGTH\@NpcAction\@\@0HB - */ - MCAPI static int const MAX_BUTTON_NAME_LENGTH; - /** - * @symbol ?MODE_KEY\@NpcAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B - */ - MCAPI static std::string const MODE_KEY; - /** - * @symbol ?TEXT_KEY\@NpcAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B - */ - MCAPI static std::string const TEXT_KEY; - /** - * @symbol ?TYPE_KEY\@NpcAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B - */ - MCAPI static std::string const TYPE_KEY; - -}; diff --git a/LiteLoader/include/llapi/mc/NpcActionsContainer.hpp b/LiteLoader/include/llapi/mc/NpcActionsContainer.hpp deleted file mode 100644 index 998f09d508..0000000000 --- a/LiteLoader/include/llapi/mc/NpcActionsContainer.hpp +++ /dev/null @@ -1,61 +0,0 @@ -/** - * @file NpcActionsContainer.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC structure NpcActionsContainer. - * - */ -struct NpcActionsContainer { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NPCACTIONSCONTAINER -public: - struct NpcActionsContainer& operator=(struct NpcActionsContainer const &) = delete; - NpcActionsContainer(struct NpcActionsContainer const &) = delete; - NpcActionsContainer() = delete; -#endif - -public: - /** - * @symbol ?cloneActions\@NpcActionsContainer\@\@QEBA?AV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI std::vector> cloneActions() const; - /** - * @symbol ?getActionAt\@NpcActionsContainer\@\@QEAAPEAVNpcAction\@\@_K\@Z - */ - MCAPI class NpcAction * getActionAt(unsigned __int64); - /** - * @symbol ?getActionCount\@NpcActionsContainer\@\@QEBA_KXZ - */ - MCAPI unsigned __int64 getActionCount() const; - /** - * @symbol ?getActions\@NpcActionsContainer\@\@QEAAAEAV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI std::vector> & getActions(); - /** - * @symbol ?getActions\@NpcActionsContainer\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI std::vector> const & getActions() const; - /** - * @symbol ?getUrlCount\@NpcActionsContainer\@\@QEBAHXZ - */ - MCAPI int getUrlCount() const; - /** - * @symbol ??1NpcActionsContainer\@\@QEAA\@XZ - */ - MCAPI ~NpcActionsContainer(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/NpcCommandAction.hpp b/LiteLoader/include/llapi/mc/NpcCommandAction.hpp deleted file mode 100644 index 81c2c3f4ce..0000000000 --- a/LiteLoader/include/llapi/mc/NpcCommandAction.hpp +++ /dev/null @@ -1,82 +0,0 @@ -/** - * @file NpcCommandAction.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "Json.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class NpcCommandAction. - * - */ -class NpcCommandAction { - -#define AFTER_EXTRA -// Add Member There -public: -struct SavedCommand { - SavedCommand() = delete; - SavedCommand(SavedCommand const&) = delete; - SavedCommand(SavedCommand const&&) = delete; -}; - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NPCCOMMANDACTION -public: - class NpcCommandAction& operator=(class NpcCommandAction const &) = delete; - NpcCommandAction(class NpcCommandAction const &) = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?toJson\@NpcCommandAction\@\@UEAA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value toJson(); - /** - * @vftbl 2 - * @symbol ?fromJson\@NpcCommandAction\@\@UEAA_NAEBVValue\@Json\@\@\@Z - */ - virtual bool fromJson(class Json::Value const &); - /** - * @symbol ??0NpcCommandAction\@\@QEAA\@XZ - */ - MCAPI NpcCommandAction(); - /** - * @symbol ?getCommands\@NpcCommandAction\@\@QEAAAEAV?$vector\@USavedCommand\@NpcCommandAction\@\@V?$allocator\@USavedCommand\@NpcCommandAction\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector & getCommands(); - /** - * @symbol ?setCommands\@NpcCommandAction\@\@QEAAX$$QEAV?$vector\@USavedCommand\@NpcCommandAction\@\@V?$allocator\@USavedCommand\@NpcCommandAction\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI void setCommands(std::vector &&); - /** - * @symbol ?COMMAND_DELIMITER\@NpcCommandAction\@\@2DB - */ - MCAPI static char const COMMAND_DELIMITER; - -//private: - -private: - /** - * @symbol ?COMMAND_LINE_KEY\@NpcCommandAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B - */ - MCAPI static std::string const COMMAND_LINE_KEY; - /** - * @symbol ?COMMAND_VERSION_KEY\@NpcCommandAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B - */ - MCAPI static std::string const COMMAND_VERSION_KEY; - -}; diff --git a/LiteLoader/include/llapi/mc/NpcComponent.hpp b/LiteLoader/include/llapi/mc/NpcComponent.hpp index a48cdef19e..550ac8f349 100644 --- a/LiteLoader/include/llapi/mc/NpcComponent.hpp +++ b/LiteLoader/include/llapi/mc/NpcComponent.hpp @@ -5,6 +5,8 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "npc.hpp" +#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -63,17 +65,13 @@ class NpcComponent { */ MCAPI void executeOpeningCommands(class Actor &, class Player &, std::string const &); /** - * @symbol ?getActionsContainer\@NpcComponent\@\@QEAAAEAUNpcActionsContainer\@\@XZ + * @symbol ?getActionsContainer\@NpcComponent\@\@QEAAAEAUActionContainer\@npc\@\@XZ */ - MCAPI struct NpcActionsContainer & getActionsContainer(); + MCAPI struct npc::ActionContainer & getActionsContainer(); /** - * @symbol ?getButtonCounts\@NpcComponent\@\@QEBA?AV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@XZ + * @symbol ?getCommandCounts\@NpcComponent\@\@QEBA?AV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@XZ */ - MCAPI std::vector getButtonCounts() const; - /** - * @symbol ?getCommandPermissionLevel\@NpcComponent\@\@QEBA?AW4CommandPermissionLevel\@\@XZ - */ - MCAPI enum class CommandPermissionLevel getCommandPermissionLevel() const; + MCAPI std::vector getCommandCounts() const; /** * @symbol ?getInteraction\@NpcComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ @@ -94,18 +92,10 @@ class NpcComponent { * @symbol ?getSkinIndex\@NpcComponent\@\@QEBAHXZ */ MCAPI int getSkinIndex() const; - /** - * @symbol ?getUpdatedActions\@NpcComponent\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEA_N2\@Z - */ - MCAPI void getUpdatedActions(std::string const &, std::vector> &, bool &, bool &); /** * @symbol ?getUrlCount\@NpcComponent\@\@QEBAHXZ */ MCAPI int getUrlCount() const; - /** - * @symbol ?handleNpcRequest\@NpcComponent\@\@QEAAXAEAVActor\@\@AEAVPlayer\@\@AEBVNpcRequestPacket\@\@\@Z - */ - MCAPI void handleNpcRequest(class Actor &, class Player &, class NpcRequestPacket const &); /** * @symbol ?initClientOnlyData\@NpcComponent\@\@QEAAXAEAVActor\@\@\@Z */ @@ -139,9 +129,9 @@ class NpcComponent { */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?setActions\@NpcComponent\@\@QEAAXAEAVActor\@\@$$QEAV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?setActions\@NpcComponent\@\@QEAAXAEAVActor\@\@$$QEAV?$vector\@V?$variant\@UCommandAction\@npc\@\@UUrlAction\@2\@\@std\@\@V?$allocator\@V?$variant\@UCommandAction\@npc\@\@UUrlAction\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ - MCAPI void setActions(class Actor &, std::vector> &&); + MCAPI void setActions(class Actor &, std::vector> &&); /** * @symbol ?setDialogueScene\@NpcComponent\@\@QEAA_NAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -162,10 +152,6 @@ class NpcComponent { * @symbol ?setSkinIndex\@NpcComponent\@\@QEAAXAEAVActor\@\@H_N\@Z */ MCAPI void setSkinIndex(class Actor &, int, bool); - /** - * @symbol ?MAX_NPC_NAME_LENGTH\@NpcComponent\@\@2_KB - */ - MCAPI static unsigned __int64 const MAX_NPC_NAME_LENGTH; //private: /** @@ -173,17 +159,9 @@ class NpcComponent { */ MCAPI void _defineEntityDataString(class Actor &, enum class ActorDataIDs); /** - * @symbol ?_deserializeData\@NpcComponent\@\@AEAAXXZ - */ - MCAPI void _deserializeData(); - /** - * @symbol ?_loadActions\@NpcComponent\@\@AEBAXAEAV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z - */ - MCAPI void _loadActions(std::vector> &, std::string const &) const; - /** - * @symbol ?_serializeActions\@NpcComponent\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?_deserializeData\@NpcComponent\@\@AEAAXAEBVValue\@Json\@\@\@Z */ - MCAPI std::string _serializeActions() const; + MCAPI void _deserializeData(class Json::Value const &); private: /** diff --git a/LiteLoader/include/llapi/mc/NpcDialogueScene.hpp b/LiteLoader/include/llapi/mc/NpcDialogueScene.hpp index 674218018a..18031418bd 100644 --- a/LiteLoader/include/llapi/mc/NpcDialogueScene.hpp +++ b/LiteLoader/include/llapi/mc/NpcDialogueScene.hpp @@ -26,13 +26,10 @@ struct NpcDialogueScene { public: struct NpcDialogueScene& operator=(struct NpcDialogueScene const &) = delete; NpcDialogueScene(struct NpcDialogueScene const &) = delete; + NpcDialogueScene() = delete; #endif public: - /** - * @symbol ??0NpcDialogueScene\@\@QEAA\@XZ - */ - MCAPI NpcDialogueScene(); /** * @symbol ??1NpcDialogueScene\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/NpcSceneDialogueData.hpp b/LiteLoader/include/llapi/mc/NpcSceneDialogueData.hpp index 839588ed75..bcb85e12d8 100644 --- a/LiteLoader/include/llapi/mc/NpcSceneDialogueData.hpp +++ b/LiteLoader/include/llapi/mc/NpcSceneDialogueData.hpp @@ -80,13 +80,13 @@ class NpcSceneDialogueData { virtual struct ActorUniqueID getActorUniqueID(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NPCSCENEDIALOGUEDATA /** - * @symbol ?getActionsContainer\@NpcSceneDialogueData\@\@UEAAPEAUNpcActionsContainer\@\@XZ + * @symbol ?getActionsContainer\@NpcSceneDialogueData\@\@UEAAPEAUActionContainer\@npc\@\@XZ */ - MCVAPI struct NpcActionsContainer * getActionsContainer(); + MCVAPI struct npc::ActionContainer * getActionsContainer(); /** - * @symbol ?getActionsContainer\@NpcSceneDialogueData\@\@UEBAPEBUNpcActionsContainer\@\@XZ + * @symbol ?getActionsContainer\@NpcSceneDialogueData\@\@UEBAPEBUActionContainer\@npc\@\@XZ */ - MCVAPI struct NpcActionsContainer const * getActionsContainer() const; + MCVAPI struct npc::ActionContainer const * getActionsContainer() const; /** * @symbol ?getActor\@NpcSceneDialogueData\@\@UEAAPEAVActor\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/NpcUrlAction.hpp b/LiteLoader/include/llapi/mc/NpcUrlAction.hpp deleted file mode 100644 index cb227ede1f..0000000000 --- a/LiteLoader/include/llapi/mc/NpcUrlAction.hpp +++ /dev/null @@ -1,47 +0,0 @@ -/** - * @file NpcUrlAction.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "Json.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class NpcUrlAction. - * - */ -class NpcUrlAction { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NPCURLACTION -public: - class NpcUrlAction& operator=(class NpcUrlAction const &) = delete; - NpcUrlAction(class NpcUrlAction const &) = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?toJson\@NpcUrlAction\@\@UEAA?AVValue\@Json\@\@XZ - */ - virtual class Json::Value toJson(); - /** - * @symbol ??0NpcUrlAction\@\@QEAA\@XZ - */ - MCAPI NpcUrlAction(); - -}; diff --git a/LiteLoader/include/llapi/mc/NyliumBlock.hpp b/LiteLoader/include/llapi/mc/NyliumBlock.hpp index 37fa82ad4c..00c5b9ef71 100644 --- a/LiteLoader/include/llapi/mc/NyliumBlock.hpp +++ b/LiteLoader/include/llapi/mc/NyliumBlock.hpp @@ -186,20 +186,20 @@ class NyliumBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,32 +211,37 @@ class NyliumBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 172 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?randomTick\@NyliumBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@NyliumBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/Objective.hpp b/LiteLoader/include/llapi/mc/Objective.hpp index 46933b1011..6868b02df3 100644 --- a/LiteLoader/include/llapi/mc/Objective.hpp +++ b/LiteLoader/include/llapi/mc/Objective.hpp @@ -56,10 +56,6 @@ class Objective { * @symbol ?getPlayerScore\@Objective\@\@QEBA?AUScoreInfo\@\@AEBUScoreboardId\@\@\@Z */ MCAPI struct ScoreInfo getPlayerScore(struct ScoreboardId const &) const; - /** - * @symbol ?getPlayerScoreRef\@Objective\@\@QEAA_NAEBUScoreboardId\@\@AEAUScoreInfoRef\@\@\@Z - */ - MCAPI bool getPlayerScoreRef(struct ScoreboardId const &, struct ScoreInfoRef &); /** * @symbol ?getPlayers\@Objective\@\@QEBA?AV?$vector\@UScoreboardId\@\@V?$allocator\@UScoreboardId\@\@\@std\@\@\@std\@\@XZ */ @@ -76,10 +72,6 @@ class Objective { * @symbol ?hasScores\@Objective\@\@QEBA_NXZ */ MCAPI bool hasScores() const; - /** - * @symbol ?setDisplayName\@Objective\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI void setDisplayName(std::string const &); /** * @symbol ??1Objective\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ObjectiveCriteria.hpp b/LiteLoader/include/llapi/mc/ObjectiveCriteria.hpp index a04d91cd90..c5df278f40 100644 --- a/LiteLoader/include/llapi/mc/ObjectiveCriteria.hpp +++ b/LiteLoader/include/llapi/mc/ObjectiveCriteria.hpp @@ -29,10 +29,6 @@ class ObjectiveCriteria { #endif public: - /** - * @symbol ??0ObjectiveCriteria\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NW4ObjectiveRenderType\@\@\@Z - */ - MCAPI ObjectiveCriteria(std::string const &, bool, enum class ObjectiveRenderType); /** * @symbol ?getName\@ObjectiveCriteria\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ObserverBlock.hpp b/LiteLoader/include/llapi/mc/ObserverBlock.hpp index a5c1c4765a..ac0a4c388e 100644 --- a/LiteLoader/include/llapi/mc/ObserverBlock.hpp +++ b/LiteLoader/include/llapi/mc/ObserverBlock.hpp @@ -202,9 +202,9 @@ class ObserverBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@ObserverBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@ObserverBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -221,40 +221,40 @@ class ObserverBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 * @symbol ?getVariant\@ObserverBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 + * @vftbl 150 * @symbol ?getMappedFace\@ObserverBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 150 + * @vftbl 151 * @symbol ?getFaceFlip\@ObserverBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -267,34 +267,39 @@ class ObserverBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_OBSERVERBLOCK /** * @symbol ?allowStateMismatchOnPlacement\@ObserverBlock\@\@UEBA_NAEBVBlock\@\@0\@Z diff --git a/LiteLoader/include/llapi/mc/ObsidianBlock.hpp b/LiteLoader/include/llapi/mc/ObsidianBlock.hpp index 3dfd6fe229..4bc6f55e74 100644 --- a/LiteLoader/include/llapi/mc/ObsidianBlock.hpp +++ b/LiteLoader/include/llapi/mc/ObsidianBlock.hpp @@ -176,30 +176,30 @@ class ObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 152 * @symbol ?animateTick\@ObsidianBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 161 + * @vftbl 162 * @symbol ?_addHardCodedBlockComponents\@ObsidianBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,25 +211,30 @@ class ObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0ObsidianBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/OceanRuinPieces.hpp b/LiteLoader/include/llapi/mc/OceanRuinPieces.hpp index 17354c5219..df70d056d7 100644 --- a/LiteLoader/include/llapi/mc/OceanRuinPieces.hpp +++ b/LiteLoader/include/llapi/mc/OceanRuinPieces.hpp @@ -30,10 +30,6 @@ class OceanRuinPieces { #endif public: - /** - * @symbol ?addPieces\@OceanRuinPieces\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEBUOceanRuinConfiguration\@\@\@Z - */ - MCAPI static void addPieces(class gsl::not_null>, class BlockPos const &, enum class Rotation const &, std::vector> &, class Random &, struct OceanRuinConfiguration const &); //private: /** diff --git a/LiteLoader/include/llapi/mc/OculusPlatformMessagePump.hpp b/LiteLoader/include/llapi/mc/OculusPlatformMessagePump.hpp new file mode 100644 index 0000000000..911d1c1675 --- /dev/null +++ b/LiteLoader/include/llapi/mc/OculusPlatformMessagePump.hpp @@ -0,0 +1,32 @@ +/** + * @file OculusPlatformMessagePump.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class OculusPlatformMessagePump { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_OCULUSPLATFORMMESSAGEPUMP +public: + class OculusPlatformMessagePump& operator=(class OculusPlatformMessagePump const &) = delete; + OculusPlatformMessagePump(class OculusPlatformMessagePump const &) = delete; + OculusPlatformMessagePump() = delete; +#endif + +public: + /** + * @symbol ?mOculusAppId\@OculusPlatformMessagePump\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI static std::string const mOculusAppId; + +}; diff --git a/LiteLoader/include/llapi/mc/OfferFlowerTickSystem.hpp b/LiteLoader/include/llapi/mc/OfferFlowerTickSystem.hpp index 269d251e74..83fac5f81b 100644 --- a/LiteLoader/include/llapi/mc/OfferFlowerTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/OfferFlowerTickSystem.hpp @@ -37,6 +37,10 @@ class OfferFlowerTickSystem { * @symbol ?_doOfferFlowerTickSystem\@OfferFlowerTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUOfferFlowerTickComponent\@\@\@Z */ MCAPI static void _doOfferFlowerTickSystem(class StrictEntityContext const &, struct OfferFlowerTickComponent &); + /** + * @symbol ?_tickOfferFlowerTickSystem\@OfferFlowerTickSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@VActorTickNeededComponent\@\@\@\@UOfferFlowerTickComponent\@\@\@\@\@Z + */ + MCAPI static void _tickOfferFlowerTickSystem(class ViewT, struct OfferFlowerTickComponent>); private: diff --git a/LiteLoader/include/llapi/mc/OldLeafBlock.hpp b/LiteLoader/include/llapi/mc/OldLeafBlock.hpp index 4904362792..0cc67f7d77 100644 --- a/LiteLoader/include/llapi/mc/OldLeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/OldLeafBlock.hpp @@ -181,40 +181,40 @@ class OldLeafBlock : public LeafBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@OldLeafBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@OldLeafBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColor\@OldLeafBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@OldLeafBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,47 +226,52 @@ class OldLeafBlock : public LeafBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 181 + * @vftbl 182 * @symbol ?getRenderLayer\@OldLeafBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@OldLeafBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@OldLeafBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@OldLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getExtraResourceItem\@OldLeafBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getExtraResourceItem(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/OldLogBlock.hpp b/LiteLoader/include/llapi/mc/OldLogBlock.hpp index f7a270afb6..540b82c8f4 100644 --- a/LiteLoader/include/llapi/mc/OldLogBlock.hpp +++ b/LiteLoader/include/llapi/mc/OldLogBlock.hpp @@ -155,11 +155,6 @@ class OldLogBlock : public LogBlock { * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); - /** - * @vftbl 103 - * @symbol ?asItemInstance\@OldLogBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z - */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** * @vftbl 105 * @symbol __unk_vfn_105 @@ -181,35 +176,20 @@ class OldLogBlock : public LogBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 - */ - virtual void __unk_vfn_131(); - /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@OldLogBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z - */ - virtual std::string buildDescriptionId(class Block const &) const; - /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@OldLogBlock\@\@UEBA_NXZ - */ - virtual bool isAuxValueRelevantForPicking() const; - /** - * @vftbl 146 - * @symbol ?getVariant\@OldLogBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -221,48 +201,33 @@ class OldLogBlock : public LogBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 - */ - virtual void __unk_vfn_170(); - /** - * @vftbl 174 - * @symbol __unk_vfn_174 - */ - virtual void __unk_vfn_174(); - /** - * @vftbl 177 - * @symbol ?use\@OldLogBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z - */ - virtual bool use(class Player &, class BlockPos const &, unsigned char) const; - /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_168(); /** - * @vftbl 185 - * @symbol ?getMapColor\@OldLogBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; + virtual void __unk_vfn_171(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_175(); /** - * @vftbl 188 - * @symbol ?getResourceItem\@OldLogBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_179(); /** - * @vftbl 190 - * @symbol ?getSilkTouchItemInstance\@OldLogBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + virtual void __unk_vfn_187(); /** - * @symbol ??0OldLogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0OldLogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@V?$optional\@ULogBlockMapColors\@\@\@2\@W4OldLogType\@\@\@Z */ - MCAPI OldLogBlock(std::string const &, int); + MCAPI OldLogBlock(std::string const &, int, class WeakPtr, class std::optional, enum class OldLogType); }; diff --git a/LiteLoader/include/llapi/mc/OnActorEnterVolumeComponent.hpp b/LiteLoader/include/llapi/mc/OnActorEnterVolumeComponent.hpp index 192f108a29..41da0a5eb0 100644 --- a/LiteLoader/include/llapi/mc/OnActorEnterVolumeComponent.hpp +++ b/LiteLoader/include/llapi/mc/OnActorEnterVolumeComponent.hpp @@ -28,8 +28,8 @@ class OnActorEnterVolumeComponent { public: /** - * @symbol ??1OnActorEnterVolumeComponent\@\@QEAA\@XZ + * @symbol ??4OnActorEnterVolumeComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ - MCAPI ~OnActorEnterVolumeComponent(); + MCAPI class OnActorEnterVolumeComponent & operator=(class OnActorEnterVolumeComponent &&); }; diff --git a/LiteLoader/include/llapi/mc/OnActorEnterVolumeDefinition.hpp b/LiteLoader/include/llapi/mc/OnActorEnterVolumeDefinition.hpp index e1b0956b81..3ed51e8915 100644 --- a/LiteLoader/include/llapi/mc/OnActorEnterVolumeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OnActorEnterVolumeDefinition.hpp @@ -30,9 +30,9 @@ struct OnActorEnterVolumeDefinition { public: /** - * @symbol ?initialize\@OnActorEnterVolumeDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVOnActorEnterVolumeComponent\@\@\@Z + * @symbol ??4OnActorEnterVolumeDefinition\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ - MCAPI void initialize(class EntityContext &, class OnActorEnterVolumeComponent &) const; + MCAPI struct OnActorEnterVolumeDefinition & operator=(struct OnActorEnterVolumeDefinition &&); /** * @symbol ??1OnActorEnterVolumeDefinition\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/OnActorLeaveVolumeComponent.hpp b/LiteLoader/include/llapi/mc/OnActorLeaveVolumeComponent.hpp index 512a261c4e..50ce070f69 100644 --- a/LiteLoader/include/llapi/mc/OnActorLeaveVolumeComponent.hpp +++ b/LiteLoader/include/llapi/mc/OnActorLeaveVolumeComponent.hpp @@ -28,8 +28,8 @@ class OnActorLeaveVolumeComponent { public: /** - * @symbol ??1OnActorLeaveVolumeComponent\@\@QEAA\@XZ + * @symbol ??4OnActorLeaveVolumeComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ - MCAPI ~OnActorLeaveVolumeComponent(); + MCAPI class OnActorLeaveVolumeComponent & operator=(class OnActorLeaveVolumeComponent &&); }; diff --git a/LiteLoader/include/llapi/mc/OnActorLeaveVolumeDefinition.hpp b/LiteLoader/include/llapi/mc/OnActorLeaveVolumeDefinition.hpp index 62c82e8e3b..99f497e5c7 100644 --- a/LiteLoader/include/llapi/mc/OnActorLeaveVolumeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OnActorLeaveVolumeDefinition.hpp @@ -30,9 +30,9 @@ struct OnActorLeaveVolumeDefinition { public: /** - * @symbol ?initialize\@OnActorLeaveVolumeDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVOnActorLeaveVolumeComponent\@\@\@Z + * @symbol ??4OnActorLeaveVolumeDefinition\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ - MCAPI void initialize(class EntityContext &, class OnActorLeaveVolumeComponent &) const; + MCAPI struct OnActorLeaveVolumeDefinition & operator=(struct OnActorLeaveVolumeDefinition &&); /** * @symbol ??1OnActorLeaveVolumeDefinition\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/OpCommand.hpp b/LiteLoader/include/llapi/mc/OpCommand.hpp index 9d34cd98b8..2737a1a02e 100644 --- a/LiteLoader/include/llapi/mc/OpCommand.hpp +++ b/LiteLoader/include/llapi/mc/OpCommand.hpp @@ -36,7 +36,7 @@ class OpCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@OpCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/OpenSignPacket.hpp b/LiteLoader/include/llapi/mc/OpenSignPacket.hpp new file mode 100644 index 0000000000..96730bd27a --- /dev/null +++ b/LiteLoader/include/llapi/mc/OpenSignPacket.hpp @@ -0,0 +1,67 @@ +/** + * @file OpenSignPacket.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Packet.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class OpenSignPacket : public Packet { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_OPENSIGNPACKET +public: + class OpenSignPacket& operator=(class OpenSignPacket const &) = delete; + OpenSignPacket(class OpenSignPacket const &) = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?getId\@OpenSignPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + */ + virtual enum class MinecraftPacketIds getId() const; + /** + * @vftbl 2 + * @symbol ?getName\@OpenSignPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + virtual std::string getName() const; + /** + * @vftbl 3 + * @symbol ?write\@OpenSignPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + */ + virtual void write(class BinaryStream &) const; + /** + * @vftbl 7 + * @symbol ?_read\@OpenSignPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_OPENSIGNPACKET + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~OpenSignPacket(); +#endif + /** + * @symbol ??0OpenSignPacket\@\@QEAA\@AEBVBlockPos\@\@_N\@Z + */ + MCAPI OpenSignPacket(class BlockPos const &, bool); + /** + * @symbol ??0OpenSignPacket\@\@QEAA\@XZ + */ + MCAPI OpenSignPacket(); + +}; diff --git a/LiteLoader/include/llapi/mc/Option.hpp b/LiteLoader/include/llapi/mc/Option.hpp index 27cb9a2012..8d464aba42 100644 --- a/LiteLoader/include/llapi/mc/Option.hpp +++ b/LiteLoader/include/llapi/mc/Option.hpp @@ -56,16 +56,6 @@ class Option { * @symbol ?load\@Option\@\@UEAAXAEBVValue\@Json\@\@\@Z */ virtual void load(class Json::Value const &); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_OPTION - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~Option(); -#endif - /** - * @symbol ??0Option\@\@QEAA\@W4OptionID\@\@W4OptionOwnerType\@\@W4OptionResetFlags\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@3W4OptionType\@\@\@Z - */ - MCAPI Option(enum class OptionID, enum class OptionOwnerType, enum class OptionResetFlags, std::string const &, std::string const &, enum class OptionType); /** * @symbol ?canModify\@Option\@\@QEBA_NXZ */ @@ -74,10 +64,6 @@ class Option { * @symbol ?getBool\@Option\@\@QEBA_NXZ */ MCAPI bool getBool() const; - /** - * @symbol ?hasOverrideSource\@Option\@\@QEBA_NXZ - */ - MCAPI bool hasOverrideSource() const; /** * @symbol ?notifyOptionValueChanged\@Option\@\@QEAAX_N\@Z */ @@ -90,10 +76,6 @@ class Option { * @symbol ?registerObserver\@Option\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEBVOption\@\@\@Z\@std\@\@\@Z */ MCAPI class Bedrock::PubSub::Subscription registerObserver(class std::function); - /** - * @symbol ?setRequestSaveCallback\@Option\@\@QEAAXV?$function\@$$A6AX_N\@Z\@std\@\@\@Z - */ - MCAPI void setRequestSaveCallback(class std::function); /** * @symbol ?read\@Option\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEA_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/OreBlock.hpp b/LiteLoader/include/llapi/mc/OreBlock.hpp index 6340e2d388..f96c61b13a 100644 --- a/LiteLoader/include/llapi/mc/OreBlock.hpp +++ b/LiteLoader/include/llapi/mc/OreBlock.hpp @@ -186,20 +186,20 @@ class OreBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,32 +211,37 @@ class OreBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@OreBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@OreBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/OverworldBiomeBuilder.hpp b/LiteLoader/include/llapi/mc/OverworldBiomeBuilder.hpp index 1ceea86d0b..1c5f254f20 100644 --- a/LiteLoader/include/llapi/mc/OverworldBiomeBuilder.hpp +++ b/LiteLoader/include/llapi/mc/OverworldBiomeBuilder.hpp @@ -38,10 +38,6 @@ class OverworldBiomeBuilder { * @symbol ?addBiomes\@OverworldBiomeBuilder\@\@QEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBVBiomeRegistry\@\@\@Z */ MCAPI void addBiomes(std::vector &, class BiomeRegistry const &) const; - /** - * @symbol ?getWorldSpawnParameters\@OverworldBiomeBuilder\@\@QEBA?AV?$vector\@UClimateParameters\@\@V?$allocator\@UClimateParameters\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector getWorldSpawnParameters() const; /** * @symbol ??1OverworldBiomeBuilder\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/OverworldDimension.hpp b/LiteLoader/include/llapi/mc/OverworldDimension.hpp index 9e0506da80..816ff07714 100644 --- a/LiteLoader/include/llapi/mc/OverworldDimension.hpp +++ b/LiteLoader/include/llapi/mc/OverworldDimension.hpp @@ -71,10 +71,6 @@ class OverworldDimension { */ MCVAPI void upgradeLevelChunk(class ChunkSource &, class LevelChunk &, class LevelChunk &); #endif - /** - * @symbol ??0OverworldDimension\@\@QEAA\@AEAVILevel\@\@AEAVScheduler\@\@\@Z - */ - MCAPI OverworldDimension(class ILevel &, class Scheduler &); //private: /** diff --git a/LiteLoader/include/llapi/mc/OverworldGeneratorMultinoise.hpp b/LiteLoader/include/llapi/mc/OverworldGeneratorMultinoise.hpp index 5af1c3e2e9..c8d52a89bd 100644 --- a/LiteLoader/include/llapi/mc/OverworldGeneratorMultinoise.hpp +++ b/LiteLoader/include/llapi/mc/OverworldGeneratorMultinoise.hpp @@ -35,6 +35,10 @@ class OverworldGeneratorMultinoise { * @symbol ?_prepareHeights\@OverworldGeneratorMultinoise\@\@EEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@AEBVWorldGenCache\@\@PEAVAquifer\@\@$$QEAV?$function\@$$A6AXAEBVBlockPos\@\@AEBVBlock\@\@H\@Z\@std\@\@_NPEAV?$vector\@FV?$allocator\@F\@std\@\@\@7\@H\@Z */ MCVAPI void _prepareHeights(class BlockVolume &, class ChunkPos const &, class WorldGenCache const &, class Aquifer *, class std::function &&, bool, std::vector *, int); + /** + * @symbol ?chunkPosNeedsBlending\@OverworldGeneratorMultinoise\@\@UEAA_NAEBVChunkPos\@\@\@Z + */ + MCVAPI bool chunkPosNeedsBlending(class ChunkPos const &); /** * @symbol ?createNoiseCache\@OverworldGeneratorMultinoise\@\@EEBA?AVChunkLocalNoiseCache\@\@VChunkPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/OverworldNoises3d.hpp b/LiteLoader/include/llapi/mc/OverworldNoises3d.hpp index cbbf311088..fc303dc9ea 100644 --- a/LiteLoader/include/llapi/mc/OverworldNoises3d.hpp +++ b/LiteLoader/include/llapi/mc/OverworldNoises3d.hpp @@ -33,10 +33,6 @@ struct OverworldNoises3d { * @symbol ??0OverworldNoises3d\@\@QEAA\@AEBU0\@\@Z */ MCAPI OverworldNoises3d(struct OverworldNoises3d const &); - /** - * @symbol ?computeErosionAndDepth\@OverworldNoises3d\@\@QEBA?AU?$pair\@MM\@std\@\@VBlockPos\@\@\@Z - */ - MCAPI struct std::pair computeErosionAndDepth(class BlockPos) const; /** * @symbol ?computeNoiseValues\@OverworldNoises3d\@\@QEBA?AUCacheEntry\@ChunkLocalNoiseCache\@\@AEBV?$DividedPos2d\@$03\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/OwnerStorageEntity.hpp b/LiteLoader/include/llapi/mc/OwnerStorageEntity.hpp index 63565f71af..46c9293423 100644 --- a/LiteLoader/include/llapi/mc/OwnerStorageEntity.hpp +++ b/LiteLoader/include/llapi/mc/OwnerStorageEntity.hpp @@ -52,14 +52,14 @@ class OwnerStorageEntity { public: //protected: - /** - * @symbol ??0OwnerStorageEntity\@\@IEAA\@$$QEAV0\@\@Z - */ - MCAPI OwnerStorageEntity(class OwnerStorageEntity &&); /** * @symbol ??0OwnerStorageEntity\@\@IEAA\@W4VariadicInit\@0\@AEAVEntityRegistry\@\@\@Z */ MCAPI OwnerStorageEntity(enum class OwnerStorageEntity::VariadicInit, class EntityRegistry &); + /** + * @symbol ??0OwnerStorageEntity\@\@IEAA\@$$QEAV0\@\@Z + */ + MCAPI OwnerStorageEntity(class OwnerStorageEntity &&); /** * @symbol ??0OwnerStorageEntity\@\@IEAA\@W4EmptyInit\@0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/POIBlueprint.hpp b/LiteLoader/include/llapi/mc/POIBlueprint.hpp index 0110ef347e..a0869324d4 100644 --- a/LiteLoader/include/llapi/mc/POIBlueprint.hpp +++ b/LiteLoader/include/llapi/mc/POIBlueprint.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class POIBlueprint { +struct POIBlueprint { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_POIBLUEPRINT public: - class POIBlueprint& operator=(class POIBlueprint const &) = delete; - POIBlueprint(class POIBlueprint const &) = delete; + struct POIBlueprint& operator=(struct POIBlueprint const &) = delete; + POIBlueprint(struct POIBlueprint const &) = delete; POIBlueprint() = delete; #endif @@ -29,4 +29,4 @@ class POIBlueprint { */ MCAPI POIBlueprint(std::string, enum class POIType, float, bool, unsigned __int64, unsigned __int64, std::string, std::string, std::string); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/POIInstance.hpp b/LiteLoader/include/llapi/mc/POIInstance.hpp index 29737ceade..2eac70ebdc 100644 --- a/LiteLoader/include/llapi/mc/POIInstance.hpp +++ b/LiteLoader/include/llapi/mc/POIInstance.hpp @@ -33,30 +33,6 @@ class POIInstance { * @symbol ??0POIInstance\@\@QEAA\@AEBVBlockPos\@\@_NV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4POIType\@\@M_K4222\@Z */ MCAPI POIInstance(class BlockPos const &, bool, std::string, enum class POIType, float, unsigned __int64, unsigned __int64, std::string, std::string, std::string); - /** - * @symbol ?decreaseOwnerCount\@POIInstance\@\@QEAAX_K\@Z - */ - MCAPI void decreaseOwnerCount(unsigned __int64); - /** - * @symbol ?getEndEvent\@POIInstance\@\@QEBAAEBVHashedString\@\@XZ - */ - MCAPI class HashedString const & getEndEvent() const; - /** - * @symbol ?getInitEvent\@POIInstance\@\@QEBAAEBVHashedString\@\@XZ - */ - MCAPI class HashedString const & getInitEvent() const; - /** - * @symbol ?getName\@POIInstance\@\@QEBAAEBVHashedString\@\@XZ - */ - MCAPI class HashedString const & getName() const; - /** - * @symbol ?getOwnerCapacity\@POIInstance\@\@QEBA_KXZ - */ - MCAPI unsigned __int64 getOwnerCapacity() const; - /** - * @symbol ?getOwnerCount\@POIInstance\@\@QEBA_KXZ - */ - MCAPI unsigned __int64 getOwnerCount() const; /** * @symbol ?getPosition\@POIInstance\@\@QEBAAEBVBlockPos\@\@XZ */ @@ -73,42 +49,14 @@ class POIInstance { * @symbol ?getSoundEvent\@POIInstance\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getSoundEvent() const; - /** - * @symbol ?getType\@POIInstance\@\@QEBA?AW4POIType\@\@XZ - */ - MCAPI enum class POIType getType() const; - /** - * @symbol ?getTypeName\@POIInstance\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string getTypeName() const; - /** - * @symbol ?getWeight\@POIInstance\@\@QEBA_KXZ - */ - MCAPI unsigned __int64 getWeight() const; - /** - * @symbol ?increaseOwnerCount\@POIInstance\@\@QEAAX_K\@Z - */ - MCAPI void increaseOwnerCount(unsigned __int64); /** * @symbol ?incrementArrivalFailureCount\@POIInstance\@\@QEAAXXZ */ MCAPI void incrementArrivalFailureCount(); - /** - * @symbol ?isFull\@POIInstance\@\@QEBA_NXZ - */ - MCAPI bool isFull() const; - /** - * @symbol ?isPathable\@POIInstance\@\@QEBA_NXZ - */ - MCAPI bool isPathable() const; /** * @symbol ?resetArrivalFailureCount\@POIInstance\@\@QEAAXXZ */ MCAPI void resetArrivalFailureCount(); - /** - * @symbol ?setVillage\@POIInstance\@\@QEAAXPEAVVillage\@\@\@Z - */ - MCAPI void setVillage(class Village *); /** * @symbol ?trySpawnParticles\@POIInstance\@\@QEBAXAEAVBlockSource\@\@AEAVRandom\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/Pack.hpp b/LiteLoader/include/llapi/mc/Pack.hpp index c9661f1ab8..ffa3c69fd9 100644 --- a/LiteLoader/include/llapi/mc/Pack.hpp +++ b/LiteLoader/include/llapi/mc/Pack.hpp @@ -63,10 +63,6 @@ class Pack { * @symbol ?notifyDeleted\@Pack\@\@QEAAXXZ */ MCAPI void notifyDeleted(); - /** - * @symbol ?notifyUpdated\@Pack\@\@QEAAXXZ - */ - MCAPI void notifyUpdated(); /** * @symbol ?registerPackDeletedCallback\@Pack\@\@QEAAXPEAXV?$function\@$$A6AXAEAVPack\@\@\@Z\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp b/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp index 665adb17e0..de569ad0d1 100644 --- a/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp +++ b/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp @@ -36,62 +36,62 @@ class PackAccessStrategy { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?getPackSize\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_KXZ + * @symbol ?getPackSize\@ZipPackAccessStrategy\@\@UEBA_KXZ */ virtual unsigned __int64 getPackSize() const = 0; /** * @vftbl 2 - * @symbol ?getPackLocation\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBAAEBVResourceLocation\@\@XZ + * @symbol ?getPackLocation\@ZipPackAccessStrategy\@\@UEBAAEBVResourceLocation\@\@XZ */ virtual class ResourceLocation const & getPackLocation() const = 0; /** * @vftbl 3 - * @symbol ?getPackName\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPackName\@ZipPackAccessStrategy\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getPackName() const = 0; /** * @vftbl 4 - * @symbol ?isWritable\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NXZ + * @symbol ?isWritable\@ZipPackAccessStrategy\@\@UEBA_NXZ */ virtual bool isWritable() const = 0; /** * @vftbl 5 - * @symbol ?setIsTrusted\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAAX_N\@Z + * @symbol ?setIsTrusted\@ZipPackAccessStrategy\@\@UEAAX_N\@Z */ virtual void setIsTrusted(bool) = 0; /** * @vftbl 6 - * @symbol ?isTrusted\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NXZ + * @symbol ?isTrusted\@ZipPackAccessStrategy\@\@UEBA_NXZ */ virtual bool isTrusted() const = 0; /** * @vftbl 7 - * @symbol ?hasAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@_N1\@Z + * @symbol ?hasAsset\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@_N1\@Z */ virtual bool hasAsset(class Core::Path const &, bool, bool) const = 0; /** * @vftbl 8 - * @symbol ?hasFolder\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@\@Z + * @symbol ?hasFolder\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@\@Z */ virtual bool hasFolder(class Core::Path const &) const = 0; /** * @vftbl 9 - * @symbol ?getAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?getAsset\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual bool getAsset(class Core::Path const &, std::string &, bool) const = 0; /** * @vftbl 10 - * @symbol ?deleteAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAA_NAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z + * @symbol ?deleteAsset\@ZipPackAccessStrategy\@\@UEAA_NAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z */ virtual bool deleteAsset(class Core::PathBuffer const &) = 0; /** * @vftbl 11 - * @symbol ?writeAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAA_NAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?writeAsset\@ZipPackAccessStrategy\@\@UEAA_NAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool writeAsset(class Core::Path const &, std::string const &) = 0; /** * @vftbl 12 - * @symbol ?forEachIn\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@_N\@Z + * @symbol ?forEachIn\@ZipPackAccessStrategy\@\@UEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@_N\@Z */ virtual void forEachIn(class Core::Path const &, class std::function, bool) const = 0; /** @@ -111,7 +111,7 @@ class PackAccessStrategy { virtual class Core::PathBuffer const & getSubPath() const; /** * @vftbl 16 - * @symbol ?createSubPack\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?createSubPack\@ZipPackAccessStrategy\@\@UEBA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVPath\@Core\@\@\@Z */ virtual std::unique_ptr createSubPack(class Core::Path const &) const = 0; /** @@ -126,7 +126,7 @@ class PackAccessStrategy { virtual bool canRecurse() const; /** * @vftbl 19 - * @symbol ?unload\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAAXXZ + * @symbol ?unload\@ZipPackAccessStrategy\@\@UEAAXXZ */ virtual void unload() = 0; /** diff --git a/LiteLoader/include/llapi/mc/PackCapabilityRegistry.hpp b/LiteLoader/include/llapi/mc/PackCapabilityRegistry.hpp index 5bf983c924..9f2e697598 100644 --- a/LiteLoader/include/llapi/mc/PackCapabilityRegistry.hpp +++ b/LiteLoader/include/llapi/mc/PackCapabilityRegistry.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "PackCapability.hpp" #define BEFORE_EXTRA @@ -29,10 +28,6 @@ class PackCapabilityRegistry { * @symbol ??0PackCapabilityRegistry\@\@QEAA\@AEBV?$initializer_list\@VPackCapability\@\@\@std\@\@\@Z */ MCAPI PackCapabilityRegistry(class std::initializer_list const &); - /** - * @symbol ?lookup\@PackCapabilityRegistry\@\@QEBA?AV?$variant\@USucceeded\@ValidationResult\@PackCapability\@\@UFailed\@23\@UNotFound\@23\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z - */ - MCAPI class std::variant lookup(class std::basic_string_view>) const; /** * @symbol ?merge\@PackCapabilityRegistry\@\@QEAAXAEAV1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PackError.hpp b/LiteLoader/include/llapi/mc/PackError.hpp index 134c30bd74..038900a342 100644 --- a/LiteLoader/include/llapi/mc/PackError.hpp +++ b/LiteLoader/include/llapi/mc/PackError.hpp @@ -25,6 +25,7 @@ class PackError { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_PACKERROR public: class PackError& operator=(class PackError const &) = delete; + PackError(class PackError const &) = delete; PackError() = delete; #endif @@ -53,10 +54,6 @@ class PackError { * @symbol ??0PackError\@\@QEAA\@W4PackErrorType\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI PackError(enum class PackErrorType, std::vector const &); - /** - * @symbol ??0PackError\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI PackError(class PackError const &); /** * @symbol ?getErrorParameters\@PackError\@\@QEBAAEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PackIdVersion.hpp b/LiteLoader/include/llapi/mc/PackIdVersion.hpp index 5234cb5f59..727b58740a 100644 --- a/LiteLoader/include/llapi/mc/PackIdVersion.hpp +++ b/LiteLoader/include/llapi/mc/PackIdVersion.hpp @@ -55,10 +55,6 @@ struct PackIdVersion { * @symbol ??MPackIdVersion\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator<(struct PackIdVersion const &) const; - /** - * @symbol ??4PackIdVersion\@\@QEAAAEAU0\@$$QEAU0\@\@Z - */ - MCAPI struct PackIdVersion & operator=(struct PackIdVersion &&); /** * @symbol ??8PackIdVersion\@\@QEBA_NAEBU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PackInstance.hpp b/LiteLoader/include/llapi/mc/PackInstance.hpp index 8bbdb3ec50..20a8d4ce7f 100644 --- a/LiteLoader/include/llapi/mc/PackInstance.hpp +++ b/LiteLoader/include/llapi/mc/PackInstance.hpp @@ -47,17 +47,21 @@ class PackInstance { */ MCAPI void forEachIn(class Core::Path const &, class std::function, bool) const; /** - * @symbol ?getLoadTime\@PackInstance\@\@QEBANXZ + * @symbol ?getFolderName\@PackInstance\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ - MCAPI double getLoadTime() const; + MCAPI std::string const & getFolderName() const; /** - * @symbol ?getManifest\@PackInstance\@\@QEBAAEBVPackManifest\@\@XZ + * @symbol ?getLoadTime\@PackInstance\@\@QEBANXZ */ - MCAPI class PackManifest const & getManifest() const; + MCAPI double getLoadTime() const; /** * @symbol ?getManifest\@PackInstance\@\@QEAAAEAVPackManifest\@\@XZ */ MCAPI class PackManifest & getManifest(); + /** + * @symbol ?getManifest\@PackInstance\@\@QEBAAEBVPackManifest\@\@XZ + */ + MCAPI class PackManifest const & getManifest() const; /** * @symbol ?getPackCategory\@PackInstance\@\@QEBA?AW4PackCategory\@\@XZ */ @@ -90,10 +94,6 @@ class PackInstance { * @symbol ?getSubpackFolderName\@PackInstance\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getSubpackFolderName() const; - /** - * @symbol ?getSubpackIndex\@PackInstance\@\@QEBAHXZ - */ - MCAPI int getSubpackIndex() const; /** * @symbol ?getTierInfo\@PackInstance\@\@QEBA?AVContentTierInfo\@\@XZ */ @@ -110,10 +110,6 @@ class PackInstance { * @symbol ?isBaseGamePack\@PackInstance\@\@QEBA_NXZ */ MCAPI bool isBaseGamePack() const; - /** - * @symbol ?isSlicePack\@PackInstance\@\@QEBA_NXZ - */ - MCAPI bool isSlicePack() const; /** * @symbol ?isZipped\@PackInstance\@\@QEBA_NXZ */ @@ -126,10 +122,6 @@ class PackInstance { * @symbol ??8PackInstance\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class PackInstance const &) const; - /** - * @symbol ?setLocale\@PackInstance\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI void setLocale(std::string const &); /** * @symbol ??1PackInstance\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PackManifest.hpp b/LiteLoader/include/llapi/mc/PackManifest.hpp index 03dd8c27f2..8f03345a9f 100644 --- a/LiteLoader/include/llapi/mc/PackManifest.hpp +++ b/LiteLoader/include/llapi/mc/PackManifest.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "PackCapability.hpp" #include "Json.hpp" #define BEFORE_EXTRA @@ -60,34 +59,14 @@ struct CapabilityRegisterer { * @symbol ??0PackManifest\@\@QEAA\@AEBV0\@\@Z */ MCAPI PackManifest(class PackManifest const &); - /** - * @symbol ?addLegacyModuleDependency\@PackManifest\@\@QEAAXAEBULegacyPackIdVersion\@\@\@Z - */ - MCAPI void addLegacyModuleDependency(struct LegacyPackIdVersion const &); /** * @symbol ?addModule\@PackManifest\@\@QEAAXAEBVResourceInformation\@\@\@Z */ MCAPI void addModule(class ResourceInformation const &); - /** - * @symbol ?addModuleDependency\@PackManifest\@\@QEAAXAEBUModuleIdentifier\@\@\@Z - */ - MCAPI void addModuleDependency(struct ModuleIdentifier const &); - /** - * @symbol ?addPackCapability\@PackManifest\@\@QEAAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@W4TrustLevel\@PackCapability\@\@\@Z - */ - MCAPI void addPackCapability(class std::basic_string_view>, enum class PackCapability::TrustLevel); /** * @symbol ?addPackDependency\@PackManifest\@\@QEAAXAEBUPackIdVersion\@\@\@Z */ MCAPI void addPackDependency(struct PackIdVersion const &); - /** - * @symbol ?clearLegacyModuleDependencies\@PackManifest\@\@QEAAXXZ - */ - MCAPI void clearLegacyModuleDependencies(); - /** - * @symbol ?clearModules\@PackManifest\@\@QEAAXXZ - */ - MCAPI void clearModules(); /** * @symbol ?getContentIdentity\@PackManifest\@\@QEBAAEBVContentIdentity\@\@XZ */ @@ -108,10 +87,6 @@ struct CapabilityRegisterer { * @symbol ?getIdentity\@PackManifest\@\@QEBAAEBUPackIdVersion\@\@XZ */ MCAPI struct PackIdVersion const & getIdentity() const; - /** - * @symbol ?getLegacyModuleDependencies\@PackManifest\@\@QEBAAEBV?$vector\@ULegacyPackIdVersion\@\@V?$allocator\@ULegacyPackIdVersion\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector const & getLegacyModuleDependencies() const; /** * @symbol ?getLocation\@PackManifest\@\@QEBAAEBVResourceLocation\@\@XZ */ @@ -160,10 +135,6 @@ struct CapabilityRegisterer { * @symbol ?getPackScope\@PackManifest\@\@QEBA?AW4PackScope\@\@XZ */ MCAPI enum class PackScope getPackScope() const; - /** - * @symbol ?getPackSettings\@PackManifest\@\@QEBAAEBVValue\@Json\@\@XZ - */ - MCAPI class Json::Value const & getPackSettings() const; /** * @symbol ?getPackSize\@PackManifest\@\@QEBA_KXZ */ @@ -172,22 +143,10 @@ struct CapabilityRegisterer { * @symbol ?getPackType\@PackManifest\@\@QEBA?AW4PackType\@\@XZ */ MCAPI enum class PackType getPackType() const; - /** - * @symbol ?getRequiredBaseGameVersion\@PackManifest\@\@QEBAAEBVBaseGameVersion\@\@XZ - */ - MCAPI class BaseGameVersion const & getRequiredBaseGameVersion() const; /** * @symbol ?hasClientScript\@PackManifest\@\@QEBA_NXZ */ MCAPI bool hasClientScript() const; - /** - * @symbol ?hasEducationMetadata\@PackManifest\@\@QEBA_NXZ - */ - MCAPI bool hasEducationMetadata() const; - /** - * @symbol ?hasLegacyModuleDependencies\@PackManifest\@\@QEBA_NXZ - */ - MCAPI bool hasLegacyModuleDependencies() const; /** * @symbol ?hasModule\@PackManifest\@\@QEBA_NAEBUPackIdVersion\@\@\@Z */ @@ -216,14 +175,6 @@ struct CapabilityRegisterer { * @symbol ?isRestrictedPack\@PackManifest\@\@QEBA_NXZ */ MCAPI bool isRestrictedPack() const; - /** - * @symbol ?isUsingPackDescriptionKeyword\@PackManifest\@\@QEBA_NXZ - */ - MCAPI bool isUsingPackDescriptionKeyword() const; - /** - * @symbol ?isUsingPackNameKeyword\@PackManifest\@\@QEBA_NXZ - */ - MCAPI bool isUsingPackNameKeyword() const; /** * @symbol ?serialize\@PackManifest\@\@QEBAXW4PackManifestFormat\@\@AEAVValue\@Json\@\@\@Z */ @@ -232,46 +183,14 @@ struct CapabilityRegisterer { * @symbol ?setCanBeRedownloaded\@PackManifest\@\@QEAAX_N\@Z */ MCAPI void setCanBeRedownloaded(bool); - /** - * @symbol ?setContentIdentity\@PackManifest\@\@QEAAXAEBVContentIdentity\@\@\@Z - */ - MCAPI void setContentIdentity(class ContentIdentity const &); /** * @symbol ?setDescription\@PackManifest\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setDescription(std::string const &); - /** - * @symbol ?setFormatVersion\@PackManifest\@\@QEAAXW4PackManifestFormat\@\@\@Z - */ - MCAPI void setFormatVersion(enum class PackManifestFormat); - /** - * @symbol ?setHasClientScript\@PackManifest\@\@QEAAXXZ - */ - MCAPI void setHasClientScript(); - /** - * @symbol ?setHasEducationMetadata\@PackManifest\@\@QEAAX_N\@Z - */ - MCAPI void setHasEducationMetadata(bool); - /** - * @symbol ?setHasPlugins\@PackManifest\@\@QEAAX_N\@Z - */ - MCAPI void setHasPlugins(bool); - /** - * @symbol ?setHidden\@PackManifest\@\@QEAAX_N\@Z - */ - MCAPI void setHidden(bool); /** * @symbol ?setIdentity\@PackManifest\@\@QEAAXAEBUPackIdVersion\@\@\@Z */ MCAPI void setIdentity(struct PackIdVersion const &); - /** - * @symbol ?setInvalidUUID\@PackManifest\@\@QEAAXXZ - */ - MCAPI void setInvalidUUID(); - /** - * @symbol ?setLanguageCodesForPackKeywords\@PackManifest\@\@QEAAXV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z - */ - MCAPI void setLanguageCodesForPackKeywords(std::vector); /** * @symbol ?setLastModifiedDate\@PackManifest\@\@QEAAX_J\@Z */ @@ -280,34 +199,14 @@ struct CapabilityRegisterer { * @symbol ?setLocalizedNameKeywords\@PackManifest\@\@QEAAXAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void setLocalizedNameKeywords(class std::unordered_map, struct std::equal_to, class std::allocator>> const &); - /** - * @symbol ?setLocation\@PackManifest\@\@QEAAXAEBVResourceLocation\@\@\@Z - */ - MCAPI void setLocation(class ResourceLocation const &); /** * @symbol ?setManifestOrigin\@PackManifest\@\@QEAAXAEBW4ManifestOrigin\@\@\@Z */ MCAPI void setManifestOrigin(enum class ManifestOrigin const &); - /** - * @symbol ?setMetadata\@PackManifest\@\@QEAAXAEBVResourceMetadata\@\@\@Z - */ - MCAPI void setMetadata(class ResourceMetadata const &); - /** - * @symbol ?setMinEngineVersion\@PackManifest\@\@QEAAXAEBVSemVersion\@\@\@Z - */ - MCAPI void setMinEngineVersion(class SemVersion const &); /** * @symbol ?setName\@PackManifest\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setName(std::string const &); - /** - * @symbol ?setOptionLockedState\@PackManifest\@\@QEAAXW4TemplateLockState\@\@\@Z - */ - MCAPI void setOptionLockedState(enum class TemplateLockState); - /** - * @symbol ?setOriginalFormatVersion\@PackManifest\@\@QEAAXW4PackManifestFormat\@\@\@Z - */ - MCAPI void setOriginalFormatVersion(enum class PackManifestFormat); /** * @symbol ?setPackCapabilitiesTrusted\@PackManifest\@\@QEAAXXZ */ @@ -316,34 +215,10 @@ struct CapabilityRegisterer { * @symbol ?setPackCategory\@PackManifest\@\@QEAAXW4PackCategory\@\@\@Z */ MCAPI void setPackCategory(enum class PackCategory); - /** - * @symbol ?setPackOrigin\@PackManifest\@\@QEAAXW4PackOrigin\@\@\@Z - */ - MCAPI void setPackOrigin(enum class PackOrigin); - /** - * @symbol ?setPackScope\@PackManifest\@\@QEAAXW4PackScope\@\@\@Z - */ - MCAPI void setPackScope(enum class PackScope); - /** - * @symbol ?setPackSettings\@PackManifest\@\@QEAAXAEBVValue\@Json\@\@\@Z - */ - MCAPI void setPackSettings(class Json::Value const &); - /** - * @symbol ?setPackSize\@PackManifest\@\@QEAAX_K\@Z - */ - MCAPI void setPackSize(unsigned __int64); /** * @symbol ?setPackType\@PackManifest\@\@QEAAXW4PackType\@\@\@Z */ MCAPI void setPackType(enum class PackType); - /** - * @symbol ?setPlatformLocked\@PackManifest\@\@QEAAX_N\@Z - */ - MCAPI void setPlatformLocked(bool); - /** - * @symbol ?setRequiredBaseGameVersion\@PackManifest\@\@QEAAXAEBVBaseGameVersion\@\@\@Z - */ - MCAPI void setRequiredBaseGameVersion(class BaseGameVersion const &); /** * @symbol ?setSourceIdentity\@PackManifest\@\@QEAAXAEBVContentIdentity\@\@\@Z */ @@ -352,10 +227,6 @@ struct CapabilityRegisterer { * @symbol ?MarioPackId\@PackManifest\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const MarioPackId; - /** - * @symbol ?StringToPackScope\@PackManifest\@\@SA?AW4PackScope\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI static enum class PackScope StringToPackScope(std::string const &); //private: /** diff --git a/LiteLoader/include/llapi/mc/PackMetadata.hpp b/LiteLoader/include/llapi/mc/PackMetadata.hpp deleted file mode 100644 index dadc86fab2..0000000000 --- a/LiteLoader/include/llapi/mc/PackMetadata.hpp +++ /dev/null @@ -1,38 +0,0 @@ -/** - * @file PackMetadata.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class PackMetadata. - * - */ -class PackMetadata { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PACKMETADATA -public: - class PackMetadata& operator=(class PackMetadata const &) = delete; - PackMetadata(class PackMetadata const &) = delete; -#endif - -public: - /** - * @symbol ??0PackMetadata\@\@QEAA\@V?$unique_ptr\@UEducationMetadata\@\@U?$default_delete\@UEducationMetadata\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI PackMetadata(std::unique_ptr); - /** - * @symbol ??0PackMetadata\@\@QEAA\@XZ - */ - MCAPI PackMetadata(); - -}; diff --git a/LiteLoader/include/llapi/mc/PackReport.hpp b/LiteLoader/include/llapi/mc/PackReport.hpp index 0d28664513..fdcd294c3b 100644 --- a/LiteLoader/include/llapi/mc/PackReport.hpp +++ b/LiteLoader/include/llapi/mc/PackReport.hpp @@ -28,22 +28,18 @@ class PackReport { #endif public: - /** - * @symbol ??0PackReport\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI PackReport(class PackReport &&); /** * @symbol ??0PackReport\@\@QEAA\@AEBV0\@\@Z */ MCAPI PackReport(class PackReport const &); /** - * @symbol ??0PackReport\@\@QEAA\@XZ + * @symbol ??0PackReport\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI PackReport(); + MCAPI PackReport(class PackReport &&); /** - * @symbol ?getErrors\@PackReport\@\@QEBAAEBV?$vector\@V?$shared_ptr\@VPackError\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VPackError\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ??0PackReport\@\@QEAA\@XZ */ - MCAPI std::vector> const & getErrors() const; + MCAPI PackReport(); /** * @symbol ?getIdentity\@PackReport\@\@QEBAAEBUPackIdVersion\@\@XZ */ @@ -64,10 +60,6 @@ class PackReport { * @symbol ?getPackType\@PackReport\@\@QEBA?AW4PackType\@\@XZ */ MCAPI enum class PackType getPackType() const; - /** - * @symbol ?hasErrors\@PackReport\@\@QEAA_NW4PackErrorType\@\@\@Z - */ - MCAPI bool hasErrors(enum class PackErrorType); /** * @symbol ?hasErrors\@PackReport\@\@QEBA_NXZ */ @@ -76,30 +68,10 @@ class PackReport { * @symbol ?serialize\@PackReport\@\@QEAAXAEAVValue\@Json\@\@\@Z */ MCAPI void serialize(class Json::Value &); - /** - * @symbol ?setAttemptedUpgrade\@PackReport\@\@QEAAXXZ - */ - MCAPI void setAttemptedUpgrade(); - /** - * @symbol ?setIdentity\@PackReport\@\@QEAAXAEBUPackIdVersion\@\@\@Z - */ - MCAPI void setIdentity(struct PackIdVersion const &); /** * @symbol ?setLocation\@PackReport\@\@QEAAXAEBVResourceLocation\@\@\@Z */ MCAPI void setLocation(class ResourceLocation const &); - /** - * @symbol ?setOriginalIdentity\@PackReport\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z - */ - MCAPI void setOriginalIdentity(std::string const &, std::string const &); - /** - * @symbol ?setPackType\@PackReport\@\@QEAAXW4PackType\@\@\@Z - */ - MCAPI void setPackType(enum class PackType); - /** - * @symbol ?setUpgradeSuccess\@PackReport\@\@QEAAXXZ - */ - MCAPI void setUpgradeSuccess(); /** * @symbol ?wasUpgraded\@PackReport\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/PackSettings.hpp b/LiteLoader/include/llapi/mc/PackSettings.hpp index 395ec5d104..cb37d929a7 100644 --- a/LiteLoader/include/llapi/mc/PackSettings.hpp +++ b/LiteLoader/include/llapi/mc/PackSettings.hpp @@ -26,13 +26,10 @@ class PackSettings { public: class PackSettings& operator=(class PackSettings const &) = delete; PackSettings(class PackSettings const &) = delete; + PackSettings() = delete; #endif public: - /** - * @symbol ??0PackSettings\@\@QEAA\@XZ - */ - MCAPI PackSettings(); /** * @symbol ?getAllSettings\@PackSettings\@\@QEBAAEBVValue\@Json\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PackSettingsFactory.hpp b/LiteLoader/include/llapi/mc/PackSettingsFactory.hpp index 7d1dae669e..12759f473f 100644 --- a/LiteLoader/include/llapi/mc/PackSettingsFactory.hpp +++ b/LiteLoader/include/llapi/mc/PackSettingsFactory.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -33,5 +34,9 @@ class PackSettingsFactory { * @symbol ?getPackSettings\@PackSettingsFactory\@\@QEAAPEAVPackSettings\@\@AEBVPackManifest\@\@\@Z */ MCAPI class PackSettings * getPackSettings(class PackManifest const &); + /** + * @symbol ?loadPackSettings\@PackSettingsFactory\@\@QEAAPEAVPackSettings\@\@AEBUPackIdVersion\@\@AEBVValue\@Json\@\@\@Z + */ + MCAPI class PackSettings * loadPackSettings(struct PackIdVersion const &, class Json::Value const &); }; diff --git a/LiteLoader/include/llapi/mc/PackSourceFactory.hpp b/LiteLoader/include/llapi/mc/PackSourceFactory.hpp index 600e806f8c..373033fabf 100644 --- a/LiteLoader/include/llapi/mc/PackSourceFactory.hpp +++ b/LiteLoader/include/llapi/mc/PackSourceFactory.hpp @@ -106,36 +106,6 @@ class PackSourceFactory { * @symbol ?setDynamicPackageRoot\@PackSourceFactory\@\@UEAAXV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z */ virtual void setDynamicPackageRoot(class Core::PathBuffer); - /** - * @vftbl 15 - * @symbol __unk_vfn_15 - */ - virtual void __unk_vfn_15(); - /** - * @vftbl 16 - * @symbol __unk_vfn_16 - */ - virtual void __unk_vfn_16(); - /** - * @vftbl 17 - * @symbol __unk_vfn_17 - */ - virtual void __unk_vfn_17(); - /** - * @vftbl 18 - * @symbol __unk_vfn_18 - */ - virtual void __unk_vfn_18(); - /** - * @vftbl 19 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z - */ - virtual void _Delete_this(bool); - /** - * @vftbl 20 - * @symbol ?_Get\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEBAPEBXXZ - */ - virtual void const * _Get() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKSOURCEFACTORY /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/Packet.hpp b/LiteLoader/include/llapi/mc/Packet.hpp index ca0b3ec050..aceb8185da 100644 --- a/LiteLoader/include/llapi/mc/Packet.hpp +++ b/LiteLoader/include/llapi/mc/Packet.hpp @@ -74,17 +74,17 @@ class Packet { virtual ~Packet(); /** * @vftbl 1 - * @symbol ?getId\@ChangeMobPropertyPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @symbol ?getId\@CreatePhotoPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const = 0; /** * @vftbl 2 - * @symbol ?getName\@ChangeMobPropertyPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@CreatePhotoPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const = 0; /** * @vftbl 3 - * @symbol ?write\@ChangeMobPropertyPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @symbol ?write\@CreatePhotoPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const = 0; /** @@ -104,7 +104,7 @@ class Packet { virtual bool isValid() const; /** * @vftbl 7 - * @symbol ?_read\@ChangeMobPropertyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CreatePhotoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &) = 0; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKET diff --git a/LiteLoader/include/llapi/mc/PacketHeader.hpp b/LiteLoader/include/llapi/mc/PacketHeader.hpp deleted file mode 100644 index ecaa918503..0000000000 --- a/LiteLoader/include/llapi/mc/PacketHeader.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file PacketHeader.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class PacketHeader. - * - */ -class PacketHeader { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PACKETHEADER -public: - class PacketHeader& operator=(class PacketHeader const &) = delete; - PacketHeader(class PacketHeader const &) = delete; - PacketHeader() = delete; -#endif - -public: - /** - * @symbol ?getChannel\@PacketHeader\@\@QEBAIXZ - */ - MCAPI unsigned int getChannel() const; - -}; diff --git a/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp b/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp index 3a9b73176b..1bf7e1e2fa 100644 --- a/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp +++ b/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp @@ -60,13 +60,13 @@ class PacketViolationWarningPacket : public Packet { */ MCVAPI ~PacketViolationWarningPacket(); #endif - /** - * @symbol ??0PacketViolationWarningPacket\@\@QEAA\@W4StreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI PacketViolationWarningPacket(enum class StreamReadResult, enum class PacketViolationResponse, enum class MinecraftPacketIds, std::string const &); /** * @symbol ??0PacketViolationWarningPacket\@\@QEAA\@XZ */ MCAPI PacketViolationWarningPacket(); + /** + * @symbol ??0PacketViolationWarningPacket\@\@QEAA\@W4StreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI PacketViolationWarningPacket(enum class StreamReadResult, enum class PacketViolationResponse, enum class MinecraftPacketIds, std::string const &); }; diff --git a/LiteLoader/include/llapi/mc/ParameterList.hpp b/LiteLoader/include/llapi/mc/ParameterList.hpp index b35d16d855..33f2ff0456 100644 --- a/LiteLoader/include/llapi/mc/ParameterList.hpp +++ b/LiteLoader/include/llapi/mc/ParameterList.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "RTree.hpp" #define BEFORE_EXTRA @@ -36,10 +35,6 @@ class ParameterList { * @symbol ??0ParameterList\@\@QEAA\@AEBV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@\@Z */ MCAPI ParameterList(std::vector const &); - /** - * @symbol ?findTarget\@ParameterList\@\@QEBAPEAVBiome\@\@AEBUTargetPoint\@\@PEAUHint\@RTree\@\@\@Z - */ - MCAPI class Biome * findTarget(struct TargetPoint const &, struct RTree::Hint *) const; /** * @symbol ??1ParameterList\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Parrot.hpp b/LiteLoader/include/llapi/mc/Parrot.hpp index ebfdda52f7..2cd2cd557d 100644 --- a/LiteLoader/include/llapi/mc/Parrot.hpp +++ b/LiteLoader/include/llapi/mc/Parrot.hpp @@ -186,11 +186,6 @@ class Parrot : public Animal { * @symbol __unk_vfn_275 */ virtual void __unk_vfn_275(); - /** - * @vftbl 288 - * @symbol ?aiStep\@Parrot\@\@UEAAXXZ - */ - virtual void aiStep(); /** * @vftbl 301 * @symbol __unk_vfn_301 diff --git a/LiteLoader/include/llapi/mc/ParrotPostAIStepSystem.hpp b/LiteLoader/include/llapi/mc/ParrotPostAIStepSystem.hpp deleted file mode 100644 index 30483d4212..0000000000 --- a/LiteLoader/include/llapi/mc/ParrotPostAIStepSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file ParrotPostAIStepSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ParrotPostAIStepSystem. - * - */ -class ParrotPostAIStepSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PARROTPOSTAISTEPSYSTEM -public: - class ParrotPostAIStepSystem& operator=(class ParrotPostAIStepSystem const &) = delete; - ParrotPostAIStepSystem(class ParrotPostAIStepSystem const &) = delete; - ParrotPostAIStepSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@ParrotPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doParrotPostAIStepSystem\@ParrotPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doParrotPostAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; diff --git a/LiteLoader/include/llapi/mc/Parser.hpp b/LiteLoader/include/llapi/mc/Parser.hpp index de404ca875..78a1d1c2e0 100644 --- a/LiteLoader/include/llapi/mc/Parser.hpp +++ b/LiteLoader/include/llapi/mc/Parser.hpp @@ -30,10 +30,18 @@ class Parser { #endif public: + /** + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAUActorDefinitionIdentifier\@\@PEBD3\@Z + */ + MCAPI static void parse(class Json::Value const &, class SemVersion const &, struct ActorDefinitionIdentifier &, char const *, char const *); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVBlockDescriptor\@\@\@Z */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, class BlockDescriptor &); + /** + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVItemDescriptor\@\@\@Z + */ + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ItemDescriptor &); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAMPEBDM\@Z */ @@ -43,89 +51,73 @@ class Parser { */ MCAPI static bool parse(class Json::Value const &, class SemVersion const &, enum class FilterSubject &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVDefinitionTrigger\@\@_N\@Z - */ - MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class DefinitionTrigger &, bool); - /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4ActorType\@\@PEBD3\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAHPEBDH\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class ActorType &, char const *, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, int &, char const *, int); /** - * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVItemDescriptor\@\@\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVVec3\@\@PEBDAEBV5\@\@Z */ - MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ItemDescriptor &); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, class Vec3 &, char const *, class Vec3 const &); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV23\@PEBD\@Z */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, class Json::Value &, char const *); - /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@PEBD\@Z - */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &, char const *); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAEE\@Z */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, unsigned char &, unsigned char); /** - * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVActorDefinitionTrigger\@\@PEBD\@Z - */ - MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ActorDefinitionTrigger &, char const *); - /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAIPEBDI\@Z + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVActorDefinitionTrigger\@\@_N\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, unsigned int &, char const *, unsigned int); + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ActorDefinitionTrigger &, bool); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVHashedString\@\@PEBD3\@Z */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, class HashedString &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &); - /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAHPEBDH\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAIPEBDI\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, int &, char const *, int); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, unsigned int &, char const *, unsigned int); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD3\@Z + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVActorDefinitionTrigger\@\@PEBD\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::string &, char const *, char const *); + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ActorDefinitionTrigger &, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVVec3\@\@PEBDAEBV5\@\@Z + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVDefinitionTrigger\@\@_N\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, class Vec3 &, char const *, class Vec3 const &); + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class DefinitionTrigger &, bool); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAUIntRange\@\@PEBDHH\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@PEBD\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, struct IntRange &, char const *, int, int); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &, char const *); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4ParticleType\@\@PEBD3\@Z */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class ParticleType &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAUActorDefinitionIdentifier\@\@PEBD3\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, struct ActorDefinitionIdentifier &, char const *, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@W4LevelSoundEvent\@\@V?$allocator\@W4LevelSoundEvent\@\@\@std\@\@\@std\@\@PEBD3\@Z */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &, char const *, char const *); + /** + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD3\@Z + */ + MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::string &, char const *, char const *); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4Difficulty\@\@PEBD3\@Z */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class Difficulty &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVMobEffectInstance\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4ActorType\@\@PEBD3\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, class MobEffectInstance &, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class ActorType &, char const *, char const *); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEA_NPEBD_N\@Z */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, bool &, char const *, bool); - /** - * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVActorDefinitionTrigger\@\@_N\@Z - */ - MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ActorDefinitionTrigger &, bool); /** * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VActorDefinitionTrigger\@\@V?$allocator\@VActorDefinitionTrigger\@\@\@std\@\@\@std\@\@\@Z */ @@ -138,6 +130,10 @@ class Parser { * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static bool parse(class Json::Value const &, class SemVersion const &, std::vector &); + /** + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVMobEffectInstance\@\@PEBD\@Z + */ + MCAPI static void parse(class Json::Value const &, class SemVersion const &, class MobEffectInstance &, char const *); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$WeightedChoices\@VActorDefinitionTrigger\@\@\@\@PEBD\@Z */ @@ -151,17 +147,17 @@ class Parser { */ MCAPI static void serialize(class ActorDefinitionTrigger const &, class Json::Value &, char const *); /** - * @symbol ?serialize\@Parser\@\@SAXAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?serialize\@Parser\@\@SAXAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@PEBD\@Z */ - MCAPI static void serialize(std::vector const &, class Json::Value &, char const *); + MCAPI static void serialize(std::vector const &, class Json::Value &, char const *); /** - * @symbol ?serialize\@Parser\@\@SAXAEBW4FilterSubject\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?serialize\@Parser\@\@SAXAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@PEBD\@Z */ - MCAPI static void serialize(enum class FilterSubject const &, class Json::Value &, char const *); + MCAPI static void serialize(std::vector const &, class Json::Value &, char const *); /** - * @symbol ?serialize\@Parser\@\@SAXAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?serialize\@Parser\@\@SAXAEBUFloatRange\@\@AEAVValue\@Json\@\@PEBD\@Z */ - MCAPI static void serialize(std::vector const &, class Json::Value &, char const *); + MCAPI static void serialize(struct FloatRange const &, class Json::Value &, char const *); /** * @symbol ?serialize\@Parser\@\@SAXAEBUActorDefinitionIdentifier\@\@AEAVValue\@Json\@\@PEBD\@Z */ @@ -171,9 +167,9 @@ class Parser { */ MCAPI static void serialize(enum class ParticleType const &, class Json::Value &, char const *); /** - * @symbol ?serialize\@Parser\@\@SAXAEBUFloatRange\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?serialize\@Parser\@\@SAXAEBW4FilterSubject\@\@AEAVValue\@Json\@\@PEBD\@Z */ - MCAPI static void serialize(struct FloatRange const &, class Json::Value &, char const *); + MCAPI static void serialize(enum class FilterSubject const &, class Json::Value &, char const *); /** * @symbol ?serialize\@Parser\@\@SAXAEBW4ActorType\@\@AEAVValue\@Json\@\@PEBD\@Z */ diff --git a/LiteLoader/include/llapi/mc/ParticleCommand.hpp b/LiteLoader/include/llapi/mc/ParticleCommand.hpp index 6731032591..3faef759fd 100644 --- a/LiteLoader/include/llapi/mc/ParticleCommand.hpp +++ b/LiteLoader/include/llapi/mc/ParticleCommand.hpp @@ -36,7 +36,7 @@ class ParticleCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@ParticleCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ParticleEventRequestQueueComponent.hpp b/LiteLoader/include/llapi/mc/ParticleEventRequestQueueComponent.hpp index c8ea046142..d588756cc6 100644 --- a/LiteLoader/include/llapi/mc/ParticleEventRequestQueueComponent.hpp +++ b/LiteLoader/include/llapi/mc/ParticleEventRequestQueueComponent.hpp @@ -31,9 +31,5 @@ struct ParticleEventRequestQueueComponent { * @symbol ??0ParticleEventRequestQueueComponent\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI ParticleEventRequestQueueComponent(struct ParticleEventRequestQueueComponent &&); - /** - * @symbol ??1ParticleEventRequestQueueComponent\@\@QEAA\@XZ - */ - MCAPI ~ParticleEventRequestQueueComponent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PassengerFreezeMovementSystem.hpp b/LiteLoader/include/llapi/mc/PassengerFreezeMovementSystem.hpp index a32117fa00..874da388a4 100644 --- a/LiteLoader/include/llapi/mc/PassengerFreezeMovementSystem.hpp +++ b/LiteLoader/include/llapi/mc/PassengerFreezeMovementSystem.hpp @@ -35,5 +35,9 @@ class PassengerFreezeMovementSystem { * @symbol ?freezeMovement\@PassengerFreezeMovementSystem\@\@SAXAEAVStrictEntityContext\@\@AEAUStateVectorComponent\@\@\@Z */ MCAPI static void freezeMovement(class StrictEntityContext &, struct StateVectorComponent &); + /** + * @symbol ?tickPassengerFreezeMovementSystem\@PassengerFreezeMovementSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPassengerComponent\@\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@UStateVectorComponent\@\@\@\@\@Z + */ + MCAPI static void tickPassengerFreezeMovementSystem(class ViewT>, struct StateVectorComponent>); }; diff --git a/LiteLoader/include/llapi/mc/PassengerNeedsPostPositioningSystem.hpp b/LiteLoader/include/llapi/mc/PassengerNeedsPostPositioningSystem.hpp index 35942a28e2..82363e3a86 100644 --- a/LiteLoader/include/llapi/mc/PassengerNeedsPostPositioningSystem.hpp +++ b/LiteLoader/include/llapi/mc/PassengerNeedsPostPositioningSystem.hpp @@ -31,6 +31,10 @@ class PassengerNeedsPostPositioningSystem { * @symbol ?_addPositionPassengerRequestComponent\@PassengerNeedsPostPositioningSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@$$CBUPendingRemovePassengersComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UServerPlayerComponentFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@\@\@$$CBUVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@3V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPositionPassengerRequestComponent\@\@\@\@\@Z */ MCAPI static void _addPositionPassengerRequestComponent(class StrictEntityContext &, struct PassengerComponent const &, class ViewT, struct PendingRemovePassengersComponent const>, class ViewT const>, class ViewT const>, class ViewT>, struct VehicleComponent const>, class ViewT>, struct VehicleComponent const, struct SynchedActorDataComponent const>, class ViewT const>, class EntityModifierT); + /** + * @symbol ?_tickPassengerNeedsPostPositioningSystem\@PassengerNeedsPostPositioningSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Exclude\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUPassengerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@$$CBUPendingRemovePassengersComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UServerPlayerComponentFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@\@\@$$CBUVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@2V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPositionPassengerRequestComponent\@\@\@\@\@Z + */ + MCAPI static void _tickPassengerNeedsPostPositioningSystem(class ViewT>, struct Include>, struct PassengerComponent const>, class ViewT, struct PendingRemovePassengersComponent const>, class ViewT const>, class ViewT const>, class ViewT>, struct VehicleComponent const>, class ViewT>, struct VehicleComponent const, struct SynchedActorDataComponent const>, class ViewT const>, class EntityModifierT); /** * @symbol ?createSystem\@PassengerNeedsPostPositioningSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PassengerPositionSelfSystem.hpp b/LiteLoader/include/llapi/mc/PassengerPositionSelfSystem.hpp index 54ab0bd951..c1d17e9ca6 100644 --- a/LiteLoader/include/llapi/mc/PassengerPositionSelfSystem.hpp +++ b/LiteLoader/include/llapi/mc/PassengerPositionSelfSystem.hpp @@ -37,6 +37,10 @@ class PassengerPositionSelfSystem { * @symbol ?_doPassengerPositionSelfSystem\@PassengerPositionSelfSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUPassengerComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPositionPassengerRequestComponent\@\@\@\@\@Z */ MCAPI static void _doPassengerPositionSelfSystem(class StrictEntityContext const &, struct PassengerComponent const &, class EntityModifierT); + /** + * @symbol ?_tickPassengerPositionSelfSystem\@PassengerPositionSelfSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUPassengerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPositionPassengerRequestComponent\@\@\@\@\@Z + */ + MCAPI static void _tickPassengerPositionSelfSystem(class ViewT>, struct PassengerComponent const>, class EntityModifierT); private: diff --git a/LiteLoader/include/llapi/mc/PathFinderHackUtils.hpp b/LiteLoader/include/llapi/mc/PathFinderHackUtils.hpp deleted file mode 100644 index bebb7b43ab..0000000000 --- a/LiteLoader/include/llapi/mc/PathFinderHackUtils.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file PathFinderHackUtils.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace PathFinderHackUtils. - * - */ -namespace PathFinderHackUtils { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?canUseFreeStartNodeCheck\@PathFinderHackUtils\@\@YA_NW4ActorType\@\@\@Z - */ - MCAPI bool canUseFreeStartNodeCheck(enum class ActorType); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PathFinderUtils.hpp b/LiteLoader/include/llapi/mc/PathFinderUtils.hpp deleted file mode 100644 index 7b8634916e..0000000000 --- a/LiteLoader/include/llapi/mc/PathFinderUtils.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @file PathFinderUtils.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace PathFinderUtils. - * - */ -namespace PathFinderUtils { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?getActorRadius\@PathFinderUtils\@\@YAMAEBVActor\@\@\@Z - */ - MCAPI float getActorRadius(class Actor const &); - /** - * @symbol ?getMaxJumpHeight\@PathFinderUtils\@\@YAMAEBVActor\@\@\@Z - */ - MCAPI float getMaxJumpHeight(class Actor const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PathfinderNode.hpp b/LiteLoader/include/llapi/mc/PathfinderNode.hpp index cb2bcebdd8..b08bcce3a2 100644 --- a/LiteLoader/include/llapi/mc/PathfinderNode.hpp +++ b/LiteLoader/include/llapi/mc/PathfinderNode.hpp @@ -28,14 +28,14 @@ class PathfinderNode { #endif public: - /** - * @symbol ??0PathfinderNode\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI PathfinderNode(class PathfinderNode const &); /** * @symbol ??0PathfinderNode\@\@QEAA\@AEBVBlockPos\@\@W4NodeType\@\@\@Z */ MCAPI PathfinderNode(class BlockPos const &, enum class NodeType); + /** + * @symbol ??0PathfinderNode\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI PathfinderNode(class PathfinderNode const &); /** * @symbol ?distanceTo\@PathfinderNode\@\@QEBAMPEAV1\@\@Z */ @@ -48,10 +48,6 @@ class PathfinderNode { * @symbol ?equals\@PathfinderNode\@\@QEAA_NPEAV1\@\@Z */ MCAPI bool equals(class PathfinderNode *); - /** - * @symbol ?getCostMalus\@PathfinderNode\@\@QEBAMXZ - */ - MCAPI float getCostMalus() const; /** * @symbol ?getType\@PathfinderNode\@\@QEBA?AW4NodeType\@\@XZ */ @@ -60,13 +56,5 @@ class PathfinderNode { * @symbol ?inOpenSet\@PathfinderNode\@\@QEAA_NXZ */ MCAPI bool inOpenSet(); - /** - * @symbol ?setCostMalus\@PathfinderNode\@\@QEAAXM\@Z - */ - MCAPI void setCostMalus(float); - /** - * @symbol ?setMoveMalus\@PathfinderNode\@\@QEAAXM\@Z - */ - MCAPI void setMoveMalus(float); }; diff --git a/LiteLoader/include/llapi/mc/PauseScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/PauseScreenCapabilities.hpp index 6b680fd40b..5add41cfad 100644 --- a/LiteLoader/include/llapi/mc/PauseScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/PauseScreenCapabilities.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -12,7 +13,7 @@ #undef BEFORE_EXTRA -class PauseScreenCapabilities { +struct PauseScreenCapabilities { #define AFTER_EXTRA // Add Member There @@ -20,8 +21,8 @@ class PauseScreenCapabilities { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_PAUSESCREENCAPABILITIES public: - class PauseScreenCapabilities& operator=(class PauseScreenCapabilities const &) = delete; - PauseScreenCapabilities(class PauseScreenCapabilities const &) = delete; + struct PauseScreenCapabilities& operator=(struct PauseScreenCapabilities const &) = delete; + PauseScreenCapabilities(struct PauseScreenCapabilities const &) = delete; PauseScreenCapabilities() = delete; #endif @@ -33,9 +34,9 @@ class PauseScreenCapabilities { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@UPauseScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @symbol ?isOfType\@?$TypedScreenCapabilities\@UPauseScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@Bedrock\@\@\@Z */ - virtual bool isOfType(class typeid_t) const; + virtual bool isOfType(class Bedrock::typeid_t) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PAUSESCREENCAPABILITIES /** * @symbol __unk_destructor_-1 @@ -43,4 +44,4 @@ class PauseScreenCapabilities { MCVAPI ~PauseScreenCapabilities(); #endif -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PendingRemovePassengersSystemImpl.hpp b/LiteLoader/include/llapi/mc/PendingRemovePassengersSystemImpl.hpp new file mode 100644 index 0000000000..8df4e36e18 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PendingRemovePassengersSystemImpl.hpp @@ -0,0 +1,32 @@ +/** + * @file PendingRemovePassengersSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class PendingRemovePassengersSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PENDINGREMOVEPASSENGERSSYSTEMIMPL +public: + class PendingRemovePassengersSystemImpl& operator=(class PendingRemovePassengersSystemImpl const &) = delete; + PendingRemovePassengersSystemImpl(class PendingRemovePassengersSystemImpl const &) = delete; + PendingRemovePassengersSystemImpl() = delete; +#endif + +public: + /** + * @symbol ?pendingRemovePassengersSystem\@PendingRemovePassengersSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUVehicleComponent\@\@$$CBUPendingRemovePassengersComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPendingRemovePassengersComponent\@\@URemovePassengersComponent\@\@\@\@\@Z + */ + MCAPI static void pendingRemovePassengersSystem(class ViewT>, struct VehicleComponent const, struct PendingRemovePassengersComponent const>, class EntityModifierT); + +}; diff --git a/LiteLoader/include/llapi/mc/PerformEnvDeleter.hpp b/LiteLoader/include/llapi/mc/PerformEnvDeleter.hpp deleted file mode 100644 index 43979e89ec..0000000000 --- a/LiteLoader/include/llapi/mc/PerformEnvDeleter.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file PerformEnvDeleter.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -class PerformEnvDeleter { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PERFORMENVDELETER -public: - class PerformEnvDeleter& operator=(class PerformEnvDeleter const &) = delete; - PerformEnvDeleter(class PerformEnvDeleter const &) = delete; - PerformEnvDeleter() = delete; -#endif - -public: - /** - * @symbol ??RPerformEnvDeleter\@\@QEAAXPEAUHC_PERFORM_ENV\@\@\@Z - */ - MCAPI void operator()(struct HC_PERFORM_ENV *); - -}; diff --git a/LiteLoader/include/llapi/mc/Performance.hpp b/LiteLoader/include/llapi/mc/Performance.hpp new file mode 100644 index 0000000000..71388187bd --- /dev/null +++ b/LiteLoader/include/llapi/mc/Performance.hpp @@ -0,0 +1,32 @@ +/** + * @file Performance.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class Performance { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PERFORMANCE +public: + class Performance& operator=(class Performance const &) = delete; + Performance(class Performance const &) = delete; + Performance() = delete; +#endif + +public: + /** + * @symbol ?watches\@Performance\@\@2VStopwatchHandler\@\@A + */ + MCAPI static class StopwatchHandler watches; + +}; diff --git a/LiteLoader/include/llapi/mc/PerlinNoise.hpp b/LiteLoader/include/llapi/mc/PerlinNoise.hpp index 8f27a97072..7b095cd71a 100644 --- a/LiteLoader/include/llapi/mc/PerlinNoise.hpp +++ b/LiteLoader/include/llapi/mc/PerlinNoise.hpp @@ -33,25 +33,25 @@ class PerlinNoise { */ MCAPI PerlinNoise(class PerlinNoise const &); /** - * @symbol ??0PerlinNoise\@\@QEAA\@AEAVIRandom\@\@UYBlendingBugSettings\@\@HH\@Z + * @symbol ??0PerlinNoise\@\@QEAA\@IHH\@Z */ - MCAPI PerlinNoise(class IRandom &, struct YBlendingBugSettings, int, int); + MCAPI PerlinNoise(unsigned int, int, int); /** * @symbol ??0PerlinNoise\@\@QEAA\@AEAVIRandom\@\@HH\@Z */ MCAPI PerlinNoise(class IRandom &, int, int); /** - * @symbol ??0PerlinNoise\@\@QEAA\@IHH\@Z - */ - MCAPI PerlinNoise(unsigned int, int, int); - /** - * @symbol ?getRegion\@PerlinNoise\@\@QEBAXPEAMAEBVVec3\@\@HHH1\@Z + * @symbol ??0PerlinNoise\@\@QEAA\@AEAVIRandom\@\@UYBlendingBugSettings\@\@HH\@Z */ - MCAPI void getRegion(float *, class Vec3 const &, int, int, int, class Vec3 const &) const; + MCAPI PerlinNoise(class IRandom &, struct YBlendingBugSettings, int, int); /** * @symbol ?getRegion\@PerlinNoise\@\@QEBAXPEAMAEBVVec2\@\@HH1M\@Z */ MCAPI void getRegion(float *, class Vec2 const &, int, int, class Vec2 const &, float) const; + /** + * @symbol ?getRegion\@PerlinNoise\@\@QEBAXPEAMAEBVVec3\@\@HHH1\@Z + */ + MCAPI void getRegion(float *, class Vec3 const &, int, int, int, class Vec3 const &) const; /** * @symbol ?getValue\@PerlinNoise\@\@QEBAMAEBVVec3\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp b/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp index 06bc8aba44..7b538010f1 100644 --- a/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp +++ b/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp @@ -28,6 +28,10 @@ class PerlinSimplexNoise { #endif public: + /** + * @symbol ??0PerlinSimplexNoise\@\@QEAA\@AEAVIRandom\@\@H_N\@Z + */ + MCAPI PerlinSimplexNoise(class IRandom &, int, bool); /** * @symbol ??0PerlinSimplexNoise\@\@QEAA\@IH\@Z */ @@ -36,22 +40,18 @@ class PerlinSimplexNoise { * @symbol ??0PerlinSimplexNoise\@\@QEAA\@AEBV0\@\@Z */ MCAPI PerlinSimplexNoise(class PerlinSimplexNoise const &); - /** - * @symbol ??0PerlinSimplexNoise\@\@QEAA\@AEAVIRandom\@\@H_N\@Z - */ - MCAPI PerlinSimplexNoise(class IRandom &, int, bool); /** * @symbol ?getRegion\@PerlinSimplexNoise\@\@QEBAPEAMPEAMAEBVVec2\@\@HH1MM\@Z */ MCAPI float * getRegion(float *, class Vec2 const &, int, int, class Vec2 const &, float, float) const; - /** - * @symbol ?getValue\@PerlinSimplexNoise\@\@QEBAMAEBVVec3\@\@\@Z - */ - MCAPI float getValue(class Vec3 const &) const; /** * @symbol ?getValue\@PerlinSimplexNoise\@\@QEBAMMM\@Z */ MCAPI float getValue(float, float) const; + /** + * @symbol ?getValue\@PerlinSimplexNoise\@\@QEBAMAEBVVec3\@\@\@Z + */ + MCAPI float getValue(class Vec3 const &) const; /** * @symbol ?getValueNormalized\@PerlinSimplexNoise\@\@QEBAMMM\@Z */ diff --git a/LiteLoader/include/llapi/mc/PermissionCommand.hpp b/LiteLoader/include/llapi/mc/PermissionCommand.hpp index c0215dc49a..35c387e76a 100644 --- a/LiteLoader/include/llapi/mc/PermissionCommand.hpp +++ b/LiteLoader/include/llapi/mc/PermissionCommand.hpp @@ -36,7 +36,7 @@ class PermissionCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@PermissionCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/PermissionsHandler.hpp b/LiteLoader/include/llapi/mc/PermissionsHandler.hpp index dd4038009b..87190e3425 100644 --- a/LiteLoader/include/llapi/mc/PermissionsHandler.hpp +++ b/LiteLoader/include/llapi/mc/PermissionsHandler.hpp @@ -4,7 +4,7 @@ */ #pragma once #define AUTO_GENERATED -#include "../Global.h" +#include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/include/llapi/mc/PersistentBlendData.hpp b/LiteLoader/include/llapi/mc/PersistentBlendData.hpp deleted file mode 100644 index da322a684c..0000000000 --- a/LiteLoader/include/llapi/mc/PersistentBlendData.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file PersistentBlendData.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure PersistentBlendData. - * - */ -struct PersistentBlendData { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PERSISTENTBLENDDATA -public: - struct PersistentBlendData& operator=(struct PersistentBlendData const &) = delete; - PersistentBlendData(struct PersistentBlendData const &) = delete; - PersistentBlendData() = delete; -#endif - -public: - /** - * @symbol ??0PersistentBlendData\@\@QEAA\@AEAVStringByteInput\@\@\@Z - */ - MCAPI PersistentBlendData(class StringByteInput &); - /** - * @symbol ?serialize\@PersistentBlendData\@\@QEBAXAEAVStringByteOutput\@\@\@Z - */ - MCAPI void serialize(class StringByteOutput &) const; - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PersonaEmoteInputSystem.hpp b/LiteLoader/include/llapi/mc/PersonaEmoteInputSystem.hpp index 5f32372e87..1a42d1b780 100644 --- a/LiteLoader/include/llapi/mc/PersonaEmoteInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/PersonaEmoteInputSystem.hpp @@ -27,10 +27,6 @@ class PersonaEmoteInputSystem { #endif public: - /** - * @symbol ?createSideBySideResultSystem\@PersonaEmoteInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSideBySideResultSystem(); /** * @symbol ?createSystem\@PersonaEmoteInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ @@ -41,6 +37,10 @@ class PersonaEmoteInputSystem { * @symbol ?_personaEmoteInputSystem\@PersonaEmoteInputSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUEventingDispatcherComponent\@\@AEBUEmotePlayedTelemetryDataComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UEventingRequestQueueComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UEmotePlayedTelemetryDataComponent\@\@UShouldStopEmotingRequestComponent\@\@\@\@\@Z */ MCAPI static void _personaEmoteInputSystem(class StrictEntityContext const &, struct EventingDispatcherComponent const &, struct EmotePlayedTelemetryDataComponent const &, class ViewT, class EntityModifierT); + /** + * @symbol ?_tickPersonaEmoteInputSystem\@PersonaEmoteInputSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UShouldStopEmotingRequestComponent\@\@\@\@$$CBUEventingDispatcherComponent\@\@$$CBUEmotePlayedTelemetryDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UEventingRequestQueueComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UEmotePlayedTelemetryDataComponent\@\@UShouldStopEmotingRequestComponent\@\@\@\@\@Z + */ + MCAPI static void _tickPersonaEmoteInputSystem(class ViewT, struct EventingDispatcherComponent const, struct EmotePlayedTelemetryDataComponent const>, class ViewT, class EntityModifierT); private: diff --git a/LiteLoader/include/llapi/mc/PetSleepWithOwnerGoal.hpp b/LiteLoader/include/llapi/mc/PetSleepWithOwnerGoal.hpp index 7de90437f3..fdb0cc2ee1 100644 --- a/LiteLoader/include/llapi/mc/PetSleepWithOwnerGoal.hpp +++ b/LiteLoader/include/llapi/mc/PetSleepWithOwnerGoal.hpp @@ -73,18 +73,6 @@ class PetSleepWithOwnerGoal { * @symbol ??0PetSleepWithOwnerGoal\@\@QEAA\@AEAVMob\@\@MHHM\@Z */ MCAPI PetSleepWithOwnerGoal(class Mob &, float, int, int, float); - /** - * @symbol ?getBedTargetPos\@PetSleepWithOwnerGoal\@\@QEBA?AVVec3\@\@XZ - */ - MCAPI class Vec3 getBedTargetPos() const; - /** - * @symbol ?getData\@PetSleepWithOwnerGoal\@\@QEBA?AUPetSleepWithOwnerGoalData\@\@XZ - */ - MCAPI struct PetSleepWithOwnerGoalData getData() const; - /** - * @symbol ?getMob\@PetSleepWithOwnerGoal\@\@QEBAAEAVMob\@\@XZ - */ - MCAPI class Mob & getMob() const; /** * @symbol ?setState\@PetSleepWithOwnerGoal\@\@QEAAXV?$unique_ptr\@VPetSleepWithOwnerState\@\@U?$default_delete\@VPetSleepWithOwnerState\@\@\@std\@\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PillagerOutpostPieces.hpp b/LiteLoader/include/llapi/mc/PillagerOutpostPieces.hpp index b490fc9dda..8e3d7d26c0 100644 --- a/LiteLoader/include/llapi/mc/PillagerOutpostPieces.hpp +++ b/LiteLoader/include/llapi/mc/PillagerOutpostPieces.hpp @@ -30,10 +30,6 @@ class PillagerOutpostPieces { #endif public: - /** - * @symbol ?addPieces\@PillagerOutpostPieces\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEAVDimension\@\@\@Z - */ - MCAPI static void addPieces(class gsl::not_null>, class BlockPos const &, enum class Rotation const &, std::vector> &, class Random &, class Dimension &); //private: /** diff --git a/LiteLoader/include/llapi/mc/PinkPetalsBlock.hpp b/LiteLoader/include/llapi/mc/PinkPetalsBlock.hpp new file mode 100644 index 0000000000..2ad0b10393 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PinkPetalsBlock.hpp @@ -0,0 +1,297 @@ +/** + * @file PinkPetalsBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BlockLegacy.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class PinkPetalsBlock : public BlockLegacy { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PINKPETALSBLOCK +public: + class PinkPetalsBlock& operator=(class PinkPetalsBlock const &) = delete; + PinkPetalsBlock(class PinkPetalsBlock const &) = delete; + PinkPetalsBlock() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 10 + * @symbol ?getAABB\@PinkPetalsBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + */ + virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); + /** + * @vftbl 29 + * @symbol __unk_vfn_29 + */ + virtual void __unk_vfn_29(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); + /** + * @vftbl 32 + * @symbol __unk_vfn_32 + */ + virtual void __unk_vfn_32(); + /** + * @vftbl 33 + * @symbol __unk_vfn_33 + */ + virtual void __unk_vfn_33(); + /** + * @vftbl 34 + * @symbol __unk_vfn_34 + */ + virtual void __unk_vfn_34(); + /** + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 37 + * @symbol __unk_vfn_37 + */ + virtual void __unk_vfn_37(); + /** + * @vftbl 38 + * @symbol __unk_vfn_38 + */ + virtual void __unk_vfn_38(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 + * @symbol __unk_vfn_40 + */ + virtual void __unk_vfn_40(); + /** + * @vftbl 41 + * @symbol __unk_vfn_41 + */ + virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); + /** + * @vftbl 44 + * @symbol __unk_vfn_44 + */ + virtual void __unk_vfn_44(); + /** + * @vftbl 45 + * @symbol __unk_vfn_45 + */ + virtual void __unk_vfn_45(); + /** + * @vftbl 46 + * @symbol __unk_vfn_46 + */ + virtual void __unk_vfn_46(); + /** + * @vftbl 47 + * @symbol __unk_vfn_47 + */ + virtual void __unk_vfn_47(); + /** + * @vftbl 48 + * @symbol __unk_vfn_48 + */ + virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 54 + * @symbol __unk_vfn_54 + */ + virtual void __unk_vfn_54(); + /** + * @vftbl 60 + * @symbol __unk_vfn_60 + */ + virtual void __unk_vfn_60(); + /** + * @vftbl 61 + * @symbol __unk_vfn_61 + */ + virtual void __unk_vfn_61(); + /** + * @vftbl 75 + * @symbol __unk_vfn_75 + */ + virtual void __unk_vfn_75(); + /** + * @vftbl 82 + * @symbol __unk_vfn_82 + */ + virtual void __unk_vfn_82(); + /** + * @vftbl 86 + * @symbol ?onFertilized\@PinkPetalsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + */ + virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; + /** + * @vftbl 88 + * @symbol ?canBeFertilized\@PinkPetalsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + */ + virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; + /** + * @vftbl 93 + * @symbol ?mayPlaceOn\@PinkPetalsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 99 + * @symbol ?neighborChanged\@PinkPetalsBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + */ + virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; + /** + * @vftbl 105 + * @symbol __unk_vfn_105 + */ + virtual void __unk_vfn_105(); + /** + * @vftbl 106 + * @symbol ?getPlacementBlock\@PinkPetalsBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + */ + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + /** + * @vftbl 123 + * @symbol __unk_vfn_123 + */ + virtual void __unk_vfn_123(); + /** + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 + * @symbol __unk_vfn_126 + */ + virtual void __unk_vfn_126(); + /** + * @vftbl 129 + * @symbol __unk_vfn_129 + */ + virtual void __unk_vfn_129(); + /** + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 + * @symbol ?getVariant\@PinkPetalsBlock\@\@UEBAHAEBVBlock\@\@\@Z + */ + virtual int getVariant(class Block const &) const; + /** + * @vftbl 157 + * @symbol __unk_vfn_157 + */ + virtual void __unk_vfn_157(); + /** + * @vftbl 166 + * @symbol __unk_vfn_166 + */ + virtual void __unk_vfn_166(); + /** + * @vftbl 167 + * @symbol __unk_vfn_167 + */ + virtual void __unk_vfn_167(); + /** + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 + * @symbol ?tick\@PinkPetalsBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + */ + virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; + /** + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 + * @symbol ?use\@PinkPetalsBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + */ + virtual bool use(class Player &, class BlockPos const &, unsigned char) const; + /** + * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 180 + * @symbol ?canSurvive\@PinkPetalsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 190 + * @symbol ?getResourceCount\@PinkPetalsBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual int getResourceCount(class Randomize &, class Block const &, int) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PINKPETALSBLOCK + /** + * @symbol ?canBeDestroyedByWaterSpread\@PinkPetalsBlock\@\@UEBA_NXZ + */ + MCVAPI bool canBeDestroyedByWaterSpread() const; + /** + * @symbol ?waterSpreadCausesSpawn\@PinkPetalsBlock\@\@UEBA_NXZ + */ + MCVAPI bool waterSpreadCausesSpawn() const; +#endif + /** + * @symbol ??0PinkPetalsBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI PinkPetalsBlock(std::string const &, int); + /** + * @symbol ?tryGrow\@PinkPetalsBlock\@\@SA_NAEAVBlockSource\@\@VBlockPos\@\@\@Z + */ + MCAPI static bool tryGrow(class BlockSource &, class BlockPos); + +}; diff --git a/LiteLoader/include/llapi/mc/PinkPetalsFeature.hpp b/LiteLoader/include/llapi/mc/PinkPetalsFeature.hpp new file mode 100644 index 0000000000..59a41cc4cf --- /dev/null +++ b/LiteLoader/include/llapi/mc/PinkPetalsFeature.hpp @@ -0,0 +1,39 @@ +/** + * @file PinkPetalsFeature.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Feature.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class PinkPetalsFeature : public Feature { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PINKPETALSFEATURE +public: + class PinkPetalsFeature& operator=(class PinkPetalsFeature const &) = delete; + PinkPetalsFeature(class PinkPetalsFeature const &) = delete; + PinkPetalsFeature() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 3 + * @symbol ?place\@PinkPetalsFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + */ + virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; + +}; diff --git a/LiteLoader/include/llapi/mc/PistonArmBlock.hpp b/LiteLoader/include/llapi/mc/PistonArmBlock.hpp index e219ec3fa2..2509dfce65 100644 --- a/LiteLoader/include/llapi/mc/PistonArmBlock.hpp +++ b/LiteLoader/include/llapi/mc/PistonArmBlock.hpp @@ -227,20 +227,20 @@ class PistonArmBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -252,42 +252,47 @@ class PistonArmBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@PistonArmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 175 + * @vftbl 176 * @symbol ?clip\@PistonArmBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@PistonArmBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@PistonArmBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/PistonBlock.hpp b/LiteLoader/include/llapi/mc/PistonBlock.hpp index 4b2b91af62..6fe1e4a349 100644 --- a/LiteLoader/include/llapi/mc/PistonBlock.hpp +++ b/LiteLoader/include/llapi/mc/PistonBlock.hpp @@ -207,9 +207,9 @@ class PistonBlock : public ActorBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@PistonBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@PistonBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -226,30 +226,30 @@ class PistonBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 * @symbol ?getVariant\@PistonBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 + * @vftbl 150 * @symbol ?getMappedFace\@PistonBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -262,41 +262,46 @@ class PistonBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@PistonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@PistonBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/PlanksBlock.hpp b/LiteLoader/include/llapi/mc/PlanksBlock.hpp index 23b067a611..1c49a959d1 100644 --- a/LiteLoader/include/llapi/mc/PlanksBlock.hpp +++ b/LiteLoader/include/llapi/mc/PlanksBlock.hpp @@ -181,35 +181,35 @@ class PlanksBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@PlanksBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@PlanksBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 161 + * @vftbl 162 * @symbol ?_addHardCodedBlockComponents\@PlanksBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -221,37 +221,42 @@ class PlanksBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@PlanksBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@PlanksBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@PlanksBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; @@ -260,9 +265,9 @@ class PlanksBlock : public BlockLegacy { */ MCAPI PlanksBlock(std::string const &, int); /** - * @symbol ?WOOD_NAMES\@PlanksBlock\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$07\@std\@\@B + * @symbol ?WOOD_NAMES\@PlanksBlock\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$08\@std\@\@B */ - MCAPI static class std::array const WOOD_NAMES; + MCAPI static class std::array const WOOD_NAMES; /** * @symbol ?isValidWoodMaterial\@PlanksBlock\@\@SA_NH\@Z */ diff --git a/LiteLoader/include/llapi/mc/PlayAnimationCommand.hpp b/LiteLoader/include/llapi/mc/PlayAnimationCommand.hpp index 200d784a4c..140916271f 100644 --- a/LiteLoader/include/llapi/mc/PlayAnimationCommand.hpp +++ b/LiteLoader/include/llapi/mc/PlayAnimationCommand.hpp @@ -36,7 +36,7 @@ class PlayAnimationCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@PlayAnimationCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/PlaySoundCommand.hpp b/LiteLoader/include/llapi/mc/PlaySoundCommand.hpp index 893bffa205..2e80cba305 100644 --- a/LiteLoader/include/llapi/mc/PlaySoundCommand.hpp +++ b/LiteLoader/include/llapi/mc/PlaySoundCommand.hpp @@ -36,7 +36,7 @@ class PlaySoundCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@PlaySoundCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/Player.hpp b/LiteLoader/include/llapi/mc/Player.hpp index b7e4090700..8e73c2de75 100644 --- a/LiteLoader/include/llapi/mc/Player.hpp +++ b/LiteLoader/include/llapi/mc/Player.hpp @@ -1016,9 +1016,9 @@ class Player : public Mob { virtual int getPreviousTickSleepTimer() const; /** * @vftbl 395 - * @symbol __unk_vfn_395 + * @symbol ?openSign\@Player\@\@UEAAXAEBVBlockPos\@\@_N\@Z */ - virtual void __unk_vfn_395(); + virtual void openSign(class BlockPos const &, bool); /** * @vftbl 396 * @symbol __unk_vfn_396 @@ -1226,26 +1226,31 @@ class Player : public Mob { virtual void __unk_vfn_436(); /** * @vftbl 437 + * @symbol ?getMaxChunkBuildRadius\@Player\@\@UEBAEXZ + */ + virtual unsigned char getMaxChunkBuildRadius() const; + /** + * @vftbl 438 * @symbol ?onMovePlayerPacketNormal\@Player\@\@MEAAXAEBVVec3\@\@AEBVVec2\@\@M\@Z */ virtual void onMovePlayerPacketNormal(class Vec3 const &, class Vec2 const &, float); /** - * @vftbl 438 + * @vftbl 439 * @symbol ?_createChunkSource\@Player\@\@MEAA?AV?$shared_ptr\@VChunkViewSource\@\@\@std\@\@AEAVChunkSource\@\@\@Z */ virtual class std::shared_ptr _createChunkSource(class ChunkSource &); /** - * @vftbl 439 + * @vftbl 440 * @symbol ?setAbilities\@Player\@\@UEAAXAEBVLayeredAbilities\@\@\@Z */ virtual void setAbilities(class LayeredAbilities const &); /** - * @vftbl 440 + * @vftbl 441 * @symbol ?getEditorPlayer\@ServerPlayer\@\@UEBA?AV?$NonOwnerPointer\@VIEditorPlayer\@Editor\@\@\@Bedrock\@\@XZ */ virtual class Bedrock::NonOwnerPointer getEditorPlayer() const = 0; /** - * @vftbl 441 + * @vftbl 442 * @symbol ?destroyEditorPlayer\@ServerPlayer\@\@UEAAXXZ */ virtual void destroyEditorPlayer() = 0; @@ -1314,10 +1319,6 @@ class Player : public Mob { * @symbol ?openPortfolio\@Player\@\@UEAAXXZ */ MCVAPI void openPortfolio(); - /** - * @symbol ?openSign\@Player\@\@UEAAXAEBVBlockPos\@\@\@Z - */ - MCVAPI void openSign(class BlockPos const &); /** * @symbol ?playEmote\@Player\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ @@ -1379,6 +1380,10 @@ class Player : public Mob { * @symbol ?clearRespawnPosition\@Player\@\@QEAAXXZ */ MCAPI void clearRespawnPosition(); + /** + * @symbol ?dropCursorSelectedItemOnDeath\@Player\@\@QEAAXXZ + */ + MCAPI void dropCursorSelectedItemOnDeath(); /** * @symbol ?eat\@Player\@\@QEAAXHM\@Z */ @@ -1491,14 +1496,14 @@ class Player : public Mob { * @symbol ?getItemInteractText\@Player\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItem\@\@\@Z */ MCAPI std::string getItemInteractText(class Item const &) const; - /** - * @symbol ?getItemStackNetManager\@Player\@\@QEBAPEBVItemStackNetManagerBase\@\@XZ - */ - MCAPI class ItemStackNetManagerBase const * getItemStackNetManager() const; /** * @symbol ?getItemStackNetManager\@Player\@\@QEAAPEAVItemStackNetManagerBase\@\@XZ */ MCAPI class ItemStackNetManagerBase * getItemStackNetManager(); + /** + * @symbol ?getItemStackNetManager\@Player\@\@QEBAPEBVItemStackNetManagerBase\@\@XZ + */ + MCAPI class ItemStackNetManagerBase const * getItemStackNetManager() const; /** * @symbol ?getLuck\@Player\@\@QEAAMXZ */ @@ -1568,13 +1573,17 @@ class Player : public Mob { */ MCAPI int getSelectedItemSlot() const; /** - * @symbol ?getSkin\@Player\@\@QEBAAEBVSerializedSkin\@\@XZ + * @symbol ?getServerId\@Player\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ - MCAPI class SerializedSkin const & getSkin() const; + MCAPI std::string const & getServerId() const; /** * @symbol ?getSkin\@Player\@\@QEAAAEAVSerializedSkin\@\@XZ */ MCAPI class SerializedSkin & getSkin(); + /** + * @symbol ?getSkin\@Player\@\@QEBAAEBVSerializedSkin\@\@XZ + */ + MCAPI class SerializedSkin const & getSkin() const; /** * @symbol ?getSleepRotation\@Player\@\@QEBAMXZ */ @@ -1587,14 +1596,14 @@ class Player : public Mob { * @symbol ?getSpawnPosition\@Player\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getSpawnPosition() const; - /** - * @symbol ?getSupplies\@Player\@\@QEBAAEBVPlayerInventory\@\@XZ - */ - MCAPI class PlayerInventory const & getSupplies() const; /** * @symbol ?getSupplies\@Player\@\@QEAAAEAVPlayerInventory\@\@XZ */ MCAPI class PlayerInventory & getSupplies(); + /** + * @symbol ?getSupplies\@Player\@\@QEBAAEBVPlayerInventory\@\@XZ + */ + MCAPI class PlayerInventory const & getSupplies() const; /** * @symbol ?getTrackedBosses\@Player\@\@QEAAAEBV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@XZ */ @@ -1783,6 +1792,14 @@ class Player : public Mob { * @symbol ?setHasSeenCredits\@Player\@\@QEAAX_N\@Z */ MCAPI void setHasSeenCredits(bool); + /** + * @symbol ?setLastDeathDimension\@Player\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z + */ + MCAPI void setLastDeathDimension(class AutomaticID); + /** + * @symbol ?setLastDeathPos\@Player\@\@QEAAXVBlockPos\@\@\@Z + */ + MCAPI void setLastDeathPos(class BlockPos); /** * @symbol ?setLastHurtBy\@Player\@\@QEAAXW4ActorType\@\@\@Z */ @@ -1927,22 +1944,10 @@ class Player : public Mob { * @symbol ?HUNGER\@Player\@\@2VAttribute\@\@B */ MCAPI static class Attribute const HUNGER; - /** - * @symbol ?ITEM_USE_INTERVAL_COUNT\@Player\@\@2HB - */ - MCAPI static int const ITEM_USE_INTERVAL_COUNT; - /** - * @symbol ?ITEM_USE_INTERVAL_DURATION\@Player\@\@2HB - */ - MCAPI static int const ITEM_USE_INTERVAL_DURATION; /** * @symbol ?LEVEL\@Player\@\@2VAttribute\@\@B */ MCAPI static class Attribute const LEVEL; - /** - * @symbol ?MAX_ITEM_USE_DURATION\@Player\@\@2HB - */ - MCAPI static int const MAX_ITEM_USE_DURATION; /** * @symbol ?PLAYER_ALIVE_HEIGHT\@Player\@\@2MB */ diff --git a/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp b/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp index f4c1329a1c..1b73e08dfb 100644 --- a/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp @@ -111,10 +111,6 @@ class PlayerActionPacket : public Packet { * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@AEBVBlockPos\@\@VActorRuntimeID\@\@\@Z */ MCAPI PlayerActionPacket(enum class PlayerActionType, class BlockPos const &, class ActorRuntimeID); - /** - * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@AEBVBlockPos\@\@EVActorRuntimeID\@\@\@Z - */ - MCAPI PlayerActionPacket(enum class PlayerActionType, class BlockPos const &, unsigned char, class ActorRuntimeID); /** * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@AEBVBlockPos\@\@HVActorRuntimeID\@\@\@Z */ @@ -123,6 +119,10 @@ class PlayerActionPacket : public Packet { * @symbol ??0PlayerActionPacket\@\@QEAA\@XZ */ MCAPI PlayerActionPacket(); + /** + * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@AEBVBlockPos\@\@EVActorRuntimeID\@\@\@Z + */ + MCAPI PlayerActionPacket(enum class PlayerActionType, class BlockPos const &, unsigned char, class ActorRuntimeID); /** * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@VActorRuntimeID\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp b/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp index c7a76c1ba6..9d9f3f5baf 100644 --- a/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp @@ -67,14 +67,14 @@ enum class InputData; */ MCVAPI ~PlayerAuthInputPacket(); #endif - /** - * @symbol ??0PlayerAuthInputPacket\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI PlayerAuthInputPacket(class PlayerAuthInputPacket &&); /** * @symbol ??0PlayerAuthInputPacket\@\@QEAA\@XZ */ MCAPI PlayerAuthInputPacket(); + /** + * @symbol ??0PlayerAuthInputPacket\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI PlayerAuthInputPacket(class PlayerAuthInputPacket &&); /** * @symbol ?getInput\@PlayerAuthInputPacket\@\@QEBA_NW4InputData\@1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PlayerBlockActions.hpp b/LiteLoader/include/llapi/mc/PlayerBlockActions.hpp index 6c7a4b9347..658dfd1958 100644 --- a/LiteLoader/include/llapi/mc/PlayerBlockActions.hpp +++ b/LiteLoader/include/llapi/mc/PlayerBlockActions.hpp @@ -29,22 +29,6 @@ class PlayerBlockActions { #endif public: - /** - * @symbol ?addAbortDestroyBlock\@PlayerBlockActions\@\@QEAAXAEBVBlockPos\@\@H\@Z - */ - MCAPI void addAbortDestroyBlock(class BlockPos const &, int); - /** - * @symbol ?addContinueDestroyBlock\@PlayerBlockActions\@\@QEAAXAEBVBlockPos\@\@H\@Z - */ - MCAPI void addContinueDestroyBlock(class BlockPos const &, int); - /** - * @symbol ?addStartDestroyBlock\@PlayerBlockActions\@\@QEAAXAEBVBlockPos\@\@H\@Z - */ - MCAPI void addStartDestroyBlock(class BlockPos const &, int); - /** - * @symbol ?addStopDestroyBlock\@PlayerBlockActions\@\@QEAAXXZ - */ - MCAPI void addStopDestroyBlock(); /** * @symbol ?findFirstOfType\@PlayerBlockActions\@\@QEBAPEBUPlayerBlockActionData\@\@W4PlayerActionType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PlayerCapabilities.hpp b/LiteLoader/include/llapi/mc/PlayerCapabilities.hpp index 83c29742e6..5148150514 100644 --- a/LiteLoader/include/llapi/mc/PlayerCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/PlayerCapabilities.hpp @@ -20,9 +20,11 @@ namespace PlayerCapabilities { #define AFTER_EXTRA // Add Member There struct ISharedController { - ISharedController() = delete; - ISharedController(ISharedController const&) = delete; - ISharedController(ISharedController const&&) = delete; + void** vtable; +}; + +struct IPlayerData { + }; #undef AFTER_EXTRA diff --git a/LiteLoader/include/llapi/mc/PlayerCommandOrigin.hpp b/LiteLoader/include/llapi/mc/PlayerCommandOrigin.hpp index 0e6610398d..19d7f9de4b 100644 --- a/LiteLoader/include/llapi/mc/PlayerCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/PlayerCommandOrigin.hpp @@ -140,9 +140,5 @@ class PlayerCommandOrigin : public CommandOrigin { * @symbol ??0PlayerCommandOrigin\@\@QEAA\@AEAVPlayer\@\@\@Z */ MCAPI PlayerCommandOrigin(class Player &); - /** - * @symbol ?load\@PlayerCommandOrigin\@\@SA?AV?$unique_ptr\@VPlayerCommandOrigin\@\@U?$default_delete\@VPlayerCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z - */ - MCAPI static std::unique_ptr load(class CompoundTag const &, class Level &); }; diff --git a/LiteLoader/include/llapi/mc/PlayerDataSystem.hpp b/LiteLoader/include/llapi/mc/PlayerDataSystem.hpp index ad7dca2498..2447bf4aae 100644 --- a/LiteLoader/include/llapi/mc/PlayerDataSystem.hpp +++ b/LiteLoader/include/llapi/mc/PlayerDataSystem.hpp @@ -42,10 +42,6 @@ namespace PlayerDataSystem { * @symbol ?legacyLoadPlayer\@PlayerDataSystem\@\@YA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI std::unique_ptr legacyLoadPlayer(class LevelStorage &, std::string const &); - /** - * @symbol ?loadLocalPlayerData\@PlayerDataSystem\@\@YA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@\@Z - */ - MCAPI std::unique_ptr loadLocalPlayerData(class LevelStorage &); /** * @symbol ?loadPlayerData\@PlayerDataSystem\@\@YA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@AEBUPlayerStorageIds\@\@_N\@Z */ @@ -58,13 +54,13 @@ namespace PlayerDataSystem { * @symbol ?playerKey\@PlayerDataSystem\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ MCAPI std::string playerKey(class std::basic_string_view>); - /** - * @symbol ?serverKey\@PlayerDataSystem\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelStorage\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z - */ - MCAPI std::string serverKey(class LevelStorage &, class std::basic_string_view>); /** * @symbol ?serverKey\@PlayerDataSystem\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelStorage\@\@AEBVPlayer\@\@\@Z */ MCAPI std::string serverKey(class LevelStorage &, class Player const &); + /** + * @symbol ?serverKey\@PlayerDataSystem\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelStorage\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z + */ + MCAPI std::string serverKey(class LevelStorage &, class std::basic_string_view>); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayerFetchUtils.hpp b/LiteLoader/include/llapi/mc/PlayerFetchUtils.hpp new file mode 100644 index 0000000000..f8614f9ccb --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerFetchUtils.hpp @@ -0,0 +1,52 @@ +/** + * @file PlayerFetchUtils.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace PlayerFetchUtils { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?findPlayer\@PlayerFetchUtils\@\@YAPEAVPlayer\@\@AEBVGameplayUserManager\@\@V?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z + */ + MCAPI class Player * findPlayer(class GameplayUserManager const &, class std::function); + /** + * @symbol ?findPlayer\@PlayerFetchUtils\@\@YAPEAVPlayer\@\@AEBVGameplayUserManager\@\@V?$function\@$$A6A_NAEBVEntityContext\@\@\@Z\@std\@\@\@Z + */ + MCAPI class Player * findPlayer(class GameplayUserManager const &, class std::function); + /** + * @symbol ?findPlayerByName\@PlayerFetchUtils\@\@YAPEAVPlayer\@\@AEBVGameplayUserManager\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI class Player * findPlayerByName(class GameplayUserManager const &, std::string const &); + /** + * @symbol ?findPlayerByPlatformId\@PlayerFetchUtils\@\@YAPEAVPlayer\@\@AEBVGameplayUserManager\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI class Player * findPlayerByPlatformId(class GameplayUserManager const &, std::string const &); + /** + * @symbol ?findPlayerByServerId\@PlayerFetchUtils\@\@YAPEAVPlayer\@\@AEBVGameplayUserManager\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI class Player * findPlayerByServerId(class GameplayUserManager const &, std::string const &); + /** + * @symbol ?findPlayerByUUID\@PlayerFetchUtils\@\@YAPEAVPlayer\@\@AEBVGameplayUserManager\@\@AEBVUUID\@mce\@\@\@Z + */ + MCAPI class Player * findPlayerByUUID(class GameplayUserManager const &, class mce::UUID const &); + /** + * @symbol ?findPlayerByXuid\@PlayerFetchUtils\@\@YAPEAVPlayer\@\@AEBVGameplayUserManager\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI class Player * findPlayerByXuid(class GameplayUserManager const &, std::string const &); + /** + * @symbol ?findPrimaryLocalPlayer\@PlayerFetchUtils\@\@YAPEAVPlayer\@\@AEBVGameplayUserManager\@\@\@Z + */ + MCAPI class Player * findPrimaryLocalPlayer(class GameplayUserManager const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayerInventory.hpp b/LiteLoader/include/llapi/mc/PlayerInventory.hpp index d5d0667680..37ed419011 100644 --- a/LiteLoader/include/llapi/mc/PlayerInventory.hpp +++ b/LiteLoader/include/llapi/mc/PlayerInventory.hpp @@ -49,14 +49,6 @@ struct SlotData { */ MCVAPI void createTransactionContext(class std::function, class std::function); #endif - /** - * @symbol ??0PlayerInventory\@\@QEAA\@V?$unique_ptr\@VInventory\@\@U?$default_delete\@VInventory\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI PlayerInventory(std::unique_ptr); - /** - * @symbol ?_getHudContainerManagerModel\@PlayerInventory\@\@QEAA?AV?$weak_ptr\@VHudContainerManagerModel\@\@\@std\@\@XZ - */ - MCAPI class std::weak_ptr _getHudContainerManagerModel(); /** * @symbol ?add\@PlayerInventory\@\@QEAA_NAEAVItemStack\@\@_N\@Z */ @@ -69,10 +61,6 @@ struct SlotData { * @symbol ?canAdd\@PlayerInventory\@\@QEBA_NAEBVItemStack\@\@\@Z */ MCAPI bool canAdd(class ItemStack const &) const; - /** - * @symbol ?clearInventory\@PlayerInventory\@\@QEAAHH\@Z - */ - MCAPI int clearInventory(int); /** * @symbol ?clearSlot\@PlayerInventory\@\@QEAAXHW4ContainerID\@\@\@Z */ @@ -85,18 +73,6 @@ struct SlotData { * @symbol ?dropAllOnDeath\@PlayerInventory\@\@QEAAX_N\@Z */ MCAPI void dropAllOnDeath(bool); - /** - * @symbol ?getAllContainerIds\@PlayerInventory\@\@QEAAAEBV?$vector\@W4ContainerID\@\@V?$allocator\@W4ContainerID\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector const & getAllContainerIds(); - /** - * @symbol ?getComplexItems\@PlayerInventory\@\@QEBAAEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@W4ContainerID\@\@\@Z - */ - MCAPI std::vector const & getComplexItems(enum class ContainerID) const; - /** - * @symbol ?getContainer\@PlayerInventory\@\@QEAAAEAVContainer\@\@XZ - */ - MCAPI class Container & getContainer(); /** * @symbol ?getContainerSize\@PlayerInventory\@\@QEBAHW4ContainerID\@\@\@Z */ @@ -134,17 +110,9 @@ struct SlotData { */ MCAPI int getSlotWithItem(class ItemStack const &, bool, bool) const; /** - * @symbol ?hasResource\@PlayerInventory\@\@QEAA_NH\@Z + * @symbol ?getSlots\@PlayerInventory\@\@QEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ - MCAPI bool hasResource(int); - /** - * @symbol ?init\@PlayerInventory\@\@QEAAXV?$weak_ptr\@VHudContainerManagerModel\@\@\@std\@\@\@Z - */ - MCAPI void init(class std::weak_ptr); - /** - * @symbol ?load\@PlayerInventory\@\@QEAAXAEBVListTag\@\@AEBVSemVersion\@\@AEAVLevel\@\@\@Z - */ - MCAPI void load(class ListTag const &, class SemVersion const &, class Level &); + MCAPI std::vector getSlots() const; /** * @symbol ?removeItem\@PlayerInventory\@\@QEAAXHHW4ContainerID\@\@\@Z */ @@ -153,26 +121,14 @@ struct SlotData { * @symbol ?removeListener\@PlayerInventory\@\@QEAAXPEAVContainerContentChangeListener\@\@\@Z */ MCAPI void removeListener(class ContainerContentChangeListener *); - /** - * @symbol ?removeResource\@PlayerInventory\@\@QEAAHAEBVItemStack\@\@_N1H\@Z - */ - MCAPI int removeResource(class ItemStack const &, bool, bool, int); /** * @symbol ?removeResource\@PlayerInventory\@\@QEAA_NH\@Z */ MCAPI bool removeResource(int); - /** - * @symbol ?save\@PlayerInventory\@\@QEAA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::unique_ptr save(); /** * @symbol ?selectSlot\@PlayerInventory\@\@QEAA_NHW4ContainerID\@\@\@Z */ MCAPI bool selectSlot(int, enum class ContainerID); - /** - * @symbol ?serverInitItemStackId\@PlayerInventory\@\@QEAAXH\@Z - */ - MCAPI void serverInitItemStackId(int); /** * @symbol ?serverInitItemStackIds\@PlayerInventory\@\@QEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ @@ -197,9 +153,5 @@ struct SlotData { * @symbol ?swapSlots\@PlayerInventory\@\@QEAAXHH\@Z */ MCAPI void swapSlots(int, int); - /** - * @symbol ?tick\@PlayerInventory\@\@QEAAXXZ - */ - MCAPI void tick(); }; diff --git a/LiteLoader/include/llapi/mc/PlayerItemInUse.hpp b/LiteLoader/include/llapi/mc/PlayerItemInUse.hpp new file mode 100644 index 0000000000..59f1bca1f7 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerItemInUse.hpp @@ -0,0 +1,65 @@ +/** + * @file PlayerItemInUse.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "PlayerInventory.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class PlayerItemInUse { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERITEMINUSE +public: + class PlayerItemInUse& operator=(class PlayerItemInUse const &) = delete; + PlayerItemInUse(class PlayerItemInUse const &) = delete; + PlayerItemInUse() = delete; +#endif + +public: + /** + * @symbol ?checkShouldUse\@PlayerItemInUse\@\@QEAA_NXZ + */ + MCAPI bool checkShouldUse(); + /** + * @symbol ?clearItemInUse\@PlayerItemInUse\@\@QEAAXAEAVEntityContext\@\@\@Z + */ + MCAPI void clearItemInUse(class EntityContext &); + /** + * @symbol ?getItemInUse\@PlayerItemInUse\@\@QEBAAEBVItemStack\@\@XZ + */ + MCAPI class ItemStack const & getItemInUse() const; + /** + * @symbol ?getMoveToMouthDuration\@PlayerItemInUse\@\@QEBAHXZ + */ + MCAPI int getMoveToMouthDuration() const; + /** + * @symbol ?getUsedDuration\@PlayerItemInUse\@\@QEBAHXZ + */ + MCAPI int getUsedDuration() const; + /** + * @symbol ?isInSlot\@PlayerItemInUse\@\@QEBA_NUSlotData\@PlayerInventory\@\@\@Z + */ + MCAPI bool isInSlot(struct PlayerInventory::SlotData) const; + /** + * @symbol ?releaseUsing\@PlayerItemInUse\@\@QEAAXAEAVPlayer\@\@\@Z + */ + MCAPI void releaseUsing(class Player &); + /** + * @symbol ?setItemInUse\@PlayerItemInUse\@\@QEAAXAEBVItemStack\@\@AEAVEntityContext\@\@HUSlotData\@PlayerInventory\@\@\@Z + */ + MCAPI void setItemInUse(class ItemStack const &, class EntityContext &, int, struct PlayerInventory::SlotData); + /** + * @symbol ??1PlayerItemInUse\@\@QEAA\@XZ + */ + MCAPI ~PlayerItemInUse(); + +}; diff --git a/LiteLoader/include/llapi/mc/PlayerListEntry.hpp b/LiteLoader/include/llapi/mc/PlayerListEntry.hpp index 2e4514fe7c..3e70d3857b 100644 --- a/LiteLoader/include/llapi/mc/PlayerListEntry.hpp +++ b/LiteLoader/include/llapi/mc/PlayerListEntry.hpp @@ -34,18 +34,21 @@ class PlayerListEntry { public: class PlayerListEntry& operator=(class PlayerListEntry const &) = delete; PlayerListEntry(class PlayerListEntry const &) = delete; - PlayerListEntry() = delete; #endif public: /** - * @symbol ??0PlayerListEntry\@\@QEAA\@VUUID\@mce\@\@\@Z + * @symbol ??0PlayerListEntry\@\@QEAA\@XZ */ - MCAPI PlayerListEntry(class mce::UUID); + MCAPI PlayerListEntry(); /** * @symbol ??0PlayerListEntry\@\@QEAA\@AEBVPlayer\@\@\@Z */ MCAPI PlayerListEntry(class Player const &); + /** + * @symbol ??0PlayerListEntry\@\@QEAA\@VUUID\@mce\@\@\@Z + */ + MCAPI PlayerListEntry(class mce::UUID); /** * @symbol ?clone\@PlayerListEntry\@\@QEBA?AV1\@XZ */ @@ -54,6 +57,18 @@ class PlayerListEntry { * @symbol ?read\@PlayerListEntry\@\@QEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI bool read(class ReadOnlyBinaryStream &); + /** + * @symbol ?readRemove\@PlayerListEntry\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z + */ + MCAPI void readRemove(class ReadOnlyBinaryStream &); + /** + * @symbol ?write\@PlayerListEntry\@\@QEBAXAEAVBinaryStream\@\@\@Z + */ + MCAPI void write(class BinaryStream &) const; + /** + * @symbol ?writeRemove\@PlayerListEntry\@\@QEBAXAEAVBinaryStream\@\@\@Z + */ + MCAPI void writeRemove(class BinaryStream &) const; /** * @symbol ??1PlayerListEntry\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PlayerListManager.hpp b/LiteLoader/include/llapi/mc/PlayerListManager.hpp new file mode 100644 index 0000000000..993d972a32 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerListManager.hpp @@ -0,0 +1,52 @@ +/** + * @file PlayerListManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class PlayerListManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERLISTMANAGER +public: + class PlayerListManager& operator=(class PlayerListManager const &) = delete; + PlayerListManager(class PlayerListManager const &) = delete; + PlayerListManager() = delete; +#endif + +public: + /** + * @symbol ?getPlayerList\@PlayerListManager\@\@QEAAAEAV?$unordered_map\@VUUID\@mce\@\@VPlayerListEntry\@\@U?$hash\@VUUID\@mce\@\@\@std\@\@U?$equal_to\@VUUID\@mce\@\@\@5\@V?$allocator\@U?$pair\@$$CBVUUID\@mce\@\@VPlayerListEntry\@\@\@std\@\@\@5\@\@std\@\@XZ + */ + MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> & getPlayerList(); + /** + * @symbol ?getPlayerList\@PlayerListManager\@\@QEBAAEBV?$unordered_map\@VUUID\@mce\@\@VPlayerListEntry\@\@U?$hash\@VUUID\@mce\@\@\@std\@\@U?$equal_to\@VUUID\@mce\@\@\@5\@V?$allocator\@U?$pair\@$$CBVUUID\@mce\@\@VPlayerListEntry\@\@\@std\@\@\@5\@\@std\@\@XZ + */ + MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getPlayerList() const; + /** + * @symbol ?getPlayerPlatformOnlineId\@PlayerListManager\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVUUID\@mce\@\@\@Z + */ + MCAPI std::string const & getPlayerPlatformOnlineId(class mce::UUID const &) const; + /** + * @symbol ?getPlayerXUID\@PlayerListManager\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVUUID\@mce\@\@\@Z + */ + MCAPI std::string const & getPlayerXUID(class mce::UUID const &) const; + /** + * @symbol ?removeByUUID\@PlayerListManager\@\@QEAAXAEBVUUID\@mce\@\@\@Z + */ + MCAPI void removeByUUID(class mce::UUID const &); + /** + * @symbol ??1PlayerListManager\@\@QEAA\@XZ + */ + MCAPI ~PlayerListManager(); + +}; diff --git a/LiteLoader/include/llapi/mc/PlayerMovement.hpp b/LiteLoader/include/llapi/mc/PlayerMovement.hpp index 854a076bd6..810755c445 100644 --- a/LiteLoader/include/llapi/mc/PlayerMovement.hpp +++ b/LiteLoader/include/llapi/mc/PlayerMovement.hpp @@ -25,14 +25,14 @@ namespace PlayerMovement { * @symbol ?applyInputLocks\@PlayerMovement\@\@YAXAEBUClientInputLockComponent\@\@AEAUMoveInputState\@\@\@Z */ MCAPI void applyInputLocks(struct ClientInputLockComponent const &, struct MoveInputState &); - /** - * @symbol ?calculateMoveVector\@PlayerMovement\@\@YA?AVVec2\@\@AEBUMoveInputState\@\@AEAUIPlayerMovementProxy\@\@\@Z - */ - MCAPI class Vec2 calculateMoveVector(struct MoveInputState const &, struct IPlayerMovementProxy &); /** * @symbol ?calculateMoveVector\@PlayerMovement\@\@YA?AVVec2\@\@AEBUMoveInputState\@\@AEBVLayeredAbilities\@\@AEBVSynchedActorData\@\@_NPEBUSneakingComponent\@\@\@Z */ MCAPI class Vec2 calculateMoveVector(struct MoveInputState const &, class LayeredAbilities const &, class SynchedActorData const &, bool, struct SneakingComponent const *); + /** + * @symbol ?calculateMoveVector\@PlayerMovement\@\@YA?AVVec2\@\@AEBUMoveInputState\@\@AEAUIPlayerMovementProxy\@\@\@Z + */ + MCAPI class Vec2 calculateMoveVector(struct MoveInputState const &, struct IPlayerMovementProxy &); /** * @symbol ?getControllingPassengerID\@PlayerMovement\@\@YA?AUActorUniqueID\@\@AEBV?$vector\@UStrictActorIDEntityContextPair\@\@V?$allocator\@UStrictActorIDEntityContextPair\@\@\@std\@\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/PlayerNameValidator.hpp b/LiteLoader/include/llapi/mc/PlayerNameValidator.hpp new file mode 100644 index 0000000000..be82ae4442 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerNameValidator.hpp @@ -0,0 +1,24 @@ +/** + * @file PlayerNameValidator.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace PlayerNameValidator { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?validatePlayerName\@PlayerNameValidator\@\@YA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVGameplayUserManager\@\@\@Z + */ + MCAPI class std::optional validatePlayerName(std::string const &, class GameplayUserManager const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayerPreMobTravelSystem.hpp b/LiteLoader/include/llapi/mc/PlayerPreMobTravelSystem.hpp index 4d5d48f996..c4c8368fda 100644 --- a/LiteLoader/include/llapi/mc/PlayerPreMobTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/PlayerPreMobTravelSystem.hpp @@ -28,5 +28,9 @@ class PlayerPreMobTravelSystem { * @symbol ?createPlayerPreMobTravelSystem\@PlayerPreMobTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createPlayerPreMobTravelSystem(); + /** + * @symbol ?tickPlayerPreMobTravelSystem\@PlayerPreMobTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@UMobTravelComponent\@\@\@\@$$CBUAbilitiesComponent\@\@$$CBUStateVectorComponent\@\@$$CBUFlySpeedComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPlayerPreMobTravelComponent\@\@\@\@\@Z + */ + MCAPI static void tickPlayerPreMobTravelSystem(class ViewT, struct MobTravelComponent>, struct AbilitiesComponent const, struct StateVectorComponent const, struct FlySpeedComponent const>, class EntityModifierT); }; diff --git a/LiteLoader/include/llapi/mc/PlayerRespawnTelemetryData.hpp b/LiteLoader/include/llapi/mc/PlayerRespawnTelemetryData.hpp index 5b2e08f661..497ba46dff 100644 --- a/LiteLoader/include/llapi/mc/PlayerRespawnTelemetryData.hpp +++ b/LiteLoader/include/llapi/mc/PlayerRespawnTelemetryData.hpp @@ -26,41 +26,14 @@ class PlayerRespawnTelemetryData { public: class PlayerRespawnTelemetryData& operator=(class PlayerRespawnTelemetryData const &) = delete; PlayerRespawnTelemetryData(class PlayerRespawnTelemetryData const &) = delete; + PlayerRespawnTelemetryData() = delete; #endif public: - /** - * @symbol ??0PlayerRespawnTelemetryData\@\@QEAA\@XZ - */ - MCAPI PlayerRespawnTelemetryData(); /** * @symbol ?WriteEventData\@PlayerRespawnTelemetryData\@\@QEBAXAEAVEvent\@Events\@Social\@\@\@Z */ MCAPI void WriteEventData(class Social::Events::Event &) const; - /** - * @symbol ?setChangedDimension\@PlayerRespawnTelemetryData\@\@QEAAX_N\@Z - */ - MCAPI void setChangedDimension(bool); - /** - * @symbol ?setJumpDistance\@PlayerRespawnTelemetryData\@\@QEAAXN\@Z - */ - MCAPI void setJumpDistance(double); - /** - * @symbol ?setLongJumpCount\@PlayerRespawnTelemetryData\@\@QEAAXI\@Z - */ - MCAPI void setLongJumpCount(unsigned int); - /** - * @symbol ?setPositionSourceType\@PlayerRespawnTelemetryData\@\@QEAAXI\@Z - */ - MCAPI void setPositionSourceType(unsigned int); - /** - * @symbol ?setSearchTime\@PlayerRespawnTelemetryData\@\@QEAAXN\@Z - */ - MCAPI void setSearchTime(double); - /** - * @symbol ?setShortJumpCount\@PlayerRespawnTelemetryData\@\@QEAAXI\@Z - */ - MCAPI void setShortJumpCount(unsigned int); //private: diff --git a/LiteLoader/include/llapi/mc/PlayerScore.hpp b/LiteLoader/include/llapi/mc/PlayerScore.hpp index 122f9dfea6..3961d7ac89 100644 --- a/LiteLoader/include/llapi/mc/PlayerScore.hpp +++ b/LiteLoader/include/llapi/mc/PlayerScore.hpp @@ -27,10 +27,6 @@ struct PlayerScore { #endif public: - /** - * @symbol ??0PlayerScore\@\@QEAA\@AEBUScoreboardId\@\@H\@Z - */ - MCAPI PlayerScore(struct ScoreboardId const &, int); /** * @symbol ?getId\@PlayerScore\@\@QEBAAEBUScoreboardId\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PlayerScoreboardId.hpp b/LiteLoader/include/llapi/mc/PlayerScoreboardId.hpp index 4e49b9aae5..bdcae60461 100644 --- a/LiteLoader/include/llapi/mc/PlayerScoreboardId.hpp +++ b/LiteLoader/include/llapi/mc/PlayerScoreboardId.hpp @@ -48,14 +48,6 @@ struct PlayerScoreboardId { * @symbol ??0PlayerScoreboardId\@\@QEAA\@_J\@Z */ MCAPI PlayerScoreboardId(__int64); - /** - * @symbol ?getHash\@PlayerScoreboardId\@\@QEBA_KXZ - */ - MCAPI unsigned __int64 getHash() const; - /** - * @symbol ??8PlayerScoreboardId\@\@QEBA_NAEBU0\@\@Z - */ - MCAPI bool operator==(struct PlayerScoreboardId const &) const; /** * @symbol ?INVALID\@PlayerScoreboardId\@\@2U1\@B */ diff --git a/LiteLoader/include/llapi/mc/PlayerSleepManager.hpp b/LiteLoader/include/llapi/mc/PlayerSleepManager.hpp new file mode 100644 index 0000000000..420aecd32a --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerSleepManager.hpp @@ -0,0 +1,55 @@ +/** + * @file PlayerSleepManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class PlayerSleepManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERSLEEPMANAGER +public: + class PlayerSleepManager& operator=(class PlayerSleepManager const &) = delete; + PlayerSleepManager(class PlayerSleepManager const &) = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?updateSleepingPlayerList\@PlayerSleepManager\@\@UEAAXXZ + */ + virtual void updateSleepingPlayerList(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERSLEEPMANAGER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PlayerSleepManager(); +#endif + /** + * @symbol ??0PlayerSleepManager\@\@QEAA\@XZ + */ + MCAPI PlayerSleepManager(); + /** + * @symbol ?getPlayerSleepStatus\@PlayerSleepManager\@\@QEBAAEBUPlayerSleepStatus\@\@XZ + */ + MCAPI struct PlayerSleepStatus const & getPlayerSleepStatus() const; + /** + * @symbol ?setSleepStatus\@PlayerSleepManager\@\@QEAAXAEBUPlayerSleepStatus\@\@\@Z + */ + MCAPI void setSleepStatus(struct PlayerSleepStatus const &); + +}; diff --git a/LiteLoader/include/llapi/mc/PlayerUIContainer.hpp b/LiteLoader/include/llapi/mc/PlayerUIContainer.hpp index 66cd95ffe5..b8a35320d9 100644 --- a/LiteLoader/include/llapi/mc/PlayerUIContainer.hpp +++ b/LiteLoader/include/llapi/mc/PlayerUIContainer.hpp @@ -35,16 +35,16 @@ class PlayerUIContainer : public SimpleContainer { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); - /** - * @vftbl 23 - * @symbol __unk_vfn_23 - */ - virtual void __unk_vfn_23(); /** * @vftbl 24 * @symbol __unk_vfn_24 */ virtual void __unk_vfn_24(); + /** + * @vftbl 25 + * @symbol __unk_vfn_25 + */ + virtual void __unk_vfn_25(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERUICONTAINER /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PlayerUIContainerModelBase.hpp b/LiteLoader/include/llapi/mc/PlayerUIContainerModelBase.hpp index d34e9c2773..d4f00acdad 100644 --- a/LiteLoader/include/llapi/mc/PlayerUIContainerModelBase.hpp +++ b/LiteLoader/include/llapi/mc/PlayerUIContainerModelBase.hpp @@ -100,12 +100,6 @@ class PlayerUIContainerModelBase : public ContainerModel { * @symbol ?_onItemChanged\@PlayerUIContainerModelBase\@\@MEAAXHAEBVItemStack\@\@0\@Z */ virtual void _onItemChanged(int, class ItemStack const &, class ItemStack const &); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERUICONTAINERMODELBASE - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~PlayerUIContainerModelBase(); -#endif /** * @symbol ??0PlayerUIContainerModelBase\@\@QEAA\@W4ContainerEnumName\@\@AEAVPlayer\@\@HW4ContainerCategory\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PodzolBlock.hpp b/LiteLoader/include/llapi/mc/PodzolBlock.hpp index d4e4f612db..3fdbe9c4cc 100644 --- a/LiteLoader/include/llapi/mc/PodzolBlock.hpp +++ b/LiteLoader/include/llapi/mc/PodzolBlock.hpp @@ -176,20 +176,20 @@ class PodzolBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,27 +201,32 @@ class PodzolBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@PodzolBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/PointedDripstoneBlock.hpp b/LiteLoader/include/llapi/mc/PointedDripstoneBlock.hpp index 96cd6c6da9..ed7ee38596 100644 --- a/LiteLoader/include/llapi/mc/PointedDripstoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/PointedDripstoneBlock.hpp @@ -187,9 +187,9 @@ class PointedDripstoneBlock : public HeavyBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@PointedDripstoneBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@PointedDripstoneBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,40 +206,40 @@ class PointedDripstoneBlock : public HeavyBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@PointedDripstoneBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@PointedDripstoneBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 152 + * @vftbl 153 * @symbol ?init\@PointedDripstoneBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -251,67 +251,72 @@ class PointedDripstoneBlock : public HeavyBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 169 - * @symbol ?onFallOn\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; + virtual void __unk_vfn_168(); /** * @vftbl 170 - * @symbol __unk_vfn_170 + * @symbol ?onFallOn\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ - virtual void __unk_vfn_170(); + virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@PointedDripstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getDustColor\@PointedDripstoneBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getDustParticleName\@PointedDripstoneBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string getDustParticleName(class Block const &) const; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 197 + * @symbol __unk_vfn_197 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_197(); /** - * @vftbl 197 + * @vftbl 198 * @symbol ?onLand\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLand(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 199 + * @vftbl 200 * @symbol ?startFalling\@PointedDripstoneBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@_N\@Z */ virtual void startFalling(class BlockSource &, class BlockPos const &, class Block const &, bool) const; diff --git a/LiteLoader/include/llapi/mc/PoolElementStructurePiece.hpp b/LiteLoader/include/llapi/mc/PoolElementStructurePiece.hpp index 0ffb76222a..a55726733e 100644 --- a/LiteLoader/include/llapi/mc/PoolElementStructurePiece.hpp +++ b/LiteLoader/include/llapi/mc/PoolElementStructurePiece.hpp @@ -85,17 +85,5 @@ class PoolElementStructurePiece : public StructurePiece { * @symbol ??0PoolElementStructurePiece\@\@QEAA\@AEBVStructurePoolElement\@\@VBlockPos\@\@W4Rotation\@\@HAEAUJigsawJunction\@\@AEBVBoundingBox\@\@1\@Z */ MCAPI PoolElementStructurePiece(class StructurePoolElement const &, class BlockPos, enum class Rotation, int, struct JigsawJunction &, class BoundingBox const &, class BlockPos); - /** - * @symbol ?getElement\@PoolElementStructurePiece\@\@QEBAAEBVStructurePoolElement\@\@XZ - */ - MCAPI class StructurePoolElement const & getElement() const; - /** - * @symbol ?getPosition\@PoolElementStructurePiece\@\@QEBAAEBVBlockPos\@\@XZ - */ - MCAPI class BlockPos const & getPosition() const; - /** - * @symbol ?setReferencePosition\@PoolElementStructurePiece\@\@QEAAXAEBVBlockPos\@\@\@Z - */ - MCAPI void setReferencePosition(class BlockPos const &); }; diff --git a/LiteLoader/include/llapi/mc/PortalBlock.hpp b/LiteLoader/include/llapi/mc/PortalBlock.hpp index 90d86f1b7d..d806fd3fc1 100644 --- a/LiteLoader/include/llapi/mc/PortalBlock.hpp +++ b/LiteLoader/include/llapi/mc/PortalBlock.hpp @@ -211,35 +211,35 @@ class PortalBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 142 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 143 * @symbol ?getVisualShapeInWorld\@PortalBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -252,34 +252,39 @@ class PortalBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PORTALBLOCK /** * @symbol ?waterSpreadCausesSpawn\@PortalBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/PortalForcer.hpp b/LiteLoader/include/llapi/mc/PortalForcer.hpp index 6afda59297..13a545ba91 100644 --- a/LiteLoader/include/llapi/mc/PortalForcer.hpp +++ b/LiteLoader/include/llapi/mc/PortalForcer.hpp @@ -44,10 +44,6 @@ class PortalForcer { * @symbol ?serialize\@PortalForcer\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void serialize(class CompoundTag &) const; - /** - * @symbol ??0PortalForcer\@\@QEAA\@AEAVLevel\@\@\@Z - */ - MCAPI PortalForcer(class Level &); /** * @symbol ?addPortalRecord\@PortalForcer\@\@QEAAAEBVPortalRecord\@\@V?$AutomaticID\@VDimension\@\@H\@\@V2\@\@Z */ @@ -60,10 +56,6 @@ class PortalForcer { * @symbol ?createPortal\@PortalForcer\@\@QEAAAEBVPortalRecord\@\@AEBVActor\@\@H\@Z */ MCAPI class PortalRecord const & createPortal(class Actor const &, int); - /** - * @symbol ?findPortal\@PortalForcer\@\@QEBA_NV?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@HAEAV3\@\@Z - */ - MCAPI bool findPortal(class AutomaticID, class BlockPos const &, int, class BlockPos &) const; /** * @symbol ?force\@PortalForcer\@\@QEAAXAEAVActor\@\@AEBUDimensionTransitionComponent\@\@\@Z */ @@ -80,10 +72,18 @@ class PortalForcer { * @symbol ?removePortalRecord\@PortalForcer\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void removePortalRecord(class BlockSource &, class BlockPos const &); + /** + * @symbol ?MIN_PORTAL_REPLACE_BLOCK_FIX_VERSION\@PortalForcer\@\@2VBaseGameVersion\@\@B + */ + MCAPI static class BaseGameVersion const MIN_PORTAL_REPLACE_BLOCK_FIX_VERSION; /** * @symbol ?PORTAL_FILE_ID\@PortalForcer\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const PORTAL_FILE_ID; + /** + * @symbol ?canPortalReplaceBlock\@PortalForcer\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI static bool canPortalReplaceBlock(class BlockSource &, class BlockPos const &); //private: /** diff --git a/LiteLoader/include/llapi/mc/PortalRecord.hpp b/LiteLoader/include/llapi/mc/PortalRecord.hpp deleted file mode 100644 index 393653f353..0000000000 --- a/LiteLoader/include/llapi/mc/PortalRecord.hpp +++ /dev/null @@ -1,51 +0,0 @@ -/** - * @file PortalRecord.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class PortalRecord. - * - */ -class PortalRecord { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PORTALRECORD -public: - class PortalRecord& operator=(class PortalRecord const &) = delete; - PortalRecord(class PortalRecord const &) = delete; - PortalRecord() = delete; -#endif - -public: - /** - * @symbol ??0PortalRecord\@\@QEAA\@AEBVBlockPos\@\@\@Z - */ - MCAPI PortalRecord(class BlockPos const &); - /** - * @symbol ??0PortalRecord\@\@QEAA\@AEBVBlockPos\@\@HHH\@Z - */ - MCAPI PortalRecord(class BlockPos const &, int, int, int); - /** - * @symbol ?closestBlockPosTo\@PortalRecord\@\@QEBA?AVBlockPos\@\@AEBVActor\@\@\@Z - */ - MCAPI class BlockPos closestBlockPosTo(class Actor const &) const; - /** - * @symbol ?hashCode\@PortalRecord\@\@QEBA_KXZ - */ - MCAPI unsigned __int64 hashCode() const; - /** - * @symbol ??8PortalRecord\@\@QEBA_NAEBV0\@\@Z - */ - MCAPI bool operator==(class PortalRecord const &) const; - -}; diff --git a/LiteLoader/include/llapi/mc/PortalShape.hpp b/LiteLoader/include/llapi/mc/PortalShape.hpp index 406c7de822..6ea3b1422b 100644 --- a/LiteLoader/include/llapi/mc/PortalShape.hpp +++ b/LiteLoader/include/llapi/mc/PortalShape.hpp @@ -50,10 +50,6 @@ class PortalShape { * @symbol ?getNumberOfPortalBlocks\@PortalShape\@\@QEBAHXZ */ MCAPI int getNumberOfPortalBlocks() const; - /** - * @symbol ?getPortalBlockAABB\@PortalShape\@\@QEBA?AVAABB\@\@XZ - */ - MCAPI class AABB getPortalBlockAABB() const; /** * @symbol ?isFilled\@PortalShape\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/PositionTrackingId.hpp b/LiteLoader/include/llapi/mc/PositionTrackingId.hpp index f43024bdee..b7edd6e11f 100644 --- a/LiteLoader/include/llapi/mc/PositionTrackingId.hpp +++ b/LiteLoader/include/llapi/mc/PositionTrackingId.hpp @@ -27,10 +27,6 @@ class PositionTrackingId { #endif public: - /** - * @symbol ??0PositionTrackingId\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI PositionTrackingId(std::string const &); /** * @symbol ??0PositionTrackingId\@\@QEAA\@$$QEAV0\@\@Z */ @@ -47,10 +43,6 @@ class PositionTrackingId { * @symbol ?getTag\@PositionTrackingId\@\@QEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr getTag() const; - /** - * @symbol ?init\@PositionTrackingId\@\@QEAAXXZ - */ - MCAPI void init(); /** * @symbol ??4PositionTrackingId\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PostFallDamageFinalizeMoveSystem.hpp b/LiteLoader/include/llapi/mc/PostFallDamageFinalizeMoveSystem.hpp index 68c21440ec..2d01c833fe 100644 --- a/LiteLoader/include/llapi/mc/PostFallDamageFinalizeMoveSystem.hpp +++ b/LiteLoader/include/llapi/mc/PostFallDamageFinalizeMoveSystem.hpp @@ -31,5 +31,9 @@ class PostFallDamageFinalizeMoveSystem { * @symbol ?createPostFallDamageFinalizeMoveSystem\@PostFallDamageFinalizeMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createPostFallDamageFinalizeMoveSystem(); + /** + * @symbol ?tickPostFallDamageFinalizeMoveSystem\@PostFallDamageFinalizeMoveSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUMoveRequestComponent\@\@UStateVectorComponent\@\@USlideOffsetComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void tickPostFallDamageFinalizeMoveSystem(class ViewT, class EntityModifierT>); }; diff --git a/LiteLoader/include/llapi/mc/PotatoBlock.hpp b/LiteLoader/include/llapi/mc/PotatoBlock.hpp index e98b9fc424..f864eec4f6 100644 --- a/LiteLoader/include/llapi/mc/PotatoBlock.hpp +++ b/LiteLoader/include/llapi/mc/PotatoBlock.hpp @@ -186,25 +186,25 @@ class PotatoBlock : public CropBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 - * @symbol ?getVariant\@PotatoBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 147 + * @symbol ?getVariant\@PotatoBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,42 +216,47 @@ class PotatoBlock : public CropBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 194 - * @symbol __unk_vfn_194 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_194(); + virtual void __unk_vfn_187(); /** * @vftbl 195 + * @symbol __unk_vfn_195 + */ + virtual void __unk_vfn_195(); + /** + * @vftbl 196 * @symbol ?getBaseSeed\@PotatoBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseSeed() const; /** - * @vftbl 196 + * @vftbl 197 * @symbol ?getBaseCrop\@PotatoBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseCrop() const; /** - * @vftbl 198 + * @vftbl 199 * @symbol ?getCropNum\@PotatoBlock\@\@UEBAHAEAVRandomize\@\@HH\@Z */ virtual int getCropNum(class Randomize &, int, int) const; diff --git a/LiteLoader/include/llapi/mc/Potion.hpp b/LiteLoader/include/llapi/mc/Potion.hpp index 96512a696d..3b0f5e7bb7 100644 --- a/LiteLoader/include/llapi/mc/Potion.hpp +++ b/LiteLoader/include/llapi/mc/Potion.hpp @@ -47,14 +47,14 @@ enum class PotionVariant; * @symbol ?effectPotencyToString\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVMobEffectInstance\@\@\@Z */ MCAPI std::string effectPotencyToString(class MobEffectInstance const &) const; - /** - * @symbol ?getDescriptionId\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@\@Z - */ - MCAPI std::string getDescriptionId(enum class Potion::PotionType) const; /** * @symbol ?getDescriptionId\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getDescriptionId() const; + /** + * @symbol ?getDescriptionId\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@\@Z + */ + MCAPI std::string getDescriptionId(enum class Potion::PotionType) const; /** * @symbol ?getMobEffect\@Potion\@\@QEBAAEBVMobEffectInstance\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PotionItem.hpp b/LiteLoader/include/llapi/mc/PotionItem.hpp index e1cd87207a..b91b7ad2a8 100644 --- a/LiteLoader/include/llapi/mc/PotionItem.hpp +++ b/LiteLoader/include/llapi/mc/PotionItem.hpp @@ -57,11 +57,6 @@ class PotionItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); - /** - * @vftbl 50 - * @symbol ?isGlint\@PotionItem\@\@MEBA_NAEBVItemStackBase\@\@\@Z - */ - virtual bool isGlint(class ItemStackBase const &) const; /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -159,9 +154,9 @@ class PotionItem : public Item { virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** * @vftbl 132 - * @symbol ?_useOn\@PotionItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@PotionItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @vftbl 133 * @symbol ?getPotionType\@PotionItem\@\@UEBA?AW4PotionType\@Potion\@\@XZ diff --git a/LiteLoader/include/llapi/mc/PowderSnowBlock.hpp b/LiteLoader/include/llapi/mc/PowderSnowBlock.hpp index ed157d5d26..e2373fe2b1 100644 --- a/LiteLoader/include/llapi/mc/PowderSnowBlock.hpp +++ b/LiteLoader/include/llapi/mc/PowderSnowBlock.hpp @@ -231,20 +231,20 @@ class PowderSnowBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -256,30 +256,35 @@ class PowderSnowBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 169 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 170 * @symbol ?onFallOn\@PowderSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_POWDERSNOWBLOCK /** * @symbol ?canBeDestroyedByWaterSpread\@PowderSnowBlock\@\@UEBA_NXZ @@ -298,14 +303,14 @@ class PowderSnowBlock : public BlockLegacy { * @symbol ??0PowderSnowBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI PowderSnowBlock(std::string const &, int, class Material const &); - /** - * @symbol ?canWalkOnTop\@PowderSnowBlock\@\@SA_NAEBVGetCollisionShapeInterface\@\@\@Z - */ - MCAPI static bool canWalkOnTop(class GetCollisionShapeInterface const &); /** * @symbol ?canWalkOnTop\@PowderSnowBlock\@\@SA_NAEBUIActorMovementProxy\@\@\@Z */ MCAPI static bool canWalkOnTop(struct IActorMovementProxy const &); + /** + * @symbol ?canWalkOnTop\@PowderSnowBlock\@\@SA_NAEBVGetCollisionShapeInterface\@\@\@Z + */ + MCAPI static bool canWalkOnTop(class GetCollisionShapeInterface const &); /** * @symbol ?clearFire\@PowderSnowBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PoweredRailBlock.hpp b/LiteLoader/include/llapi/mc/PoweredRailBlock.hpp index d6ee4b1c39..c890a78e5e 100644 --- a/LiteLoader/include/llapi/mc/PoweredRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/PoweredRailBlock.hpp @@ -181,25 +181,25 @@ class PoweredRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 - * @symbol ?getVariant\@PoweredRailBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 147 + * @symbol ?getVariant\@PoweredRailBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,25 +211,30 @@ class PoweredRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0PoweredRailBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/PressurePlateBlock.hpp b/LiteLoader/include/llapi/mc/PressurePlateBlock.hpp index a9b4fc8807..9a0c27fd70 100644 --- a/LiteLoader/include/llapi/mc/PressurePlateBlock.hpp +++ b/LiteLoader/include/llapi/mc/PressurePlateBlock.hpp @@ -176,20 +176,20 @@ class PressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,37 +201,42 @@ class PressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 195 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 196 * @symbol ?getSignalStrength\@PressurePlateBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getSignalStrength(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 196 + * @vftbl 197 * @symbol ?getSignalForData\@PressurePlateBlock\@\@MEBAHH\@Z */ virtual int getSignalForData(int) const; /** - * @vftbl 197 + * @vftbl 198 * @symbol ?getRedstoneSignal\@PressurePlateBlock\@\@MEBAHH\@Z */ virtual int getRedstoneSignal(int) const; diff --git a/LiteLoader/include/llapi/mc/PrintStream.hpp b/LiteLoader/include/llapi/mc/PrintStream.hpp index 29cac5e489..15a7d6883f 100644 --- a/LiteLoader/include/llapi/mc/PrintStream.hpp +++ b/LiteLoader/include/llapi/mc/PrintStream.hpp @@ -39,5 +39,15 @@ class PrintStream { * @symbol ?print\@PrintStream\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void print(std::string const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PRINTSTREAM + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PrintStream(); +#endif + /** + * @symbol ?println\@PrintStream\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI void println(std::string const &); }; diff --git a/LiteLoader/include/llapi/mc/PrismarineBlock.hpp b/LiteLoader/include/llapi/mc/PrismarineBlock.hpp index 96ea91a920..67bcb302a0 100644 --- a/LiteLoader/include/llapi/mc/PrismarineBlock.hpp +++ b/LiteLoader/include/llapi/mc/PrismarineBlock.hpp @@ -181,30 +181,30 @@ class PrismarineBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@PrismarineBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@PrismarineBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,32 +216,37 @@ class PrismarineBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@PrismarineBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@PrismarineBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/PrivateKeyManager.hpp b/LiteLoader/include/llapi/mc/PrivateKeyManager.hpp index 22b201dfa1..5a4b8c7ab6 100644 --- a/LiteLoader/include/llapi/mc/PrivateKeyManager.hpp +++ b/LiteLoader/include/llapi/mc/PrivateKeyManager.hpp @@ -54,9 +54,5 @@ class PrivateKeyManager { * @symbol ?computeSecret\@PrivateKeyManager\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVKeyManager\@\@\@Z */ MCAPI std::string computeSecret(class KeyManager const &) const; - /** - * @symbol ?sign\@PrivateKeyManager\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@W4HashType\@Hash\@Crypto\@\@\@Z - */ - MCAPI std::string sign(std::string const &, enum class Crypto::Hash::HashType) const; }; diff --git a/LiteLoader/include/llapi/mc/ProjectileComponent.hpp b/LiteLoader/include/llapi/mc/ProjectileComponent.hpp index e5950c60a7..d6a713a491 100644 --- a/LiteLoader/include/llapi/mc/ProjectileComponent.hpp +++ b/LiteLoader/include/llapi/mc/ProjectileComponent.hpp @@ -29,10 +29,6 @@ enum class EAxis; #endif public: - /** - * @symbol ??0ProjectileComponent\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI ProjectileComponent(class ProjectileComponent const &); /** * @symbol ??0ProjectileComponent\@\@QEAA\@XZ */ @@ -41,6 +37,10 @@ enum class EAxis; * @symbol ??0ProjectileComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ProjectileComponent(class ProjectileComponent &&); + /** + * @symbol ??0ProjectileComponent\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI ProjectileComponent(class ProjectileComponent const &); /** * @symbol ?addAdditionalSaveData\@ProjectileComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PropertiesSettings.hpp b/LiteLoader/include/llapi/mc/PropertiesSettings.hpp index 8b802badab..ba4c8a3fbd 100644 --- a/LiteLoader/include/llapi/mc/PropertiesSettings.hpp +++ b/LiteLoader/include/llapi/mc/PropertiesSettings.hpp @@ -34,6 +34,10 @@ class PropertiesSettings { * @symbol ??0PropertiesSettings\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI PropertiesSettings(std::string const &); + /** + * @symbol ?adventureModeOverridesEnabled\@PropertiesSettings\@\@QEBA_NXZ + */ + MCAPI bool adventureModeOverridesEnabled() const; /** * @symbol ?allowCheats\@PropertiesSettings\@\@QEBA_NXZ */ @@ -42,6 +46,10 @@ class PropertiesSettings { * @symbol ?areCustomSkinsDisabled\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool areCustomSkinsDisabled() const; + /** + * @symbol ?blockNetworkIdsAreHashes\@PropertiesSettings\@\@QEBA_NXZ + */ + MCAPI bool blockNetworkIdsAreHashes() const; /** * @symbol ?canEmitTelemetryEvents\@PropertiesSettings\@\@QEBA_NXZ */ @@ -62,6 +70,14 @@ class PropertiesSettings { * @symbol ?getChatRestrictionLevel\@PropertiesSettings\@\@QEBA?AW4ChatRestrictionLevel\@\@XZ */ MCAPI enum class ChatRestrictionLevel getChatRestrictionLevel() const; + /** + * @symbol ?getClientThrottleScalar\@PropertiesSettings\@\@QEBAMXZ + */ + MCAPI float getClientThrottleScalar() const; + /** + * @symbol ?getClientThrottleThreshold\@PropertiesSettings\@\@QEBAHXZ + */ + MCAPI int getClientThrottleThreshold() const; /** * @symbol ?getCompressionAlgorithm\@PropertiesSettings\@\@QEBA?AW4PacketCompressionAlgorithm\@\@XZ */ @@ -130,6 +146,10 @@ class PropertiesSettings { * @symbol ?getMotd\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getMotd() const; + /** + * @symbol ?getNetworkPermissions\@PropertiesSettings\@\@QEBAAEBUNetworkPermissions\@\@XZ + */ + MCAPI struct NetworkPermissions const & getNetworkPermissions() const; /** * @symbol ?getOpPermissionLevel\@PropertiesSettings\@\@QEBA?AW4CommandPermissionLevel\@\@XZ */ @@ -146,6 +166,10 @@ class PropertiesSettings { * @symbol ?getScriptSettings\@PropertiesSettings\@\@QEBAAEBUScriptSettings\@\@XZ */ MCAPI struct ScriptSettings const & getScriptSettings() const; + /** + * @symbol ?getServerBuildRatioOverride\@PropertiesSettings\@\@QEBA?AV?$optional\@M\@std\@\@XZ + */ + MCAPI class std::optional getServerBuildRatioOverride() const; /** * @symbol ?getServerId\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PropertyBag.hpp b/LiteLoader/include/llapi/mc/PropertyBag.hpp index cab7e516bf..62239da2aa 100644 --- a/LiteLoader/include/llapi/mc/PropertyBag.hpp +++ b/LiteLoader/include/llapi/mc/PropertyBag.hpp @@ -29,14 +29,14 @@ class PropertyBag { #endif public: - /** - * @symbol ??0PropertyBag\@\@QEAA\@AEBVValue\@Json\@\@\@Z - */ - MCAPI PropertyBag(class Json::Value const &); /** * @symbol ??0PropertyBag\@\@QEAA\@XZ */ MCAPI PropertyBag(); + /** + * @symbol ??0PropertyBag\@\@QEAA\@AEBVValue\@Json\@\@\@Z + */ + MCAPI PropertyBag(class Json::Value const &); /** * @symbol ?toJsonValue\@PropertyBag\@\@QEBAAEBVValue\@Json\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PropertyContainer.hpp b/LiteLoader/include/llapi/mc/PropertyContainer.hpp index ad49ccdef9..83ddbaed2b 100644 --- a/LiteLoader/include/llapi/mc/PropertyContainer.hpp +++ b/LiteLoader/include/llapi/mc/PropertyContainer.hpp @@ -32,30 +32,10 @@ class PropertyContainer { * @symbol ??0PropertyContainer\@\@QEAA\@V?$not_null\@V?$shared_ptr\@$$CBVPropertyGroup\@\@\@std\@\@\@gsl\@\@AEAVRenderParams\@\@\@Z */ MCAPI PropertyContainer(class gsl::not_null>, class RenderParams &); - /** - * @symbol ?addAdditionalSaveDataToCompoundTag\@PropertyContainer\@\@QEBAXAEAVCompoundTag\@\@\@Z - */ - MCAPI void addAdditionalSaveDataToCompoundTag(class CompoundTag &) const; /** * @symbol ?addEntryToSyncData\@PropertyContainer\@\@QEBAXAEBVPropertyMetadata\@\@AEAUPropertySyncData\@\@\@Z */ MCAPI void addEntryToSyncData(class PropertyMetadata const &, struct PropertySyncData &) const; - /** - * @symbol ?getBoolValue\@PropertyContainer\@\@QEBA?AV?$optional\@_N\@std\@\@_K\@Z - */ - MCAPI class std::optional getBoolValue(unsigned __int64) const; - /** - * @symbol ?getEnumIndexValue\@PropertyContainer\@\@QEBA?AV?$optional\@_K\@std\@\@_K\@Z - */ - MCAPI class std::optional getEnumIndexValue(unsigned __int64) const; - /** - * @symbol ?getFloatValue\@PropertyContainer\@\@QEBA?AV?$optional\@M\@std\@\@_K\@Z - */ - MCAPI class std::optional getFloatValue(unsigned __int64) const; - /** - * @symbol ?getIntValue\@PropertyContainer\@\@QEBA?AV?$optional\@H\@std\@\@_K\@Z - */ - MCAPI class std::optional getIntValue(unsigned __int64) const; /** * @symbol ?getMolangValue\@PropertyContainer\@\@QEBA_N_KAEAUMolangScriptArg\@\@\@Z */ @@ -68,14 +48,6 @@ class PropertyContainer { * @symbol ?setAliasProperties\@PropertyContainer\@\@QEAAXAEBV?$unordered_map\@VHashedString\@\@V?$shared_ptr\@VTag\@\@\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$shared_ptr\@VTag\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@1\@Z */ MCAPI void setAliasProperties(class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const &, std::string const &, std::string const &); - /** - * @symbol ?setBoolValue\@PropertyContainer\@\@QEAAX_K_N\@Z - */ - MCAPI void setBoolValue(unsigned __int64, bool); - /** - * @symbol ?setEnumIndexValue\@PropertyContainer\@\@QEAAX_K0\@Z - */ - MCAPI void setEnumIndexValue(unsigned __int64, unsigned __int64); /** * @symbol ?setFloatValue\@PropertyContainer\@\@QEAAX_KM\@Z */ diff --git a/LiteLoader/include/llapi/mc/PropertyGroup.hpp b/LiteLoader/include/llapi/mc/PropertyGroup.hpp index e60e4a7671..592e7cb3bc 100644 --- a/LiteLoader/include/llapi/mc/PropertyGroup.hpp +++ b/LiteLoader/include/llapi/mc/PropertyGroup.hpp @@ -58,10 +58,6 @@ class PropertyGroup { * @symbol ?getPropertyMetadata\@PropertyGroup\@\@QEBAPEBVPropertyMetadata\@\@_K\@Z */ MCAPI class PropertyMetadata const * getPropertyMetadata(unsigned __int64) const; - /** - * @symbol ?getPropertyMetadataByString\@PropertyGroup\@\@QEBAPEBVPropertyMetadata\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI class PropertyMetadata const * getPropertyMetadataByString(std::string const &) const; /** * @symbol ?hasAnyClientSyncProperties\@PropertyGroup\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/PumpkinBlock.hpp b/LiteLoader/include/llapi/mc/PumpkinBlock.hpp index 7a17973076..6c5e6fd98b 100644 --- a/LiteLoader/include/llapi/mc/PumpkinBlock.hpp +++ b/LiteLoader/include/llapi/mc/PumpkinBlock.hpp @@ -182,9 +182,9 @@ class PumpkinBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@PumpkinBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@PumpkinBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,30 +201,30 @@ class PumpkinBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 * @symbol ?getVariant\@PumpkinBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 + * @vftbl 150 * @symbol ?getMappedFace\@PumpkinBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -237,29 +237,34 @@ class PumpkinBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@PumpkinBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PUMPKINBLOCK /** * @symbol ?canBeSilkTouched\@PumpkinBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/QuartzBlockBlock.hpp b/LiteLoader/include/llapi/mc/QuartzBlockBlock.hpp index 3827d6ea16..fec34a27e9 100644 --- a/LiteLoader/include/llapi/mc/QuartzBlockBlock.hpp +++ b/LiteLoader/include/llapi/mc/QuartzBlockBlock.hpp @@ -167,9 +167,9 @@ class QuartzBlockBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@QuartzBlockBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@QuartzBlockBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,40 +186,40 @@ class QuartzBlockBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@QuartzBlockBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@QuartzBlockBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@QuartzBlockBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 + * @vftbl 150 * @symbol ?getMappedFace\@QuartzBlockBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -231,32 +231,37 @@ class QuartzBlockBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@QuartzBlockBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@QuartzBlockBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/Quaternion.hpp b/LiteLoader/include/llapi/mc/Quaternion.hpp new file mode 100644 index 0000000000..85a11ac8f0 --- /dev/null +++ b/LiteLoader/include/llapi/mc/Quaternion.hpp @@ -0,0 +1,32 @@ +/** + * @file Quaternion.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class Quaternion { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_QUATERNION +public: + class Quaternion& operator=(class Quaternion const &) = delete; + Quaternion(class Quaternion const &) = delete; + Quaternion() = delete; +#endif + +public: + /** + * @symbol ??0Quaternion\@\@QEAA\@AEBVMatrix\@\@\@Z + */ + MCAPI Quaternion(class Matrix const &); + +}; diff --git a/LiteLoader/include/llapi/mc/QueryTargetCommand.hpp b/LiteLoader/include/llapi/mc/QueryTargetCommand.hpp index da7d4595f0..e1a885b32b 100644 --- a/LiteLoader/include/llapi/mc/QueryTargetCommand.hpp +++ b/LiteLoader/include/llapi/mc/QueryTargetCommand.hpp @@ -36,7 +36,7 @@ class QueryTargetCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@QueryTargetCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/Raid.hpp b/LiteLoader/include/llapi/mc/Raid.hpp index 843928477f..bd8e07062b 100644 --- a/LiteLoader/include/llapi/mc/Raid.hpp +++ b/LiteLoader/include/llapi/mc/Raid.hpp @@ -53,6 +53,10 @@ class Raid { * @symbol ?getRemainingRaiders\@Raid\@\@QEBA_KXZ */ MCAPI unsigned __int64 getRemainingRaiders() const; + /** + * @symbol ?isRaider\@Raid\@\@QEBA_NUActorUniqueID\@\@\@Z + */ + MCAPI bool isRaider(struct ActorUniqueID) const; /** * @symbol ?readAdditionalSaveData\@Raid\@\@QEAAXAEBVCompoundTag\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/RaidBossComponent.hpp b/LiteLoader/include/llapi/mc/RaidBossComponent.hpp index 5d5aa81829..2b6130994a 100644 --- a/LiteLoader/include/llapi/mc/RaidBossComponent.hpp +++ b/LiteLoader/include/llapi/mc/RaidBossComponent.hpp @@ -113,6 +113,10 @@ class RaidBossComponent { * @symbol ?updateBossBarStats\@RaidBossComponent\@\@QEAAXAEAVActor\@\@AEBVRaid\@\@\@Z */ MCAPI void updateBossBarStats(class Actor &, class Raid const &); + /** + * @symbol ?updateHealthBarVisible\@RaidBossComponent\@\@QEAAX_NAEAVActor\@\@\@Z + */ + MCAPI void updateHealthBarVisible(bool, class Actor &); /** * @symbol ??1RaidBossComponent\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/RaidTriggerSystem.hpp b/LiteLoader/include/llapi/mc/RaidTriggerSystem.hpp index c710f229fe..73e025f823 100644 --- a/LiteLoader/include/llapi/mc/RaidTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/RaidTriggerSystem.hpp @@ -34,6 +34,10 @@ class RaidTriggerSystem { * @symbol ?_doRaidTriggerSystem\@RaidTriggerSystem\@\@CAXAEBUDimensionTypeComponent\@\@AEBUStateVectorComponent\@\@AEAVActorOwnerComponent\@\@AEBUVillageManagerComponent\@\@\@Z */ MCAPI static void _doRaidTriggerSystem(struct DimensionTypeComponent const &, struct StateVectorComponent const &, class ActorOwnerComponent &, struct VillageManagerComponent const &); + /** + * @symbol ?_tickRaidTriggerSystem\@RaidTriggerSystem\@\@CAXV?$OptionalGlobalT\@$$CBUVillageManagerComponent\@\@VEntityRegistryBase\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@$$CBV?$FlagComponent\@UActorTickedFlag\@\@\@\@$$CBV?$ActorFlagComponent\@URaidTriggerFlag\@\@\@\@\@\@$$CBUDimensionTypeComponent\@\@$$CBUStateVectorComponent\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void _tickRaidTriggerSystem(class OptionalGlobalT, class ViewT const, class ActorFlagComponent const>, struct DimensionTypeComponent const, struct StateVectorComponent const, class ActorOwnerComponent>); private: diff --git a/LiteLoader/include/llapi/mc/RailBlock.hpp b/LiteLoader/include/llapi/mc/RailBlock.hpp index f6421ffdc8..4430e16689 100644 --- a/LiteLoader/include/llapi/mc/RailBlock.hpp +++ b/LiteLoader/include/llapi/mc/RailBlock.hpp @@ -176,25 +176,25 @@ class RailBlock : public BaseRailBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 - * @symbol ?getVariant\@RailBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 147 + * @symbol ?getVariant\@RailBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,25 +206,30 @@ class RailBlock : public BaseRailBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0RailBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/RakNetServerLocator.hpp b/LiteLoader/include/llapi/mc/RakNetServerLocator.hpp index d59667cb85..a2e209dd68 100644 --- a/LiteLoader/include/llapi/mc/RakNetServerLocator.hpp +++ b/LiteLoader/include/llapi/mc/RakNetServerLocator.hpp @@ -182,10 +182,6 @@ struct AnnounceServerData { * @symbol ?_pingServerV4\@RakNetServerLocator\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI bool _pingServerV4(std::string const &, int); - /** - * @symbol ?_pingServerV6\@RakNetServerLocator\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - MCAPI bool _pingServerV6(std::string const &, int); /** * @symbol ?_setPingResponder\@RakNetServerLocator\@\@AEAAXAEBUAnnounceServerData\@1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/RakPeerHelper.hpp b/LiteLoader/include/llapi/mc/RakPeerHelper.hpp index 0490757d87..c02e1a40dc 100644 --- a/LiteLoader/include/llapi/mc/RakPeerHelper.hpp +++ b/LiteLoader/include/llapi/mc/RakPeerHelper.hpp @@ -52,10 +52,6 @@ class RakPeerHelper { * @symbol ?getIPv6BoundPort\@RakPeerHelper\@\@QEBAGXZ */ MCAPI unsigned short getIPv6BoundPort() const; - /** - * @symbol ?getIPv6ConnectionIndex\@RakPeerHelper\@\@QEBAHXZ - */ - MCAPI int getIPv6ConnectionIndex() const; /** * @symbol ?isIPv4Supported\@RakPeerHelper\@\@QEBA_NXZ */ @@ -68,10 +64,6 @@ class RakPeerHelper { * @symbol ?peerStartup\@RakPeerHelper\@\@QEAA?AW4StartupResult\@RakNet\@\@PEAVRakPeerInterface\@3\@AEBUConnectionDefinition\@\@W4PeerPurpose\@1\@\@Z */ MCAPI enum class RakNet::StartupResult peerStartup(class RakNet::RakPeerInterface *, struct ConnectionDefinition const &, enum class RakPeerHelper::PeerPurpose); - /** - * @symbol ?reset\@RakPeerHelper\@\@QEAAXXZ - */ - MCAPI void reset(); //private: /** diff --git a/LiteLoader/include/llapi/mc/RakTcpProxy.hpp b/LiteLoader/include/llapi/mc/RakTcpProxy.hpp index 28f1c9d95f..5a45c59046 100644 --- a/LiteLoader/include/llapi/mc/RakTcpProxy.hpp +++ b/LiteLoader/include/llapi/mc/RakTcpProxy.hpp @@ -26,6 +26,7 @@ class RakTcpProxy { public: class RakTcpProxy& operator=(class RakTcpProxy const &) = delete; RakTcpProxy(class RakTcpProxy const &) = delete; + RakTcpProxy() = delete; #endif public: @@ -84,9 +85,5 @@ class RakTcpProxy { * @symbol ?nextLostConnection\@RakTcpProxy\@\@UEAA?AUSystemAddress\@RakNet\@\@XZ */ virtual struct RakNet::SystemAddress nextLostConnection(); - /** - * @symbol ??0RakTcpProxy\@\@QEAA\@XZ - */ - MCAPI RakTcpProxy(); }; diff --git a/LiteLoader/include/llapi/mc/RakWebSocket.hpp b/LiteLoader/include/llapi/mc/RakWebSocket.hpp index 2c277a029c..cb10972b70 100644 --- a/LiteLoader/include/llapi/mc/RakWebSocket.hpp +++ b/LiteLoader/include/llapi/mc/RakWebSocket.hpp @@ -90,18 +90,6 @@ class RakWebSocket { * @symbol ??0RakWebSocket\@\@QEAA\@V?$unique_ptr\@VTcpProxy\@\@U?$default_delete\@VTcpProxy\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI RakWebSocket(std::unique_ptr, bool); - /** - * @symbol ?close\@RakWebSocket\@\@QEAAX_N0\@Z - */ - MCAPI void close(bool, bool); - /** - * @symbol ?getUri\@RakWebSocket\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string getUri() const; - /** - * @symbol ?isDisconnected\@RakWebSocket\@\@QEBA_NXZ - */ - MCAPI bool isDisconnected() const; /** * @symbol ?send\@RakWebSocket\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -132,10 +120,6 @@ class RakWebSocket { * @symbol ?_invokeOnCloseHandler\@RakWebSocket\@\@IEAAXXZ */ MCAPI void _invokeOnCloseHandler(); - /** - * @symbol ?_processClosingFrames\@RakWebSocket\@\@IEAAXAEAVBitStream\@RakNet\@\@\@Z - */ - MCAPI void _processClosingFrames(class RakNet::BitStream &); /** * @symbol ?_processClosingHandshake\@RakWebSocket\@\@IEAAX_N\@Z */ @@ -144,10 +128,6 @@ class RakWebSocket { * @symbol ?_processDataFrames\@RakWebSocket\@\@IEAAXAEAVBitStream\@RakNet\@\@\@Z */ MCAPI void _processDataFrames(class RakNet::BitStream &); - /** - * @symbol ?_processOpenHandshakePackets\@RakWebSocket\@\@IEAAXAEAVBitStream\@RakNet\@\@\@Z - */ - MCAPI void _processOpenHandshakePackets(class RakNet::BitStream &); /** * @symbol ?_processPacket\@RakWebSocket\@\@IEAA_NAEBV?$function\@$$A6AXAEAVBitStream\@RakNet\@\@\@Z\@std\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/RakWebSocketDataFrame.hpp b/LiteLoader/include/llapi/mc/RakWebSocketDataFrame.hpp index 1637fbe794..5691e5aaaa 100644 --- a/LiteLoader/include/llapi/mc/RakWebSocketDataFrame.hpp +++ b/LiteLoader/include/llapi/mc/RakWebSocketDataFrame.hpp @@ -26,68 +26,13 @@ class RakWebSocketDataFrame { public: class RakWebSocketDataFrame& operator=(class RakWebSocketDataFrame const &) = delete; RakWebSocketDataFrame(class RakWebSocketDataFrame const &) = delete; + RakWebSocketDataFrame() = delete; #endif public: - /** - * @symbol ??0RakWebSocketDataFrame\@\@QEAA\@XZ - */ - MCAPI RakWebSocketDataFrame(); - /** - * @symbol ?getCloseCode\@RakWebSocketDataFrame\@\@QEBA?AW4CloseStatusCode\@\@XZ - */ - MCAPI enum class CloseStatusCode getCloseCode() const; - /** - * @symbol ?getHeader\@RakWebSocketDataFrame\@\@QEBAAEBURakWebSocketDataFrameHeader\@\@XZ - */ - MCAPI struct RakWebSocketDataFrameHeader const & getHeader() const; - /** - * @symbol ?getMessageType\@RakWebSocketDataFrame\@\@QEBA?AW4WebSocketMessageType\@\@XZ - */ - MCAPI enum class WebSocketMessageType getMessageType() const; - /** - * @symbol ?getParseState\@RakWebSocketDataFrame\@\@QEBA?AW4ParseState\@1\@XZ - */ - MCAPI enum class RakWebSocketDataFrame::ParseState getParseState() const; - /** - * @symbol ?getPayload\@RakWebSocketDataFrame\@\@QEBAAEBVBitStream\@RakNet\@\@XZ - */ - MCAPI class RakNet::BitStream const & getPayload() const; - /** - * @symbol ?getPayloadAsString\@RakWebSocketDataFrame\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string getPayloadAsString() const; - /** - * @symbol ??1RakWebSocketDataFrame\@\@QEAA\@XZ - */ - MCAPI ~RakWebSocketDataFrame(); /** * @symbol ?writeFrameToStream\@RakWebSocketDataFrame\@\@SAXAEAVBitStream\@RakNet\@\@PEBEIW4OpCode\@\@_NI\@Z */ MCAPI static void writeFrameToStream(class RakNet::BitStream &, unsigned char const *, unsigned int, enum class OpCode, bool, unsigned int); -//private: - /** - * @symbol ?_isContinuation\@RakWebSocketDataFrame\@\@CA_NE\@Z - */ - MCAPI static bool _isContinuation(unsigned char); - /** - * @symbol ?_isControl\@RakWebSocketDataFrame\@\@CA_NE\@Z - */ - MCAPI static bool _isControl(unsigned char); - /** - * @symbol ?_isNonControl\@RakWebSocketDataFrame\@\@CA_NE\@Z - */ - MCAPI static bool _isNonControl(unsigned char); - /** - * @symbol ?_isUnsupported\@RakWebSocketDataFrame\@\@CA_NE\@Z - */ - MCAPI static bool _isUnsupported(unsigned char); - /** - * @symbol ?_maskUnmaskData\@RakWebSocketDataFrame\@\@CAXPEAEIII\@Z - */ - MCAPI static void _maskUnmaskData(unsigned char *, unsigned int, unsigned int, unsigned int); - -private: - }; diff --git a/LiteLoader/include/llapi/mc/RakWebSocketDataFrameHeader.hpp b/LiteLoader/include/llapi/mc/RakWebSocketDataFrameHeader.hpp deleted file mode 100644 index 12b03a49ad..0000000000 --- a/LiteLoader/include/llapi/mc/RakWebSocketDataFrameHeader.hpp +++ /dev/null @@ -1,70 +0,0 @@ -/** - * @file RakWebSocketDataFrameHeader.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure RakWebSocketDataFrameHeader. - * - */ -struct RakWebSocketDataFrameHeader { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_RAKWEBSOCKETDATAFRAMEHEADER -public: - struct RakWebSocketDataFrameHeader& operator=(struct RakWebSocketDataFrameHeader const &) = delete; - RakWebSocketDataFrameHeader(struct RakWebSocketDataFrameHeader const &) = delete; -#endif - -public: - /** - * @symbol ??0RakWebSocketDataFrameHeader\@\@QEAA\@_N0000W4OpCode\@\@E\@Z - */ - MCAPI RakWebSocketDataFrameHeader(bool, bool, bool, bool, bool, enum class OpCode, unsigned char); - /** - * @symbol ??0RakWebSocketDataFrameHeader\@\@QEAA\@XZ - */ - MCAPI RakWebSocketDataFrameHeader(); - /** - * @symbol ?getFinBit\@RakWebSocketDataFrameHeader\@\@QEBAHXZ - */ - MCAPI int getFinBit() const; - /** - * @symbol ?getMaskBit\@RakWebSocketDataFrameHeader\@\@QEBAHXZ - */ - MCAPI int getMaskBit() const; - /** - * @symbol ?getOpCode\@RakWebSocketDataFrameHeader\@\@QEBA?AW4OpCode\@\@XZ - */ - MCAPI enum class OpCode getOpCode() const; - /** - * @symbol ?getPayloadLength\@RakWebSocketDataFrameHeader\@\@QEBAEXZ - */ - MCAPI unsigned char getPayloadLength() const; - /** - * @symbol ?getRSV1Bit\@RakWebSocketDataFrameHeader\@\@QEBAHXZ - */ - MCAPI int getRSV1Bit() const; - /** - * @symbol ?getRSV2Bit\@RakWebSocketDataFrameHeader\@\@QEBAHXZ - */ - MCAPI int getRSV2Bit() const; - /** - * @symbol ?getRSV3Bit\@RakWebSocketDataFrameHeader\@\@QEBAHXZ - */ - MCAPI int getRSV3Bit() const; - /** - * @symbol ??1RakWebSocketDataFrameHeader\@\@QEAA\@XZ - */ - MCAPI ~RakWebSocketDataFrameHeader(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/RakWebSocketDataFrameParser.hpp b/LiteLoader/include/llapi/mc/RakWebSocketDataFrameParser.hpp index 42193185dc..50e16bd524 100644 --- a/LiteLoader/include/llapi/mc/RakWebSocketDataFrameParser.hpp +++ b/LiteLoader/include/llapi/mc/RakWebSocketDataFrameParser.hpp @@ -30,18 +30,10 @@ class RakWebSocketDataFrameParser { #endif public: - /** - * @symbol ??0RakWebSocketDataFrameParser\@\@QEAA\@_N\@Z - */ - MCAPI RakWebSocketDataFrameParser(bool); /** * @symbol ?readFrame\@RakWebSocketDataFrameParser\@\@QEAA?AV?$shared_ptr\@VRakWebSocketDataFrame\@\@\@std\@\@AEAVBitStream\@RakNet\@\@\@Z */ MCAPI class std::shared_ptr readFrame(class RakNet::BitStream &); - /** - * @symbol ?setOnFailHandler\@RakWebSocketDataFrameParser\@\@QEAAXV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CloseStatusCode\@\@\@Z\@std\@\@\@Z - */ - MCAPI void setOnFailHandler(class std::function); /** * @symbol ??1RakWebSocketDataFrameParser\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Random.hpp b/LiteLoader/include/llapi/mc/Random.hpp index 9d0c2e0c67..60af5204b8 100644 --- a/LiteLoader/include/llapi/mc/Random.hpp +++ b/LiteLoader/include/llapi/mc/Random.hpp @@ -75,10 +75,6 @@ class Random { * @symbol ??0Random\@\@QEAA\@XZ */ MCAPI Random(); - /** - * @symbol ??0Random\@\@QEAA\@I_N\@Z - */ - MCAPI Random(unsigned int, bool); /** * @symbol ?nextFloat\@Random\@\@QEAAMMM\@Z */ diff --git a/LiteLoader/include/llapi/mc/RandomDyeFunction.hpp b/LiteLoader/include/llapi/mc/RandomDyeFunction.hpp index fd9cd27c2c..d3f031ed26 100644 --- a/LiteLoader/include/llapi/mc/RandomDyeFunction.hpp +++ b/LiteLoader/include/llapi/mc/RandomDyeFunction.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #include "LootItemFunction.hpp" #define BEFORE_EXTRA @@ -46,10 +45,6 @@ class RandomDyeFunction : public LootItemFunction { * @symbol ?apply\@RandomDyeFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); - /** - * @symbol ?deserialize\@RandomDyeFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); //private: /** diff --git a/LiteLoader/include/llapi/mc/RandomHoverGoal.hpp b/LiteLoader/include/llapi/mc/RandomHoverGoal.hpp index 1a9183acab..f67196e7f0 100644 --- a/LiteLoader/include/llapi/mc/RandomHoverGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomHoverGoal.hpp @@ -79,10 +79,6 @@ class RandomHoverGoal { * @symbol ?_computeNewTarget\@RandomHoverGoal\@\@IEAA_NXZ */ MCAPI bool _computeNewTarget(); - /** - * @symbol ?_mobMeetsPreconditions\@RandomHoverGoal\@\@IEBA_NXZ - */ - MCAPI bool _mobMeetsPreconditions() const; /** * @symbol ?_moveToTarget\@RandomHoverGoal\@\@IEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/RangedAttackGoal.hpp b/LiteLoader/include/llapi/mc/RangedAttackGoal.hpp index c853fa0c5f..dd110e06c9 100644 --- a/LiteLoader/include/llapi/mc/RangedAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/RangedAttackGoal.hpp @@ -78,12 +78,4 @@ class RangedAttackGoal { */ MCAPI void handleAttackBehavior(class Actor *, class Vec3 const &, float, bool); -//private: - /** - * @symbol ?_dischargeCarriedItem\@RangedAttackGoal\@\@AEAAXXZ - */ - MCAPI void _dischargeCarriedItem(); - -private: - }; diff --git a/LiteLoader/include/llapi/mc/Recipe.hpp b/LiteLoader/include/llapi/mc/Recipe.hpp index 4804390dc1..0e193fa4a3 100644 --- a/LiteLoader/include/llapi/mc/Recipe.hpp +++ b/LiteLoader/include/llapi/mc/Recipe.hpp @@ -36,9 +36,9 @@ class Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@ShapelessRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @symbol ?assemble\@ShapelessRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &) const = 0; + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const = 0; /** * @vftbl 2 * @symbol ?getCraftingSize\@BannerAddPatternRecipe\@\@UEBAHXZ @@ -56,9 +56,9 @@ class Recipe { virtual std::vector const & getResultItem() const = 0; /** * @vftbl 5 - * @symbol ?isShapeless\@MultiRecipe\@\@EEBA_NXZ + * @symbol __unk_vfn_5 */ - virtual bool isShapeless() const = 0; + virtual void __unk_vfn_5() = 0; /** * @vftbl 6 * @symbol ?matches\@ShapedChemistryRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z @@ -81,26 +81,31 @@ class Recipe { virtual bool isMultiRecipe() const; /** * @vftbl 10 + * @symbol ?hasDataDrivenResult\@Recipe\@\@UEBA_NXZ + */ + virtual bool hasDataDrivenResult() const; + /** + * @vftbl 11 * @symbol ?itemValidForRecipe\@Recipe\@\@UEBA_NAEBVItemDescriptor\@\@AEBVItemStack\@\@\@Z */ virtual bool itemValidForRecipe(class ItemDescriptor const &, class ItemStack const &) const; /** - * @vftbl 11 + * @vftbl 12 * @symbol ?itemsMatch\@Recipe\@\@UEBA_NAEBVItemDescriptor\@\@0\@Z */ virtual bool itemsMatch(class ItemDescriptor const &, class ItemDescriptor const &) const; /** - * @vftbl 12 + * @vftbl 13 * @symbol ?itemsMatch\@Recipe\@\@UEBA_NAEBVItemDescriptor\@\@0PEBVCompoundTag\@\@\@Z */ virtual bool itemsMatch(class ItemDescriptor const &, class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 13 + * @vftbl 14 * @symbol ?getIngredientsHash\@Recipe\@\@UEBA_KXZ */ virtual unsigned __int64 getIngredientsHash() const; /** - * @vftbl 14 + * @vftbl 15 * @symbol ?loadResultList\@Recipe\@\@UEBAXAEBVBlockPalette\@\@\@Z */ virtual void loadResultList(class BlockPalette const &) const; @@ -138,6 +143,10 @@ class Recipe { * @symbol ?getTag\@Recipe\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getTag() const; + /** + * @symbol ?getUnlockingRequirement\@Recipe\@\@QEBAAEBVRecipeUnlockingRequirement\@\@XZ + */ + MCAPI class RecipeUnlockingRequirement const & getUnlockingRequirement() const; /** * @symbol ?getWidth\@Recipe\@\@QEBAHXZ */ diff --git a/LiteLoader/include/llapi/mc/RecipeCraftInputs.hpp b/LiteLoader/include/llapi/mc/RecipeCraftInputs.hpp index 71dff5394c..cf569993e7 100644 --- a/LiteLoader/include/llapi/mc/RecipeCraftInputs.hpp +++ b/LiteLoader/include/llapi/mc/RecipeCraftInputs.hpp @@ -27,10 +27,6 @@ class RecipeCraftInputs { #endif public: - /** - * @symbol ??0RecipeCraftInputs\@\@QEAA\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z - */ - MCAPI RecipeCraftInputs(class TypedServerNetId const &); /** * @symbol ??1RecipeCraftInputs\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/RecipeIngredient.hpp b/LiteLoader/include/llapi/mc/RecipeIngredient.hpp index 2bce642890..de6e8a8164 100644 --- a/LiteLoader/include/llapi/mc/RecipeIngredient.hpp +++ b/LiteLoader/include/llapi/mc/RecipeIngredient.hpp @@ -30,6 +30,7 @@ class RecipeIngredient : public ItemDescriptorCount { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_RECIPEINGREDIENT public: class RecipeIngredient& operator=(class RecipeIngredient const &) = delete; + RecipeIngredient() = delete; #endif public: @@ -45,25 +46,29 @@ class RecipeIngredient : public ItemDescriptorCount { MCVAPI ~RecipeIngredient(); #endif /** - * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlock\@\@G\@Z + * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVItemDescriptor\@\@G\@Z */ - MCAPI RecipeIngredient(class Block const &, unsigned short); + MCAPI RecipeIngredient(class ItemDescriptor const &, unsigned short); /** - * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z + * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlock\@\@G\@Z */ - MCAPI RecipeIngredient(class BlockLegacy const &, unsigned short); + MCAPI RecipeIngredient(class Block const &, unsigned short); /** * @symbol ??0RecipeIngredient\@\@QEAA\@AEBV0\@\@Z */ MCAPI RecipeIngredient(class RecipeIngredient const &); /** - * @symbol ??0RecipeIngredient\@\@QEAA\@XZ + * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z */ - MCAPI RecipeIngredient(); + MCAPI RecipeIngredient(class BlockLegacy const &, unsigned short); /** * @symbol ??0RecipeIngredient\@\@QEAA\@AEBUItemTag\@\@G\@Z */ MCAPI RecipeIngredient(struct ItemTag const &, unsigned short); + /** + * @symbol ??0RecipeIngredient\@\@QEAA\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + MCAPI RecipeIngredient(class ReadOnlyBinaryStream &); /** * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVItem\@\@HG\@Z */ @@ -77,9 +82,9 @@ class RecipeIngredient : public ItemDescriptorCount { */ MCAPI RecipeIngredient(class std::basic_string_view>, int, unsigned short); /** - * @symbol ??0RecipeIngredient\@\@QEAA\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?isEmpty\@RecipeIngredient\@\@QEBA_NXZ */ - MCAPI RecipeIngredient(class ReadOnlyBinaryStream &); + MCAPI bool isEmpty() const; /** * @symbol ?EMPTY_INGREDIENT\@RecipeIngredient\@\@2V1\@A */ diff --git a/LiteLoader/include/llapi/mc/RecipeOptionalCraftInputs.hpp b/LiteLoader/include/llapi/mc/RecipeOptionalCraftInputs.hpp deleted file mode 100644 index 46388d730d..0000000000 --- a/LiteLoader/include/llapi/mc/RecipeOptionalCraftInputs.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file RecipeOptionalCraftInputs.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -class RecipeOptionalCraftInputs { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_RECIPEOPTIONALCRAFTINPUTS -public: - class RecipeOptionalCraftInputs& operator=(class RecipeOptionalCraftInputs const &) = delete; - RecipeOptionalCraftInputs(class RecipeOptionalCraftInputs const &) = delete; - RecipeOptionalCraftInputs() = delete; -#endif - -public: - /** - * @symbol ??0RecipeOptionalCraftInputs\@\@QEAA\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z - */ - MCAPI RecipeOptionalCraftInputs(class TypedServerNetId const &, std::string const &, std::string const &); - -}; diff --git a/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp b/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp index 2620b789df..d5c0668f10 100644 --- a/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp +++ b/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp @@ -5,11 +5,12 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "RecipeIngredient.hpp" + #define BEFORE_EXTRA #undef BEFORE_EXTRA + class RecipeUnlockingRequirement { #define AFTER_EXTRA @@ -35,17 +36,29 @@ class RecipeUnlockingRequirement { public: /** - * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@W4UnlockingContext\@0\@\@Z + * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@V?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI RecipeUnlockingRequirement(enum class RecipeUnlockingRequirement::UnlockingContext); + MCAPI RecipeUnlockingRequirement(std::vector); /** * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@XZ */ MCAPI RecipeUnlockingRequirement(); /** - * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@V?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@W4UnlockingContext\@0\@\@Z */ - MCAPI RecipeUnlockingRequirement(std::vector); + MCAPI RecipeUnlockingRequirement(enum class RecipeUnlockingRequirement::UnlockingContext); + /** + * @symbol ?canBeUnlockedByContext\@RecipeUnlockingRequirement\@\@QEBA_NW4UnlockingContext\@1\@\@Z + */ + MCAPI bool canBeUnlockedByContext(enum class RecipeUnlockingRequirement::UnlockingContext) const; + /** + * @symbol ?canBeUnlockedByIngredient\@RecipeUnlockingRequirement\@\@QEBA_NAEBVRecipeIngredient\@\@\@Z + */ + MCAPI bool canBeUnlockedByIngredient(class RecipeIngredient const &) const; + /** + * @symbol ?isUnlockedByIngredients\@RecipeUnlockingRequirement\@\@QEBA_NXZ + */ + MCAPI bool isUnlockedByIngredients() const; /** * @symbol ?isValid\@RecipeUnlockingRequirement\@\@QEBA_NXZ */ @@ -59,4 +72,4 @@ class RecipeUnlockingRequirement { */ MCAPI static enum class RecipeUnlockingRequirement::UnlockingContext unlockingContextFromString(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RecipeUnlockingSystem.hpp b/LiteLoader/include/llapi/mc/RecipeUnlockingSystem.hpp new file mode 100644 index 0000000000..b4cab7d5be --- /dev/null +++ b/LiteLoader/include/llapi/mc/RecipeUnlockingSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file RecipeUnlockingSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class RecipeUnlockingSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_RECIPEUNLOCKINGSYSTEM +public: + class RecipeUnlockingSystem& operator=(class RecipeUnlockingSystem const &) = delete; + RecipeUnlockingSystem(class RecipeUnlockingSystem const &) = delete; + RecipeUnlockingSystem() = delete; +#endif + +public: + /** + * @symbol ?createSystem\@RecipeUnlockingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/Recipes.hpp b/LiteLoader/include/llapi/mc/Recipes.hpp index c736dc2411..6a54f87064 100644 --- a/LiteLoader/include/llapi/mc/Recipes.hpp +++ b/LiteLoader/include/llapi/mc/Recipes.hpp @@ -90,6 +90,10 @@ struct NormalizedRectangularRecipeResults { * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV23\@22AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z */ MCAPI void addShapedRecipe(std::string, class ItemInstance const &, std::string const &, std::string const &, std::string const &, std::vector const &, std::vector const &, int, class std::function (std::string, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional)>, class std::optional); + /** + * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV23\@2AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z + */ + MCAPI void addShapedRecipe(std::string, class ItemInstance const &, std::string const &, std::string const &, std::vector const &, std::vector const &, int, class std::function (std::string, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional)>, class std::optional); /** * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z */ @@ -98,10 +102,6 @@ struct NormalizedRectangularRecipeResults { * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@3\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z */ MCAPI void addShapedRecipe(std::string, std::vector const &, std::vector const &, std::vector const &, std::vector const &, int, class std::function (std::string, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional)>, class std::optional); - /** - * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV23\@2AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z - */ - MCAPI void addShapedRecipe(std::string, class ItemInstance const &, std::string const &, std::string const &, std::vector const &, std::vector const &, int, class std::function (std::string, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional)>, class std::optional); /** * @symbol ?addShapelessRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapelessRecipe\@\@U?$default_delete\@VShapelessRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z */ @@ -118,6 +118,10 @@ struct NormalizedRectangularRecipeResults { * @symbol ?extractRecipeObjInfo\@Recipes\@\@QEAA?AU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI struct std::pair extractRecipeObjInfo(class Json::Value const &); + /** + * @symbol ?forEachRecipeFor\@Recipes\@\@QEBAXAEBVHashedString\@\@AEBV?$function\@$$A6AXAEBVRecipe\@\@\@Z\@std\@\@\@Z + */ + MCAPI void forEachRecipeFor(class HashedString const &, class std::function const &) const; /** * @symbol ?getFurnaceRecipeResult\@Recipes\@\@QEBA?AVItemInstance\@\@AEBVItemStackBase\@\@AEBVHashedString\@\@\@Z */ @@ -179,9 +183,9 @@ struct NormalizedRectangularRecipeResults { */ MCAPI bool _loadBrewingMix(class Json::Value const &, class SemVersion const &); /** - * @symbol ?_loadHardcodedRecipes\@Recipes\@\@AEAAXXZ + * @symbol ?_loadHardcodedRecipes\@Recipes\@\@AEAAXAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ - MCAPI void _loadHardcodedRecipes(); + MCAPI void _loadHardcodedRecipes(class BaseGameVersion const &, class Experiments const &); /** * @symbol ?_loadIngredientFromJson\@Recipes\@\@AEBA?BVRecipeIngredient\@\@AEBVValue\@Json\@\@AEBVSemVersion\@\@_N2\@Z */ @@ -194,6 +198,10 @@ struct NormalizedRectangularRecipeResults { * @symbol ?_loadSmithingTransform\@Recipes\@\@AEAA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@6\@\@Z */ MCAPI bool _loadSmithingTransform(class Json::Value const &, class SemVersion const &, std::string const &, std::vector const &); + /** + * @symbol ?_loadSmithingTrim\@Recipes\@\@AEAA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@6\@\@Z + */ + MCAPI bool _loadSmithingTrim(class Json::Value const &, class SemVersion const &, std::string const &, std::vector const &); protected: diff --git a/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp b/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp index 21bd4be81d..99fce259ef 100644 --- a/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp +++ b/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp @@ -108,8 +108,8 @@ class RedStoneDustItem : public Item { virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** * @vftbl 132 - * @symbol ?_useOn\@RedStoneDustItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@RedStoneDustItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; }; diff --git a/LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp b/LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp index c8d45cb8ff..eb8c188fa1 100644 --- a/LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp @@ -191,30 +191,30 @@ class RedStoneOreBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 152 * @symbol ?animateTick\@RedStoneOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 164 + * @vftbl 165 * @symbol ?onStandOn\@RedStoneOreBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,52 +226,57 @@ class RedStoneOreBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@RedStoneOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@RedStoneOreBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@RedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@RedStoneOreBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@RedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?_lightUpBlock\@RedStoneOreBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void _lightUpBlock(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp b/LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp index 5e80da5869..e102d22933 100644 --- a/LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp @@ -216,40 +216,40 @@ class RedStoneWireBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 135 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 136 * @symbol ?getColor\@RedStoneWireBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColor\@RedStoneWireBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 147 + * @vftbl 148 * @symbol ?canSpawnOn\@RedStoneWireBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -262,46 +262,51 @@ class RedStoneWireBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@RedStoneWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@RedStoneWireBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@RedStoneWireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/RedstoneBlock.hpp b/LiteLoader/include/llapi/mc/RedstoneBlock.hpp index bdbbdd0925..7f36ae984d 100644 --- a/LiteLoader/include/llapi/mc/RedstoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneBlock.hpp @@ -191,25 +191,25 @@ class RedstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 147 - * @symbol ?canSpawnOn\@RedstoneBlock\@\@UEBA_NPEAVActor\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual bool canSpawnOn(class Actor *) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 148 + * @symbol ?canSpawnOn\@RedstoneBlock\@\@UEBA_NPEAVActor\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -222,29 +222,34 @@ class RedstoneBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@RedstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0RedstoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp b/LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp index add63de762..1aa51f87a4 100644 --- a/LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp @@ -196,20 +196,20 @@ class RedstoneLampBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -222,41 +222,46 @@ class RedstoneLampBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@RedstoneLampBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@RedstoneLampBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp b/LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp index 9cc1879d3a..e7a768be07 100644 --- a/LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp @@ -206,35 +206,35 @@ class RedstoneTorchBlock : public TorchBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 147 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 148 * @symbol ?canSpawnOn\@RedstoneTorchBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 161 + * @vftbl 162 * @symbol ?_addHardCodedBlockComponents\@RedstoneTorchBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -247,41 +247,46 @@ class RedstoneTorchBlock : public TorchBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@RedstoneTorchBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@RedstoneTorchBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getTickDelay\@RedstoneTorchBlock\@\@UEAAHXZ */ virtual int getTickDelay(); diff --git a/LiteLoader/include/llapi/mc/ReedBlock.hpp b/LiteLoader/include/llapi/mc/ReedBlock.hpp index 70ebf2dc3b..128aaf938e 100644 --- a/LiteLoader/include/llapi/mc/ReedBlock.hpp +++ b/LiteLoader/include/llapi/mc/ReedBlock.hpp @@ -211,40 +211,40 @@ class ReedBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 135 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 136 * @symbol ?getColor\@ReedBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColor\@ReedBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 137 + * @vftbl 138 * @symbol ?getColorAtPos\@ReedBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 140 + * @vftbl 141 * @symbol ?onGraphicsModeChanged\@ReedBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -256,42 +256,47 @@ class ReedBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@ReedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@ReedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@ReedBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@ReedBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/RegistryKey.hpp b/LiteLoader/include/llapi/mc/RegistryKey.hpp index 4dbbb16cc9..36c06bf789 100644 --- a/LiteLoader/include/llapi/mc/RegistryKey.hpp +++ b/LiteLoader/include/llapi/mc/RegistryKey.hpp @@ -29,25 +29,9 @@ class RegistryKey { #endif public: - /** - * @symbol ??BRegistryKey\@\@QEBA_NXZ - */ - MCAPI operator bool() const; - /** - * @symbol ?readValue\@RegistryKey\@\@QEBA_NPEBDAEAK\@Z - */ - MCAPI bool readValue(char const *, unsigned long &) const; - /** - * @symbol ?readValue\@RegistryKey\@\@QEBA_NPEBDAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI bool readValue(char const *, std::string &) const; /** * @symbol ??1RegistryKey\@\@QEAA\@XZ */ MCAPI ~RegistryKey(); - /** - * @symbol ?open\@RegistryKey\@\@SA?AV1\@PEAUHKEY__\@\@PEBDK\@Z - */ - MCAPI static class RegistryKey open(struct HKEY__*, char const *, unsigned long); }; diff --git a/LiteLoader/include/llapi/mc/ReinforcedDeepslateBlock.hpp b/LiteLoader/include/llapi/mc/ReinforcedDeepslateBlock.hpp index be39a54f99..d740fcccad 100644 --- a/LiteLoader/include/llapi/mc/ReinforcedDeepslateBlock.hpp +++ b/LiteLoader/include/llapi/mc/ReinforcedDeepslateBlock.hpp @@ -179,20 +179,20 @@ class ReinforcedDeepslateBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -204,25 +204,30 @@ class ReinforcedDeepslateBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REINFORCEDDEEPSLATEBLOCK /** * @symbol ?canBeSilkTouched\@ReinforcedDeepslateBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/ReloadCommand.hpp b/LiteLoader/include/llapi/mc/ReloadCommand.hpp index 4a3d8afe8f..6e15137337 100644 --- a/LiteLoader/include/llapi/mc/ReloadCommand.hpp +++ b/LiteLoader/include/llapi/mc/ReloadCommand.hpp @@ -36,7 +36,7 @@ class ReloadCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@ReloadCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/RemoveAllPassengersSystem.hpp b/LiteLoader/include/llapi/mc/RemoveAllPassengersSystem.hpp index d9a9ee1fed..52c260a4c1 100644 --- a/LiteLoader/include/llapi/mc/RemoveAllPassengersSystem.hpp +++ b/LiteLoader/include/llapi/mc/RemoveAllPassengersSystem.hpp @@ -36,4 +36,12 @@ class RemoveAllPassengersSystem { */ MCAPI static void removeAllPassengers(class StrictEntityContext &, struct VehicleComponent &, class Optional>, class EntityModifierT, class FlagComponent> &); +//private: + /** + * @symbol ?_tick\@RemoveAllPassengersSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@U?$Exclude\@VRideableComponent\@\@\@\@UVehicleComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void _tick(class ViewT>, struct Exclude, struct VehicleComponent, class Optional>>, class EntityModifierT, class FlagComponent>); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/RemoveEntityPacket.hpp b/LiteLoader/include/llapi/mc/RemoveEntityPacket.hpp index c8a1e24aa4..4d69a3d8d1 100644 --- a/LiteLoader/include/llapi/mc/RemoveEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/RemoveEntityPacket.hpp @@ -50,10 +50,6 @@ class RemoveEntityPacket : public Packet { */ MCVAPI ~RemoveEntityPacket(); #endif - /** - * @symbol ??0RemoveEntityPacket\@\@QEAA\@AEAVEntityContext\@\@\@Z - */ - MCAPI RemoveEntityPacket(class EntityContext &); /** * @symbol ??0RemoveEntityPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/RemovePassengersComponent.hpp b/LiteLoader/include/llapi/mc/RemovePassengersComponent.hpp index 94d1d5226b..82a6268826 100644 --- a/LiteLoader/include/llapi/mc/RemovePassengersComponent.hpp +++ b/LiteLoader/include/llapi/mc/RemovePassengersComponent.hpp @@ -31,9 +31,5 @@ struct RemovePassengersComponent { * @symbol ??4RemovePassengersComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct RemovePassengersComponent & operator=(struct RemovePassengersComponent &&); - /** - * @symbol ??1RemovePassengersComponent\@\@QEAA\@XZ - */ - MCAPI ~RemovePassengersComponent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/RemovePassengersSystemImpl.hpp b/LiteLoader/include/llapi/mc/RemovePassengersSystemImpl.hpp index 552ad08268..59e1bc43a4 100644 --- a/LiteLoader/include/llapi/mc/RemovePassengersSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/RemovePassengersSystemImpl.hpp @@ -31,5 +31,9 @@ class RemovePassengersSystemImpl { * @symbol ?_removePassengersSystem\@RemovePassengersSystemImpl\@\@SAXAEAVStrictEntityContext\@\@AEAURemovePassengersComponent\@\@AEAUVehicleComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UVehicleComponent\@\@V?$FlagComponent\@URecalculateControlledByLocalInstanceRequestFlag\@\@\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@\@Z */ MCAPI static void _removePassengersSystem(class StrictEntityContext &, struct RemovePassengersComponent &, struct VehicleComponent &, class EntityModifierT, class FlagComponent>); + /** + * @symbol ?removePassengersSystem\@RemovePassengersSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@URemovePassengersComponent\@\@UVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UVehicleComponent\@\@V?$FlagComponent\@URecalculateControlledByLocalInstanceRequestFlag\@\@\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void removePassengersSystem(class ViewT, class EntityModifierT, class FlagComponent>); }; diff --git a/LiteLoader/include/llapi/mc/RemovePassengersWithoutSeatSystem.hpp b/LiteLoader/include/llapi/mc/RemovePassengersWithoutSeatSystem.hpp index 7cf0c6950d..874947d866 100644 --- a/LiteLoader/include/llapi/mc/RemovePassengersWithoutSeatSystem.hpp +++ b/LiteLoader/include/llapi/mc/RemovePassengersWithoutSeatSystem.hpp @@ -36,4 +36,12 @@ class RemovePassengersWithoutSeatSystem { */ MCAPI static void removePassengersWithoutSeat(class StrictEntityContext &, class RideableComponent const &, struct VehicleComponent &, class EntityModifierT> &); +//private: + /** + * @symbol ?_tickRemovePassengersWithoutSeat\@RemovePassengersWithoutSeatSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBVRideableComponent\@\@UVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void _tickRemovePassengersWithoutSeat(class ViewT>, class RideableComponent const, struct VehicleComponent>, class EntityModifierT>); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/RenderOffsetsItemComponent.hpp b/LiteLoader/include/llapi/mc/RenderOffsetsItemComponent.hpp index e6c15d4105..4b318c6a93 100644 --- a/LiteLoader/include/llapi/mc/RenderOffsetsItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/RenderOffsetsItemComponent.hpp @@ -51,9 +51,10 @@ struct ItemTransforms { */ virtual bool isNetworkComponent() const; /** - * @symbol ?_fromString\@RenderOffsetsItemComponent\@\@CAXAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 2 + * @symbol __unk_vfn_2 */ - MCAPI static void _fromString(class RenderOffsetsItemComponent &, std::string const &); + virtual void __unk_vfn_2(); /** * @vftbl 3 * @symbol __unk_vfn_3 @@ -84,10 +85,6 @@ struct ItemTransforms { MCAPI static class HashedString const & getIdentifier(); //private: - /** - * @symbol ?_fromString\@RenderOffsetsItemComponent\@\@CAXAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI static void _fromString(class RenderOffsetsItemComponent &, std::string const &); private: /** diff --git a/LiteLoader/include/llapi/mc/RenderingRidingOffsetInfo.hpp b/LiteLoader/include/llapi/mc/RenderingRidingOffsetInfo.hpp index 60ddec2ece..3ee0edd600 100644 --- a/LiteLoader/include/llapi/mc/RenderingRidingOffsetInfo.hpp +++ b/LiteLoader/include/llapi/mc/RenderingRidingOffsetInfo.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class RenderingRidingOffsetInfo { +struct RenderingRidingOffsetInfo { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_RENDERINGRIDINGOFFSETINFO public: - class RenderingRidingOffsetInfo& operator=(class RenderingRidingOffsetInfo const &) = delete; - RenderingRidingOffsetInfo(class RenderingRidingOffsetInfo const &) = delete; + struct RenderingRidingOffsetInfo& operator=(struct RenderingRidingOffsetInfo const &) = delete; + RenderingRidingOffsetInfo(struct RenderingRidingOffsetInfo const &) = delete; RenderingRidingOffsetInfo() = delete; #endif @@ -33,4 +33,4 @@ class RenderingRidingOffsetInfo { */ MCAPI ~RenderingRidingOffsetInfo(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/RepairItemRecipe.hpp b/LiteLoader/include/llapi/mc/RepairItemRecipe.hpp index 0b7e992cf1..df2a0478b9 100644 --- a/LiteLoader/include/llapi/mc/RepairItemRecipe.hpp +++ b/LiteLoader/include/llapi/mc/RepairItemRecipe.hpp @@ -37,9 +37,9 @@ class RepairItemRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@RepairItemRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @symbol ?assemble\@RepairItemRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &) const; + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@RepairItemRecipe\@\@UEBAHXZ @@ -55,6 +55,11 @@ class RepairItemRecipe : public Recipe { * @symbol ?getResultItem\@RepairItemRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; + /** + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); /** * @vftbl 6 * @symbol ?matches\@RepairItemRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/RepeaterBlock.hpp b/LiteLoader/include/llapi/mc/RepeaterBlock.hpp index 5a89ba2291..965f853dbd 100644 --- a/LiteLoader/include/llapi/mc/RepeaterBlock.hpp +++ b/LiteLoader/include/llapi/mc/RepeaterBlock.hpp @@ -201,30 +201,30 @@ class RepeaterBlock : public DiodeBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 152 * @symbol ?animateTick\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -237,71 +237,76 @@ class RepeaterBlock : public DiodeBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@RepeaterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@RepeaterBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?isLocked\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isLocked(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 201 + * @vftbl 202 * @symbol ?isAlternateInput\@RepeaterBlock\@\@MEBA_NAEBVBlock\@\@\@Z */ virtual bool isAlternateInput(class Block const &) const; /** - * @vftbl 205 + * @vftbl 206 * @symbol ?getTurnOnDelay\@RepeaterBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int getTurnOnDelay(class Block const &) const; /** - * @vftbl 206 + * @vftbl 207 * @symbol ?getOnBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z */ virtual class Block const * getOnBlock(class Block const *) const; /** - * @vftbl 207 + * @vftbl 208 * @symbol ?getOffBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z */ virtual class Block const * getOffBlock(class Block const *) const; diff --git a/LiteLoader/include/llapi/mc/ReplaceItemCommand.hpp b/LiteLoader/include/llapi/mc/ReplaceItemCommand.hpp index 6541c4a74d..a26b5ee015 100644 --- a/LiteLoader/include/llapi/mc/ReplaceItemCommand.hpp +++ b/LiteLoader/include/llapi/mc/ReplaceItemCommand.hpp @@ -37,7 +37,7 @@ class ReplaceItemCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@ReplaceItemCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ReplayStateConfig.hpp b/LiteLoader/include/llapi/mc/ReplayStateConfig.hpp index 4a478234a0..48a0e3373e 100644 --- a/LiteLoader/include/llapi/mc/ReplayStateConfig.hpp +++ b/LiteLoader/include/llapi/mc/ReplayStateConfig.hpp @@ -31,9 +31,5 @@ struct ReplayStateConfig { * @symbol ??0ReplayStateConfig\@\@QEAA\@W4ReplayStateMode\@\@\@Z */ MCAPI ReplayStateConfig(enum class ReplayStateMode); - /** - * @symbol ?usesUnsupportedThresholds\@ReplayStateConfig\@\@QEBA_NXZ - */ - MCAPI bool usesUnsupportedThresholds() const; }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ResetActionStopSystem.hpp b/LiteLoader/include/llapi/mc/ResetActionStopSystem.hpp index ba04b582e7..59af6e4508 100644 --- a/LiteLoader/include/llapi/mc/ResetActionStopSystem.hpp +++ b/LiteLoader/include/llapi/mc/ResetActionStopSystem.hpp @@ -31,5 +31,9 @@ class ResetActionStopSystem { * @symbol ?createResetActionStopSystem\@ResetActionStopSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createResetActionStopSystem(); + /** + * @symbol ?tickResetActionStopSystem\@ResetActionStopSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@UActionOrStopComponent\@\@\@\@\@Z + */ + MCAPI static void tickResetActionStopSystem(class ViewT, class FlagComponent>, struct ActionOrStopComponent>); }; diff --git a/LiteLoader/include/llapi/mc/ResetEventObj.hpp b/LiteLoader/include/llapi/mc/ResetEventObj.hpp index 6078cac316..47295c868e 100644 --- a/LiteLoader/include/llapi/mc/ResetEventObj.hpp +++ b/LiteLoader/include/llapi/mc/ResetEventObj.hpp @@ -29,25 +29,9 @@ class ResetEventObj { #endif public: - /** - * @symbol ??0ResetEventObj\@\@QEAA\@_N0\@Z - */ - MCAPI ResetEventObj(bool, bool); - /** - * @symbol ?set\@ResetEventObj\@\@QEAAXXZ - */ - MCAPI void set(); - /** - * @symbol ?wait\@ResetEventObj\@\@QEAAXXZ - */ - MCAPI void wait(); /** * @symbol ?wait_until\@ResetEventObj\@\@QEAA_NV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z */ MCAPI bool wait_until(class std::chrono::time_point>>); - /** - * @symbol ??1ResetEventObj\@\@QEAA\@XZ - */ - MCAPI ~ResetEventObj(); }; diff --git a/LiteLoader/include/llapi/mc/ResetFrictionModifierSystem.hpp b/LiteLoader/include/llapi/mc/ResetFrictionModifierSystem.hpp index 467d8655e4..0cf00b9132 100644 --- a/LiteLoader/include/llapi/mc/ResetFrictionModifierSystem.hpp +++ b/LiteLoader/include/llapi/mc/ResetFrictionModifierSystem.hpp @@ -32,8 +32,8 @@ class ResetFrictionModifierSystem { */ MCAPI static struct TickingSystemWithInfo createResetFrictionModifierSystem(); /** - * @symbol ?tickResetFrictionModifierSystem\@ResetFrictionModifierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@UPlayerInputRequestComponent\@\@UVanillaClientGameplayComponent\@\@\@\@UFrictionModifierComponent\@\@\@\@\@Z + * @symbol ?tickResetFrictionModifierSystem\@ResetFrictionModifierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@UPlayerInputRequestComponent\@\@UVanillaClientGameplayComponent\@\@\@\@UFrictionModifierComponent\@\@\@\@\@Z */ - MCAPI static void tickResetFrictionModifierSystem(class ViewT, class FlagComponent, class FlagComponent, struct PlayerInputRequestComponent, struct VanillaClientGameplayComponent>, struct FrictionModifierComponent>); + MCAPI static void tickResetFrictionModifierSystem(class ViewT, class FlagComponent, struct PlayerInputRequestComponent, struct VanillaClientGameplayComponent>, struct FrictionModifierComponent>); }; diff --git a/LiteLoader/include/llapi/mc/ResetPositionModeSystem.hpp b/LiteLoader/include/llapi/mc/ResetPositionModeSystem.hpp index 1e968b9617..119d0640ce 100644 --- a/LiteLoader/include/llapi/mc/ResetPositionModeSystem.hpp +++ b/LiteLoader/include/llapi/mc/ResetPositionModeSystem.hpp @@ -31,5 +31,9 @@ class ResetPositionModeSystem { * @symbol ?createResetPositionModeSystem\@ResetPositionModeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createResetPositionModeSystem(); + /** + * @symbol ?tickResetPositionModeSystem\@ResetPositionModeSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@UPlayerPositionModeComponent\@\@\@\@\@Z + */ + MCAPI static void tickResetPositionModeSystem(class ViewT>, struct PlayerPositionModeComponent>); }; diff --git a/LiteLoader/include/llapi/mc/ResetSlideOffSetSystem.hpp b/LiteLoader/include/llapi/mc/ResetSlideOffSetSystem.hpp index 0128c321ec..a071efaa36 100644 --- a/LiteLoader/include/llapi/mc/ResetSlideOffSetSystem.hpp +++ b/LiteLoader/include/llapi/mc/ResetSlideOffSetSystem.hpp @@ -31,5 +31,9 @@ class ResetSlideOffSetSystem { * @symbol ?createResetSlideOffSetSystem\@ResetSlideOffSetSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createResetSlideOffSetSystem(); + /** + * @symbol ?tickResetSlideOffSetSystem\@ResetSlideOffSetSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Exclude\@V?$FlagComponent\@UAutoStepRequestFlag\@\@\@\@\@\@$$CBUMoveRequestComponent\@\@USlideOffsetComponent\@\@\@\@\@Z + */ + MCAPI static void tickResetSlideOffSetSystem(class ViewT>, struct MoveRequestComponent const, struct SlideOffsetComponent>); }; diff --git a/LiteLoader/include/llapi/mc/ResourceInformation.hpp b/LiteLoader/include/llapi/mc/ResourceInformation.hpp index 78fa766afe..fc5649f829 100644 --- a/LiteLoader/include/llapi/mc/ResourceInformation.hpp +++ b/LiteLoader/include/llapi/mc/ResourceInformation.hpp @@ -31,17 +31,17 @@ enum class ResourceType; public: /** - * @symbol ??0ResourceInformation\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ResourceInformation\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@AEBVUUID\@mce\@\@W4ResourceType\@0\@00\@Z */ - MCAPI ResourceInformation(class ResourceInformation const &); + MCAPI ResourceInformation(std::string const &, class SemVersion const &, class mce::UUID const &, enum class ResourceInformation::ResourceType, std::string const &, std::string const &); /** * @symbol ??0ResourceInformation\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@AEBVUUID\@mce\@\@000\@Z */ MCAPI ResourceInformation(std::string const &, class SemVersion const &, class mce::UUID const &, std::string const &, std::string const &, std::string const &); /** - * @symbol ??0ResourceInformation\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@AEBVUUID\@mce\@\@W4ResourceType\@0\@00\@Z + * @symbol ??0ResourceInformation\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ResourceInformation(std::string const &, class SemVersion const &, class mce::UUID const &, enum class ResourceInformation::ResourceType, std::string const &, std::string const &); + MCAPI ResourceInformation(class ResourceInformation const &); /** * @symbol ?satisfies\@ResourceInformation\@\@QEBA_NAEBUPackIdVersion\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ResourceLocation.hpp b/LiteLoader/include/llapi/mc/ResourceLocation.hpp index 76f8a77263..719c575f78 100644 --- a/LiteLoader/include/llapi/mc/ResourceLocation.hpp +++ b/LiteLoader/include/llapi/mc/ResourceLocation.hpp @@ -30,6 +30,10 @@ class ResourceLocation { #endif public: + /** + * @symbol ??0ResourceLocation\@\@QEAA\@AEBVPath\@Core\@\@W4ResourceFileSystem\@\@\@Z + */ + MCAPI ResourceLocation(class Core::Path const &, enum class ResourceFileSystem); /** * @symbol ??0ResourceLocation\@\@QEAA\@AEBVPath\@Core\@\@\@Z */ @@ -38,10 +42,6 @@ class ResourceLocation { * @symbol ??0ResourceLocation\@\@QEAA\@XZ */ MCAPI ResourceLocation(); - /** - * @symbol ??0ResourceLocation\@\@QEAA\@AEBVPath\@Core\@\@W4ResourceFileSystem\@\@\@Z - */ - MCAPI ResourceLocation(class Core::Path const &, enum class ResourceFileSystem); /** * @symbol ?getFullPath\@ResourceLocation\@\@QEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ @@ -71,4 +71,12 @@ class ResourceLocation { */ MCAPI static class ResourceLocation const & getEmptyLocation(); +//private: + /** + * @symbol ?_computeHashes\@ResourceLocation\@\@AEAAXXZ + */ + MCAPI void _computeHashes(); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/ResourceMetadata.hpp b/LiteLoader/include/llapi/mc/ResourceMetadata.hpp index 1b61bb79de..b2e75fcafe 100644 --- a/LiteLoader/include/llapi/mc/ResourceMetadata.hpp +++ b/LiteLoader/include/llapi/mc/ResourceMetadata.hpp @@ -23,10 +23,13 @@ class ResourceMetadata { public: class ResourceMetadata& operator=(class ResourceMetadata const &) = delete; ResourceMetadata(class ResourceMetadata const &) = delete; - ResourceMetadata() = delete; #endif public: + /** + * @symbol ??0ResourceMetadata\@\@QEAA\@XZ + */ + MCAPI ResourceMetadata(); /** * @symbol ??1ResourceMetadata\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ResourcePack.hpp b/LiteLoader/include/llapi/mc/ResourcePack.hpp index 20e29a5231..aa84214bfb 100644 --- a/LiteLoader/include/llapi/mc/ResourcePack.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePack.hpp @@ -86,14 +86,6 @@ class ResourcePack { * @symbol ?generateAssetSet\@ResourcePack\@\@QEAAXXZ */ MCAPI void generateAssetSet(); - /** - * @symbol ?getFolderName\@ResourcePack\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getFolderName() const; - /** - * @symbol ?getLoadTime\@ResourcePack\@\@QEBANXZ - */ - MCAPI double getLoadTime() const; /** * @symbol ?getManifest\@ResourcePack\@\@QEAAAEAVPackManifest\@\@XZ */ @@ -118,18 +110,6 @@ class ResourcePack { * @symbol ?getResourceLocation\@ResourcePack\@\@QEBAAEBVResourceLocation\@\@XZ */ MCAPI class ResourceLocation const & getResourceLocation() const; - /** - * @symbol ?getSubpackCount\@ResourcePack\@\@QEBAHXZ - */ - MCAPI int getSubpackCount() const; - /** - * @symbol ?getSubpackFolderName\@ResourcePack\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - MCAPI std::string const & getSubpackFolderName(int) const; - /** - * @symbol ?getSubpackIndex\@ResourcePack\@\@QEBAHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI int getSubpackIndex(std::string const &) const; /** * @symbol ?getSubpackInfoStack\@ResourcePack\@\@QEBAAEBVSubpackInfoCollection\@\@XZ */ @@ -142,14 +122,6 @@ class ResourcePack { * @symbol ?hasResource\@ResourcePack\@\@QEBA_NAEBVPath\@Core\@\@H\@Z */ MCAPI bool hasResource(class Core::Path const &, int) const; - /** - * @symbol ?isBaseGamePack\@ResourcePack\@\@QEBA_NXZ - */ - MCAPI bool isBaseGamePack() const; - /** - * @symbol ?isSlicePack\@ResourcePack\@\@QEBA_NXZ - */ - MCAPI bool isSlicePack() const; /** * @symbol ?isType\@ResourcePack\@\@QEBA_NW4PackType\@\@\@Z */ @@ -162,14 +134,6 @@ class ResourcePack { * @symbol ?setAsSlicePack\@ResourcePack\@\@QEAAXXZ */ MCAPI void setAsSlicePack(); - /** - * @symbol ?setError\@ResourcePack\@\@QEAAXXZ - */ - MCAPI void setError(); - /** - * @symbol ?setLoadTime\@ResourcePack\@\@QEAAXN\@Z - */ - MCAPI void setLoadTime(double); /** * @symbol ?setLocale\@ResourcePack\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ResourcePackFileUploadManager.hpp b/LiteLoader/include/llapi/mc/ResourcePackFileUploadManager.hpp index 00aa6e33b1..5b06ab7fef 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackFileUploadManager.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackFileUploadManager.hpp @@ -48,10 +48,6 @@ class ResourcePackFileUploadManager : public FileUploadManager { */ MCVAPI ~ResourcePackFileUploadManager(); #endif - /** - * @symbol ??0ResourcePackFileUploadManager\@\@QEAA\@AEAVTaskGroup\@\@V?$shared_ptr\@VIFileChunkUploader\@\@\@std\@\@\@Z - */ - MCAPI ResourcePackFileUploadManager(class TaskGroup &, class std::shared_ptr); /** * @symbol ?uploadResourcePack\@ResourcePackFileUploadManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVResourceLocation\@\@_N2W4PackType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ResourcePackManager.hpp b/LiteLoader/include/llapi/mc/ResourcePackManager.hpp index 1ca00ffb61..1e6be756da 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackManager.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackManager.hpp @@ -122,14 +122,14 @@ class ResourcePackManager { * @symbol ?getPackSourceReport\@ResourcePackManager\@\@QEBAPEBVPackSourceReport\@\@XZ */ MCAPI class PackSourceReport const * getPackSourceReport() const; - /** - * @symbol ?getResourcesOfGroup\@ResourcePackManager\@\@QEBA?AV?$vector\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$allocator\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@\@std\@\@AEBVPackInstance\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z - */ - MCAPI std::vector> getResourcesOfGroup(class PackInstance const &, std::string const &) const; /** * @symbol ?getResourcesOfGroup\@ResourcePackManager\@\@QEBA?AV?$vector\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$allocator\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI std::vector> getResourcesOfGroup(std::string const &) const; + /** + * @symbol ?getResourcesOfGroup\@ResourcePackManager\@\@QEBA?AV?$vector\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$allocator\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@\@std\@\@AEBVPackInstance\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + */ + MCAPI std::vector> getResourcesOfGroup(class PackInstance const &, std::string const &) const; /** * @symbol ?getStack\@ResourcePackManager\@\@QEBAAEBVResourcePackStack\@\@W4ResourcePackStackType\@\@\@Z */ @@ -180,6 +180,10 @@ class ResourcePackManager { * @symbol ?_composeFullStack\@ResourcePackManager\@\@AEAAXXZ */ MCAPI void _composeFullStack(); + /** + * @symbol ?_getPackForResource\@ResourcePackManager\@\@AEBAPEAVPackInstance\@\@AEBVPath\@Core\@\@\@Z + */ + MCAPI class PackInstance * _getPackForResource(class Core::Path const &) const; /** * @symbol ?_getResourcesOfGroup\@ResourcePackManager\@\@AEBAXAEBVPackInstance\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$allocator\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@\@4\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ResourcePackStack.hpp b/LiteLoader/include/llapi/mc/ResourcePackStack.hpp index eac7ef7ecc..905adf84bc 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackStack.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackStack.hpp @@ -62,10 +62,6 @@ class ResourcePackStack { * @symbol ?add\@ResourcePackStack\@\@QEAAXVPackInstance\@\@AEBVIResourcePackRepository\@\@_N\@Z */ MCAPI void add(class PackInstance, class IResourcePackRepository const &, bool); - /** - * @symbol ?generateAssetSet\@ResourcePackStack\@\@QEAAXXZ - */ - MCAPI void generateAssetSet(); /** * @symbol ?getSplitStacks\@ResourcePackStack\@\@QEBAXAEAV1\@0\@Z */ @@ -78,10 +74,6 @@ class ResourcePackStack { * @symbol ?hasPlatformLockedContent\@ResourcePackStack\@\@QEBA_NXZ */ MCAPI bool hasPlatformLockedContent() const; - /** - * @symbol ?iteratePacks\@ResourcePackStack\@\@QEBAXAEBV?$function\@$$A6AXAEBVPackInstance\@\@\@Z\@std\@\@\@Z - */ - MCAPI void iteratePacks(class std::function const &) const; /** * @symbol ?removeDuplicates\@ResourcePackStack\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/ResourceSignature.hpp b/LiteLoader/include/llapi/mc/ResourceSignature.hpp index da18571f0d..1556a11e44 100644 --- a/LiteLoader/include/llapi/mc/ResourceSignature.hpp +++ b/LiteLoader/include/llapi/mc/ResourceSignature.hpp @@ -30,10 +30,6 @@ class ResourceSignature { #endif public: - /** - * @symbol ?areKnownFilesValid\@ResourceSignature\@\@QEAA_NAEBVPackAccessStrategy\@\@\@Z - */ - MCAPI bool areKnownFilesValid(class PackAccessStrategy const &); /** * @symbol ??1ResourceSignature\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ResourceUriCommand.hpp b/LiteLoader/include/llapi/mc/ResourceUriCommand.hpp index 999feef2b2..39e838f4a3 100644 --- a/LiteLoader/include/llapi/mc/ResourceUriCommand.hpp +++ b/LiteLoader/include/llapi/mc/ResourceUriCommand.hpp @@ -36,7 +36,7 @@ class ResourceUriCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@ResourceUriCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp b/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp index 2842e7b1b2..75dde4b41f 100644 --- a/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp +++ b/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp @@ -182,44 +182,44 @@ class RespawnAnchorBlock : public BlockLegacy { virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** * @vftbl 129 + * @symbol __unk_vfn_129 + */ + virtual void __unk_vfn_129(); + /** + * @vftbl 130 * @symbol ?canSpawnAt\@RespawnAnchorBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSpawnAt(class BlockSource const &, class BlockPos const &) const; /** - * @vftbl 130 + * @vftbl 131 * @symbol ?notifySpawnedAt\@RespawnAnchorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void notifySpawnedAt(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_132(); /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@RespawnAnchorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@RespawnAnchorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 153 + * @vftbl 154 * @symbol ?getLightEmission\@RespawnAnchorBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -232,41 +232,46 @@ class RespawnAnchorBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@RespawnAnchorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@RespawnAnchorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@RespawnAnchorBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@RespawnAnchorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; @@ -292,10 +297,6 @@ class RespawnAnchorBlock : public BlockLegacy { * @symbol ?addItem\@RespawnAnchorBlock\@\@SA_NAEAVContainer\@\@HAEAVItemStack\@\@AEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool addItem(class Container &, int, class ItemStack &, class BlockSource &, class Block const &, class BlockPos const &); - /** - * @symbol ?getChargeLevel\@RespawnAnchorBlock\@\@SAHAEBVBlock\@\@\@Z - */ - MCAPI static int getChargeLevel(class Block const &); //private: /** diff --git a/LiteLoader/include/llapi/mc/RespawnPacket.hpp b/LiteLoader/include/llapi/mc/RespawnPacket.hpp index cd8afc30da..1a18b78a44 100644 --- a/LiteLoader/include/llapi/mc/RespawnPacket.hpp +++ b/LiteLoader/include/llapi/mc/RespawnPacket.hpp @@ -88,13 +88,13 @@ return #var; */ MCVAPI ~RespawnPacket(); #endif - /** - * @symbol ??0RespawnPacket\@\@QEAA\@AEBVVec3\@\@AEBW4PlayerRespawnState\@\@\@Z - */ - MCAPI RespawnPacket(class Vec3 const &, enum class PlayerRespawnState const &); /** * @symbol ??0RespawnPacket\@\@QEAA\@XZ */ MCAPI RespawnPacket(); + /** + * @symbol ??0RespawnPacket\@\@QEAA\@AEBVVec3\@\@AEBW4PlayerRespawnState\@\@\@Z + */ + MCAPI RespawnPacket(class Vec3 const &, enum class PlayerRespawnState const &); }; diff --git a/LiteLoader/include/llapi/mc/RideCommand.hpp b/LiteLoader/include/llapi/mc/RideCommand.hpp index 2f764005d4..65b6a8b3e2 100644 --- a/LiteLoader/include/llapi/mc/RideCommand.hpp +++ b/LiteLoader/include/llapi/mc/RideCommand.hpp @@ -36,7 +36,7 @@ class RideCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@RideCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/RideJumpTriggerSystem.hpp b/LiteLoader/include/llapi/mc/RideJumpTriggerSystem.hpp index fc864b75f2..5aab0e12d1 100644 --- a/LiteLoader/include/llapi/mc/RideJumpTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/RideJumpTriggerSystem.hpp @@ -37,6 +37,10 @@ class RideJumpTriggerSystem { * @symbol ?_tickRideJumpTriggerSystem\@RideJumpTriggerSystem\@\@CAXAEAVStrictEntityContext\@\@AEBUMoveInputComponent\@\@AEBUPassengerComponent\@\@AEAUJumpRidingScaleComponent\@\@AEAUVanillaClientGameplayComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UMobFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMobOnPlayerJumpRequestComponent\@\@USendPacketsComponent\@\@\@\@\@Z */ MCAPI static void _tickRideJumpTriggerSystem(class StrictEntityContext &, struct MoveInputComponent const &, struct PassengerComponent const &, struct JumpRidingScaleComponent &, struct VanillaClientGameplayComponent &, class ViewT const>, class Optional const>, class Optional>, class EntityModifierT &); + /** + * @symbol ?tickRideJumpTriggerSystem\@RideJumpTriggerSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@UPlayerInputRequestComponent\@\@\@\@$$CBUMoveInputComponent\@\@$$CBUPassengerComponent\@\@UJumpRidingScaleComponent\@\@UVanillaClientGameplayComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UMobFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMobOnPlayerJumpRequestComponent\@\@USendPacketsComponent\@\@\@\@\@Z + */ + MCAPI static void tickRideJumpTriggerSystem(class ViewT, struct PlayerInputRequestComponent>, struct MoveInputComponent const, struct PassengerComponent const, struct JumpRidingScaleComponent, struct VanillaClientGameplayComponent>, class ViewT const>, class Optional const>, class Optional>, class EntityModifierT); private: diff --git a/LiteLoader/include/llapi/mc/RideableComponent.hpp b/LiteLoader/include/llapi/mc/RideableComponent.hpp index 4212607092..a1ecac22e0 100644 --- a/LiteLoader/include/llapi/mc/RideableComponent.hpp +++ b/LiteLoader/include/llapi/mc/RideableComponent.hpp @@ -27,6 +27,10 @@ class RideableComponent { #endif public: + /** + * @symbol ??0RideableComponent\@\@QEAA\@XZ + */ + MCAPI RideableComponent(); /** * @symbol ??0RideableComponent\@\@QEAA\@AEBV0\@\@Z */ @@ -35,10 +39,6 @@ class RideableComponent { * @symbol ??0RideableComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI RideableComponent(class RideableComponent &&); - /** - * @symbol ??0RideableComponent\@\@QEAA\@XZ - */ - MCAPI RideableComponent(); /** * @symbol ?areSeatsFull\@RideableComponent\@\@QEBA_NAEBVActor\@\@\@Z */ @@ -80,12 +80,4 @@ class RideableComponent { */ MCAPI ~RideableComponent(); -//private: - /** - * @symbol ?_setCanPlayerRide\@RideableComponent\@\@AEBAXAEAVPlayer\@\@_N\@Z - */ - MCAPI void _setCanPlayerRide(class Player &, bool) const; - -private: - }; diff --git a/LiteLoader/include/llapi/mc/RiseToLiquidLevelGoal.hpp b/LiteLoader/include/llapi/mc/RiseToLiquidLevelGoal.hpp index 48640cabe6..5c32d6d5e4 100644 --- a/LiteLoader/include/llapi/mc/RiseToLiquidLevelGoal.hpp +++ b/LiteLoader/include/llapi/mc/RiseToLiquidLevelGoal.hpp @@ -74,12 +74,4 @@ class RiseToLiquidLevelGoal { */ MCAPI RiseToLiquidLevelGoal(class Mob &, float, float, float); -//private: - /** - * @symbol ?findLiquidLevel\@RiseToLiquidLevelGoal\@\@AEAAMXZ - */ - MCAPI float findLiquidLevel(); - -private: - }; diff --git a/LiteLoader/include/llapi/mc/RootedDirtBlock.hpp b/LiteLoader/include/llapi/mc/RootedDirtBlock.hpp index 3e28865d6f..76ae6cb78a 100644 --- a/LiteLoader/include/llapi/mc/RootedDirtBlock.hpp +++ b/LiteLoader/include/llapi/mc/RootedDirtBlock.hpp @@ -196,20 +196,20 @@ class RootedDirtBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -221,30 +221,35 @@ class RootedDirtBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 * @symbol ?use\@RootedDirtBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0RootedDirtBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/RopeParams.hpp b/LiteLoader/include/llapi/mc/RopeParams.hpp index cb4e652af6..218fbf4156 100644 --- a/LiteLoader/include/llapi/mc/RopeParams.hpp +++ b/LiteLoader/include/llapi/mc/RopeParams.hpp @@ -25,13 +25,10 @@ struct RopeParams { public: struct RopeParams& operator=(struct RopeParams const &) = delete; RopeParams(struct RopeParams const &) = delete; + RopeParams() = delete; #endif public: - /** - * @symbol ??0RopeParams\@\@QEAA\@XZ - */ - MCAPI RopeParams(); /** * @symbol ??0RopeParams\@\@QEAA\@AEBVVec3\@\@0M\@Z */ diff --git a/LiteLoader/include/llapi/mc/RopePoints.hpp b/LiteLoader/include/llapi/mc/RopePoints.hpp index c086a2317e..826de10f21 100644 --- a/LiteLoader/include/llapi/mc/RopePoints.hpp +++ b/LiteLoader/include/llapi/mc/RopePoints.hpp @@ -27,30 +27,6 @@ class RopePoints { #endif public: - /** - * @symbol ?beginRope\@RopePoints\@\@QEAAXXZ - */ - MCAPI void beginRope(); - /** - * @symbol ?endRope\@RopePoints\@\@QEAAXXZ - */ - MCAPI void endRope(); - /** - * @symbol ?freezeInterpolation\@RopePoints\@\@QEAAXXZ - */ - MCAPI void freezeInterpolation(); - /** - * @symbol ?pushBack\@RopePoints\@\@QEAAXAEBVVec3\@\@\@Z - */ - MCAPI void pushBack(class Vec3 const &); - /** - * @symbol ?reserve\@RopePoints\@\@QEAAX_K\@Z - */ - MCAPI void reserve(unsigned __int64); - /** - * @symbol ?size\@RopePoints\@\@QEBA_KXZ - */ - MCAPI unsigned __int64 size() const; /** * @symbol ??1RopePoints\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/RopeSystem.hpp b/LiteLoader/include/llapi/mc/RopeSystem.hpp index 9eeaa0e68a..5d59c189a9 100644 --- a/LiteLoader/include/llapi/mc/RopeSystem.hpp +++ b/LiteLoader/include/llapi/mc/RopeSystem.hpp @@ -134,6 +134,10 @@ class RopeSystem { * @symbol ?_tickWaves\@RopeSystem\@\@AEAAXXZ */ MCAPI void _tickWaves(); + /** + * @symbol ?_updateRenderPoints\@RopeSystem\@\@AEAAXXZ + */ + MCAPI void _updateRenderPoints(); private: diff --git a/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp b/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp index 229524742c..8c053d613a 100644 --- a/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp +++ b/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp @@ -167,9 +167,9 @@ class RotatedPillarBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@RotatedPillarBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@RotatedPillarBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,25 +186,25 @@ class RotatedPillarBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 149 - * @symbol ?getMappedFace\@RotatedPillarBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual unsigned char getMappedFace(unsigned char, class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 150 + * @symbol ?getMappedFace\@RotatedPillarBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,27 +216,32 @@ class RotatedPillarBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@RotatedPillarBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/RotatedPillarInfestedBlock.hpp b/LiteLoader/include/llapi/mc/RotatedPillarInfestedBlock.hpp index 7bbb5b6386..acf686a932 100644 --- a/LiteLoader/include/llapi/mc/RotatedPillarInfestedBlock.hpp +++ b/LiteLoader/include/llapi/mc/RotatedPillarInfestedBlock.hpp @@ -181,20 +181,20 @@ class RotatedPillarInfestedBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,32 +206,37 @@ class RotatedPillarInfestedBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 189 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 190 * @symbol ?getResourceCount\@RotatedPillarInfestedBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@RotatedPillarInfestedBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/RotationCommandUtils.hpp b/LiteLoader/include/llapi/mc/RotationCommandUtils.hpp index d97a8642c6..cd89390655 100644 --- a/LiteLoader/include/llapi/mc/RotationCommandUtils.hpp +++ b/LiteLoader/include/llapi/mc/RotationCommandUtils.hpp @@ -32,9 +32,9 @@ class RotationData { #undef AFTER_EXTRA /** - * @symbol ?ComputeFacingRotation\@RotationCommandUtils\@\@YA?AVVec2\@\@AEBVActor\@\@VVec3\@\@AEBV4\@H\@Z + * @symbol ?ComputeFacingRotation\@RotationCommandUtils\@\@YA?AVVec2\@\@VVec3\@\@AEBV3\@H\@Z */ - MCAPI class Vec2 ComputeFacingRotation(class Actor const &, class Vec3, class Vec3 const &, int); + MCAPI class Vec2 ComputeFacingRotation(class Vec3, class Vec3 const &, int); /** * @symbol ?ComputeRotation\@RotationCommandUtils\@\@YA?AVVec2\@\@AEBVActor\@\@AEBV?$optional\@VRotationData\@RotationCommandUtils\@\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/RotationUtil.hpp b/LiteLoader/include/llapi/mc/RotationUtil.hpp index 69b1aa0a1f..0eadd8a8f2 100644 --- a/LiteLoader/include/llapi/mc/RotationUtil.hpp +++ b/LiteLoader/include/llapi/mc/RotationUtil.hpp @@ -33,13 +33,13 @@ namespace RotationUtil { * @symbol ?getShuffledRotations\@RotationUtil\@\@YA?AV?$vector\@W4Rotation\@\@V?$allocator\@W4Rotation\@\@\@std\@\@\@std\@\@AEAVRandom\@\@\@Z */ MCAPI std::vector getShuffledRotations(class Random &); - /** - * @symbol ?rotate\@RotationUtil\@\@YAEW4Rotation\@\@E\@Z - */ - MCAPI unsigned char rotate(enum class Rotation, unsigned char); /** * @symbol ?rotate\@RotationUtil\@\@YA?AVBlockPos\@\@AEBV2\@W4Rotation\@\@\@Z */ MCAPI class BlockPos rotate(class BlockPos const &, enum class Rotation); + /** + * @symbol ?rotate\@RotationUtil\@\@YAEW4Rotation\@\@E\@Z + */ + MCAPI unsigned char rotate(enum class Rotation, unsigned char); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SHStartPiece.hpp b/LiteLoader/include/llapi/mc/SHStartPiece.hpp index 75187852dd..b36647008c 100644 --- a/LiteLoader/include/llapi/mc/SHStartPiece.hpp +++ b/LiteLoader/include/llapi/mc/SHStartPiece.hpp @@ -40,9 +40,5 @@ class SHStartPiece : public SHStairsDown { * @symbol ?getType\@SHStartPiece\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; - /** - * @symbol ??0SHStartPiece\@\@QEAA\@HAEAVRandom\@\@HH\@Z - */ - MCAPI SHStartPiece(int, class Random &, int, int); }; diff --git a/LiteLoader/include/llapi/mc/SandBlock.hpp b/LiteLoader/include/llapi/mc/SandBlock.hpp index 1a39901532..538c090e99 100644 --- a/LiteLoader/include/llapi/mc/SandBlock.hpp +++ b/LiteLoader/include/llapi/mc/SandBlock.hpp @@ -201,35 +201,35 @@ class SandBlock : public HeavyBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@SandBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@SandBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@SandBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -241,55 +241,60 @@ class SandBlock : public HeavyBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@SandBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@SandBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@SandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getDustColor\@SandBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getDustParticleName\@SandBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string getDustParticleName(class Block const &) const; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 197 + * @symbol __unk_vfn_197 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_197(); /** * @symbol ??0SandBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/SandStoneBlock.hpp b/LiteLoader/include/llapi/mc/SandStoneBlock.hpp index 95859dbcc9..149bbb4d28 100644 --- a/LiteLoader/include/llapi/mc/SandStoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/SandStoneBlock.hpp @@ -186,30 +186,30 @@ class SandStoneBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@SandStoneBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@SandStoneBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -221,32 +221,37 @@ class SandStoneBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@SandStoneBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@SandStoneBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/Sapling.hpp b/LiteLoader/include/llapi/mc/Sapling.hpp index 82fdd33454..92dc325cda 100644 --- a/LiteLoader/include/llapi/mc/Sapling.hpp +++ b/LiteLoader/include/llapi/mc/Sapling.hpp @@ -201,35 +201,35 @@ class Sapling : public BushBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@Sapling\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@Sapling\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@Sapling\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -241,47 +241,52 @@ class Sapling : public BushBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@Sapling\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 180 + * @vftbl 181 * @symbol ?getRenderLayer\@Sapling\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 181 + * @vftbl 182 * @symbol ?getRenderLayer\@Sapling\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@Sapling\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@Sapling\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; @@ -303,10 +308,6 @@ class Sapling : public BushBlock { MCAPI bool advanceTree(class BlockSource &, class BlockPos const &, class Random &, class Actor *) const; //private: - /** - * @symbol ?_generateBirchTree\@Sapling\@\@AEBA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEBVFeatureRegistry\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVRandom\@\@_N\@Z - */ - MCAPI class WeakRefT _generateBirchTree(class FeatureRegistry const &, class BlockPos const &, class BlockSource &, class Random &, bool) const; /** * @symbol ?_generateJungleTree\@Sapling\@\@AEBA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEAH0AEA_NAEBVBlockPos\@\@AEAVBlockSource\@\@AEBVFeatureRegistry\@\@\@Z */ @@ -327,14 +328,6 @@ class Sapling : public BushBlock { * @symbol ?_growTree\@Sapling\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@_N\@Z */ MCAPI bool _growTree(class BlockSource &, class BlockPos const &, class Random &, bool) const; - /** - * @symbol ?_isNearFlowerBlock\@Sapling\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI bool _isNearFlowerBlock(class BlockSource &, class BlockPos const &) const; - /** - * @symbol ?_shouldContainBeehive\@Sapling\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z - */ - MCAPI bool _shouldContainBeehive(class BlockSource &, class BlockPos const &, class Random &) const; protected: diff --git a/LiteLoader/include/llapi/mc/SaplingUtils.hpp b/LiteLoader/include/llapi/mc/SaplingUtils.hpp new file mode 100644 index 0000000000..1ffc687d1b --- /dev/null +++ b/LiteLoader/include/llapi/mc/SaplingUtils.hpp @@ -0,0 +1,28 @@ +/** + * @file SaplingUtils.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace SaplingUtils { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?isNearFlowerBlock\@SaplingUtils\@\@YA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI bool isNearFlowerBlock(class BlockSource &, class BlockPos const &); + /** + * @symbol ?shouldTreeContainBeehive\@SaplingUtils\@\@YA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + */ + MCAPI bool shouldTreeContainBeehive(class BlockSource &, class BlockPos const &, class Random &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SaveCommand.hpp b/LiteLoader/include/llapi/mc/SaveCommand.hpp index 27fd0106da..5479d92073 100644 --- a/LiteLoader/include/llapi/mc/SaveCommand.hpp +++ b/LiteLoader/include/llapi/mc/SaveCommand.hpp @@ -38,7 +38,7 @@ enum class State; */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@SaveCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/SayCommand.hpp b/LiteLoader/include/llapi/mc/SayCommand.hpp index 056a35cd50..34429aa2dc 100644 --- a/LiteLoader/include/llapi/mc/SayCommand.hpp +++ b/LiteLoader/include/llapi/mc/SayCommand.hpp @@ -36,7 +36,7 @@ class SayCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@SayCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; @@ -47,13 +47,13 @@ class SayCommand : public Command { //private: /** - * @symbol ?_sendMessage\@SayCommand\@\@AEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEBUCommandOriginIdentity\@\@AEAVLevel\@\@\@Z + * @symbol ?_sendMessage\@SayCommand\@\@CAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEBUCommandOriginIdentity\@\@AEAVLevel\@\@\@Z */ - MCAPI void _sendMessage(std::string const &, std::string const &, struct CommandOriginIdentity const &, class Level &) const; + MCAPI static void _sendMessage(std::string const &, std::string const &, struct CommandOriginIdentity const &, class Level &); /** - * @symbol ?_trySendSayCommandEvent\@SayCommand\@\@AEBA_NAEBVPlayer\@\@AEAVLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_trySendSayCommandEvent\@SayCommand\@\@CA_NAEBVPlayer\@\@AEAVLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI bool _trySendSayCommandEvent(class Player const &, class Level &, std::string const &) const; + MCAPI static bool _trySendSayCommandEvent(class Player const &, class Level &, std::string const &); private: diff --git a/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp b/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp index e312d97349..33c7d3bd1c 100644 --- a/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp +++ b/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp @@ -207,9 +207,9 @@ class ScaffoldingBlock : public HeavyBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@ScaffoldingBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@ScaffoldingBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -231,25 +231,25 @@ class ScaffoldingBlock : public HeavyBlock { */ virtual bool canSlide(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 - * @symbol ?animateTick\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 152 + * @symbol ?animateTick\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -262,54 +262,59 @@ class ScaffoldingBlock : public HeavyBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 175 + * @vftbl 176 * @symbol ?clip\@ScaffoldingBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getDustColor\@ScaffoldingBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getDustParticleName\@ScaffoldingBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string getDustParticleName(class Block const &) const; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 197 + * @symbol __unk_vfn_197 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_197(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCAFFOLDINGBLOCK /** * @symbol ?waterSpreadCausesSpawn\@ScaffoldingBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp b/LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp index c7c7808087..338947522b 100644 --- a/LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp @@ -103,9 +103,9 @@ class ScaffoldingBlockItem : public BlockItem { virtual void __unk_vfn_80(); /** * @vftbl 132 - * @symbol ?_useOn\@ScaffoldingBlockItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@ScaffoldingBlockItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0ScaffoldingBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/ScatterParams.hpp b/LiteLoader/include/llapi/mc/ScatterParams.hpp index f902c11fee..6e5b446c49 100644 --- a/LiteLoader/include/llapi/mc/ScatterParams.hpp +++ b/LiteLoader/include/llapi/mc/ScatterParams.hpp @@ -56,10 +56,6 @@ class ScatteredPositions { * @symbol ?initMolangParams\@ScatterParams\@\@SAXAEAVRenderParams\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI static void initMolangParams(class RenderParams &, class BlockPos const &, class Random &); - /** - * @symbol ?initScatterParamIndices\@ScatterParams\@\@SAXXZ - */ - MCAPI static void initScatterParamIndices(); //private: /** diff --git a/LiteLoader/include/llapi/mc/ScheduleCommand.hpp b/LiteLoader/include/llapi/mc/ScheduleCommand.hpp index d693a277f1..5fd52d75a4 100644 --- a/LiteLoader/include/llapi/mc/ScheduleCommand.hpp +++ b/LiteLoader/include/llapi/mc/ScheduleCommand.hpp @@ -42,7 +42,7 @@ struct FunctionInfo { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@ScheduleCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ScopedAutoreleasePool.hpp b/LiteLoader/include/llapi/mc/ScopedAutoreleasePool.hpp index 3a8b08c87f..e71f77b2b9 100644 --- a/LiteLoader/include/llapi/mc/ScopedAutoreleasePool.hpp +++ b/LiteLoader/include/llapi/mc/ScopedAutoreleasePool.hpp @@ -36,14 +36,6 @@ class ScopedAutoreleasePool { * @symbol ?drain\@ScopedAutoreleasePool\@\@QEAAXXZ */ MCAPI void drain(); - /** - * @symbol ?drainNow\@ScopedAutoreleasePool\@\@QEAAXXZ - */ - MCAPI void drainNow(); - /** - * @symbol ?reset\@ScopedAutoreleasePool\@\@QEAAXXZ - */ - MCAPI void reset(); /** * @symbol ??1ScopedAutoreleasePool\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Scoreboard.hpp b/LiteLoader/include/llapi/mc/Scoreboard.hpp index fdbed1fc40..04ad3225cd 100644 --- a/LiteLoader/include/llapi/mc/Scoreboard.hpp +++ b/LiteLoader/include/llapi/mc/Scoreboard.hpp @@ -426,10 +426,6 @@ class Scoreboard { * @symbol ?getScoreboardEventCoordinator\@Scoreboard\@\@QEAAAEAVScoreboardEventCoordinator\@\@XZ */ MCAPI class ScoreboardEventCoordinator & getScoreboardEventCoordinator(); - /** - * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI struct ScoreboardId const & getScoreboardId(std::string const &) const; /** * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBVActor\@\@\@Z */ @@ -438,6 +434,10 @@ class Scoreboard { * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBVPlayer\@\@\@Z */ MCAPI struct ScoreboardId const & getScoreboardId(class Player const &) const; + /** + * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI struct ScoreboardId const & getScoreboardId(std::string const &) const; /** * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z */ @@ -470,10 +470,6 @@ class Scoreboard { * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, struct ActorUniqueID const &); - /** - * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z - */ - MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, struct PlayerScoreboardId const &); /** * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBVCompoundTag\@\@\@Z */ @@ -483,17 +479,21 @@ class Scoreboard { */ MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, std::string const &); /** - * @symbol ?removeObjective\@Scoreboard\@\@QEAA_NPEAVObjective\@\@\@Z + * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z */ - MCAPI bool removeObjective(class Objective *); + MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, struct PlayerScoreboardId const &); /** - * @symbol ?removeScoreListener\@Scoreboard\@\@QEAAXAEBVPlayer\@\@\@Z + * @symbol ?removeObjective\@Scoreboard\@\@QEAA_NPEAVObjective\@\@\@Z */ - MCAPI void removeScoreListener(class Player const &); + MCAPI bool removeObjective(class Objective *); /** * @symbol ?removeScoreListener\@Scoreboard\@\@QEAAXAEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void removeScoreListener(class Player const &, std::string const &); + /** + * @symbol ?removeScoreListener\@Scoreboard\@\@QEAAXAEBVPlayer\@\@\@Z + */ + MCAPI void removeScoreListener(class Player const &); /** * @symbol ?replaceFakePlayer\@Scoreboard\@\@QEAAXAEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ScoreboardCommand.hpp b/LiteLoader/include/llapi/mc/ScoreboardCommand.hpp index fd3c5e7399..7e0ecc7c03 100644 --- a/LiteLoader/include/llapi/mc/ScoreboardCommand.hpp +++ b/LiteLoader/include/llapi/mc/ScoreboardCommand.hpp @@ -47,7 +47,7 @@ struct SetScoreOutput { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@ScoreboardCommand\@\@EEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ScoreboardId.hpp b/LiteLoader/include/llapi/mc/ScoreboardId.hpp index 27995b0859..9847413b30 100644 --- a/LiteLoader/include/llapi/mc/ScoreboardId.hpp +++ b/LiteLoader/include/llapi/mc/ScoreboardId.hpp @@ -22,16 +22,20 @@ struct ScoreboardId { public: __int64 id; void* null; + ScoreboardId & operator++(){ + ++id; + return *this; + } #undef AFTER_EXTRA public: - /** - * @symbol ??0ScoreboardId\@\@QEAA\@XZ - */ - MCAPI ScoreboardId(); /** * @symbol ??0ScoreboardId\@\@QEAA\@_J\@Z */ MCAPI ScoreboardId(__int64); + /** + * @symbol ??0ScoreboardId\@\@QEAA\@XZ + */ + MCAPI ScoreboardId(); /** * @symbol ??0ScoreboardId\@\@QEAA\@AEBU0\@\@Z */ @@ -56,10 +60,6 @@ struct ScoreboardId { * @symbol ??9ScoreboardId\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator!=(struct ScoreboardId const &) const; - /** - * @symbol ??EScoreboardId\@\@QEAAAEAU0\@XZ - */ - MCAPI struct ScoreboardId & operator++(); /** * @symbol ??4ScoreboardId\@\@QEAAAEAU0\@AEBU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ScoreboardIdentityRef.hpp b/LiteLoader/include/llapi/mc/ScoreboardIdentityRef.hpp index bf7eae9dd3..2333b45155 100644 --- a/LiteLoader/include/llapi/mc/ScoreboardIdentityRef.hpp +++ b/LiteLoader/include/llapi/mc/ScoreboardIdentityRef.hpp @@ -41,10 +41,6 @@ class ScoreboardIdentityRef { * @symbol ?getEntityId\@ScoreboardIdentityRef\@\@QEBAAEBUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID const & getEntityId() const; - /** - * @symbol ?getFakePlayerName\@ScoreboardIdentityRef\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getFakePlayerName() const; /** * @symbol ?getIdentityType\@ScoreboardIdentityRef\@\@QEBA?AW4Type\@IdentityDefinition\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ScreenHandlerBase.hpp b/LiteLoader/include/llapi/mc/ScreenHandlerBase.hpp index b4579f0274..c7c5b57bbe 100644 --- a/LiteLoader/include/llapi/mc/ScreenHandlerBase.hpp +++ b/LiteLoader/include/llapi/mc/ScreenHandlerBase.hpp @@ -63,12 +63,4 @@ class ScreenHandlerBase { */ MCAPI ScreenHandlerBase(class ItemStackRequestActionHandler &); -//protected: - /** - * @symbol ?_tryGetSparseContainer\@ScreenHandlerBase\@\@IEAA?AV?$shared_ptr\@VSimpleSparseContainer\@\@\@std\@\@W4ContainerEnumName\@\@\@Z - */ - MCAPI class std::shared_ptr _tryGetSparseContainer(enum class ContainerEnumName); - -protected: - }; diff --git a/LiteLoader/include/llapi/mc/ScriptActorGameplayHandler.hpp b/LiteLoader/include/llapi/mc/ScriptActorGameplayHandler.hpp index daad688d08..82506670ed 100644 --- a/LiteLoader/include/llapi/mc/ScriptActorGameplayHandler.hpp +++ b/LiteLoader/include/llapi/mc/ScriptActorGameplayHandler.hpp @@ -59,9 +59,9 @@ class ScriptActorGameplayHandler { //private: /** - * @symbol ?_handleActorDefinitionStartedEvent\@ScriptActorGameplayHandler\@\@AEBA_NAEAUActorDefinitionStartedEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z + * @symbol ?_handleActorDefinitionStartedEvent\@ScriptActorGameplayHandler\@\@AEBA_NAEAUActorDefinitionStartedEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VIScriptBeforeEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z */ - MCAPI bool _handleActorDefinitionStartedEvent(struct ActorDefinitionStartedEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle) const; + MCAPI bool _handleActorDefinitionStartedEvent(struct ActorDefinitionStartedEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle) const; private: diff --git a/LiteLoader/include/llapi/mc/ScriptBlockGameplayHandler.hpp b/LiteLoader/include/llapi/mc/ScriptBlockGameplayHandler.hpp index 8aafe39b0a..1e9e487a93 100644 --- a/LiteLoader/include/llapi/mc/ScriptBlockGameplayHandler.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBlockGameplayHandler.hpp @@ -84,13 +84,13 @@ class ScriptBlockGameplayHandler { //private: /** - * @symbol ?_handleExplosionStartedEvent\@ScriptBlockGameplayHandler\@\@AEBA_NAEAUExplosionStartedEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z + * @symbol ?_handleExplosionStartedEvent\@ScriptBlockGameplayHandler\@\@AEBA_NAEAUExplosionStartedEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VIScriptBeforeEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z */ - MCAPI bool _handleExplosionStartedEvent(struct ExplosionStartedEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle) const; + MCAPI bool _handleExplosionStartedEvent(struct ExplosionStartedEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle) const; /** - * @symbol ?_handlePistonActionEvent\@ScriptBlockGameplayHandler\@\@AEBA_NAEBUPistonActionEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z + * @symbol ?_handlePistonActionEvent\@ScriptBlockGameplayHandler\@\@AEBA_NAEBUPistonActionEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VIScriptBeforeEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z */ - MCAPI bool _handlePistonActionEvent(struct PistonActionEvent const &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle) const; + MCAPI bool _handlePistonActionEvent(struct PistonActionEvent const &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle) const; private: diff --git a/LiteLoader/include/llapi/mc/ScriptCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ScriptCommandOrigin.hpp index cde23460d5..503c82c326 100644 --- a/LiteLoader/include/llapi/mc/ScriptCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/ScriptCommandOrigin.hpp @@ -116,8 +116,8 @@ class ScriptCommandOrigin : public CommandOrigin { MCVAPI ~ScriptCommandOrigin(); #endif /** - * @symbol ??0ScriptCommandOrigin\@\@QEAA\@AEAVServerLevel\@\@PEAVDimension\@\@V?$function\@$$A6AXH$$QEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVValue\@Json\@\@\@Z\@std\@\@\@Z + * @symbol ??0ScriptCommandOrigin\@\@QEAA\@AEAVServerLevel\@\@PEAVDimension\@\@V?$function\@$$A6AXH$$QEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVValue\@Json\@\@\@Z\@std\@\@V?$optional\@W4CommandPermissionLevel\@\@\@4\@\@Z */ - MCAPI ScriptCommandOrigin(class ServerLevel &, class Dimension *, class std::function); + MCAPI ScriptCommandOrigin(class ServerLevel &, class Dimension *, class std::function, class std::optional); }; diff --git a/LiteLoader/include/llapi/mc/ScriptCommandUtils.hpp b/LiteLoader/include/llapi/mc/ScriptCommandUtils.hpp new file mode 100644 index 0000000000..12e6f4ff59 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ScriptCommandUtils.hpp @@ -0,0 +1,28 @@ +/** + * @file ScriptCommandUtils.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ScriptCommandUtils { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?CommandResultShouldThrow\@ScriptCommandUtils\@\@YA_NUMCRESULT\@\@\@Z + */ + MCAPI bool CommandResultShouldThrow(struct MCRESULT); + /** + * @symbol ?EngineVersionToCommandVersionValue\@ScriptCommandUtils\@\@YAHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI int EngineVersionToCommandVersionValue(std::string const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ScriptDebugger.hpp b/LiteLoader/include/llapi/mc/ScriptDebugger.hpp index 4f5066eb2f..19226a41ad 100644 --- a/LiteLoader/include/llapi/mc/ScriptDebugger.hpp +++ b/LiteLoader/include/llapi/mc/ScriptDebugger.hpp @@ -60,14 +60,6 @@ class ScriptDebugger { * @symbol ?getResourceStats\@ScriptDebugger\@\@UEBA?AUScriptResourceStats\@\@XZ */ virtual struct ScriptResourceStats getResourceStats() const; - /** - * @symbol ??0ScriptDebugger\@\@QEAA\@AEAVScriptEngine\@Scripting\@\@AEAVScriptPluginManager\@\@AEAVIScriptDebuggerWatchdog\@\@V?$unique_ptr\@VIScriptTelemetryLogger\@\@U?$default_delete\@VIScriptTelemetryLogger\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI ScriptDebugger(class Scripting::ScriptEngine &, class ScriptPluginManager &, class IScriptDebuggerWatchdog &, std::unique_ptr); - /** - * @symbol ?checkConnections\@ScriptDebugger\@\@QEAAXXZ - */ - MCAPI void checkConnections(); //private: /** diff --git a/LiteLoader/include/llapi/mc/ScriptDebuggerTransport.hpp b/LiteLoader/include/llapi/mc/ScriptDebuggerTransport.hpp index eec2e99b8e..9efb927a7e 100644 --- a/LiteLoader/include/llapi/mc/ScriptDebuggerTransport.hpp +++ b/LiteLoader/include/llapi/mc/ScriptDebuggerTransport.hpp @@ -84,9 +84,5 @@ class ScriptDebuggerTransport { * @symbol ?send\@ScriptDebuggerTransport\@\@UEAAXPEBD_K\@Z */ virtual void send(char const *, unsigned __int64); - /** - * @symbol ??0ScriptDebuggerTransport\@\@QEAA\@AEAVIScriptDebuggerWatchdog\@\@\@Z - */ - MCAPI ScriptDebuggerTransport(class IScriptDebuggerWatchdog &); }; diff --git a/LiteLoader/include/llapi/mc/ScriptDebuggerWatchdog.hpp b/LiteLoader/include/llapi/mc/ScriptDebuggerWatchdog.hpp index 0a23ceab1e..e66daff507 100644 --- a/LiteLoader/include/llapi/mc/ScriptDebuggerWatchdog.hpp +++ b/LiteLoader/include/llapi/mc/ScriptDebuggerWatchdog.hpp @@ -49,13 +49,5 @@ class ScriptDebuggerWatchdog { * @symbol ?listenTimeoutExpired\@ScriptDebuggerWatchdog\@\@UEBA_NXZ */ virtual bool listenTimeoutExpired() const; - /** - * @symbol ??0ScriptDebuggerWatchdog\@\@QEAA\@V?$duration\@HU?$ratio\@$0DM\@$00\@std\@\@\@chrono\@std\@\@\@Z - */ - MCAPI ScriptDebuggerWatchdog(class std::chrono::duration>); - /** - * @symbol ?startLeaveGame\@ScriptDebuggerWatchdog\@\@QEAAXXZ - */ - MCAPI void startLeaveGame(); }; diff --git a/LiteLoader/include/llapi/mc/ScriptDeferredActionManager.hpp b/LiteLoader/include/llapi/mc/ScriptDeferredActionManager.hpp deleted file mode 100644 index d4357e9e38..0000000000 --- a/LiteLoader/include/llapi/mc/ScriptDeferredActionManager.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file ScriptDeferredActionManager.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ScriptDeferredActionManager. - * - */ -class ScriptDeferredActionManager { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCRIPTDEFERREDACTIONMANAGER -public: - class ScriptDeferredActionManager& operator=(class ScriptDeferredActionManager const &) = delete; - ScriptDeferredActionManager(class ScriptDeferredActionManager const &) = delete; - ScriptDeferredActionManager() = delete; -#endif - -public: - /** - * @symbol ?executeActions\@ScriptDeferredActionManager\@\@QEAAXXZ - */ - MCAPI void executeActions(); - /** - * @symbol ?rejectAll\@ScriptDeferredActionManager\@\@QEAAXXZ - */ - MCAPI void rejectAll(); - /** - * @symbol ??1ScriptDeferredActionManager\@\@QEAA\@XZ - */ - MCAPI ~ScriptDeferredActionManager(); - -}; diff --git a/LiteLoader/include/llapi/mc/ScriptDeferredEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ScriptDeferredEventCoordinator.hpp new file mode 100644 index 0000000000..aa8b5523d8 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ScriptDeferredEventCoordinator.hpp @@ -0,0 +1,32 @@ +/** + * @file ScriptDeferredEventCoordinator.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ScriptDeferredEventCoordinator { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCRIPTDEFERREDEVENTCOORDINATOR +public: + class ScriptDeferredEventCoordinator& operator=(class ScriptDeferredEventCoordinator const &) = delete; + ScriptDeferredEventCoordinator(class ScriptDeferredEventCoordinator const &) = delete; + ScriptDeferredEventCoordinator() = delete; +#endif + +public: + /** + * @symbol ?sendAllDeferredEvents\@ScriptDeferredEventCoordinator\@\@QEAAXXZ + */ + MCAPI void sendAllDeferredEvents(); + +}; diff --git a/LiteLoader/include/llapi/mc/ScriptDeferredEventListener.hpp b/LiteLoader/include/llapi/mc/ScriptDeferredEventListener.hpp new file mode 100644 index 0000000000..e8d1992498 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ScriptDeferredEventListener.hpp @@ -0,0 +1,42 @@ +/** + * @file ScriptDeferredEventListener.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ScriptDeferredEventListener { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCRIPTDEFERREDEVENTLISTENER +public: + class ScriptDeferredEventListener& operator=(class ScriptDeferredEventListener const &) = delete; + ScriptDeferredEventListener(class ScriptDeferredEventListener const &) = delete; + ScriptDeferredEventListener() = delete; +#endif + +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCRIPTDEFERREDEVENTLISTENER + /** + * @symbol ?onFlushAfterEvents\@ScriptDeferredEventListener\@\@UEAA_NXZ + */ + MCVAPI bool onFlushAfterEvents(); + /** + * @symbol ?onLevelTickEnd\@ScriptDeferredEventListener\@\@UEAAXXZ + */ + MCVAPI void onLevelTickEnd(); + /** + * @symbol ?onRunSystemEvents\@ScriptDeferredEventListener\@\@UEAA_NXZ + */ + MCVAPI bool onRunSystemEvents(); +#endif + +}; diff --git a/LiteLoader/include/llapi/mc/ScriptEventCommand.hpp b/LiteLoader/include/llapi/mc/ScriptEventCommand.hpp index bea9a903f2..9472b446fa 100644 --- a/LiteLoader/include/llapi/mc/ScriptEventCommand.hpp +++ b/LiteLoader/include/llapi/mc/ScriptEventCommand.hpp @@ -31,7 +31,7 @@ class ScriptEventCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@ScriptEventCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ScriptFormPromiseTracker.hpp b/LiteLoader/include/llapi/mc/ScriptFormPromiseTracker.hpp index e8ebb6afe7..9f5afae957 100644 --- a/LiteLoader/include/llapi/mc/ScriptFormPromiseTracker.hpp +++ b/LiteLoader/include/llapi/mc/ScriptFormPromiseTracker.hpp @@ -22,6 +22,7 @@ class ScriptFormPromiseTracker { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCRIPTFORMPROMISETRACKER public: + class ScriptFormPromiseTracker& operator=(class ScriptFormPromiseTracker const &) = delete; ScriptFormPromiseTracker(class ScriptFormPromiseTracker const &) = delete; #endif @@ -48,10 +49,6 @@ class ScriptFormPromiseTracker { * @symbol ?handlePlayerQuit\@ScriptFormPromiseTracker\@\@QEAAXAEBVNetworkIdentifier\@\@\@Z */ MCAPI void handlePlayerQuit(class NetworkIdentifier const &); - /** - * @symbol ??4ScriptFormPromiseTracker\@\@QEAAAEAV0\@AEBV0\@\@Z - */ - MCAPI class ScriptFormPromiseTracker & operator=(class ScriptFormPromiseTracker const &); /** * @symbol ?rejectAllForShutdown\@ScriptFormPromiseTracker\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/ScriptGameTestModuleFactory.hpp b/LiteLoader/include/llapi/mc/ScriptGameTestModuleFactory.hpp index 204a702be4..a6891ac4a8 100644 --- a/LiteLoader/include/llapi/mc/ScriptGameTestModuleFactory.hpp +++ b/LiteLoader/include/llapi/mc/ScriptGameTestModuleFactory.hpp @@ -6,6 +6,7 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Scripting.hpp" +#include "gametest.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/include/llapi/mc/ScriptIdentityModuleFactory.hpp b/LiteLoader/include/llapi/mc/ScriptIdentityModuleFactory.hpp new file mode 100644 index 0000000000..d813806515 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ScriptIdentityModuleFactory.hpp @@ -0,0 +1,40 @@ +/** + * @file ScriptIdentityModuleFactory.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ScriptIdentityModuleFactory { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCRIPTIDENTITYMODULEFACTORY +public: + class ScriptIdentityModuleFactory& operator=(class ScriptIdentityModuleFactory const &) = delete; + ScriptIdentityModuleFactory(class ScriptIdentityModuleFactory const &) = delete; + ScriptIdentityModuleFactory() = delete; +#endif + +public: + +//private: + +private: + /** + * @symbol ?ModuleName\@ScriptIdentityModuleFactory\@\@0PEBDEB + */ + MCAPI static char const * ModuleName; + /** + * @symbol ?ModuleUUID\@ScriptIdentityModuleFactory\@\@0VUUID\@mce\@\@B + */ + MCAPI static class mce::UUID const ModuleUUID; + +}; diff --git a/LiteLoader/include/llapi/mc/ScriptItemGameplayHandler.hpp b/LiteLoader/include/llapi/mc/ScriptItemGameplayHandler.hpp index 841eca5773..23eb645a89 100644 --- a/LiteLoader/include/llapi/mc/ScriptItemGameplayHandler.hpp +++ b/LiteLoader/include/llapi/mc/ScriptItemGameplayHandler.hpp @@ -92,17 +92,17 @@ class ScriptItemGameplayHandler { //private: /** - * @symbol ?_handleItemDefinitionEventTriggered\@ScriptItemGameplayHandler\@\@AEAA_NAEAUItemDefinitionEventTriggeredEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z + * @symbol ?_handleItemDefinitionEventTriggered\@ScriptItemGameplayHandler\@\@AEAA_NAEAUItemDefinitionEventTriggeredEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VIScriptBeforeEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z */ - MCAPI bool _handleItemDefinitionEventTriggered(struct ItemDefinitionEventTriggeredEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle); + MCAPI bool _handleItemDefinitionEventTriggered(struct ItemDefinitionEventTriggeredEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle); /** - * @symbol ?_handleItemUseEvent\@ScriptItemGameplayHandler\@\@AEAA_NAEAUItemUseEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z + * @symbol ?_handleItemUseEvent\@ScriptItemGameplayHandler\@\@AEAA_NAEAUItemUseEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VIScriptBeforeEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z */ - MCAPI bool _handleItemUseEvent(struct ItemUseEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle); + MCAPI bool _handleItemUseEvent(struct ItemUseEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle); /** - * @symbol ?_handleItemUseOnEvent\@ScriptItemGameplayHandler\@\@AEAA_NAEAUItemUseOnEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z + * @symbol ?_handleItemUseOnEvent\@ScriptItemGameplayHandler\@\@AEAA_NAEAUItemUseOnEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VIScriptBeforeEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z */ - MCAPI bool _handleItemUseOnEvent(struct ItemUseOnEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle); + MCAPI bool _handleItemUseOnEvent(struct ItemUseOnEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle); private: diff --git a/LiteLoader/include/llapi/mc/ScriptMemory.hpp b/LiteLoader/include/llapi/mc/ScriptMemory.hpp deleted file mode 100644 index 473beb1bd6..0000000000 --- a/LiteLoader/include/llapi/mc/ScriptMemory.hpp +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @file ScriptMemory.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "Scripting.hpp" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace ScriptMemory. - * - */ -namespace ScriptMemory { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?getQuickJSMallocFunctions\@ScriptMemory\@\@YA?AV?$unique_ptr\@UMallocFunctions\@QuickJS\@Scripting\@\@U?$default_delete\@UMallocFunctions\@QuickJS\@Scripting\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::unique_ptr getQuickJSMallocFunctions(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ScriptMinecraftCommonModuleFactory.hpp b/LiteLoader/include/llapi/mc/ScriptMinecraftCommonModuleFactory.hpp index ffdb07eb77..f2f99bc49d 100644 --- a/LiteLoader/include/llapi/mc/ScriptMinecraftCommonModuleFactory.hpp +++ b/LiteLoader/include/llapi/mc/ScriptMinecraftCommonModuleFactory.hpp @@ -24,20 +24,13 @@ class ScriptMinecraftCommonModuleFactory { public: class ScriptMinecraftCommonModuleFactory& operator=(class ScriptMinecraftCommonModuleFactory const &) = delete; ScriptMinecraftCommonModuleFactory(class ScriptMinecraftCommonModuleFactory const &) = delete; + ScriptMinecraftCommonModuleFactory() = delete; #endif public: - /** - * @symbol ??0ScriptMinecraftCommonModuleFactory\@\@QEAA\@XZ - */ - MCAPI ScriptMinecraftCommonModuleFactory(); /** * @symbol ?addCommon\@ScriptMinecraftCommonModuleFactory\@\@QEAAXAEAVModuleBindingBuilder\@Scripting\@\@\@Z */ MCAPI void addCommon(class Scripting::ModuleBindingBuilder &); - /** - * @symbol ??1ScriptMinecraftCommonModuleFactory\@\@QEAA\@XZ - */ - MCAPI ~ScriptMinecraftCommonModuleFactory(); }; diff --git a/LiteLoader/include/llapi/mc/ScriptMinecraftModuleFactory.hpp b/LiteLoader/include/llapi/mc/ScriptMinecraftModuleFactory.hpp index 1be0e14de7..81bc2f330d 100644 --- a/LiteLoader/include/llapi/mc/ScriptMinecraftModuleFactory.hpp +++ b/LiteLoader/include/llapi/mc/ScriptMinecraftModuleFactory.hpp @@ -6,7 +6,6 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Scripting.hpp" -#include "ScriptModuleMinecraft.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -70,10 +69,6 @@ class ScriptMinecraftModuleFactory { * @symbol ??0ScriptMinecraftModuleFactory\@\@QEAA\@PEAVServerLevel\@\@\@Z */ MCAPI ScriptMinecraftModuleFactory(class ServerLevel *); - /** - * @symbol ?getActorComponentFactories\@ScriptMinecraftModuleFactory\@\@SAAEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VIComponentFactory\@ScriptModuleMinecraft\@\@U?$default_delete\@VIComponentFactory\@ScriptModuleMinecraft\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VIComponentFactory\@ScriptModuleMinecraft\@\@U?$default_delete\@VIComponentFactory\@ScriptModuleMinecraft\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI static class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> & getActorComponentFactories(); /** * @symbol ?getModuleUUIDAsString\@ScriptMinecraftModuleFactory\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ScriptMinecraftNetModuleFactory.hpp b/LiteLoader/include/llapi/mc/ScriptMinecraftNetModuleFactory.hpp index 18c07f1f5d..210e3f0d7e 100644 --- a/LiteLoader/include/llapi/mc/ScriptMinecraftNetModuleFactory.hpp +++ b/LiteLoader/include/llapi/mc/ScriptMinecraftNetModuleFactory.hpp @@ -74,6 +74,10 @@ class ScriptMinecraftNetModuleFactory { MCAPI static std::string getModuleUUIDAsString(); //private: + /** + * @symbol ?_addVersions\@ScriptMinecraftNetModuleFactory\@\@AEAAXXZ + */ + MCAPI void _addVersions(); /** * @symbol ?_generateBindings\@ScriptMinecraftNetModuleFactory\@\@AEAA?AUModuleBinding\@Scripting\@\@AEAVModuleBindingBuilder\@3\@V?$optional\@UContextConfig\@Scripting\@\@\@std\@\@_NAEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@6\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ScriptMinecraftServerAdminModuleFactory.hpp b/LiteLoader/include/llapi/mc/ScriptMinecraftServerAdminModuleFactory.hpp index 4b4c8a88ea..83b36cc6e4 100644 --- a/LiteLoader/include/llapi/mc/ScriptMinecraftServerAdminModuleFactory.hpp +++ b/LiteLoader/include/llapi/mc/ScriptMinecraftServerAdminModuleFactory.hpp @@ -72,10 +72,6 @@ class ScriptMinecraftServerAdminModuleFactory { * @symbol ?getModuleUUIDAsString\@ScriptMinecraftServerAdminModuleFactory\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI static std::string getModuleUUIDAsString(); - /** - * @symbol ?makeModuleDescriptorFor\@ScriptMinecraftServerAdminModuleFactory\@\@SA?AUModuleDescriptor\@Scripting\@\@UVersion\@3\@\@Z - */ - MCAPI static struct Scripting::ModuleDescriptor makeModuleDescriptorFor(struct Scripting::Version); //private: /** diff --git a/LiteLoader/include/llapi/mc/ScriptModuleMinecraft.hpp b/LiteLoader/include/llapi/mc/ScriptModuleMinecraft.hpp index c1a89db8c3..799d050b32 100644 --- a/LiteLoader/include/llapi/mc/ScriptModuleMinecraft.hpp +++ b/LiteLoader/include/llapi/mc/ScriptModuleMinecraft.hpp @@ -6,23 +6,10 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Scripting.hpp" +#include "Json.hpp" #define BEFORE_EXTRA -namespace Scripting { - template - class ClassBindingBuilder { - ClassBindingBuilder() = delete; - ClassBindingBuilder(ClassBindingBuilder const&) = delete; - ClassBindingBuilder(ClassBindingBuilder const&&) = delete; - }; - template - class EnumBindingBuilder { - EnumBindingBuilder() = delete; - EnumBindingBuilder(EnumBindingBuilder const&) = delete; - EnumBindingBuilder(EnumBindingBuilder const&&) = delete; - }; - struct Version; -}; + #undef BEFORE_EXTRA /** @@ -45,6 +32,10 @@ enum class ScriptTimeOfDay; enum class ScriptMessageSourceType; +struct ScriptRawMessageScoreInterface; + +struct ScriptRawMessageInterface; + struct ScriptNavigationResult { public: bool mIsFullPath; @@ -87,5 +78,9 @@ struct ScriptNavigationResult { * @symbol ?bindTimeOfDay\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@W4ScriptTimeOfDay\@ScriptModuleMinecraft\@\@W412\@\@Scripting\@\@XZ */ MCAPI class Scripting::EnumBindingBuilder bindTimeOfDay(); + /** + * @symbol ?rawMessageOrStringToJson\@ScriptModuleMinecraft\@\@YA?AVValue\@Json\@\@AEBV?$variant\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UScriptRawMessageInterface\@ScriptModuleMinecraft\@\@\@std\@\@\@Z + */ + MCAPI class Json::Value rawMessageOrStringToJson(class std::variant const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ScriptModuleMinecraftUI.hpp b/LiteLoader/include/llapi/mc/ScriptModuleMinecraftUI.hpp new file mode 100644 index 0000000000..93a3008e10 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ScriptModuleMinecraftUI.hpp @@ -0,0 +1,25 @@ +/** + * @file ScriptModuleMinecraftUI.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Scripting.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ScriptModuleMinecraftUI { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?bindScriptFormRejectReason\@ScriptModuleMinecraftUI\@\@YA?AV?$EnumBindingBuilder\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ScriptFormRejectReason\@ScriptModuleMinecraftUI\@\@\@Scripting\@\@XZ + */ + MCAPI class Scripting::EnumBindingBuilder bindScriptFormRejectReason(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp b/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp index bf69b94761..a41f49a941 100644 --- a/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp @@ -20,48 +20,35 @@ class ScriptPackConfiguration { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCRIPTPACKCONFIGURATION -public: - class ScriptPackConfiguration& operator=(class ScriptPackConfiguration const &) = delete; -#endif - public: /** - * @symbol ??0ScriptPackConfiguration\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ScriptPackConfiguration\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI ScriptPackConfiguration(class ScriptPackConfiguration const &); + MCAPI ScriptPackConfiguration(class ScriptPackConfiguration &&); /** * @symbol ??0ScriptPackConfiguration\@\@QEAA\@XZ */ MCAPI ScriptPackConfiguration(); /** - * @symbol ??0ScriptPackConfiguration\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI ScriptPackConfiguration(class ScriptPackConfiguration &&); - /** - * @symbol ?getPermissions\@ScriptPackConfiguration\@\@QEAAAEAVScriptPackPermissions\@\@XZ + * @symbol ??0ScriptPackConfiguration\@\@QEAA\@AEBV0\@\@Z */ - MCAPI class ScriptPackPermissions & getPermissions(); + MCAPI ScriptPackConfiguration(class ScriptPackConfiguration const &); /** * @symbol ?getPermissions\@ScriptPackConfiguration\@\@QEBAAEBVScriptPackPermissions\@\@XZ */ MCAPI class ScriptPackPermissions const & getPermissions() const; - /** - * @symbol ?getSecrets\@ScriptPackConfiguration\@\@QEAAAEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> & getSecrets(); /** * @symbol ?getSecrets\@ScriptPackConfiguration\@\@QEBAAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getSecrets() const; - /** - * @symbol ?getVariables\@ScriptPackConfiguration\@\@QEAAAEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> & getVariables(); /** * @symbol ?getVariables\@ScriptPackConfiguration\@\@QEBAAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getVariables() const; + /** + * @symbol ??4ScriptPackConfiguration\@\@QEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class ScriptPackConfiguration & operator=(class ScriptPackConfiguration const &); /** * @symbol ??4ScriptPackConfiguration\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp b/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp index 39f4e45448..262a6a3576 100644 --- a/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp @@ -26,14 +26,14 @@ class ScriptPackConfigurationManager { #endif public: - /** - * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI ScriptPackConfigurationManager(class ScriptPackConfigurationManager const &); /** * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@XZ */ MCAPI ScriptPackConfigurationManager(); + /** + * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI ScriptPackConfigurationManager(class ScriptPackConfigurationManager const &); /** * @symbol ?getPackConfiguration\@ScriptPackConfigurationManager\@\@QEBAAEBVScriptPackConfiguration\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ScriptPackPermissions.hpp b/LiteLoader/include/llapi/mc/ScriptPackPermissions.hpp index 2abc29464d..096d6517f6 100644 --- a/LiteLoader/include/llapi/mc/ScriptPackPermissions.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPackPermissions.hpp @@ -19,11 +19,6 @@ class ScriptPackPermissions { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCRIPTPACKPERMISSIONS -public: - class ScriptPackPermissions& operator=(class ScriptPackPermissions const &) = delete; -#endif - public: /** * @symbol ??0ScriptPackPermissions\@\@QEAA\@XZ @@ -34,13 +29,9 @@ class ScriptPackPermissions { */ MCAPI ScriptPackPermissions(class ScriptPackPermissions const &); /** - * @symbol ?isModuleAllowed\@ScriptPackPermissions\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI bool isModuleAllowed(std::string const &) const; - /** - * @symbol ??4ScriptPackPermissions\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4ScriptPackPermissions\@\@QEAAAEAV0\@AEBV0\@\@Z */ - MCAPI class ScriptPackPermissions & operator=(class ScriptPackPermissions &&); + MCAPI class ScriptPackPermissions & operator=(class ScriptPackPermissions const &); //private: diff --git a/LiteLoader/include/llapi/mc/ScriptPlugin.hpp b/LiteLoader/include/llapi/mc/ScriptPlugin.hpp index 95d8eadf55..cb42bb6a0d 100644 --- a/LiteLoader/include/llapi/mc/ScriptPlugin.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPlugin.hpp @@ -46,54 +46,14 @@ class ScriptPlugin { */ MCVAPI ~ScriptPlugin(); #endif - /** - * @symbol ??0ScriptPlugin\@\@QEAA\@$$QEAUModuleDescriptor\@Scripting\@\@$$QEAV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@$$QEAUCapabilities\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@4\@33$$QEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@4\@\@Z - */ - MCAPI ScriptPlugin(struct Scripting::ModuleDescriptor &&, std::vector &&, struct Scripting::Capabilities &&, std::string const &, std::string const &, std::string const &, class std::unordered_map, struct std::equal_to, class std::allocator>> &&); - /** - * @symbol ?getCapabilities\@ScriptPlugin\@\@QEBAAEBUCapabilities\@Scripting\@\@XZ - */ - MCAPI struct Scripting::Capabilities const & getCapabilities() const; - /** - * @symbol ?getEngineVersion\@ScriptPlugin\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getEngineVersion() const; - /** - * @symbol ?getModuleDependencies\@ScriptPlugin\@\@QEBAAEBV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector const & getModuleDependencies() const; - /** - * @symbol ?getModuleDescriptor\@ScriptPlugin\@\@QEBAAEBUModuleDescriptor\@Scripting\@\@XZ - */ - MCAPI struct Scripting::ModuleDescriptor const & getModuleDescriptor() const; - /** - * @symbol ?getRuntimeName\@ScriptPlugin\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getRuntimeName() const; - /** - * @symbol ?getScriptContext\@ScriptPlugin\@\@QEAAAEAVScriptContext\@Scripting\@\@XZ - */ - MCAPI class Scripting::ScriptContext & getScriptContext(); - /** - * @symbol ?getScriptMainName\@ScriptPlugin\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getScriptMainName() const; /** * @symbol ?hasErrors\@ScriptPlugin\@\@QEBA_NXZ */ MCAPI bool hasErrors() const; - /** - * @symbol ?loadScriptMain\@ScriptPlugin\@\@QEAA?AV?$optional\@UScriptData\@Scripting\@\@\@std\@\@XZ - */ - MCAPI class std::optional loadScriptMain(); /** * @symbol ?reportErrors\@ScriptPlugin\@\@QEBA?AV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector reportErrors() const; - /** - * @symbol ?setScriptContext\@ScriptPlugin\@\@QEAAX$$QEAVScriptContext\@Scripting\@\@\@Z - */ - MCAPI void setScriptContext(class Scripting::ScriptContext &&); //private: /** diff --git a/LiteLoader/include/llapi/mc/ScriptPluginHandleCounter.hpp b/LiteLoader/include/llapi/mc/ScriptPluginHandleCounter.hpp index af25622751..8f6b395a18 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginHandleCounter.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginHandleCounter.hpp @@ -71,18 +71,6 @@ class ScriptPluginHandleCounter { */ MCVAPI void onPreLifetimeScopeDestroy(class Scripting::LifetimeRegistry &); #endif - /** - * @symbol ??0ScriptPluginHandleCounter\@\@QEAA\@AEAVScriptPlugin\@\@\@Z - */ - MCAPI ScriptPluginHandleCounter(class ScriptPlugin &); - /** - * @symbol ?getName\@ScriptPluginHandleCounter\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string getName() const; - /** - * @symbol ?getScriptPlugin\@ScriptPluginHandleCounter\@\@QEAAAEAVScriptPlugin\@\@XZ - */ - MCAPI class ScriptPlugin & getScriptPlugin(); //private: /** diff --git a/LiteLoader/include/llapi/mc/ScriptPluginHandleStats.hpp b/LiteLoader/include/llapi/mc/ScriptPluginHandleStats.hpp index 16dd79f862..9d1e682cd1 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginHandleStats.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginHandleStats.hpp @@ -26,14 +26,14 @@ struct ScriptPluginHandleStats { #endif public: - /** - * @symbol ??4ScriptPluginHandleStats\@\@QEAAAEAU0\@AEBU0\@\@Z - */ - MCAPI struct ScriptPluginHandleStats & operator=(struct ScriptPluginHandleStats const &); /** * @symbol ??4ScriptPluginHandleStats\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct ScriptPluginHandleStats & operator=(struct ScriptPluginHandleStats &&); + /** + * @symbol ??4ScriptPluginHandleStats\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct ScriptPluginHandleStats & operator=(struct ScriptPluginHandleStats const &); /** * @symbol ??1ScriptPluginHandleStats\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ScriptPluginManager.hpp b/LiteLoader/include/llapi/mc/ScriptPluginManager.hpp index bfa2cd4cf1..49d195f439 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginManager.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginManager.hpp @@ -5,8 +5,8 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Scripting.hpp" #include "ResourceInformation.hpp" +#include "Scripting.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,10 +31,6 @@ class ScriptPluginManager { #endif public: - /** - * @symbol ??0ScriptPluginManager\@\@QEAA\@AEAVScriptEngine\@Scripting\@\@_NV?$unique_ptr\@VIScriptTelemetryLogger\@\@U?$default_delete\@VIScriptTelemetryLogger\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI ScriptPluginManager(class Scripting::ScriptEngine &, bool, std::unique_ptr); /** * @symbol ?discoverPlugins\@ScriptPluginManager\@\@QEAA?AVScriptPluginManagerResult\@\@W4ResourceType\@ResourceInformation\@\@AEBVIScriptPluginSourceEnumerator\@\@AEBVScriptPackConfigurationManager\@\@AEBV?$vector\@V?$function\@$$A6A_NAEBVPackManifest\@\@AEBUModuleDescriptor\@Scripting\@\@1AEAVScriptPluginResult\@\@\@Z\@std\@\@V?$allocator\@V?$function\@$$A6A_NAEBVPackManifest\@\@AEBUModuleDescriptor\@Scripting\@\@1AEAVScriptPluginResult\@\@\@Z\@std\@\@\@2\@\@std\@\@\@Z */ @@ -43,14 +39,6 @@ class ScriptPluginManager { * @symbol ?getPluginStats\@ScriptPluginManager\@\@QEBA?AV?$vector\@UScriptPluginStats\@\@V?$allocator\@UScriptPluginStats\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getPluginStats() const; - /** - * @symbol ?getPlugins\@ScriptPluginManager\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VScriptPlugin\@\@U?$default_delete\@VScriptPlugin\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VScriptPlugin\@\@U?$default_delete\@VScriptPlugin\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI std::vector> const & getPlugins() const; - /** - * @symbol ?releaseAll\@ScriptPluginManager\@\@QEAAXXZ - */ - MCAPI void releaseAll(); /** * @symbol ?releasePlugins\@ScriptPluginManager\@\@QEAAXXZ */ @@ -59,10 +47,6 @@ class ScriptPluginManager { * @symbol ?runAll\@ScriptPluginManager\@\@QEAA?AVScriptPluginManagerResult\@\@XZ */ MCAPI class ScriptPluginManagerResult runAll(); - /** - * @symbol ??1ScriptPluginManager\@\@QEAA\@XZ - */ - MCAPI ~ScriptPluginManager(); /** * @symbol ?getPackCapability\@ScriptPluginManager\@\@SA?AVPackCapability\@\@XZ */ @@ -70,9 +54,9 @@ class ScriptPluginManager { //private: /** - * @symbol ?_generateModuleDependencies\@ScriptPluginManager\@\@AEBA?AV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@AEBV?$vector\@UModuleIdentifier\@\@V?$allocator\@UModuleIdentifier\@\@\@std\@\@\@3\@AEBV?$vector\@UPackIdVersion\@\@V?$allocator\@UPackIdVersion\@\@\@std\@\@\@3\@1\@Z + * @symbol ?_generateModuleDependencies\@ScriptPluginManager\@\@AEBA?AV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@AEBV?$vector\@UModuleIdentifier\@\@V?$allocator\@UModuleIdentifier\@\@\@std\@\@\@3\@AEBV?$vector\@UPackIdVersion\@\@V?$allocator\@UPackIdVersion\@\@\@std\@\@\@3\@\@Z */ - MCAPI std::vector _generateModuleDependencies(std::vector const &, std::vector const &, std::vector const &) const; + MCAPI std::vector _generateModuleDependencies(std::vector const &, std::vector const &) const; /** * @symbol ?_reportContextResults\@ScriptPluginManager\@\@AEAAXAEBUScriptContextResult\@Scripting\@\@AEAVScriptPluginResult\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ScriptPluginPackSourceEnumerator.hpp b/LiteLoader/include/llapi/mc/ScriptPluginPackSourceEnumerator.hpp index edb00371ca..eef5fc3ccd 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginPackSourceEnumerator.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginPackSourceEnumerator.hpp @@ -34,11 +34,6 @@ class ScriptPluginPackSourceEnumerator { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?getFullPackStack\@ScriptPluginPackSourceEnumerator\@\@UEBAAEBV?$vector\@UPackIdVersion\@\@V?$allocator\@UPackIdVersion\@\@\@std\@\@\@std\@\@XZ - */ - virtual std::vector const & getFullPackStack() const; - /** - * @vftbl 2 * @symbol ?getPluginSources\@ScriptPluginPackSourceEnumerator\@\@UEBAAEBV?$vector\@V?$unique_ptr\@VIScriptPluginSource\@\@U?$default_delete\@VIScriptPluginSource\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VIScriptPluginSource\@\@U?$default_delete\@VIScriptPluginSource\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ virtual std::vector> const & getPluginSources() const; @@ -48,9 +43,5 @@ class ScriptPluginPackSourceEnumerator { */ MCVAPI ~ScriptPluginPackSourceEnumerator(); #endif - /** - * @symbol ??0ScriptPluginPackSourceEnumerator\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VPackInstance\@\@V?$allocator\@VPackInstance\@\@\@std\@\@\@2\@1\@Z - */ - MCAPI ScriptPluginPackSourceEnumerator(std::string const &, std::vector const &, std::vector const &); }; diff --git a/LiteLoader/include/llapi/mc/ScriptPluginResult.hpp b/LiteLoader/include/llapi/mc/ScriptPluginResult.hpp index 10d6decdea..8d5f934a03 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginResult.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginResult.hpp @@ -29,10 +29,6 @@ class ScriptPluginResult { #endif public: - /** - * @symbol ??0ScriptPluginResult\@\@QEAA\@AEBUModuleDescriptor\@Scripting\@\@\@Z - */ - MCAPI ScriptPluginResult(struct Scripting::ModuleDescriptor const &); /** * @symbol ??0ScriptPluginResult\@\@QEAA\@AEBV0\@\@Z */ @@ -41,10 +37,6 @@ class ScriptPluginResult { * @symbol ?addError\@ScriptPluginResult\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addError(std::string const &); - /** - * @symbol ?addErrors\@ScriptPluginResult\@\@QEAAXAEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z - */ - MCAPI void addErrors(std::vector const &); /** * @symbol ?addInfo\@ScriptPluginResult\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -57,10 +49,6 @@ class ScriptPluginResult { * @symbol ?getErrors\@ScriptPluginResult\@\@QEBAAEBV?$vector\@UError\@ScriptPluginResult\@\@V?$allocator\@UError\@ScriptPluginResult\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getErrors() const; - /** - * @symbol ?getInfos\@ScriptPluginResult\@\@QEBAAEBV?$vector\@UInfo\@ScriptPluginResult\@\@V?$allocator\@UInfo\@ScriptPluginResult\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector const & getInfos() const; /** * @symbol ?getModuleDescriptor\@ScriptPluginResult\@\@QEBAAEBUModuleDescriptor\@Scripting\@\@XZ */ @@ -69,10 +57,6 @@ class ScriptPluginResult { * @symbol ?getWarnings\@ScriptPluginResult\@\@QEBAAEBV?$vector\@UWarning\@ScriptPluginResult\@\@V?$allocator\@UWarning\@ScriptPluginResult\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getWarnings() const; - /** - * @symbol ?hasErrors\@ScriptPluginResult\@\@QEBA_NXZ - */ - MCAPI bool hasErrors() const; /** * @symbol ??1ScriptPluginResult\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ScriptPluginUtils.hpp b/LiteLoader/include/llapi/mc/ScriptPluginUtils.hpp index 12f2eed476..927291cca5 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginUtils.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginUtils.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Scripting.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -26,10 +25,6 @@ namespace ScriptPluginUtils { * @symbol ?BETA_RELEASE\@ScriptPluginUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const BETA_RELEASE; - /** - * @symbol ?CreateRuntimeByType\@ScriptPluginUtils\@\@YA?AV?$unique_ptr\@VIRuntime\@Scripting\@\@U?$default_delete\@VIRuntime\@Scripting\@\@\@std\@\@\@std\@\@W4ScriptRuntimeType\@\@AEAVRegistryManager\@Scripting\@\@PEAVDependencyLocator\@6\@\@Z - */ - MCAPI std::unique_ptr CreateRuntimeByType(enum class ScriptRuntimeType, class Scripting::RegistryManager &, class Scripting::DependencyLocator *); /** * @symbol ?GetRuntimeType\@ScriptPluginUtils\@\@YA?AW4ScriptRuntimeType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -54,9 +49,5 @@ namespace ScriptPluginUtils { * @symbol ?JavaScriptModuleNameNormalizer\@ScriptPluginUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@AEBV23\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI std::string JavaScriptModuleNameNormalizer(class std::basic_string_view> const &, std::string const &, std::vector const &); - /** - * @symbol ?SanitizeRuntimeName\@ScriptPluginUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z - */ - MCAPI std::string SanitizeRuntimeName(std::string const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ScriptPrintLogger.hpp b/LiteLoader/include/llapi/mc/ScriptPrintLogger.hpp index ef3dc4b033..bd2d213dd5 100644 --- a/LiteLoader/include/llapi/mc/ScriptPrintLogger.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPrintLogger.hpp @@ -52,19 +52,13 @@ class ScriptPrintLogger { virtual void onError(struct Scripting::ContextId, class std::basic_string_view> const &) const; /** * @vftbl 4 - * @symbol ?onException\@ScriptPrintLogger\@\@UEBAXUContextId\@Scripting\@\@AEBUError\@3\@\@Z + * @symbol ?onException\@ScriptPrintLogger\@\@UEBAXUContextId\@Scripting\@\@AEBVmeta_any\@entt\@\@\@Z */ - virtual void onException(struct Scripting::ContextId, struct Scripting::Error const &) const; + virtual void onException(struct Scripting::ContextId, class entt::meta_any const &) const; /** * @vftbl 5 - * @symbol ?shouldPrintException\@ScriptPrintLogger\@\@UEBA_NAEBUError\@Scripting\@\@\@Z + * @symbol ?shouldPrintException\@ScriptPrintLogger\@\@UEBA_NAEBVmeta_any\@entt\@\@\@Z */ - virtual bool shouldPrintException(struct Scripting::Error const &) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCRIPTPRINTLOGGER - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~ScriptPrintLogger(); -#endif + virtual bool shouldPrintException(class entt::meta_any const &) const; }; diff --git a/LiteLoader/include/llapi/mc/ScriptResultUtil.hpp b/LiteLoader/include/llapi/mc/ScriptResultUtil.hpp index 61db3b1ca7..b763851472 100644 --- a/LiteLoader/include/llapi/mc/ScriptResultUtil.hpp +++ b/LiteLoader/include/llapi/mc/ScriptResultUtil.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "gametest.hpp" #include "Scripting.hpp" #define BEFORE_EXTRA @@ -23,13 +24,13 @@ namespace ScriptResultUtil { #undef AFTER_EXTRA /** - * @symbol ?GametestResultToScriptingValueResult\@ScriptResultUtil\@\@YA?AV?$Result\@V?$StrongTypedObjectHandle\@VVec3\@\@\@Scripting\@\@\@Scripting\@\@AEBV?$variant\@UGameTestError\@gametest\@\@VVec3\@\@\@std\@\@AEBVWeakLifetimeScope\@3\@\@Z + * @symbol ?GametestResultToScriptingValueResult\@ScriptResultUtil\@\@YA?AV?$Result\@VVec3\@\@\@Scripting\@\@AEBV?$variant\@UGameTestError\@gametest\@\@VBlockPos\@\@\@std\@\@\@Z */ - MCAPI class Scripting::Result> GametestResultToScriptingValueResult(class std::variant const &, class Scripting::WeakLifetimeScope const &); + MCAPI class Scripting::Result GametestResultToScriptingValueResult(class std::variant const &); /** - * @symbol ?GametestResultToScriptingValueResult\@ScriptResultUtil\@\@YA?AV?$Result\@V?$StrongTypedObjectHandle\@VVec3\@\@\@Scripting\@\@\@Scripting\@\@AEBV?$variant\@UGameTestError\@gametest\@\@VBlockPos\@\@\@std\@\@AEBVWeakLifetimeScope\@3\@\@Z + * @symbol ?GametestResultToScriptingValueResult\@ScriptResultUtil\@\@YA?AV?$Result\@VVec3\@\@\@Scripting\@\@AEBV?$variant\@UGameTestError\@gametest\@\@VVec3\@\@\@std\@\@\@Z */ - MCAPI class Scripting::Result> GametestResultToScriptingValueResult(class std::variant const &, class Scripting::WeakLifetimeScope const &); + MCAPI class Scripting::Result GametestResultToScriptingValueResult(class std::variant const &); /** * @symbol ?ScriptingResultToGameTestResult\@ScriptResultUtil\@\@YA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVResultAny\@Scripting\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ScriptServerNetworkEventHandler.hpp b/LiteLoader/include/llapi/mc/ScriptServerNetworkEventHandler.hpp index 64ede2a5db..58cae6c7d9 100644 --- a/LiteLoader/include/llapi/mc/ScriptServerNetworkEventHandler.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerNetworkEventHandler.hpp @@ -49,9 +49,9 @@ class ScriptServerNetworkEventHandler { //private: /** - * @symbol ?_handleChat\@ScriptServerNetworkEventHandler\@\@AEBA_NAEAUChatEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z + * @symbol ?_handleChat\@ScriptServerNetworkEventHandler\@\@AEBA_NAEAUChatEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VIScriptBeforeEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z */ - MCAPI bool _handleChat(struct ChatEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle) const; + MCAPI bool _handleChat(struct ChatEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle) const; private: diff --git a/LiteLoader/include/llapi/mc/ScriptTickListener.hpp b/LiteLoader/include/llapi/mc/ScriptTickListener.hpp index 56c465b863..ff1ff34d28 100644 --- a/LiteLoader/include/llapi/mc/ScriptTickListener.hpp +++ b/LiteLoader/include/llapi/mc/ScriptTickListener.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Scripting.hpp" #define BEFORE_EXTRA @@ -28,54 +27,15 @@ class ScriptTickListener { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCRIPTTICKLISTENER /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol __unk_vfn_1 - */ - virtual void __unk_vfn_1(); - /** - * @vftbl 2 - * @symbol __unk_vfn_2 - */ - virtual void __unk_vfn_2(); - /** - * @vftbl 3 - * @symbol __unk_vfn_3 - */ - virtual void __unk_vfn_3(); - /** - * @vftbl 4 * @symbol ?onLevelRemovedPlayer\@ScriptTickListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@AEAVPlayer\@\@\@Z */ - virtual enum class EventResult onLevelRemovedPlayer(class Level &, class Player &); + MCVAPI enum class EventResult onLevelRemovedPlayer(class Level &, class Player &); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @symbol ?onLevelTickEnd\@ScriptTickListener\@\@UEAAXXZ */ - virtual void __unk_vfn_5(); - /** - * @vftbl 6 - * @symbol __unk_vfn_6 - */ - virtual void __unk_vfn_6(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); - /** - * @vftbl 8 - * @symbol ?onLevelTickEnd\@ScriptTickListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z - */ - virtual enum class EventResult onLevelTickEnd(class Level &); - /** - * @symbol ??0ScriptTickListener\@\@QEAA\@AEAVScriptEngine\@Scripting\@\@AEAVScriptFormPromiseTracker\@\@AEAVScriptDeferredActionManager\@\@\@Z - */ - MCAPI ScriptTickListener(class Scripting::ScriptEngine &, class ScriptFormPromiseTracker &, class ScriptDeferredActionManager &); + MCVAPI void onLevelTickEnd(); +#endif }; diff --git a/LiteLoader/include/llapi/mc/ScriptWatchdog.hpp b/LiteLoader/include/llapi/mc/ScriptWatchdog.hpp deleted file mode 100644 index 5a2cdb2693..0000000000 --- a/LiteLoader/include/llapi/mc/ScriptWatchdog.hpp +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @file ScriptWatchdog.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "Scripting.hpp" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace ScriptWatchdog. - * - */ -namespace ScriptWatchdog { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?initialize\@ScriptWatchdog\@\@YAXPEAVIWatchdog\@Scripting\@\@AEAVServerLevel\@\@PEAVScriptPluginManager\@\@VWeakLifetimeScope\@3\@PEAVServerInstance\@\@\@Z - */ - MCAPI void initialize(class Scripting::IWatchdog *, class ServerLevel &, class ScriptPluginManager *, class Scripting::WeakLifetimeScope, class ServerInstance *); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Scripting.hpp b/LiteLoader/include/llapi/mc/Scripting.hpp index 8d6d60eff2..e392f77296 100644 --- a/LiteLoader/include/llapi/mc/Scripting.hpp +++ b/LiteLoader/include/llapi/mc/Scripting.hpp @@ -18,10 +18,46 @@ namespace Scripting { #define AFTER_EXTRA +template +class ClassBindingBuilder { + ClassBindingBuilder() = delete; + ClassBindingBuilder(ClassBindingBuilder const&) = delete; + ClassBindingBuilder(ClassBindingBuilder const&&) = delete; +}; + +template +class EnumBindingBuilder { + EnumBindingBuilder() = delete; + EnumBindingBuilder(EnumBindingBuilder const&) = delete; + EnumBindingBuilder(EnumBindingBuilder const&&) = delete; +}; + +struct Version; + +enum class LogLevel : int { + Verbose = 0x0, + Info = 0x1, + Warning = 0x2, + Error = 0x3, + Count = 0x4, +}; + #undef AFTER_EXTRA + /** + * @symbol ?LogMessage\@Scripting\@\@YAXW4LogLevel\@1\@PEBDI1ZZ + */ + MCAPI void LogMessage(enum class Scripting::LogLevel, char const *, unsigned int, char const *, ...); /** * @symbol ?_versionSplit\@Scripting\@\@YA?AV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@D\@Z */ MCAPI std::vector _versionSplit(std::string const &, char); + /** + * @symbol ?defaultLogFunction\@Scripting\@\@YAXPEAXW4LogLevel\@1\@PEBDI2\@Z + */ + MCAPI void defaultLogFunction(void *, enum class Scripting::LogLevel, char const *, unsigned int, char const *); + /** + * @symbol ?logUserData\@Scripting\@\@3PEAXEA + */ + MCAPI extern void * logUserData; }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SculkBlock.hpp b/LiteLoader/include/llapi/mc/SculkBlock.hpp index 597ef8e47e..c298dfd627 100644 --- a/LiteLoader/include/llapi/mc/SculkBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkBlock.hpp @@ -176,20 +176,20 @@ class SculkBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,32 +201,37 @@ class SculkBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@SculkBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@SculkBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SculkCatalystBlock.hpp b/LiteLoader/include/llapi/mc/SculkCatalystBlock.hpp index 4b315c7ff3..7685322cae 100644 --- a/LiteLoader/include/llapi/mc/SculkCatalystBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkCatalystBlock.hpp @@ -176,25 +176,25 @@ class SculkCatalystBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 - * @symbol ?getVariant\@SculkCatalystBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 147 + * @symbol ?getVariant\@SculkCatalystBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,42 +206,47 @@ class SculkCatalystBlock : public ActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@SculkCatalystBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@SculkCatalystBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@SculkCatalystBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@SculkCatalystBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/SculkCatalystBlockActor.hpp b/LiteLoader/include/llapi/mc/SculkCatalystBlockActor.hpp index 80281aa344..74a25eefe4 100644 --- a/LiteLoader/include/llapi/mc/SculkCatalystBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SculkCatalystBlockActor.hpp @@ -82,9 +82,9 @@ class SculkCatalystBlockActor { //private: /** - * @symbol ?_trySendItSpreadsEventPacket\@SculkCatalystBlockActor\@\@CAXAEAVActor\@\@\@Z + * @symbol ?_tryConsumeOnDeathExperience\@SculkCatalystBlockActor\@\@AEAAXAEAVLevel\@\@AEAVActor\@\@\@Z */ - MCAPI static void _trySendItSpreadsEventPacket(class Actor &); + MCAPI void _tryConsumeOnDeathExperience(class Level &, class Actor &); private: diff --git a/LiteLoader/include/llapi/mc/SculkChargeCursor.hpp b/LiteLoader/include/llapi/mc/SculkChargeCursor.hpp index 1b865a1276..7da21ac7c0 100644 --- a/LiteLoader/include/llapi/mc/SculkChargeCursor.hpp +++ b/LiteLoader/include/llapi/mc/SculkChargeCursor.hpp @@ -31,18 +31,6 @@ class SculkChargeCursor { * @symbol ??0SculkChargeCursor\@\@QEAA\@AEBVCompoundTag\@\@\@Z */ MCAPI SculkChargeCursor(class CompoundTag const &); - /** - * @symbol ??0SculkChargeCursor\@\@QEAA\@AEBVBlockPos\@\@H\@Z - */ - MCAPI SculkChargeCursor(class BlockPos const &, int); - /** - * @symbol ?addFrom\@SculkChargeCursor\@\@QEAAXAEBV1\@\@Z - */ - MCAPI void addFrom(class SculkChargeCursor const &); - /** - * @symbol ?save\@SculkChargeCursor\@\@QEBAXAEAVCompoundTag\@\@\@Z - */ - MCAPI void save(class CompoundTag &) const; /** * @symbol ?update\@SculkChargeCursor\@\@QEAAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVSculkSpreader\@\@_N\@Z */ @@ -57,6 +45,10 @@ class SculkChargeCursor { * @symbol ?_getSculkBehavior\@SculkChargeCursor\@\@CAAEBVSculkBehavior\@\@AEBVBlock\@\@\@Z */ MCAPI static class SculkBehavior const & _getSculkBehavior(class Block const &); + /** + * @symbol ?_getValidMovementPos\@SculkChargeCursor\@\@CA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVSculkSpreader\@\@AEAVRandom\@\@\@Z + */ + MCAPI static class std::optional _getValidMovementPos(class IBlockWorldGenAPI &, class BlockPos const &, class SculkSpreader &, class Random &); /** * @symbol ?_isMovementUnobstructed\@SculkChargeCursor\@\@CA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@1\@Z */ diff --git a/LiteLoader/include/llapi/mc/SculkSensorBlock.hpp b/LiteLoader/include/llapi/mc/SculkSensorBlock.hpp index c86908662e..52e79e474d 100644 --- a/LiteLoader/include/llapi/mc/SculkSensorBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkSensorBlock.hpp @@ -206,35 +206,35 @@ class SculkSensorBlock : public ActorBlock { */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 152 * @symbol ?animateTick\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 153 + * @vftbl 154 * @symbol ?getLightEmission\@SculkSensorBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 164 + * @vftbl 165 * @symbol ?onStandOn\@SculkSensorBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -247,51 +247,56 @@ class SculkSensorBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 184 + * @vftbl 185 * @symbol ?getEmissiveBrightness\@SculkSensorBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getEmissiveBrightness(class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@SculkSensorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@SculkSensorBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@SculkSensorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; @@ -310,9 +315,13 @@ class SculkSensorBlock : public ActorBlock { */ MCAPI SculkSensorBlock(std::string const &, int); /** - * @symbol ?activate\@SculkSensorBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@H\@Z + * @symbol ??0SculkSensorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4BlockActorType\@\@\@Z + */ + MCAPI SculkSensorBlock(std::string const &, int, enum class BlockActorType); + /** + * @symbol ?activate\@SculkSensorBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@HH\@Z */ - MCAPI static void activate(class BlockSource &, class BlockPos const &, class Actor *, int); + MCAPI static void activate(class BlockSource &, class BlockPos const &, class Actor *, int, int); /** * @symbol ?isActive\@SculkSensorBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SculkSensorBlockActor.hpp b/LiteLoader/include/llapi/mc/SculkSensorBlockActor.hpp index 3627ab4b74..be791806a0 100644 --- a/LiteLoader/include/llapi/mc/SculkSensorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SculkSensorBlockActor.hpp @@ -95,29 +95,23 @@ class SculkSensorBlockActor : public BlockActor { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCULKSENSORBLOCKACTOR /** - * @symbol ??0SculkSensorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI SculkSensorBlockActor(class BlockPos const &); - /** - * @symbol ?getLatestReceivedVibrationFrequency\@SculkSensorBlockActor\@\@QEBAHXZ - */ - MCAPI int getLatestReceivedVibrationFrequency() const; - /** - * @symbol ?onStepOn\@SculkSensorBlockActor\@\@QEAAXAEAVBlockSource\@\@AEAVActor\@\@\@Z - */ - MCAPI void onStepOn(class BlockSource &, class Actor &); + MCVAPI ~SculkSensorBlockActor(); +#endif /** - * @symbol ?TypeId\@SculkSensorBlockActor\@\@2W4BlockActorType\@\@B + * @symbol ??0SculkSensorBlockActor\@\@QEAA\@W4BlockActorType\@\@AEBVBlockPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$unique_ptr\@VSculkSensorVibrationConfig\@\@U?$default_delete\@VSculkSensorVibrationConfig\@\@\@std\@\@\@4\@\@Z */ - MCAPI static enum class BlockActorType const TypeId; + MCAPI SculkSensorBlockActor(enum class BlockActorType, class BlockPos const &, std::string const &, std::unique_ptr &&); /** - * @symbol ?TypeString\@SculkSensorBlockActor\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ??0SculkSensorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ - MCAPI static std::string const TypeString; + MCAPI SculkSensorBlockActor(class BlockPos const &); /** - * @symbol ?tryGet\@SculkSensorBlockActor\@\@SAPEAV1\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getLatestReceivedVibrationFrequency\@SculkSensorBlockActor\@\@QEBAHXZ */ - MCAPI static class SculkSensorBlockActor * tryGet(class BlockSource &, class BlockPos const &); + MCAPI int getLatestReceivedVibrationFrequency() const; }; diff --git a/LiteLoader/include/llapi/mc/SculkSensorVibrationConfig.hpp b/LiteLoader/include/llapi/mc/SculkSensorVibrationConfig.hpp index f2bb284c65..32eac75bbd 100644 --- a/LiteLoader/include/llapi/mc/SculkSensorVibrationConfig.hpp +++ b/LiteLoader/include/llapi/mc/SculkSensorVibrationConfig.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "VibrationListenerConfig.hpp" #define BEFORE_EXTRA @@ -14,7 +15,7 @@ * @brief MC class SculkSensorVibrationConfig. * */ -class SculkSensorVibrationConfig { +class SculkSensorVibrationConfig : public VibrationListenerConfig { #define AFTER_EXTRA @@ -47,5 +48,9 @@ class SculkSensorVibrationConfig { * @symbol ?shouldListen\@SculkSensorVibrationConfig\@\@UEAA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z */ virtual bool shouldListen(class BlockSource &, class GameEvent const &, struct GameEventContext const &); + /** + * @symbol ??0SculkSensorVibrationConfig\@\@QEAA\@AEBVBlockPos\@\@\@Z + */ + MCAPI SculkSensorVibrationConfig(class BlockPos const &); }; diff --git a/LiteLoader/include/llapi/mc/SculkShriekerBlock.hpp b/LiteLoader/include/llapi/mc/SculkShriekerBlock.hpp index f62c7587e9..bc17fc4c5c 100644 --- a/LiteLoader/include/llapi/mc/SculkShriekerBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkShriekerBlock.hpp @@ -186,40 +186,40 @@ class SculkShriekerBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 * @symbol ?getVariant\@SculkShriekerBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 152 + * @vftbl 153 * @symbol ?init\@SculkShriekerBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 + * @vftbl 165 * @symbol ?onStandOn\@SculkShriekerBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -232,46 +232,51 @@ class SculkShriekerBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@SculkShriekerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@SculkShriekerBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@SculkShriekerBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/SculkSpreader.hpp b/LiteLoader/include/llapi/mc/SculkSpreader.hpp index 5557742a34..7675a7c925 100644 --- a/LiteLoader/include/llapi/mc/SculkSpreader.hpp +++ b/LiteLoader/include/llapi/mc/SculkSpreader.hpp @@ -42,46 +42,22 @@ class SculkSpreader { * @symbol ?clearCursors\@SculkSpreader\@\@QEAAXXZ */ MCAPI void clearCursors(); - /** - * @symbol ?getAdditionalDecayRate\@SculkSpreader\@\@QEBAHXZ - */ - MCAPI int getAdditionalDecayRate() const; - /** - * @symbol ?getChargeDecayRate\@SculkSpreader\@\@QEBAHXZ - */ - MCAPI int getChargeDecayRate() const; /** * @symbol ?getCursorPosition\@SculkSpreader\@\@QEBA?AVBlockPos\@\@H\@Z */ MCAPI class BlockPos getCursorPosition(int) const; - /** - * @symbol ?getGrowthSpawnCost\@SculkSpreader\@\@QEBAHXZ - */ - MCAPI int getGrowthSpawnCost() const; /** * @symbol ?getMaxCharge\@SculkSpreader\@\@QEBAHXZ */ MCAPI int getMaxCharge() const; - /** - * @symbol ?getNoGrowthRadius\@SculkSpreader\@\@QEBAHXZ - */ - MCAPI int getNoGrowthRadius() const; /** * @symbol ?getNumberOfCursors\@SculkSpreader\@\@QEBAHXZ */ MCAPI int getNumberOfCursors() const; - /** - * @symbol ?getSculkReplaceableBlocks\@SculkSpreader\@\@QEAAAEBV?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@XZ - */ - MCAPI class std::set, class std::allocator> const & getSculkReplaceableBlocks(); /** * @symbol ?getTotalCharge\@SculkSpreader\@\@QEBAHXZ */ MCAPI int getTotalCharge() const; - /** - * @symbol ?isWorldGen\@SculkSpreader\@\@QEBA_NXZ - */ - MCAPI bool isWorldGen() const; /** * @symbol ?load\@SculkSpreader\@\@QEAAXAEBVCompoundTag\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SculkUtils.hpp b/LiteLoader/include/llapi/mc/SculkUtils.hpp index d0ef28a7b6..2769c68939 100644 --- a/LiteLoader/include/llapi/mc/SculkUtils.hpp +++ b/LiteLoader/include/llapi/mc/SculkUtils.hpp @@ -31,37 +31,9 @@ namespace SculkUtils { * @symbol ?generateSculkReplaceableBlocksWorldgen\@SculkUtils\@\@YA?BV?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@XZ */ MCAPI class std::set, class std::allocator> const generateSculkReplaceableBlocksWorldgen(); - /** - * @symbol ?isPosInTickingRange\@SculkUtils\@\@YA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI bool isPosInTickingRange(class BlockSource &, class BlockPos const &); - /** - * @symbol ?isSculk\@SculkUtils\@\@YA_NAEBVBlock\@\@\@Z - */ - MCAPI bool isSculk(class Block const &); /** * @symbol ?isSculkOrSculkVein\@SculkUtils\@\@YA_NAEBVBlock\@\@\@Z */ MCAPI bool isSculkOrSculkVein(class Block const &); - /** - * @symbol ?isSculkReplaceable\@SculkUtils\@\@YA_NAEBVBlock\@\@AEBV?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@\@Z - */ - MCAPI bool isSculkReplaceable(class Block const &, class std::set, class std::allocator> const &); - /** - * @symbol ?isSculkVein\@SculkUtils\@\@YA_NAEBVBlock\@\@\@Z - */ - MCAPI bool isSculkVein(class Block const &); - /** - * @symbol ?isSculkVeinWithSubstrateAccess\@SculkUtils\@\@YA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@AEBVBlockPos\@\@AEAVSculkSpreader\@\@\@Z - */ - MCAPI bool isSculkVeinWithSubstrateAccess(class IBlockWorldGenAPI &, class Block const &, class BlockPos const &, class SculkSpreader &); - /** - * @symbol ?requestChargeEffects\@SculkUtils\@\@YAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z - */ - MCAPI void requestChargeEffects(class IBlockWorldGenAPI &, class BlockSource *, class BlockPos const &, int, int); - /** - * @symbol ?requestChargePopEffects\@SculkUtils\@\@YAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI void requestChargePopEffects(class IBlockWorldGenAPI &, class BlockSource *, class BlockPos const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SculkVeinBlock.hpp b/LiteLoader/include/llapi/mc/SculkVeinBlock.hpp index bca2c596ac..f410d583a5 100644 --- a/LiteLoader/include/llapi/mc/SculkVeinBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkVeinBlock.hpp @@ -186,20 +186,20 @@ class SculkVeinBlock : public MultifaceBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,47 +211,52 @@ class SculkVeinBlock : public MultifaceBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@SculkVeinBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@SculkVeinBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@SculkVeinBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getMultifaceBlock\@SculkVeinBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getMultifaceBlock() const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getMultifaceSpreader\@SculkVeinBlock\@\@UEBAAEBVMultifaceSpreader\@\@XZ */ virtual class MultifaceSpreader const & getMultifaceSpreader() const; diff --git a/LiteLoader/include/llapi/mc/SculkVeinMultifaceSpreader.hpp b/LiteLoader/include/llapi/mc/SculkVeinMultifaceSpreader.hpp index 2ed8b43683..a4a241805c 100644 --- a/LiteLoader/include/llapi/mc/SculkVeinMultifaceSpreader.hpp +++ b/LiteLoader/include/llapi/mc/SculkVeinMultifaceSpreader.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "MultifaceSpreader.hpp" #define BEFORE_EXTRA @@ -54,9 +53,5 @@ class SculkVeinMultifaceSpreader { */ MCVAPI ~SculkVeinMultifaceSpreader(); #endif - /** - * @symbol ??0SculkVeinMultifaceSpreader\@\@QEAA\@AEBV?$vector\@W4SpreadType\@MultifaceSpreader\@\@V?$allocator\@W4SpreadType\@MultifaceSpreader\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI SculkVeinMultifaceSpreader(std::vector const &); }; diff --git a/LiteLoader/include/llapi/mc/SeaGrass.hpp b/LiteLoader/include/llapi/mc/SeaGrass.hpp index 3bb711b725..d7749364de 100644 --- a/LiteLoader/include/llapi/mc/SeaGrass.hpp +++ b/LiteLoader/include/llapi/mc/SeaGrass.hpp @@ -216,35 +216,35 @@ class SeaGrass : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@SeaGrass\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@SeaGrass\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColor\@SeaGrass\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -257,46 +257,51 @@ class SeaGrass : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@SeaGrass\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@SeaGrass\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@SeaGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@SeaGrass\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@SeaGrass\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SeaLanternBlock.hpp b/LiteLoader/include/llapi/mc/SeaLanternBlock.hpp index e119250c92..91315fd6fa 100644 --- a/LiteLoader/include/llapi/mc/SeaLanternBlock.hpp +++ b/LiteLoader/include/llapi/mc/SeaLanternBlock.hpp @@ -176,20 +176,20 @@ class SeaLanternBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,32 +201,37 @@ class SeaLanternBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@SeaLanternBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@SeaLanternBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SeaPickle.hpp b/LiteLoader/include/llapi/mc/SeaPickle.hpp index 7dd692bf09..e8cb40681a 100644 --- a/LiteLoader/include/llapi/mc/SeaPickle.hpp +++ b/LiteLoader/include/llapi/mc/SeaPickle.hpp @@ -216,40 +216,40 @@ class SeaPickle : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@SeaPickle\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@SeaPickle\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColor\@SeaPickle\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 153 + * @vftbl 154 * @symbol ?getLightEmission\@SeaPickle\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -262,56 +262,61 @@ class SeaPickle : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@SeaPickle\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@SeaPickle\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@SeaPickle\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@SeaPickle\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@SeaPickle\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@SeaPickle\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?checkAlive\@SeaPickle\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp b/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp index 29a652c108..bef45ae1ea 100644 --- a/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp @@ -108,9 +108,9 @@ class SeaPickleBlockItem : public BlockItem { virtual void __unk_vfn_80(); /** * @vftbl 132 - * @symbol ?_useOn\@SeaPickleBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@SeaPickleBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0SeaPickleBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/SemVersion.hpp b/LiteLoader/include/llapi/mc/SemVersion.hpp index 360b9b183e..f86ec8c394 100644 --- a/LiteLoader/include/llapi/mc/SemVersion.hpp +++ b/LiteLoader/include/llapi/mc/SemVersion.hpp @@ -45,6 +45,10 @@ bool mValidVersion, mAnyVersion; // 104, 105 * @symbol ??0SemVersion\@\@QEAA\@GGGAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI SemVersion(unsigned short, unsigned short, unsigned short, std::string const &, std::string const &); + /** + * @symbol ??0SemVersion\@\@QEAA\@XZ + */ + MCAPI SemVersion(); /** * @symbol ??0SemVersion\@\@QEAA\@Uany_version_constructor\@0\@\@Z */ @@ -53,10 +57,6 @@ bool mValidVersion, mAnyVersion; // 104, 105 * @symbol ??0SemVersion\@\@QEAA\@AEBV0\@\@Z */ MCAPI SemVersion(class SemVersion const &); - /** - * @symbol ??0SemVersion\@\@QEAA\@XZ - */ - MCAPI SemVersion(); /** * @symbol ?asString\@SemVersion\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SendPacketsComponent.hpp b/LiteLoader/include/llapi/mc/SendPacketsComponent.hpp index 636b91ee83..e34abe870a 100644 --- a/LiteLoader/include/llapi/mc/SendPacketsComponent.hpp +++ b/LiteLoader/include/llapi/mc/SendPacketsComponent.hpp @@ -31,9 +31,5 @@ struct SendPacketsComponent { * @symbol ??4SendPacketsComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct SendPacketsComponent & operator=(struct SendPacketsComponent &&); - /** - * @symbol ??1SendPacketsComponent\@\@QEAA\@XZ - */ - MCAPI ~SendPacketsComponent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SendPacketsSystemImpl.hpp b/LiteLoader/include/llapi/mc/SendPacketsSystemImpl.hpp index 2ef8a1a753..165ff5d635 100644 --- a/LiteLoader/include/llapi/mc/SendPacketsSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/SendPacketsSystemImpl.hpp @@ -31,5 +31,9 @@ class SendPacketsSystemImpl { * @symbol ?_sendPacketsSystem\@SendPacketsSystemImpl\@\@SAXAEAVStrictEntityContext\@\@AEBVActorOwnerComponent\@\@AEAUSendPacketsComponent\@\@\@Z */ MCAPI static void _sendPacketsSystem(class StrictEntityContext &, class ActorOwnerComponent const &, struct SendPacketsComponent &); + /** + * @symbol ?sendPacketsSystem\@SendPacketsSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBVActorOwnerComponent\@\@USendPacketsComponent\@\@\@\@\@Z + */ + MCAPI static void sendPacketsSystem(class ViewT); }; diff --git a/LiteLoader/include/llapi/mc/SerializedAbilitiesData.hpp b/LiteLoader/include/llapi/mc/SerializedAbilitiesData.hpp index 974ae5f029..f4217c56d8 100644 --- a/LiteLoader/include/llapi/mc/SerializedAbilitiesData.hpp +++ b/LiteLoader/include/llapi/mc/SerializedAbilitiesData.hpp @@ -17,8 +17,19 @@ struct SerializedAbilitiesData { #define AFTER_EXTRA - ActorUniqueID mUid; - LayeredAbilities mAbilities; + struct SerializedAbilitiesLayer {}; + struct SerializedLayer + { + SerializedAbilitiesLayer mAbilitiesLayer; + uint32_t mAbilitiesSize; + uint32_t mAbility; + float mFlyingSpeed; + float mWalkingSpeed; + }; + ActorUniqueID mUniqueID; + CommandPermissionLevel mCommandPermissionLevel; + PlayerPermissionLevel mPlayerPermissionLevel; + std::vector mLayers; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SERIALIZEDABILITIESDATA public: diff --git a/LiteLoader/include/llapi/mc/SerializedSkin.hpp b/LiteLoader/include/llapi/mc/SerializedSkin.hpp index 297151ac54..39d66fccf6 100644 --- a/LiteLoader/include/llapi/mc/SerializedSkin.hpp +++ b/LiteLoader/include/llapi/mc/SerializedSkin.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "persona.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -23,10 +22,6 @@ class SerializedSkin { char filler[0x250]; #undef AFTER_EXTRA public: - /** - * @symbol ??0SerializedSkin\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI SerializedSkin(class SerializedSkin const &); /** * @symbol ??0SerializedSkin\@\@QEAA\@AEBVSubClientConnectionRequest\@\@\@Z */ @@ -35,6 +30,10 @@ class SerializedSkin { * @symbol ??0SerializedSkin\@\@QEAA\@XZ */ MCAPI SerializedSkin(); + /** + * @symbol ??0SerializedSkin\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI SerializedSkin(class SerializedSkin const &); /** * @symbol ??0SerializedSkin\@\@QEAA\@$$QEAV0\@\@Z */ @@ -43,10 +42,6 @@ class SerializedSkin { * @symbol ??0SerializedSkin\@\@QEAA\@AEBVConnectionRequest\@\@\@Z */ MCAPI SerializedSkin(class ConnectionRequest const &); - /** - * @symbol ?getAnimationFrames\@SerializedSkin\@\@QEBAMW4AnimatedTextureType\@persona\@\@\@Z - */ - MCAPI float getAnimationFrames(enum class persona::AnimatedTextureType) const; /** * @symbol ?getName\@SerializedSkin\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ @@ -63,6 +58,10 @@ class SerializedSkin { * @symbol ?read\@SerializedSkin\@\@QEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI bool read(class ReadOnlyBinaryStream &); + /** + * @symbol ?setArmSizeFromString\@SerializedSkin\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI void setArmSizeFromString(std::string const &); /** * @symbol ?setIsTrustedSkin\@SerializedSkin\@\@QEAAX_N\@Z */ @@ -71,10 +70,6 @@ class SerializedSkin { * @symbol ?updateGeometryName\@SerializedSkin\@\@QEAAXXZ */ MCAPI void updateGeometryName(); - /** - * @symbol ?useBlinkingAnimation\@SerializedSkin\@\@QEBA_NXZ - */ - MCAPI bool useBlinkingAnimation() const; /** * @symbol ?write\@SerializedSkin\@\@QEBAXAEAVBinaryStream\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SerializerContext.hpp b/LiteLoader/include/llapi/mc/SerializerContext.hpp index a961565474..54d62fa47d 100644 --- a/LiteLoader/include/llapi/mc/SerializerContext.hpp +++ b/LiteLoader/include/llapi/mc/SerializerContext.hpp @@ -27,14 +27,14 @@ class SerializerContext { #endif public: - /** - * @symbol ??0SerializerContext\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI SerializerContext(class SerializerContext const &); /** * @symbol ??0SerializerContext\@\@QEAA\@XZ */ MCAPI SerializerContext(); + /** + * @symbol ??0SerializerContext\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI SerializerContext(class SerializerContext const &); /** * @symbol ?clear\@SerializerContext\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/SerializerTraits.hpp b/LiteLoader/include/llapi/mc/SerializerTraits.hpp index 0008e88152..48f1ed933a 100644 --- a/LiteLoader/include/llapi/mc/SerializerTraits.hpp +++ b/LiteLoader/include/llapi/mc/SerializerTraits.hpp @@ -38,14 +38,18 @@ struct SerializerTraits { * @symbol ?name\@SerializerTraits\@\@QEAAAEAU1\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct SerializerTraits & name(std::string); + /** + * @symbol ??4SerializerTraits\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct SerializerTraits & operator=(struct SerializerTraits const &); /** * @symbol ??4SerializerTraits\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct SerializerTraits & operator=(struct SerializerTraits &&); /** - * @symbol ??4SerializerTraits\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ?setEnumDocumentation\@SerializerTraits\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI struct SerializerTraits & operator=(struct SerializerTraits const &); + MCAPI void setEnumDocumentation(std::string); /** * @symbol ?validate\@SerializerTraits\@\@QEAAAEAU1\@V?$function\@$$A6A_NAEAVmeta_any\@entt\@\@AEAVSerializerContext\@\@\@Z\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ServerAutoStepSystem.hpp b/LiteLoader/include/llapi/mc/ServerAutoStepSystem.hpp index e6e0069077..47127f32b6 100644 --- a/LiteLoader/include/llapi/mc/ServerAutoStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerAutoStepSystem.hpp @@ -44,9 +44,14 @@ class ServerAutoStepSystem { virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol ?tick\@ServerAutoStepSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UAutoStepRequestFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UMoveRequestComponent\@\@USlideOffsetComponent\@\@USubBBsComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @symbol __unk_vfn_3 */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct SynchedActorDataComponent, class FlagComponent>, struct Read, struct Write, struct MoveRequestComponent, struct SlideOffsetComponent, struct SubBBsComponent, struct SideBySidePlaybackBlocksComponent>, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?tick\@ServerAutoStepSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UAutoStepRequestFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UPlayerGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UMoveRequestComponent\@\@USlideOffsetComponent\@\@USubBBsComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + */ + virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct SynchedActorDataComponent, class FlagComponent>, struct Read, struct Write, struct MoveRequestComponent, struct SlideOffsetComponent, struct SubBBsComponent, struct SideBySidePlaybackBlocksComponent>, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** * @symbol ?createServerAutoStepSystem\@ServerAutoStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ServerCommand.hpp b/LiteLoader/include/llapi/mc/ServerCommand.hpp index 854abac762..7ab19f962a 100644 --- a/LiteLoader/include/llapi/mc/ServerCommand.hpp +++ b/LiteLoader/include/llapi/mc/ServerCommand.hpp @@ -33,10 +33,6 @@ class ServerCommand { */ MCVAPI ~ServerCommand(); #endif - /** - * @symbol ?setup\@ServerCommand\@\@SAXAEAVMinecraft\@\@\@Z - */ - MCAPI static void setup(class Minecraft &); //protected: /** diff --git a/LiteLoader/include/llapi/mc/ServerCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ServerCommandOrigin.hpp index 187e96a2a2..8b0c2549bb 100644 --- a/LiteLoader/include/llapi/mc/ServerCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/ServerCommandOrigin.hpp @@ -121,9 +121,5 @@ class ServerCommandOrigin : public CommandOrigin { * @symbol ??0ServerCommandOrigin\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVServerLevel\@\@W4CommandPermissionLevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI ServerCommandOrigin(std::string const &, class ServerLevel &, enum class CommandPermissionLevel, class AutomaticID); - /** - * @symbol ?load\@ServerCommandOrigin\@\@SA?AV?$unique_ptr\@VServerCommandOrigin\@\@U?$default_delete\@VServerCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVServerLevel\@\@\@Z - */ - MCAPI static std::unique_ptr load(class CompoundTag const &, class ServerLevel &); }; diff --git a/LiteLoader/include/llapi/mc/ServerFileChunkUploader.hpp b/LiteLoader/include/llapi/mc/ServerFileChunkUploader.hpp index 4e987522fb..180474676a 100644 --- a/LiteLoader/include/llapi/mc/ServerFileChunkUploader.hpp +++ b/LiteLoader/include/llapi/mc/ServerFileChunkUploader.hpp @@ -100,9 +100,5 @@ class ServerFileChunkUploader : public IFileChunkUploader { */ MCVAPI void update(); #endif - /** - * @symbol ??0ServerFileChunkUploader\@\@QEAA\@AEAVPacketSender\@\@AEBVNetworkIdentifier\@\@\@Z - */ - MCAPI ServerFileChunkUploader(class PacketSender &, class NetworkIdentifier const &); }; diff --git a/LiteLoader/include/llapi/mc/ServerGameplayUserManagerProxy.hpp b/LiteLoader/include/llapi/mc/ServerGameplayUserManagerProxy.hpp new file mode 100644 index 0000000000..2c9cc0f325 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ServerGameplayUserManagerProxy.hpp @@ -0,0 +1,44 @@ +/** + * @file ServerGameplayUserManagerProxy.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "GameplayUserManagerProxy.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ServerGameplayUserManagerProxy : public GameplayUserManagerProxy { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SERVERGAMEPLAYUSERMANAGERPROXY +public: + class ServerGameplayUserManagerProxy& operator=(class ServerGameplayUserManagerProxy const &) = delete; + ServerGameplayUserManagerProxy(class ServerGameplayUserManagerProxy const &) = delete; + ServerGameplayUserManagerProxy() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?validatePlayerName\@ServerGameplayUserManagerProxy\@\@UEBA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVGameplayUserManager\@\@\@Z + */ + virtual class std::optional validatePlayerName(std::string const &, class GameplayUserManager const &) const; + /** + * @vftbl 2 + * @symbol ?shouldGeneratePlayerIndex\@ServerGameplayUserManagerProxy\@\@UEBA_NXZ + */ + virtual bool shouldGeneratePlayerIndex() const; + +}; diff --git a/LiteLoader/include/llapi/mc/ServerInstance.hpp b/LiteLoader/include/llapi/mc/ServerInstance.hpp index 2589f46e6e..25c311e022 100644 --- a/LiteLoader/include/llapi/mc/ServerInstance.hpp +++ b/LiteLoader/include/llapi/mc/ServerInstance.hpp @@ -120,9 +120,9 @@ class ServerInstance { */ MCAPI class ItemRegistryRef getServerItemRegistry() const; /** - * @symbol ?initializeServer\@ServerInstance\@\@QEAA_NAEAVIMinecraftApp\@\@AEAVAllowList\@\@PEAVPermissionsFile\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VFilePathManager\@Core\@\@\@Bedrock\@\@\@gsl\@\@V?$duration\@_JU?$ratio\@$00$00\@std\@\@\@chrono\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@9\@55VLevelSettings\@\@H_NUConnectionDefinition\@\@7AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@9\@5AEBVUUID\@mce\@\@AEAVIMinecraftEventing\@\@AEAVIResourcePackRepository\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentTierManager\@\@\@Bedrock\@\@\@6\@AEAVResourcePackManager\@\@V?$function\@$$A6A?AV?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@AEAVScheduler\@\@\@Z\@9\@V?$unique_ptr\@VLevelLooseFileStorage\@\@U?$default_delete\@VLevelLooseFileStorage\@\@\@std\@\@\@9\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@9\@PEAVLevelData\@\@55V?$unique_ptr\@VEducationOptions\@\@U?$default_delete\@VEducationOptions\@\@\@std\@\@\@9\@PEAVResourcePackManager\@\@V?$function\@$$A6AXXZ\@9\@V?$function\@$$A6AXXZ\@9\@PEAVServerMetrics\@\@PEAVDebugEndPoint\@\@7V?$shared_ptr\@VFileStorageArea\@Core\@\@\@9\@AEBUNetworkSettingOptions\@\@77V?$optional\@UPlayerMovementSettings\@\@\@9\@V?$optional\@UScriptSettings\@\@\@9\@AEBVExperiments\@\@W4TransportLayer\@\@7MV?$optional\@_N\@9\@\@Z + * @symbol ?initializeServer\@ServerInstance\@\@QEAA_NAEAVIMinecraftApp\@\@AEAVAllowList\@\@PEAVPermissionsFile\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VFilePathManager\@Core\@\@\@Bedrock\@\@\@gsl\@\@V?$duration\@_JU?$ratio\@$00$00\@std\@\@\@chrono\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@9\@55VLevelSettings\@\@H_NUConnectionDefinition\@\@7AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@9\@5AEBVUUID\@mce\@\@AEAVIMinecraftEventing\@\@AEAVIResourcePackRepository\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentTierManager\@\@\@Bedrock\@\@\@6\@AEAVResourcePackManager\@\@V?$function\@$$A6A?AV?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@AEAVScheduler\@\@\@Z\@9\@V?$unique_ptr\@VLevelLooseFileStorage\@\@U?$default_delete\@VLevelLooseFileStorage\@\@\@std\@\@\@9\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@9\@PEAVLevelData\@\@55V?$unique_ptr\@VEducationOptions\@\@U?$default_delete\@VEducationOptions\@\@\@std\@\@\@9\@PEAVResourcePackManager\@\@V?$function\@$$A6AXXZ\@9\@V?$function\@$$A6AXXZ\@9\@PEAVServerMetrics\@\@PEAVDebugEndPoint\@\@7V?$shared_ptr\@VFileStorageArea\@Core\@\@\@9\@AEBUNetworkSettingOptions\@\@77V?$optional\@UPlayerMovementSettings\@\@\@9\@V?$optional\@UScriptSettings\@\@\@9\@AEBVExperiments\@\@W4TransportLayer\@\@7MV?$optional\@_N\@9\@W4ForceBlockNetworkIdsAreHashes\@\@AEBUNetworkPermissions\@\@\@Z */ - MCAPI bool initializeServer(class IMinecraftApp &, class AllowList &, class PermissionsFile *, class gsl::not_null> const &, class std::chrono::duration<__int64, struct std::ratio<1, 1>>, std::string, std::string, std::string, class LevelSettings, int, bool, struct ConnectionDefinition, bool, std::vector const &, std::string, class mce::UUID const &, class IMinecraftEventing &, class IResourcePackRepository &, class gsl::not_null> const &, class ResourcePackManager &, class std::function (class Scheduler &)>, std::unique_ptr, std::string const &, class LevelData *, std::string, std::string, std::unique_ptr, class ResourcePackManager *, class std::function, class std::function, class ServerMetrics *, class DebugEndPoint *, bool, class std::shared_ptr, struct NetworkSettingOptions const &, bool, bool, class std::optional, class std::optional, class Experiments const &, enum class TransportLayer, bool, float, class std::optional); + MCAPI bool initializeServer(class IMinecraftApp &, class AllowList &, class PermissionsFile *, class gsl::not_null> const &, class std::chrono::duration<__int64, struct std::ratio<1, 1>>, std::string, std::string, std::string, class LevelSettings, int, bool, struct ConnectionDefinition, bool, std::vector const &, std::string, class mce::UUID const &, class IMinecraftEventing &, class IResourcePackRepository &, class gsl::not_null> const &, class ResourcePackManager &, class std::function (class Scheduler &)>, std::unique_ptr, std::string const &, class LevelData *, std::string, std::string, std::unique_ptr, class ResourcePackManager *, class std::function, class std::function, class ServerMetrics *, class DebugEndPoint *, bool, class std::shared_ptr, struct NetworkSettingOptions const &, bool, bool, class std::optional, class std::optional, class Experiments const &, enum class TransportLayer, bool, float, class std::optional, enum class ForceBlockNetworkIdsAreHashes, struct NetworkPermissions const &); /** * @symbol ?leaveGameSync\@ServerInstance\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/ServerLevel.hpp b/LiteLoader/include/llapi/mc/ServerLevel.hpp index 0f83255588..91482b8987 100644 --- a/LiteLoader/include/llapi/mc/ServerLevel.hpp +++ b/LiteLoader/include/llapi/mc/ServerLevel.hpp @@ -55,6 +55,14 @@ class ServerLevel { * @symbol ?getLevelEventCoordinator\@ServerLevel\@\@UEAAAEAVLevelEventCoordinator\@\@XZ */ MCVAPI class LevelEventCoordinator & getLevelEventCoordinator(); + /** + * @symbol ?getPlayerSleepManager\@ServerLevel\@\@UEAAAEAVPlayerSleepManager\@\@XZ + */ + MCVAPI class PlayerSleepManager & getPlayerSleepManager(); + /** + * @symbol ?getPlayerSleepManager\@ServerLevel\@\@UEBAAEBVPlayerSleepManager\@\@XZ + */ + MCVAPI class PlayerSleepManager const & getPlayerSleepManager() const; /** * @symbol ?getPositionTrackerDBServer\@ServerLevel\@\@UEBAPEAVPositionTrackingDBServer\@PositionTrackingDB\@\@XZ */ @@ -123,19 +131,15 @@ class ServerLevel { * @symbol ?setWorldTemplateOptionsUnlocked\@ServerLevel\@\@UEAAXXZ */ MCVAPI void setWorldTemplateOptionsUnlocked(); - /** - * @symbol ?updateSleepingPlayerList\@ServerLevel\@\@UEAAXXZ - */ - MCVAPI void updateSleepingPlayerList(); /** * @symbol __unk_destructor_-1 */ MCVAPI ~ServerLevel(); #endif /** - * @symbol ??0ServerLevel\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@V?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VLevelLooseFileStorage\@\@U?$default_delete\@VLevelLooseFileStorage\@\@\@std\@\@\@4\@AEAVIMinecraftEventing\@\@AEAVResourcePackManager\@\@4V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@2\@AEAVMinecraftCommands\@\@AEAVScheduler\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VIEntityRegistryOwner\@\@\@Bedrock\@\@\@2\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@V?$unique_ptr\@VBlockComponentFactory\@\@U?$default_delete\@VBlockComponentFactory\@\@\@std\@\@\@4\@V?$unique_ptr\@VBlockDefinitionGroup\@\@U?$default_delete\@VBlockDefinitionGroup\@\@\@std\@\@\@4\@VItemRegistryRef\@\@_NV?$weak_ptr\@VBlockTypeRegistry\@\@\@4\@\@Z + * @symbol ??0ServerLevel\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@V?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VLevelLooseFileStorage\@\@U?$default_delete\@VLevelLooseFileStorage\@\@\@std\@\@\@4\@AEAVIMinecraftEventing\@\@AEAVResourcePackManager\@\@4V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@2\@AEAVMinecraftCommands\@\@AEAVScheduler\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VIEntityRegistryOwner\@\@\@Bedrock\@\@\@2\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@V?$unique_ptr\@VBlockComponentFactory\@\@U?$default_delete\@VBlockComponentFactory\@\@\@std\@\@\@4\@V?$unique_ptr\@VBlockDefinitionGroup\@\@U?$default_delete\@VBlockDefinitionGroup\@\@\@std\@\@\@4\@VItemRegistryRef\@\@_N_NV?$weak_ptr\@VBlockTypeRegistry\@\@\@4\@\@Z */ - MCAPI ServerLevel(class gsl::not_null> const &, std::unique_ptr, std::unique_ptr, class IMinecraftEventing &, class ResourcePackManager &, class ResourcePackManager &, class gsl::not_null>, class MinecraftCommands &, class Scheduler &, class gsl::not_null> const &, class WeakRefT, std::unique_ptr, std::unique_ptr, class ItemRegistryRef, bool, class std::weak_ptr); + MCAPI ServerLevel(class gsl::not_null> const &, std::unique_ptr, std::unique_ptr, class IMinecraftEventing &, class ResourcePackManager &, class ResourcePackManager &, class gsl::not_null>, class MinecraftCommands &, class Scheduler &, class gsl::not_null> const &, class WeakRefT, std::unique_ptr, std::unique_ptr, class ItemRegistryRef, bool, bool, class std::weak_ptr); /** * @symbol ?addServerChunksToPacket\@ServerLevel\@\@QEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@AEAVNetworkChunkPublisherUpdatePacket\@\@\@Z */ @@ -145,17 +149,13 @@ class ServerLevel { */ MCAPI void clearAllGenerationRequests(class NetworkIdentifier const &, enum class SubClientId); /** - * @symbol ?getCommands\@ServerLevel\@\@QEAAAEAVMinecraftCommands\@\@XZ + * @symbol ?getCommandManager\@ServerLevel\@\@QEAAAEAVCommandManager\@\@XZ */ - MCAPI class MinecraftCommands & getCommands(); + MCAPI class CommandManager & getCommandManager(); /** * @symbol ?getDynamicPropertiesDefinition\@ServerLevel\@\@QEAAAEAVDynamicPropertiesDefinition\@\@XZ */ MCAPI class DynamicPropertiesDefinition & getDynamicPropertiesDefinition(); - /** - * @symbol ?getFunctionManager\@ServerLevel\@\@QEAAAEAVFunctionManager\@\@XZ - */ - MCAPI class FunctionManager & getFunctionManager(); /** * @symbol ?getMobEvents\@ServerLevel\@\@QEAAAEAVMobEvents\@\@XZ */ @@ -198,18 +198,38 @@ class ServerLevel { * @symbol ?_initializeActorManager\@ServerLevel\@\@AEAAXXZ */ MCAPI void _initializeActorManager(); + /** + * @symbol ?_initializePlayerSleepManager\@ServerLevel\@\@AEAAXXZ + */ + MCAPI void _initializePlayerSleepManager(); /** * @symbol ?_onActorEntityAdded\@ServerLevel\@\@AEAAXAEAVActor\@\@\@Z */ MCAPI void _onActorEntityAdded(class Actor &); + /** + * @symbol ?_onGameplayUserAdded\@ServerLevel\@\@AEAAXAEAVEntityContext\@\@\@Z + */ + MCAPI void _onGameplayUserAdded(class EntityContext &); /** * @symbol ?_onNewDimensionCreated\@ServerLevel\@\@AEAAXAEAVDimension\@\@\@Z */ MCAPI void _onNewDimensionCreated(class Dimension &); + /** + * @symbol ?_onPlayerWakeUp\@ServerLevel\@\@AEAAXAEAVPlayer\@\@\@Z + */ + MCAPI void _onPlayerWakeUp(class Player &); /** * @symbol ?_onRemoveActorEntityReferences\@ServerLevel\@\@AEAAXAEAVActor\@\@\@Z */ MCAPI void _onRemoveActorEntityReferences(class Actor &); + /** + * @symbol ?_onSleepingPlayerListUpdated\@ServerLevel\@\@AEAAXAEBUPlayerSleepStatus\@\@\@Z + */ + MCAPI void _onSleepingPlayerListUpdated(struct PlayerSleepStatus const &); + /** + * @symbol ?_onWakeUpAllPlayers\@ServerLevel\@\@AEAAXXZ + */ + MCAPI void _onWakeUpAllPlayers(); /** * @symbol ?_postReloadActorAdded\@ServerLevel\@\@AEAAXAEAVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ServerNetworkController.hpp b/LiteLoader/include/llapi/mc/ServerNetworkController.hpp index 46d5c325e2..ed92ff7c29 100644 --- a/LiteLoader/include/llapi/mc/ServerNetworkController.hpp +++ b/LiteLoader/include/llapi/mc/ServerNetworkController.hpp @@ -49,9 +49,5 @@ class ServerNetworkController { * @symbol ?canChangePermission\@ServerNetworkController\@\@UEBA_NAEBVUUID\@mce\@\@AEBVServerPlayer\@\@\@Z */ virtual bool canChangePermission(class mce::UUID const &, class ServerPlayer const &) const; - /** - * @symbol ??0ServerNetworkController\@\@QEAA\@_NAEBVUUID\@mce\@\@V?$function\@$$A6A_NAEBVServerPlayer\@\@W4AbilitiesIndex\@\@\@Z\@std\@\@\@Z - */ - MCAPI ServerNetworkController(bool, class mce::UUID const &, class std::function); }; diff --git a/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp b/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp index 86459b5e87..ff52bfa62a 100644 --- a/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp +++ b/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp @@ -63,13 +63,9 @@ class ServerNetworkHandler { */ MCVAPI class GameSpecificNetEventCallback * getGameSpecificNetEventCallback(); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapCreateLockedCopyPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class MapCreateLockedCopyPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackChunkRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestAbilityPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ResourcePackChunkRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class RequestAbilityPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVChangeMobPropertyPacket\@\@\@Z */ @@ -99,85 +95,57 @@ class ServerNetworkHandler { */ MCVAPI void handle(class NetworkIdentifier const &, class ItemStackRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventoryTransactionPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class InventoryTransactionPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTextPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class TextPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestPermissionsPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLabTablePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class RequestPermissionsPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class LabTablePacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerSkinPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerSkinPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLabTablePacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class LabTablePacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCodeBuilderSourcePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CodeBuilderSourcePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNpcRequestPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class NpcRequestPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMovePlayerPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPositionTrackingDBClientRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MovePlayerPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class PositionTrackingDBClientRequestPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheStatusPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheStatusPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerInputPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class PlayerInputPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBlockPickRequestPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class BlockPickRequestPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapInfoRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNpcRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MapInfoRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class NpcRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestAbilityPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemFrameDropItemPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class RequestAbilityPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ItemFrameDropItemPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerAuthInputPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackChunkRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class PlayerAuthInputPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ResourcePackChunkRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemFrameDropItemPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestChunkRadiusPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ItemFrameDropItemPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class RequestChunkRadiusPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBossEventPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDebugInfoPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class BossEventPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class DebugInfoPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMobEquipmentPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLoginPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MobEquipmentPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class LoginPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPassengerJumpPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetPlayerGameTypePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class PassengerJumpPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class SetPlayerGameTypePacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdatePlayerGameTypePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class UpdatePlayerGameTypePacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestChunkRadiusPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class RequestChunkRadiusPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacket\@\@\@Z */ @@ -186,14 +154,30 @@ class ServerNetworkHandler { * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV2\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacketV2 const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMovePlayerPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class MovePlayerPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBlockPickRequestPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class BlockPickRequestPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMultiplayerSettingsPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class MultiplayerSettingsPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSpawnExperienceOrbPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class SpawnExperienceOrbPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerHotbarPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerHotbarPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandBlockUpdatePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestPermissionsPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class CommandBlockUpdatePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class RequestPermissionsPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmotePacket\@\@\@Z */ @@ -207,21 +191,29 @@ class ServerNetworkHandler { */ MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheBlobStatusPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVScriptMessagePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventoryTransactionPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ScriptMessagePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class InventoryTransactionPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorEventPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBossEventPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ActorEventPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class BossEventPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSpawnExperienceOrbPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetLocalPlayerAsInitializedPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SpawnExperienceOrbPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class SetLocalPlayerAsInitializedPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CommandRequestPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnvilDamagePacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class AnvilDamagePacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGameTestRequestPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class GameTestRequestPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDisconnectPacket\@\@\@Z */ @@ -231,21 +223,25 @@ class ServerNetworkHandler { */ MCVAPI void handle(class NetworkIdentifier const &, class SetDifficultyPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVContainerClosePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSimpleEventPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ContainerClosePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class SimpleEventPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmoteListPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class EmoteListPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetLocalPlayerAsInitializedPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookEditPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SetLocalPlayerAsInitializedPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class BookEditPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSimpleEventPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPassengerJumpPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SimpleEventPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class PassengerJumpPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapInfoRequestPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class MapInfoRequestPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVModalFormResponsePacket\@\@\@Z */ @@ -255,17 +251,21 @@ class ServerNetworkHandler { */ MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureTemplateDataRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMobEquipmentPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class StructureTemplateDataRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class MobEquipmentPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetPlayerGameTypePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVScriptMessagePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SetPlayerGameTypePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ScriptMessagePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookEditPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapCreateLockedCopyPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class BookEditPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class MapCreateLockedCopyPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVContainerClosePacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class ContainerClosePacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerActionPacket\@\@\@Z */ @@ -275,17 +275,21 @@ class ServerNetworkHandler { */ MCVAPI void handle(class NetworkIdentifier const &, class CraftingEventPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureBlockUpdatePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTextPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class StructureBlockUpdatePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class TextPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRespawnPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class RespawnPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnvilDamagePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorEventPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class AnvilDamagePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ActorEventPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerAuthInputPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class PlayerAuthInputPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSettingsCommandPacket\@\@\@Z */ @@ -294,18 +298,6 @@ class ServerNetworkHandler { * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestNetworkSettingsPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class RequestNetworkSettingsPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNetworkStackLatencyPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class NetworkStackLatencyPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPositionTrackingDBClientRequestPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class PositionTrackingDBClientRequestPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientToServerHandshakePacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class ClientToServerHandshakePacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTickSyncPacket\@\@\@Z */ @@ -314,34 +306,30 @@ class ServerNetworkHandler { * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMoveActorAbsolutePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class MoveActorAbsolutePacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDebugInfoPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class DebugInfoPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV1\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacketV1 const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorPickRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureBlockUpdatePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ActorPickRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class StructureBlockUpdatePacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVFilterTextPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class FilterTextPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLoginPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureTemplateDataRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class LoginPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class StructureTemplateDataRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGameTestRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerInputPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class GameTestRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class PlayerInputPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMultiplayerSettingsPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNetworkStackLatencyPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MultiplayerSettingsPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class NetworkStackLatencyPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubClientLoginPacket\@\@\@Z */ @@ -354,6 +342,14 @@ class ServerNetworkHandler { * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInteractPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class InteractPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandBlockUpdatePacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class CommandBlockUpdatePacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientToServerHandshakePacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class ClientToServerHandshakePacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVShowCreditsPacket\@\@\@Z */ @@ -366,6 +362,10 @@ class ServerNetworkHandler { * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDefaultGameTypePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetDefaultGameTypePacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorPickRequestPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class ActorPickRequestPacket const &); /** * @symbol ?onDisconnect\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N1\@Z */ @@ -412,9 +412,9 @@ class ServerNetworkHandler { MCVAPI ~ServerNetworkHandler(); #endif /** - * @symbol ??0ServerNetworkHandler\@\@QEAA\@AEAVGameCallbacks\@\@AEBV?$NonOwnerPointer\@VILevel\@\@\@Bedrock\@\@AEAVNetworkSystem\@\@AEAVPrivateKeyManager\@\@AEAVServerLocator\@\@AEAVPacketSender\@\@AEAVAllowList\@\@PEAVPermissionsFile\@\@AEBVUUID\@mce\@\@H_NAEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEAVMinecraftCommands\@\@AEAVIMinecraftApp\@\@AEBV?$unordered_map\@UPackIdVersion\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@UPackIdVersion\@\@\@3\@U?$equal_to\@UPackIdVersion\@\@\@3\@V?$allocator\@U?$pair\@$$CBUPackIdVersion\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@AEAVScheduler\@\@V?$NonOwnerPointer\@VTextFilteringProcessor\@\@\@3\@V?$optional_ref\@VMinecraftGameTest\@\@\@\@V?$ServiceReference\@VAppConfigs\@\@\@\@V?$ServiceReference\@VMultiplayerServiceManager\@Social\@\@\@\@9\@Z + * @symbol ??0ServerNetworkHandler\@\@QEAA\@AEAVGameCallbacks\@\@AEBV?$NonOwnerPointer\@VILevel\@\@\@Bedrock\@\@AEAVNetworkSystem\@\@AEAVPrivateKeyManager\@\@AEAVServerLocator\@\@AEAVPacketSender\@\@AEAVAllowList\@\@PEAVPermissionsFile\@\@AEBVUUID\@mce\@\@H_NAEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEAVMinecraftCommands\@\@AEAVIMinecraftApp\@\@AEBV?$unordered_map\@UPackIdVersion\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@UPackIdVersion\@\@\@3\@U?$equal_to\@UPackIdVersion\@\@\@3\@V?$allocator\@U?$pair\@$$CBUPackIdVersion\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@AEAVScheduler\@\@V?$NonOwnerPointer\@VTextFilteringProcessor\@\@\@3\@V?$optional_ref\@VMinecraftGameTest\@\@\@\@V?$ServiceReference\@VAppConfigs\@\@\@\@V?$ServiceReference\@VMultiplayerServiceManager\@Social\@\@\@\@9AEBUNetworkPermissions\@\@\@Z */ - MCAPI ServerNetworkHandler(class GameCallbacks &, class Bedrock::NonOwnerPointer const &, class NetworkSystem &, class PrivateKeyManager &, class ServerLocator &, class PacketSender &, class AllowList &, class PermissionsFile *, class mce::UUID const &, int, bool, std::vector const &, std::string, int, class MinecraftCommands &, class IMinecraftApp &, class std::unordered_map, struct std::equal_to, class std::allocator>> const &, class Scheduler &, class Bedrock::NonOwnerPointer, class optional_ref, class ServiceReference, class ServiceReference, bool); + MCAPI ServerNetworkHandler(class GameCallbacks &, class Bedrock::NonOwnerPointer const &, class NetworkSystem &, class PrivateKeyManager &, class ServerLocator &, class PacketSender &, class AllowList &, class PermissionsFile *, class mce::UUID const &, int, bool, std::vector const &, std::string, int, class MinecraftCommands &, class IMinecraftApp &, class std::unordered_map, struct std::equal_to, class std::allocator>> const &, class Scheduler &, class Bedrock::NonOwnerPointer, class optional_ref, class ServiceReference, class ServiceReference, bool, struct NetworkPermissions const &); /** * @symbol ?activateAllowList\@ServerNetworkHandler\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/ServerPlayer.hpp b/LiteLoader/include/llapi/mc/ServerPlayer.hpp index dd72a44b7a..2b87f92754 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayer.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayer.hpp @@ -416,9 +416,9 @@ class ServerPlayer : public Player { virtual void stopSleepInBed(bool, bool); /** * @vftbl 395 - * @symbol __unk_vfn_395 + * @symbol ?openSign\@ServerPlayer\@\@UEAAXAEBVBlockPos\@\@_N\@Z */ - virtual void __unk_vfn_395(); + virtual void openSign(class BlockPos const &, bool); /** * @vftbl 396 * @symbol __unk_vfn_396 @@ -540,22 +540,27 @@ class ServerPlayer : public Player { */ virtual void __unk_vfn_436(); /** - * @vftbl 440 + * @vftbl 437 + * @symbol ?getMaxChunkBuildRadius\@ServerPlayer\@\@UEBAEXZ + */ + virtual unsigned char getMaxChunkBuildRadius() const; + /** + * @vftbl 441 * @symbol ?getEditorPlayer\@ServerPlayer\@\@UEBA?AV?$NonOwnerPointer\@VIEditorPlayer\@Editor\@\@\@Bedrock\@\@XZ */ virtual class Bedrock::NonOwnerPointer getEditorPlayer() const; /** - * @vftbl 441 + * @vftbl 442 * @symbol ?destroyEditorPlayer\@ServerPlayer\@\@UEAAXXZ */ virtual void destroyEditorPlayer(); /** - * @vftbl 442 + * @vftbl 443 * @symbol ?_getSpawnChunkLimit\@ServerPlayer\@\@MEBAHXZ */ virtual int _getSpawnChunkLimit() const; /** - * @vftbl 443 + * @vftbl 444 * @symbol ?_updateChunkPublisherView\@ServerPlayer\@\@MEAAXAEBVVec3\@\@M\@Z */ virtual void _updateChunkPublisherView(class Vec3 const &, float); @@ -613,6 +618,10 @@ class ServerPlayer : public Player { * @symbol ?handleBlockPickRequestOnServer\@ServerPlayer\@\@QEAAXAEBVBlockPos\@\@_N\@Z */ MCAPI void handleBlockPickRequestOnServer(class BlockPos const &, bool); + /** + * @symbol ?isCompatibleWithClientSideChunkGen\@ServerPlayer\@\@QEBA_NXZ + */ + MCAPI bool isCompatibleWithClientSideChunkGen() const; /** * @symbol ?openUnmanagedContainer\@ServerPlayer\@\@QEAA?AW4ContainerID\@\@XZ */ @@ -642,13 +651,17 @@ class ServerPlayer : public Player { */ MCAPI void sendPlayerOnGround(); /** - * @symbol ?setClientChunkRadius\@ServerPlayer\@\@QEAAXI\@Z + * @symbol ?setClientChunkRadius\@ServerPlayer\@\@QEAAXIE\@Z */ - MCAPI void setClientChunkRadius(unsigned int); + MCAPI void setClientChunkRadius(unsigned int, unsigned char); /** * @symbol ?setInputMode\@ServerPlayer\@\@QEAAXAEBW4InputMode\@\@\@Z */ MCAPI void setInputMode(enum class InputMode const &); + /** + * @symbol ?setIsCompatibleWithClientSideChunkGen\@ServerPlayer\@\@QEAAX_N\@Z + */ + MCAPI void setIsCompatibleWithClientSideChunkGen(bool); /** * @symbol ?setLocalPlayerAsInitialized\@ServerPlayer\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/ServerPlayerMovementComponent.hpp b/LiteLoader/include/llapi/mc/ServerPlayerMovementComponent.hpp index 1a613ba890..4282fc30cd 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerMovementComponent.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerMovementComponent.hpp @@ -31,9 +31,5 @@ struct ServerPlayerMovementComponent { * @symbol ??0ServerPlayerMovementComponent\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI ServerPlayerMovementComponent(struct ServerPlayerMovementComponent &&); - /** - * @symbol ??1ServerPlayerMovementComponent\@\@QEAA\@XZ - */ - MCAPI ~ServerPlayerMovementComponent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ServerPlayerSleepManager.hpp b/LiteLoader/include/llapi/mc/ServerPlayerSleepManager.hpp new file mode 100644 index 0000000000..acf5bdb9fb --- /dev/null +++ b/LiteLoader/include/llapi/mc/ServerPlayerSleepManager.hpp @@ -0,0 +1,81 @@ +/** + * @file ServerPlayerSleepManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ServerPlayerSleepManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SERVERPLAYERSLEEPMANAGER +public: + class ServerPlayerSleepManager& operator=(class ServerPlayerSleepManager const &) = delete; + ServerPlayerSleepManager(class ServerPlayerSleepManager const &) = delete; + ServerPlayerSleepManager() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?updateSleepingPlayerList\@ServerPlayerSleepManager\@\@UEAAXXZ + */ + virtual void updateSleepingPlayerList(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERPLAYERSLEEPMANAGER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ServerPlayerSleepManager(); +#endif + /** + * @symbol ??0ServerPlayerSleepManager\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VGameplayUserManager\@\@\@Bedrock\@\@\@gsl\@\@\@Z + */ + MCAPI ServerPlayerSleepManager(class gsl::not_null>); + /** + * @symbol ?registerOnPlayerWakeUp\@ServerPlayerSleepManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVPlayer\@\@\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerOnPlayerWakeUp(class std::function); + /** + * @symbol ?registerOnSleepingPlayerListUpdated\@ServerPlayerSleepManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEBUPlayerSleepStatus\@\@\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerOnSleepingPlayerListUpdated(class std::function); + /** + * @symbol ?registerOnWakeUpAllPlayers\@ServerPlayerSleepManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXXZ\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerOnWakeUpAllPlayers(class std::function); + /** + * @symbol ?setShouldSendSleepMessage\@ServerPlayerSleepManager\@\@QEAAX_N\@Z + */ + MCAPI void setShouldSendSleepMessage(bool); + /** + * @symbol ?shouldSendSleepMessage\@ServerPlayerSleepManager\@\@QEBA_NXZ + */ + MCAPI bool shouldSendSleepMessage() const; + /** + * @symbol ?tickCheckToWakeUpPlayers\@ServerPlayerSleepManager\@\@QEAAXXZ + */ + MCAPI void tickCheckToWakeUpPlayers(); + +//private: + /** + * @symbol ?_awakenAllPlayers\@ServerPlayerSleepManager\@\@AEAAXXZ + */ + MCAPI void _awakenAllPlayers(); + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/ServerScriptDebugCommand.hpp b/LiteLoader/include/llapi/mc/ServerScriptDebugCommand.hpp index 79b5da08b5..ac1d002d8a 100644 --- a/LiteLoader/include/llapi/mc/ServerScriptDebugCommand.hpp +++ b/LiteLoader/include/llapi/mc/ServerScriptDebugCommand.hpp @@ -34,7 +34,7 @@ class ServerScriptDebugCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@ServerScriptDebugCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ServerStandInCauldronSystem.hpp b/LiteLoader/include/llapi/mc/ServerStandInCauldronSystem.hpp index 5d452f46b4..46ad8e0017 100644 --- a/LiteLoader/include/llapi/mc/ServerStandInCauldronSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerStandInCauldronSystem.hpp @@ -31,6 +31,10 @@ class ServerStandInCauldronSystem { * @symbol ?_checkInsideCauldron\@ServerStandInCauldronSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _checkInsideCauldron(class StrictEntityContext &, class ActorOwnerComponent &); + /** + * @symbol ?_tickSystem\@ServerStandInCauldronSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UUpdateWaterStateRequestComponent\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void _tickSystem(class ViewT, class ActorOwnerComponent>); /** * @symbol ?createSystem\@ServerStandInCauldronSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp b/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp index f09129c528..6187b301b1 100644 --- a/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp +++ b/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp @@ -60,13 +60,13 @@ class ServerToClientHandshakePacket : public Packet { */ MCVAPI ~ServerToClientHandshakePacket(); #endif - /** - * @symbol ??0ServerToClientHandshakePacket\@\@QEAA\@XZ - */ - MCAPI ServerToClientHandshakePacket(); /** * @symbol ??0ServerToClientHandshakePacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI ServerToClientHandshakePacket(std::string const &); + /** + * @symbol ??0ServerToClientHandshakePacket\@\@QEAA\@XZ + */ + MCAPI ServerToClientHandshakePacket(); }; diff --git a/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp b/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp index 1fda1340d7..b70819336f 100644 --- a/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp @@ -60,13 +60,13 @@ class SetActorDataPacket : public Packet { */ MCVAPI ~SetActorDataPacket(); #endif - /** - * @symbol ??0SetActorDataPacket\@\@QEAA\@XZ - */ - MCAPI SetActorDataPacket(); /** * @symbol ??0SetActorDataPacket\@\@QEAA\@VActorRuntimeID\@\@AEAVSynchedActorDataEntityWrapper\@\@PEAVPropertyComponent\@\@_K_N\@Z */ MCAPI SetActorDataPacket(class ActorRuntimeID, class SynchedActorDataEntityWrapper &, class PropertyComponent *, unsigned __int64, bool); + /** + * @symbol ??0SetActorDataPacket\@\@QEAA\@XZ + */ + MCAPI SetActorDataPacket(); }; diff --git a/LiteLoader/include/llapi/mc/SetActorLinkPacketSystemImpl.hpp b/LiteLoader/include/llapi/mc/SetActorLinkPacketSystemImpl.hpp index 250f623d44..0d9c816e06 100644 --- a/LiteLoader/include/llapi/mc/SetActorLinkPacketSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/SetActorLinkPacketSystemImpl.hpp @@ -31,5 +31,9 @@ class SetActorLinkPacketSystemImpl { * @symbol ?_setActorLinkPacketSystem\@SetActorLinkPacketSystemImpl\@\@SAXAEAVStrictEntityContext\@\@AEBUActorUniqueIDComponent\@\@AEBURemovePassengersComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UPassengerInitiatedFlag\@\@\@\@\@\@AEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorUniqueIDComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@\@Z */ MCAPI static void _setActorLinkPacketSystem(class StrictEntityContext &, struct ActorUniqueIDComponent const &, struct RemovePassengersComponent const &, class Optional const>, class Optional const>, class ViewT &, class EntityModifierT); + /** + * @symbol ?setActorLinkPacketSystem\@SetActorLinkPacketSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Exclude\@V?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@$$CBUActorUniqueIDComponent\@\@$$CBURemovePassengersComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UPassengerInitiatedFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorUniqueIDComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@\@Z + */ + MCAPI static void setActorLinkPacketSystem(class ViewT>, struct ActorUniqueIDComponent const, struct RemovePassengersComponent const, class Optional const>, class Optional const>>, class ViewT, class EntityModifierT); }; diff --git a/LiteLoader/include/llapi/mc/SetBlockCommand.hpp b/LiteLoader/include/llapi/mc/SetBlockCommand.hpp index ec1c9b4cdb..d620b57e91 100644 --- a/LiteLoader/include/llapi/mc/SetBlockCommand.hpp +++ b/LiteLoader/include/llapi/mc/SetBlockCommand.hpp @@ -36,7 +36,7 @@ class SetBlockCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@SetBlockCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/SetItemCountFunction.hpp b/LiteLoader/include/llapi/mc/SetItemCountFunction.hpp index 874f790362..b3bf3063d7 100644 --- a/LiteLoader/include/llapi/mc/SetItemCountFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetItemCountFunction.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #include "LootItemFunction.hpp" #define BEFORE_EXTRA @@ -46,9 +45,5 @@ class SetItemCountFunction : public LootItemFunction { * @symbol ?apply\@SetItemCountFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); - /** - * @symbol ?deserialize\@SetItemCountFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); }; diff --git a/LiteLoader/include/llapi/mc/SetMaxPlayersCommand.hpp b/LiteLoader/include/llapi/mc/SetMaxPlayersCommand.hpp index 5d824d84e9..935ef16d5d 100644 --- a/LiteLoader/include/llapi/mc/SetMaxPlayersCommand.hpp +++ b/LiteLoader/include/llapi/mc/SetMaxPlayersCommand.hpp @@ -36,7 +36,7 @@ class SetMaxPlayersCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@SetMaxPlayersCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/SetPreviousPositionSystem.hpp b/LiteLoader/include/llapi/mc/SetPreviousPositionSystem.hpp index 7578fa7ea5..b93cefb00d 100644 --- a/LiteLoader/include/llapi/mc/SetPreviousPositionSystem.hpp +++ b/LiteLoader/include/llapi/mc/SetPreviousPositionSystem.hpp @@ -37,6 +37,10 @@ class SetPreviousPositionSystem { * @symbol ?_doSetPreviousPositionSystem\@SetPreviousPositionSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUStateVectorComponent\@\@\@Z */ MCAPI static void _doSetPreviousPositionSystem(class StrictEntityContext const &, struct StateVectorComponent &); + /** + * @symbol ?_tickSetPreviousPositionSystem\@SetPreviousPositionSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UNeedSetPreviousPosition\@\@\@\@\@\@UStateVectorComponent\@\@\@\@\@Z + */ + MCAPI static void _tickSetPreviousPositionSystem(class ViewT, class FlagComponent>, struct StateVectorComponent>); private: diff --git a/LiteLoader/include/llapi/mc/SetPreviousWalkDistSystem.hpp b/LiteLoader/include/llapi/mc/SetPreviousWalkDistSystem.hpp index e47ba618d5..8f0e28eea3 100644 --- a/LiteLoader/include/llapi/mc/SetPreviousWalkDistSystem.hpp +++ b/LiteLoader/include/llapi/mc/SetPreviousWalkDistSystem.hpp @@ -29,4 +29,12 @@ class SetPreviousWalkDistSystem { */ MCAPI static struct TickingSystemWithInfo createSystem(); +//private: + /** + * @symbol ?_tickWalkDistPrevSystem\@SetPreviousWalkDistSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUWalkDistComponent\@\@UWalkDistPrevComponent\@\@\@\@\@Z + */ + MCAPI static void _tickWalkDistPrevSystem(class ViewT>, struct WalkDistComponent const, struct WalkDistPrevComponent>); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/SetScorePacket.hpp b/LiteLoader/include/llapi/mc/SetScorePacket.hpp index a853fe7edf..4a7528a4c4 100644 --- a/LiteLoader/include/llapi/mc/SetScorePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetScorePacket.hpp @@ -61,14 +61,14 @@ class SetScorePacket : public Packet { */ MCVAPI ~SetScorePacket(); #endif - /** - * @symbol ?change\@SetScorePacket\@\@SA?AV1\@AEBUScoreboardId\@\@AEBVObjective\@\@\@Z - */ - MCAPI static class SetScorePacket change(struct ScoreboardId const &, class Objective const &); /** * @symbol ?change\@SetScorePacket\@\@SA?AV1\@V?$vector\@UScorePacketInfo\@\@V?$allocator\@UScorePacketInfo\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static class SetScorePacket change(std::vector); + /** + * @symbol ?change\@SetScorePacket\@\@SA?AV1\@AEBUScoreboardId\@\@AEBVObjective\@\@\@Z + */ + MCAPI static class SetScorePacket change(struct ScoreboardId const &, class Objective const &); /** * @symbol ?remove\@SetScorePacket\@\@SA?AV1\@AEBUScoreboardId\@\@AEBVObjective\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp b/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp index d685ae3552..08742665c2 100644 --- a/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp @@ -60,14 +60,14 @@ class SetSpawnPositionPacket : public Packet { */ MCVAPI ~SetSpawnPositionPacket(); #endif - /** - * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@W4SpawnPositionType\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI SetSpawnPositionPacket(enum class SpawnPositionType, class AutomaticID, class BlockPos const &); /** * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@1\@Z */ MCAPI SetSpawnPositionPacket(class AutomaticID, class BlockPos const &, class BlockPos const &); + /** + * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@W4SpawnPositionType\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI SetSpawnPositionPacket(enum class SpawnPositionType, class AutomaticID, class BlockPos const &); /** * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SetTitlePacket.hpp b/LiteLoader/include/llapi/mc/SetTitlePacket.hpp index 2c7e7ef2de..59672bf0a6 100644 --- a/LiteLoader/include/llapi/mc/SetTitlePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetTitlePacket.hpp @@ -61,10 +61,6 @@ enum class TitleType; */ MCVAPI ~SetTitlePacket(); #endif - /** - * @symbol ??0SetTitlePacket\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI SetTitlePacket(class SetTitlePacket const &); /** * @symbol ??0SetTitlePacket\@\@QEAA\@XZ */ @@ -77,6 +73,10 @@ enum class TitleType; * @symbol ??0SetTitlePacket\@\@QEAA\@HHH\@Z */ MCAPI SetTitlePacket(int, int, int); + /** + * @symbol ??0SetTitlePacket\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI SetTitlePacket(class SetTitlePacket const &); /** * @symbol ??0SetTitlePacket\@\@QEAA\@W4TitleType\@0\@AEBVResolvedTextObject\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SetWorldSpawnCommand.hpp b/LiteLoader/include/llapi/mc/SetWorldSpawnCommand.hpp index cb5178f9fc..7e3f4fb685 100644 --- a/LiteLoader/include/llapi/mc/SetWorldSpawnCommand.hpp +++ b/LiteLoader/include/llapi/mc/SetWorldSpawnCommand.hpp @@ -36,7 +36,7 @@ class SetWorldSpawnCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@SetWorldSpawnCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/SettingsScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/SettingsScreenCapabilities.hpp index 5d1e0df428..f818a7b99a 100644 --- a/LiteLoader/include/llapi/mc/SettingsScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/SettingsScreenCapabilities.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -24,6 +25,7 @@ struct SettingsScreenCapabilities { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SETTINGSSCREENCAPABILITIES public: struct SettingsScreenCapabilities& operator=(struct SettingsScreenCapabilities const &) = delete; + SettingsScreenCapabilities(struct SettingsScreenCapabilities const &) = delete; SettingsScreenCapabilities() = delete; #endif @@ -35,18 +37,14 @@ struct SettingsScreenCapabilities { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@USettingsScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @symbol ?isOfType\@?$TypedScreenCapabilities\@USettingsScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@Bedrock\@\@\@Z */ - virtual bool isOfType(class typeid_t) const; + virtual bool isOfType(class Bedrock::typeid_t) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETTINGSSCREENCAPABILITIES /** * @symbol __unk_destructor_-1 */ MCVAPI ~SettingsScreenCapabilities(); #endif - /** - * @symbol ??0SettingsScreenCapabilities\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI SettingsScreenCapabilities(struct SettingsScreenCapabilities const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ShapedChemistryRecipe.hpp b/LiteLoader/include/llapi/mc/ShapedChemistryRecipe.hpp index 3442f517db..45a3e9f29a 100644 --- a/LiteLoader/include/llapi/mc/ShapedChemistryRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapedChemistryRecipe.hpp @@ -35,6 +35,11 @@ class ShapedChemistryRecipe : public ShapedRecipe { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); + /** + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); /** * @vftbl 6 * @symbol ?matches\@ShapedChemistryRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/ShapedRecipe.hpp b/LiteLoader/include/llapi/mc/ShapedRecipe.hpp index c623a700cf..0ab29d33eb 100644 --- a/LiteLoader/include/llapi/mc/ShapedRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapedRecipe.hpp @@ -37,9 +37,9 @@ class ShapedRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@ShapedRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @symbol ?assemble\@ShapedRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &) const; + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@ShapedRecipe\@\@UEBAHXZ @@ -57,9 +57,9 @@ class ShapedRecipe : public Recipe { virtual std::vector const & getResultItem() const; /** * @vftbl 5 - * @symbol ?isShapeless\@ShapedRecipe\@\@UEBA_NXZ + * @symbol __unk_vfn_5 */ - virtual bool isShapeless() const; + virtual void __unk_vfn_5(); /** * @vftbl 6 * @symbol ?matches\@ShapedRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z @@ -71,11 +71,15 @@ class ShapedRecipe : public Recipe { */ virtual int size() const; /** - * @vftbl 14 + * @vftbl 15 * @symbol ?loadResultList\@ShapedRecipe\@\@UEBAXAEBVBlockPalette\@\@\@Z */ virtual void loadResultList(class BlockPalette const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SHAPEDRECIPE + /** + * @symbol ?isShapeless\@ShapedRecipe\@\@UEBA_NXZ + */ + MCVAPI bool isShapeless() const; /** * @symbol __unk_destructor_-1 */ @@ -85,10 +89,6 @@ class ShapedRecipe : public Recipe { * @symbol ??0ShapedRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z */ MCAPI ShapedRecipe(class std::basic_string_view>, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional); - /** - * @symbol ?generateUUID\@ShapedRecipe\@\@QEAAXXZ - */ - MCAPI void generateUUID(); /** * @symbol ?getIngredientsHashOffset\@ShapedRecipe\@\@QEBA_KHHHH\@Z */ diff --git a/LiteLoader/include/llapi/mc/ShapelessChemistryRecipe.hpp b/LiteLoader/include/llapi/mc/ShapelessChemistryRecipe.hpp index 09e3642932..fed01add9f 100644 --- a/LiteLoader/include/llapi/mc/ShapelessChemistryRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapelessChemistryRecipe.hpp @@ -35,6 +35,11 @@ class ShapelessChemistryRecipe : public ShapelessRecipe { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); + /** + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); /** * @vftbl 6 * @symbol ?matches\@ShapelessChemistryRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp b/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp index 3e4d0af16b..4ec27c9f01 100644 --- a/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp @@ -37,9 +37,9 @@ class ShapelessRecipe : public Recipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@ShapelessRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @symbol ?assemble\@ShapelessRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &) const; + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; /** * @vftbl 2 * @symbol ?getCraftingSize\@ShapelessRecipe\@\@UEBAHXZ @@ -57,9 +57,9 @@ class ShapelessRecipe : public Recipe { virtual std::vector const & getResultItem() const; /** * @vftbl 5 - * @symbol ?isShapeless\@ShapelessRecipe\@\@UEBA_NXZ + * @symbol __unk_vfn_5 */ - virtual bool isShapeless() const; + virtual void __unk_vfn_5(); /** * @vftbl 6 * @symbol ?matches\@ShapelessRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z @@ -71,11 +71,15 @@ class ShapelessRecipe : public Recipe { */ virtual int size() const; /** - * @vftbl 14 + * @vftbl 15 * @symbol ?loadResultList\@ShapelessRecipe\@\@UEBAXAEBVBlockPalette\@\@\@Z */ virtual void loadResultList(class BlockPalette const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SHAPELESSRECIPE + /** + * @symbol ?isShapeless\@ShapelessRecipe\@\@UEBA_NXZ + */ + MCVAPI bool isShapeless() const; /** * @symbol __unk_destructor_-1 */ @@ -85,9 +89,5 @@ class ShapelessRecipe : public Recipe { * @symbol ??0ShapelessRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z */ MCAPI ShapelessRecipe(class std::basic_string_view>, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional); - /** - * @symbol ?generateUUID\@ShapelessRecipe\@\@QEAAXXZ - */ - MCAPI void generateUUID(); }; diff --git a/LiteLoader/include/llapi/mc/ShareableComponent.hpp b/LiteLoader/include/llapi/mc/ShareableComponent.hpp index 2fbf255d43..056997c9d2 100644 --- a/LiteLoader/include/llapi/mc/ShareableComponent.hpp +++ b/LiteLoader/include/llapi/mc/ShareableComponent.hpp @@ -29,26 +29,26 @@ class ShareableComponent { #endif public: - /** - * @symbol ?getCountToPickUp\@ShareableComponent\@\@QEBAHAEBVActor\@\@AEBVItemActor\@\@\@Z - */ - MCAPI int getCountToPickUp(class Actor const &, class ItemActor const &) const; /** * @symbol ?getCountToPickUp\@ShareableComponent\@\@QEBAHAEBVActor\@\@AEBVItemStack\@\@\@Z */ MCAPI int getCountToPickUp(class Actor const &, class ItemStack const &) const; /** - * @symbol ?getSlotToSwap\@ShareableComponent\@\@QEBAHAEAVActor\@\@AEBVItemActor\@\@\@Z + * @symbol ?getCountToPickUp\@ShareableComponent\@\@QEBAHAEBVActor\@\@AEBVItemActor\@\@\@Z */ - MCAPI int getSlotToSwap(class Actor &, class ItemActor const &) const; + MCAPI int getCountToPickUp(class Actor const &, class ItemActor const &) const; /** - * @symbol ?hasSurplus\@ShareableComponent\@\@QEBAHAEAVActor\@\@AEBVItemStack\@\@AEAV3\@_N\@Z + * @symbol ?getSlotToSwap\@ShareableComponent\@\@QEBAHAEAVActor\@\@AEBVItemActor\@\@\@Z */ - MCAPI int hasSurplus(class Actor &, class ItemStack const &, class ItemStack &, bool) const; + MCAPI int getSlotToSwap(class Actor &, class ItemActor const &) const; /** * @symbol ?hasSurplus\@ShareableComponent\@\@QEBAHAEAVActor\@\@AEBVItemStack\@\@_N\@Z */ MCAPI int hasSurplus(class Actor &, class ItemStack const &, bool) const; + /** + * @symbol ?hasSurplus\@ShareableComponent\@\@QEBAHAEAVActor\@\@AEBVItemStack\@\@AEAV3\@_N\@Z + */ + MCAPI int hasSurplus(class Actor &, class ItemStack const &, class ItemStack &, bool) const; /** * @symbol ?itemBelongsInInventory\@ShareableComponent\@\@QEBA_NAEAVActor\@\@AEBVItemStack\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/ShearsItem.hpp b/LiteLoader/include/llapi/mc/ShearsItem.hpp index 47a8247c15..6c4b09ae2b 100644 --- a/LiteLoader/include/llapi/mc/ShearsItem.hpp +++ b/LiteLoader/include/llapi/mc/ShearsItem.hpp @@ -133,9 +133,9 @@ class ShearsItem : public Item { virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; /** * @vftbl 132 - * @symbol ?_useOn\@ShearsItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@ShearsItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0ShearsItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/SheepPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/SheepPreAIStepSystem.hpp index 86ffc20f60..544a2cf8ef 100644 --- a/LiteLoader/include/llapi/mc/SheepPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/SheepPreAIStepSystem.hpp @@ -37,6 +37,10 @@ class SheepPreAIStepSystem { * @symbol ?_doSheepPreAIStepSystem\@SheepPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doSheepPreAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); + /** + * @symbol ?_tickSheepPreAIStepSystem\@SheepPreAIStepSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@USheepFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void _tickSheepPreAIStepSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>); private: diff --git a/LiteLoader/include/llapi/mc/ShieldItem.hpp b/LiteLoader/include/llapi/mc/ShieldItem.hpp index 360dbf9114..b8de4b3601 100644 --- a/LiteLoader/include/llapi/mc/ShieldItem.hpp +++ b/LiteLoader/include/llapi/mc/ShieldItem.hpp @@ -71,6 +71,11 @@ class ShieldItem : public Item { * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); + /** + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@ShieldItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + */ + virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** * @vftbl 61 * @symbol ?isValidRepairItem\@ShieldItem\@\@UEBA_NAEBVItemStackBase\@\@0AEBVBaseGameVersion\@\@\@Z @@ -131,6 +136,11 @@ class ShieldItem : public Item { * @symbol ?hurtActor\@ShieldItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; + /** + * @vftbl 95 + * @symbol ?buildDescriptionId\@ShieldItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + */ + virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** * @vftbl 98 * @symbol ?readUserData\@ShieldItem\@\@UEBAXAEAVItemStackBase\@\@AEAVIDataInput\@\@AEAVReadOnlyBinaryStream\@\@\@Z @@ -186,6 +196,10 @@ class ShieldItem : public Item { * @symbol ?IN_HAND_BLOCK_DURATION\@ShieldItem\@\@2HB */ MCAPI static int const IN_HAND_BLOCK_DURATION; + /** + * @symbol ?NO_SHIELD_PATTERN\@ShieldItem\@\@2HB + */ + MCAPI static int const NO_SHIELD_PATTERN; /** * @symbol ?TIMESTAMP_TAG\@ShieldItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/ShieldRecipe.hpp b/LiteLoader/include/llapi/mc/ShieldRecipe.hpp new file mode 100644 index 0000000000..ea00a861f0 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ShieldRecipe.hpp @@ -0,0 +1,83 @@ +/** + * @file ShieldRecipe.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Recipe.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ShieldRecipe : public Recipe { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SHIELDRECIPE +public: + class ShieldRecipe& operator=(class ShieldRecipe const &) = delete; + ShieldRecipe(class ShieldRecipe const &) = delete; + ShieldRecipe() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?assemble\@ShieldRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + */ + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + /** + * @vftbl 2 + * @symbol ?getCraftingSize\@ShieldRecipe\@\@UEBAHXZ + */ + virtual int getCraftingSize() const; + /** + * @vftbl 3 + * @symbol ?getIngredient\@ShieldRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z + */ + virtual class RecipeIngredient const & getIngredient(int, int) const; + /** + * @vftbl 4 + * @symbol ?getResultItem\@ShieldRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ + */ + virtual std::vector const & getResultItem() const; + /** + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 + * @symbol ?matches\@ShieldRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + */ + virtual bool matches(class CraftingContainer &, class Level &) const; + /** + * @vftbl 7 + * @symbol ?size\@ShieldRecipe\@\@UEBAHXZ + */ + virtual int size() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SHIELDRECIPE + /** + * @symbol ?isShapeless\@ShieldRecipe\@\@UEBA_NXZ + */ + MCVAPI bool isShapeless() const; +#endif + /** + * @symbol ??0ShieldRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@PEBVUUID\@mce\@\@\@Z + */ + MCAPI ShieldRecipe(class std::basic_string_view>, class mce::UUID const *); + /** + * @symbol ?ID\@ShieldRecipe\@\@2VUUID\@mce\@\@A + */ + MCAPI static class mce::UUID ID; + +}; diff --git a/LiteLoader/include/llapi/mc/ShortTag.hpp b/LiteLoader/include/llapi/mc/ShortTag.hpp index ace2cf27df..606d984148 100644 --- a/LiteLoader/include/llapi/mc/ShortTag.hpp +++ b/LiteLoader/include/llapi/mc/ShortTag.hpp @@ -35,6 +35,7 @@ short val; public: class ShortTag& operator=(class ShortTag const &) = delete; ShortTag(class ShortTag const &) = delete; + ShortTag() = delete; #endif public: @@ -78,10 +79,6 @@ short val; * @symbol ?hash\@ShortTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; - /** - * @symbol ??0ShortTag\@\@QEAA\@XZ - */ - MCAPI ShortTag(); /** * @symbol ??0ShortTag\@\@QEAA\@F\@Z */ diff --git a/LiteLoader/include/llapi/mc/ShovelItem.hpp b/LiteLoader/include/llapi/mc/ShovelItem.hpp index c9ba430288..4e2385bc1b 100644 --- a/LiteLoader/include/llapi/mc/ShovelItem.hpp +++ b/LiteLoader/include/llapi/mc/ShovelItem.hpp @@ -119,9 +119,9 @@ class ShovelItem : public DiggerItem { virtual void __unk_vfn_80(); /** * @vftbl 132 - * @symbol ?_useOn\@ShovelItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@ShovelItem\@\@MEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0ShovelItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVTier\@Item\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp b/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp index cfc3b13602..8405ad00bf 100644 --- a/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp +++ b/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp @@ -73,13 +73,13 @@ class ShowCreditsPacket : public Packet { */ MCVAPI ~ShowCreditsPacket(); #endif - /** - * @symbol ??0ShowCreditsPacket\@\@QEAA\@XZ - */ - MCAPI ShowCreditsPacket(); /** * @symbol ??0ShowCreditsPacket\@\@QEAA\@VActorRuntimeID\@\@W4CreditsState\@0\@\@Z */ MCAPI ShowCreditsPacket(class ActorRuntimeID, enum class ShowCreditsPacket::CreditsState); + /** + * @symbol ??0ShowCreditsPacket\@\@QEAA\@XZ + */ + MCAPI ShowCreditsPacket(); }; diff --git a/LiteLoader/include/llapi/mc/Shulker.hpp b/LiteLoader/include/llapi/mc/Shulker.hpp index 561b8e84f7..ce59295ff6 100644 --- a/LiteLoader/include/llapi/mc/Shulker.hpp +++ b/LiteLoader/include/llapi/mc/Shulker.hpp @@ -211,11 +211,6 @@ class Shulker : public Mob { * @symbol ?travel\@Shulker\@\@UEAAXMMM_N\@Z */ virtual void travel(float, float, float, bool); - /** - * @vftbl 288 - * @symbol ?aiStep\@Shulker\@\@UEAAXXZ - */ - virtual void aiStep(); /** * @vftbl 293 * @symbol ?checkSpawnRules\@Shulker\@\@UEAA_N_N\@Z @@ -313,10 +308,6 @@ class Shulker : public Mob { * @symbol ?_peekAmountTick\@Shulker\@\@AEAAXXZ */ MCAPI void _peekAmountTick(); - /** - * @symbol ?_setAttachFace\@Shulker\@\@AEAAXE\@Z - */ - MCAPI void _setAttachFace(unsigned char); /** * @symbol ?_tryAttachingToNeighbouringFaces\@Shulker\@\@AEAA_NVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp index 53301bbc09..62bb21f554 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp @@ -176,35 +176,35 @@ class ShulkerBoxBlock : public UndyedShulkerBoxBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 134 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@ShulkerBoxBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@ShulkerBoxBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 138 + * @vftbl 139 * @symbol ?getColorForParticle\@ShulkerBoxBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColorForParticle(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,30 +216,35 @@ class ShulkerBoxBlock : public UndyedShulkerBoxBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@ShulkerBoxBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0ShulkerBoxBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp index 97783b34c8..4dd43550c2 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp @@ -37,11 +37,16 @@ class ShulkerBoxRecipe : public ShapelessRecipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@ShulkerBoxRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @symbol ?assemble\@ShulkerBoxRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &) const; + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; /** - * @vftbl 11 + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 12 * @symbol ?itemsMatch\@ShulkerBoxRecipe\@\@UEBA_NAEBVItemDescriptor\@\@0\@Z */ virtual bool itemsMatch(class ItemDescriptor const &, class ItemDescriptor const &) const; diff --git a/LiteLoader/include/llapi/mc/ShulkerPostAiStepSystem.hpp b/LiteLoader/include/llapi/mc/ShulkerPostAiStepSystem.hpp index 00401c956a..ae45566e7a 100644 --- a/LiteLoader/include/llapi/mc/ShulkerPostAiStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerPostAiStepSystem.hpp @@ -31,6 +31,10 @@ class ShulkerPostAiStepSystem { * @symbol ?createSystem\@ShulkerPostAiStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?tick\@ShulkerPostAiStepSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UShulkerFlag\@\@\@\@\@\@UActorRotationComponent\@\@UMobBodyRotationComponent\@\@UStateVectorComponent\@\@\@\@\@Z + */ + MCAPI static void tick(class ViewT, class FlagComponent>, struct ActorRotationComponent, struct MobBodyRotationComponent, struct StateVectorComponent>); //private: /** diff --git a/LiteLoader/include/llapi/mc/SideBySideExtractionSystem.hpp b/LiteLoader/include/llapi/mc/SideBySideExtractionSystem.hpp index 4fd190fa4e..254519a505 100644 --- a/LiteLoader/include/llapi/mc/SideBySideExtractionSystem.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideExtractionSystem.hpp @@ -39,9 +39,9 @@ class SideBySideExtractionSystem { */ virtual void registerEvents(class entt::basic_dispatcher> &); /** - * @symbol ??0SideBySideExtractionSystem\@\@QEAA\@AEBV?$array\@V?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@$0BJ\@\@std\@\@\@Z + * @symbol ??0SideBySideExtractionSystem\@\@QEAA\@AEBV?$array\@V?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@$0BE\@\@std\@\@\@Z */ - MCAPI SideBySideExtractionSystem(class std::array, 25> const &); + MCAPI SideBySideExtractionSystem(class std::array, 20> const &); /** * @symbol ?_onSideBySideExtractionRequest\@SideBySideExtractionSystem\@\@SAXAEBUExtractMethods\@SideBySide\@\@AEBUOnExtractSideBySide\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SideBySideLevelSystem.hpp b/LiteLoader/include/llapi/mc/SideBySideLevelSystem.hpp new file mode 100644 index 0000000000..291f9f5974 --- /dev/null +++ b/LiteLoader/include/llapi/mc/SideBySideLevelSystem.hpp @@ -0,0 +1,36 @@ +/** + * @file SideBySideLevelSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class SideBySideLevelSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDELEVELSYSTEM +public: + class SideBySideLevelSystem& operator=(class SideBySideLevelSystem const &) = delete; + SideBySideLevelSystem(class SideBySideLevelSystem const &) = delete; + SideBySideLevelSystem() = delete; +#endif + +public: + /** + * @symbol ?emptyEventingRequests\@SideBySideLevelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo emptyEventingRequests(); + /** + * @symbol ?emptySoundRequests\@SideBySideLevelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo emptySoundRequests(); + +}; diff --git a/LiteLoader/include/llapi/mc/SideBySideResultComponent.hpp b/LiteLoader/include/llapi/mc/SideBySideResultComponent.hpp index a68dc219a1..66037d0c5b 100644 --- a/LiteLoader/include/llapi/mc/SideBySideResultComponent.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideResultComponent.hpp @@ -31,9 +31,5 @@ struct SideBySideResultComponent { * @symbol ??4SideBySideResultComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct SideBySideResultComponent & operator=(struct SideBySideResultComponent &&); - /** - * @symbol ??1SideBySideResultComponent\@\@QEAA\@XZ - */ - MCAPI ~SideBySideResultComponent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp b/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp index 9059c66465..b41d5e1bfb 100644 --- a/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp @@ -56,17 +56,17 @@ class SideBySideTrigger { */ MCAPI static void storeSideBySideResult(class Actor &, enum class SideBySideExtractionId, struct SideBySideResult); /** - * @symbol ?tryRecordBlockSource\@SideBySideTrigger\@\@SA?AVConditionalRecordingConstBlockSource\@\@_NV?$not_null\@PEBVIConstBlockSource\@\@\@gsl\@\@\@Z + * @symbol ?tryRecordBlockSource\@SideBySideTrigger\@\@SA?AVConditionalRecordingConstBlockSource\@\@_NV?$not_null\@PEBVIConstBlockSource\@\@\@gsl\@\@AEAUIActorMovementProxy\@\@\@Z */ - MCAPI static class ConditionalRecordingConstBlockSource tryRecordBlockSource(bool, class gsl::not_null); - /** - * @symbol ?tryTrigger\@SideBySideTrigger\@\@SA_NAEAVActor\@\@W4SideBySideExtractionId\@\@W4SideBySideExtractionStep\@\@\@Z - */ - MCAPI static bool tryTrigger(class Actor &, enum class SideBySideExtractionId, enum class SideBySideExtractionStep); + MCAPI static class ConditionalRecordingConstBlockSource tryRecordBlockSource(bool, class gsl::not_null, struct IActorMovementProxy &); /** * @symbol ?tryTrigger\@SideBySideTrigger\@\@SA_NAEAUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@W4SideBySideExtractionStep\@\@\@Z */ MCAPI static bool tryTrigger(struct IActorMovementProxy &, enum class SideBySideExtractionId, enum class SideBySideExtractionStep); + /** + * @symbol ?tryTrigger\@SideBySideTrigger\@\@SA_NAEAVActor\@\@W4SideBySideExtractionId\@\@W4SideBySideExtractionStep\@\@\@Z + */ + MCAPI static bool tryTrigger(class Actor &, enum class SideBySideExtractionId, enum class SideBySideExtractionStep); /** * @symbol ?tryTriggerCurrentPostSimulation\@SideBySideTrigger\@\@SA_NAEAUIActorMovementProxy\@\@V?$optional\@W4SideBySideExtractionId\@\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SideBySideValidationFailureComponent.hpp b/LiteLoader/include/llapi/mc/SideBySideValidationFailureComponent.hpp deleted file mode 100644 index 7b219547c6..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideValidationFailureComponent.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file SideBySideValidationFailureComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure SideBySideValidationFailureComponent. - * - */ -struct SideBySideValidationFailureComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDEVALIDATIONFAILURECOMPONENT -public: - struct SideBySideValidationFailureComponent& operator=(struct SideBySideValidationFailureComponent const &) = delete; - SideBySideValidationFailureComponent(struct SideBySideValidationFailureComponent const &) = delete; - SideBySideValidationFailureComponent() = delete; -#endif - -public: - /** - * @symbol ??1SideBySideValidationFailureComponent\@\@QEAA\@XZ - */ - MCAPI ~SideBySideValidationFailureComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SignBlock.hpp b/LiteLoader/include/llapi/mc/SignBlock.hpp index 9145e87a81..9b68c6df36 100644 --- a/LiteLoader/include/llapi/mc/SignBlock.hpp +++ b/LiteLoader/include/llapi/mc/SignBlock.hpp @@ -202,25 +202,25 @@ class SignBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@SignBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 144 + * @symbol ?getVisualShape\@SignBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -232,57 +232,67 @@ class SignBlock : public ActorBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@SignBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@SignBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@SignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getEntityResourceItem\@SignBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; /** - * @vftbl 195 + * @vftbl 196 + * @symbol ?getYRotationInDegrees\@SignBlock\@\@UEBAMAEBVBlock\@\@\@Z + */ + virtual float getYRotationInDegrees(class Block const &) const; + /** + * @vftbl 197 * @symbol ?_canSurvive\@SignBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool _canSurvive(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 196 + * @vftbl 198 * @symbol ?_getItemInstance\@SignBlock\@\@MEBA?AVItemInstance\@\@XZ */ virtual class ItemInstance _getItemInstance() const; /** - * @vftbl 197 + * @vftbl 199 * @symbol ?_getShape\@SignBlock\@\@MEBAXHAEAVAABB\@\@\@Z */ virtual void _getShape(int, class AABB &) const; diff --git a/LiteLoader/include/llapi/mc/SignBlockActor.hpp b/LiteLoader/include/llapi/mc/SignBlockActor.hpp index 607b92149b..d07f0a2448 100644 --- a/LiteLoader/include/llapi/mc/SignBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SignBlockActor.hpp @@ -47,6 +47,11 @@ enum class SignType; * @symbol ?save\@SignBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; + /** + * @vftbl 7 + * @symbol ?tick\@SignBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + */ + virtual void tick(class BlockSource &); /** * @vftbl 8 * @symbol ?onChanged\@SignBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z @@ -112,6 +117,11 @@ enum class SignType; * @symbol ?_onUpdatePacket\@SignBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); + /** + * @vftbl 39 + * @symbol ?_playerCanUpdate\@SignBlockActor\@\@MEBA_NAEBVPlayer\@\@\@Z + */ + virtual bool _playerCanUpdate(class Player const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIGNBLOCKACTOR /** * @symbol __unk_destructor_-1 @@ -123,55 +133,71 @@ enum class SignType; */ MCAPI SignBlockActor(class BlockPos const &, enum class BlockActorType, std::string const &); /** - * @symbol ?getMessage\@SignBlockActor\@\@QEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getIsGlowing\@SignBlockActor\@\@QEBA_NW4SignTextSide\@\@\@Z + */ + MCAPI bool getIsGlowing(enum class SignTextSide) const; + /** + * @symbol ?getIsLockedForEditing\@SignBlockActor\@\@QEAA_NAEAVILevel\@\@\@Z + */ + MCAPI bool getIsLockedForEditing(class ILevel &); + /** + * @symbol ?getIsWaxed\@SignBlockActor\@\@QEBA_NXZ */ - MCAPI std::string const & getMessage(); + MCAPI bool getIsWaxed() const; /** - * @symbol ?getSignTextColor\@SignBlockActor\@\@QEBAAEBVColor\@mce\@\@XZ + * @symbol ?getMessage\@SignBlockActor\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4SignTextSide\@\@\@Z */ - MCAPI class mce::Color const & getSignTextColor() const; + MCAPI std::string const & getMessage(enum class SignTextSide) const; /** - * @symbol ?isBug471852Resolved\@SignBlockActor\@\@QEBA_NXZ + * @symbol ?getSideFacingPlayer\@SignBlockActor\@\@QEBA?AW4SignTextSide\@\@AEBVPlayer\@\@\@Z */ - MCAPI bool isBug471852Resolved() const; + MCAPI enum class SignTextSide getSideFacingPlayer(class Player const &) const; /** - * @symbol ?load\@SignBlockActor\@\@QEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@_N\@Z + * @symbol ?getSignTextColor\@SignBlockActor\@\@QEBAAEBVColor\@mce\@\@W4SignTextSide\@\@\@Z */ - MCAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &, bool); + MCAPI class mce::Color const & getSignTextColor(enum class SignTextSide) const; /** - * @symbol ?resolveBug471852\@SignBlockActor\@\@QEAAXXZ + * @symbol ?getTextObject\@SignBlockActor\@\@QEBAAEBVTextObjectRoot\@\@W4SignTextSide\@\@\@Z */ - MCAPI void resolveBug471852(); + MCAPI class TextObjectRoot const & getTextObject(enum class SignTextSide) const; /** - * @symbol ?setMessage\@SignBlockActor\@\@QEAAXVTextObjectRoot\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isStringMessage\@SignBlockActor\@\@QEBA_NW4SignTextSide\@\@\@Z */ - MCAPI void setMessage(class TextObjectRoot, std::string); + MCAPI bool isStringMessage(enum class SignTextSide) const; /** - * @symbol ?setMessage\@SignBlockActor\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?serverOnlySetIsLockedForEditing\@SignBlockActor\@\@QEAAXAEAVPlayer\@\@\@Z */ - MCAPI void setMessage(std::string, std::string); + MCAPI void serverOnlySetIsLockedForEditing(class Player &); /** - * @symbol ?setSignTextColor\@SignBlockActor\@\@QEAAXAEBVColor\@mce\@\@\@Z + * @symbol ?setIsGlowing\@SignBlockActor\@\@QEAAXW4SignTextSide\@\@_N\@Z */ - MCAPI void setSignTextColor(class mce::Color const &); + MCAPI void setIsGlowing(enum class SignTextSide, bool); /** - * @symbol ?setTextLocked\@SignBlockActor\@\@QEAAX_N\@Z + * @symbol ?setMessageForServerScripingOnly\@SignBlockActor\@\@QEAAXW4SignTextSide\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z */ - MCAPI void setTextLocked(bool); + MCAPI void setMessageForServerScripingOnly(enum class SignTextSide, std::string, std::string); + /** + * @symbol ?setMessageForServerScripingOnly\@SignBlockActor\@\@QEAAXW4SignTextSide\@\@VTextObjectRoot\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI void setMessageForServerScripingOnly(enum class SignTextSide, class TextObjectRoot, std::string); + /** + * @symbol ?setSignTextColor\@SignBlockActor\@\@QEAAXW4SignTextSide\@\@AEBVColor\@mce\@\@\@Z + */ + MCAPI void setSignTextColor(enum class SignTextSide, class mce::Color const &); /** * @symbol ?setType\@SignBlockActor\@\@QEAAXW4SignType\@1\@\@Z */ MCAPI void setType(enum class SignBlockActor::SignType); - -//private: /** - * @symbol ?_setMessage\@SignBlockActor\@\@AEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?setWaxed\@SignBlockActor\@\@QEAAXXZ */ - MCAPI void _setMessage(std::string, std::string); + MCAPI void setWaxed(); + +//private: /** - * @symbol ?_setMessage\@SignBlockActor\@\@AEAAXVTextObjectRoot\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_updateTextFromClient\@SignBlockActor\@\@AEAAXAEBVCompoundTag\@\@AEBVBlockSource\@\@\@Z */ - MCAPI void _setMessage(class TextObjectRoot, std::string); + MCAPI void _updateTextFromClient(class CompoundTag const &, class BlockSource const &); private: diff --git a/LiteLoader/include/llapi/mc/SignItem.hpp b/LiteLoader/include/llapi/mc/SignItem.hpp index 67dfe158d7..7969876ac2 100644 --- a/LiteLoader/include/llapi/mc/SignItem.hpp +++ b/LiteLoader/include/llapi/mc/SignItem.hpp @@ -109,9 +109,9 @@ class SignItem : public Item { virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** * @vftbl 132 - * @symbol ?_useOn\@SignItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@SignItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @vftbl 133 * @symbol ?getBlockToPlace\@SignItem\@\@MEBAPEBVBlock\@\@EAEBVActor\@\@VBlockPos\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/SimpleContainer.hpp b/LiteLoader/include/llapi/mc/SimpleContainer.hpp index 78fca46942..d0f340bbe4 100644 --- a/LiteLoader/include/llapi/mc/SimpleContainer.hpp +++ b/LiteLoader/include/llapi/mc/SimpleContainer.hpp @@ -46,46 +46,40 @@ class SimpleContainer : public Container { */ virtual class ItemStack const & getItem(int) const; /** - * @vftbl 9 + * @vftbl 10 * @symbol ?setItem\@SimpleContainer\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setItem(int, class ItemStack const &); /** - * @vftbl 14 + * @vftbl 15 * @symbol ?getContainerSize\@SimpleContainer\@\@UEBAHXZ */ virtual int getContainerSize() const; /** - * @vftbl 15 + * @vftbl 16 * @symbol ?getMaxStackSize\@SimpleContainer\@\@UEBAHXZ */ virtual int getMaxStackSize() const; /** - * @vftbl 16 + * @vftbl 17 * @symbol ?startOpen\@SimpleContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void startOpen(class Player &); /** - * @vftbl 17 + * @vftbl 18 * @symbol ?stopOpen\@SimpleContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void stopOpen(class Player &); - /** - * @vftbl 23 - * @symbol __unk_vfn_23 - */ - virtual void __unk_vfn_23(); /** * @vftbl 24 * @symbol __unk_vfn_24 */ virtual void __unk_vfn_24(); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIMPLECONTAINER /** - * @symbol __unk_destructor_-1 + * @vftbl 25 + * @symbol __unk_vfn_25 */ - MCVAPI ~SimpleContainer(); -#endif + virtual void __unk_vfn_25(); /** * @symbol ??0SimpleContainer\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NHW4ContainerType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SimplePlayerContainer.hpp b/LiteLoader/include/llapi/mc/SimplePlayerContainer.hpp index f28ff10870..e704ab996a 100644 --- a/LiteLoader/include/llapi/mc/SimplePlayerContainer.hpp +++ b/LiteLoader/include/llapi/mc/SimplePlayerContainer.hpp @@ -36,45 +36,20 @@ class SimplePlayerContainer : public SimpleContainer { */ virtual void __unk_vfn_0(); /** - * @vftbl 9 + * @vftbl 10 * @symbol ?setItem\@SimplePlayerContainer\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setItem(int, class ItemStack const &); - /** - * @vftbl 23 - * @symbol __unk_vfn_23 - */ - virtual void __unk_vfn_23(); /** * @vftbl 24 * @symbol __unk_vfn_24 */ virtual void __unk_vfn_24(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 - */ - virtual void __unk_vfn_34(); - /** - * @vftbl 35 - * @symbol __unk_vfn_35 - */ - virtual void __unk_vfn_35(); - /** - * @vftbl 36 - * @symbol __unk_vfn_36 - */ - virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); - /** - * @vftbl 38 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z + * @vftbl 25 + * @symbol __unk_vfn_25 */ - virtual void _Delete_this(bool); + virtual void __unk_vfn_25(); /** * @symbol ??0SimplePlayerContainer\@\@QEAA\@AEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NHW4ContainerType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SimplexNoise.hpp b/LiteLoader/include/llapi/mc/SimplexNoise.hpp index 80f9289749..848372b4f7 100644 --- a/LiteLoader/include/llapi/mc/SimplexNoise.hpp +++ b/LiteLoader/include/llapi/mc/SimplexNoise.hpp @@ -33,10 +33,6 @@ class SimplexNoise { * @symbol ??0SimplexNoise\@\@QEAA\@AEAVIRandom\@\@_N\@Z */ MCAPI SimplexNoise(class IRandom &, bool); - /** - * @symbol ?_add\@SimplexNoise\@\@QEBAXPEAMMMHHMMM\@Z - */ - MCAPI void _add(float *, float, float, int, int, float, float, float) const; /** * @symbol ?_getValue\@SimplexNoise\@\@QEBAMAEBVVec2\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp b/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp index 4d37424370..0ae41adc9d 100644 --- a/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp +++ b/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp @@ -8,6 +8,7 @@ #include "Actor.hpp" #include "Bedrock.hpp" #include "Editor.hpp" +#include "gametest.hpp" #include "ScriptModuleMinecraft.hpp" #include "ServerPlayer.hpp" @@ -234,11 +235,6 @@ class SimulatedPlayer : public ServerPlayer { * @symbol __unk_vfn_385 */ virtual void __unk_vfn_385(); - /** - * @vftbl 395 - * @symbol __unk_vfn_395 - */ - virtual void __unk_vfn_395(); /** * @vftbl 396 * @symbol __unk_vfn_396 @@ -280,17 +276,17 @@ class SimulatedPlayer : public ServerPlayer { */ virtual void __unk_vfn_436(); /** - * @vftbl 438 + * @vftbl 439 * @symbol ?_createChunkSource\@SimulatedPlayer\@\@MEAA?AV?$shared_ptr\@VChunkViewSource\@\@\@std\@\@AEAVChunkSource\@\@\@Z */ virtual class std::shared_ptr _createChunkSource(class ChunkSource &); /** - * @vftbl 442 + * @vftbl 443 * @symbol ?_getSpawnChunkLimit\@SimulatedPlayer\@\@MEBAHXZ */ virtual int _getSpawnChunkLimit() const; /** - * @vftbl 443 + * @vftbl 444 * @symbol ?_updateChunkPublisherView\@SimulatedPlayer\@\@MEAAXAEBVVec3\@\@M\@Z */ virtual void _updateChunkPublisherView(class Vec3 const &, float); @@ -345,17 +341,17 @@ class SimulatedPlayer : public ServerPlayer { */ MCAPI bool simulateGiveItem(class ItemStack &, bool); /** - * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NAEAVActor\@\@\@Z + * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NXZ */ - MCAPI bool simulateInteract(class Actor &); + MCAPI bool simulateInteract(); /** * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NAEBVBlockPos\@\@W4ScriptFacing\@ScriptModuleMinecraft\@\@\@Z */ MCAPI bool simulateInteract(class BlockPos const &, enum class ScriptModuleMinecraft::ScriptFacing); /** - * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NXZ + * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NAEAVActor\@\@\@Z */ - MCAPI bool simulateInteract(); + MCAPI bool simulateInteract(class Actor &); /** * @symbol ?simulateJump\@SimulatedPlayer\@\@QEAA_NXZ */ @@ -364,10 +360,6 @@ class SimulatedPlayer : public ServerPlayer { * @symbol ?simulateLocalMove\@SimulatedPlayer\@\@QEAAXAEBVVec3\@\@M\@Z */ MCAPI void simulateLocalMove(class Vec3 const &, float); - /** - * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEBVBlockPos\@\@\@Z - */ - MCAPI void simulateLookAt(class BlockPos const &); /** * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEAVActor\@\@\@Z */ @@ -376,6 +368,10 @@ class SimulatedPlayer : public ServerPlayer { * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void simulateLookAt(class Vec3 const &); + /** + * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEBVBlockPos\@\@\@Z + */ + MCAPI void simulateLookAt(class BlockPos const &); /** * @symbol ?simulateMoveToLocation\@SimulatedPlayer\@\@QEAAXAEBVVec3\@\@M\@Z */ diff --git a/LiteLoader/include/llapi/mc/SkinAdjustments.hpp b/LiteLoader/include/llapi/mc/SkinAdjustments.hpp deleted file mode 100644 index 7ccbedad47..0000000000 --- a/LiteLoader/include/llapi/mc/SkinAdjustments.hpp +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @file SkinAdjustments.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SkinAdjustments. - * - */ -class SkinAdjustments { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SKINADJUSTMENTS -public: - class SkinAdjustments& operator=(class SkinAdjustments const &) = delete; - SkinAdjustments(class SkinAdjustments const &) = delete; -#endif - -public: - /** - * @symbol ??0SkinAdjustments\@\@QEAA\@XZ - */ - MCAPI SkinAdjustments(); - -}; diff --git a/LiteLoader/include/llapi/mc/SkullBlock.hpp b/LiteLoader/include/llapi/mc/SkullBlock.hpp index 45295897e4..51e2fac5b1 100644 --- a/LiteLoader/include/llapi/mc/SkullBlock.hpp +++ b/LiteLoader/include/llapi/mc/SkullBlock.hpp @@ -187,9 +187,9 @@ class SkullBlock : public ActorBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@SkullBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@SkullBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,30 +206,30 @@ class SkullBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@SkullBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 143 + * @vftbl 144 * @symbol ?getVisualShape\@SkullBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -242,31 +242,36 @@ class SkullBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@SkullBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getEntityResourceItem\@SkullBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SkullItem.hpp b/LiteLoader/include/llapi/mc/SkullItem.hpp index f29fb56677..6dec289176 100644 --- a/LiteLoader/include/llapi/mc/SkullItem.hpp +++ b/LiteLoader/include/llapi/mc/SkullItem.hpp @@ -158,9 +158,9 @@ class SkullItem : public Item { virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** * @vftbl 132 - * @symbol ?_useOn\@SkullItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@SkullItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0SkullItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/SlabBlock.hpp b/LiteLoader/include/llapi/mc/SlabBlock.hpp index fa3f21857e..88c6c34c8a 100644 --- a/LiteLoader/include/llapi/mc/SlabBlock.hpp +++ b/LiteLoader/include/llapi/mc/SlabBlock.hpp @@ -197,9 +197,9 @@ class SlabBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@SlabBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@SlabBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 121 * @symbol ?getMobToSpawn\@SlabBlock\@\@UEBAPEBVMobSpawnerData\@\@AEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z @@ -221,25 +221,25 @@ class SlabBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@SlabBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 144 + * @symbol ?getVisualShape\@SlabBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -251,32 +251,37 @@ class SlabBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@SlabBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@SlabBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SlabBlockItem.hpp b/LiteLoader/include/llapi/mc/SlabBlockItem.hpp index 16a2924604..0f69d5d762 100644 --- a/LiteLoader/include/llapi/mc/SlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/SlabBlockItem.hpp @@ -108,9 +108,9 @@ class SlabBlockItem : public BlockItem { virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** * @vftbl 132 - * @symbol ?_useOn\@SlabBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@SlabBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** * @symbol ??0SlabBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/Slime.hpp b/LiteLoader/include/llapi/mc/Slime.hpp index 83ed5647f9..8e986ff70d 100644 --- a/LiteLoader/include/llapi/mc/Slime.hpp +++ b/LiteLoader/include/llapi/mc/Slime.hpp @@ -255,10 +255,6 @@ class Slime : public Monster { * @symbol ?getOldSquishValue\@Slime\@\@QEBAMXZ */ MCAPI float getOldSquishValue() const; - /** - * @symbol ?getSlimeSize\@Slime\@\@QEBAHXZ - */ - MCAPI int getSlimeSize() const; /** * @symbol ?getSquishValue\@Slime\@\@QEBAMXZ */ diff --git a/LiteLoader/include/llapi/mc/SlimeBlock.hpp b/LiteLoader/include/llapi/mc/SlimeBlock.hpp index 150f1bba51..3e9d20eb7f 100644 --- a/LiteLoader/include/llapi/mc/SlimeBlock.hpp +++ b/LiteLoader/include/llapi/mc/SlimeBlock.hpp @@ -181,25 +181,25 @@ class SlimeBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 164 - * @symbol ?onStandOn\@SlimeBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void onStandOn(class EntityContext &, class BlockPos const &) const; + virtual void __unk_vfn_157(); /** * @vftbl 165 - * @symbol __unk_vfn_165 + * @symbol ?onStandOn\@SlimeBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_165(); + virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,35 +211,40 @@ class SlimeBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 169 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 170 * @symbol ?onFallOn\@SlimeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 182 + * @vftbl 183 * @symbol ?getExtraRenderLayers\@SlimeBlock\@\@UEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SLIMEBLOCK /** * @symbol ?isBounceBlock\@SlimeBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/SlimePreNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/SlimePreNormalTickSystem.hpp index 12ddb8d3b0..6fe44479c7 100644 --- a/LiteLoader/include/llapi/mc/SlimePreNormalTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/SlimePreNormalTickSystem.hpp @@ -37,6 +37,10 @@ class SlimePreNormalTickSystem { * @symbol ?_doSlimePreNormalTickSystem\@SlimePreNormalTickSystem\@\@CAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@USlimeWasOnGroundPreNormalTick\@\@\@\@\@\@\@Z */ MCAPI static void _doSlimePreNormalTickSystem(class StrictEntityContext &, class ActorOwnerComponent &, class Optional const>, class EntityModifierT>); + /** + * @symbol ?_tickSlimePreNormalTickSystem\@SlimePreNormalTickSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@USlimeFlag\@\@\@\@\@\@VActorOwnerComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@USlimeWasOnGroundPreNormalTick\@\@\@\@\@\@\@Z + */ + MCAPI static void _tickSlimePreNormalTickSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent, class Optional const>>, class EntityModifierT>); private: diff --git a/LiteLoader/include/llapi/mc/SlotDescriptor.hpp b/LiteLoader/include/llapi/mc/SlotDescriptor.hpp index c235c0f277..2dd215ca51 100644 --- a/LiteLoader/include/llapi/mc/SlotDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/SlotDescriptor.hpp @@ -22,14 +22,14 @@ struct SlotDescriptor { #undef AFTER_EXTRA public: - /** - * @symbol ??0SlotDescriptor\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI SlotDescriptor(struct SlotDescriptor const &); /** * @symbol ??0SlotDescriptor\@\@QEAA\@XZ */ MCAPI SlotDescriptor(); + /** + * @symbol ??0SlotDescriptor\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI SlotDescriptor(struct SlotDescriptor const &); /** * @symbol ?addAcceptedItem\@SlotDescriptor\@\@QEAAXAEBVItemDescriptor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SmallDripleafBlock.hpp b/LiteLoader/include/llapi/mc/SmallDripleafBlock.hpp index c01cb2d84c..e2895009b2 100644 --- a/LiteLoader/include/llapi/mc/SmallDripleafBlock.hpp +++ b/LiteLoader/include/llapi/mc/SmallDripleafBlock.hpp @@ -202,9 +202,9 @@ class SmallDripleafBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@SmallDripleafBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@SmallDripleafBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -221,25 +221,25 @@ class SmallDripleafBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 152 - * @symbol ?init\@SmallDripleafBlock\@\@UEAAAEAVBlockLegacy\@\@XZ + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class BlockLegacy & init(); + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 153 + * @symbol ?init\@SmallDripleafBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ - virtual void __unk_vfn_156(); + virtual class BlockLegacy & init(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -252,46 +252,51 @@ class SmallDripleafBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@SmallDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@SmallDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@SmallDripleafBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@SmallDripleafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp b/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp index f9995a6a05..c1df7c3f1f 100644 --- a/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp @@ -176,20 +176,20 @@ class SmithingTableBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,30 +201,35 @@ class SmithingTableBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 * @symbol ?use\@SmithingTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SMITHINGTABLEBLOCK /** * @symbol ?isCraftingBlock\@SmithingTableBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/SmithingTableContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/SmithingTableContainerManagerModel.hpp index 1b0577bb68..6eeb82c0c7 100644 --- a/LiteLoader/include/llapi/mc/SmithingTableContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTableContainerManagerModel.hpp @@ -86,5 +86,9 @@ class SmithingTableContainerManagerModel : public ContainerManagerModel { * @symbol ?RESULT_SLOT\@SmithingTableContainerManagerModel\@\@2HB */ MCAPI static int const RESULT_SLOT; + /** + * @symbol ?TEMPLATE_SLOT\@SmithingTableContainerManagerModel\@\@2HB + */ + MCAPI static int const TEMPLATE_SLOT; }; diff --git a/LiteLoader/include/llapi/mc/SmithingTableInputContainerValidation.hpp b/LiteLoader/include/llapi/mc/SmithingTableInputContainerValidation.hpp index 386392c2f4..e9cc082217 100644 --- a/LiteLoader/include/llapi/mc/SmithingTableInputContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTableInputContainerValidation.hpp @@ -42,9 +42,9 @@ class SmithingTableInputContainerValidation : public ContainerValidationBase { virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** * @vftbl 2 - * @symbol __unk_vfn_2 + * @symbol ?isItemAllowedInSlot\@SmithingTableInputContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ - virtual void __unk_vfn_2(); + virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** * @vftbl 3 * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/SmithingTableMaterialContainerValidation.hpp b/LiteLoader/include/llapi/mc/SmithingTableMaterialContainerValidation.hpp index 5bc0a3e1d6..2e0c6c490f 100644 --- a/LiteLoader/include/llapi/mc/SmithingTableMaterialContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTableMaterialContainerValidation.hpp @@ -42,9 +42,9 @@ class SmithingTableMaterialContainerValidation : public ContainerValidationBase virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** * @vftbl 2 - * @symbol __unk_vfn_2 + * @symbol ?isItemAllowedInSlot\@SmithingTableMaterialContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ - virtual void __unk_vfn_2(); + virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** * @vftbl 3 * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/SmithingTableTemplateContainerValidation.hpp b/LiteLoader/include/llapi/mc/SmithingTableTemplateContainerValidation.hpp new file mode 100644 index 0000000000..aa2a3c937e --- /dev/null +++ b/LiteLoader/include/llapi/mc/SmithingTableTemplateContainerValidation.hpp @@ -0,0 +1,79 @@ +/** + * @file SmithingTableTemplateContainerValidation.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "ContainerValidationBase.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class SmithingTableTemplateContainerValidation : public ContainerValidationBase { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SMITHINGTABLETEMPLATECONTAINERVALIDATION +public: + class SmithingTableTemplateContainerValidation& operator=(class SmithingTableTemplateContainerValidation const &) = delete; + SmithingTableTemplateContainerValidation(class SmithingTableTemplateContainerValidation const &) = delete; + SmithingTableTemplateContainerValidation() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + */ + virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; + /** + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@SmithingTableTemplateContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + */ + virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; + /** + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + */ + virtual int getAvailableSetCount(int, class ItemStackBase const &) const; + /** + * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + */ + virtual bool canItemMoveToContainer(class ItemStackBase const &) const; + /** + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + */ + virtual bool canDestroy(class ContainerScreenContext const &) const; + /** + * @vftbl 8 + * @symbol ?getContainerOffset\@SmithingTableTemplateContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + */ + virtual int getContainerOffset(class ContainerScreenContext const &) const; + /** + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + */ + virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; + +}; diff --git a/LiteLoader/include/llapi/mc/SmithingTemplateItem.hpp b/LiteLoader/include/llapi/mc/SmithingTemplateItem.hpp new file mode 100644 index 0000000000..0946ce70ed --- /dev/null +++ b/LiteLoader/include/llapi/mc/SmithingTemplateItem.hpp @@ -0,0 +1,114 @@ +/** + * @file SmithingTemplateItem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Json.hpp" +#include "Item.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class SmithingTemplateItem : public Item { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SMITHINGTEMPLATEITEM +public: + class SmithingTemplateItem& operator=(class SmithingTemplateItem const &) = delete; + SmithingTemplateItem(class SmithingTemplateItem const &) = delete; + SmithingTemplateItem() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 7 + * @symbol __unk_vfn_7 + */ + virtual void __unk_vfn_7(); + /** + * @vftbl 11 + * @symbol __unk_vfn_11 + */ + virtual void __unk_vfn_11(); + /** + * @vftbl 14 + * @symbol __unk_vfn_14 + */ + virtual void __unk_vfn_14(); + /** + * @vftbl 16 + * @symbol __unk_vfn_16 + */ + virtual void __unk_vfn_16(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@SmithingTemplateItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + */ + virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; + /** + * @vftbl 66 + * @symbol __unk_vfn_66 + */ + virtual void __unk_vfn_66(); + /** + * @vftbl 70 + * @symbol __unk_vfn_70 + */ + virtual void __unk_vfn_70(); + /** + * @vftbl 71 + * @symbol __unk_vfn_71 + */ + virtual void __unk_vfn_71(); + /** + * @vftbl 72 + * @symbol __unk_vfn_72 + */ + virtual void __unk_vfn_72(); + /** + * @vftbl 75 + * @symbol __unk_vfn_75 + */ + virtual void __unk_vfn_75(); + /** + * @vftbl 79 + * @symbol __unk_vfn_79 + */ + virtual void __unk_vfn_79(); + /** + * @vftbl 80 + * @symbol __unk_vfn_80 + */ + virtual void __unk_vfn_80(); + /** + * @vftbl 95 + * @symbol ?buildDescriptionId\@SmithingTemplateItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + */ + virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; + /** + * @symbol ??0SmithingTemplateItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4UpgradeType\@0\@0\@Z + */ + MCAPI SmithingTemplateItem(std::string const &, int, enum class SmithingTemplateItem::UpgradeType, std::string const &); + +}; diff --git a/LiteLoader/include/llapi/mc/SmithingTemplateUtils.hpp b/LiteLoader/include/llapi/mc/SmithingTemplateUtils.hpp new file mode 100644 index 0000000000..b0b6f0903a --- /dev/null +++ b/LiteLoader/include/llapi/mc/SmithingTemplateUtils.hpp @@ -0,0 +1,56 @@ +/** + * @file SmithingTemplateUtils.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace SmithingTemplateUtils { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?APPLIES_TO_TITLE\@SmithingTemplateUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const APPLIES_TO_TITLE; + /** + * @symbol ?ARMOR_TRIM_APPLIES_TO\@SmithingTemplateUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const ARMOR_TRIM_APPLIES_TO; + /** + * @symbol ?ARMOR_TRIM_INGREDIENTS\@SmithingTemplateUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const ARMOR_TRIM_INGREDIENTS; + /** + * @symbol ?DESCRIPTION_FORMAT\@SmithingTemplateUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const DESCRIPTION_FORMAT; + /** + * @symbol ?INGREDIENTS_TITLE\@SmithingTemplateUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const INGREDIENTS_TITLE; + /** + * @symbol ?NETHERITE_UPGRADE_APPLIES_TO\@SmithingTemplateUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const NETHERITE_UPGRADE_APPLIES_TO; + /** + * @symbol ?NETHERITE_UPGRADE_INGREDIENTS\@SmithingTemplateUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const NETHERITE_UPGRADE_INGREDIENTS; + /** + * @symbol ?TITLE_FORMAT\@SmithingTemplateUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const TITLE_FORMAT; + /** + * @symbol ?UNKNOWN\@SmithingTemplateUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const UNKNOWN; + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SmithingTransformRecipe.hpp b/LiteLoader/include/llapi/mc/SmithingTransformRecipe.hpp index d6f321eced..5ad8d7e6d1 100644 --- a/LiteLoader/include/llapi/mc/SmithingTransformRecipe.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTransformRecipe.hpp @@ -32,25 +32,39 @@ class SmithingTransformRecipe : public ShapelessRecipe { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?assemble\@SmithingTransformRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @symbol ?assemble\@SmithingTransformRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z */ - virtual std::vector const & assemble(class CraftingContainer &) const; + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; /** - * @symbol ??0SmithingTransformRecipe\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVRecipeIngredient\@\@1AEBVItemInstance\@\@AEBVHashedString\@\@\@Z + * @vftbl 5 + * @symbol __unk_vfn_5 */ - MCAPI SmithingTransformRecipe(std::string const &, class RecipeIngredient const &, class RecipeIngredient const &, class ItemInstance const &, class HashedString const &); + virtual void __unk_vfn_5(); /** - * @symbol ?getAddition\@SmithingTransformRecipe\@\@QEBAAEBVRecipeIngredient\@\@XZ + * @vftbl 6 + * @symbol ?matches\@SmithingTransformRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z */ - MCAPI class RecipeIngredient const & getAddition() const; + virtual bool matches(class CraftingContainer &, class Level &) const; /** - * @symbol ?getBase\@SmithingTransformRecipe\@\@QEBAAEBVRecipeIngredient\@\@XZ + * @symbol ??0SmithingTransformRecipe\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVRecipeIngredient\@\@11AEBVItemInstance\@\@AEBVHashedString\@\@\@Z */ - MCAPI class RecipeIngredient const & getBase() const; + MCAPI SmithingTransformRecipe(std::string const &, class RecipeIngredient const &, class RecipeIngredient const &, class RecipeIngredient const &, class ItemInstance const &, class HashedString const &); + /** + * @symbol ?getAdditionIngredient\@SmithingTransformRecipe\@\@QEBAAEBVRecipeIngredient\@\@XZ + */ + MCAPI class RecipeIngredient const & getAdditionIngredient() const; + /** + * @symbol ?getBaseIngredient\@SmithingTransformRecipe\@\@QEBAAEBVRecipeIngredient\@\@XZ + */ + MCAPI class RecipeIngredient const & getBaseIngredient() const; /** * @symbol ?getResult\@SmithingTransformRecipe\@\@QEBAAEBVItemInstance\@\@XZ */ MCAPI class ItemInstance const & getResult() const; + /** + * @symbol ?getTemplateIngredient\@SmithingTransformRecipe\@\@QEBAAEBVRecipeIngredient\@\@XZ + */ + MCAPI class RecipeIngredient const & getTemplateIngredient() const; /** * @symbol ?ID\@SmithingTransformRecipe\@\@2VUUID\@mce\@\@B */ diff --git a/LiteLoader/include/llapi/mc/SmithingTrimRecipe.hpp b/LiteLoader/include/llapi/mc/SmithingTrimRecipe.hpp new file mode 100644 index 0000000000..d1024b6d67 --- /dev/null +++ b/LiteLoader/include/llapi/mc/SmithingTrimRecipe.hpp @@ -0,0 +1,74 @@ +/** + * @file SmithingTrimRecipe.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "ShapelessRecipe.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class SmithingTrimRecipe : public ShapelessRecipe { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SMITHINGTRIMRECIPE +public: + class SmithingTrimRecipe& operator=(class SmithingTrimRecipe const &) = delete; + SmithingTrimRecipe(class SmithingTrimRecipe const &) = delete; + SmithingTrimRecipe() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?assemble\@SmithingTrimRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@AEBUCraftingContext\@\@\@Z + */ + virtual std::vector const & assemble(class CraftingContainer &, struct CraftingContext const &) const; + /** + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 + * @symbol ?matches\@SmithingTrimRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + */ + virtual bool matches(class CraftingContainer &, class Level &) const; + /** + * @vftbl 10 + * @symbol ?hasDataDrivenResult\@SmithingTrimRecipe\@\@UEBA_NXZ + */ + virtual bool hasDataDrivenResult() const; + /** + * @symbol ??0SmithingTrimRecipe\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVRecipeIngredient\@\@11AEBVHashedString\@\@\@Z + */ + MCAPI SmithingTrimRecipe(std::string const &, class RecipeIngredient const &, class RecipeIngredient const &, class RecipeIngredient const &, class HashedString const &); + /** + * @symbol ?getAdditionIngredient\@SmithingTrimRecipe\@\@QEBAAEBVRecipeIngredient\@\@XZ + */ + MCAPI class RecipeIngredient const & getAdditionIngredient() const; + /** + * @symbol ?getBaseIngredient\@SmithingTrimRecipe\@\@QEBAAEBVRecipeIngredient\@\@XZ + */ + MCAPI class RecipeIngredient const & getBaseIngredient() const; + /** + * @symbol ?getTemplateIngredient\@SmithingTrimRecipe\@\@QEBAAEBVRecipeIngredient\@\@XZ + */ + MCAPI class RecipeIngredient const & getTemplateIngredient() const; + /** + * @symbol ?ID\@SmithingTrimRecipe\@\@2VUUID\@mce\@\@B + */ + MCAPI static class mce::UUID const ID; + +}; diff --git a/LiteLoader/include/llapi/mc/SmithingTrimRecipeUtils.hpp b/LiteLoader/include/llapi/mc/SmithingTrimRecipeUtils.hpp new file mode 100644 index 0000000000..18245211ba --- /dev/null +++ b/LiteLoader/include/llapi/mc/SmithingTrimRecipeUtils.hpp @@ -0,0 +1,36 @@ +/** + * @file SmithingTrimRecipeUtils.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace SmithingTrimRecipeUtils { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doesItemHaveResultingTrim\@SmithingTrimRecipeUtils\@\@YA_NAEBVLevel\@\@AEBVItemStack\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@2\@Z + */ + MCAPI bool doesItemHaveResultingTrim(class Level const &, class ItemStack const &, std::string const &, std::string const &); + /** + * @symbol ?validateAdditionIngredient\@SmithingTrimRecipeUtils\@\@YA_NAEBVLevel\@\@VRecipeIngredient\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI bool validateAdditionIngredient(class Level const &, class RecipeIngredient, std::string const &); + /** + * @symbol ?validateBaseIngredient\@SmithingTrimRecipeUtils\@\@YA_NVRecipeIngredient\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI bool validateBaseIngredient(class RecipeIngredient, std::string const &); + /** + * @symbol ?validateTemplateIngredient\@SmithingTrimRecipeUtils\@\@YA_NAEBVLevel\@\@VRecipeIngredient\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI bool validateTemplateIngredient(class Level const &, class RecipeIngredient, std::string const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SmokerBlock.hpp b/LiteLoader/include/llapi/mc/SmokerBlock.hpp index 2de43bf00d..994c4a8b95 100644 --- a/LiteLoader/include/llapi/mc/SmokerBlock.hpp +++ b/LiteLoader/include/llapi/mc/SmokerBlock.hpp @@ -181,20 +181,20 @@ class SmokerBlock : public FurnaceBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,37 +206,42 @@ class SmokerBlock : public FurnaceBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 * @symbol ?use\@SmokerBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@SmokerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@SmokerBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/SnapshotWritableFile.hpp b/LiteLoader/include/llapi/mc/SnapshotWritableFile.hpp index 85be869672..78734a1453 100644 --- a/LiteLoader/include/llapi/mc/SnapshotWritableFile.hpp +++ b/LiteLoader/include/llapi/mc/SnapshotWritableFile.hpp @@ -54,9 +54,5 @@ class SnapshotWritableFile { * @symbol ?Sync\@SnapshotWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ */ virtual class leveldb::Status Sync(); - /** - * @symbol ??0SnapshotWritableFile\@\@QEAA\@$$QEAPEAVWritableFile\@leveldb\@\@AEAVshared_mutex\@std\@\@\@Z - */ - MCAPI SnapshotWritableFile(class leveldb::WritableFile *&&, class std::shared_mutex &); }; diff --git a/LiteLoader/include/llapi/mc/SneakMovementSystem.hpp b/LiteLoader/include/llapi/mc/SneakMovementSystem.hpp index f0602752b9..e6af5c7cbb 100644 --- a/LiteLoader/include/llapi/mc/SneakMovementSystem.hpp +++ b/LiteLoader/include/llapi/mc/SneakMovementSystem.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class SneakMovementSystem { +struct SneakMovementSystem { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SNEAKMOVEMENTSYSTEM public: - class SneakMovementSystem& operator=(class SneakMovementSystem const &) = delete; - SneakMovementSystem(class SneakMovementSystem const &) = delete; + struct SneakMovementSystem& operator=(struct SneakMovementSystem const &) = delete; + SneakMovementSystem(struct SneakMovementSystem const &) = delete; SneakMovementSystem() = delete; #endif @@ -41,13 +41,18 @@ class SneakMovementSystem { virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol ?tick\@SneakMovementSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@UMoveInputComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @symbol __unk_vfn_3 */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct DimensionTypeComponent, struct MaxAutoStepComponent, struct MoveInputComponent, class FlagComponent, struct SynchedActorDataComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void __unk_vfn_3(); /** - * @symbol ?containsSneakCollisionShapes\@SneakMovementSystem\@\@SA_NAEBVStrictEntityContext\@\@AEAVLocalSpatialEntityFetcher\@\@AEBVAABB\@\@2V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@AEBVIConstBlockSource\@\@_NAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@UMoveInputComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @vftbl 4 + * @symbol ?tick\@SneakMovementSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UPlayerGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@UMoveInputComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ - MCAPI static bool containsSneakCollisionShapes(class StrictEntityContext const &, class LocalSpatialEntityFetcher &, class AABB const &, class AABB const &, class ViewT>, struct AABBShapeComponent const>, class ViewT>>, class IConstBlockSource const &, bool, std::vector &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct DimensionTypeComponent, struct MaxAutoStepComponent, struct MoveInputComponent, class FlagComponent, struct SynchedActorDataComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct DimensionTypeComponent, struct MaxAutoStepComponent, struct MoveInputComponent, class FlagComponent, struct SynchedActorDataComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + /** + * @symbol ?containsSneakCollisionShapes\@SneakMovementSystem\@\@SA_NAEBVStrictEntityContext\@\@AEAVLocalSpatialEntityFetcher\@\@AEBVAABB\@\@2V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@AEBVIConstBlockSource\@\@_NAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UPlayerGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@UMoveInputComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + */ + MCAPI static bool containsSneakCollisionShapes(class StrictEntityContext const &, class LocalSpatialEntityFetcher &, class AABB const &, class AABB const &, class ViewT>, struct AABBShapeComponent const>, class ViewT>>, class IConstBlockSource const &, bool, std::vector &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct DimensionTypeComponent, struct MaxAutoStepComponent, struct MoveInputComponent, class FlagComponent, struct SynchedActorDataComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** * @symbol ?create\@SneakMovementSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ @@ -57,8 +62,8 @@ class SneakMovementSystem { */ MCAPI static struct TickingSystemWithInfo createSideBySide(); /** - * @symbol ?tickSneakMovementSystem\@SneakMovementSystem\@\@SAXAEBVStrictEntityContext\@\@V?$Optional\@$$CBV?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBUMoveInputComponent\@\@\@\@AEBUAABBShapeComponent\@\@AEBUDimensionTypeComponent\@\@AEBUMaxAutoStepComponent\@\@AEBUSynchedActorDataComponent\@\@AEAUMoveRequestComponent\@\@AEAUStateVectorComponent\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@UMoveInputComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@AEBULocalSpatialEntityFetcherFactoryComponent\@\@AEAVLocalSpatialEntityFetcher\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?tickSneakMovementSystem\@SneakMovementSystem\@\@SAXAEBVStrictEntityContext\@\@V?$Optional\@$$CBV?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBUMoveInputComponent\@\@\@\@AEBUAABBShapeComponent\@\@AEBUDimensionTypeComponent\@\@AEBUMaxAutoStepComponent\@\@AEBUSynchedActorDataComponent\@\@AEAUMoveRequestComponent\@\@AEAUStateVectorComponent\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UPlayerGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@UMoveInputComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@AEBULocalSpatialEntityFetcherFactoryComponent\@\@AEAVLocalSpatialEntityFetcher\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static void tickSneakMovementSystem(class StrictEntityContext const &, class Optional const>, class Optional const>, class Optional, struct AABBShapeComponent const &, struct DimensionTypeComponent const &, struct MaxAutoStepComponent const &, struct SynchedActorDataComponent const &, struct MoveRequestComponent &, struct StateVectorComponent &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct DimensionTypeComponent, struct MaxAutoStepComponent, struct MoveInputComponent, class FlagComponent, struct SynchedActorDataComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class ViewT>, struct AABBShapeComponent const>, class ViewT>>, struct LocalSpatialEntityFetcherFactoryComponent const &, class LocalSpatialEntityFetcher &, class IConstBlockSource const &); + MCAPI static void tickSneakMovementSystem(class StrictEntityContext const &, class Optional const>, class Optional const>, class Optional, struct AABBShapeComponent const &, struct DimensionTypeComponent const &, struct MaxAutoStepComponent const &, struct SynchedActorDataComponent const &, struct MoveRequestComponent &, struct StateVectorComponent &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct DimensionTypeComponent, struct MaxAutoStepComponent, struct MoveInputComponent, class FlagComponent, struct SynchedActorDataComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class ViewT>, struct AABBShapeComponent const>, class ViewT>>, struct LocalSpatialEntityFetcherFactoryComponent const &, class LocalSpatialEntityFetcher &, class IConstBlockSource const &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SneakTriggerSystem.hpp b/LiteLoader/include/llapi/mc/SneakTriggerSystem.hpp index a5b1b0ceb2..8eb33cbaf1 100644 --- a/LiteLoader/include/llapi/mc/SneakTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/SneakTriggerSystem.hpp @@ -25,16 +25,12 @@ class SneakTriggerSystem { public: /** - * @symbol ?createTriggerSideBySideSystem\@SneakTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createTriggerSystem\@SneakTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@_N\@Z */ - MCAPI static struct TickingSystemWithInfo createTriggerSideBySideSystem(); + MCAPI static struct TickingSystemWithInfo createTriggerSystem(bool); /** - * @symbol ?createTriggerSystem\@SneakTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?updatePlayerState\@SneakTriggerSystem\@\@SA?AV?$optional\@_N\@std\@\@AEBVGetCollisionShapeInterface\@\@AEBVAABB\@\@AEBVVec2\@\@_N33MPEAUPlayerActionComponent\@\@AEBVLayeredAbilities\@\@AEBVIConstBlockSource\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@3\@\@Z */ - MCAPI static struct TickingSystemWithInfo createTriggerSystem(); - /** - * @symbol ?updatePlayerState\@SneakTriggerSystem\@\@SA?AV?$optional\@_N\@std\@\@AEBVGetCollisionShapeInterface\@\@AEBVAABB\@\@AEBVVec2\@\@_N33MPEAUPlayerActionComponent\@\@AEBVIConstBlockSource\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@3\@\@Z - */ - MCAPI static class std::optional updatePlayerState(class GetCollisionShapeInterface const &, class AABB const &, class Vec2 const &, bool, bool, bool, float, struct PlayerActionComponent *, class IConstBlockSource const &, std::vector &); + MCAPI static class std::optional updatePlayerState(class GetCollisionShapeInterface const &, class AABB const &, class Vec2 const &, bool, bool, bool, float, struct PlayerActionComponent *, class LayeredAbilities const &, class IConstBlockSource const &, std::vector &); }; diff --git a/LiteLoader/include/llapi/mc/SneakingSystem.hpp b/LiteLoader/include/llapi/mc/SneakingSystem.hpp index 4a6ad95a47..77af34fbd3 100644 --- a/LiteLoader/include/llapi/mc/SneakingSystem.hpp +++ b/LiteLoader/include/llapi/mc/SneakingSystem.hpp @@ -44,6 +44,11 @@ class SneakingSystem { virtual void __unk_vfn_2(); /** * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 * @symbol ?tick\@SneakingSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorTickedFlag\@\@\@\@\@\@U?$Read\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Write\@USneakingComponent\@\@VActorOwnerComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@$$V\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ virtual void tick(class StrictExecutionContext>, struct Read>, struct Write, struct AddRemove<>, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>> &); diff --git a/LiteLoader/include/llapi/mc/SnowBlock.hpp b/LiteLoader/include/llapi/mc/SnowBlock.hpp index b84abb4fb7..3283097270 100644 --- a/LiteLoader/include/llapi/mc/SnowBlock.hpp +++ b/LiteLoader/include/llapi/mc/SnowBlock.hpp @@ -186,20 +186,20 @@ class SnowBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,32 +211,37 @@ class SnowBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 188 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 189 * @symbol ?getResourceItem\@SnowBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@SnowBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SortItemInstanceIdAux.hpp b/LiteLoader/include/llapi/mc/SortItemInstanceIdAux.hpp index c9364862e6..ec228a4546 100644 --- a/LiteLoader/include/llapi/mc/SortItemInstanceIdAux.hpp +++ b/LiteLoader/include/llapi/mc/SortItemInstanceIdAux.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -class SortItemInstanceIdAux { +struct SortItemInstanceIdAux { #define AFTER_EXTRA // Add Member There @@ -20,8 +20,8 @@ class SortItemInstanceIdAux { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SORTITEMINSTANCEIDAUX public: - class SortItemInstanceIdAux& operator=(class SortItemInstanceIdAux const &) = delete; - SortItemInstanceIdAux(class SortItemInstanceIdAux const &) = delete; + struct SortItemInstanceIdAux& operator=(struct SortItemInstanceIdAux const &) = delete; + SortItemInstanceIdAux(struct SortItemInstanceIdAux const &) = delete; SortItemInstanceIdAux() = delete; #endif @@ -31,4 +31,4 @@ class SortItemInstanceIdAux { */ MCAPI bool operator()(class ItemInstance const &, class ItemInstance const &) const; -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SoulSandBlock.hpp b/LiteLoader/include/llapi/mc/SoulSandBlock.hpp index 2db09a146a..5fd0720250 100644 --- a/LiteLoader/include/llapi/mc/SoulSandBlock.hpp +++ b/LiteLoader/include/llapi/mc/SoulSandBlock.hpp @@ -201,20 +201,20 @@ class SoulSandBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -227,39 +227,44 @@ class SoulSandBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0SoulSandBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/SoulSpeedAttributeSystem.hpp b/LiteLoader/include/llapi/mc/SoulSpeedAttributeSystem.hpp index 86ef7d93cf..115a546abd 100644 --- a/LiteLoader/include/llapi/mc/SoulSpeedAttributeSystem.hpp +++ b/LiteLoader/include/llapi/mc/SoulSpeedAttributeSystem.hpp @@ -35,5 +35,9 @@ class SoulSpeedAttributeSystem { * @symbol ?createSystem\@SoulSpeedAttributeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?tickSystem\@SoulSpeedAttributeSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void tickSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>); }; diff --git a/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp b/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp index 8bee0269ea..e727c7d3f8 100644 --- a/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp @@ -176,30 +176,30 @@ class SoulTorchBlock : public TorchBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 152 * @symbol ?animateTick\@SoulTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 161 + * @vftbl 162 * @symbol ?_addHardCodedBlockComponents\@SoulTorchBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,25 +211,30 @@ class SoulTorchBlock : public TorchBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0SoulTorchBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/SoundEventRequestQueueComponent.hpp b/LiteLoader/include/llapi/mc/SoundEventRequestQueueComponent.hpp index cac4e9811a..4187c0003f 100644 --- a/LiteLoader/include/llapi/mc/SoundEventRequestQueueComponent.hpp +++ b/LiteLoader/include/llapi/mc/SoundEventRequestQueueComponent.hpp @@ -31,9 +31,5 @@ struct SoundEventRequestQueueComponent { * @symbol ??0SoundEventRequestQueueComponent\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI SoundEventRequestQueueComponent(struct SoundEventRequestQueueComponent &&); - /** - * @symbol ??1SoundEventRequestQueueComponent\@\@QEAA\@XZ - */ - MCAPI ~SoundEventRequestQueueComponent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SoundEventSystem.hpp b/LiteLoader/include/llapi/mc/SoundEventSystem.hpp index d25bb55286..68972dd761 100644 --- a/LiteLoader/include/llapi/mc/SoundEventSystem.hpp +++ b/LiteLoader/include/llapi/mc/SoundEventSystem.hpp @@ -36,6 +36,10 @@ class SoundEventSystem { * @symbol ?_tick\@SoundEventSystem\@\@SAXAEBVStrictEntityContext\@\@AEAVLevelComponent\@\@AEAUSoundEventRequestQueueComponent\@\@\@Z */ MCAPI static void _tick(class StrictEntityContext const &, class LevelComponent &, struct SoundEventRequestQueueComponent &); + /** + * @symbol ?_view\@SoundEventSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@VLevelComponent\@\@USoundEventRequestQueueComponent\@\@\@\@\@Z + */ + MCAPI static void _view(class ViewT); /** * @symbol ?create\@SoundEventSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SparseContainer.hpp b/LiteLoader/include/llapi/mc/SparseContainer.hpp index 73fce48a03..e791c8b58c 100644 --- a/LiteLoader/include/llapi/mc/SparseContainer.hpp +++ b/LiteLoader/include/llapi/mc/SparseContainer.hpp @@ -29,10 +29,6 @@ class SparseContainer { #endif public: - /** - * @symbol ?_isSlotInRange\@SparseContainer\@\@QEBA_NH\@Z - */ - MCAPI bool _isSlotInRange(int) const; /** * @symbol ?addItemNetworkChangedCallback\@SparseContainer\@\@QEAAXW4ContainerEnumName\@\@V?$function\@$$A6AXHAEBVItemStack\@\@0\@Z\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SpatialActorNetworkData.hpp b/LiteLoader/include/llapi/mc/SpatialActorNetworkData.hpp index f90553beca..aae7d49485 100644 --- a/LiteLoader/include/llapi/mc/SpatialActorNetworkData.hpp +++ b/LiteLoader/include/llapi/mc/SpatialActorNetworkData.hpp @@ -48,22 +48,6 @@ struct DebugSendRateModifiers { * @symbol ?enableAutoSend\@SpatialActorNetworkData\@\@QEAAX_N\@Z */ MCAPI void enableAutoSend(bool); - /** - * @symbol ?getLastSentPositionForAddingEntity\@SpatialActorNetworkData\@\@QEAA?AVVec3\@\@XZ - */ - MCAPI class Vec3 getLastSentPositionForAddingEntity(); - /** - * @symbol ?getLastSentRotationForAddingEntity\@SpatialActorNetworkData\@\@QEAA?AVVec2\@\@XZ - */ - MCAPI class Vec2 getLastSentRotationForAddingEntity(); - /** - * @symbol ?getLastSentYBodyRotationForAddingEntity\@SpatialActorNetworkData\@\@QEAAMXZ - */ - MCAPI float getLastSentYBodyRotationForAddingEntity(); - /** - * @symbol ?getLastSentYHeadRotationForAddingEntity\@SpatialActorNetworkData\@\@QEAAMXZ - */ - MCAPI float getLastSentYHeadRotationForAddingEntity(); /** * @symbol ?handleClientData\@SpatialActorNetworkData\@\@QEAAXAEBVMoveActorAbsoluteData\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SpawnActorParameters.hpp b/LiteLoader/include/llapi/mc/SpawnActorParameters.hpp index d4137d6339..1d43538f4a 100644 --- a/LiteLoader/include/llapi/mc/SpawnActorParameters.hpp +++ b/LiteLoader/include/llapi/mc/SpawnActorParameters.hpp @@ -31,14 +31,14 @@ struct SpawnActorParameters { * @symbol ??0SpawnActorParameters\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI SpawnActorParameters(struct SpawnActorParameters &&); - /** - * @symbol ??0SpawnActorParameters\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI SpawnActorParameters(struct SpawnActorParameters const &); /** * @symbol ??0SpawnActorParameters\@\@QEAA\@XZ */ MCAPI SpawnActorParameters(); + /** + * @symbol ??0SpawnActorParameters\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI SpawnActorParameters(struct SpawnActorParameters const &); /** * @symbol ?setItem\@SpawnActorParameters\@\@QEAAXAEBVItemDescriptor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SpawnData.hpp b/LiteLoader/include/llapi/mc/SpawnData.hpp index 452d919dbe..68af9b31d8 100644 --- a/LiteLoader/include/llapi/mc/SpawnData.hpp +++ b/LiteLoader/include/llapi/mc/SpawnData.hpp @@ -28,14 +28,14 @@ class SpawnData { #endif public: - /** - * @symbol ??0SpawnData\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI SpawnData(class SpawnData const &); /** * @symbol ??0SpawnData\@\@QEAA\@AEBVCompoundTag\@\@\@Z */ MCAPI SpawnData(class CompoundTag const &); + /** + * @symbol ??0SpawnData\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI SpawnData(class SpawnData const &); /** * @symbol ?save\@SpawnData\@\@QEAA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SpawnGroupRegistry.hpp b/LiteLoader/include/llapi/mc/SpawnGroupRegistry.hpp index a71ad3c14a..3175fea68c 100644 --- a/LiteLoader/include/llapi/mc/SpawnGroupRegistry.hpp +++ b/LiteLoader/include/llapi/mc/SpawnGroupRegistry.hpp @@ -57,61 +57,6 @@ class SpawnGroupRegistry { * @symbol ?readResourceFiles\@SpawnGroupRegistry\@\@MEAAXAEAVResourcePackManager\@\@AEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorSpawnRuleDefinition\@\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorSpawnRuleDefinition\@\@\@std\@\@\@2\@\@std\@\@\@Z */ virtual void readResourceFiles(class ResourcePackManager &, class std::unordered_map, struct std::equal_to, class std::allocator>> &); - /** - * @vftbl 5 - * @symbol __unk_vfn_5 - */ - virtual void __unk_vfn_5(); - /** - * @vftbl 6 - * @symbol __unk_vfn_6 - */ - virtual void __unk_vfn_6(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); - /** - * @vftbl 8 - * @symbol __unk_vfn_8 - */ - virtual void __unk_vfn_8(); - /** - * @vftbl 9 - * @symbol __unk_vfn_9 - */ - virtual void __unk_vfn_9(); - /** - * @vftbl 10 - * @symbol ?_Get\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEBAPEBXXZ - */ - virtual void const * _Get() const; - /** - * @vftbl 11 - * @symbol __unk_vfn_11 - */ - virtual void __unk_vfn_11(); - /** - * @vftbl 12 - * @symbol __unk_vfn_12 - */ - virtual void __unk_vfn_12(); - /** - * @vftbl 13 - * @symbol __unk_vfn_13 - */ - virtual void __unk_vfn_13(); - /** - * @vftbl 14 - * @symbol __unk_vfn_14 - */ - virtual void __unk_vfn_14(); - /** - * @vftbl 15 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z - */ - virtual void _Delete_this(bool); /** * @symbol ??0SpawnGroupRegistry\@\@QEAA\@AEAVResourcePackManager\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SpawnPointCommand.hpp b/LiteLoader/include/llapi/mc/SpawnPointCommand.hpp index a974e0b390..67accd4846 100644 --- a/LiteLoader/include/llapi/mc/SpawnPointCommand.hpp +++ b/LiteLoader/include/llapi/mc/SpawnPointCommand.hpp @@ -36,7 +36,7 @@ class SpawnPointCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@SpawnPointCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/Spawner.hpp b/LiteLoader/include/llapi/mc/Spawner.hpp index 6eb4d59059..98aa39a72c 100644 --- a/LiteLoader/include/llapi/mc/Spawner.hpp +++ b/LiteLoader/include/llapi/mc/Spawner.hpp @@ -36,18 +36,10 @@ class Spawner { #endif public: - /** - * @symbol ??0Spawner\@\@QEAA\@AEAVLevel\@\@\@Z - */ - MCAPI Spawner(class Level &); /** * @symbol ?getSpawnRules\@Spawner\@\@QEBAPEBVActorSpawnRuleGroup\@\@XZ */ MCAPI class ActorSpawnRuleGroup const * getSpawnRules() const; - /** - * @symbol ?getSpawnRulesMutable\@Spawner\@\@QEBAPEAVActorSpawnRuleGroup\@\@XZ - */ - MCAPI class ActorSpawnRuleGroup * getSpawnRulesMutable() const; /** * @symbol ?getSpawnSettings\@Spawner\@\@QEBAAEBUSpawnSettings\@\@XZ */ @@ -84,10 +76,6 @@ class Spawner { * @symbol ?tick\@Spawner\@\@QEAAXAEAVBlockSource\@\@AEBVLevelChunk\@\@\@Z */ MCAPI void tick(class BlockSource &, class LevelChunk const &); - /** - * @symbol ??1Spawner\@\@QEAA\@XZ - */ - MCAPI ~Spawner(); /** * @symbol ?findNextSpawnBlockUnder\@Spawner\@\@SA_NAEBVBlockSource\@\@AEAVBlockPos\@\@W4MaterialType\@\@W4SpawnBlockRequirements\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SpinAttackSystem.hpp b/LiteLoader/include/llapi/mc/SpinAttackSystem.hpp index ecb234244a..ee7a4135ed 100644 --- a/LiteLoader/include/llapi/mc/SpinAttackSystem.hpp +++ b/LiteLoader/include/llapi/mc/SpinAttackSystem.hpp @@ -31,6 +31,10 @@ class SpinAttackSystem { * @symbol ?_spinAttack\@SpinAttackSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _spinAttack(class StrictEntityContext &, class ActorOwnerComponent &); + /** + * @symbol ?_tickSpinAttackSystem\@SpinAttackSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void _tickSpinAttackSystem(class ViewT>, class ActorOwnerComponent>); /** * @symbol ?createSystem\@SpinAttackSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SplitBlockIds.hpp b/LiteLoader/include/llapi/mc/SplitBlockIds.hpp deleted file mode 100644 index 771c905ff3..0000000000 --- a/LiteLoader/include/llapi/mc/SplitBlockIds.hpp +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @file SplitBlockIds.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -namespace SplitBlockIds { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?LegacyWool\@SplitBlockIds\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const LegacyWool; - /** - * @symbol ?NewWoolBlockIds\@SplitBlockIds\@\@3V?$array\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@$0BA\@\@std\@\@B - */ - MCAPI extern class std::array, 16> const NewWoolBlockIds; - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SplitBlockUtils.hpp b/LiteLoader/include/llapi/mc/SplitBlockUtils.hpp new file mode 100644 index 0000000000..639f1dce9f --- /dev/null +++ b/LiteLoader/include/llapi/mc/SplitBlockUtils.hpp @@ -0,0 +1,40 @@ +/** + * @file SplitBlockUtils.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace SplitBlockUtils { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?LegacyBlockInfos\@SplitBlockUtils\@\@3V?$vector\@V?$reference_wrapper\@$$CBULegacyBlockInfo\@SplitBlockUtils\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBULegacyBlockInfo\@SplitBlockUtils\@\@\@std\@\@\@2\@\@std\@\@B + */ + MCAPI extern std::vector> const LegacyBlockInfos; + /** + * @symbol ?LegacyFenceInfo\@SplitBlockUtils\@\@3ULegacyBlockInfo\@1\@B + */ + MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyFenceInfo; + /** + * @symbol ?LegacyLog2Info\@SplitBlockUtils\@\@3ULegacyBlockInfo\@1\@B + */ + MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyLog2Info; + /** + * @symbol ?LegacyLogInfo\@SplitBlockUtils\@\@3ULegacyBlockInfo\@1\@B + */ + MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyLogInfo; + /** + * @symbol ?LegacyWoolInfo\@SplitBlockUtils\@\@3ULegacyBlockInfo\@1\@B + */ + MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyWoolInfo; + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SpongeBlock.hpp b/LiteLoader/include/llapi/mc/SpongeBlock.hpp index 805f779673..d85f52f212 100644 --- a/LiteLoader/include/llapi/mc/SpongeBlock.hpp +++ b/LiteLoader/include/llapi/mc/SpongeBlock.hpp @@ -191,35 +191,35 @@ class SpongeBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@SpongeBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@SpongeBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -232,41 +232,46 @@ class SpongeBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@SpongeBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@SpongeBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/SporeBlossom.hpp b/LiteLoader/include/llapi/mc/SporeBlossom.hpp index 8da3dcf49c..01c201157c 100644 --- a/LiteLoader/include/llapi/mc/SporeBlossom.hpp +++ b/LiteLoader/include/llapi/mc/SporeBlossom.hpp @@ -196,25 +196,25 @@ class SporeBlossom : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 - * @symbol ?animateTick\@SporeBlossom\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 152 + * @symbol ?animateTick\@SporeBlossom\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,35 +226,40 @@ class SporeBlossom : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@SporeBlossom\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@SporeBlossom\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SPOREBLOSSOM /** * @symbol ?canBeSilkTouched\@SporeBlossom\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/SpreadPlayersCommand.hpp b/LiteLoader/include/llapi/mc/SpreadPlayersCommand.hpp index 12b645288f..060c0f8318 100644 --- a/LiteLoader/include/llapi/mc/SpreadPlayersCommand.hpp +++ b/LiteLoader/include/llapi/mc/SpreadPlayersCommand.hpp @@ -36,7 +36,7 @@ class SpreadPlayersCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@SpreadPlayersCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/SprintTimerSystem.hpp b/LiteLoader/include/llapi/mc/SprintTimerSystem.hpp index 55385bc504..59bdb4f2bd 100644 --- a/LiteLoader/include/llapi/mc/SprintTimerSystem.hpp +++ b/LiteLoader/include/llapi/mc/SprintTimerSystem.hpp @@ -31,5 +31,9 @@ class SprintTimerSystem { * @symbol ?createSprintTimerSystem\@SprintTimerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSprintTimerSystem(); + /** + * @symbol ?tickSprintTimerSystem\@SprintTimerSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@$$CBUMoveInputComponent\@\@UPlayerInputRequestComponent\@\@UVanillaClientGameplayComponent\@\@\@\@\@Z + */ + MCAPI static void tickSprintTimerSystem(class ViewT, class FlagComponent>, struct MoveInputComponent const, struct PlayerInputRequestComponent, struct VanillaClientGameplayComponent>); }; diff --git a/LiteLoader/include/llapi/mc/SprintTriggerSystem.hpp b/LiteLoader/include/llapi/mc/SprintTriggerSystem.hpp index afa436fe8b..e9e00dd97b 100644 --- a/LiteLoader/include/llapi/mc/SprintTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/SprintTriggerSystem.hpp @@ -10,26 +10,15 @@ #undef BEFORE_EXTRA -/** - * @brief MC class SprintTriggerSystem. - * - */ -class SprintTriggerSystem { + +namespace SprintTriggerSystem { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SPRINTTRIGGERSYSTEM -public: - class SprintTriggerSystem& operator=(class SprintTriggerSystem const &) = delete; - SprintTriggerSystem(class SprintTriggerSystem const &) = delete; - SprintTriggerSystem() = delete; -#endif - -public: /** - * @symbol ?create\@SprintTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@SprintTriggerSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo create(); + MCAPI struct TickingSystemWithInfo createSystem(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SprintTriggerSystemImpl.hpp b/LiteLoader/include/llapi/mc/SprintTriggerSystemImpl.hpp new file mode 100644 index 0000000000..62599be505 --- /dev/null +++ b/LiteLoader/include/llapi/mc/SprintTriggerSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file SprintTriggerSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace SprintTriggerSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doTick\@SprintTriggerSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBV?$Optional\@$$CBUItemInUseComponent\@\@\@\@AEBV?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@AEBV?$Optional\@$$CBUPassengerComponent\@\@\@\@AEBV?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@AEBUAbilitiesComponent\@\@AEBUMobEffectsComponent\@\@AEBUMoveInputComponent\@\@AEBUPlayerInputModeComponent\@\@AEBV?$Optional\@UPlayerActionComponent\@\@\@\@AEAUAttributesComponent\@\@AEAUPlayerInputRequestComponent\@\@AEAUVanillaClientGameplayComponent\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UVehicleComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCanVehicleSprintFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@USynchedActorDataComponent\@\@\@\@AEBUExternalDataInterface\@\@\@Z + */ + MCAPI void doTick(class StrictEntityContext const &, class Optional const &, class Optional const> const &, class Optional const &, class Optional const> const &, struct AbilitiesComponent const &, struct MobEffectsComponent const &, struct MoveInputComponent const &, struct PlayerInputModeComponent const &, class Optional const &, struct AttributesComponent &, struct PlayerInputRequestComponent &, struct VanillaClientGameplayComponent &, class ViewT const &, class ViewT>> const &, class ViewT const &, struct ExternalDataInterface const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SpyglassItem.hpp b/LiteLoader/include/llapi/mc/SpyglassItem.hpp index 373100ced3..efc50b7f79 100644 --- a/LiteLoader/include/llapi/mc/SpyglassItem.hpp +++ b/LiteLoader/include/llapi/mc/SpyglassItem.hpp @@ -121,9 +121,5 @@ class SpyglassItem : public Item { * @symbol ?releaseUsing\@SpyglassItem\@\@UEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z */ virtual void releaseUsing(class ItemStack &, class Player *, int) const; - /** - * @symbol ??0SpyglassItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z - */ - MCAPI SpyglassItem(std::string const &, short); }; diff --git a/LiteLoader/include/llapi/mc/SquidPostAIStepSystem.hpp b/LiteLoader/include/llapi/mc/SquidPostAIStepSystem.hpp deleted file mode 100644 index 65c2354040..0000000000 --- a/LiteLoader/include/llapi/mc/SquidPostAIStepSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file SquidPostAIStepSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SquidPostAIStepSystem. - * - */ -class SquidPostAIStepSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SQUIDPOSTAISTEPSYSTEM -public: - class SquidPostAIStepSystem& operator=(class SquidPostAIStepSystem const &) = delete; - SquidPostAIStepSystem(class SquidPostAIStepSystem const &) = delete; - SquidPostAIStepSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@SquidPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doSquidPostAIStepSystem\@SquidPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doSquidPostAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; diff --git a/LiteLoader/include/llapi/mc/SquidPreAiStepSystem.hpp b/LiteLoader/include/llapi/mc/SquidPreAiStepSystem.hpp index 10d6bb16de..615dbf498f 100644 --- a/LiteLoader/include/llapi/mc/SquidPreAiStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/SquidPreAiStepSystem.hpp @@ -31,6 +31,10 @@ class SquidPreAiStepSystem { * @symbol ?createSystem\@SquidPreAiStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?tick\@SquidPreAiStepSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@USquidFlag\@\@\@\@\@\@ULocalMoveVelocityComponent\@\@\@\@\@Z + */ + MCAPI static void tick(class ViewT, class FlagComponent>, struct LocalMoveVelocityComponent>); //private: /** diff --git a/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp b/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp index cd0aab2176..4e5ebb7858 100644 --- a/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp +++ b/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp @@ -45,14 +45,14 @@ class StackResultStorageEntity { * @symbol ??0StackResultStorageEntity\@\@IEAA\@$$QEAV0\@\@Z */ MCAPI StackResultStorageEntity(class StackResultStorageEntity &&); - /** - * @symbol ??0StackResultStorageEntity\@\@IEAA\@AEBVOwnerStorageEntity\@\@\@Z - */ - MCAPI StackResultStorageEntity(class OwnerStorageEntity const &); /** * @symbol ??0StackResultStorageEntity\@\@IEAA\@AEBVWeakStorageEntity\@\@\@Z */ MCAPI StackResultStorageEntity(class WeakStorageEntity const &); + /** + * @symbol ??0StackResultStorageEntity\@\@IEAA\@AEBVOwnerStorageEntity\@\@\@Z + */ + MCAPI StackResultStorageEntity(class OwnerStorageEntity const &); /** * @symbol ?_getStackRef\@StackResultStorageEntity\@\@IEBAAEAVEntityContext\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp b/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp index 8b036b9923..87b799f55a 100644 --- a/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp +++ b/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp @@ -196,30 +196,30 @@ class StainedGlassBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@StainedGlassBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@StainedGlassBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -231,37 +231,42 @@ class StainedGlassBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 185 + * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 186 * @symbol ?getMapColor\@StainedGlassBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@StainedGlassBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@StainedGlassBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp b/LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp index 68d5ea7bd6..8a6c94f2ac 100644 --- a/LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp +++ b/LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp @@ -181,30 +181,30 @@ class StainedGlassPaneBlock : public ThinFenceBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@StainedGlassPaneBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@StainedGlassPaneBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,27 +216,32 @@ class StainedGlassPaneBlock : public ThinFenceBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@StainedGlassPaneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StairBlock.hpp b/LiteLoader/include/llapi/mc/StairBlock.hpp index b9d8fc7cb2..654a00c382 100644 --- a/LiteLoader/include/llapi/mc/StairBlock.hpp +++ b/LiteLoader/include/llapi/mc/StairBlock.hpp @@ -227,9 +227,9 @@ class StairBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@StairBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@StairBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 109 * @symbol ?attack\@StairBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z @@ -256,45 +256,45 @@ class StairBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 147 * @symbol ?getVariant\@StairBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 163 + * @vftbl 164 * @symbol ?onExploded\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 164 + * @vftbl 165 * @symbol ?onStandOn\@StairBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -307,44 +307,49 @@ class StairBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 175 + * @vftbl 176 * @symbol ?clip\@StairBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@StairBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STAIRBLOCK /** * @symbol ?canBeSilkTouched\@StairBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/StandingVehiclePostPositionPassengerSystem.hpp b/LiteLoader/include/llapi/mc/StandingVehiclePostPositionPassengerSystem.hpp index 7c277633d1..b5cf70aea9 100644 --- a/LiteLoader/include/llapi/mc/StandingVehiclePostPositionPassengerSystem.hpp +++ b/LiteLoader/include/llapi/mc/StandingVehiclePostPositionPassengerSystem.hpp @@ -31,6 +31,10 @@ class StandingVehiclePostPositionPassengerSystem { * @symbol ?_impl\@StandingVehiclePostPositionPassengerSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEAUActorSetPositionRequestComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUStandAnimationComponent\@\@$$CBURenderRotationComponent\@\@U?$Include\@UVehicleComponent\@\@\@\@$$CBURenderPositionComponent\@\@\@\@\@Z */ MCAPI static void _impl(class StrictEntityContext &, struct PassengerComponent const &, struct ActorSetPositionRequestComponent &, class ViewT>, struct StandAnimationComponent const, struct RenderRotationComponent const, struct Include, struct RenderPositionComponent const>); + /** + * @symbol ?_tick\@StandingVehiclePostPositionPassengerSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPositionPassengerRequestComponent\@\@\@\@$$CBUPassengerComponent\@\@UActorSetPositionRequestComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUStandAnimationComponent\@\@$$CBURenderRotationComponent\@\@U?$Include\@UVehicleComponent\@\@\@\@$$CBURenderPositionComponent\@\@\@\@\@Z + */ + MCAPI static void _tick(class ViewT, struct PassengerComponent const, struct ActorSetPositionRequestComponent>, class ViewT>, struct StandAnimationComponent const, struct RenderRotationComponent const, struct Include, struct RenderPositionComponent const>); /** * @symbol ?createSystem\@StandingVehiclePostPositionPassengerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/StartGlidingSystem.hpp b/LiteLoader/include/llapi/mc/StartGlidingSystem.hpp index cae04bd087..e7058a90fa 100644 --- a/LiteLoader/include/llapi/mc/StartGlidingSystem.hpp +++ b/LiteLoader/include/llapi/mc/StartGlidingSystem.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class StartGlidingSystem { +struct StartGlidingSystem { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_STARTGLIDINGSYSTEM public: - class StartGlidingSystem& operator=(class StartGlidingSystem const &) = delete; - StartGlidingSystem(class StartGlidingSystem const &) = delete; + struct StartGlidingSystem& operator=(struct StartGlidingSystem const &) = delete; + StartGlidingSystem(struct StartGlidingSystem const &) = delete; StartGlidingSystem() = delete; #endif @@ -41,12 +41,17 @@ class StartGlidingSystem { virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol ?tick\@StartGlidingSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@UPlayerInputRequestComponent\@\@V?$FlagComponent\@UArmorFlyEnabledFlag\@\@\@\@UPassengerComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UMoveInputComponent\@\@UStateVectorComponent\@\@UVanillaClientGameplayComponent\@\@UCollisionBoxDefinitionComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@USynchedActorDataComponent\@\@UPlayerActionComponent\@\@UOffsetsComponent\@\@\@\@U?$AddRemove\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@U?$GlobalRead\@$$V\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @symbol __unk_vfn_3 */ - virtual void tick(class StrictExecutionContext, class FlagComponent, struct PlayerInputRequestComponent, class FlagComponent, struct PassengerComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove>, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?tick\@StartGlidingSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@UPlayerInputRequestComponent\@\@V?$FlagComponent\@UArmorFlyEnabledFlag\@\@\@\@UPassengerComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UMoveInputComponent\@\@UStateVectorComponent\@\@UVanillaClientGameplayComponent\@\@UCollisionBoxDefinitionComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@USynchedActorDataComponent\@\@UPlayerActionComponent\@\@UOffsetsComponent\@\@\@\@U?$AddRemove\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@U?$GlobalRead\@$$V\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + */ + virtual void tick(class StrictExecutionContext, struct PlayerInputRequestComponent, class FlagComponent, struct PassengerComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove>, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** * @symbol ?createSystem\@StartGlidingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/StartScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/StartScreenCapabilities.hpp index 234c2ea10a..c220c289a1 100644 --- a/LiteLoader/include/llapi/mc/StartScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/StartScreenCapabilities.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -12,7 +13,7 @@ #undef BEFORE_EXTRA -class StartScreenCapabilities { +struct StartScreenCapabilities { #define AFTER_EXTRA // Add Member There @@ -20,8 +21,8 @@ class StartScreenCapabilities { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_STARTSCREENCAPABILITIES public: - class StartScreenCapabilities& operator=(class StartScreenCapabilities const &) = delete; - StartScreenCapabilities(class StartScreenCapabilities const &) = delete; + struct StartScreenCapabilities& operator=(struct StartScreenCapabilities const &) = delete; + StartScreenCapabilities(struct StartScreenCapabilities const &) = delete; StartScreenCapabilities() = delete; #endif @@ -33,8 +34,8 @@ class StartScreenCapabilities { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@UStartScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @symbol ?isOfType\@?$TypedScreenCapabilities\@UStartScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@Bedrock\@\@\@Z */ - virtual bool isOfType(class typeid_t) const; + virtual bool isOfType(class Bedrock::typeid_t) const; -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/StateAnimationVariable.hpp b/LiteLoader/include/llapi/mc/StateAnimationVariable.hpp deleted file mode 100644 index f0a13c1dde..0000000000 --- a/LiteLoader/include/llapi/mc/StateAnimationVariable.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file StateAnimationVariable.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class StateAnimationVariable. - * - */ -class StateAnimationVariable { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_STATEANIMATIONVARIABLE -public: - class StateAnimationVariable& operator=(class StateAnimationVariable const &) = delete; - StateAnimationVariable(class StateAnimationVariable const &) = delete; - StateAnimationVariable() = delete; -#endif - -public: - /** - * @symbol ?addKeyFrame\@StateAnimationVariable\@\@QEAAXMM\@Z - */ - MCAPI void addKeyFrame(float, float); - -}; diff --git a/LiteLoader/include/llapi/mc/StaticVanillaBlocks.hpp b/LiteLoader/include/llapi/mc/StaticVanillaBlocks.hpp index f0cd1f528c..d680387390 100644 --- a/LiteLoader/include/llapi/mc/StaticVanillaBlocks.hpp +++ b/LiteLoader/include/llapi/mc/StaticVanillaBlocks.hpp @@ -11,8 +11,10 @@ LIAPI extern class Block const* mElements[119]; LIAPI extern class Block const* mAcaciaButton; LIAPI extern class Block const* mAcaciaDoor; +LIAPI extern class Block const* mAcaciaFence; LIAPI extern class Block const* mAcaciaFenceGate; LIAPI extern class Block const* mAcaciaHangingSign; +LIAPI extern class Block const* mAcaciaLog; LIAPI extern class Block const* mAcaciaPressurePlate; LIAPI extern class Block const* mAcaciaStairs; LIAPI extern class Block const* mAcaciaStandingSign; @@ -61,8 +63,10 @@ LIAPI extern class Block const* mBell; LIAPI extern class Block const* mBigDripleaf; LIAPI extern class Block const* mBirchButton; LIAPI extern class Block const* mBirchDoor; +LIAPI extern class Block const* mBirchFence; LIAPI extern class Block const* mBirchFenceGate; LIAPI extern class Block const* mBirchHangingSign; +LIAPI extern class Block const* mBirchLog; LIAPI extern class Block const* mBirchPressurePlate; LIAPI extern class Block const* mBirchStairs; LIAPI extern class Block const* mBirchStandingSign; @@ -100,6 +104,7 @@ LIAPI extern class Block const* mBuddingAmethyst; LIAPI extern class Block const* mCactus; LIAPI extern class Block const* mCake; LIAPI extern class Block const* mCalcite; +LIAPI extern class Block const* mCalibratedSculkSensor; LIAPI extern class Block const* mCamera; LIAPI extern class Block const* mCampFire; LIAPI extern class Block const* mCandle; @@ -117,6 +122,23 @@ LIAPI extern class Block const* mChainCommandBlock; LIAPI extern class Block const* mChalkboard; LIAPI extern class Block const* mChemicalHeat; LIAPI extern class Block const* mChemistryTable; +LIAPI extern class Block const* mCherryButton; +LIAPI extern class Block const* mCherryDoor; +LIAPI extern class Block const* mCherryDoubleSlab; +LIAPI extern class Block const* mCherryFence; +LIAPI extern class Block const* mCherryFenceGate; +LIAPI extern class Block const* mCherryHangingSign; +LIAPI extern class Block const* mCherryLeaves; +LIAPI extern class Block const* mCherryLog; +LIAPI extern class Block const* mCherryPlanks; +LIAPI extern class Block const* mCherryPressurePlate; +LIAPI extern class Block const* mCherrySapling; +LIAPI extern class Block const* mCherrySlab; +LIAPI extern class Block const* mCherryStairs; +LIAPI extern class Block const* mCherryStandingSign; +LIAPI extern class Block const* mCherryTrapdoor; +LIAPI extern class Block const* mCherryWallSign; +LIAPI extern class Block const* mCherryWood; LIAPI extern class Block const* mChest; LIAPI extern class Block const* mChiseledBookshelf; LIAPI extern class Block const* mChiseledDeepslate; @@ -185,7 +207,9 @@ LIAPI extern class Block const* mCyanGlazedTerracotta; LIAPI extern class Block const* mCyanWool; LIAPI extern class Block const* mDarkOakButton; LIAPI extern class Block const* mDarkOakDoor; +LIAPI extern class Block const* mDarkOakFence; LIAPI extern class Block const* mDarkOakFenceGate; +LIAPI extern class Block const* mDarkOakLog; LIAPI extern class Block const* mDarkOakPressurePlate; LIAPI extern class Block const* mDarkOakStairs; LIAPI extern class Block const* mDarkOakTrapdoor; @@ -252,7 +276,6 @@ LIAPI extern class Block const* mExposedCutCopperSlab; LIAPI extern class Block const* mExposedCutCopperStairs; LIAPI extern class Block const* mExposedDoubleCutCopperSlab; LIAPI extern class Block const* mFarmlandBlock; -LIAPI extern class Block const* mFence; LIAPI extern class Block const* mFenceGate; LIAPI extern class Block const* mFire; LIAPI extern class Block const* mFletchingTable; @@ -312,8 +335,10 @@ LIAPI extern class Block const* mJigsaw; LIAPI extern class Block const* mJukebox; LIAPI extern class Block const* mJungleButton; LIAPI extern class Block const* mJungleDoor; +LIAPI extern class Block const* mJungleFence; LIAPI extern class Block const* mJungleFenceGate; LIAPI extern class Block const* mJungleHangingSign; +LIAPI extern class Block const* mJungleLog; LIAPI extern class Block const* mJunglePressurePlate; LIAPI extern class Block const* mJungleStairs; LIAPI extern class Block const* mJungleStandingSign; @@ -353,8 +378,6 @@ LIAPI extern class Block const* mLitRedstoneLamp; LIAPI extern class Block const* mLitRedstoneOre; LIAPI extern class Block const* mLitSmoker; LIAPI extern class Block const* mLodestone; -LIAPI extern class Block const* mLog; -LIAPI extern class Block const* mLog2; LIAPI extern class Block const* mLoom; LIAPI extern class Block const* mMagentaCandle; LIAPI extern class Block const* mMagentaCandleCake; @@ -412,7 +435,9 @@ LIAPI extern class Block const* mNetherrack; LIAPI extern class Block const* mNetherreactor; LIAPI extern class Block const* mNormalStoneStairs; LIAPI extern class Block const* mNoteblock; +LIAPI extern class Block const* mOakFence; LIAPI extern class Block const* mOakHangingSign; +LIAPI extern class Block const* mOakLog; LIAPI extern class Block const* mOakStairs; LIAPI extern class Block const* mObserver; LIAPI extern class Block const* mObsidian; @@ -432,6 +457,7 @@ LIAPI extern class Block const* mPearlescentFroglight; LIAPI extern class Block const* mPinkCandle; LIAPI extern class Block const* mPinkCandleCake; LIAPI extern class Block const* mPinkGlazedTerracotta; +LIAPI extern class Block const* mPinkPetals; LIAPI extern class Block const* mPinkWool; LIAPI extern class Block const* mPiston; LIAPI extern class Block const* mPistonArmCollision; @@ -543,8 +569,10 @@ LIAPI extern class Block const* mSponge; LIAPI extern class Block const* mSporeBlossom; LIAPI extern class Block const* mSpruceButton; LIAPI extern class Block const* mSpruceDoor; +LIAPI extern class Block const* mSpruceFence; LIAPI extern class Block const* mSpruceFenceGate; LIAPI extern class Block const* mSpruceHangingSign; +LIAPI extern class Block const* mSpruceLog; LIAPI extern class Block const* mSprucePressurePlate; LIAPI extern class Block const* mSpruceStairs; LIAPI extern class Block const* mSpruceStandingSign; @@ -572,6 +600,8 @@ LIAPI extern class Block const* mStonecutterBlock; LIAPI extern class Block const* mStrippedAcaciaLog; LIAPI extern class Block const* mStrippedBambooBlock; LIAPI extern class Block const* mStrippedBirchLog; +LIAPI extern class Block const* mStrippedCherryLog; +LIAPI extern class Block const* mStrippedCherryWood; LIAPI extern class Block const* mStrippedCrimsonHyphae; LIAPI extern class Block const* mStrippedCrimsonStem; LIAPI extern class Block const* mStrippedDarkOakLog; @@ -584,6 +614,7 @@ LIAPI extern class Block const* mStrippedWarpedHyphae; LIAPI extern class Block const* mStrippedWarpedStem; LIAPI extern class Block const* mStructureBlock; LIAPI extern class Block const* mStructureVoid; +LIAPI extern class Block const* mSuspiciousGravel; LIAPI extern class Block const* mSuspiciousSand; LIAPI extern class Block const* mSweetBerryBush; LIAPI extern class Block const* mTallGrass; diff --git a/LiteLoader/include/llapi/mc/StemBlock.hpp b/LiteLoader/include/llapi/mc/StemBlock.hpp index 96621d715a..6ab07f77c7 100644 --- a/LiteLoader/include/llapi/mc/StemBlock.hpp +++ b/LiteLoader/include/llapi/mc/StemBlock.hpp @@ -206,40 +206,40 @@ class StemBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 135 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 136 * @symbol ?getColor\@StemBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColor\@StemBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 137 + * @vftbl 138 * @symbol ?getColorAtPos\@StemBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 143 + * @vftbl 144 * @symbol ?getVisualShape\@StemBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -251,37 +251,42 @@ class StemBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@StemBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@StemBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@StemBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/StompBlockGoal.hpp b/LiteLoader/include/llapi/mc/StompBlockGoal.hpp index ff81ce2c6d..25b61ee86e 100644 --- a/LiteLoader/include/llapi/mc/StompBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/StompBlockGoal.hpp @@ -120,9 +120,5 @@ class StompBlockGoal : public BaseMoveToGoal { * @symbol ?_playDestroySound\@StompBlockGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z */ virtual void _playDestroySound(class Level &, class BlockSource &, class BlockPos); - /** - * @symbol ??0StompBlockGoal\@\@QEAA\@PEBVBlock\@\@AEAVMob\@\@MHHMH\@Z - */ - MCAPI StompBlockGoal(class Block const *, class Mob &, float, int, int, float, int); }; diff --git a/LiteLoader/include/llapi/mc/StompEggGoal.hpp b/LiteLoader/include/llapi/mc/StompEggGoal.hpp index fe4215e15f..99a0db3541 100644 --- a/LiteLoader/include/llapi/mc/StompEggGoal.hpp +++ b/LiteLoader/include/llapi/mc/StompEggGoal.hpp @@ -75,9 +75,5 @@ class StompEggGoal : public StompBlockGoal { * @symbol ?_playDestroySound\@StompEggGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z */ virtual void _playDestroySound(class Level &, class BlockSource &, class BlockPos); - /** - * @symbol ??0StompEggGoal\@\@QEAA\@AEAVMob\@\@MHHMH\@Z - */ - MCAPI StompEggGoal(class Mob &, float, int, int, float, int); }; diff --git a/LiteLoader/include/llapi/mc/StoneBlock.hpp b/LiteLoader/include/llapi/mc/StoneBlock.hpp index 5ce1497337..0496902ac5 100644 --- a/LiteLoader/include/llapi/mc/StoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneBlock.hpp @@ -186,40 +186,40 @@ class StoneBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@StoneBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@StoneBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 159 + * @vftbl 160 * @symbol ?tryGetInfested\@StoneBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 161 + * @vftbl 162 * @symbol ?_addHardCodedBlockComponents\@StoneBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -231,32 +231,37 @@ class StoneBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@StoneBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@StoneBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/StoneBrickBlock.hpp b/LiteLoader/include/llapi/mc/StoneBrickBlock.hpp index ad4895d910..6f434e27f6 100644 --- a/LiteLoader/include/llapi/mc/StoneBrickBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneBrickBlock.hpp @@ -181,35 +181,35 @@ class StoneBrickBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@StoneBrickBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@StoneBrickBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 159 + * @vftbl 160 * @symbol ?tryGetInfested\@StoneBrickBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -221,32 +221,37 @@ class StoneBrickBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@StoneBrickBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@StoneBrickBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp b/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp index 6976d8e4e0..6b6d668638 100644 --- a/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp @@ -176,20 +176,20 @@ class StoneButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,25 +201,30 @@ class StoneButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); /** * @symbol ??0StoneButtonBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp index 201235e186..27b772a79e 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp @@ -186,35 +186,35 @@ class StoneSlabBlock : public SlabBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@StoneSlabBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@StoneSlabBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,37 +226,42 @@ class StoneSlabBlock : public SlabBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@StoneSlabBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@StoneSlabBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@StoneSlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp index 2db6fe7c5c..deda0a6ef7 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp @@ -186,35 +186,35 @@ class StoneSlabBlock2 : public SlabBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@StoneSlabBlock2\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock2\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@StoneSlabBlock2\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,37 +226,42 @@ class StoneSlabBlock2 : public SlabBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@StoneSlabBlock2\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@StoneSlabBlock2\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@StoneSlabBlock2\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp index 3dda653942..970c347d19 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp @@ -186,35 +186,35 @@ class StoneSlabBlock3 : public SlabBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@StoneSlabBlock3\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock3\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@StoneSlabBlock3\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,37 +226,42 @@ class StoneSlabBlock3 : public SlabBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@StoneSlabBlock3\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@StoneSlabBlock3\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@StoneSlabBlock3\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp index 0a418a3b1e..69e7a94ca8 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp @@ -186,35 +186,35 @@ class StoneSlabBlock4 : public SlabBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@StoneSlabBlock4\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock4\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@StoneSlabBlock4\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,37 +226,42 @@ class StoneSlabBlock4 : public SlabBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@StoneSlabBlock4\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@StoneSlabBlock4\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@StoneSlabBlock4\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp index 97f5fc577f..64e1348f77 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp @@ -106,9 +106,5 @@ class StoneSlabBlockItem : public DeprecatedSlabBlockItem { * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); - /** - * @symbol ??0StoneSlabBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - MCAPI StoneSlabBlockItem(std::string const &, int); }; diff --git a/LiteLoader/include/llapi/mc/StonecutterBlock.hpp b/LiteLoader/include/llapi/mc/StonecutterBlock.hpp index acc1f3a54f..167b63e743 100644 --- a/LiteLoader/include/llapi/mc/StonecutterBlock.hpp +++ b/LiteLoader/include/llapi/mc/StonecutterBlock.hpp @@ -177,9 +177,9 @@ class StonecutterBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@StonecutterBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@StonecutterBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,25 +196,25 @@ class StonecutterBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@StonecutterBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 144 + * @symbol ?getVisualShape\@StonecutterBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,37 +226,42 @@ class StonecutterBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol ?use\@StonecutterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual bool use(class Player &, class BlockPos const &, unsigned char) const; + virtual void __unk_vfn_175(); /** * @vftbl 178 - * @symbol __unk_vfn_178 + * @symbol ?use\@StonecutterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ - virtual void __unk_vfn_178(); + virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 188 * @symbol ?playerDestroy\@StonecutterBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@StonecutterBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StopCommand.hpp b/LiteLoader/include/llapi/mc/StopCommand.hpp index 4dffbff29e..e685e2dfab 100644 --- a/LiteLoader/include/llapi/mc/StopCommand.hpp +++ b/LiteLoader/include/llapi/mc/StopCommand.hpp @@ -36,7 +36,7 @@ class StopCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@StopCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/StopSoundCommand.hpp b/LiteLoader/include/llapi/mc/StopSoundCommand.hpp index 0719c25148..0fd5633be2 100644 --- a/LiteLoader/include/llapi/mc/StopSoundCommand.hpp +++ b/LiteLoader/include/llapi/mc/StopSoundCommand.hpp @@ -36,7 +36,7 @@ class StopSoundCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@StopSoundCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/StopSoundPacket.hpp b/LiteLoader/include/llapi/mc/StopSoundPacket.hpp index 70126da795..29e7f06ee5 100644 --- a/LiteLoader/include/llapi/mc/StopSoundPacket.hpp +++ b/LiteLoader/include/llapi/mc/StopSoundPacket.hpp @@ -60,13 +60,13 @@ class StopSoundPacket : public Packet { */ MCVAPI ~StopSoundPacket(); #endif - /** - * @symbol ??0StopSoundPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z - */ - MCAPI StopSoundPacket(std::string const &, bool); /** * @symbol ??0StopSoundPacket\@\@QEAA\@XZ */ MCAPI StopSoundPacket(); + /** + * @symbol ??0StopSoundPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + */ + MCAPI StopSoundPacket(std::string const &, bool); }; diff --git a/LiteLoader/include/llapi/mc/StopwatchHandler.hpp b/LiteLoader/include/llapi/mc/StopwatchHandler.hpp new file mode 100644 index 0000000000..e9d2300328 --- /dev/null +++ b/LiteLoader/include/llapi/mc/StopwatchHandler.hpp @@ -0,0 +1,32 @@ +/** + * @file StopwatchHandler.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class StopwatchHandler { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_STOPWATCHHANDLER +public: + class StopwatchHandler& operator=(class StopwatchHandler const &) = delete; + StopwatchHandler(class StopwatchHandler const &) = delete; + StopwatchHandler() = delete; +#endif + +public: + /** + * @symbol ?clearAll\@StopwatchHandler\@\@QEAAXXZ + */ + MCAPI void clearAll(); + +}; diff --git a/LiteLoader/include/llapi/mc/StoreLocalMovementVelocitySystem.hpp b/LiteLoader/include/llapi/mc/StoreLocalMovementVelocitySystem.hpp index df3699941a..72990747bd 100644 --- a/LiteLoader/include/llapi/mc/StoreLocalMovementVelocitySystem.hpp +++ b/LiteLoader/include/llapi/mc/StoreLocalMovementVelocitySystem.hpp @@ -32,5 +32,9 @@ class StoreLocalMovementVelocitySystem { * @symbol ?tickEntity\@StoreLocalMovementVelocitySystem\@\@SAXAEAVStrictEntityContext\@\@AEBUMobTravelComponent\@\@AEAUCurrentLocalMoveVelocityComponent\@\@\@Z */ MCAPI static void tickEntity(class StrictEntityContext &, struct MobTravelComponent const &, struct CurrentLocalMoveVelocityComponent &); + /** + * @symbol ?tickStoreLocalMovementVelocitySystem\@StoreLocalMovementVelocitySystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@$$CBUMobTravelComponent\@\@UCurrentLocalMoveVelocityComponent\@\@\@\@\@Z + */ + MCAPI static void tickStoreLocalMovementVelocitySystem(class ViewT>, struct MobTravelComponent const, struct CurrentLocalMoveVelocityComponent>); }; diff --git a/LiteLoader/include/llapi/mc/StorePreviousRideStatsSystem.hpp b/LiteLoader/include/llapi/mc/StorePreviousRideStatsSystem.hpp index d4867b9af7..9d6f701e8d 100644 --- a/LiteLoader/include/llapi/mc/StorePreviousRideStatsSystem.hpp +++ b/LiteLoader/include/llapi/mc/StorePreviousRideStatsSystem.hpp @@ -31,6 +31,10 @@ class StorePreviousRideStatsSystem { * @symbol ?_storePreviousRideStats\@StorePreviousRideStatsSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEAUVanillaClientGameplayComponent\@\@\@Z */ MCAPI static void _storePreviousRideStats(class StrictEntityContext const &, struct StateVectorComponent const &, struct VanillaClientGameplayComponent &); + /** + * @symbol ?_tickStorePreviousRideStatsSystem\@StorePreviousRideStatsSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@UPassengerComponent\@\@\@\@$$CBUStateVectorComponent\@\@UVanillaClientGameplayComponent\@\@\@\@\@Z + */ + MCAPI static void _tickStorePreviousRideStatsSystem(class ViewT, class FlagComponent, struct PassengerComponent>, struct StateVectorComponent const, struct VanillaClientGameplayComponent>); /** * @symbol ?createSystem\@StorePreviousRideStatsSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/StrictEntityContext.hpp b/LiteLoader/include/llapi/mc/StrictEntityContext.hpp index 0510f8103a..82a178bd7c 100644 --- a/LiteLoader/include/llapi/mc/StrictEntityContext.hpp +++ b/LiteLoader/include/llapi/mc/StrictEntityContext.hpp @@ -27,14 +27,14 @@ class StrictEntityContext { #endif public: - /** - * @symbol ??0StrictEntityContext\@\@QEAA\@AEAVEntityRegistryBase\@\@VEntityId\@\@\@Z - */ - MCAPI StrictEntityContext(class EntityRegistryBase &, class EntityId); /** * @symbol ??0StrictEntityContext\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI StrictEntityContext(class StrictEntityContext &&); + /** + * @symbol ??0StrictEntityContext\@\@QEAA\@AEAVEntityRegistryBase\@\@VEntityId\@\@\@Z + */ + MCAPI StrictEntityContext(class EntityRegistryBase &, class EntityId); /** * @symbol ??0StrictEntityContext\@\@QEAA\@AEBVEntityContextBase\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp b/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp index c1ed998a1b..3757f9c202 100644 --- a/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp +++ b/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp @@ -27,10 +27,6 @@ class StrictEntityContextOwner { #endif public: - /** - * @symbol ??0StrictEntityContextOwner\@\@QEAA\@AEAVEntityRegistryBase\@\@VEntityId\@\@\@Z - */ - MCAPI StrictEntityContextOwner(class EntityRegistryBase &, class EntityId); /** * @symbol ??0StrictEntityContextOwner\@\@QEAA\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/StrippedLogBlock.hpp b/LiteLoader/include/llapi/mc/StrippedLogBlock.hpp index 175733a3c6..7ec71bbd9a 100644 --- a/LiteLoader/include/llapi/mc/StrippedLogBlock.hpp +++ b/LiteLoader/include/llapi/mc/StrippedLogBlock.hpp @@ -176,25 +176,25 @@ class StrippedLogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 - * @symbol ?getVariant\@StrippedLogBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 147 + * @symbol ?getVariant\@StrippedLogBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,33 +206,43 @@ class StrippedLogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); + /** + * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); /** * @vftbl 186 - * @symbol __unk_vfn_186 + * @symbol ?getMapColor\@StrippedLogBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + */ + virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; + /** + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@StrippedLogBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0StrippedLogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0StrippedLogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$optional\@ULogBlockMapColors\@\@\@2\@\@Z */ - MCAPI StrippedLogBlock(std::string const &, int); + MCAPI StrippedLogBlock(std::string const &, int, class std::optional); }; diff --git a/LiteLoader/include/llapi/mc/StrollTowardsVillageGoal.hpp b/LiteLoader/include/llapi/mc/StrollTowardsVillageGoal.hpp index e6e7d871e2..b31737d980 100644 --- a/LiteLoader/include/llapi/mc/StrollTowardsVillageGoal.hpp +++ b/LiteLoader/include/llapi/mc/StrollTowardsVillageGoal.hpp @@ -65,9 +65,5 @@ class StrollTowardsVillageGoal : public MoveToVillageGoal { * @symbol ?_selectRandomPosInVillage\@StrollTowardsVillageGoal\@\@MEAA?AVBlockPos\@\@XZ */ virtual class BlockPos _selectRandomPosInVillage(); - /** - * @symbol ??0StrollTowardsVillageGoal\@\@QEAA\@AEAVMob\@\@MMMHM\@Z - */ - MCAPI StrollTowardsVillageGoal(class Mob &, float, float, float, int, float); }; diff --git a/LiteLoader/include/llapi/mc/StructureAnimationAction.hpp b/LiteLoader/include/llapi/mc/StructureAnimationAction.hpp index 02fe40689c..f3754702d4 100644 --- a/LiteLoader/include/llapi/mc/StructureAnimationAction.hpp +++ b/LiteLoader/include/llapi/mc/StructureAnimationAction.hpp @@ -57,10 +57,6 @@ class StructureAnimationAction { * @symbol ??0StructureAnimationAction\@\@QEAA\@AEBVStructureSettings\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI StructureAnimationAction(class StructureSettings const &, class AutomaticID, class BlockPos const &, std::string const &); - /** - * @symbol ?isValidTag\@StructureAnimationAction\@\@SA_NAEBVCompoundTag\@\@\@Z - */ - MCAPI static bool isValidTag(class CompoundTag const &); /** * @symbol ?load\@StructureAnimationAction\@\@SA?AV?$unique_ptr\@VStructureAnimationAction\@\@U?$default_delete\@VStructureAnimationAction\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/StructureBlock.hpp b/LiteLoader/include/llapi/mc/StructureBlock.hpp index fceb85f778..87129bc4ca 100644 --- a/LiteLoader/include/llapi/mc/StructureBlock.hpp +++ b/LiteLoader/include/llapi/mc/StructureBlock.hpp @@ -191,20 +191,20 @@ class StructureBlock : public ActorBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -217,36 +217,41 @@ class StructureBlock : public ActorBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@StructureBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@StructureBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@StructureBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp b/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp index 1fb97b7c8a..dd7b3441fb 100644 --- a/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp @@ -53,13 +53,13 @@ class StructureBlockUpdatePacket : public Packet { * @symbol ?_read\@StructureBlockUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); - /** - * @symbol ??0StructureBlockUpdatePacket\@\@QEAA\@XZ - */ - MCAPI StructureBlockUpdatePacket(); /** * @symbol ??0StructureBlockUpdatePacket\@\@QEAA\@AEBV0\@\@Z */ MCAPI StructureBlockUpdatePacket(class StructureBlockUpdatePacket const &); + /** + * @symbol ??0StructureBlockUpdatePacket\@\@QEAA\@XZ + */ + MCAPI StructureBlockUpdatePacket(); }; diff --git a/LiteLoader/include/llapi/mc/StructureCommand.hpp b/LiteLoader/include/llapi/mc/StructureCommand.hpp index 623399ca64..a4ab4673ab 100644 --- a/LiteLoader/include/llapi/mc/StructureCommand.hpp +++ b/LiteLoader/include/llapi/mc/StructureCommand.hpp @@ -36,7 +36,7 @@ class StructureCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@StructureCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/StructureEditorData.hpp b/LiteLoader/include/llapi/mc/StructureEditorData.hpp index c0124ae164..8952b8127b 100644 --- a/LiteLoader/include/llapi/mc/StructureEditorData.hpp +++ b/LiteLoader/include/llapi/mc/StructureEditorData.hpp @@ -27,6 +27,10 @@ class StructureEditorData { #endif public: + /** + * @symbol ??0StructureEditorData\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI StructureEditorData(class StructureEditorData &&); /** * @symbol ??0StructureEditorData\@\@QEAA\@AEBV0\@\@Z */ @@ -217,10 +221,6 @@ class StructureEditorData { MCAPI static class BlockPos getOrientedBounds(class BlockPos const &, enum class Rotation); //private: - /** - * @symbol ?_setPivotFromStructureSize\@StructureEditorData\@\@AEAAXXZ - */ - MCAPI void _setPivotFromStructureSize(); private: /** diff --git a/LiteLoader/include/llapi/mc/StructureFeature.hpp b/LiteLoader/include/llapi/mc/StructureFeature.hpp index cff62b9767..1f00e0c161 100644 --- a/LiteLoader/include/llapi/mc/StructureFeature.hpp +++ b/LiteLoader/include/llapi/mc/StructureFeature.hpp @@ -85,61 +85,6 @@ class StructureFeature { * @symbol ?getStructureAt\@StructureFeature\@\@MEAAPEAVStructureStart\@\@HHH\@Z */ virtual class StructureStart * getStructureAt(int, int, int); - /** - * @vftbl 8 - * @symbol __unk_vfn_8 - */ - virtual void __unk_vfn_8(); - /** - * @vftbl 9 - * @symbol __unk_vfn_9 - */ - virtual void __unk_vfn_9(); - /** - * @vftbl 10 - * @symbol __unk_vfn_10 - */ - virtual void __unk_vfn_10(); - /** - * @vftbl 11 - * @symbol __unk_vfn_11 - */ - virtual void __unk_vfn_11(); - /** - * @vftbl 12 - * @symbol __unk_vfn_12 - */ - virtual void __unk_vfn_12(); - /** - * @vftbl 13 - * @symbol ?_Get\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEBAPEBXXZ - */ - virtual void const * _Get() const; - /** - * @vftbl 14 - * @symbol __unk_vfn_14 - */ - virtual void __unk_vfn_14(); - /** - * @vftbl 15 - * @symbol __unk_vfn_15 - */ - virtual void __unk_vfn_15(); - /** - * @vftbl 16 - * @symbol __unk_vfn_16 - */ - virtual void __unk_vfn_16(); - /** - * @vftbl 17 - * @symbol __unk_vfn_17 - */ - virtual void __unk_vfn_17(); - /** - * @vftbl 18 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z - */ - virtual void _Delete_this(bool); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTUREFEATURE /** * @symbol __unk_destructor_-1 @@ -178,10 +123,6 @@ class StructureFeature { * @symbol ?garbageCollectBlueprints\@StructureFeature\@\@QEAAXV?$buffer_span\@VChunkPos\@\@\@\@I\@Z */ MCAPI void garbageCollectBlueprints(class buffer_span, unsigned int); - /** - * @symbol ?getType\@StructureFeature\@\@QEBA?AW4StructureFeatureType\@\@XZ - */ - MCAPI enum class StructureFeatureType getType() const; /** * @symbol ?isInsideBoundingFeature\@StructureFeature\@\@QEAA_NHHH\@Z */ diff --git a/LiteLoader/include/llapi/mc/StructureHelpers.hpp b/LiteLoader/include/llapi/mc/StructureHelpers.hpp index 346dc351d0..c0a72af4c6 100644 --- a/LiteLoader/include/llapi/mc/StructureHelpers.hpp +++ b/LiteLoader/include/llapi/mc/StructureHelpers.hpp @@ -45,29 +45,9 @@ class StructureHelpers { * @symbol ?fillColumnDown\@StructureHelpers\@\@SAXAEAVStructurePiece\@\@AEAVBlockSource\@\@AEBVBlock\@\@HHHAEBVBoundingBox\@\@\@Z */ MCAPI static void fillColumnDown(class StructurePiece &, class BlockSource &, class Block const &, int, int, int, class BoundingBox const &); - /** - * @symbol ?getDirectionRotation\@StructureHelpers\@\@SAHHG\@Z - */ - MCAPI static int getDirectionRotation(int, unsigned short); - /** - * @symbol ?getDoorRotation\@StructureHelpers\@\@SAHHG\@Z - */ - MCAPI static int getDoorRotation(int, unsigned short); - /** - * @symbol ?getFacingDirectionRotation\@StructureHelpers\@\@SAHHG\@Z - */ - MCAPI static int getFacingDirectionRotation(int, unsigned short); - /** - * @symbol ?getRailRotation\@StructureHelpers\@\@SAHHG\@Z - */ - MCAPI static int getRailRotation(int, unsigned short); /** * @symbol ?getTorchRotation\@StructureHelpers\@\@SAHHG\@Z */ MCAPI static int getTorchRotation(int, unsigned short); - /** - * @symbol ?getWeirdoDirectionRotation\@StructureHelpers\@\@SAHHG\@Z - */ - MCAPI static int getWeirdoDirectionRotation(int, unsigned short); }; diff --git a/LiteLoader/include/llapi/mc/StructureIntegrityProcessor.hpp b/LiteLoader/include/llapi/mc/StructureIntegrityProcessor.hpp index a1542d49b1..c9788ddc96 100644 --- a/LiteLoader/include/llapi/mc/StructureIntegrityProcessor.hpp +++ b/LiteLoader/include/llapi/mc/StructureIntegrityProcessor.hpp @@ -29,10 +29,6 @@ class StructureIntegrityProcessor { #endif public: - /** - * @symbol ??0StructureIntegrityProcessor\@\@QEAA\@MI\@Z - */ - MCAPI StructureIntegrityProcessor(float, unsigned int); /** * @symbol ?generateFlagsForIndices\@StructureIntegrityProcessor\@\@QEBA?AV?$vector\@_NV?$allocator\@_N\@std\@\@\@std\@\@HH\@Z */ diff --git a/LiteLoader/include/llapi/mc/StructurePiece.hpp b/LiteLoader/include/llapi/mc/StructurePiece.hpp index 89acf788d9..d0e3078d75 100644 --- a/LiteLoader/include/llapi/mc/StructurePiece.hpp +++ b/LiteLoader/include/llapi/mc/StructurePiece.hpp @@ -51,7 +51,7 @@ class StructurePiece { virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** * @vftbl 4 - * @symbol ?postProcess\@SHLeftTurn\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @symbol ?postProcess\@NBCastleSmallCorridorLeftTurnPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &) = 0; /** diff --git a/LiteLoader/include/llapi/mc/StructurePoolActorRule.hpp b/LiteLoader/include/llapi/mc/StructurePoolActorRule.hpp index 3535993014..11e96e8d43 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolActorRule.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolActorRule.hpp @@ -31,9 +31,5 @@ class StructurePoolActorRule { * @symbol ??0StructurePoolActorRule\@\@QEAA\@$$QEAV?$unique_ptr\@VIStructurePoolActorPredicate\@\@U?$default_delete\@VIStructurePoolActorPredicate\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@\@Z */ MCAPI StructurePoolActorRule(std::unique_ptr &&, std::string); - /** - * @symbol ?processRule\@StructurePoolActorRule\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@\@Z - */ - MCAPI bool processRule(std::string const &, std::string &) const; }; diff --git a/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatch.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatch.hpp index 29b8345c9c..4c6d536b77 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatch.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatch.hpp @@ -44,6 +44,10 @@ class StructurePoolBlockPredicateBlockMatch { * @symbol ?test\@StructurePoolBlockPredicateBlockMatch\@\@UEBA_NAEBVBlockPos\@\@0AEAVRandomize\@\@\@Z */ virtual bool test(class BlockPos const &, class BlockPos const &, class Randomize &) const; + /** + * @symbol ??0StructurePoolBlockPredicateBlockMatch\@\@QEAA\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI StructurePoolBlockPredicateBlockMatch(std::vector); /** * @symbol ??0StructurePoolBlockPredicateBlockMatch\@\@QEAA\@AEBVBlock\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateCappedArcheologyBlockReplacement.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateCappedArcheologyBlockReplacement.hpp new file mode 100644 index 0000000000..0905c0c593 --- /dev/null +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateCappedArcheologyBlockReplacement.hpp @@ -0,0 +1,44 @@ +/** + * @file StructurePoolBlockPredicateCappedArcheologyBlockReplacement.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BrushableBlockActor.hpp" +#include "StructurePoolBlockPredicateCappedRandomBlockReplacement.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class StructurePoolBlockPredicateCappedArcheologyBlockReplacement : public StructurePoolBlockPredicateCappedRandomBlockReplacement { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_STRUCTUREPOOLBLOCKPREDICATECAPPEDARCHEOLOGYBLOCKREPLACEMENT +public: + class StructurePoolBlockPredicateCappedArcheologyBlockReplacement& operator=(class StructurePoolBlockPredicateCappedArcheologyBlockReplacement const &) = delete; + StructurePoolBlockPredicateCappedArcheologyBlockReplacement(class StructurePoolBlockPredicateCappedArcheologyBlockReplacement const &) = delete; + StructurePoolBlockPredicateCappedArcheologyBlockReplacement() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 3 + * @symbol ?finalize\@StructurePoolBlockPredicateCappedArcheologyBlockReplacement\@\@UEAA_NAEAVBlockSource\@\@AEAVIRandom\@\@\@Z + */ + virtual bool finalize(class BlockSource &, class IRandom &); + /** + * @symbol ??0StructurePoolBlockPredicateCappedArcheologyBlockReplacement\@\@QEAA\@AEBV?$map\@VHashedString\@\@V1\@U?$less\@VHashedString\@\@\@std\@\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V1\@\@std\@\@\@3\@\@std\@\@_KW4Placement\@BrushableBlockActor\@\@\@Z + */ + MCAPI StructurePoolBlockPredicateCappedArcheologyBlockReplacement(class std::map, class std::allocator>> const &, unsigned __int64, enum class BrushableBlockActor::Placement); + +}; diff --git a/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateCappedRandomBlockReplacement.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateCappedRandomBlockReplacement.hpp new file mode 100644 index 0000000000..71b6c3ca0a --- /dev/null +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateCappedRandomBlockReplacement.hpp @@ -0,0 +1,66 @@ +/** + * @file StructurePoolBlockPredicateCappedRandomBlockReplacement.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class StructurePoolBlockPredicateCappedRandomBlockReplacement { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_STRUCTUREPOOLBLOCKPREDICATECAPPEDRANDOMBLOCKREPLACEMENT +public: + class StructurePoolBlockPredicateCappedRandomBlockReplacement& operator=(class StructurePoolBlockPredicateCappedRandomBlockReplacement const &) = delete; + StructurePoolBlockPredicateCappedRandomBlockReplacement(class StructurePoolBlockPredicateCappedRandomBlockReplacement const &) = delete; + StructurePoolBlockPredicateCappedRandomBlockReplacement() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?test\@StructurePoolBlockPredicateCappedRandomBlockReplacement\@\@UEBA_NAEBVBlock\@\@AEAVRandomize\@\@\@Z + */ + virtual bool test(class Block const &, class Randomize &) const; + /** + * @vftbl 2 + * @symbol ?test\@StructurePoolBlockPredicateCappedRandomBlockReplacement\@\@UEBA_NAEBVBlockPos\@\@0AEAVRandomize\@\@\@Z + */ + virtual bool test(class BlockPos const &, class BlockPos const &, class Randomize &) const; + /** + * @vftbl 3 + * @symbol ?finalize\@StructurePoolBlockPredicateCappedRandomBlockReplacement\@\@UEAA_NAEAVBlockSource\@\@AEAVIRandom\@\@\@Z + */ + virtual bool finalize(class BlockSource &, class IRandom &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTUREPOOLBLOCKPREDICATECAPPEDRANDOMBLOCKREPLACEMENT + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~StructurePoolBlockPredicateCappedRandomBlockReplacement(); +#endif + /** + * @symbol ??0StructurePoolBlockPredicateCappedRandomBlockReplacement\@\@QEAA\@AEBV?$map\@VHashedString\@\@V1\@U?$less\@VHashedString\@\@\@std\@\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V1\@\@std\@\@\@3\@\@std\@\@_K\@Z + */ + MCAPI StructurePoolBlockPredicateCappedRandomBlockReplacement(class std::map, class std::allocator>> const &, unsigned __int64); + +//protected: + /** + * @symbol ?_finalize\@StructurePoolBlockPredicateCappedRandomBlockReplacement\@\@IEAA_NAEAVBlockSource\@\@AEAVIRandom\@\@V?$function\@$$A6AXAEAVBlockPos\@\@\@Z\@std\@\@\@Z + */ + MCAPI bool _finalize(class BlockSource &, class IRandom &, class std::function); + +protected: + +}; diff --git a/LiteLoader/include/llapi/mc/StructurePoolBlockRule.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockRule.hpp index 0e0b995c8b..453921f27f 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolBlockRule.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockRule.hpp @@ -37,6 +37,10 @@ class StructurePoolBlockRule { * @symbol ??0StructurePoolBlockRule\@\@QEAA\@$$QEAV?$unique_ptr\@VIStructurePoolBlockPredicate\@\@U?$default_delete\@VIStructurePoolBlockPredicate\@\@\@std\@\@\@std\@\@00PEBVBlock\@\@\@Z */ MCAPI StructurePoolBlockRule(std::unique_ptr &&, std::unique_ptr &&, std::unique_ptr &&, class Block const *); + /** + * @symbol ?finalizeRule\@StructurePoolBlockRule\@\@QEAA_NAEAVBlockSource\@\@AEAVIRandom\@\@\@Z + */ + MCAPI bool finalizeRule(class BlockSource &, class IRandom &); /** * @symbol ?processRule\@StructurePoolBlockRule\@\@QEBA_NAEBVBlock\@\@0AEAVRandom\@\@AEAPEBV2\@AEBVBlockPos\@\@3\@Z */ diff --git a/LiteLoader/include/llapi/mc/StructurePoolBlockTagRule.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockTagRule.hpp index 02027a1988..a2c4d4f2c7 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolBlockTagRule.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockTagRule.hpp @@ -31,9 +31,5 @@ class StructurePoolBlockTagRule { * @symbol ??0StructurePoolBlockTagRule\@\@QEAA\@$$QEAV?$unique_ptr\@VIStructurePoolBlockTagPredicate\@\@U?$default_delete\@VIStructurePoolBlockTagPredicate\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@1\@Z */ MCAPI StructurePoolBlockTagRule(std::unique_ptr &&, std::string, std::string); - /** - * @symbol ?processRule\@StructurePoolBlockTagRule\@\@QEBA_NAEBVBlock\@\@AEAVCompoundTag\@\@\@Z - */ - MCAPI bool processRule(class Block const &, class CompoundTag &) const; }; diff --git a/LiteLoader/include/llapi/mc/StructurePoolElement.hpp b/LiteLoader/include/llapi/mc/StructurePoolElement.hpp index 992d0dac5a..dcb959b07d 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolElement.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolElement.hpp @@ -103,6 +103,10 @@ class LazyTemplate { */ MCVAPI ~StructurePoolElement(); #endif + /** + * @symbol ??0StructurePoolElement\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@\@2\@\@4\@PEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@\@2\@\@4\@PEBV?$vector\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@\@2\@\@4\@W4Projection\@\@W4PostProcessSettings\@\@\@Z + */ + MCAPI StructurePoolElement(class gsl::not_null>, std::string const &, std::vector> const *, std::vector> const *, std::vector> const *, enum class Projection, enum class PostProcessSettings); /** * @symbol ??0StructurePoolElement\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Projection\@\@W4PostProcessSettings\@\@\@Z */ @@ -111,10 +115,6 @@ class LazyTemplate { * @symbol ??0StructurePoolElement\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UStructurePoolElementSettings\@\@\@Z */ MCAPI StructurePoolElement(class gsl::not_null>, std::string const &, struct StructurePoolElementSettings); - /** - * @symbol ??0StructurePoolElement\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@\@2\@\@4\@PEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@\@2\@\@4\@PEBV?$vector\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@\@2\@\@4\@W4Projection\@\@W4PostProcessSettings\@\@\@Z - */ - MCAPI StructurePoolElement(class gsl::not_null>, std::string const &, std::vector> const *, std::vector> const *, std::vector> const *, enum class Projection, enum class PostProcessSettings); //private: /** diff --git a/LiteLoader/include/llapi/mc/StructureSettings.hpp b/LiteLoader/include/llapi/mc/StructureSettings.hpp index 230d61e2d0..c8b83c765b 100644 --- a/LiteLoader/include/llapi/mc/StructureSettings.hpp +++ b/LiteLoader/include/llapi/mc/StructureSettings.hpp @@ -66,10 +66,6 @@ inline StructureSettings(BlockPos const& size, bool ignoreEntities, bool ignoreB * @symbol ?getIgnoreEntities\@StructureSettings\@\@QEBA_NXZ */ MCAPI bool getIgnoreEntities() const; - /** - * @symbol ?getIgnoreJigsawBlocks\@StructureSettings\@\@QEBA_NXZ - */ - MCAPI bool getIgnoreJigsawBlocks() const; /** * @symbol ?getIntegritySeed\@StructureSettings\@\@QEBAIXZ */ @@ -78,10 +74,6 @@ inline StructureSettings(BlockPos const& size, bool ignoreEntities, bool ignoreB * @symbol ?getIntegrityValue\@StructureSettings\@\@QEBAMXZ */ MCAPI float getIntegrityValue() const; - /** - * @symbol ?getIsWaterLogged\@StructureSettings\@\@QEBA_NXZ - */ - MCAPI bool getIsWaterLogged() const; /** * @symbol ?getLastTouchedByPlayerID\@StructureSettings\@\@QEBA?AUActorUniqueID\@\@XZ */ @@ -98,10 +90,6 @@ inline StructureSettings(BlockPos const& size, bool ignoreEntities, bool ignoreB * @symbol ?getPivot\@StructureSettings\@\@QEBAAEBVVec3\@\@XZ */ MCAPI class Vec3 const & getPivot() const; - /** - * @symbol ?getReloadActorEquipment\@StructureSettings\@\@QEBA_NXZ - */ - MCAPI bool getReloadActorEquipment() const; /** * @symbol ?getRotation\@StructureSettings\@\@QEBA?AW4Rotation\@\@XZ */ @@ -118,14 +106,14 @@ inline StructureSettings(BlockPos const& size, bool ignoreEntities, bool ignoreB * @symbol ?isAnimated\@StructureSettings\@\@QEBA_NXZ */ MCAPI bool isAnimated() const; - /** - * @symbol ??4StructureSettings\@\@QEAAAEAV0\@$$QEAV0\@\@Z - */ - MCAPI class StructureSettings & operator=(class StructureSettings &&); /** * @symbol ??4StructureSettings\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class StructureSettings & operator=(class StructureSettings const &); + /** + * @symbol ??4StructureSettings\@\@QEAAAEAV0\@$$QEAV0\@\@Z + */ + MCAPI class StructureSettings & operator=(class StructureSettings &&); /** * @symbol ?setAllowNonTickingPlayerAndTickingAreaChunks\@StructureSettings\@\@QEAAX_N\@Z */ @@ -138,10 +126,6 @@ inline StructureSettings(BlockPos const& size, bool ignoreEntities, bool ignoreB * @symbol ?setAnimationSeconds\@StructureSettings\@\@QEAAXM\@Z */ MCAPI void setAnimationSeconds(float); - /** - * @symbol ?setAnimationTicks\@StructureSettings\@\@QEAAXI\@Z - */ - MCAPI void setAnimationTicks(unsigned int); /** * @symbol ?setIgnoreBlocks\@StructureSettings\@\@QEAAX_N\@Z */ @@ -162,10 +146,6 @@ inline StructureSettings(BlockPos const& size, bool ignoreEntities, bool ignoreB * @symbol ?setIntegrityValue\@StructureSettings\@\@QEAAXM\@Z */ MCAPI void setIntegrityValue(float); - /** - * @symbol ?setIsWaterLogged\@StructureSettings\@\@QEAAX_N\@Z - */ - MCAPI void setIsWaterLogged(bool); /** * @symbol ?setLastTouchedByPlayerID\@StructureSettings\@\@QEAAXUActorUniqueID\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/StructureStart.hpp b/LiteLoader/include/llapi/mc/StructureStart.hpp index a54eafc156..caa88bf6e8 100644 --- a/LiteLoader/include/llapi/mc/StructureStart.hpp +++ b/LiteLoader/include/llapi/mc/StructureStart.hpp @@ -50,10 +50,6 @@ class StructureStart { */ MCVAPI ~StructureStart(); #endif - /** - * @symbol ?postProcessMobsAt\@StructureStart\@\@QEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z - */ - MCAPI void postProcessMobsAt(class BlockSource &, class Random &, class BoundingBox const &); //protected: /** diff --git a/LiteLoader/include/llapi/mc/StructureTemplate.hpp b/LiteLoader/include/llapi/mc/StructureTemplate.hpp index 963813096c..74158dc441 100644 --- a/LiteLoader/include/llapi/mc/StructureTemplate.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplate.hpp @@ -66,32 +66,6 @@ class StructureTemplate { * @symbol ?_allowReadActor\@StructureTemplate\@\@MEBA_NAEBVActor\@\@\@Z */ virtual bool _allowReadActor(class Actor const &) const; - /** - * @vftbl 4 - * @symbol __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 - * @symbol __unk_vfn_5 - */ - virtual void __unk_vfn_5(); - /** - * @vftbl 6 - * @symbol __unk_vfn_6 - */ - virtual void __unk_vfn_6(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); - /** - * @vftbl 8 - * @symbol __unk_vfn_8 - */ - virtual void __unk_vfn_8(); - #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTURETEMPLATE /** * @symbol __unk_destructor_-1 @@ -102,10 +76,6 @@ class StructureTemplate { * @symbol ??0StructureTemplate\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@V?$NonOwnerPointer\@VIUnknownBlockTypeRegistry\@\@\@Bedrock\@\@\@Z */ MCAPI StructureTemplate(class std::basic_string_view>, class Bedrock::NonOwnerPointer); - /** - * @symbol ??0StructureTemplate\@\@QEAA\@AEBV0\@V?$NonOwnerPointer\@VIUnknownBlockTypeRegistry\@\@\@Bedrock\@\@\@Z - */ - MCAPI StructureTemplate(class StructureTemplate const &, class Bedrock::NonOwnerPointer); /** * @symbol ?fillFromWorld\@StructureTemplate\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVStructureSettings\@\@\@Z */ @@ -126,10 +96,6 @@ class StructureTemplate { * @symbol ?getSize\@StructureTemplate\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getSize() const; - /** - * @symbol ?getStructureVersion\@StructureTemplate\@\@QEBAEXZ - */ - MCAPI unsigned char getStructureVersion() const; /** * @symbol ?getTransformedBounds\@StructureTemplate\@\@QEBA?AVBoundingBox\@\@VBlockPos\@\@AEBVStructureSettings\@\@\@Z */ @@ -138,10 +104,6 @@ class StructureTemplate { * @symbol ?isLoaded\@StructureTemplate\@\@QEBA_NXZ */ MCAPI bool isLoaded() const; - /** - * @symbol ?load\@StructureTemplate\@\@QEAA_NAEBVCompoundTag\@\@\@Z - */ - MCAPI bool load(class CompoundTag const &); /** * @symbol ?placeInWorld\@StructureTemplate\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPalette\@\@AEBVBlockPos\@\@AEBVStructureSettings\@\@PEAVStructureTelemetryServerData\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/StructureTemplateData.hpp b/LiteLoader/include/llapi/mc/StructureTemplateData.hpp index 45fad06bc4..d6ee4a9de5 100644 --- a/LiteLoader/include/llapi/mc/StructureTemplateData.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplateData.hpp @@ -51,42 +51,14 @@ class StructureTemplateData { * @symbol ?addEntityData\@StructureTemplateData\@\@QEAAXV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void addEntityData(std::unique_ptr); - /** - * @symbol ?addPalette\@StructureTemplateData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VStructureBlockPalette\@\@\@Z - */ - MCAPI void addPalette(std::string const &, class StructureBlockPalette); /** * @symbol ?clear\@StructureTemplateData\@\@QEAAXXZ */ MCAPI void clear(); - /** - * @symbol ?getAllPalettes\@StructureTemplateData\@\@QEBAAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VStructureBlockPalette\@\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VStructureBlockPalette\@\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getAllPalettes() const; - /** - * @symbol ?getBlockIndices\@StructureTemplateData\@\@QEBAAEBV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector const & getBlockIndices() const; - /** - * @symbol ?getEntityData\@StructureTemplateData\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI std::vector> const & getEntityData() const; - /** - * @symbol ?getExtraBlockIndices\@StructureTemplateData\@\@QEBAAEBV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector const & getExtraBlockIndices() const; /** * @symbol ?getPalette\@StructureTemplateData\@\@QEBAPEBVStructureBlockPalette\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class StructureBlockPalette const * getPalette(std::string const &) const; - /** - * @symbol ?getSize\@StructureTemplateData\@\@QEBAAEBVBlockPos\@\@XZ - */ - MCAPI class BlockPos const & getSize() const; - /** - * @symbol ?getStructureWorldOrigin\@StructureTemplateData\@\@QEBAAEBVBlockPos\@\@XZ - */ - MCAPI class BlockPos const & getStructureWorldOrigin() const; /** * @symbol ?load\@StructureTemplateData\@\@QEAA_NAEBVCompoundTag\@\@\@Z */ @@ -103,14 +75,6 @@ class StructureTemplateData { * @symbol ?setExtraBlockIndices\@StructureTemplateData\@\@QEAAXV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@\@Z */ MCAPI void setExtraBlockIndices(std::vector); - /** - * @symbol ?setSize\@StructureTemplateData\@\@QEAAXAEBVBlockPos\@\@\@Z - */ - MCAPI void setSize(class BlockPos const &); - /** - * @symbol ?setStructureWorldOrigin\@StructureTemplateData\@\@QEAAXAEBVBlockPos\@\@\@Z - */ - MCAPI void setStructureWorldOrigin(class BlockPos const &); /** * @symbol ?DEFAULT_PALETTE_NAME\@StructureTemplateData\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/StructureVoid.hpp b/LiteLoader/include/llapi/mc/StructureVoid.hpp index 7fc0ea791f..3eb4adb07c 100644 --- a/LiteLoader/include/llapi/mc/StructureVoid.hpp +++ b/LiteLoader/include/llapi/mc/StructureVoid.hpp @@ -201,20 +201,20 @@ class StructureVoid : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,25 +226,30 @@ class StructureVoid : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTUREVOID /** * @symbol ?canBeSilkTouched\@StructureVoid\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/SubBBsComponent.hpp b/LiteLoader/include/llapi/mc/SubBBsComponent.hpp index e9a15e32e5..f747ecb117 100644 --- a/LiteLoader/include/llapi/mc/SubBBsComponent.hpp +++ b/LiteLoader/include/llapi/mc/SubBBsComponent.hpp @@ -27,6 +27,10 @@ struct SubBBsComponent { #endif public: + /** + * @symbol ??4SubBBsComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + */ + MCAPI struct SubBBsComponent & operator=(struct SubBBsComponent &&); /** * @symbol ??1SubBBsComponent\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SubChunk.hpp b/LiteLoader/include/llapi/mc/SubChunk.hpp index 75bc365a14..fb02a0e036 100644 --- a/LiteLoader/include/llapi/mc/SubChunk.hpp +++ b/LiteLoader/include/llapi/mc/SubChunk.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "SubChunkBrightnessStorage.hpp" #include "Bedrock.hpp" #define BEFORE_EXTRA @@ -34,14 +33,14 @@ struct SubChunk { * @symbol ??0SubChunk\@\@QEAA\@PEBVBlock\@\@_N1AEAVSpinLock\@\@C\@Z */ MCAPI SubChunk(class Block const *, bool, bool, class SpinLock &, signed char); - /** - * @symbol ??0SubChunk\@\@QEAA\@XZ - */ - MCAPI SubChunk(); /** * @symbol ??0SubChunk\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI SubChunk(struct SubChunk &&); + /** + * @symbol ??0SubChunk\@\@QEAA\@XZ + */ + MCAPI SubChunk(); /** * @symbol ?deserialize\@SubChunk\@\@QEAAXAEAVIDataInput\@\@AEBVBlockPalette\@\@AEBVSubChunkPos\@\@V?$optional\@PEAUDeserializationChanges\@\@\@std\@\@\@Z */ @@ -142,14 +141,6 @@ struct SubChunk { * @symbol ?setSkyLight\@SubChunk\@\@QEAAXGE\@Z */ MCAPI void setSkyLight(unsigned short, unsigned char); - /** - * @symbol ?setSubChunkState\@SubChunk\@\@QEAAXW4SubChunkState\@1\@\@Z - */ - MCAPI void setSubChunkState(enum class SubChunk::SubChunkState); - /** - * @symbol ?shutdown\@SubChunk\@\@QEAAXXZ - */ - MCAPI void shutdown(); /** * @symbol ??1SubChunk\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SubChunkBrightnessStorage.hpp b/LiteLoader/include/llapi/mc/SubChunkBrightnessStorage.hpp deleted file mode 100644 index 670f95ed65..0000000000 --- a/LiteLoader/include/llapi/mc/SubChunkBrightnessStorage.hpp +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @file SubChunkBrightnessStorage.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SubChunkBrightnessStorage. - * - */ -class SubChunkBrightnessStorage { - -#define AFTER_EXTRA -public: - struct LightPair; - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SUBCHUNKBRIGHTNESSSTORAGE -public: - class SubChunkBrightnessStorage& operator=(class SubChunkBrightnessStorage const &) = delete; - SubChunkBrightnessStorage(class SubChunkBrightnessStorage const &) = delete; -#endif - -public: - /** - * @symbol ??0SubChunkBrightnessStorage\@\@QEAA\@XZ - */ - MCAPI SubChunkBrightnessStorage(); - /** - * @symbol ?reset\@SubChunkBrightnessStorage\@\@QEAAX_N\@Z - */ - MCAPI void reset(bool); - -}; diff --git a/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp b/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp index 3d8472b3eb..e574f806a0 100644 --- a/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "SubChunkBrightnessStorage.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -46,14 +45,14 @@ class SubChunkRelighter { * @symbol ?_propagateBlockLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z */ MCAPI void _propagateBlockLight(struct SubChunkLightIndex, unsigned char); - /** - * @symbol ?_propagateSkyLight\@SubChunkRelighter\@\@QEAAXXZ - */ - MCAPI void _propagateSkyLight(); /** * @symbol ?_propagateSkyLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z */ MCAPI void _propagateSkyLight(struct SubChunkLightIndex, unsigned char); + /** + * @symbol ?_propagateSkyLight\@SubChunkRelighter\@\@QEAAXXZ + */ + MCAPI void _propagateSkyLight(); /** * @symbol ?_propagateSubtractiveBlockLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z */ diff --git a/LiteLoader/include/llapi/mc/SubClientConnectionRequest.hpp b/LiteLoader/include/llapi/mc/SubClientConnectionRequest.hpp index c02b138bfe..a9b4488f81 100644 --- a/LiteLoader/include/llapi/mc/SubClientConnectionRequest.hpp +++ b/LiteLoader/include/llapi/mc/SubClientConnectionRequest.hpp @@ -145,6 +145,10 @@ class SubClientConnectionRequest { * @symbol ?isCapeOnClassicSkin\@SubClientConnectionRequest\@\@QEBA_NXZ */ MCAPI bool isCapeOnClassicSkin() const; + /** + * @symbol ?isCompatibleWithClientSideChunkGen\@SubClientConnectionRequest\@\@QEBA_NXZ + */ + MCAPI bool isCompatibleWithClientSideChunkGen() const; /** * @symbol ?isOverrideSkin\@SubClientConnectionRequest\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/SubpackInfoCollection.hpp b/LiteLoader/include/llapi/mc/SubpackInfoCollection.hpp index 8aae0ef8f1..588099c390 100644 --- a/LiteLoader/include/llapi/mc/SubpackInfoCollection.hpp +++ b/LiteLoader/include/llapi/mc/SubpackInfoCollection.hpp @@ -31,21 +31,5 @@ class SubpackInfoCollection { * @symbol ?addSubpackInfo\@SubpackInfoCollection\@\@QEAAX$$QEAUSubpackInfo\@\@\@Z */ MCAPI void addSubpackInfo(struct SubpackInfo &&); - /** - * @symbol ?getSubpackContentTier\@SubpackInfoCollection\@\@QEBA?AVContentTierInfo\@\@H\@Z - */ - MCAPI class ContentTierInfo getSubpackContentTier(int) const; - /** - * @symbol ?getSubpackFolderName\@SubpackInfoCollection\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - MCAPI std::string const & getSubpackFolderName(int) const; - /** - * @symbol ?getSubpackInfo\@SubpackInfoCollection\@\@QEBAAEBV?$vector\@USubpackInfo\@\@V?$allocator\@USubpackInfo\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector const & getSubpackInfo() const; - /** - * @symbol ?hasSubpacks\@SubpackInfoCollection\@\@QEBA_NXZ - */ - MCAPI bool hasSubpacks() const; }; diff --git a/LiteLoader/include/llapi/mc/SummonCommand.hpp b/LiteLoader/include/llapi/mc/SummonCommand.hpp index 9f5c20b069..d5d4a02b87 100644 --- a/LiteLoader/include/llapi/mc/SummonCommand.hpp +++ b/LiteLoader/include/llapi/mc/SummonCommand.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "RotationCommandUtils.hpp" #include "Command.hpp" #define BEFORE_EXTRA @@ -36,7 +37,7 @@ class SummonCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@SummonCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; @@ -45,4 +46,12 @@ class SummonCommand : public Command { */ MCAPI static void setup(class CommandRegistry &); +//private: + /** + * @symbol ?_getFacingDirection\@SummonCommand\@\@AEBA?AW4FacingResult\@RotationCommandUtils\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVVec3\@\@\@Z + */ + MCAPI enum class RotationCommandUtils::FacingResult _getFacingDirection(class CommandOrigin const &, class CommandOutput &, class Vec3 &) const; + +private: + }; diff --git a/LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentAttributes.hpp b/LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentAttributes.hpp index 1da193b9f7..d2536c031f 100644 --- a/LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentAttributes.hpp +++ b/LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentAttributes.hpp @@ -41,9 +41,5 @@ struct SurfaceMaterialAdjustmentAttributes { * @symbol ?parseExpressionNodeFloat\@SurfaceMaterialAdjustmentAttributes\@\@QEAAXAEBVCompoundTag\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1AEAVExpressionNode\@\@M\@Z */ MCAPI void parseExpressionNodeFloat(class CompoundTag const &, std::string const &, std::string const &, class ExpressionNode &, float); - /** - * @symbol ??1SurfaceMaterialAdjustmentAttributes\@\@QEAA\@XZ - */ - MCAPI ~SurfaceMaterialAdjustmentAttributes(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SurvivalMode.hpp b/LiteLoader/include/llapi/mc/SurvivalMode.hpp index 406d7669fb..60444977ff 100644 --- a/LiteLoader/include/llapi/mc/SurvivalMode.hpp +++ b/LiteLoader/include/llapi/mc/SurvivalMode.hpp @@ -67,9 +67,9 @@ class SurvivalMode : public GameMode { virtual bool useItem(class ItemStack &); /** * @vftbl 12 - * @symbol ?useItemOn\@SurvivalMode\@\@UEAA_NAEAVItemStack\@\@AEBVBlockPos\@\@EAEBVVec3\@\@PEBVBlock\@\@\@Z + * @symbol ?useItemOn\@SurvivalMode\@\@UEAA?AVInteractionResult\@\@AEAVItemStack\@\@AEBVBlockPos\@\@EAEBVVec3\@\@PEBVBlock\@\@\@Z */ - virtual bool useItemOn(class ItemStack &, class BlockPos const &, unsigned char, class Vec3 const &, class Block const *); + virtual class InteractionResult useItemOn(class ItemStack &, class BlockPos const &, unsigned char, class Vec3 const &, class Block const *); /** * @vftbl 13 * @symbol ?interact\@SurvivalMode\@\@UEAA_NAEAVActor\@\@AEBVVec3\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/SuspiciousSandBlockActor.hpp b/LiteLoader/include/llapi/mc/SuspiciousSandBlockActor.hpp deleted file mode 100644 index 1432dc58c1..0000000000 --- a/LiteLoader/include/llapi/mc/SuspiciousSandBlockActor.hpp +++ /dev/null @@ -1,110 +0,0 @@ -/** - * @file SuspiciousSandBlockActor.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -class SuspiciousSandBlockActor { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SUSPICIOUSSANDBLOCKACTOR -public: - class SuspiciousSandBlockActor& operator=(class SuspiciousSandBlockActor const &) = delete; - SuspiciousSandBlockActor(class SuspiciousSandBlockActor const &) = delete; - SuspiciousSandBlockActor() = delete; -#endif - -public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SUSPICIOUSSANDBLOCKACTOR - /** - * @symbol ?_getUpdatePacket\@SuspiciousSandBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z - */ - MCVAPI std::unique_ptr _getUpdatePacket(class BlockSource &); - /** - * @symbol ?_onUpdatePacket\@SuspiciousSandBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z - */ - MCVAPI void _onUpdatePacket(class CompoundTag const &, class BlockSource &); - /** - * @symbol ?getContainerSize\@SuspiciousSandBlockActor\@\@UEBAHXZ - */ - MCVAPI int getContainerSize() const; - /** - * @symbol ?getItem\@SuspiciousSandBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z - */ - MCVAPI class ItemStack const & getItem(int) const; - /** - * @symbol ?getMaxStackSize\@SuspiciousSandBlockActor\@\@UEBAHXZ - */ - MCVAPI int getMaxStackSize() const; - /** - * @symbol ?load\@SuspiciousSandBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z - */ - MCVAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &); - /** - * @symbol ?onChanged\@SuspiciousSandBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z - */ - MCVAPI void onChanged(class BlockSource &); - /** - * @symbol ?onRemoved\@SuspiciousSandBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z - */ - MCVAPI void onRemoved(class BlockSource &); - /** - * @symbol ?save\@SuspiciousSandBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z - */ - MCVAPI bool save(class CompoundTag &) const; - /** - * @symbol ?serverInitItemStackIds\@SuspiciousSandBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z - */ - MCVAPI void serverInitItemStackIds(int, int, class std::function); - /** - * @symbol ?setItem\@SuspiciousSandBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z - */ - MCVAPI void setItem(int, class ItemStack const &); - /** - * @symbol ?stopOpen\@SuspiciousSandBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z - */ - MCVAPI void stopOpen(class Player &); -#endif - /** - * @symbol ??0SuspiciousSandBlockActor\@\@QEAA\@AEBVBlockPos\@\@W4Placement\@0\@\@Z - */ - MCAPI SuspiciousSandBlockActor(class BlockPos const &, enum class SuspiciousSandBlockActor::Placement); - /** - * @symbol ?brush\@SuspiciousSandBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z - */ - MCAPI void brush(class BlockSource &, class BlockPos const &, unsigned char); - /** - * @symbol ?update\@SuspiciousSandBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI void update(class BlockSource &, class BlockPos const &); - /** - * @symbol ?getLootTableFromVariant\@SuspiciousSandBlockActor\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Placement\@1\@\@Z - */ - MCAPI static std::string getLootTableFromVariant(enum class SuspiciousSandBlockActor::Placement); - /** - * @symbol ?tryGet\@SuspiciousSandBlockActor\@\@SAPEAV1\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI static class SuspiciousSandBlockActor * tryGet(class BlockSource &, class BlockPos const &); - -//private: - /** - * @symbol ?_brushingCompleted\@SuspiciousSandBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z - */ - MCAPI void _brushingCompleted(class BlockSource &); - /** - * @symbol ?_removeDisplayEntity\@SuspiciousSandBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z - */ - MCAPI void _removeDisplayEntity(class BlockSource &); - -private: - -}; diff --git a/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp b/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp index ab9d479a40..67475eddf6 100644 --- a/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp +++ b/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp @@ -112,10 +112,6 @@ class SuspiciousStewItem : public Item { */ MCVAPI bool uniqueAuxValues() const; #endif - /** - * @symbol ??0SuspiciousStewItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z - */ - MCAPI SuspiciousStewItem(std::string const &, short); /** * @symbol ?applyStewEffect\@SuspiciousStewItem\@\@SAXAEBVItemStack\@\@AEAVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SwamplandHut.hpp b/LiteLoader/include/llapi/mc/SwamplandHut.hpp index d74a311d3f..c044f628b3 100644 --- a/LiteLoader/include/llapi/mc/SwamplandHut.hpp +++ b/LiteLoader/include/llapi/mc/SwamplandHut.hpp @@ -55,10 +55,6 @@ class SwamplandHut : public StructurePiece { * @symbol ?addHardcodedSpawnAreas\@SwamplandHut\@\@UEBAXAEAVLevelChunk\@\@\@Z */ virtual void addHardcodedSpawnAreas(class LevelChunk &) const; - /** - * @symbol ??0SwamplandHut\@\@QEAA\@FHH\@Z - */ - MCAPI SwamplandHut(short, int, int); //protected: /** diff --git a/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp b/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp index 3787bd3caa..73d8e1e613 100644 --- a/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp +++ b/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp @@ -241,35 +241,35 @@ class SweetBerryBushBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@SweetBerryBushBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@SweetBerryBushBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 158 + * @vftbl 159 * @symbol ?dealsContactDamage\@SweetBerryBushBlock\@\@UEBA_NAEBVActor\@\@AEBVBlock\@\@_N\@Z */ virtual bool dealsContactDamage(class Actor const &, class Block const &, bool) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -281,52 +281,57 @@ class SweetBerryBushBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 172 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?randomTick\@SweetBerryBushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@SweetBerryBushBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@SweetBerryBushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 180 + * @vftbl 181 * @symbol ?getRenderLayer\@SweetBerryBushBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 181 + * @vftbl 182 * @symbol ?getRenderLayer\@SweetBerryBushBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@SweetBerryBushBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SwellGoal.hpp b/LiteLoader/include/llapi/mc/SwellGoal.hpp index 92a883d048..cda43ea98e 100644 --- a/LiteLoader/include/llapi/mc/SwellGoal.hpp +++ b/LiteLoader/include/llapi/mc/SwellGoal.hpp @@ -69,9 +69,5 @@ class SwellGoal { * @symbol ?appendDebugInfo\@SwellGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; - /** - * @symbol ??0SwellGoal\@\@QEAA\@PEAVCreeper\@\@MM\@Z - */ - MCAPI SwellGoal(class Creeper *, float, float); }; diff --git a/LiteLoader/include/llapi/mc/SwimIdleDefinition.hpp b/LiteLoader/include/llapi/mc/SwimIdleDefinition.hpp index 0832145b13..54a40c25c4 100644 --- a/LiteLoader/include/llapi/mc/SwimIdleDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SwimIdleDefinition.hpp @@ -26,17 +26,10 @@ class SwimIdleDefinition { public: class SwimIdleDefinition& operator=(class SwimIdleDefinition const &) = delete; SwimIdleDefinition(class SwimIdleDefinition const &) = delete; + SwimIdleDefinition() = delete; #endif public: - /** - * @symbol ??0SwimIdleDefinition\@\@QEAA\@XZ - */ - MCAPI SwimIdleDefinition(); - /** - * @symbol ?initialize\@SwimIdleDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSwimIdleGoal\@\@\@Z - */ - MCAPI void initialize(class EntityContext &, class SwimIdleGoal &) const; /** * @symbol ?buildSchema\@SwimIdleDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSwimIdleDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SwimIdleGoal.hpp b/LiteLoader/include/llapi/mc/SwimIdleGoal.hpp index 32cd9db293..841d3714dc 100644 --- a/LiteLoader/include/llapi/mc/SwimIdleGoal.hpp +++ b/LiteLoader/include/llapi/mc/SwimIdleGoal.hpp @@ -69,9 +69,5 @@ class SwimIdleGoal { * @symbol ?appendDebugInfo\@SwimIdleGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; - /** - * @symbol ??0SwimIdleGoal\@\@QEAA\@AEAVMob\@\@\@Z - */ - MCAPI SwimIdleGoal(class Mob &); }; diff --git a/LiteLoader/include/llapi/mc/SwimTriggerSystem.hpp b/LiteLoader/include/llapi/mc/SwimTriggerSystem.hpp index 29fadc2042..20c2c8f74b 100644 --- a/LiteLoader/include/llapi/mc/SwimTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/SwimTriggerSystem.hpp @@ -44,20 +44,21 @@ class SwimTriggerSystem { virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol ?tick\@SwimTriggerSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@UAbilitiesComponent\@\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@UActorRotationComponent\@\@UDimensionTypeComponent\@\@UMoveInputComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@U?$Write\@UPlayerActionComponent\@\@UPlayerInputRequestComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @symbol __unk_vfn_3 */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct ActorRotationComponent, struct DimensionTypeComponent, struct MoveInputComponent, struct StateVectorComponent, struct SynchedActorDataComponent, class FlagComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void __unk_vfn_3(); /** - * @symbol ?create\@SwimTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @vftbl 4 + * @symbol ?tick\@SwimTriggerSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UPlayerGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@UAbilitiesComponent\@\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@UActorRotationComponent\@\@UDimensionTypeComponent\@\@UMoveInputComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@U?$Write\@UPlayerActionComponent\@\@UPlayerInputRequestComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ - MCAPI static struct TickingSystemWithInfo create(); + virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct ActorRotationComponent, struct DimensionTypeComponent, struct MoveInputComponent, struct StateVectorComponent, struct SynchedActorDataComponent, class FlagComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** - * @symbol ?createSideBySide\@SwimTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@SwimTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createSideBySide(); + MCAPI static struct TickingSystemWithInfo create(); /** - * @symbol ?tickSwimTriggerSystem\@SwimTriggerSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUAbilitiesComponent\@\@AEBUActorRotationComponent\@\@AEBUMoveInputComponent\@\@AEBUStateVectorComponent\@\@AEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$Optional\@UPlayerActionComponent\@\@\@\@AEAUPlayerInputRequestComponent\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@UAbilitiesComponent\@\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@UActorRotationComponent\@\@UDimensionTypeComponent\@\@UMoveInputComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@U?$Write\@UPlayerActionComponent\@\@UPlayerInputRequestComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?tickSwimTriggerSystem\@SwimTriggerSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUAbilitiesComponent\@\@AEBUActorRotationComponent\@\@AEBUMoveInputComponent\@\@AEBUStateVectorComponent\@\@AEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$Optional\@UPlayerActionComponent\@\@\@\@AEAUPlayerInputRequestComponent\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UPlayerGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@UAbilitiesComponent\@\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@UActorRotationComponent\@\@UDimensionTypeComponent\@\@UMoveInputComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@U?$Write\@UPlayerActionComponent\@\@UPlayerInputRequestComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static void tickSwimTriggerSystem(class StrictEntityContext const &, struct AABBShapeComponent const &, struct AbilitiesComponent const &, struct ActorRotationComponent const &, struct MoveInputComponent const &, struct StateVectorComponent const &, struct SynchedActorDataComponent const &, class Optional const>, class Optional const>, class Optional, struct PlayerInputRequestComponent &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct ActorRotationComponent, struct DimensionTypeComponent, struct MoveInputComponent, struct StateVectorComponent, struct SynchedActorDataComponent, class FlagComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class IConstBlockSource const &); + MCAPI static void tickSwimTriggerSystem(class StrictEntityContext const &, struct AABBShapeComponent const &, struct AbilitiesComponent const &, struct ActorRotationComponent const &, struct MoveInputComponent const &, struct StateVectorComponent const &, struct SynchedActorDataComponent const &, class Optional const>, class Optional const>, class Optional, struct PlayerInputRequestComponent &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct ActorRotationComponent, struct DimensionTypeComponent, struct MoveInputComponent, struct StateVectorComponent, struct SynchedActorDataComponent, class FlagComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class IConstBlockSource const &); }; diff --git a/LiteLoader/include/llapi/mc/SwimWanderDefinition.hpp b/LiteLoader/include/llapi/mc/SwimWanderDefinition.hpp index 5ac6eee11a..41463aadec 100644 --- a/LiteLoader/include/llapi/mc/SwimWanderDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SwimWanderDefinition.hpp @@ -26,17 +26,10 @@ class SwimWanderDefinition { public: class SwimWanderDefinition& operator=(class SwimWanderDefinition const &) = delete; SwimWanderDefinition(class SwimWanderDefinition const &) = delete; + SwimWanderDefinition() = delete; #endif public: - /** - * @symbol ??0SwimWanderDefinition\@\@QEAA\@XZ - */ - MCAPI SwimWanderDefinition(); - /** - * @symbol ?initialize\@SwimWanderDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSwimWanderGoal\@\@\@Z - */ - MCAPI void initialize(class EntityContext &, class SwimWanderGoal &) const; /** * @symbol ?buildSchema\@SwimWanderDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSwimWanderDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SwimWanderGoal.hpp b/LiteLoader/include/llapi/mc/SwimWanderGoal.hpp index da6446be37..1e70459e92 100644 --- a/LiteLoader/include/llapi/mc/SwimWanderGoal.hpp +++ b/LiteLoader/include/llapi/mc/SwimWanderGoal.hpp @@ -69,10 +69,6 @@ class SwimWanderGoal { * @symbol ?appendDebugInfo\@SwimWanderGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; - /** - * @symbol ??0SwimWanderGoal\@\@QEAA\@AEAVMob\@\@\@Z - */ - MCAPI SwimWanderGoal(class Mob &); //protected: /** diff --git a/LiteLoader/include/llapi/mc/SwimWithEntityDefinition.hpp b/LiteLoader/include/llapi/mc/SwimWithEntityDefinition.hpp index 390b48edb3..30ab28b746 100644 --- a/LiteLoader/include/llapi/mc/SwimWithEntityDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SwimWithEntityDefinition.hpp @@ -26,17 +26,10 @@ class SwimWithEntityDefinition { public: class SwimWithEntityDefinition& operator=(class SwimWithEntityDefinition const &) = delete; SwimWithEntityDefinition(class SwimWithEntityDefinition const &) = delete; + SwimWithEntityDefinition() = delete; #endif public: - /** - * @symbol ??0SwimWithEntityDefinition\@\@QEAA\@XZ - */ - MCAPI SwimWithEntityDefinition(); - /** - * @symbol ?initialize\@SwimWithEntityDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSwimWithEntityGoal\@\@\@Z - */ - MCAPI void initialize(class EntityContext &, class SwimWithEntityGoal &) const; /** * @symbol ?buildSchema\@SwimWithEntityDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSwimWithEntityDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SwimWithEntityGoal.hpp b/LiteLoader/include/llapi/mc/SwimWithEntityGoal.hpp index 9df47de693..107369e51d 100644 --- a/LiteLoader/include/llapi/mc/SwimWithEntityGoal.hpp +++ b/LiteLoader/include/llapi/mc/SwimWithEntityGoal.hpp @@ -69,10 +69,6 @@ class SwimWithEntityGoal { * @symbol ?appendDebugInfo\@SwimWithEntityGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; - /** - * @symbol ??0SwimWithEntityGoal\@\@QEAA\@AEAVMob\@\@\@Z - */ - MCAPI SwimWithEntityGoal(class Mob &); //private: /** diff --git a/LiteLoader/include/llapi/mc/SwoopAttackDefinition.hpp b/LiteLoader/include/llapi/mc/SwoopAttackDefinition.hpp index 20d86fb1ea..6e420e91ed 100644 --- a/LiteLoader/include/llapi/mc/SwoopAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SwoopAttackDefinition.hpp @@ -26,17 +26,10 @@ class SwoopAttackDefinition { public: class SwoopAttackDefinition& operator=(class SwoopAttackDefinition const &) = delete; SwoopAttackDefinition(class SwoopAttackDefinition const &) = delete; + SwoopAttackDefinition() = delete; #endif public: - /** - * @symbol ??0SwoopAttackDefinition\@\@QEAA\@XZ - */ - MCAPI SwoopAttackDefinition(); - /** - * @symbol ?initialize\@SwoopAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSwoopAttackGoal\@\@\@Z - */ - MCAPI void initialize(class EntityContext &, class SwoopAttackGoal &) const; /** * @symbol ?buildSchema\@SwoopAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSwoopAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SwoopAttackGoal.hpp b/LiteLoader/include/llapi/mc/SwoopAttackGoal.hpp index d1fcb4d1c0..41d607e4c8 100644 --- a/LiteLoader/include/llapi/mc/SwoopAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/SwoopAttackGoal.hpp @@ -69,9 +69,5 @@ class SwoopAttackGoal { * @symbol ?appendDebugInfo\@SwoopAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; - /** - * @symbol ??0SwoopAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z - */ - MCAPI SwoopAttackGoal(class Mob &); }; diff --git a/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp b/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp index 2a8af818c5..71b3008d80 100644 --- a/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp +++ b/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp @@ -65,13 +65,13 @@ class SyncActorPropertyPacket : public Packet { */ MCVAPI ~SyncActorPropertyPacket(); #endif - /** - * @symbol ??0SyncActorPropertyPacket\@\@QEAA\@AEBVHashedString\@\@AEBVPropertyGroupManager\@\@\@Z - */ - MCAPI SyncActorPropertyPacket(class HashedString const &, class PropertyGroupManager const &); /** * @symbol ??0SyncActorPropertyPacket\@\@QEAA\@XZ */ MCAPI SyncActorPropertyPacket(); + /** + * @symbol ??0SyncActorPropertyPacket\@\@QEAA\@AEBVHashedString\@\@AEBVPropertyGroupManager\@\@\@Z + */ + MCAPI SyncActorPropertyPacket(class HashedString const &, class PropertyGroupManager const &); }; diff --git a/LiteLoader/include/llapi/mc/SystemInfo.hpp b/LiteLoader/include/llapi/mc/SystemInfo.hpp index e5f5484ad0..f57a5574c3 100644 --- a/LiteLoader/include/llapi/mc/SystemInfo.hpp +++ b/LiteLoader/include/llapi/mc/SystemInfo.hpp @@ -20,6 +20,10 @@ struct SystemInfo { #undef AFTER_EXTRA public: + /** + * @symbol ??0SystemInfo\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI SystemInfo(struct SystemInfo &&); /** * @symbol ??0SystemInfo\@\@QEAA\@AEBU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Tag.hpp b/LiteLoader/include/llapi/mc/Tag.hpp index 1821974eb2..c478ad3000 100644 --- a/LiteLoader/include/llapi/mc/Tag.hpp +++ b/LiteLoader/include/llapi/mc/Tag.hpp @@ -124,22 +124,22 @@ class Tag { virtual void deleteChildren(); /** * @vftbl 2 - * @symbol ?write\@DoubleTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @symbol ?write\@StringTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ virtual void write(class IDataOutput &) const = 0; /** * @vftbl 3 - * @symbol ?load\@DoubleTag\@\@UEAAXAEAVIDataInput\@\@\@Z + * @symbol ?load\@StringTag\@\@UEAAXAEAVIDataInput\@\@\@Z */ virtual void load(class IDataInput &) = 0; /** * @vftbl 4 - * @symbol ?toString\@DoubleTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?toString\@StringTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toString() const = 0; /** * @vftbl 5 - * @symbol ?getId\@DoubleTag\@\@UEBA?AW4Type\@Tag\@\@XZ + * @symbol ?getId\@StringTag\@\@UEBA?AW4Type\@Tag\@\@XZ */ virtual enum class Tag::Type getId() const = 0; /** @@ -159,12 +159,12 @@ class Tag { virtual void print(std::string const &, class PrintStream &) const; /** * @vftbl 9 - * @symbol ?copy\@DoubleTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?copy\@StringTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr copy() const = 0; /** * @vftbl 10 - * @symbol ?hash\@DoubleTag\@\@UEBA_KXZ + * @symbol ?hash\@StringTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const = 0; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TAG diff --git a/LiteLoader/include/llapi/mc/TagCommand.hpp b/LiteLoader/include/llapi/mc/TagCommand.hpp index bb857a4373..cabd09c13a 100644 --- a/LiteLoader/include/llapi/mc/TagCommand.hpp +++ b/LiteLoader/include/llapi/mc/TagCommand.hpp @@ -36,7 +36,7 @@ class TagCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@TagCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TagUpdateToken.hpp b/LiteLoader/include/llapi/mc/TagUpdateToken.hpp index 830c6fe57b..a395bdcd13 100644 --- a/LiteLoader/include/llapi/mc/TagUpdateToken.hpp +++ b/LiteLoader/include/llapi/mc/TagUpdateToken.hpp @@ -27,6 +27,10 @@ class TagUpdateToken { #endif public: + /** + * @symbol ??0TagUpdateToken\@\@QEAA\@V?$weak_ptr\@U?$atomic\@H\@std\@\@\@std\@\@\@Z + */ + MCAPI TagUpdateToken(class std::weak_ptr>); /** * @symbol ??1TagUpdateToken\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp b/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp index e7dcf70716..2f3989e229 100644 --- a/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp @@ -60,13 +60,13 @@ class TakeItemActorPacket : public Packet { */ MCVAPI ~TakeItemActorPacket(); #endif - /** - * @symbol ??0TakeItemActorPacket\@\@QEAA\@XZ - */ - MCAPI TakeItemActorPacket(); /** * @symbol ??0TakeItemActorPacket\@\@QEAA\@VActorRuntimeID\@\@0\@Z */ MCAPI TakeItemActorPacket(class ActorRuntimeID, class ActorRuntimeID); + /** + * @symbol ??0TakeItemActorPacket\@\@QEAA\@XZ + */ + MCAPI TakeItemActorPacket(); }; diff --git a/LiteLoader/include/llapi/mc/TakePictureCommand.hpp b/LiteLoader/include/llapi/mc/TakePictureCommand.hpp index 54dd09f25c..73e7def5cf 100644 --- a/LiteLoader/include/llapi/mc/TakePictureCommand.hpp +++ b/LiteLoader/include/llapi/mc/TakePictureCommand.hpp @@ -36,7 +36,7 @@ class TakePictureCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@TakePictureCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TallGrass.hpp b/LiteLoader/include/llapi/mc/TallGrass.hpp index 16a4fbf68f..7d651b074c 100644 --- a/LiteLoader/include/llapi/mc/TallGrass.hpp +++ b/LiteLoader/include/llapi/mc/TallGrass.hpp @@ -216,45 +216,45 @@ class TallGrass : public BushBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@TallGrass\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@TallGrass\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@TallGrass\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColor\@TallGrass\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 161 + * @vftbl 162 * @symbol ?_addHardCodedBlockComponents\@TallGrass\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -266,52 +266,57 @@ class TallGrass : public BushBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 180 * @symbol ?canSurvive\@TallGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 180 + * @vftbl 181 * @symbol ?getRenderLayer\@TallGrass\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 181 + * @vftbl 182 * @symbol ?getRenderLayer\@TallGrass\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@TallGrass\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@TallGrass\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@TallGrass\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/TargetBlock.hpp b/LiteLoader/include/llapi/mc/TargetBlock.hpp index db3db6364d..c783d1f4f8 100644 --- a/LiteLoader/include/llapi/mc/TargetBlock.hpp +++ b/LiteLoader/include/llapi/mc/TargetBlock.hpp @@ -196,20 +196,20 @@ class TargetBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -222,34 +222,68 @@ class TargetBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 195 + * @symbol __unk_vfn_195 + */ + virtual void __unk_vfn_195(); + /** + * @vftbl 196 + * @symbol __unk_vfn_196 + */ + virtual void __unk_vfn_196(); + /** + * @vftbl 197 + * @symbol __unk_vfn_197 + */ + virtual void __unk_vfn_197(); + /** + * @vftbl 198 + * @symbol __unk_vfn_198 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_198(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 199 + * @symbol __unk_vfn_199 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_199(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ - virtual void __unk_vfn_186(); + MCAPI std::string const & getDescriptionId() const; /** * @symbol ??0TargetBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/TargetGoal.hpp b/LiteLoader/include/llapi/mc/TargetGoal.hpp index 302962fa93..179a6df15d 100644 --- a/LiteLoader/include/llapi/mc/TargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/TargetGoal.hpp @@ -36,7 +36,7 @@ class TargetGoal { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?canUse\@DefendVillageTargetGoal\@\@UEAA_NXZ + * @symbol ?canUse\@OwnerHurtTargetGoal\@\@UEAA_NXZ */ virtual bool canUse() = 0; /** diff --git a/LiteLoader/include/llapi/mc/TargetWhenPushedGoal.hpp b/LiteLoader/include/llapi/mc/TargetWhenPushedGoal.hpp index 93ff725cea..48975fa3cb 100644 --- a/LiteLoader/include/llapi/mc/TargetWhenPushedGoal.hpp +++ b/LiteLoader/include/llapi/mc/TargetWhenPushedGoal.hpp @@ -74,9 +74,5 @@ class TargetWhenPushedGoal { */ MCVAPI bool canContinueToUse(); #endif - /** - * @symbol ??0TargetWhenPushedGoal\@\@QEAA\@AEAVMob\@\@V?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@M\@Z - */ - MCAPI TargetWhenPushedGoal(class Mob &, std::vector, float); }; diff --git a/LiteLoader/include/llapi/mc/TaskQueuePortImpl.hpp b/LiteLoader/include/llapi/mc/TaskQueuePortImpl.hpp index abfd297d49..d685a98d3e 100644 --- a/LiteLoader/include/llapi/mc/TaskQueuePortImpl.hpp +++ b/LiteLoader/include/llapi/mc/TaskQueuePortImpl.hpp @@ -73,34 +73,39 @@ class TaskQueuePortImpl { virtual void Detach(struct ITaskQueuePortContext *); /** * @vftbl 12 - * @symbol ?DrainOneItem\@TaskQueuePortImpl\@\@UEAA_NXZ + * @symbol ?Dispatch\@TaskQueuePortImpl\@\@UEAA_NPEAUITaskQueuePortContext\@\@I\@Z */ - virtual bool DrainOneItem(); + virtual bool Dispatch(struct ITaskQueuePortContext *, unsigned int); /** * @vftbl 13 - * @symbol ?Wait\@TaskQueuePortImpl\@\@UEAA_NPEAUITaskQueuePortContext\@\@I\@Z - */ - virtual bool Wait(struct ITaskQueuePortContext *, unsigned int); - /** - * @vftbl 14 * @symbol ?IsEmpty\@TaskQueuePortImpl\@\@UEAA_NXZ */ virtual bool IsEmpty(); /** - * @vftbl 15 + * @vftbl 14 * @symbol ?SuspendTermination\@TaskQueuePortImpl\@\@UEAAJPEAUITaskQueuePortContext\@\@\@Z */ virtual long SuspendTermination(struct ITaskQueuePortContext *); /** - * @vftbl 16 + * @vftbl 15 * @symbol ?ResumeTermination\@TaskQueuePortImpl\@\@UEAAXPEAUITaskQueuePortContext\@\@\@Z */ virtual void ResumeTermination(struct ITaskQueuePortContext *); + /** + * @vftbl 16 + * @symbol ?SuspendPort\@TaskQueuePortImpl\@\@UEAAXXZ + */ + virtual void SuspendPort(); /** * @vftbl 17 - * @symbol __unk_vfn_17 + * @symbol ?ResumePort\@TaskQueuePortImpl\@\@UEAAXXZ */ - virtual void __unk_vfn_17(); + virtual void ResumePort(); + /** + * @vftbl 18 + * @symbol __unk_vfn_18 + */ + virtual void __unk_vfn_18(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TASKQUEUEPORTIMPL /** * @symbol __unk_destructor_-1 @@ -118,21 +123,33 @@ class TaskQueuePortImpl { //private: /** - * @symbol ?AppendEntry\@TaskQueuePortImpl\@\@AEAA_NAEBUQueueEntry\@1\@_K_N\@Z + * @symbol ?AppendEntry\@TaskQueuePortImpl\@\@AEAA_NAEBUQueueEntry\@1\@_K\@Z */ - MCAPI bool AppendEntry(struct TaskQueuePortImpl::QueueEntry const &, unsigned __int64, bool); + MCAPI bool AppendEntry(struct TaskQueuePortImpl::QueueEntry const &, unsigned __int64); /** - * @symbol ?AppendWaitRegistrationEntry\@TaskQueuePortImpl\@\@AEAA_NPEAUWaitRegistration\@1\@_N\@Z + * @symbol ?AppendWaitRegistrationEntry\@TaskQueuePortImpl\@\@AEAA_NPEAUWaitRegistration\@1\@\@Z */ - MCAPI bool AppendWaitRegistrationEntry(struct TaskQueuePortImpl::WaitRegistration *, bool); + MCAPI bool AppendWaitRegistrationEntry(struct TaskQueuePortImpl::WaitRegistration *); /** * @symbol ?CancelPendingEntries\@TaskQueuePortImpl\@\@AEAAXPEAUITaskQueuePortContext\@\@_N\@Z */ MCAPI void CancelPendingEntries(struct ITaskQueuePortContext *, bool); + /** + * @symbol ?DrainOneItem\@TaskQueuePortImpl\@\@AEAA_NAEAUThreadPoolActionStatus\@OS\@\@\@Z + */ + MCAPI bool DrainOneItem(struct OS::ThreadPoolActionStatus &); /** * @symbol ?InitializeWaitRegistration\@TaskQueuePortImpl\@\@AEAAJPEAUWaitRegistration\@1\@\@Z */ MCAPI long InitializeWaitRegistration(struct TaskQueuePortImpl::WaitRegistration *); + /** + * @symbol ?NotifyItemQueued\@TaskQueuePortImpl\@\@AEAAXXZ + */ + MCAPI void NotifyItemQueued(); + /** + * @symbol ?ProcessThreadPoolCallback\@TaskQueuePortImpl\@\@AEAAXAEAUThreadPoolActionStatus\@OS\@\@\@Z + */ + MCAPI void ProcessThreadPoolCallback(struct OS::ThreadPoolActionStatus &); /** * @symbol ?ScheduleTermination\@TaskQueuePortImpl\@\@AEAAXPEAUTerminationEntry\@1\@\@Z */ @@ -141,6 +158,10 @@ class TaskQueuePortImpl { * @symbol ?SubmitPendingCallback\@TaskQueuePortImpl\@\@AEAAXXZ */ MCAPI void SubmitPendingCallback(); + /** + * @symbol ?Wait\@TaskQueuePortImpl\@\@AEAA_NPEAUITaskQueuePortContext\@\@I\@Z + */ + MCAPI bool Wait(struct ITaskQueuePortContext *, unsigned int); /** * @symbol ?EraseQueue\@TaskQueuePortImpl\@\@CAXPEAV?$LocklessQueue\@UQueueEntry\@TaskQueuePortImpl\@\@\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/TaskResult.hpp b/LiteLoader/include/llapi/mc/TaskResult.hpp index b196d364f8..399fac2a3c 100644 --- a/LiteLoader/include/llapi/mc/TaskResult.hpp +++ b/LiteLoader/include/llapi/mc/TaskResult.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -33,14 +32,6 @@ class TaskResult { * @symbol ??0TaskResult\@\@QEAA\@XZ */ MCAPI TaskResult(); - /** - * @symbol ?getRunAtTime\@TaskResult\@\@QEBA?AV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@XZ - */ - MCAPI class std::chrono::time_point>> getRunAtTime() const; - /** - * @symbol ?getWaitingOperation\@TaskResult\@\@QEBA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@XZ - */ - MCAPI class std::shared_ptr> getWaitingOperation() const; /** * @symbol ?hasDelay\@TaskResult\@\@QEBA_NXZ */ @@ -53,10 +44,6 @@ class TaskResult { * @symbol ?isWaiting\@TaskResult\@\@QEBA_NXZ */ MCAPI bool isWaiting() const; - /** - * @symbol ?isWaitingOperationLinked\@TaskResult\@\@QEBA_NXZ - */ - MCAPI bool isWaitingOperationLinked() const; /** * @symbol ??1TaskResult\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/TeleportCommand.hpp b/LiteLoader/include/llapi/mc/TeleportCommand.hpp index 129299a291..6f89ec41e3 100644 --- a/LiteLoader/include/llapi/mc/TeleportCommand.hpp +++ b/LiteLoader/include/llapi/mc/TeleportCommand.hpp @@ -40,7 +40,7 @@ enum class TeleportAnalysis; */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@TeleportCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TeleportInterpolatorResetSystem.hpp b/LiteLoader/include/llapi/mc/TeleportInterpolatorResetSystem.hpp index 9cf1eac3b2..4123eb4a0b 100644 --- a/LiteLoader/include/llapi/mc/TeleportInterpolatorResetSystem.hpp +++ b/LiteLoader/include/llapi/mc/TeleportInterpolatorResetSystem.hpp @@ -31,5 +31,9 @@ class TeleportInterpolatorResetSystem { * @symbol ?createTeleportInterpolatorResetSystem\@TeleportInterpolatorResetSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createTeleportInterpolatorResetSystem(); + /** + * @symbol ?tickTeleportInterpolatorResetSystem\@TeleportInterpolatorResetSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UServerPlayerComponentFlag\@\@\@\@\@\@V?$Optional\@UMovementInterpolatorComponent\@\@\@\@$$CBUPlayerPositionModeComponent\@\@UFallDistanceComponent\@\@UStateVectorComponent\@\@\@\@\@Z + */ + MCAPI static void tickTeleportInterpolatorResetSystem(class ViewT, class FlagComponent>, class Optional, struct PlayerPositionModeComponent const, struct FallDistanceComponent, struct StateVectorComponent>); }; diff --git a/LiteLoader/include/llapi/mc/TellCommand.hpp b/LiteLoader/include/llapi/mc/TellCommand.hpp index f7ecf3fe6b..8efed02b0f 100644 --- a/LiteLoader/include/llapi/mc/TellCommand.hpp +++ b/LiteLoader/include/llapi/mc/TellCommand.hpp @@ -36,7 +36,7 @@ class TellCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@TellCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; @@ -47,9 +47,9 @@ class TellCommand : public Command { //private: /** - * @symbol ?_sendMessageToPlayers\@TellCommand\@\@AEBAXAEBV?$CommandSelectorResults\@VPlayer\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1AEBUCommandOriginIdentity\@\@AEAVLevel\@\@\@Z + * @symbol ?_sendMessageToPlayer\@TellCommand\@\@CAXAEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1AEBUCommandOriginIdentity\@\@AEAVLevel\@\@\@Z */ - MCAPI void _sendMessageToPlayers(class CommandSelectorResults const &, std::string const &, std::string const &, struct CommandOriginIdentity const &, class Level &) const; + MCAPI static void _sendMessageToPlayer(class Player &, std::string const &, std::string const &, struct CommandOriginIdentity const &, class Level &); private: diff --git a/LiteLoader/include/llapi/mc/TellRawCommand.hpp b/LiteLoader/include/llapi/mc/TellRawCommand.hpp index e5bbcf841b..d20b94c6c1 100644 --- a/LiteLoader/include/llapi/mc/TellRawCommand.hpp +++ b/LiteLoader/include/llapi/mc/TellRawCommand.hpp @@ -36,7 +36,7 @@ class TellRawCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@TellRawCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp b/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp index 74a82536c0..fb65df3698 100644 --- a/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp +++ b/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp @@ -47,7 +47,7 @@ class TemplateStructurePiece : public StructurePiece { virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** * @vftbl 13 - * @symbol ?_handleDataMarker\@EndCityPiece\@EndCityPieces\@\@MEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @symbol ?_handleDataMarker\@OceanRuinPiece\@OceanRuinPieces\@\@MEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual void _handleDataMarker(std::string const &, class BlockPos const &, class BlockSource &, class Random &, class BoundingBox const &) = 0; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TEMPLATESTRUCTUREPIECE diff --git a/LiteLoader/include/llapi/mc/TemporalAttributeBuff.hpp b/LiteLoader/include/llapi/mc/TemporalAttributeBuff.hpp index f547f3b96f..bcb5d678e5 100644 --- a/LiteLoader/include/llapi/mc/TemporalAttributeBuff.hpp +++ b/LiteLoader/include/llapi/mc/TemporalAttributeBuff.hpp @@ -91,9 +91,5 @@ class TemporalAttributeBuff { * @symbol ?serializationSetLifeTime\@TemporalAttributeBuff\@\@QEAAXH\@Z */ MCAPI void serializationSetLifeTime(int); - /** - * @symbol ?tick\@TemporalAttributeBuff\@\@QEAAXXZ - */ - MCAPI void tick(); }; diff --git a/LiteLoader/include/llapi/mc/TemptGoal.hpp b/LiteLoader/include/llapi/mc/TemptGoal.hpp index 32a6dcaf86..5142ba9bcd 100644 --- a/LiteLoader/include/llapi/mc/TemptGoal.hpp +++ b/LiteLoader/include/llapi/mc/TemptGoal.hpp @@ -72,9 +72,5 @@ class TemptGoal { * @symbol ??0TemptGoal\@\@QEAA\@AEBV0\@\@Z */ MCAPI TemptGoal(class TemptGoal const &); - /** - * @symbol ??0TemptGoal\@\@QEAA\@AEAVMob\@\@MAEBV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@W4LevelSoundEvent\@\@UFloatRange\@\@_NM44\@Z - */ - MCAPI TemptGoal(class Mob &, float, std::vector const &, enum class LevelSoundEvent, struct FloatRange, bool, float, bool, bool); }; diff --git a/LiteLoader/include/llapi/mc/TestAction.hpp b/LiteLoader/include/llapi/mc/TestAction.hpp index 4032833b18..b0e5956a79 100644 --- a/LiteLoader/include/llapi/mc/TestAction.hpp +++ b/LiteLoader/include/llapi/mc/TestAction.hpp @@ -26,6 +26,7 @@ class TestAction : public IRequestAction { public: class TestAction& operator=(class TestAction const &) = delete; TestAction(class TestAction const &) = delete; + TestAction() = delete; #endif public: @@ -44,9 +45,5 @@ class TestAction : public IRequestAction { * @symbol ??8TestAction\@\@UEBA_NAEAVIRequestAction\@\@\@Z */ virtual bool operator==(class IRequestAction &) const; - /** - * @symbol ??0TestAction\@\@QEAA\@XZ - */ - MCAPI TestAction(); }; diff --git a/LiteLoader/include/llapi/mc/TestForBlockCommand.hpp b/LiteLoader/include/llapi/mc/TestForBlockCommand.hpp index 1f0ec611ee..fdc92d92e2 100644 --- a/LiteLoader/include/llapi/mc/TestForBlockCommand.hpp +++ b/LiteLoader/include/llapi/mc/TestForBlockCommand.hpp @@ -36,7 +36,7 @@ class TestForBlockCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@TestForBlockCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TestForBlocksCommand.hpp b/LiteLoader/include/llapi/mc/TestForBlocksCommand.hpp index 2633b72a59..0ede7eaaa7 100644 --- a/LiteLoader/include/llapi/mc/TestForBlocksCommand.hpp +++ b/LiteLoader/include/llapi/mc/TestForBlocksCommand.hpp @@ -36,7 +36,7 @@ class TestForBlocksCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@TestForBlocksCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TestForCommand.hpp b/LiteLoader/include/llapi/mc/TestForCommand.hpp index e961b4d176..90fae26782 100644 --- a/LiteLoader/include/llapi/mc/TestForCommand.hpp +++ b/LiteLoader/include/llapi/mc/TestForCommand.hpp @@ -36,7 +36,7 @@ class TestForCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@TestForCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TestSummaryDisplayer.hpp b/LiteLoader/include/llapi/mc/TestSummaryDisplayer.hpp index bf09be41a1..03a5b46d68 100644 --- a/LiteLoader/include/llapi/mc/TestSummaryDisplayer.hpp +++ b/LiteLoader/include/llapi/mc/TestSummaryDisplayer.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "gametest.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here diff --git a/LiteLoader/include/llapi/mc/TextFilteringUtils.hpp b/LiteLoader/include/llapi/mc/TextFilteringUtils.hpp index b5423dc470..1be088af53 100644 --- a/LiteLoader/include/llapi/mc/TextFilteringUtils.hpp +++ b/LiteLoader/include/llapi/mc/TextFilteringUtils.hpp @@ -31,5 +31,17 @@ class TextFilteringUtils { * @symbol ?checkChatFilteringEventsAndSendToastIfClientWasMuted\@TextFilteringUtils\@\@SAXAEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@V?$not_null\@PEAVPacketSender\@\@\@gsl\@\@AEBVNetworkIdentifier\@\@AEBW4SubClientId\@\@\@Z */ MCAPI static void checkChatFilteringEventsAndSendToastIfClientWasMuted(std::vector const &, class gsl::not_null, class NetworkIdentifier const &, enum class SubClientId const &); + /** + * @symbol ?getFilterableStringsFromBlockEntity\@TextFilteringUtils\@\@SA?AV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBVCompoundTag\@\@W4BlockActorType\@\@\@Z + */ + MCAPI static std::vector getFilterableStringsFromBlockEntity(class CompoundTag const &, enum class BlockActorType); + /** + * @symbol ?hasDeprecatedSignTag\@TextFilteringUtils\@\@SA_NAEBVCompoundTag\@\@\@Z + */ + MCAPI static bool hasDeprecatedSignTag(class CompoundTag const &); + /** + * @symbol ?setFilteredStringsOnBlockEntity\@TextFilteringUtils\@\@SAXAEAVCompoundTag\@\@W4BlockActorType\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z + */ + MCAPI static void setFilteredStringsOnBlockEntity(class CompoundTag &, enum class BlockActorType, std::vector); }; diff --git a/LiteLoader/include/llapi/mc/TextObjectLocalizedTextWithParams.hpp b/LiteLoader/include/llapi/mc/TextObjectLocalizedTextWithParams.hpp index 861d55f5fc..359d16f1e3 100644 --- a/LiteLoader/include/llapi/mc/TextObjectLocalizedTextWithParams.hpp +++ b/LiteLoader/include/llapi/mc/TextObjectLocalizedTextWithParams.hpp @@ -54,9 +54,5 @@ class TextObjectLocalizedTextWithParams { * @symbol ??0TextObjectLocalizedTextWithParams\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@2\@\@Z */ MCAPI TextObjectLocalizedTextWithParams(std::string, std::vector const &); - /** - * @symbol ??0TextObjectLocalizedTextWithParams\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VTextObjectRoot\@\@U?$default_delete\@VTextObjectRoot\@\@\@std\@\@\@2\@\@Z - */ - MCAPI TextObjectLocalizedTextWithParams(std::string, std::unique_ptr); }; diff --git a/LiteLoader/include/llapi/mc/TextObjectParser.hpp b/LiteLoader/include/llapi/mc/TextObjectParser.hpp index b92e246bfd..3ed09b81e9 100644 --- a/LiteLoader/include/llapi/mc/TextObjectParser.hpp +++ b/LiteLoader/include/llapi/mc/TextObjectParser.hpp @@ -85,6 +85,10 @@ struct ServerData { * @symbol ?RAW_TEXT_ERROR_WITH_NOT_ARRAY_OR_RAW_TEXT\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_ERROR_WITH_NOT_ARRAY_OR_RAW_TEXT; + /** + * @symbol ?textObjectFromJson\@TextObjectParser\@\@SA_NAEBVValue\@Json\@\@AEAVTextObjectRoot\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI static bool textObjectFromJson(class Json::Value const &, class TextObjectRoot &, std::string &); /** * @symbol ?textObjectFromJsonServer\@TextObjectParser\@\@SA_NAEBVValue\@Json\@\@AEAVTextObjectRoot\@\@UServerData\@1\@AEAUErrorLocalization\@1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/TextObjectScore.hpp b/LiteLoader/include/llapi/mc/TextObjectScore.hpp index adb5025aa4..df819f23ea 100644 --- a/LiteLoader/include/llapi/mc/TextObjectScore.hpp +++ b/LiteLoader/include/llapi/mc/TextObjectScore.hpp @@ -50,10 +50,6 @@ class TextObjectScore { * @symbol ?resolve\@TextObjectScore\@\@UEBA?AVValue\@Json\@\@AEBUResolveData\@\@\@Z */ virtual class Json::Value resolve(struct ResolveData const &) const; - /** - * @symbol ??0TextObjectScore\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z - */ - MCAPI TextObjectScore(std::string, std::string); /** * @symbol ?RAW_TEXT_SCORE_KEY\@TextObjectScore\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/TextObjectSelector.hpp b/LiteLoader/include/llapi/mc/TextObjectSelector.hpp index b5d329d1e7..183c9704b1 100644 --- a/LiteLoader/include/llapi/mc/TextObjectSelector.hpp +++ b/LiteLoader/include/llapi/mc/TextObjectSelector.hpp @@ -50,10 +50,6 @@ class TextObjectSelector { * @symbol ?resolve\@TextObjectSelector\@\@UEBA?AVValue\@Json\@\@AEBUResolveData\@\@\@Z */ virtual class Json::Value resolve(struct ResolveData const &) const; - /** - * @symbol ??0TextObjectSelector\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI TextObjectSelector(std::string); /** * @symbol ?RAW_TEXT_SELECTOR_KEY\@TextObjectSelector\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/TextPacket.hpp b/LiteLoader/include/llapi/mc/TextPacket.hpp index 4aea0ae5de..c3f69ca806 100644 --- a/LiteLoader/include/llapi/mc/TextPacket.hpp +++ b/LiteLoader/include/llapi/mc/TextPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "PlayerCapabilities.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -65,6 +66,10 @@ class TextPacket : public Packet { * @symbol ??0TextPacket\@\@QEAA\@XZ */ MCAPI TextPacket(); + /** + * @symbol ?_shouldHandleTextPacketForPlayer\@TextPacket\@\@SA?B_NAEBV1\@AEAUIPlayerData\@PlayerCapabilities\@\@AEBUISharedController\@3\@\@Z + */ + MCAPI static bool const _shouldHandleTextPacketForPlayer(class TextPacket const &, struct PlayerCapabilities::IPlayerData &, struct PlayerCapabilities::ISharedController const &); /** * @symbol ?createAnnouncement\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z */ @@ -89,14 +94,14 @@ class TextPacket : public Packet { * @symbol ?createTextObjectMessage\@TextPacket\@\@SA?AV1\@AEBVResolvedTextObject\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z */ MCAPI static class TextPacket createTextObjectMessage(class ResolvedTextObject const &, std::string, std::string); - /** - * @symbol ?createTextObjectWhisperMessage\@TextPacket\@\@SA?AV1\@AEBVResolvedTextObject\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z - */ - MCAPI static class TextPacket createTextObjectWhisperMessage(class ResolvedTextObject const &, std::string const &, std::string const &); /** * @symbol ?createTextObjectWhisperMessage\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ MCAPI static class TextPacket createTextObjectWhisperMessage(std::string const &, std::string const &, std::string const &); + /** + * @symbol ?createTextObjectWhisperMessage\@TextPacket\@\@SA?AV1\@AEBVResolvedTextObject\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z + */ + MCAPI static class TextPacket createTextObjectWhisperMessage(class ResolvedTextObject const &, std::string const &, std::string const &); /** * @symbol ?createTranslated\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z */ @@ -110,12 +115,4 @@ class TextPacket : public Packet { */ MCAPI static class TextPacket createWhisper(std::string const &, std::string const &, std::string const &, std::string const &); -//private: - /** - * @symbol ??0TextPacket\@\@AEAA\@W4TextPacketType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@_N11\@Z - */ - MCAPI TextPacket(enum class TextPacketType, std::string const &, std::string const &, std::vector const &, bool, std::string const &, std::string const &); - -private: - }; diff --git a/LiteLoader/include/llapi/mc/TheEndDimension.hpp b/LiteLoader/include/llapi/mc/TheEndDimension.hpp index 8fa509a851..fd7bea57c6 100644 --- a/LiteLoader/include/llapi/mc/TheEndDimension.hpp +++ b/LiteLoader/include/llapi/mc/TheEndDimension.hpp @@ -127,10 +127,6 @@ class TheEndDimension { */ MCVAPI void upgradeLevelChunk(class ChunkSource &, class LevelChunk &, class LevelChunk &); #endif - /** - * @symbol ??0TheEndDimension\@\@QEAA\@AEAVILevel\@\@AEAVScheduler\@\@\@Z - */ - MCAPI TheEndDimension(class ILevel &, class Scheduler &); /** * @symbol ?AMBIENT_MULTIPLIER\@TheEndDimension\@\@2MB */ diff --git a/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp b/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp index 0bf4fb55f1..e159ad38d2 100644 --- a/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp +++ b/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp @@ -221,25 +221,25 @@ class ThinFenceBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 142 - * @symbol ?getVisualShapeInWorld\@ThinFenceBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 143 + * @symbol ?getVisualShapeInWorld\@ThinFenceBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -251,27 +251,32 @@ class ThinFenceBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@ThinFenceBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/TickUtil.hpp b/LiteLoader/include/llapi/mc/TickUtil.hpp index 5ae819ccce..e9e5e5aeae 100644 --- a/LiteLoader/include/llapi/mc/TickUtil.hpp +++ b/LiteLoader/include/llapi/mc/TickUtil.hpp @@ -25,22 +25,10 @@ namespace TickUtil { * @symbol ?chunkBoundsToGridBounds\@TickUtil\@\@YA?AU?$pair\@VBlockPos\@\@V1\@\@std\@\@AEBVPos\@\@0\@Z */ MCAPI struct std::pair chunkBoundsToGridBounds(class Pos const &, class Pos const &); - /** - * @symbol ?forRandomOffset\@TickUtil\@\@YAXEEAEAVRandom\@\@V?$function\@$$A6AXAEBVPos\@\@\@Z\@std\@\@\@Z - */ - MCAPI void forRandomOffset(unsigned char, unsigned char, class Random &, class std::function); /** * @symbol ?getDeterministicBounds\@TickUtil\@\@YA?AUBounds\@\@AEBU2\@\@Z */ MCAPI struct Bounds getDeterministicBounds(struct Bounds const &); - /** - * @symbol ?getLoadedChunkNeighborBounds\@TickUtil\@\@YA?AUBounds\@\@AEBU2\@\@Z - */ - MCAPI struct Bounds getLoadedChunkNeighborBounds(struct Bounds const &); - /** - * @symbol ?getLoadedChunkNeighborPos\@TickUtil\@\@YA?AVChunkPos\@\@AEBVPos\@\@_N1\@Z - */ - MCAPI class ChunkPos getLoadedChunkNeighborPos(class Pos const &, bool, bool); /** * @symbol ?getRandomInBounds\@TickUtil\@\@YA?AVChunkPos\@\@AEBUBounds\@\@AEAVRandom\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/TickingAreaCommand.hpp b/LiteLoader/include/llapi/mc/TickingAreaCommand.hpp index 75161af6b3..15867dc8e1 100644 --- a/LiteLoader/include/llapi/mc/TickingAreaCommand.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreaCommand.hpp @@ -36,7 +36,7 @@ class TickingAreaCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@TickingAreaCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TickingAreaListBase.hpp b/LiteLoader/include/llapi/mc/TickingAreaListBase.hpp index 8ec6a5381e..e66410b15d 100644 --- a/LiteLoader/include/llapi/mc/TickingAreaListBase.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreaListBase.hpp @@ -53,18 +53,10 @@ class TickingAreaListBase { * @symbol ?countEntityTickingAreas\@TickingAreaListBase\@\@QEBAIXZ */ MCAPI unsigned int countEntityTickingAreas() const; - /** - * @symbol ?countStandaloneTickingAreas\@TickingAreaListBase\@\@QEBAIXZ - */ - MCAPI unsigned int countStandaloneTickingAreas() const; /** * @symbol ?destroyAreas\@TickingAreaListBase\@\@QEAAXXZ */ MCAPI void destroyAreas(); - /** - * @symbol ?empty\@TickingAreaListBase\@\@QEBA_NXZ - */ - MCAPI bool empty() const; /** * @symbol ?findStandaloneAreasContaining\@TickingAreaListBase\@\@QEAA?AV?$vector\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@\@2\@\@std\@\@AEBVBlockPos\@\@\@Z */ @@ -89,18 +81,10 @@ class TickingAreaListBase { * @symbol ?hasTickingAreaNamed\@TickingAreaListBase\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool hasTickingAreaNamed(std::string const &) const; - /** - * @symbol ?isPreloadDone\@TickingAreaListBase\@\@QEBA_NXZ - */ - MCAPI bool isPreloadDone() const; /** * @symbol ?processRemoves\@TickingAreaListBase\@\@QEAAXXZ */ MCAPI void processRemoves(); - /** - * @symbol ?processUpdates\@TickingAreaListBase\@\@QEAAXAEAVLevelStorage\@\@UTick\@\@\@Z - */ - MCAPI void processUpdates(class LevelStorage &, struct Tick); /** * @symbol ?removeAllStandaloneAreas\@TickingAreaListBase\@\@QEAA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@\@Z */ @@ -109,10 +93,6 @@ class TickingAreaListBase { * @symbol ?removeAreas\@TickingAreaListBase\@\@QEAA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@AEBV?$vector\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@\@2\@\@3\@AEAVLevelStorage\@\@\@Z */ MCAPI std::vector removeAreas(std::vector> const &, class LevelStorage &); - /** - * @symbol ?tick\@TickingAreaListBase\@\@QEAAXAEBUTick\@\@\@Z - */ - MCAPI void tick(struct Tick const &); /** * @symbol ?tickSeasons\@TickingAreaListBase\@\@QEAAXAEAVRandom\@\@\@Z */ @@ -122,12 +102,4 @@ class TickingAreaListBase { */ MCAPI void updateBlockSourceCurrentTick(struct Tick const &); -//protected: - /** - * @symbol ?_shouldRemoveArea\@TickingAreaListBase\@\@IEBA_NIAEBV?$vector\@VVec3\@\@V?$allocator\@VVec3\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI bool _shouldRemoveArea(unsigned int, std::vector const &) const; - -protected: - }; diff --git a/LiteLoader/include/llapi/mc/TickingAreasManager.hpp b/LiteLoader/include/llapi/mc/TickingAreasManager.hpp index 74a62f4ef5..f1f8576ffb 100644 --- a/LiteLoader/include/llapi/mc/TickingAreasManager.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreasManager.hpp @@ -126,6 +126,10 @@ class TickingAreasManager { * @symbol ?_deletePendingArea\@TickingAreasManager\@\@AEAAXAEAVLevelStorage\@\@AEBUPendingArea\@\@\@Z */ MCAPI void _deletePendingArea(class LevelStorage &, struct PendingArea const &); + /** + * @symbol ?_findUsableDefaultName\@TickingAreasManager\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVTickingAreaList\@\@AEBV?$vector\@UPendingArea\@\@V?$allocator\@UPendingArea\@\@\@std\@\@\@3\@\@Z + */ + MCAPI std::string _findUsableDefaultName(class TickingAreaList const &, std::vector const &) const; /** * @symbol ?_getPendingAreaDescriptionsFiltered\@TickingAreasManager\@\@AEBA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@V?$function\@$$A6A_NAEBUPendingArea\@\@\@Z\@3\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/TimeAccumulator.hpp b/LiteLoader/include/llapi/mc/TimeAccumulator.hpp index 4853aab8fa..fd2988b463 100644 --- a/LiteLoader/include/llapi/mc/TimeAccumulator.hpp +++ b/LiteLoader/include/llapi/mc/TimeAccumulator.hpp @@ -23,13 +23,10 @@ class TimeAccumulator { public: class TimeAccumulator& operator=(class TimeAccumulator const &) = delete; TimeAccumulator(class TimeAccumulator const &) = delete; + TimeAccumulator() = delete; #endif public: - /** - * @symbol ??0TimeAccumulator\@\@QEAA\@XZ - */ - MCAPI TimeAccumulator(); /** * @symbol ?getCount\@TimeAccumulator\@\@QEBA_KXZ */ @@ -42,9 +39,5 @@ class TimeAccumulator { * @symbol ?getTimeSumAverageSeconds\@TimeAccumulator\@\@QEBAMXZ */ MCAPI float getTimeSumAverageSeconds() const; - /** - * @symbol ?getTimeSumSeconds\@TimeAccumulator\@\@QEBAMXZ - */ - MCAPI float getTimeSumSeconds() const; }; diff --git a/LiteLoader/include/llapi/mc/TimeCommand.hpp b/LiteLoader/include/llapi/mc/TimeCommand.hpp index 7ff75936e8..11cfe5b46d 100644 --- a/LiteLoader/include/llapi/mc/TimeCommand.hpp +++ b/LiteLoader/include/llapi/mc/TimeCommand.hpp @@ -36,7 +36,7 @@ class TimeCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@TimeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TitleCommand.hpp b/LiteLoader/include/llapi/mc/TitleCommand.hpp index f716c7b443..add5c078a4 100644 --- a/LiteLoader/include/llapi/mc/TitleCommand.hpp +++ b/LiteLoader/include/llapi/mc/TitleCommand.hpp @@ -36,7 +36,7 @@ class TitleCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@TitleCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TitleInfo.hpp b/LiteLoader/include/llapi/mc/TitleInfo.hpp new file mode 100644 index 0000000000..672ee538eb --- /dev/null +++ b/LiteLoader/include/llapi/mc/TitleInfo.hpp @@ -0,0 +1,32 @@ +/** + * @file TitleInfo.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace TitleInfo { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?BedrockVanillaTag\@TitleInfo\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const BedrockVanillaTag; + /** + * @symbol ?CurrentTitleId\@TitleInfo\@\@3W4TitleId\@1\@B + */ + MCAPI extern enum class TitleInfo::TitleId const CurrentTitleId; + /** + * @symbol ?EarthTag\@TitleInfo\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI extern std::string const EarthTag; + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/TitleRawCommand.hpp b/LiteLoader/include/llapi/mc/TitleRawCommand.hpp index fa2c24da34..a00636d0c6 100644 --- a/LiteLoader/include/llapi/mc/TitleRawCommand.hpp +++ b/LiteLoader/include/llapi/mc/TitleRawCommand.hpp @@ -37,7 +37,7 @@ class TitleRawCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@TitleRawCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TntBlock.hpp b/LiteLoader/include/llapi/mc/TntBlock.hpp index 665eb7eaf8..90bcaaa796 100644 --- a/LiteLoader/include/llapi/mc/TntBlock.hpp +++ b/LiteLoader/include/llapi/mc/TntBlock.hpp @@ -206,40 +206,40 @@ class TntBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@TntBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@TntBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@TntBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 163 + * @vftbl 164 * @symbol ?onExploded\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -252,36 +252,41 @@ class TntBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@TntBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@TntBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/ToggleDownfallCommand.hpp b/LiteLoader/include/llapi/mc/ToggleDownfallCommand.hpp index e03c387a9e..011b5daa76 100644 --- a/LiteLoader/include/llapi/mc/ToggleDownfallCommand.hpp +++ b/LiteLoader/include/llapi/mc/ToggleDownfallCommand.hpp @@ -36,7 +36,7 @@ class ToggleDownfallCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@ToggleDownfallCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TopSnowBlock.hpp b/LiteLoader/include/llapi/mc/TopSnowBlock.hpp index 5643d0bc85..1c08b60d7b 100644 --- a/LiteLoader/include/llapi/mc/TopSnowBlock.hpp +++ b/LiteLoader/include/llapi/mc/TopSnowBlock.hpp @@ -217,9 +217,9 @@ class TopSnowBlock : public HeavyBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@TopSnowBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@TopSnowBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 114 * @symbol ?canBeBuiltOver\@TopSnowBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z @@ -256,30 +256,30 @@ class TopSnowBlock : public HeavyBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@TopSnowBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 163 + * @vftbl 164 * @symbol ?onExploded\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -292,76 +292,81 @@ class TopSnowBlock : public HeavyBlock { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@TopSnowBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@TopSnowBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@TopSnowBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 195 * @symbol ?getDustColor\@TopSnowBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getDustParticleName\@TopSnowBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string getDustParticleName(class Block const &) const; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 197 + * @symbol __unk_vfn_197 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_197(); /** - * @vftbl 198 + * @vftbl 199 * @symbol ?isFreeToFall\@TopSnowBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isFreeToFall(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 199 + * @vftbl 200 * @symbol ?startFalling\@TopSnowBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@_N\@Z */ virtual void startFalling(class BlockSource &, class BlockPos const &, class Block const &, bool) const; diff --git a/LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp b/LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp index a3d86e04ac..dece9eb1b3 100644 --- a/LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp @@ -108,12 +108,8 @@ class TopSnowBlockItem : public BlockItem { virtual void __unk_vfn_80(); /** * @vftbl 132 - * @symbol ?_useOn\@TopSnowBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@TopSnowBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; - /** - * @symbol ??0TopSnowBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - MCAPI TopSnowBlockItem(std::string const &, int); + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; }; diff --git a/LiteLoader/include/llapi/mc/TorchBlock.hpp b/LiteLoader/include/llapi/mc/TorchBlock.hpp index 1249d57571..4202fcdef9 100644 --- a/LiteLoader/include/llapi/mc/TorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/TorchBlock.hpp @@ -182,9 +182,9 @@ class TorchBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@TorchBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@TorchBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,40 +201,40 @@ class TorchBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 133 * @symbol ?getIconYOffset\@TorchBlock\@\@UEBAHXZ */ virtual int getIconYOffset() const; /** - * @vftbl 143 + * @vftbl 144 * @symbol ?getVisualShape\@TorchBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 161 + * @vftbl 162 * @symbol ?_addHardCodedBlockComponents\@TorchBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -247,44 +247,49 @@ class TorchBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@TorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 181 + * @vftbl 182 * @symbol ?getRenderLayer\@TorchBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TORCHBLOCK /** * @symbol ?canBeSilkTouched\@TorchBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/TorchflowerCropBlock.hpp b/LiteLoader/include/llapi/mc/TorchflowerCropBlock.hpp index cbec7ec848..54e8840c11 100644 --- a/LiteLoader/include/llapi/mc/TorchflowerCropBlock.hpp +++ b/LiteLoader/include/llapi/mc/TorchflowerCropBlock.hpp @@ -176,25 +176,25 @@ class TorchflowerCropBlock : public CropBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 146 - * @symbol ?getVariant\@TorchflowerCropBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual int getVariant(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 147 + * @symbol ?getVariant\@TorchflowerCropBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual int getVariant(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,45 +206,79 @@ class TorchflowerCropBlock : public CropBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 194 - * @symbol __unk_vfn_194 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_194(); + virtual void __unk_vfn_187(); /** * @vftbl 195 + * @symbol __unk_vfn_195 + */ + virtual void __unk_vfn_195(); + /** + * @vftbl 196 * @symbol ?getBaseSeed\@TorchflowerCropBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseSeed() const; /** - * @vftbl 196 + * @vftbl 197 * @symbol ?getBaseCrop\@TorchflowerCropBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseCrop() const; /** - * @vftbl 197 + * @vftbl 198 * @symbol ?getSeedNum\@TorchflowerCropBlock\@\@UEBAHAEAVRandomize\@\@HH\@Z */ virtual int getSeedNum(class Randomize &, int, int) const; + /** + * @vftbl 200 + * @symbol __unk_vfn_200 + */ + virtual void __unk_vfn_200(); + /** + * @vftbl 201 + * @symbol __unk_vfn_201 + */ + virtual void __unk_vfn_201(); + /** + * @vftbl 202 + * @symbol __unk_vfn_202 + */ + virtual void __unk_vfn_202(); + /** + * @vftbl 203 + * @symbol __unk_vfn_203 + */ + virtual void __unk_vfn_203(); + /** + * @vftbl 204 + * @symbol __unk_vfn_204 + */ + virtual void __unk_vfn_204(); + /** + * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + MCAPI std::string const & getDescriptionId() const; /** * @symbol ??0TorchflowerCropBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/Trade2ContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/Trade2ContainerManagerModel.hpp index a2f32b4b89..edf82804ac 100644 --- a/LiteLoader/include/llapi/mc/Trade2ContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/Trade2ContainerManagerModel.hpp @@ -69,9 +69,5 @@ class Trade2ContainerManagerModel : public ContainerManagerModel { * @symbol ??0Trade2ContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI Trade2ContainerManagerModel(enum class ContainerID, class Player &, struct ActorUniqueID const &); - /** - * @symbol ?getEntity\@Trade2ContainerManagerModel\@\@QEBAPEAVActor\@\@XZ - */ - MCAPI class Actor * getEntity() const; }; diff --git a/LiteLoader/include/llapi/mc/TradeContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/TradeContainerManagerModel.hpp index 4db47a476e..b4a30eb3ec 100644 --- a/LiteLoader/include/llapi/mc/TradeContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/TradeContainerManagerModel.hpp @@ -65,68 +65,9 @@ class TradeContainerManagerModel : public ContainerManagerModel { * @symbol ?_postInit\@TradeContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); - /** - * @vftbl 18 - * @symbol __unk_vfn_18 - */ - virtual void __unk_vfn_18(); - /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 20 - * @symbol __unk_vfn_20 - */ - virtual void __unk_vfn_20(); - /** - * @vftbl 21 - * @symbol __unk_vfn_21 - */ - virtual void __unk_vfn_21(); - /** - * @vftbl 22 - * @symbol __unk_vfn_22 - */ - virtual void __unk_vfn_22(); - /** - * @vftbl 23 - * @symbol __unk_vfn_23 - */ - virtual void __unk_vfn_23(); - /** - * @vftbl 24 - * @symbol __unk_vfn_24 - */ - virtual void __unk_vfn_24(); - /** - * @vftbl 25 - * @symbol __unk_vfn_25 - */ - virtual void __unk_vfn_25(); - /** - * @vftbl 26 - * @symbol __unk_vfn_26 - */ - virtual void __unk_vfn_26(); - /** - * @vftbl 27 - * @symbol __unk_vfn_27 - */ - virtual void __unk_vfn_27(); - /** - * @vftbl 28 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z - */ - virtual void _Delete_this(bool); /** * @symbol ??0TradeContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI TradeContainerManagerModel(enum class ContainerID, class Player &, struct ActorUniqueID const &); - /** - * @symbol ?getEntity\@TradeContainerManagerModel\@\@QEBAPEAVActor\@\@XZ - */ - MCAPI class Actor * getEntity() const; }; diff --git a/LiteLoader/include/llapi/mc/TradeInterestGoal.hpp b/LiteLoader/include/llapi/mc/TradeInterestGoal.hpp index 711e4e502d..7ea16042ae 100644 --- a/LiteLoader/include/llapi/mc/TradeInterestGoal.hpp +++ b/LiteLoader/include/llapi/mc/TradeInterestGoal.hpp @@ -69,10 +69,6 @@ class TradeInterestGoal { * @symbol ?appendDebugInfo\@TradeInterestGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; - /** - * @symbol ??0TradeInterestGoal\@\@QEAA\@AEAVMob\@\@MMMMM\@Z - */ - MCAPI TradeInterestGoal(class Mob &, float, float, float, float, float); //private: /** diff --git a/LiteLoader/include/llapi/mc/TradeWithPlayerGoal.hpp b/LiteLoader/include/llapi/mc/TradeWithPlayerGoal.hpp index 312a3cacae..46cdc94ffb 100644 --- a/LiteLoader/include/llapi/mc/TradeWithPlayerGoal.hpp +++ b/LiteLoader/include/llapi/mc/TradeWithPlayerGoal.hpp @@ -69,9 +69,5 @@ class TradeWithPlayerGoal { * @symbol ?appendDebugInfo\@TradeWithPlayerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; - /** - * @symbol ??0TradeWithPlayerGoal\@\@QEAA\@AEAVMob\@\@\@Z - */ - MCAPI TradeWithPlayerGoal(class Mob &); }; diff --git a/LiteLoader/include/llapi/mc/TrailRuinsFeature.hpp b/LiteLoader/include/llapi/mc/TrailRuinsFeature.hpp new file mode 100644 index 0000000000..581d95a7d3 --- /dev/null +++ b/LiteLoader/include/llapi/mc/TrailRuinsFeature.hpp @@ -0,0 +1,48 @@ +/** + * @file TrailRuinsFeature.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "StructureFeature.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class TrailRuinsFeature : public StructureFeature { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TRAILRUINSFEATURE +public: + class TrailRuinsFeature& operator=(class TrailRuinsFeature const &) = delete; + TrailRuinsFeature(class TrailRuinsFeature const &) = delete; + TrailRuinsFeature() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 5 + * @symbol ?isFeatureChunk\@TrailRuinsFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + */ + virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); + /** + * @vftbl 6 + * @symbol ?createStructureStart\@TrailRuinsFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + */ + virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); + /** + * @symbol ??0TrailRuinsFeature\@\@QEAA\@IAEBVBaseGameVersion\@\@\@Z + */ + MCAPI TrailRuinsFeature(unsigned int, class BaseGameVersion const &); + +}; diff --git a/LiteLoader/include/llapi/mc/TrailRuinsPiece.hpp b/LiteLoader/include/llapi/mc/TrailRuinsPiece.hpp new file mode 100644 index 0000000000..78cf555165 --- /dev/null +++ b/LiteLoader/include/llapi/mc/TrailRuinsPiece.hpp @@ -0,0 +1,58 @@ +/** + * @file TrailRuinsPiece.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "PoolElementStructurePiece.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class TrailRuinsPiece : public PoolElementStructurePiece { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TRAILRUINSPIECE +public: + class TrailRuinsPiece& operator=(class TrailRuinsPiece const &) = delete; + TrailRuinsPiece(class TrailRuinsPiece const &) = delete; + TrailRuinsPiece() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 13 + * @symbol ?generateHeightAtPosition\@TrailRuinsPiece\@\@UEBAHAEBVBlockPos\@\@AEAVDimension\@\@AEAVBlockVolume\@\@AEAV?$unordered_map\@VChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z + */ + virtual int generateHeightAtPosition(class BlockPos const &, class Dimension &, class BlockVolume &, class std::unordered_map>, struct std::hash, struct std::equal_to, class std::allocator>>>> &) const; + /** + * @vftbl 14 + * @symbol ?getSupportBlock\@TrailRuinsPiece\@\@UEBAPEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z + */ + virtual class Block const * getSupportBlock(class BlockSource &, class BlockPos const &, class Block const &) const; + /** + * @vftbl 15 + * @symbol ?getBeardStabilizeBlock\@TrailRuinsPiece\@\@UEBAAEBVBlock\@\@AEBV2\@\@Z + */ + virtual class Block const & getBeardStabilizeBlock(class Block const &) const; + /** + * @vftbl 16 + * @symbol ?getTerrainAdjustmentEffect\@TrailRuinsPiece\@\@UEBA?AW4AdjustmentEffect\@\@XZ + */ + virtual enum class AdjustmentEffect getTerrainAdjustmentEffect() const; + /** + * @symbol ?addPieces\@TrailRuinsPiece\@\@SAXVBlockPos\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEAVJigsawStructureRegistry\@\@W4VanillaBiomeTypes\@\@AEAVDimension\@\@\@Z + */ + MCAPI static void addPieces(class BlockPos, std::vector> &, class Random &, class JigsawStructureRegistry &, enum class VanillaBiomeTypes, class Dimension &); + +}; diff --git a/LiteLoader/include/llapi/mc/TrailRuinsStart.hpp b/LiteLoader/include/llapi/mc/TrailRuinsStart.hpp new file mode 100644 index 0000000000..52442d8328 --- /dev/null +++ b/LiteLoader/include/llapi/mc/TrailRuinsStart.hpp @@ -0,0 +1,39 @@ +/** + * @file TrailRuinsStart.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "StructureStart.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class TrailRuinsStart : public StructureStart { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TRAILRUINSSTART +public: + class TrailRuinsStart& operator=(class TrailRuinsStart const &) = delete; + TrailRuinsStart(class TrailRuinsStart const &) = delete; + TrailRuinsStart() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 2 + * @symbol ?isValid\@TrailRuinsStart\@\@UEBA_NXZ + */ + virtual bool isValid() const; + +}; diff --git a/LiteLoader/include/llapi/mc/TrapDoorBlock.hpp b/LiteLoader/include/llapi/mc/TrapDoorBlock.hpp index 059dad5c77..b62d82ac48 100644 --- a/LiteLoader/include/llapi/mc/TrapDoorBlock.hpp +++ b/LiteLoader/include/llapi/mc/TrapDoorBlock.hpp @@ -202,9 +202,9 @@ class TrapDoorBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@TrapDoorBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@TrapDoorBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -221,25 +221,25 @@ class TrapDoorBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@TrapDoorBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 144 + * @symbol ?getVisualShape\@TrapDoorBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_156(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -252,34 +252,39 @@ class TrapDoorBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@TrapDoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@TrapDoorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRAPDOORBLOCK /** * @symbol ?canBeSilkTouched\@TrapDoorBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/TridentItem.hpp b/LiteLoader/include/llapi/mc/TridentItem.hpp index c6c1bddeb2..6e99208765 100644 --- a/LiteLoader/include/llapi/mc/TridentItem.hpp +++ b/LiteLoader/include/llapi/mc/TridentItem.hpp @@ -156,10 +156,6 @@ class TridentItem : public Item { * @symbol ?hurtActor\@TridentItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; - /** - * @symbol ??0TridentItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - MCAPI TridentItem(std::string const &, int); /** * @symbol ?CHARGE_THRESHOLD_TIME\@TridentItem\@\@2HB */ diff --git a/LiteLoader/include/llapi/mc/TrimDataPacket.hpp b/LiteLoader/include/llapi/mc/TrimDataPacket.hpp new file mode 100644 index 0000000000..391a553b80 --- /dev/null +++ b/LiteLoader/include/llapi/mc/TrimDataPacket.hpp @@ -0,0 +1,67 @@ +/** + * @file TrimDataPacket.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Packet.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class TrimDataPacket : public Packet { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TRIMDATAPACKET +public: + class TrimDataPacket& operator=(class TrimDataPacket const &) = delete; + TrimDataPacket(class TrimDataPacket const &) = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?getId\@TrimDataPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + */ + virtual enum class MinecraftPacketIds getId() const; + /** + * @vftbl 2 + * @symbol ?getName\@TrimDataPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + virtual std::string getName() const; + /** + * @vftbl 3 + * @symbol ?write\@TrimDataPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + */ + virtual void write(class BinaryStream &) const; + /** + * @vftbl 7 + * @symbol ?_read\@TrimDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRIMDATAPACKET + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TrimDataPacket(); +#endif + /** + * @symbol ??0TrimDataPacket\@\@QEAA\@XZ + */ + MCAPI TrimDataPacket(); + /** + * @symbol ?prepareFromRegistries\@TrimDataPacket\@\@SA?AV1\@AEBVTrimPatternRegistry\@\@AEBVTrimMaterialRegistry\@\@\@Z + */ + MCAPI static class TrimDataPacket prepareFromRegistries(class TrimPatternRegistry const &, class TrimMaterialRegistry const &); + +}; diff --git a/LiteLoader/include/llapi/mc/TrimMaterial.hpp b/LiteLoader/include/llapi/mc/TrimMaterial.hpp new file mode 100644 index 0000000000..defc4c700c --- /dev/null +++ b/LiteLoader/include/llapi/mc/TrimMaterial.hpp @@ -0,0 +1,32 @@ +/** + * @file TrimMaterial.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct TrimMaterial { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TRIMMATERIAL +public: + struct TrimMaterial& operator=(struct TrimMaterial const &) = delete; + TrimMaterial(struct TrimMaterial const &) = delete; + TrimMaterial() = delete; +#endif + +public: + /** + * @symbol ??1TrimMaterial\@\@QEAA\@XZ + */ + MCAPI ~TrimMaterial(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/TrimMaterialRegistry.hpp b/LiteLoader/include/llapi/mc/TrimMaterialRegistry.hpp new file mode 100644 index 0000000000..9a3e0b8c53 --- /dev/null +++ b/LiteLoader/include/llapi/mc/TrimMaterialRegistry.hpp @@ -0,0 +1,44 @@ +/** + * @file TrimMaterialRegistry.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class TrimMaterialRegistry { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TRIMMATERIALREGISTRY +public: + class TrimMaterialRegistry& operator=(class TrimMaterialRegistry const &) = delete; + TrimMaterialRegistry(class TrimMaterialRegistry const &) = delete; + TrimMaterialRegistry() = delete; +#endif + +public: + /** + * @symbol ?getAllEntries\@TrimMaterialRegistry\@\@QEBAAEBV?$vector\@UTrimMaterial\@\@V?$allocator\@UTrimMaterial\@\@\@std\@\@\@std\@\@XZ + */ + MCAPI std::vector const & getAllEntries() const; + /** + * @symbol ?getTrimMaterialByItemName\@TrimMaterialRegistry\@\@QEBA?AV?$optional\@UTrimMaterial\@\@\@std\@\@AEBVHashedString\@\@\@Z + */ + MCAPI class std::optional getTrimMaterialByItemName(class HashedString const &) const; + /** + * @symbol ?getTrimMaterialByMaterialId\@TrimMaterialRegistry\@\@QEBA?AV?$optional\@UTrimMaterial\@\@\@std\@\@AEBVHashedString\@\@\@Z + */ + MCAPI class std::optional getTrimMaterialByMaterialId(class HashedString const &) const; + /** + * @symbol ?initializeServer\@TrimMaterialRegistry\@\@QEAAXXZ + */ + MCAPI void initializeServer(); + +}; diff --git a/LiteLoader/include/llapi/mc/TrimMaterialRegistryHardCodedInit.hpp b/LiteLoader/include/llapi/mc/TrimMaterialRegistryHardCodedInit.hpp new file mode 100644 index 0000000000..7c836ecbbe --- /dev/null +++ b/LiteLoader/include/llapi/mc/TrimMaterialRegistryHardCodedInit.hpp @@ -0,0 +1,24 @@ +/** + * @file TrimMaterialRegistryHardCodedInit.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace TrimMaterialRegistryHardCodedInit { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?getMaterials\@TrimMaterialRegistryHardCodedInit\@\@YA?AV?$vector\@UTrimMaterial\@\@V?$allocator\@UTrimMaterial\@\@\@std\@\@\@std\@\@XZ + */ + MCAPI std::vector getMaterials(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/TrimPattern.hpp b/LiteLoader/include/llapi/mc/TrimPattern.hpp new file mode 100644 index 0000000000..137f6ee3a1 --- /dev/null +++ b/LiteLoader/include/llapi/mc/TrimPattern.hpp @@ -0,0 +1,32 @@ +/** + * @file TrimPattern.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct TrimPattern { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TRIMPATTERN +public: + struct TrimPattern& operator=(struct TrimPattern const &) = delete; + TrimPattern(struct TrimPattern const &) = delete; + TrimPattern() = delete; +#endif + +public: + /** + * @symbol ??1TrimPattern\@\@QEAA\@XZ + */ + MCAPI ~TrimPattern(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/TrimPatternRegistry.hpp b/LiteLoader/include/llapi/mc/TrimPatternRegistry.hpp new file mode 100644 index 0000000000..35fb7a01ad --- /dev/null +++ b/LiteLoader/include/llapi/mc/TrimPatternRegistry.hpp @@ -0,0 +1,40 @@ +/** + * @file TrimPatternRegistry.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class TrimPatternRegistry { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TRIMPATTERNREGISTRY +public: + class TrimPatternRegistry& operator=(class TrimPatternRegistry const &) = delete; + TrimPatternRegistry(class TrimPatternRegistry const &) = delete; + TrimPatternRegistry() = delete; +#endif + +public: + /** + * @symbol ?getAllEntries\@TrimPatternRegistry\@\@QEBA?AV?$vector\@UTrimPattern\@\@V?$allocator\@UTrimPattern\@\@\@std\@\@\@std\@\@XZ + */ + MCAPI std::vector getAllEntries() const; + /** + * @symbol ?getPatternIdByItem\@TrimPatternRegistry\@\@QEBA?AV?$optional\@VHashedString\@\@\@std\@\@AEBVHashedString\@\@\@Z + */ + MCAPI class std::optional getPatternIdByItem(class HashedString const &) const; + /** + * @symbol ?initializeServer\@TrimPatternRegistry\@\@QEAAXVItemRegistryRef\@\@\@Z + */ + MCAPI void initializeServer(class ItemRegistryRef); + +}; diff --git a/LiteLoader/include/llapi/mc/TrimPatternRegistryHardCodedInit.hpp b/LiteLoader/include/llapi/mc/TrimPatternRegistryHardCodedInit.hpp new file mode 100644 index 0000000000..54db94e1d9 --- /dev/null +++ b/LiteLoader/include/llapi/mc/TrimPatternRegistryHardCodedInit.hpp @@ -0,0 +1,24 @@ +/** + * @file TrimPatternRegistryHardCodedInit.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace TrimPatternRegistryHardCodedInit { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?getPatterns\@TrimPatternRegistryHardCodedInit\@\@YA?AV?$unordered_map\@VHashedString\@\@V1\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V1\@\@std\@\@\@3\@\@std\@\@VItemRegistryRef\@\@\@Z + */ + MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> getPatterns(class ItemRegistryRef); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/TripWireBlock.hpp b/LiteLoader/include/llapi/mc/TripWireBlock.hpp index 1334e60381..07dd0bbff3 100644 --- a/LiteLoader/include/llapi/mc/TripWireBlock.hpp +++ b/LiteLoader/include/llapi/mc/TripWireBlock.hpp @@ -201,30 +201,30 @@ class TripWireBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@TripWireBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -237,41 +237,46 @@ class TripWireBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@TripWireBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@TripWireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp b/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp index 4a2ea62e4b..e923ebabb7 100644 --- a/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp +++ b/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp @@ -192,9 +192,9 @@ class TripWireHookBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@TripWireHookBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@TripWireHookBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,35 +211,35 @@ class TripWireHookBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 143 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 144 * @symbol ?getVisualShape\@TripWireHookBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 147 + * @vftbl 148 * @symbol ?canSpawnOn\@TripWireHookBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_157(); /** - * @vftbl 162 + * @vftbl 163 * @symbol ?onRemove\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -252,39 +252,44 @@ class TripWireHookBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@TripWireHookBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0TripWireHookBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/TripodCameraActivatedComponent.hpp b/LiteLoader/include/llapi/mc/TripodCameraActivatedComponent.hpp deleted file mode 100644 index fd4912d80a..0000000000 --- a/LiteLoader/include/llapi/mc/TripodCameraActivatedComponent.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file TripodCameraActivatedComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class TripodCameraActivatedComponent. - * - */ -class TripodCameraActivatedComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TRIPODCAMERAACTIVATEDCOMPONENT -public: - class TripodCameraActivatedComponent& operator=(class TripodCameraActivatedComponent const &) = delete; - TripodCameraActivatedComponent(class TripodCameraActivatedComponent const &) = delete; - TripodCameraActivatedComponent() = delete; -#endif - -public: - /** - * @symbol ??1TripodCameraActivatedComponent\@\@QEAA\@XZ - */ - MCAPI ~TripodCameraActivatedComponent(); - -}; diff --git a/LiteLoader/include/llapi/mc/TropicalFishInfo.hpp b/LiteLoader/include/llapi/mc/TropicalFishInfo.hpp index 6b7d228136..b6a8194bc0 100644 --- a/LiteLoader/include/llapi/mc/TropicalFishInfo.hpp +++ b/LiteLoader/include/llapi/mc/TropicalFishInfo.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class TropicalFishInfo { +struct TropicalFishInfo { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_TROPICALFISHINFO public: - class TropicalFishInfo& operator=(class TropicalFishInfo const &) = delete; - TropicalFishInfo(class TropicalFishInfo const &) = delete; + struct TropicalFishInfo& operator=(struct TropicalFishInfo const &) = delete; + TropicalFishInfo(struct TropicalFishInfo const &) = delete; TropicalFishInfo() = delete; #endif @@ -29,4 +29,4 @@ class TropicalFishInfo { */ MCAPI ~TropicalFishInfo(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/TrustComponent.hpp b/LiteLoader/include/llapi/mc/TrustComponent.hpp index ca44f4ae14..a56d25ada7 100644 --- a/LiteLoader/include/llapi/mc/TrustComponent.hpp +++ b/LiteLoader/include/llapi/mc/TrustComponent.hpp @@ -28,10 +28,6 @@ class TrustComponent { #endif public: - /** - * @symbol ??0TrustComponent\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI TrustComponent(class TrustComponent &&); /** * @symbol ??0TrustComponent\@\@QEAA\@XZ */ @@ -52,10 +48,6 @@ class TrustComponent { * @symbol ?initFromDefinition\@TrustComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); - /** - * @symbol ??4TrustComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z - */ - MCAPI class TrustComponent & operator=(class TrustComponent &&); /** * @symbol ?readAdditionalSaveData\@TrustComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp b/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp index c70163a13f..021055feee 100644 --- a/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp +++ b/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp @@ -206,25 +206,25 @@ class TurtleEggBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@TurtleEggBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual std::string buildDescriptionId(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 134 + * @symbol ?buildDescriptionId\@TurtleEggBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -237,51 +237,56 @@ class TurtleEggBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 177 + * @vftbl 178 * @symbol ?use\@TurtleEggBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@TurtleEggBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@TurtleEggBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@TurtleEggBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp b/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp index 9baa83d389..43869e2c0d 100644 --- a/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp +++ b/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp @@ -206,25 +206,25 @@ class TwistingVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 162 - * @symbol ?onRemove\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void onRemove(class BlockSource &, class BlockPos const &) const; + virtual void __unk_vfn_157(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol ?onRemove\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_165(); + virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -237,41 +237,46 @@ class TwistingVinesBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@TwistingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@TwistingVinesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; @@ -281,10 +286,6 @@ class TwistingVinesBlock : public BlockLegacy { MCAPI TwistingVinesBlock(std::string const &, int); //private: - /** - * @symbol ?_getAge\@TwistingVinesBlock\@\@AEBAHAEBVBlock\@\@\@Z - */ - MCAPI int _getAge(class Block const &) const; /** * @symbol ?_shouldGrow\@TwistingVinesBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/UnburiedConstraint.hpp b/LiteLoader/include/llapi/mc/UnburiedConstraint.hpp index 4b17b7953a..264a14c7f6 100644 --- a/LiteLoader/include/llapi/mc/UnburiedConstraint.hpp +++ b/LiteLoader/include/llapi/mc/UnburiedConstraint.hpp @@ -39,6 +39,61 @@ class UnburiedConstraint { * @symbol ?isSatisfied\@UnburiedConstraint\@\@UEBA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@\@Z */ virtual bool isSatisfied(class IBlockWorldGenAPI const &, class BlockPos const &, enum class Rotation const &) const; + /** + * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 + * @symbol __unk_vfn_6 + */ + virtual void __unk_vfn_6(); + /** + * @vftbl 7 + * @symbol ?_Get\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEBAPEBXXZ + */ + virtual void const * _Get() const; + /** + * @vftbl 8 + * @symbol __unk_vfn_8 + */ + virtual void __unk_vfn_8(); + /** + * @vftbl 9 + * @symbol __unk_vfn_9 + */ + virtual void __unk_vfn_9(); + /** + * @vftbl 10 + * @symbol __unk_vfn_10 + */ + virtual void __unk_vfn_10(); + /** + * @vftbl 11 + * @symbol __unk_vfn_11 + */ + virtual void __unk_vfn_11(); + /** + * @vftbl 12 + * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z + */ + virtual void _Delete_this(bool); /** * @symbol ??0UnburiedConstraint\@\@QEAA\@AEAVStructureTemplate\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/UnderWaterSensingSystem.hpp b/LiteLoader/include/llapi/mc/UnderWaterSensingSystem.hpp index 70ea8e4dda..032992cfb4 100644 --- a/LiteLoader/include/llapi/mc/UnderWaterSensingSystem.hpp +++ b/LiteLoader/include/llapi/mc/UnderWaterSensingSystem.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class UnderWaterSensingSystem { +struct UnderWaterSensingSystem { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_UNDERWATERSENSINGSYSTEM public: - class UnderWaterSensingSystem& operator=(class UnderWaterSensingSystem const &) = delete; - UnderWaterSensingSystem(class UnderWaterSensingSystem const &) = delete; + struct UnderWaterSensingSystem& operator=(struct UnderWaterSensingSystem const &) = delete; + UnderWaterSensingSystem(struct UnderWaterSensingSystem const &) = delete; UnderWaterSensingSystem() = delete; #endif @@ -41,6 +41,11 @@ class UnderWaterSensingSystem { virtual void __unk_vfn_2(); /** * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 * @symbol ?tick\@UnderWaterSensingSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UDimensionTypeComponent\@\@UUpdateWaterStateRequestComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@$$V\@\@U?$AddRemove\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write<>, struct AddRemove>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); @@ -55,6 +60,4 @@ class UnderWaterSensingSystem { */ MCAPI static void doUnderWaterSensing(class StrictEntityContext const &, struct StateVectorComponent const &, struct UpdateWaterStateRequestComponent const &, class EntityModifierT>, struct GetAttachPositionViews const &, class IConstBlockSource const &); -private: - -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp b/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp index a1461ea95f..41057655dd 100644 --- a/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp @@ -196,25 +196,25 @@ class UnderwaterTorchBlock : public TorchBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 151 - * @symbol ?animateTick\@UnderwaterTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 152 + * @symbol ?animateTick\@UnderwaterTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,25 +226,30 @@ class UnderwaterTorchBlock : public TorchBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0UnderwaterTorchBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp b/LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp index 4e8bdcaaca..022fe41d3e 100644 --- a/LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp +++ b/LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp @@ -202,9 +202,9 @@ class UndyedShulkerBoxBlock : public ChestBlock { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@UndyedShulkerBoxBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@UndyedShulkerBoxBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -221,25 +221,25 @@ class UndyedShulkerBoxBlock : public ChestBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 135 - * @symbol ?getColor\@UndyedShulkerBoxBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual int getColor(class Block const &) const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 136 + * @symbol ?getColor\@UndyedShulkerBoxBlock\@\@UEBAHAEBVBlock\@\@\@Z */ - virtual void __unk_vfn_156(); + virtual int getColor(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -251,27 +251,32 @@ class UndyedShulkerBoxBlock : public ChestBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@UndyedShulkerBoxBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/UnknownBlock.hpp b/LiteLoader/include/llapi/mc/UnknownBlock.hpp index ced84b8ac1..04207aef0d 100644 --- a/LiteLoader/include/llapi/mc/UnknownBlock.hpp +++ b/LiteLoader/include/llapi/mc/UnknownBlock.hpp @@ -176,20 +176,20 @@ class UnknownBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,25 +201,30 @@ class UnknownBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); /** * @symbol ??0UnknownBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp b/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp index 263a2cde4d..5f0026f034 100644 --- a/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp +++ b/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp @@ -49,6 +49,16 @@ class UnlockedRecipesPacket : public Packet { * @symbol ?_read\@UnlockedRecipesPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_UNLOCKEDRECIPESPACKET + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~UnlockedRecipesPacket(); +#endif + /** + * @symbol ??0UnlockedRecipesPacket\@\@QEAA\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@_N\@Z + */ + MCAPI UnlockedRecipesPacket(std::vector const &, bool); /** * @symbol ??0UnlockedRecipesPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/UnlockedRecipesServerComponent.hpp b/LiteLoader/include/llapi/mc/UnlockedRecipesServerComponent.hpp new file mode 100644 index 0000000000..704f999ac0 --- /dev/null +++ b/LiteLoader/include/llapi/mc/UnlockedRecipesServerComponent.hpp @@ -0,0 +1,84 @@ +/** + * @file UnlockedRecipesServerComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "RecipeUnlockingRequirement.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class UnlockedRecipesServerComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_UNLOCKEDRECIPESSERVERCOMPONENT +public: + class UnlockedRecipesServerComponent& operator=(class UnlockedRecipesServerComponent const &) = delete; + UnlockedRecipesServerComponent(class UnlockedRecipesServerComponent const &) = delete; +#endif + +public: + /** + * @symbol ??0UnlockedRecipesServerComponent\@\@QEAA\@XZ + */ + MCAPI UnlockedRecipesServerComponent(); + /** + * @symbol ??0UnlockedRecipesServerComponent\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI UnlockedRecipesServerComponent(class UnlockedRecipesServerComponent &&); + /** + * @symbol ?addAdditionalSaveData\@UnlockedRecipesServerComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + */ + MCAPI void addAdditionalSaveData(class CompoundTag &) const; + /** + * @symbol ?markInventoryAsChanged\@UnlockedRecipesServerComponent\@\@QEAAXXZ + */ + MCAPI void markInventoryAsChanged(); + /** + * @symbol ??4UnlockedRecipesServerComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + */ + MCAPI class UnlockedRecipesServerComponent & operator=(class UnlockedRecipesServerComponent &&); + /** + * @symbol ?readAdditionalSaveData\@UnlockedRecipesServerComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + */ + MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); + /** + * @symbol ?updateRecipeUnlocking\@UnlockedRecipesServerComponent\@\@QEAAXPEAVServerPlayer\@\@\@Z + */ + MCAPI void updateRecipeUnlocking(class ServerPlayer *); + /** + * @symbol ?COMPONENT_TAG\@UnlockedRecipesServerComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI static std::string const COMPONENT_TAG; + /** + * @symbol ?UNLOCKED_RECIPES_TAG\@UnlockedRecipesServerComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI static std::string const UNLOCKED_RECIPES_TAG; + /** + * @symbol ?USED_CONTEXTS_TAG\@UnlockedRecipesServerComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + */ + MCAPI static std::string const USED_CONTEXTS_TAG; + +//protected: + /** + * @symbol ?isRecipeUnlocked\@UnlockedRecipesServerComponent\@\@IEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI bool isRecipeUnlocked(std::string const &) const; + /** + * @symbol ?unlockRecipes\@UnlockedRecipesServerComponent\@\@IEAA?AV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBVRecipes\@\@_NAEBV?$optional\@UInventoryChangedData\@UnlockedRecipesServerComponent\@\@\@3\@\@Z + */ + MCAPI std::vector unlockRecipes(class Recipes const &, bool, class std::optional const &); + /** + * @symbol ?useContext\@UnlockedRecipesServerComponent\@\@IEAAXAEBVRecipes\@\@W4UnlockingContext\@RecipeUnlockingRequirement\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z + */ + MCAPI void useContext(class Recipes const &, enum class RecipeUnlockingRequirement::UnlockingContext, std::vector &); + +protected: + +}; diff --git a/LiteLoader/include/llapi/mc/UpdateBoundingBoxSystem.hpp b/LiteLoader/include/llapi/mc/UpdateBoundingBoxSystem.hpp index a24d2708d5..5b242d5dbd 100644 --- a/LiteLoader/include/llapi/mc/UpdateBoundingBoxSystem.hpp +++ b/LiteLoader/include/llapi/mc/UpdateBoundingBoxSystem.hpp @@ -31,6 +31,10 @@ class UpdateBoundingBoxSystem { * @symbol ?createSystem\@UpdateBoundingBoxSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?tick\@UpdateBoundingBoxSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@$$CBUShouldUpdateBoundingBoxRequestComponent\@\@VActorOwnerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Exclude\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@$$CBUShouldUpdateBoundingBoxRequestComponent\@\@VActorOwnerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UShouldUpdateBoundingBoxRequestComponent\@\@\@\@\@Z + */ + MCAPI static void tick(class ViewT>, struct ShouldUpdateBoundingBoxRequestComponent const, class ActorOwnerComponent>, class ViewT>, struct ShouldUpdateBoundingBoxRequestComponent const, class ActorOwnerComponent>, class EntityModifierT); /** * @symbol ?updateBoundingBoxFromDefinition\@UpdateBoundingBoxSystem\@\@SAXAEAVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp b/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp index f772fb2bf7..e01dcdf28a 100644 --- a/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp @@ -52,6 +52,16 @@ class UpdateClientInputLocksPacket : public Packet { * @symbol ?_read\@UpdateClientInputLocksPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATECLIENTINPUTLOCKSPACKET + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~UpdateClientInputLocksPacket(); +#endif + /** + * @symbol ??0UpdateClientInputLocksPacket\@\@QEAA\@AEBUClientInputLockComponent\@\@AEBVVec3\@\@\@Z + */ + MCAPI UpdateClientInputLocksPacket(struct ClientInputLockComponent const &, class Vec3 const &); /** * @symbol ??0UpdateClientInputLocksPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/UpdateMovingFlagSystem.hpp b/LiteLoader/include/llapi/mc/UpdateMovingFlagSystem.hpp index 97cbea84ae..0b2a2b4e16 100644 --- a/LiteLoader/include/llapi/mc/UpdateMovingFlagSystem.hpp +++ b/LiteLoader/include/llapi/mc/UpdateMovingFlagSystem.hpp @@ -31,5 +31,9 @@ class UpdateMovingFlagSystem { * @symbol ?createUpdateMovingFlagSystem\@UpdateMovingFlagSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createUpdateMovingFlagSystem(); + /** + * @symbol ?tickUpdateMovingFlagSystem\@UpdateMovingFlagSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMovingFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void tickUpdateMovingFlagSystem(class ViewT>, class ActorOwnerComponent>, class EntityModifierT>); }; diff --git a/LiteLoader/include/llapi/mc/UpdateRenderPosSystem.hpp b/LiteLoader/include/llapi/mc/UpdateRenderPosSystem.hpp index 6e2d8e6b45..f8d9307b8e 100644 --- a/LiteLoader/include/llapi/mc/UpdateRenderPosSystem.hpp +++ b/LiteLoader/include/llapi/mc/UpdateRenderPosSystem.hpp @@ -37,6 +37,10 @@ class UpdateRenderPosSystem { * @symbol ?_doUpdateRenderPosSystem\@UpdateRenderPosSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEAURenderPositionComponent\@\@\@Z */ MCAPI static void _doUpdateRenderPosSystem(class StrictEntityContext const &, struct StateVectorComponent const &, struct RenderPositionComponent &); + /** + * @symbol ?_tickUpdateRenderPosSystem\@UpdateRenderPosSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUStateVectorComponent\@\@URenderPositionComponent\@\@\@\@\@Z + */ + MCAPI static void _tickUpdateRenderPosSystem(class ViewT>, struct StateVectorComponent const, struct RenderPositionComponent>); private: diff --git a/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp b/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp index 295b1863c9..12234a2cd4 100644 --- a/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp @@ -60,13 +60,13 @@ class UpdateTradePacket : public Packet { */ MCVAPI ~UpdateTradePacket(); #endif - /** - * @symbol ??0UpdateTradePacket\@\@QEAA\@W4ContainerID\@\@W4ContainerType\@\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVCompoundTag\@\@AEBUActorUniqueID\@\@4H_N5\@Z - */ - MCAPI UpdateTradePacket(enum class ContainerID, enum class ContainerType, int, std::string const &, class CompoundTag &&, struct ActorUniqueID const &, struct ActorUniqueID const &, int, bool, bool); /** * @symbol ??0UpdateTradePacket\@\@QEAA\@XZ */ MCAPI UpdateTradePacket(); + /** + * @symbol ??0UpdateTradePacket\@\@QEAA\@W4ContainerID\@\@W4ContainerType\@\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVCompoundTag\@\@AEBUActorUniqueID\@\@4H_N5\@Z + */ + MCAPI UpdateTradePacket(enum class ContainerID, enum class ContainerType, int, std::string const &, class CompoundTag &&, struct ActorUniqueID const &, struct ActorUniqueID const &, int, bool, bool); }; diff --git a/LiteLoader/include/llapi/mc/UpgradePatchHelpers.hpp b/LiteLoader/include/llapi/mc/UpgradePatchHelpers.hpp deleted file mode 100644 index ee18be06e8..0000000000 --- a/LiteLoader/include/llapi/mc/UpgradePatchHelpers.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file UpgradePatchHelpers.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace UpgradePatchHelpers. - * - */ -namespace UpgradePatchHelpers { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?setVersion\@UpgradePatchHelpers\@\@YAXAEAV?$GenericDocument\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@VCrtAllocator\@2\@\@rapidjson\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI void setVersion(class rapidjson::GenericDocument, class rapidjson::MemoryPoolAllocator, class rapidjson::CrtAllocator> &, std::string const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Util.hpp b/LiteLoader/include/llapi/mc/Util.hpp index 521dd55d9e..35a543d9ff 100644 --- a/LiteLoader/include/llapi/mc/Util.hpp +++ b/LiteLoader/include/llapi/mc/Util.hpp @@ -82,14 +82,14 @@ struct FormattedString { * @symbol ?base64_decode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string base64_decode(std::string const &); - /** - * @symbol ?base64_encode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@_N\@Z - */ - MCAPI std::string base64_encode(std::string const &, bool); /** * @symbol ?base64_encode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBE_K_N\@Z */ MCAPI std::string base64_encode(unsigned char const *, unsigned __int64, bool); + /** + * @symbol ?base64_encode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@_N\@Z + */ + MCAPI std::string base64_encode(std::string const &, bool); /** * @symbol ?base64url_decode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@\@Z */ @@ -242,10 +242,6 @@ struct FormattedString { * @symbol ?removeTrailingSpaces\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string removeTrailingSpaces(std::string const &); - /** - * @symbol ?replaceUtf8CharactersWithAscii\@Util\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@D\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@D\@std\@\@\@2\@\@3\@\@Z - */ - MCAPI void replaceUtf8CharactersWithAscii(std::string &, std::vector> const &); /** * @symbol ?safeGetline\@Util\@\@YAAEAV?$basic_istream\@DU?$char_traits\@D\@std\@\@\@std\@\@AEAV23\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ @@ -330,10 +326,6 @@ struct FormattedString { * @symbol ?toString\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string\@_WU?$char_traits\@_W\@std\@\@V?$allocator\@_W\@2\@\@3\@\@Z */ MCAPI std::string toString(class std::basic_string, class std::allocator> const &); - /** - * @symbol ?toString\@Util\@\@YAPEBDW4BoneTransformType\@\@\@Z - */ - MCAPI char const * toString(enum class BoneTransformType); /** * @symbol ?toString\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/VRRotateControlSystem.hpp b/LiteLoader/include/llapi/mc/VRRotateControlSystem.hpp index 8e63d79813..52a8e15e99 100644 --- a/LiteLoader/include/llapi/mc/VRRotateControlSystem.hpp +++ b/LiteLoader/include/llapi/mc/VRRotateControlSystem.hpp @@ -31,5 +31,9 @@ class VRRotateControlSystem { * @symbol ?create\@VRRotateControlSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); + /** + * @symbol ?tick\@VRRotateControlSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPlayerInputRequestComponent\@\@\@\@$$CBUMoveInputComponent\@\@$$CBUPlayerInputModeComponent\@\@$$CBUVRMoveAdjustAngleComponent\@\@ULocalMoveVelocityComponent\@\@\@\@\@Z + */ + MCAPI static void tick(class ViewT, struct MoveInputComponent const, struct PlayerInputModeComponent const, struct VRMoveAdjustAngleComponent const, struct LocalMoveVelocityComponent>); }; diff --git a/LiteLoader/include/llapi/mc/VanillaBiomeNames.hpp b/LiteLoader/include/llapi/mc/VanillaBiomeNames.hpp index 39827cf30b..f945d23b97 100644 --- a/LiteLoader/include/llapi/mc/VanillaBiomeNames.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBiomeNames.hpp @@ -51,6 +51,10 @@ namespace VanillaBiomeNames { * @symbol ?BirchForestMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchForestMutated; + /** + * @symbol ?CherryGrove\@VanillaBiomeNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryGrove; /** * @symbol ?ColdBeach\@VanillaBiomeNames\@\@3VHashedString\@\@B */ diff --git a/LiteLoader/include/llapi/mc/VanillaBlockTags.hpp b/LiteLoader/include/llapi/mc/VanillaBlockTags.hpp index 3512b75f7f..1b659631ac 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockTags.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockTags.hpp @@ -11,51 +11,124 @@ #undef BEFORE_EXTRA -/** - * @brief MC class VanillaBlockTags. - * - */ -class VanillaBlockTags { + +namespace VanillaBlockTags { #define AFTER_EXTRA // Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_VANILLABLOCKTAGS -public: - class VanillaBlockTags& operator=(class VanillaBlockTags const &) = delete; - VanillaBlockTags(class VanillaBlockTags const &) = delete; - VanillaBlockTags() = delete; -#endif - -public: /** - * @symbol ?Acacia\@VanillaBlockTags\@\@2QBDB + * @symbol ?Acacia\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Acacia; + /** + * @symbol ?Birch\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Birch; + /** + * @symbol ?DarkOak\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const DarkOak; + /** + * @symbol ?DiamondDiggable\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const DiamondDiggable; + /** + * @symbol ?Dirt\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Dirt; + /** + * @symbol ?FertilizeArea\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const FertilizeArea; + /** + * @symbol ?GoldDiggable\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const GoldDiggable; + /** + * @symbol ?Grass\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Grass; + /** + * @symbol ?Gravel\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Gravel; + /** + * @symbol ?IronDiggable\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const IronDiggable; + /** + * @symbol ?Jungle\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Jungle; + /** + * @symbol ?Log\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Log; + /** + * @symbol ?Metal\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Metal; + /** + * @symbol ?MobSpawner\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const MobSpawner; + /** + * @symbol ?NotFeatureReplaceable\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const NotFeatureReplaceable; + /** + * @symbol ?Oak\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Oak; + /** + * @symbol ?Plant\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Plant; + /** + * @symbol ?Pumpkin\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Pumpkin; + /** + * @symbol ?Rail\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Rail; + /** + * @symbol ?Sand\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Sand; + /** + * @symbol ?Snow\@VanillaBlockTags\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Snow; + /** + * @symbol ?Spruce\@VanillaBlockTags\@\@3VHashedString\@\@B */ - MCAPI static char const Acacia[]; + MCAPI extern class HashedString const Spruce; /** - * @symbol ?Birch\@VanillaBlockTags\@\@2QBDB + * @symbol ?Stone\@VanillaBlockTags\@\@3VHashedString\@\@B */ - MCAPI static char const Birch[]; + MCAPI extern class HashedString const Stone; /** - * @symbol ?DarkOak\@VanillaBlockTags\@\@2QBDB + * @symbol ?StoneDiggable\@VanillaBlockTags\@\@3VHashedString\@\@B */ - MCAPI static char const DarkOak[]; + MCAPI extern class HashedString const StoneDiggable; /** - * @symbol ?Jungle\@VanillaBlockTags\@\@2QBDB + * @symbol ?TextSign\@VanillaBlockTags\@\@3VHashedString\@\@B */ - MCAPI static char const Jungle[]; + MCAPI extern class HashedString const TextSign; /** - * @symbol ?Log\@VanillaBlockTags\@\@2QBDB + * @symbol ?Water\@VanillaBlockTags\@\@3VHashedString\@\@B */ - MCAPI static char const Log[]; + MCAPI extern class HashedString const Water; /** - * @symbol ?Oak\@VanillaBlockTags\@\@2QBDB + * @symbol ?Wood\@VanillaBlockTags\@\@3VHashedString\@\@B */ - MCAPI static char const Oak[]; + MCAPI extern class HashedString const Wood; /** - * @symbol ?Spruce\@VanillaBlockTags\@\@2QBDB + * @symbol ?WoodDiggable\@VanillaBlockTags\@\@3VHashedString\@\@B */ - MCAPI static char const Spruce[]; + MCAPI extern class HashedString const WoodDiggable; -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VanillaBlockTypeGroups.hpp b/LiteLoader/include/llapi/mc/VanillaBlockTypeGroups.hpp new file mode 100644 index 0000000000..e59fee1430 --- /dev/null +++ b/LiteLoader/include/llapi/mc/VanillaBlockTypeGroups.hpp @@ -0,0 +1,32 @@ +/** + * @file VanillaBlockTypeGroups.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace VanillaBlockTypeGroups { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?LogBlockIds\@VanillaBlockTypeGroups\@\@3V?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@B + */ + MCAPI extern std::vector> const LogBlockIds; + /** + * @symbol ?OldLogBlockIds\@VanillaBlockTypeGroups\@\@3V?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@B + */ + MCAPI extern std::vector> const OldLogBlockIds; + /** + * @symbol ?WoodFenceBlockIds\@VanillaBlockTypeGroups\@\@3V?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@B + */ + MCAPI extern std::vector> const WoodFenceBlockIds; + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VanillaBlockTypeIds.hpp b/LiteLoader/include/llapi/mc/VanillaBlockTypeIds.hpp index 36ffaa0444..2c194ef029 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockTypeIds.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockTypeIds.hpp @@ -27,6 +27,10 @@ namespace VanillaBlockTypeIds { * @symbol ?AcaciaDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AcaciaDoor; + /** + * @symbol ?AcaciaFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const AcaciaFence; /** * @symbol ?AcaciaFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -35,6 +39,10 @@ namespace VanillaBlockTypeIds { * @symbol ?AcaciaHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AcaciaHangingSign; + /** + * @symbol ?AcaciaLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const AcaciaLog; /** * @symbol ?AcaciaPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -227,6 +235,10 @@ namespace VanillaBlockTypeIds { * @symbol ?BirchDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchDoor; + /** + * @symbol ?BirchFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BirchFence; /** * @symbol ?BirchFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -235,6 +247,10 @@ namespace VanillaBlockTypeIds { * @symbol ?BirchHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchHangingSign; + /** + * @symbol ?BirchLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BirchLog; /** * @symbol ?BirchPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -383,6 +399,10 @@ namespace VanillaBlockTypeIds { * @symbol ?Calcite\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Calcite; + /** + * @symbol ?CalibratedSculkSensor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CalibratedSculkSensor; /** * @symbol ?Camera\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -451,6 +471,74 @@ namespace VanillaBlockTypeIds { * @symbol ?ChemistryTable\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChemistryTable; + /** + * @symbol ?CherryButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryButton; + /** + * @symbol ?CherryDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryDoor; + /** + * @symbol ?CherryDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryDoubleSlab; + /** + * @symbol ?CherryFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryFence; + /** + * @symbol ?CherryFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryFenceGate; + /** + * @symbol ?CherryHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryHangingSign; + /** + * @symbol ?CherryLeaves\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryLeaves; + /** + * @symbol ?CherryLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryLog; + /** + * @symbol ?CherryPlanks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryPlanks; + /** + * @symbol ?CherryPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryPressurePlate; + /** + * @symbol ?CherrySapling\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherrySapling; + /** + * @symbol ?CherrySlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherrySlab; + /** + * @symbol ?CherryStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryStairs; + /** + * @symbol ?CherryStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryStandingSign; + /** + * @symbol ?CherryTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryTrapdoor; + /** + * @symbol ?CherryWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryWallSign; + /** + * @symbol ?CherryWood\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryWood; /** * @symbol ?Chest\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -723,10 +811,18 @@ namespace VanillaBlockTypeIds { * @symbol ?DarkOakDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkOakDoor; + /** + * @symbol ?DarkOakFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const DarkOakFence; /** * @symbol ?DarkOakFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkOakFenceGate; + /** + * @symbol ?DarkOakLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const DarkOakLog; /** * @symbol ?DarkOakPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -995,10 +1091,6 @@ namespace VanillaBlockTypeIds { * @symbol ?FarmlandBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FarmlandBlock; - /** - * @symbol ?Fence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Fence; /** * @symbol ?FenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1235,6 +1327,10 @@ namespace VanillaBlockTypeIds { * @symbol ?JungleDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleDoor; + /** + * @symbol ?JungleFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const JungleFence; /** * @symbol ?JungleFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1243,6 +1339,10 @@ namespace VanillaBlockTypeIds { * @symbol ?JungleHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleHangingSign; + /** + * @symbol ?JungleLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const JungleLog; /** * @symbol ?JunglePressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1399,14 +1499,6 @@ namespace VanillaBlockTypeIds { * @symbol ?Lodestone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Lodestone; - /** - * @symbol ?Log\@VanillaBlockTypeIds\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Log; - /** - * @symbol ?Log2\@VanillaBlockTypeIds\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Log2; /** * @symbol ?Loom\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1635,10 +1727,18 @@ namespace VanillaBlockTypeIds { * @symbol ?Noteblock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Noteblock; + /** + * @symbol ?OakFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const OakFence; /** * @symbol ?OakHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OakHangingSign; + /** + * @symbol ?OakLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const OakLog; /** * @symbol ?OakStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1715,6 +1815,10 @@ namespace VanillaBlockTypeIds { * @symbol ?PinkGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PinkGlazedTerracotta; + /** + * @symbol ?PinkPetals\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PinkPetals; /** * @symbol ?PinkWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -2159,6 +2263,10 @@ namespace VanillaBlockTypeIds { * @symbol ?SpruceDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpruceDoor; + /** + * @symbol ?SpruceFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const SpruceFence; /** * @symbol ?SpruceFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -2167,6 +2275,10 @@ namespace VanillaBlockTypeIds { * @symbol ?SpruceHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpruceHangingSign; + /** + * @symbol ?SpruceLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const SpruceLog; /** * @symbol ?SprucePressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -2275,6 +2387,14 @@ namespace VanillaBlockTypeIds { * @symbol ?StrippedBirchLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StrippedBirchLog; + /** + * @symbol ?StrippedCherryLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const StrippedCherryLog; + /** + * @symbol ?StrippedCherryWood\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const StrippedCherryWood; /** * @symbol ?StrippedCrimsonHyphae\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -2323,6 +2443,10 @@ namespace VanillaBlockTypeIds { * @symbol ?StructureVoid\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StructureVoid; + /** + * @symbol ?SuspiciousGravel\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const SuspiciousGravel; /** * @symbol ?SuspiciousSand\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ diff --git a/LiteLoader/include/llapi/mc/VanillaBlockTypes.hpp b/LiteLoader/include/llapi/mc/VanillaBlockTypes.hpp index 497f94c7f9..02d213208a 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockTypes.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockTypes.hpp @@ -29,30 +29,10 @@ namespace VanillaBlockTypes { * @symbol ?mAmethystCluster\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mAmethystCluster; - /** - * @symbol ?mAnvil\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mAnvil; - /** - * @symbol ?mBamboo\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mBamboo; /** * @symbol ?mBambooSapling\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mBambooSapling; - /** - * @symbol ?mBasalt\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mBasalt; - /** - * @symbol ?mBeacon\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mBeacon; - /** - * @symbol ?mBlackstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mBlackstone; /** * @symbol ?mBlackstoneDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ @@ -61,14 +41,6 @@ namespace VanillaBlockTypes { * @symbol ?mBlackstoneSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mBlackstoneSlab; - /** - * @symbol ?mBookshelf\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mBookshelf; - /** - * @symbol ?mBrewingStand\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mBrewingStand; /** * @symbol ?mBuddingAmethyst\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ @@ -77,10 +49,6 @@ namespace VanillaBlockTypes { * @symbol ?mCalcite\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mCalcite; - /** - * @symbol ?mCauldron\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCauldron; /** * @symbol ?mChest\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ @@ -89,10 +57,6 @@ namespace VanillaBlockTypes { * @symbol ?mChiseledDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mChiseledDeepslate; - /** - * @symbol ?mChiseledPolishedBlackstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mChiseledPolishedBlackstone; /** * @symbol ?mCobbledDeepslateDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ @@ -101,10 +65,6 @@ namespace VanillaBlockTypes { * @symbol ?mCobbledDeepslateSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mCobbledDeepslateSlab; - /** - * @symbol ?mConduitBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mConduitBlock; /** * @symbol ?mCrackedDeepslateTiles\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ @@ -177,10 +137,6 @@ namespace VanillaBlockTypes { * @symbol ?mDripstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mDripstone; - /** - * @symbol ?mEnchantingTable\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mEnchantingTable; /** * @symbol ?mExposedCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ @@ -213,26 +169,10 @@ namespace VanillaBlockTypes { * @symbol ?mInfestedDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mInfestedDeepslate; - /** - * @symbol ?mInfoReserved6\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mInfoReserved6; - /** - * @symbol ?mInfoUpdateGame1\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mInfoUpdateGame1; - /** - * @symbol ?mInfoUpdateGame2\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mInfoUpdateGame2; /** * @symbol ?mLargeAmethystBud\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mLargeAmethystBud; - /** - * @symbol ?mLavaCauldron\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mLavaCauldron; /** * @symbol ?mLodestoneBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ @@ -265,10 +205,6 @@ namespace VanillaBlockTypes { * @symbol ?mMediumAmethystBud\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mMediumAmethystBud; - /** - * @symbol ?mMovingBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mMovingBlock; /** * @symbol ?mMudBrickDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ @@ -305,10 +241,6 @@ namespace VanillaBlockTypes { * @symbol ?mPointedDripstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPointedDripstone; - /** - * @symbol ?mPolishedBasalt\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mPolishedBasalt; /** * @symbol ?mPolishedBlackstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ @@ -345,22 +277,10 @@ namespace VanillaBlockTypes { * @symbol ?mPortal\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPortal; - /** - * @symbol ?mPrismarine\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mPrismarine; - /** - * @symbol ?mPurpurBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mPurpurBlock; /** * @symbol ?mQuartzBricks\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mQuartzBricks; - /** - * @symbol ?mReeds\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mReeds; /** * @symbol ?mReinforcedDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ @@ -393,10 +313,6 @@ namespace VanillaBlockTypes { * @symbol ?mSmallAmethystBud\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mSmallAmethystBud; - /** - * @symbol ?mSmoothBasalt\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mSmoothBasalt; /** * @symbol ?mSmoothStone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ @@ -421,10 +337,6 @@ namespace VanillaBlockTypes { * @symbol ?mStrippedMangroveWood\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mStrippedMangroveWood; - /** - * @symbol ?mSweetBerryBushBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mSweetBerryBushBlock; /** * @symbol ?mTuff\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ @@ -505,10 +417,6 @@ namespace VanillaBlockTypes { * @symbol ?mWeatheredDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWeatheredDoubleCutCopperSlab; - /** - * @symbol ?mWitherRose\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWitherRose; /** * @symbol ?mWoodenSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ diff --git a/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp b/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp index 0bb3880147..f1b68ea76f 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp @@ -87,6 +87,10 @@ class VanillaBlockUpdater { * @symbol ?addUpdaters_1_19_70\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z */ MCAPI static void addUpdaters_1_19_70(class CompoundTagUpdaterContext &); + /** + * @symbol ?addUpdaters_1_19_80\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z + */ + MCAPI static void addUpdaters_1_19_80(class CompoundTagUpdaterContext &); private: /** diff --git a/LiteLoader/include/llapi/mc/VanillaBlocks.hpp b/LiteLoader/include/llapi/mc/VanillaBlocks.hpp index 2bcb13d1e5..1100d9b255 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlocks.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlocks.hpp @@ -33,30 +33,10 @@ namespace VanillaBlocks { * @symbol ?mAmethystCluster\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mAmethystCluster; - /** - * @symbol ?mAnvil\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mAnvil; - /** - * @symbol ?mBamboo\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mBamboo; /** * @symbol ?mBambooSapling\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mBambooSapling; - /** - * @symbol ?mBasalt\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mBasalt; - /** - * @symbol ?mBeacon\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mBeacon; - /** - * @symbol ?mBlackstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mBlackstone; /** * @symbol ?mBlackstoneDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ @@ -65,14 +45,6 @@ namespace VanillaBlocks { * @symbol ?mBlackstoneSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mBlackstoneSlab; - /** - * @symbol ?mBookshelf\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mBookshelf; - /** - * @symbol ?mBrewingStand\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mBrewingStand; /** * @symbol ?mBuddingAmethyst\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ @@ -81,10 +53,6 @@ namespace VanillaBlocks { * @symbol ?mCalcite\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mCalcite; - /** - * @symbol ?mCauldron\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCauldron; /** * @symbol ?mChest\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ @@ -93,10 +61,6 @@ namespace VanillaBlocks { * @symbol ?mChiseledDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mChiseledDeepslate; - /** - * @symbol ?mChiseledPolishedBlackstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mChiseledPolishedBlackstone; /** * @symbol ?mChorusPlantBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ @@ -109,10 +73,6 @@ namespace VanillaBlocks { * @symbol ?mCobbledDeepslateSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mCobbledDeepslateSlab; - /** - * @symbol ?mConduitBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mConduitBlock; /** * @symbol ?mCrackedDeepslateTiles\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ @@ -185,10 +145,6 @@ namespace VanillaBlocks { * @symbol ?mDripstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mDripstone; - /** - * @symbol ?mEnchantingTable\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mEnchantingTable; /** * @symbol ?mExposedCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ @@ -213,26 +169,10 @@ namespace VanillaBlocks { * @symbol ?mInfestedDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mInfestedDeepslate; - /** - * @symbol ?mInfoReserved6\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mInfoReserved6; - /** - * @symbol ?mInfoUpdateGame1\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mInfoUpdateGame1; - /** - * @symbol ?mInfoUpdateGame2\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mInfoUpdateGame2; /** * @symbol ?mLargeAmethystBud\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mLargeAmethystBud; - /** - * @symbol ?mLavaCauldron\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mLavaCauldron; /** * @symbol ?mLodestoneBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ @@ -265,10 +205,6 @@ namespace VanillaBlocks { * @symbol ?mMediumAmethystBud\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mMediumAmethystBud; - /** - * @symbol ?mMovingBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mMovingBlock; /** * @symbol ?mMudBrickDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ @@ -301,10 +237,6 @@ namespace VanillaBlocks { * @symbol ?mPointedDripstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPointedDripstone; - /** - * @symbol ?mPolishedBasalt\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mPolishedBasalt; /** * @symbol ?mPolishedBlackstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ @@ -341,22 +273,10 @@ namespace VanillaBlocks { * @symbol ?mPortal\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPortal; - /** - * @symbol ?mPrismarine\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mPrismarine; - /** - * @symbol ?mPurpurBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mPurpurBlock; /** * @symbol ?mQuartzBricks\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mQuartzBricks; - /** - * @symbol ?mReeds\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mReeds; /** * @symbol ?mReinforcedDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ @@ -389,10 +309,6 @@ namespace VanillaBlocks { * @symbol ?mSmallAmethystBud\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mSmallAmethystBud; - /** - * @symbol ?mSmoothBasalt\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mSmoothBasalt; /** * @symbol ?mSmoothStone\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ @@ -417,10 +333,6 @@ namespace VanillaBlocks { * @symbol ?mStrippedMangroveWood\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mStrippedMangroveWood; - /** - * @symbol ?mSweetBerryBushBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mSweetBerryBushBlock; /** * @symbol ?mTuff\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ @@ -493,10 +405,6 @@ namespace VanillaBlocks { * @symbol ?mWeatheredDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWeatheredDoubleCutCopperSlab; - /** - * @symbol ?mWitherRose\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWitherRose; /** * @symbol ?mWoodenSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ diff --git a/LiteLoader/include/llapi/mc/VanillaEntityInitializerCommon.hpp b/LiteLoader/include/llapi/mc/VanillaEntityInitializerCommon.hpp index 2170006a84..364bb4ebb0 100644 --- a/LiteLoader/include/llapi/mc/VanillaEntityInitializerCommon.hpp +++ b/LiteLoader/include/llapi/mc/VanillaEntityInitializerCommon.hpp @@ -27,29 +27,13 @@ class VanillaEntityInitializerCommon { #endif public: - /** - * @symbol ?createFromFunction\@VanillaEntityInitializerCommon\@\@SA?AV?$unique_ptr\@VIEntityInitializer\@\@U?$default_delete\@VIEntityInitializer\@\@\@std\@\@\@std\@\@V?$not_null\@P6AXV?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@AEBV3\@\@Z\@gsl\@\@\@Z - */ - MCAPI static std::unique_ptr createFromFunction(class gsl::not_null, class EntityContext &, class EntityContext const &)>); /** * @symbol ?initActorComponents\@VanillaEntityInitializerCommon\@\@SAXW4EntityHost\@\@V?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@AEBV5\@\@Z */ MCAPI static void initActorComponents(enum class EntityHost, std::unique_ptr, class EntityContext &, class EntityContext const &); - /** - * @symbol ?initECSMovement\@VanillaEntityInitializerCommon\@\@SAXAEAVEntityContext\@\@AEBV2\@\@Z - */ - MCAPI static void initECSMovement(class EntityContext &, class EntityContext const &); /** * @symbol ?initExperimentalMovement\@VanillaEntityInitializerCommon\@\@SAXAEAVEntityContext\@\@AEBV2\@\@Z */ MCAPI static void initExperimentalMovement(class EntityContext &, class EntityContext const &); - /** - * @symbol ?initSideBySideComparison\@VanillaEntityInitializerCommon\@\@SAXAEAVEntityContext\@\@AEBV2\@\@Z - */ - MCAPI static void initSideBySideComparison(class EntityContext &, class EntityContext const &); - /** - * @symbol ?initVanilla\@VanillaEntityInitializerCommon\@\@SAXAEAVEntityContext\@\@AEBV2\@\@Z - */ - MCAPI static void initVanilla(class EntityContext &, class EntityContext const &); }; diff --git a/LiteLoader/include/llapi/mc/VanillaEntityInitializerServer.hpp b/LiteLoader/include/llapi/mc/VanillaEntityInitializerServer.hpp index 311d49f936..f1f1e8aed9 100644 --- a/LiteLoader/include/llapi/mc/VanillaEntityInitializerServer.hpp +++ b/LiteLoader/include/llapi/mc/VanillaEntityInitializerServer.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "VanillaSystemsRegistration.hpp" #define BEFORE_EXTRA @@ -28,10 +27,6 @@ class VanillaEntityInitializerServer { #endif public: - /** - * @symbol ?create\@VanillaEntityInitializerServer\@\@SA?AV?$unique_ptr\@VIEntityInitializer\@\@U?$default_delete\@VIEntityInitializer\@\@\@std\@\@\@std\@\@AEBURegistrationOptions\@VanillaSystemsRegistration\@\@\@Z - */ - MCAPI static std::unique_ptr create(struct VanillaSystemsRegistration::RegistrationOptions const &); /** * @symbol ?initECSMovement\@VanillaEntityInitializerServer\@\@SAXV?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@AEBV4\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/VanillaGameModuleServer.hpp b/LiteLoader/include/llapi/mc/VanillaGameModuleServer.hpp index ad8f908945..dd259132c0 100644 --- a/LiteLoader/include/llapi/mc/VanillaGameModuleServer.hpp +++ b/LiteLoader/include/llapi/mc/VanillaGameModuleServer.hpp @@ -6,6 +6,7 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Bedrock.hpp" +#include "VanillaSystemsRegistration.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -36,9 +37,9 @@ class VanillaGameModuleServer { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?init\@VanillaGameModuleServer\@\@UEAAXAEAVServerInstance\@\@AEAVLevel\@\@\@Z + * @symbol ?init\@VanillaGameModuleServer\@\@UEAAXAEAVServerInstance\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VLevel\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ - virtual void init(class ServerInstance &, class Level &); + virtual void init(class ServerInstance &, class gsl::not_null> const &); /** * @vftbl 2 * @symbol ?initializeBehaviorStack\@VanillaGameModuleServer\@\@UEAAXAEBVExperiments\@\@AEAVIResourcePackRepository\@\@AEAVResourcePackStack\@\@AEBVBaseGameVersion\@\@\@Z @@ -46,9 +47,9 @@ class VanillaGameModuleServer { virtual void initializeBehaviorStack(class Experiments const &, class IResourcePackRepository &, class ResourcePackStack &, class BaseGameVersion const &); /** * @vftbl 3 - * @symbol ?configureLevel\@VanillaGameModuleServer\@\@UEAAXAEAVLevel\@\@AEBVExperiments\@\@AEAVResourcePackManager\@\@AEBVBaseGameVersion\@\@\@Z + * @symbol ?configureLevel\@VanillaGameModuleServer\@\@UEAAXAEBV?$not_null\@V?$NonOwnerPointer\@VLevel\@\@\@Bedrock\@\@\@gsl\@\@AEBVExperiments\@\@AEAVResourcePackManager\@\@AEBVBaseGameVersion\@\@\@Z */ - virtual void configureLevel(class Level &, class Experiments const &, class ResourcePackManager &, class BaseGameVersion const &); + virtual void configureLevel(class gsl::not_null> const &, class Experiments const &, class ResourcePackManager &, class BaseGameVersion const &); /** * @vftbl 4 * @symbol __unk_vfn_4 @@ -90,14 +91,18 @@ class VanillaGameModuleServer { MCAPI VanillaGameModuleServer(); //private: + /** + * @symbol ?_configureEntitySystems\@VanillaGameModuleServer\@\@AEAAXAEBV?$not_null\@V?$NonOwnerPointer\@VLevel\@\@\@Bedrock\@\@\@gsl\@\@AEAVResourcePackManager\@\@AEBVExperiments\@\@AEBURegistrationOptions\@VanillaSystemsRegistration\@\@\@Z + */ + MCAPI void _configureEntitySystems(class gsl::not_null> const &, class ResourcePackManager &, class Experiments const &, struct VanillaSystemsRegistration::RegistrationOptions const &); /** * @symbol ?_configureWorldGen\@VanillaGameModuleServer\@\@AEAAXAEAVIWorldRegistriesProvider\@\@AEBUSpawnSettings\@\@AEBVExperiments\@\@AEAVResourcePackManager\@\@AEBVBaseGameVersion\@\@\@Z */ MCAPI void _configureWorldGen(class IWorldRegistriesProvider &, struct SpawnSettings const &, class Experiments const &, class ResourcePackManager &, class BaseGameVersion const &); /** - * @symbol ?_registerListeners\@VanillaGameModuleServer\@\@AEAAXAEAVLevel\@\@\@Z + * @symbol ?_registerListeners\@VanillaGameModuleServer\@\@AEAAXAEBV?$not_null\@V?$NonOwnerPointer\@VLevel\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ - MCAPI void _registerListeners(class Level &); + MCAPI void _registerListeners(class gsl::not_null> const &); private: diff --git a/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp b/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp index 1b59185c01..0a8ca40bbd 100644 --- a/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp +++ b/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp @@ -89,5 +89,9 @@ namespace VanillaGameVersions { * @symbol ?WildUpdateVersion_U6\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const WildUpdateVersion_U6; + /** + * @symbol ?WildUpdateVersion_U8\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + */ + MCAPI extern class BaseGameVersion const WildUpdateVersion_U8; }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VanillaItemNames.hpp b/LiteLoader/include/llapi/mc/VanillaItemNames.hpp index c46b135b73..e3fdd29e84 100644 --- a/LiteLoader/include/llapi/mc/VanillaItemNames.hpp +++ b/LiteLoader/include/llapi/mc/VanillaItemNames.hpp @@ -51,14 +51,26 @@ namespace VanillaItemNames { * @symbol ?AmethystShard\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AmethystShard; + /** + * @symbol ?AnglerPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const AnglerPotteryShard; /** * @symbol ?Apple\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Apple; + /** + * @symbol ?ArcherPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const ArcherPotteryShard; /** * @symbol ?ArmorStand\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ArmorStand; + /** + * @symbol ?ArmsUpPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const ArmsUpPotteryShard; /** * @symbol ?Arrow\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -159,6 +171,10 @@ namespace VanillaItemNames { * @symbol ?BlackDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlackDye; + /** + * @symbol ?BladePotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BladePotteryShard; /** * @symbol ?BlazePowder\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -215,6 +231,10 @@ namespace VanillaItemNames { * @symbol ?Bread\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Bread; + /** + * @symbol ?BrewerPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BrewerPotteryShard; /** * @symbol ?BrewingStand\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -239,6 +259,10 @@ namespace VanillaItemNames { * @symbol ?Bundle\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Bundle; + /** + * @symbol ?BurnPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BurnPotteryShard; /** * @symbol ?Cake\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -303,6 +327,26 @@ namespace VanillaItemNames { * @symbol ?Charcoal\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Charcoal; + /** + * @symbol ?CherryBoat\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryBoat; + /** + * @symbol ?CherryChestBoat\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryChestBoat; + /** + * @symbol ?CherryDoor\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryDoor; + /** + * @symbol ?CherryHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherryHangingSign; + /** + * @symbol ?CherrySign\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CherrySign; /** * @symbol ?ChestMinecart\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -331,6 +375,10 @@ namespace VanillaItemNames { * @symbol ?Coal\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Coal; + /** + * @symbol ?CoastArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CoastArmorTrimSmithingTemplate; /** * @symbol ?CocoaBeans\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -435,6 +483,10 @@ namespace VanillaItemNames { * @symbol ?CyanDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CyanDye; + /** + * @symbol ?DangerPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const DangerPotteryShard; /** * @symbol ?DarkOakBoat\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -527,6 +579,10 @@ namespace VanillaItemNames { * @symbol ?DrownedSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DrownedSpawnEgg; + /** + * @symbol ?DuneArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const DuneArmorTrimSmithingTemplate; /** * @symbol ?DyeLegacy\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -595,6 +651,14 @@ namespace VanillaItemNames { * @symbol ?ExperienceBottle\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ExperienceBottle; + /** + * @symbol ?ExplorerPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const ExplorerPotteryShard; + /** + * @symbol ?EyeArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const EyeArmorTrimSmithingTemplate; /** * @symbol ?Feather\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -647,6 +711,10 @@ namespace VanillaItemNames { * @symbol ?FoxSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FoxSpawnEgg; + /** + * @symbol ?FriendPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const FriendPotteryShard; /** * @symbol ?FrogSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -783,6 +851,14 @@ namespace VanillaItemNames { * @symbol ?HeartOfTheSea\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HeartOfTheSea; + /** + * @symbol ?HeartPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const HeartPotteryShard; + /** + * @symbol ?HeartbreakPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const HeartbreakPotteryShard; /** * @symbol ?HoglinSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -807,6 +883,14 @@ namespace VanillaItemNames { * @symbol ?HorseSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HorseSpawnEgg; + /** + * @symbol ?HostArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const HostArmorTrimSmithingTemplate; + /** + * @symbol ?HowlPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const HowlPotteryShard; /** * @symbol ?HuskSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1015,6 +1099,10 @@ namespace VanillaItemNames { * @symbol ?Minecart\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Minecart; + /** + * @symbol ?MinerPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const MinerPotteryShard; /** * @symbol ?MojangBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1023,6 +1111,10 @@ namespace VanillaItemNames { * @symbol ?MooshroomSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MooshroomSpawnEgg; + /** + * @symbol ?MournerPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const MournerPotteryShard; /** * @symbol ?MuleSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1163,6 +1255,10 @@ namespace VanillaItemNames { * @symbol ?NetheriteSword\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetheriteSword; + /** + * @symbol ?NetheriteUpgradeSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const NetheriteUpgradeSmithingTemplate; /** * @symbol ?NpcSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1247,6 +1343,10 @@ namespace VanillaItemNames { * @symbol ?PinkDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PinkDye; + /** + * @symbol ?PlentyPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PlentyPotteryShard; /** * @symbol ?PoisonousPotato\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1275,22 +1375,6 @@ namespace VanillaItemNames { * @symbol ?Potion\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Potion; - /** - * @symbol ?PotteryShardArcher\@VanillaItemNames\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const PotteryShardArcher; - /** - * @symbol ?PotteryShardArmsUp\@VanillaItemNames\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const PotteryShardArmsUp; - /** - * @symbol ?PotteryShardPrize\@VanillaItemNames\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const PotteryShardPrize; - /** - * @symbol ?PotteryShardSkull\@VanillaItemNames\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const PotteryShardSkull; /** * @symbol ?PowderSnowBucket\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1303,6 +1387,10 @@ namespace VanillaItemNames { * @symbol ?PrismarineShard\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PrismarineShard; + /** + * @symbol ?PrizePotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PrizePotteryShard; /** * @symbol ?Pufferfish\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1351,6 +1439,10 @@ namespace VanillaItemNames { * @symbol ?RabbitStew\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RabbitStew; + /** + * @symbol ?RaiserArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const RaiserArmorTrimSmithingTemplate; /** * @symbol ?RapidFertilizer\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1387,6 +1479,10 @@ namespace VanillaItemNames { * @symbol ?Repeater\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Repeater; + /** + * @symbol ?RibArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const RibArmorTrimSmithingTemplate; /** * @symbol ?RottenFlesh\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1411,6 +1507,18 @@ namespace VanillaItemNames { * @symbol ?Scute\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Scute; + /** + * @symbol ?SentryArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const SentryArmorTrimSmithingTemplate; + /** + * @symbol ?ShaperArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const ShaperArmorTrimSmithingTemplate; + /** + * @symbol ?SheafPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const SheafPotteryShard; /** * @symbol ?Shears\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1419,6 +1527,10 @@ namespace VanillaItemNames { * @symbol ?SheepSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SheepSpawnEgg; + /** + * @symbol ?ShelterPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const ShelterPotteryShard; /** * @symbol ?Shield\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1435,6 +1547,10 @@ namespace VanillaItemNames { * @symbol ?ShulkerSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ShulkerSpawnEgg; + /** + * @symbol ?SilenceArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const SilenceArmorTrimSmithingTemplate; /** * @symbol ?SilverfishSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1455,6 +1571,10 @@ namespace VanillaItemNames { * @symbol ?SkullBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SkullBannerPattern; + /** + * @symbol ?SkullPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const SkullPotteryShard; /** * @symbol ?SlimeBall\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1467,6 +1587,14 @@ namespace VanillaItemNames { * @symbol ?SnifferSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SnifferSpawnEgg; + /** + * @symbol ?SnortPotteryShard\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const SnortPotteryShard; + /** + * @symbol ?SnoutArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const SnoutArmorTrimSmithingTemplate; /** * @symbol ?SnowBall\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1495,6 +1623,10 @@ namespace VanillaItemNames { * @symbol ?SpiderSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpiderSpawnEgg; + /** + * @symbol ?SpireArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const SpireArmorTrimSmithingTemplate; /** * @symbol ?SplashPotion\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1587,6 +1719,10 @@ namespace VanillaItemNames { * @symbol ?TadpoleSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TadpoleSpawnEgg; + /** + * @symbol ?TideArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const TideArmorTrimSmithingTemplate; /** * @symbol ?TntMinecart\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1627,6 +1763,10 @@ namespace VanillaItemNames { * @symbol ?TurtleSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TurtleSpawnEgg; + /** + * @symbol ?VexArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const VexArmorTrimSmithingTemplate; /** * @symbol ?VexSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1643,6 +1783,10 @@ namespace VanillaItemNames { * @symbol ?WanderingTraderSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WanderingTraderSpawnEgg; + /** + * @symbol ?WardArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const WardArmorTrimSmithingTemplate; /** * @symbol ?WardenSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1667,6 +1811,10 @@ namespace VanillaItemNames { * @symbol ?WaterBucket\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaterBucket; + /** + * @symbol ?WayfinderArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const WayfinderArmorTrimSmithingTemplate; /** * @symbol ?Wheat\@VanillaItemNames\@\@3VHashedString\@\@B */ @@ -1679,6 +1827,10 @@ namespace VanillaItemNames { * @symbol ?WhiteDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WhiteDye; + /** + * @symbol ?WildArmorTrimSmithingTemplate\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const WildArmorTrimSmithingTemplate; /** * @symbol ?WitchSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ diff --git a/LiteLoader/include/llapi/mc/VanillaItemTags.hpp b/LiteLoader/include/llapi/mc/VanillaItemTags.hpp index 732683d425..c15d71bb2e 100644 --- a/LiteLoader/include/llapi/mc/VanillaItemTags.hpp +++ b/LiteLoader/include/llapi/mc/VanillaItemTags.hpp @@ -221,10 +221,34 @@ class VanillaItemTags { * @symbol ?Tool\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Tool; + /** + * @symbol ?TransformMaterials\@VanillaItemTags\@\@2UItemTag\@\@B + */ + MCAPI static struct ItemTag const TransformMaterials; + /** + * @symbol ?TransformTemplates\@VanillaItemTags\@\@2UItemTag\@\@B + */ + MCAPI static struct ItemTag const TransformTemplates; + /** + * @symbol ?TransformableItems\@VanillaItemTags\@\@2UItemTag\@\@B + */ + MCAPI static struct ItemTag const TransformableItems; /** * @symbol ?Trident\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Trident; + /** + * @symbol ?TrimMaterials\@VanillaItemTags\@\@2UItemTag\@\@B + */ + MCAPI static struct ItemTag const TrimMaterials; + /** + * @symbol ?TrimTemplates\@VanillaItemTags\@\@2UItemTag\@\@B + */ + MCAPI static struct ItemTag const TrimTemplates; + /** + * @symbol ?TrimmableArmors\@VanillaItemTags\@\@2UItemTag\@\@B + */ + MCAPI static struct ItemTag const TrimmableArmors; /** * @symbol ?VibrationDamper\@VanillaItemTags\@\@2UItemTag\@\@B */ diff --git a/LiteLoader/include/llapi/mc/VanillaLevelChunkUpgrade.hpp b/LiteLoader/include/llapi/mc/VanillaLevelChunkUpgrade.hpp index d3af469ddd..6616edd962 100644 --- a/LiteLoader/include/llapi/mc/VanillaLevelChunkUpgrade.hpp +++ b/LiteLoader/include/llapi/mc/VanillaLevelChunkUpgrade.hpp @@ -106,17 +106,9 @@ enum class Axis; * @symbol ?upgradeArmorStandComponents\@VanillaLevelChunkUpgrade\@\@YA_NAEAVCompoundTag\@\@\@Z */ MCAPI bool upgradeArmorStandComponents(class CompoundTag &); - /** - * @symbol ?upgradeLevelChunk\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@0AEAVBlockSource\@\@\@Z - */ - MCAPI void upgradeLevelChunk(class LevelChunk &, class LevelChunk &, class BlockSource &); /** * @symbol ?upgradeOldLimboEntity\@VanillaLevelChunkUpgrade\@\@YAXAEAVCompoundTag\@\@W4LimboEntitiesVersion\@\@_N\@Z */ MCAPI void upgradeOldLimboEntity(class CompoundTag &, enum class LimboEntitiesVersion, bool); - /** - * @symbol ?upgradeWorldHeight\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@0AEAVBlockSource\@\@\@Z - */ - MCAPI void upgradeWorldHeight(class LevelChunk &, class LevelChunk &, class BlockSource &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VanillaServerCommands.hpp b/LiteLoader/include/llapi/mc/VanillaServerCommands.hpp deleted file mode 100644 index f3c977347c..0000000000 --- a/LiteLoader/include/llapi/mc/VanillaServerCommands.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file VanillaServerCommands.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace VanillaServerCommands. - * - */ -namespace VanillaServerCommands { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?setup\@VanillaServerCommands\@\@YAXAEAVCommandRegistry\@\@\@Z - */ - MCAPI void setup(class CommandRegistry &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VanillaServerGameplayEventListener.hpp b/LiteLoader/include/llapi/mc/VanillaServerGameplayEventListener.hpp index da90e14b09..961ec1e9e8 100644 --- a/LiteLoader/include/llapi/mc/VanillaServerGameplayEventListener.hpp +++ b/LiteLoader/include/llapi/mc/VanillaServerGameplayEventListener.hpp @@ -30,6 +30,10 @@ class VanillaServerGameplayEventListener { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_VANILLASERVERGAMEPLAYEVENTLISTENER + /** + * @symbol ?onActorCreationAttemptFailed\@VanillaServerGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + */ + MCVAPI enum class EventResult onActorCreationAttemptFailed(class Actor &, class std::basic_string_view>); /** * @symbol ?onBlockInteractedWith\@VanillaServerGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/VanillaServerNetworkHandler.hpp b/LiteLoader/include/llapi/mc/VanillaServerNetworkHandler.hpp index c8320f2cab..d8e4af22d3 100644 --- a/LiteLoader/include/llapi/mc/VanillaServerNetworkHandler.hpp +++ b/LiteLoader/include/llapi/mc/VanillaServerNetworkHandler.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -40,9 +39,5 @@ class VanillaServerNetworkHandler { * @symbol ?handle\@VanillaServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackClientResponsePacket\@\@\@Z */ virtual void handle(class NetworkIdentifier const &, class ResourcePackClientResponsePacket const &); - /** - * @symbol ??0VanillaServerNetworkHandler\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VServerNetworkHandler\@\@\@Bedrock\@\@\@gsl\@\@AEAVServerInstance\@\@\@Z - */ - MCAPI VanillaServerNetworkHandler(class gsl::not_null>, class ServerInstance &); }; diff --git a/LiteLoader/include/llapi/mc/VanillaStates.hpp b/LiteLoader/include/llapi/mc/VanillaStates.hpp index 08f40e33dc..5058d556c2 100644 --- a/LiteLoader/include/llapi/mc/VanillaStates.hpp +++ b/LiteLoader/include/llapi/mc/VanillaStates.hpp @@ -27,525 +27,525 @@ struct CachedItemStateMapPtr { #undef AFTER_EXTRA /** - * @symbol ?Active\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?Active\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const Active; + MCAPI extern class BlockStateVariant const Active; /** - * @symbol ?Age\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?Age\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const Age; + MCAPI extern class BlockStateVariant const Age; /** - * @symbol ?AgeBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?AgeBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const AgeBit; + MCAPI extern class BlockStateVariant const AgeBit; /** - * @symbol ?AllowUnderwaterBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?AllowUnderwaterBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const AllowUnderwaterBit; + MCAPI extern class BlockStateVariant const AllowUnderwaterBit; /** - * @symbol ?AttachedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?AttachedBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const AttachedBit; + MCAPI extern class BlockStateVariant const AttachedBit; /** - * @symbol ?Attachment\@VanillaStates\@\@3V?$ItemStateVariant\@W4AttachmentType\@\@\@\@B + * @symbol ?Attachment\@VanillaStates\@\@3V?$BlockStateVariant\@W4AttachmentType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const Attachment; + MCAPI extern class BlockStateVariant const Attachment; /** - * @symbol ?BambooLeafSize\@VanillaStates\@\@3V?$ItemStateVariant\@W4LeafSize\@\@\@\@B + * @symbol ?BambooLeafSize\@VanillaStates\@\@3V?$BlockStateVariant\@W4LeafSize\@\@\@\@B */ - MCAPI extern class ItemStateVariant const BambooLeafSize; + MCAPI extern class BlockStateVariant const BambooLeafSize; /** - * @symbol ?BambooThickness\@VanillaStates\@\@3V?$ItemStateVariant\@W4StalkThickness\@\@\@\@B + * @symbol ?BambooThickness\@VanillaStates\@\@3V?$BlockStateVariant\@W4StalkThickness\@\@\@\@B */ - MCAPI extern class ItemStateVariant const BambooThickness; + MCAPI extern class BlockStateVariant const BambooThickness; /** - * @symbol ?BeehiveHoneyLevel\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?BeehiveHoneyLevel\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const BeehiveHoneyLevel; + MCAPI extern class BlockStateVariant const BeehiveHoneyLevel; /** - * @symbol ?BigDripleafHead\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?BigDripleafHead\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const BigDripleafHead; + MCAPI extern class BlockStateVariant const BigDripleafHead; /** - * @symbol ?BigDripleafTilt\@VanillaStates\@\@3V?$ItemStateVariant\@W4BigDripleafTilt\@\@\@\@B + * @symbol ?BigDripleafTilt\@VanillaStates\@\@3V?$BlockStateVariant\@W4BigDripleafTilt\@\@\@\@B */ - MCAPI extern class ItemStateVariant const BigDripleafTilt; + MCAPI extern class BlockStateVariant const BigDripleafTilt; /** - * @symbol ?BiteCounter\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?BiteCounter\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const BiteCounter; + MCAPI extern class BlockStateVariant const BiteCounter; /** - * @symbol ?BlockLightLevel\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?BlockLightLevel\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const BlockLightLevel; + MCAPI extern class BlockStateVariant const BlockLightLevel; /** - * @symbol ?Bloom\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?Bloom\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const Bloom; + MCAPI extern class BlockStateVariant const Bloom; /** - * @symbol ?BookshelfOccupiedSlots\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?BookshelfOccupiedSlots\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const BookshelfOccupiedSlots; + MCAPI extern class BlockStateVariant const BookshelfOccupiedSlots; /** - * @symbol ?BrewingStandSlotABit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?BrewingStandSlotABit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const BrewingStandSlotABit; + MCAPI extern class BlockStateVariant const BrewingStandSlotABit; /** - * @symbol ?BrewingStandSlotBBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?BrewingStandSlotBBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const BrewingStandSlotBBit; + MCAPI extern class BlockStateVariant const BrewingStandSlotBBit; /** - * @symbol ?BrewingStandSlotCBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?BrewingStandSlotCBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const BrewingStandSlotCBit; + MCAPI extern class BlockStateVariant const BrewingStandSlotCBit; /** - * @symbol ?BrushedProgress\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?BrushedProgress\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const BrushedProgress; + MCAPI extern class BlockStateVariant const BrushedProgress; /** - * @symbol ?ButtonPressedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?ButtonPressedBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const ButtonPressedBit; + MCAPI extern class BlockStateVariant const ButtonPressedBit; /** - * @symbol ?CanSummon\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?CanSummon\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const CanSummon; + MCAPI extern class BlockStateVariant const CanSummon; /** - * @symbol ?Candles\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?Candles\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const Candles; + MCAPI extern class BlockStateVariant const Candles; /** - * @symbol ?CauldronLiquid\@VanillaStates\@\@3V?$ItemStateVariant\@W4CauldronLiquidType\@\@\@\@B + * @symbol ?CauldronLiquid\@VanillaStates\@\@3V?$BlockStateVariant\@W4CauldronLiquidType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const CauldronLiquid; + MCAPI extern class BlockStateVariant const CauldronLiquid; /** - * @symbol ?ChemistryTableType\@VanillaStates\@\@3V?$ItemStateVariant\@W4ChemistryTableType\@\@\@\@B + * @symbol ?ChemistryTableType\@VanillaStates\@\@3V?$BlockStateVariant\@W4ChemistryTableType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const ChemistryTableType; + MCAPI extern class BlockStateVariant const ChemistryTableType; /** - * @symbol ?ChiselType\@VanillaStates\@\@3V?$ItemStateVariant\@W4ChiselType\@\@\@\@B + * @symbol ?ChiselType\@VanillaStates\@\@3V?$BlockStateVariant\@W4ChiselType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const ChiselType; + MCAPI extern class BlockStateVariant const ChiselType; /** - * @symbol ?ClusterCount\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?ClusterCount\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const ClusterCount; + MCAPI extern class BlockStateVariant const ClusterCount; /** - * @symbol ?Color\@VanillaStates\@\@3V?$ItemStateVariant\@W4BlockColor\@\@\@\@B + * @symbol ?Color\@VanillaStates\@\@3V?$BlockStateVariant\@W4BlockColor\@\@\@\@B */ - MCAPI extern class ItemStateVariant const Color; + MCAPI extern class BlockStateVariant const Color; /** - * @symbol ?ColorBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?ColorBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const ColorBit; + MCAPI extern class BlockStateVariant const ColorBit; /** - * @symbol ?ComposterFillLevel\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?ComposterFillLevel\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const ComposterFillLevel; + MCAPI extern class BlockStateVariant const ComposterFillLevel; /** - * @symbol ?ConditionalBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?ConditionalBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const ConditionalBit; + MCAPI extern class BlockStateVariant const ConditionalBit; /** - * @symbol ?CoralColor\@VanillaStates\@\@3V?$ItemStateVariant\@W4CoralColor\@\@\@\@B + * @symbol ?CoralColor\@VanillaStates\@\@3V?$BlockStateVariant\@W4CoralColor\@\@\@\@B */ - MCAPI extern class ItemStateVariant const CoralColor; + MCAPI extern class BlockStateVariant const CoralColor; /** - * @symbol ?CoralDirection\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?CoralDirection\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const CoralDirection; + MCAPI extern class BlockStateVariant const CoralDirection; /** - * @symbol ?CoralFanDirection\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?CoralFanDirection\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const CoralFanDirection; + MCAPI extern class BlockStateVariant const CoralFanDirection; /** - * @symbol ?CoralHangTypeBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?CoralHangTypeBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const CoralHangTypeBit; + MCAPI extern class BlockStateVariant const CoralHangTypeBit; /** - * @symbol ?CoveredBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?CoveredBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const CoveredBit; + MCAPI extern class BlockStateVariant const CoveredBit; /** - * @symbol ?CrackedState\@VanillaStates\@\@3V?$ItemStateVariant\@W4HatchLevel\@\@\@\@B + * @symbol ?CrackedState\@VanillaStates\@\@3V?$BlockStateVariant\@W4HatchLevel\@\@\@\@B */ - MCAPI extern class ItemStateVariant const CrackedState; + MCAPI extern class BlockStateVariant const CrackedState; /** - * @symbol ?DEPRECATED\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?DEPRECATED\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const DEPRECATED; + MCAPI extern class BlockStateVariant const DEPRECATED; /** - * @symbol ?Damage\@VanillaStates\@\@3V?$ItemStateVariant\@W4AnvilDamage\@\@\@\@B + * @symbol ?Damage\@VanillaStates\@\@3V?$BlockStateVariant\@W4AnvilDamage\@\@\@\@B */ - MCAPI extern class ItemStateVariant const Damage; + MCAPI extern class BlockStateVariant const Damage; /** - * @symbol ?DeadBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?DeadBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const DeadBit; + MCAPI extern class BlockStateVariant const DeadBit; /** - * @symbol ?Direction\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?Direction\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const Direction; + MCAPI extern class BlockStateVariant const Direction; /** - * @symbol ?DirtType\@VanillaStates\@\@3V?$ItemStateVariant\@W4DirtType\@\@\@\@B + * @symbol ?DirtType\@VanillaStates\@\@3V?$BlockStateVariant\@W4DirtType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const DirtType; + MCAPI extern class BlockStateVariant const DirtType; /** - * @symbol ?DisarmedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?DisarmedBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const DisarmedBit; + MCAPI extern class BlockStateVariant const DisarmedBit; /** - * @symbol ?DoorHingeBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?DoorHingeBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const DoorHingeBit; + MCAPI extern class BlockStateVariant const DoorHingeBit; /** - * @symbol ?DoublePlantType\@VanillaStates\@\@3V?$ItemStateVariant\@W4DoublePlantType\@\@\@\@B + * @symbol ?DoublePlantType\@VanillaStates\@\@3V?$BlockStateVariant\@W4DoublePlantType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const DoublePlantType; + MCAPI extern class BlockStateVariant const DoublePlantType; /** - * @symbol ?DragDown\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?DragDown\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const DragDown; + MCAPI extern class BlockStateVariant const DragDown; /** - * @symbol ?DripstoneThickness\@VanillaStates\@\@3V?$ItemStateVariant\@W4DripstoneThickness\@\@\@\@B + * @symbol ?DripstoneThickness\@VanillaStates\@\@3V?$BlockStateVariant\@W4DripstoneThickness\@\@\@\@B */ - MCAPI extern class ItemStateVariant const DripstoneThickness; + MCAPI extern class BlockStateVariant const DripstoneThickness; /** - * @symbol ?EndPortalEyeBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?EndPortalEyeBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const EndPortalEyeBit; + MCAPI extern class BlockStateVariant const EndPortalEyeBit; /** - * @symbol ?ExplodeBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?ExplodeBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const ExplodeBit; + MCAPI extern class BlockStateVariant const ExplodeBit; /** - * @symbol ?Extinguished\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?Extinguished\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const Extinguished; + MCAPI extern class BlockStateVariant const Extinguished; /** - * @symbol ?FacingDirection\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?FacingDirection\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const FacingDirection; + MCAPI extern class BlockStateVariant const FacingDirection; /** - * @symbol ?FillLevel\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?FillLevel\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const FillLevel; + MCAPI extern class BlockStateVariant const FillLevel; /** - * @symbol ?FlowerType\@VanillaStates\@\@3V?$ItemStateVariant\@W4FlowerType\@\@\@\@B + * @symbol ?FlowerType\@VanillaStates\@\@3V?$BlockStateVariant\@W4FlowerType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const FlowerType; + MCAPI extern class BlockStateVariant const FlowerType; /** - * @symbol ?GrowingPlantAge\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?GrowingPlantAge\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const GrowingPlantAge; + MCAPI extern class BlockStateVariant const GrowingPlantAge; /** - * @symbol ?Growth\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?Growth\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const Growth; + MCAPI extern class BlockStateVariant const Growth; /** - * @symbol ?HangingBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?HangingBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const HangingBit; + MCAPI extern class BlockStateVariant const HangingBit; /** - * @symbol ?HeadPieceBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?HeadPieceBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const HeadPieceBit; + MCAPI extern class BlockStateVariant const HeadPieceBit; /** - * @symbol ?Height\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?Height\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const Height; + MCAPI extern class BlockStateVariant const Height; /** - * @symbol ?HugeMushroomBits\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?HugeMushroomBits\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const HugeMushroomBits; + MCAPI extern class BlockStateVariant const HugeMushroomBits; /** - * @symbol ?InWallBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?InWallBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const InWallBit; + MCAPI extern class BlockStateVariant const InWallBit; /** - * @symbol ?InfiniburnBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?InfiniburnBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const InfiniburnBit; + MCAPI extern class BlockStateVariant const InfiniburnBit; /** - * @symbol ?ItemFrameMapBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?ItemFrameMapBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const ItemFrameMapBit; + MCAPI extern class BlockStateVariant const ItemFrameMapBit; /** - * @symbol ?ItemFramePhotoBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?ItemFramePhotoBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const ItemFramePhotoBit; + MCAPI extern class BlockStateVariant const ItemFramePhotoBit; /** - * @symbol ?KelpAge\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?KelpAge\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const KelpAge; + MCAPI extern class BlockStateVariant const KelpAge; /** - * @symbol ?LeverDirection\@VanillaStates\@\@3V?$ItemStateVariant\@W4LeverDirection\@\@\@\@B + * @symbol ?LeverDirection\@VanillaStates\@\@3V?$BlockStateVariant\@W4LeverDirection\@\@\@\@B */ - MCAPI extern class ItemStateVariant const LeverDirection; + MCAPI extern class BlockStateVariant const LeverDirection; /** - * @symbol ?LiquidDepth\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?LiquidDepth\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const LiquidDepth; + MCAPI extern class BlockStateVariant const LiquidDepth; /** - * @symbol ?Lit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?Lit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const Lit; + MCAPI extern class BlockStateVariant const Lit; /** - * @symbol ?MoisturizedAmount\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?MoisturizedAmount\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const MoisturizedAmount; + MCAPI extern class BlockStateVariant const MoisturizedAmount; /** - * @symbol ?MonsterEggStoneType\@VanillaStates\@\@3V?$ItemStateVariant\@W4MonsterEggStoneType\@\@\@\@B + * @symbol ?MonsterEggStoneType\@VanillaStates\@\@3V?$BlockStateVariant\@W4MonsterEggStoneType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const MonsterEggStoneType; + MCAPI extern class BlockStateVariant const MonsterEggStoneType; /** - * @symbol ?MultiFaceDirectionBits\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?MultiFaceDirectionBits\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const MultiFaceDirectionBits; + MCAPI extern class BlockStateVariant const MultiFaceDirectionBits; /** - * @symbol ?NewLeafType\@VanillaStates\@\@3V?$ItemStateVariant\@W4NewLeafType\@\@\@\@B + * @symbol ?NewLeafType\@VanillaStates\@\@3V?$BlockStateVariant\@W4NewLeafType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const NewLeafType; + MCAPI extern class BlockStateVariant const NewLeafType; /** - * @symbol ?NewLogType\@VanillaStates\@\@3V?$ItemStateVariant\@W4NewLogType\@\@\@\@B + * @symbol ?NewLogType\@VanillaStates\@\@3V?$BlockStateVariant\@W4NewLogType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const NewLogType; + MCAPI extern class BlockStateVariant const NewLogType; /** - * @symbol ?NoDropBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?NoDropBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const NoDropBit; + MCAPI extern class BlockStateVariant const NoDropBit; /** - * @symbol ?OccupiedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?OccupiedBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const OccupiedBit; + MCAPI extern class BlockStateVariant const OccupiedBit; /** - * @symbol ?OldLeafType\@VanillaStates\@\@3V?$ItemStateVariant\@W4OldLeafType\@\@\@\@B + * @symbol ?OldLeafType\@VanillaStates\@\@3V?$BlockStateVariant\@W4OldLeafType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const OldLeafType; + MCAPI extern class BlockStateVariant const OldLeafType; /** - * @symbol ?OldLogType\@VanillaStates\@\@3V?$ItemStateVariant\@W4OldLogType\@\@\@\@B + * @symbol ?OldLogType\@VanillaStates\@\@3V?$BlockStateVariant\@W4OldLogType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const OldLogType; + MCAPI extern class BlockStateVariant const OldLogType; /** - * @symbol ?OpenBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?OpenBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const OpenBit; + MCAPI extern class BlockStateVariant const OpenBit; /** - * @symbol ?OutputLitBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?OutputLitBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const OutputLitBit; + MCAPI extern class BlockStateVariant const OutputLitBit; /** - * @symbol ?OutputSubtractBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?OutputSubtractBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const OutputSubtractBit; + MCAPI extern class BlockStateVariant const OutputSubtractBit; /** - * @symbol ?PersistentBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?PersistentBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const PersistentBit; + MCAPI extern class BlockStateVariant const PersistentBit; /** - * @symbol ?PillarAxis\@VanillaStates\@\@3V?$ItemStateVariant\@W4PillarAxis\@\@\@\@B + * @symbol ?PillarAxis\@VanillaStates\@\@3V?$BlockStateVariant\@W4PillarAxis\@\@\@\@B */ - MCAPI extern class ItemStateVariant const PillarAxis; + MCAPI extern class BlockStateVariant const PillarAxis; /** - * @symbol ?PortalAxis\@VanillaStates\@\@3V?$ItemStateVariant\@W4PortalAxis\@\@\@\@B + * @symbol ?PortalAxis\@VanillaStates\@\@3V?$BlockStateVariant\@W4PortalAxis\@\@\@\@B */ - MCAPI extern class ItemStateVariant const PortalAxis; + MCAPI extern class BlockStateVariant const PortalAxis; /** - * @symbol ?PoweredBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?PoweredBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const PoweredBit; + MCAPI extern class BlockStateVariant const PoweredBit; /** - * @symbol ?PrismarineBlockType\@VanillaStates\@\@3V?$ItemStateVariant\@W4PrismarineBlockType\@\@\@\@B + * @symbol ?PrismarineBlockType\@VanillaStates\@\@3V?$BlockStateVariant\@W4PrismarineBlockType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const PrismarineBlockType; + MCAPI extern class BlockStateVariant const PrismarineBlockType; /** - * @symbol ?PropaguleStage\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?PropaguleStage\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const PropaguleStage; + MCAPI extern class BlockStateVariant const PropaguleStage; /** - * @symbol ?RailDataBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?RailDataBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const RailDataBit; + MCAPI extern class BlockStateVariant const RailDataBit; /** - * @symbol ?RailDirection\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?RailDirection\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const RailDirection; + MCAPI extern class BlockStateVariant const RailDirection; /** - * @symbol ?RedstoneSignal\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?RedstoneSignal\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const RedstoneSignal; + MCAPI extern class BlockStateVariant const RedstoneSignal; /** - * @symbol ?RepeaterDelay\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?RepeaterDelay\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const RepeaterDelay; + MCAPI extern class BlockStateVariant const RepeaterDelay; /** - * @symbol ?RespawnAnchorCharge\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?RespawnAnchorCharge\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const RespawnAnchorCharge; + MCAPI extern class BlockStateVariant const RespawnAnchorCharge; /** - * @symbol ?Rotation\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?Rotation\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const Rotation; + MCAPI extern class BlockStateVariant const Rotation; /** - * @symbol ?SandStoneType\@VanillaStates\@\@3V?$ItemStateVariant\@W4SandStoneType\@\@\@\@B + * @symbol ?SandStoneType\@VanillaStates\@\@3V?$BlockStateVariant\@W4SandStoneType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const SandStoneType; + MCAPI extern class BlockStateVariant const SandStoneType; /** - * @symbol ?SandType\@VanillaStates\@\@3V?$ItemStateVariant\@W4SandType\@\@\@\@B + * @symbol ?SandType\@VanillaStates\@\@3V?$BlockStateVariant\@W4SandType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const SandType; + MCAPI extern class BlockStateVariant const SandType; /** - * @symbol ?SaplingType\@VanillaStates\@\@3V?$ItemStateVariant\@W4SaplingType\@\@\@\@B + * @symbol ?SaplingType\@VanillaStates\@\@3V?$BlockStateVariant\@W4SaplingType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const SaplingType; + MCAPI extern class BlockStateVariant const SaplingType; /** - * @symbol ?SeaGrassType\@VanillaStates\@\@3V?$ItemStateVariant\@W4SeaGrassType\@\@\@\@B + * @symbol ?SeaGrassType\@VanillaStates\@\@3V?$BlockStateVariant\@W4SeaGrassType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const SeaGrassType; + MCAPI extern class BlockStateVariant const SeaGrassType; /** - * @symbol ?SpongeType\@VanillaStates\@\@3V?$ItemStateVariant\@W4SpongeType\@\@\@\@B + * @symbol ?SpongeType\@VanillaStates\@\@3V?$BlockStateVariant\@W4SpongeType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const SpongeType; + MCAPI extern class BlockStateVariant const SpongeType; /** - * @symbol ?Stability\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?Stability\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const Stability; + MCAPI extern class BlockStateVariant const Stability; /** - * @symbol ?StabilityCheckBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?StabilityCheckBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const StabilityCheckBit; + MCAPI extern class BlockStateVariant const StabilityCheckBit; /** - * @symbol ?StandingRotation\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?StandingRotation\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const StandingRotation; + MCAPI extern class BlockStateVariant const StandingRotation; /** - * @symbol ?StoneBrickType\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneBrickType\@\@\@\@B + * @symbol ?StoneBrickType\@VanillaStates\@\@3V?$BlockStateVariant\@W4StoneBrickType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const StoneBrickType; + MCAPI extern class BlockStateVariant const StoneBrickType; /** - * @symbol ?StoneSlabType\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneSlabType\@\@\@\@B + * @symbol ?StoneSlabType\@VanillaStates\@\@3V?$BlockStateVariant\@W4StoneSlabType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const StoneSlabType; + MCAPI extern class BlockStateVariant const StoneSlabType; /** - * @symbol ?StoneSlabType2\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneSlabType2\@\@\@\@B + * @symbol ?StoneSlabType2\@VanillaStates\@\@3V?$BlockStateVariant\@W4StoneSlabType2\@\@\@\@B */ - MCAPI extern class ItemStateVariant const StoneSlabType2; + MCAPI extern class BlockStateVariant const StoneSlabType2; /** - * @symbol ?StoneSlabType3\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneSlabType3\@\@\@\@B + * @symbol ?StoneSlabType3\@VanillaStates\@\@3V?$BlockStateVariant\@W4StoneSlabType3\@\@\@\@B */ - MCAPI extern class ItemStateVariant const StoneSlabType3; + MCAPI extern class BlockStateVariant const StoneSlabType3; /** - * @symbol ?StoneSlabType4\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneSlabType4\@\@\@\@B + * @symbol ?StoneSlabType4\@VanillaStates\@\@3V?$BlockStateVariant\@W4StoneSlabType4\@\@\@\@B */ - MCAPI extern class ItemStateVariant const StoneSlabType4; + MCAPI extern class BlockStateVariant const StoneSlabType4; /** - * @symbol ?StoneType\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneType\@\@\@\@B + * @symbol ?StoneType\@VanillaStates\@\@3V?$BlockStateVariant\@W4StoneType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const StoneType; + MCAPI extern class BlockStateVariant const StoneType; /** - * @symbol ?StrippedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?StrippedBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const StrippedBit; + MCAPI extern class BlockStateVariant const StrippedBit; /** - * @symbol ?StructureBlockType\@VanillaStates\@\@3V?$ItemStateVariant\@W4StructureBlockType\@\@\@\@B + * @symbol ?StructureBlockType\@VanillaStates\@\@3V?$BlockStateVariant\@W4StructureBlockType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const StructureBlockType; + MCAPI extern class BlockStateVariant const StructureBlockType; /** - * @symbol ?StructureVoidType\@VanillaStates\@\@3V?$ItemStateVariant\@W4StructureVoidType\@\@\@\@B + * @symbol ?StructureVoidType\@VanillaStates\@\@3V?$BlockStateVariant\@W4StructureVoidType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const StructureVoidType; + MCAPI extern class BlockStateVariant const StructureVoidType; /** - * @symbol ?SuspendedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?SuspendedBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const SuspendedBit; + MCAPI extern class BlockStateVariant const SuspendedBit; /** - * @symbol ?TallGrassType\@VanillaStates\@\@3V?$ItemStateVariant\@W4TallGrassType\@\@\@\@B + * @symbol ?TallGrassType\@VanillaStates\@\@3V?$BlockStateVariant\@W4TallGrassType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const TallGrassType; + MCAPI extern class BlockStateVariant const TallGrassType; /** - * @symbol ?ToggleBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?ToggleBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const ToggleBit; + MCAPI extern class BlockStateVariant const ToggleBit; /** - * @symbol ?TopSlotBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?TopSlotBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const TopSlotBit; + MCAPI extern class BlockStateVariant const TopSlotBit; /** - * @symbol ?TorchFacingDirection\@VanillaStates\@\@3V?$ItemStateVariant\@W4TorchFacing\@\@\@\@B + * @symbol ?TorchFacingDirection\@VanillaStates\@\@3V?$BlockStateVariant\@W4TorchFacing\@\@\@\@B */ - MCAPI extern class ItemStateVariant const TorchFacingDirection; + MCAPI extern class BlockStateVariant const TorchFacingDirection; /** - * @symbol ?TriggeredBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?TriggeredBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const TriggeredBit; + MCAPI extern class BlockStateVariant const TriggeredBit; /** - * @symbol ?TurtleEggCount\@VanillaStates\@\@3V?$ItemStateVariant\@W4EggCount\@\@\@\@B + * @symbol ?TurtleEggCount\@VanillaStates\@\@3V?$BlockStateVariant\@W4EggCount\@\@\@\@B */ - MCAPI extern class ItemStateVariant const TurtleEggCount; + MCAPI extern class BlockStateVariant const TurtleEggCount; /** - * @symbol ?TwistingVinesAge\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?TwistingVinesAge\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const TwistingVinesAge; + MCAPI extern class BlockStateVariant const TwistingVinesAge; /** - * @symbol ?UpdateBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?UpdateBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const UpdateBit; + MCAPI extern class BlockStateVariant const UpdateBit; /** - * @symbol ?UpperBlockBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?UpperBlockBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const UpperBlockBit; + MCAPI extern class BlockStateVariant const UpperBlockBit; /** - * @symbol ?UpsideDownBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?UpsideDownBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const UpsideDownBit; + MCAPI extern class BlockStateVariant const UpsideDownBit; /** - * @symbol ?VineDirectionBits\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?VineDirectionBits\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const VineDirectionBits; + MCAPI extern class BlockStateVariant const VineDirectionBits; /** - * @symbol ?WallBlockType\@VanillaStates\@\@3V?$ItemStateVariant\@W4WallBlockType\@\@\@\@B + * @symbol ?WallBlockType\@VanillaStates\@\@3V?$BlockStateVariant\@W4WallBlockType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const WallBlockType; + MCAPI extern class BlockStateVariant const WallBlockType; /** - * @symbol ?WallConnectionTypeEast\@VanillaStates\@\@3V?$ItemStateVariant\@W4WallConnectionType\@\@\@\@B + * @symbol ?WallConnectionTypeEast\@VanillaStates\@\@3V?$BlockStateVariant\@W4WallConnectionType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const WallConnectionTypeEast; + MCAPI extern class BlockStateVariant const WallConnectionTypeEast; /** - * @symbol ?WallConnectionTypeNorth\@VanillaStates\@\@3V?$ItemStateVariant\@W4WallConnectionType\@\@\@\@B + * @symbol ?WallConnectionTypeNorth\@VanillaStates\@\@3V?$BlockStateVariant\@W4WallConnectionType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const WallConnectionTypeNorth; + MCAPI extern class BlockStateVariant const WallConnectionTypeNorth; /** - * @symbol ?WallConnectionTypeSouth\@VanillaStates\@\@3V?$ItemStateVariant\@W4WallConnectionType\@\@\@\@B + * @symbol ?WallConnectionTypeSouth\@VanillaStates\@\@3V?$BlockStateVariant\@W4WallConnectionType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const WallConnectionTypeSouth; + MCAPI extern class BlockStateVariant const WallConnectionTypeSouth; /** - * @symbol ?WallConnectionTypeWest\@VanillaStates\@\@3V?$ItemStateVariant\@W4WallConnectionType\@\@\@\@B + * @symbol ?WallConnectionTypeWest\@VanillaStates\@\@3V?$BlockStateVariant\@W4WallConnectionType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const WallConnectionTypeWest; + MCAPI extern class BlockStateVariant const WallConnectionTypeWest; /** - * @symbol ?WallPostBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?WallPostBit\@VanillaStates\@\@3V?$BlockStateVariant\@_N\@\@B */ - MCAPI extern class ItemStateVariant const WallPostBit; + MCAPI extern class BlockStateVariant const WallPostBit; /** - * @symbol ?WeepingVinesAge\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?WeepingVinesAge\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const WeepingVinesAge; + MCAPI extern class BlockStateVariant const WeepingVinesAge; /** - * @symbol ?WeirdoDirection\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?WeirdoDirection\@VanillaStates\@\@3V?$BlockStateVariant\@H\@\@B */ - MCAPI extern class ItemStateVariant const WeirdoDirection; + MCAPI extern class BlockStateVariant const WeirdoDirection; /** - * @symbol ?WoodType\@VanillaStates\@\@3V?$ItemStateVariant\@W4WoodType\@\@\@\@B + * @symbol ?WoodType\@VanillaStates\@\@3V?$BlockStateVariant\@W4WoodType\@\@\@\@B */ - MCAPI extern class ItemStateVariant const WoodType; + MCAPI extern class BlockStateVariant const WoodType; /** - * @symbol ?getState\@VanillaStates\@\@YAPEBVItemState\@\@AEBVHashedString\@\@\@Z + * @symbol ?getState\@VanillaStates\@\@YAPEBVBlockState\@\@AEBVHashedString\@\@\@Z */ - MCAPI class ItemState const * getState(class HashedString const &); + MCAPI class BlockState const * getState(class HashedString const &); /** - * @symbol ?getState\@VanillaStates\@\@YAPEBVItemState\@\@AEBVHashedString\@\@AEAUCachedItemStateMapPtr\@1\@\@Z + * @symbol ?getState\@VanillaStates\@\@YAPEBVBlockState\@\@AEBVHashedString\@\@AEAUCachedBlockStateMapPtr\@1\@\@Z */ - MCAPI class ItemState const * getState(class HashedString const &, struct VanillaStates::CachedItemStateMapPtr &); + MCAPI class BlockState const * getState(class HashedString const &, struct VanillaStates::CachedBlockStateMapPtr &); /** * @symbol ?registerStates\@VanillaStates\@\@YAXXZ */ diff --git a/LiteLoader/include/llapi/mc/VanillaTagMaps.hpp b/LiteLoader/include/llapi/mc/VanillaTagMaps.hpp deleted file mode 100644 index bff69e8a0b..0000000000 --- a/LiteLoader/include/llapi/mc/VanillaTagMaps.hpp +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @file VanillaTagMaps.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace VanillaTagMaps. - * - */ -namespace VanillaTagMaps { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA - /** - * @symbol ?BlockNameIdToTagsMap\@VanillaTagMaps\@\@3V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@B - */ - MCAPI extern class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const BlockNameIdToTagsMap; - /** - * @symbol ?ItemNameIdToTagsMap\@VanillaTagMaps\@\@3V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@B - */ - MCAPI extern class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const ItemNameIdToTagsMap; - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VanillaTags.hpp b/LiteLoader/include/llapi/mc/VanillaTags.hpp deleted file mode 100644 index a1e6e61a54..0000000000 --- a/LiteLoader/include/llapi/mc/VanillaTags.hpp +++ /dev/null @@ -1,109 +0,0 @@ -/** - * @file VanillaTags.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace VanillaTags. - * - */ -namespace VanillaTags { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA - /** - * @symbol ?DiamondDiggable\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const DiamondDiggable; - /** - * @symbol ?Dirt\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Dirt; - /** - * @symbol ?FertilizeArea\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const FertilizeArea; - /** - * @symbol ?GoldDiggable\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const GoldDiggable; - /** - * @symbol ?Grass\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Grass; - /** - * @symbol ?Gravel\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Gravel; - /** - * @symbol ?IronDiggable\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const IronDiggable; - /** - * @symbol ?Metal\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Metal; - /** - * @symbol ?MobSpawner\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const MobSpawner; - /** - * @symbol ?NotFeatureReplaceable\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const NotFeatureReplaceable; - /** - * @symbol ?Plant\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Plant; - /** - * @symbol ?Pumpkin\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Pumpkin; - /** - * @symbol ?Rail\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Rail; - /** - * @symbol ?Sand\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Sand; - /** - * @symbol ?Snow\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Snow; - /** - * @symbol ?Stone\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Stone; - /** - * @symbol ?StoneDiggable\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const StoneDiggable; - /** - * @symbol ?TextSign\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const TextSign; - /** - * @symbol ?Water\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Water; - /** - * @symbol ?Wood\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Wood; - /** - * @symbol ?WoodDiggable\@VanillaTags\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const WoodDiggable; - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VanillaTrailRuinsJigsawStructureBlockRules.hpp b/LiteLoader/include/llapi/mc/VanillaTrailRuinsJigsawStructureBlockRules.hpp new file mode 100644 index 0000000000..86570fa93c --- /dev/null +++ b/LiteLoader/include/llapi/mc/VanillaTrailRuinsJigsawStructureBlockRules.hpp @@ -0,0 +1,32 @@ +/** + * @file VanillaTrailRuinsJigsawStructureBlockRules.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class VanillaTrailRuinsJigsawStructureBlockRules { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_VANILLATRAILRUINSJIGSAWSTRUCTUREBLOCKRULES +public: + class VanillaTrailRuinsJigsawStructureBlockRules& operator=(class VanillaTrailRuinsJigsawStructureBlockRules const &) = delete; + VanillaTrailRuinsJigsawStructureBlockRules(class VanillaTrailRuinsJigsawStructureBlockRules const &) = delete; + VanillaTrailRuinsJigsawStructureBlockRules() = delete; +#endif + +public: + /** + * @symbol ?initialize\@VanillaTrailRuinsJigsawStructureBlockRules\@\@SAXAEAVJigsawStructureRegistry\@\@\@Z + */ + MCAPI static void initialize(class JigsawStructureRegistry &); + +}; diff --git a/LiteLoader/include/llapi/mc/VanillaTrailRuinsJigsawStructureElements.hpp b/LiteLoader/include/llapi/mc/VanillaTrailRuinsJigsawStructureElements.hpp new file mode 100644 index 0000000000..61cbf32217 --- /dev/null +++ b/LiteLoader/include/llapi/mc/VanillaTrailRuinsJigsawStructureElements.hpp @@ -0,0 +1,33 @@ +/** + * @file VanillaTrailRuinsJigsawStructureElements.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class VanillaTrailRuinsJigsawStructureElements { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_VANILLATRAILRUINSJIGSAWSTRUCTUREELEMENTS +public: + class VanillaTrailRuinsJigsawStructureElements& operator=(class VanillaTrailRuinsJigsawStructureElements const &) = delete; + VanillaTrailRuinsJigsawStructureElements(class VanillaTrailRuinsJigsawStructureElements const &) = delete; + VanillaTrailRuinsJigsawStructureElements() = delete; +#endif + +public: + /** + * @symbol ?initialize\@VanillaTrailRuinsJigsawStructureElements\@\@SAXAEBV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVJigsawStructureRegistry\@\@\@Z + */ + MCAPI static void initialize(class gsl::not_null> const &, class JigsawStructureRegistry &); + +}; diff --git a/LiteLoader/include/llapi/mc/VanillaTrailRuinsJigsawStructures.hpp b/LiteLoader/include/llapi/mc/VanillaTrailRuinsJigsawStructures.hpp new file mode 100644 index 0000000000..1f2aa9570c --- /dev/null +++ b/LiteLoader/include/llapi/mc/VanillaTrailRuinsJigsawStructures.hpp @@ -0,0 +1,33 @@ +/** + * @file VanillaTrailRuinsJigsawStructures.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class VanillaTrailRuinsJigsawStructures { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_VANILLATRAILRUINSJIGSAWSTRUCTURES +public: + class VanillaTrailRuinsJigsawStructures& operator=(class VanillaTrailRuinsJigsawStructures const &) = delete; + VanillaTrailRuinsJigsawStructures(class VanillaTrailRuinsJigsawStructures const &) = delete; + VanillaTrailRuinsJigsawStructures() = delete; +#endif + +public: + /** + * @symbol ?initialize\@VanillaTrailRuinsJigsawStructures\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVJigsawStructureRegistry\@\@\@Z + */ + MCAPI static void initialize(class gsl::not_null>, class JigsawStructureRegistry &); + +}; diff --git a/LiteLoader/include/llapi/mc/VanillaWorldSystems.hpp b/LiteLoader/include/llapi/mc/VanillaWorldSystems.hpp index 62acbc101f..7b38184461 100644 --- a/LiteLoader/include/llapi/mc/VanillaWorldSystems.hpp +++ b/LiteLoader/include/llapi/mc/VanillaWorldSystems.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -28,8 +29,8 @@ class Impl { #undef AFTER_EXTRA /** - * @symbol ?init\@VanillaWorldSystems\@\@YA?AV?$shared_ptr\@VImpl\@VanillaWorldSystems\@\@\@std\@\@PEAVLevel\@\@AEBVExperiments\@\@AEBVBaseGameVersion\@\@PEAVResourcePackManager\@\@VItemRegistryRef\@\@\@Z + * @symbol ?init\@VanillaWorldSystems\@\@YA?AV?$shared_ptr\@VImpl\@VanillaWorldSystems\@\@\@std\@\@AEBV?$NonOwnerPointer\@VLevel\@\@\@Bedrock\@\@AEBVExperiments\@\@AEBVBaseGameVersion\@\@PEAVResourcePackManager\@\@VItemRegistryRef\@\@\@Z */ - MCAPI class std::shared_ptr init(class Level *, class Experiments const &, class BaseGameVersion const &, class ResourcePackManager *, class ItemRegistryRef); + MCAPI class std::shared_ptr init(class Bedrock::NonOwnerPointer const &, class Experiments const &, class BaseGameVersion const &, class ResourcePackManager *, class ItemRegistryRef); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Vec4.hpp b/LiteLoader/include/llapi/mc/Vec4.hpp new file mode 100644 index 0000000000..b3c9cabf24 --- /dev/null +++ b/LiteLoader/include/llapi/mc/Vec4.hpp @@ -0,0 +1,44 @@ +/** + * @file Vec4.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class Vec4 { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_VEC4 +public: + class Vec4& operator=(class Vec4 const &) = delete; + Vec4(class Vec4 const &) = delete; + Vec4() = delete; +#endif + +public: + /** + * @symbol ?MAX\@Vec4\@\@2V1\@B + */ + MCAPI static class Vec4 const MAX; + /** + * @symbol ?MIN\@Vec4\@\@2V1\@B + */ + MCAPI static class Vec4 const MIN; + /** + * @symbol ?ONE\@Vec4\@\@2V1\@B + */ + MCAPI static class Vec4 const ONE; + /** + * @symbol ?ZERO\@Vec4\@\@2V1\@B + */ + MCAPI static class Vec4 const ZERO; + +}; diff --git a/LiteLoader/include/llapi/mc/VehicleServerMolangSeatPositionSystem.hpp b/LiteLoader/include/llapi/mc/VehicleServerMolangSeatPositionSystem.hpp index 9f7b8525d9..14c0ccbe7c 100644 --- a/LiteLoader/include/llapi/mc/VehicleServerMolangSeatPositionSystem.hpp +++ b/LiteLoader/include/llapi/mc/VehicleServerMolangSeatPositionSystem.hpp @@ -31,6 +31,10 @@ class VehicleServerMolangSeatPositionSystem { * @symbol ?_tickActor\@VehicleServerMolangSeatPositionSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEAVActorOwnerComponent\@\@AEAUPositionPassengerRequestComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBVRideableComponent\@\@$$CBUVehicleComponent\@\@\@\@\@Z */ MCAPI static void _tickActor(class StrictEntityContext &, struct PassengerComponent const &, class ActorOwnerComponent &, struct PositionPassengerRequestComponent &, class ViewT); + /** + * @symbol ?_tickVehicleServerMolangSeatPositionSystem\@VehicleServerMolangSeatPositionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@VActorOwnerComponent\@\@UPositionPassengerRequestComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBVRideableComponent\@\@$$CBUVehicleComponent\@\@\@\@\@Z + */ + MCAPI static void _tickVehicleServerMolangSeatPositionSystem(class ViewT, class ViewT); /** * @symbol ?createSystem\@VehicleServerMolangSeatPositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/VerticalCollisionSystem.hpp b/LiteLoader/include/llapi/mc/VerticalCollisionSystem.hpp index deda37d824..bdb545effa 100644 --- a/LiteLoader/include/llapi/mc/VerticalCollisionSystem.hpp +++ b/LiteLoader/include/llapi/mc/VerticalCollisionSystem.hpp @@ -44,6 +44,11 @@ class VerticalCollisionSystem { virtual void __unk_vfn_2(); /** * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 * @symbol ?tick\@VerticalCollisionSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UMinecartFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UVerticalCollisionFlag\@\@\@\@\@\@U?$Read\@USynchedActorDataComponent\@\@UMoveRequestComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@UStateVectorComponent\@\@\@\@U?$Write\@UStateVectorComponent\@\@UWalkDistComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UBounceComponent\@\@\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); diff --git a/LiteLoader/include/llapi/mc/VexRandomMoveGoal.hpp b/LiteLoader/include/llapi/mc/VexRandomMoveGoal.hpp index 41246e5b9b..5fca4a6668 100644 --- a/LiteLoader/include/llapi/mc/VexRandomMoveGoal.hpp +++ b/LiteLoader/include/llapi/mc/VexRandomMoveGoal.hpp @@ -69,9 +69,5 @@ class VexRandomMoveGoal { * @symbol ?appendDebugInfo\@VexRandomMoveGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; - /** - * @symbol ??0VexRandomMoveGoal\@\@QEAA\@AEAVMob\@\@\@Z - */ - MCAPI VexRandomMoveGoal(class Mob &); }; diff --git a/LiteLoader/include/llapi/mc/VibrationInfo.hpp b/LiteLoader/include/llapi/mc/VibrationInfo.hpp index f31c454c7f..e9f3914594 100644 --- a/LiteLoader/include/llapi/mc/VibrationInfo.hpp +++ b/LiteLoader/include/llapi/mc/VibrationInfo.hpp @@ -27,22 +27,6 @@ class VibrationInfo { #endif public: - /** - * @symbol ??0VibrationInfo\@\@QEAA\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z - */ - MCAPI VibrationInfo(class CompoundTag const &, class DataLoadHelper &); - /** - * @symbol ??0VibrationInfo\@\@QEAA\@AEBVGameEvent\@\@AEBUGameEventContext\@\@M\@Z - */ - MCAPI VibrationInfo(class GameEvent const &, struct GameEventContext const &, float); - /** - * @symbol ?getProjectileOwner\@VibrationInfo\@\@QEBAPEAVActor\@\@AEAVLevel\@\@\@Z - */ - MCAPI class Actor * getProjectileOwner(class Level &) const; - /** - * @symbol ?getSource\@VibrationInfo\@\@QEBAPEAVActor\@\@AEAVLevel\@\@\@Z - */ - MCAPI class Actor * getSource(class Level &) const; /** * @symbol ?load\@VibrationInfo\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/VibrationListenerComponent.hpp b/LiteLoader/include/llapi/mc/VibrationListenerComponent.hpp index 1c3419755c..0ff85b9ae0 100644 --- a/LiteLoader/include/llapi/mc/VibrationListenerComponent.hpp +++ b/LiteLoader/include/llapi/mc/VibrationListenerComponent.hpp @@ -35,9 +35,5 @@ class VibrationListenerComponent { * @symbol ?readAdditionalSaveData\@VibrationListenerComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); - /** - * @symbol ??1VibrationListenerComponent\@\@QEAA\@XZ - */ - MCAPI ~VibrationListenerComponent(); }; diff --git a/LiteLoader/include/llapi/mc/VibrationListenerConfig.hpp b/LiteLoader/include/llapi/mc/VibrationListenerConfig.hpp index dd982efa74..cbbca6ff78 100644 --- a/LiteLoader/include/llapi/mc/VibrationListenerConfig.hpp +++ b/LiteLoader/include/llapi/mc/VibrationListenerConfig.hpp @@ -11,10 +11,24 @@ #undef BEFORE_EXTRA -namespace VibrationListenerConfig { +class VibrationListenerConfig { #define AFTER_EXTRA #undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_VIBRATIONLISTENERCONFIG +public: + class VibrationListenerConfig& operator=(class VibrationListenerConfig const &) = delete; + VibrationListenerConfig(class VibrationListenerConfig const &) = delete; + VibrationListenerConfig() = delete; +#endif -}; \ No newline at end of file +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_VIBRATIONLISTENERCONFIG + /** + * @symbol ?isValidVibration\@VibrationListenerConfig\@\@UEAA_NAEBVGameEvent\@\@\@Z + */ + MCVAPI bool isValidVibration(class GameEvent const &); +#endif + +}; diff --git a/LiteLoader/include/llapi/mc/VibrationListenerUtils.hpp b/LiteLoader/include/llapi/mc/VibrationListenerUtils.hpp index ed3e9757fb..b593b99003 100644 --- a/LiteLoader/include/llapi/mc/VibrationListenerUtils.hpp +++ b/LiteLoader/include/llapi/mc/VibrationListenerUtils.hpp @@ -23,6 +23,10 @@ namespace VibrationListenerUtils { * @symbol ?getGameEventFrequency\@VibrationListenerUtils\@\@YAHAEBVGameEvent\@\@\@Z */ MCAPI int getGameEventFrequency(class GameEvent const &); + /** + * @symbol ?getResonateEventByFrequency\@VibrationListenerUtils\@\@YAAEBVGameEvent\@\@H\@Z + */ + MCAPI class GameEvent const & getResonateEventByFrequency(int); /** * @symbol ?ignoreVibrationIfSneaking\@VibrationListenerUtils\@\@YA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/VibrationSelector.hpp b/LiteLoader/include/llapi/mc/VibrationSelector.hpp index 12475dfb19..486bcd1d86 100644 --- a/LiteLoader/include/llapi/mc/VibrationSelector.hpp +++ b/LiteLoader/include/llapi/mc/VibrationSelector.hpp @@ -23,28 +23,13 @@ class VibrationSelector { public: class VibrationSelector& operator=(class VibrationSelector const &) = delete; VibrationSelector(class VibrationSelector const &) = delete; + VibrationSelector() = delete; #endif public: - /** - * @symbol ??0VibrationSelector\@\@QEAA\@XZ - */ - MCAPI VibrationSelector(); /** * @symbol ?addCandidate\@VibrationSelector\@\@QEAAXUTick\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@AEBVBlockPos\@\@\@Z */ MCAPI void addCandidate(struct Tick, class GameEvent const &, struct GameEventContext const &, class BlockPos const &); - /** - * @symbol ?consumeBestCandidate\@VibrationSelector\@\@QEAA?AV?$optional\@VVibrationInfo\@\@\@std\@\@UTick\@\@\@Z - */ - MCAPI class std::optional consumeBestCandidate(struct Tick); - /** - * @symbol ?load\@VibrationSelector\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z - */ - MCAPI void load(class CompoundTag const &, class DataLoadHelper &); - /** - * @symbol ?save\@VibrationSelector\@\@QEBAXAEAVCompoundTag\@\@\@Z - */ - MCAPI void save(class CompoundTag &) const; }; diff --git a/LiteLoader/include/llapi/mc/Village.hpp b/LiteLoader/include/llapi/mc/Village.hpp index b0209de896..e3bc20ad7a 100644 --- a/LiteLoader/include/llapi/mc/Village.hpp +++ b/LiteLoader/include/llapi/mc/Village.hpp @@ -55,22 +55,10 @@ struct DwellerData { * @symbol ?addVillager\@Village\@\@QEAAXAEBUActorUniqueID\@\@\@Z */ MCAPI void addVillager(struct ActorUniqueID const &); - /** - * @symbol ?alwaysTickRaid\@Village\@\@QEBA_NXZ - */ - MCAPI bool alwaysTickRaid() const; - /** - * @symbol ?canRemove\@Village\@\@QEBA_NXZ - */ - MCAPI bool canRemove() const; /** * @symbol ?checkNeedMoreVillagers\@Village\@\@QEBA_NXZ */ MCAPI bool checkNeedMoreVillagers() const; - /** - * @symbol ?clearOwnedPOIs\@Village\@\@QEAAXXZ - */ - MCAPI void clearOwnedPOIs(); /** * @symbol ?debugDraw\@Village\@\@QEAAXXZ */ @@ -127,10 +115,6 @@ struct DwellerData { * @symbol ?getStanding\@Village\@\@QEAAHAEBUActorUniqueID\@\@\@Z */ MCAPI int getStanding(struct ActorUniqueID const &); - /** - * @symbol ?getUnclaimedPOIs\@Village\@\@QEBAAEBV?$array\@V?$vector\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@V?$allocator\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@\@2\@\@std\@\@$02\@std\@\@XZ - */ - MCAPI class std::array>, 3> const & getUnclaimedPOIs() const; /** * @symbol ?getUniqueID\@Village\@\@QEBA?AVUUID\@mce\@\@XZ */ @@ -179,10 +163,6 @@ struct DwellerData { * @symbol ?rewardAllPlayers\@Village\@\@QEAAXH\@Z */ MCAPI void rewardAllPlayers(int); - /** - * @symbol ?saveEntireVillage\@Village\@\@QEAAXXZ - */ - MCAPI void saveEntireVillage(); /** * @symbol ?setSavedDwellerPosition\@Village\@\@QEAAXW4DwellerRole\@\@AEBUActorUniqueID\@\@VBlockPos\@\@\@Z */ @@ -215,10 +195,6 @@ struct DwellerData { * @symbol ?withinVillageBounds\@Village\@\@QEBA_NAEBVVec3\@\@M\@Z */ MCAPI bool withinVillageBounds(class Vec3 const &, float) const; - /** - * @symbol ??1Village\@\@QEAA\@XZ - */ - MCAPI ~Village(); /** * @symbol ?DEBUG_DRAWING\@Village\@\@2_NA */ diff --git a/LiteLoader/include/llapi/mc/VillageManager.hpp b/LiteLoader/include/llapi/mc/VillageManager.hpp index 0f1ab79415..6b93b4947b 100644 --- a/LiteLoader/include/llapi/mc/VillageManager.hpp +++ b/LiteLoader/include/llapi/mc/VillageManager.hpp @@ -42,13 +42,14 @@ enum class BedAvailabilityState; */ virtual class std::weak_ptr fetchClosestVillage(class BlockPos const &, int, unsigned int) const; /** - * @symbol ??0VillageManager\@\@QEAA\@AEAVDimension\@\@\@Z + * @vftbl 2 + * @symbol ?getVillageByID\@VillageManager\@\@UEBA?AV?$weak_ptr\@VVillage\@\@\@std\@\@AEBVUUID\@mce\@\@\@Z */ - MCAPI VillageManager(class Dimension &); + virtual class std::weak_ptr getVillageByID(class mce::UUID const &) const; /** - * @symbol ?applyHeroOfTheVillageEffect\@VillageManager\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ??0VillageManager\@\@QEAA\@AEAVDimension\@\@\@Z */ - MCAPI void applyHeroOfTheVillageEffect(class Actor &); + MCAPI VillageManager(class Dimension &); /** * @symbol ?fetchClosestVillageMostSuitableForDweller\@VillageManager\@\@QEBA?AV?$weak_ptr\@VVillage\@\@\@std\@\@AEBVBlockPos\@\@HI\@Z */ @@ -65,22 +66,10 @@ enum class BedAvailabilityState; * @symbol ?getPOIInitEventFromName\@VillageManager\@\@QEBA?AVHashedString\@\@AEBV2\@\@Z */ MCAPI class HashedString getPOIInitEventFromName(class HashedString const &) const; - /** - * @symbol ?getVillageByID\@VillageManager\@\@QEBA?AV?$weak_ptr\@VVillage\@\@\@std\@\@AEBVUUID\@mce\@\@\@Z - */ - MCAPI class std::weak_ptr getVillageByID(class mce::UUID const &) const; - /** - * @symbol ?hasPOI\@VillageManager\@\@QEBA_NAEBVBlockPos\@\@W4POIType\@\@\@Z - */ - MCAPI bool hasPOI(class BlockPos const &, enum class POIType) const; /** * @symbol ?insertPOI\@VillageManager\@\@QEAAX$$QEAV?$shared_ptr\@VPOIInstance\@\@\@std\@\@\@Z */ MCAPI void insertPOI(class std::shared_ptr &&); - /** - * @symbol ?isRegisteredPOI\@VillageManager\@\@QEBA_NAEBVBlock\@\@\@Z - */ - MCAPI bool isRegisteredPOI(class Block const &) const; /** * @symbol ?isValidPOIType\@VillageManager\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ @@ -147,6 +136,10 @@ enum class BedAvailabilityState; * @symbol ?_loadPOIBlueprints\@VillageManager\@\@AEAAXXZ */ MCAPI void _loadPOIBlueprints(); + /** + * @symbol ?_removeVillage\@VillageManager\@\@AEAAXAEAVVillage\@\@\@Z + */ + MCAPI void _removeVillage(class Village &); /** * @symbol ?_tryAssignPOIOrCreateVillage\@VillageManager\@\@AEAAX$$QEAV?$shared_ptr\@VPOIInstance\@\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/VillagerCelebrationGoal.hpp b/LiteLoader/include/llapi/mc/VillagerCelebrationGoal.hpp index 4e10a5ec5b..d1b2f7e19c 100644 --- a/LiteLoader/include/llapi/mc/VillagerCelebrationGoal.hpp +++ b/LiteLoader/include/llapi/mc/VillagerCelebrationGoal.hpp @@ -67,10 +67,6 @@ class VillagerCelebrationGoal { * @symbol ?appendDebugInfo\@VillagerCelebrationGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; - /** - * @symbol ??0VillagerCelebrationGoal\@\@QEAA\@AEAVMob\@\@\@Z - */ - MCAPI VillagerCelebrationGoal(class Mob &); //private: /** diff --git a/LiteLoader/include/llapi/mc/VineBlock.hpp b/LiteLoader/include/llapi/mc/VineBlock.hpp index 691adfe0f2..938f505eff 100644 --- a/LiteLoader/include/llapi/mc/VineBlock.hpp +++ b/LiteLoader/include/llapi/mc/VineBlock.hpp @@ -177,9 +177,9 @@ class VineBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@VineBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@VineBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,35 +196,35 @@ class VineBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 135 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 136 * @symbol ?getColor\@VineBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColor\@VineBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 142 + * @vftbl 143 * @symbol ?getVisualShapeInWorld\@VineBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -236,52 +236,57 @@ class VineBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 172 * @symbol ?tick\@VineBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 + * @vftbl 173 * @symbol ?randomTick\@VineBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@VineBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@VineBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 187 + * @vftbl 188 * @symbol ?playerDestroy\@VineBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 190 * @symbol ?getResourceCount\@VineBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/VolumeAreaCommand.hpp b/LiteLoader/include/llapi/mc/VolumeAreaCommand.hpp index d3e13c1d41..0176e05ce0 100644 --- a/LiteLoader/include/llapi/mc/VolumeAreaCommand.hpp +++ b/LiteLoader/include/llapi/mc/VolumeAreaCommand.hpp @@ -34,7 +34,7 @@ class VolumeAreaCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@VolumeAreaCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/VolumeFogComponent.hpp b/LiteLoader/include/llapi/mc/VolumeFogComponent.hpp index bb847b9f70..2d1a1b535b 100644 --- a/LiteLoader/include/llapi/mc/VolumeFogComponent.hpp +++ b/LiteLoader/include/llapi/mc/VolumeFogComponent.hpp @@ -31,9 +31,5 @@ class VolumeFogComponent { * @symbol ??4VolumeFogComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class VolumeFogComponent & operator=(class VolumeFogComponent &&); - /** - * @symbol ??1VolumeFogComponent\@\@QEAA\@XZ - */ - MCAPI ~VolumeFogComponent(); }; diff --git a/LiteLoader/include/llapi/mc/WSServerCommand.hpp b/LiteLoader/include/llapi/mc/WSServerCommand.hpp index f3efa58a12..5195dd4486 100644 --- a/LiteLoader/include/llapi/mc/WSServerCommand.hpp +++ b/LiteLoader/include/llapi/mc/WSServerCommand.hpp @@ -36,7 +36,7 @@ class WSServerCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@WSServerCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/WallBlock.hpp b/LiteLoader/include/llapi/mc/WallBlock.hpp index da01022daa..7c2b1f65d8 100644 --- a/LiteLoader/include/llapi/mc/WallBlock.hpp +++ b/LiteLoader/include/llapi/mc/WallBlock.hpp @@ -212,9 +212,9 @@ class WallBlock : public BlockLegacy { virtual void __unk_vfn_105(); /** * @vftbl 106 - * @symbol ?getPlacementBlock\@WallBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@WallBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -231,40 +231,40 @@ class WallBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@WallBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@WallBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 142 + * @vftbl 143 * @symbol ?getVisualShapeInWorld\@WallBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@WallBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -277,41 +277,46 @@ class WallBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@WallBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@WallBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; @@ -329,14 +334,14 @@ class WallBlock : public BlockLegacy { */ MCVAPI ~WallBlock(); #endif - /** - * @symbol ??0WallBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlockLegacy\@\@\@Z - */ - MCAPI WallBlock(std::string const &, int, class BlockLegacy const &); /** * @symbol ??0WallBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI WallBlock(std::string const &, int, class Material const &); + /** + * @symbol ??0WallBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlockLegacy\@\@\@Z + */ + MCAPI WallBlock(std::string const &, int, class BlockLegacy const &); /** * @symbol ?tryFixWallStates\@WallBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/WanderingTraderScheduler.hpp b/LiteLoader/include/llapi/mc/WanderingTraderScheduler.hpp index 049bc8ca55..6f687758f3 100644 --- a/LiteLoader/include/llapi/mc/WanderingTraderScheduler.hpp +++ b/LiteLoader/include/llapi/mc/WanderingTraderScheduler.hpp @@ -29,14 +29,6 @@ class WanderingTraderScheduler { #endif public: - /** - * @symbol ??0WanderingTraderScheduler\@\@QEAA\@AEAVLevel\@\@\@Z - */ - MCAPI WanderingTraderScheduler(class Level &); - /** - * @symbol ?isWanderingTraderCurrentlyManaged\@WanderingTraderScheduler\@\@QEAA_NAEBVActor\@\@\@Z - */ - MCAPI bool isWanderingTraderCurrentlyManaged(class Actor const &); /** * @symbol ?readSaveData\@WanderingTraderScheduler\@\@QEAAXXZ */ @@ -49,10 +41,6 @@ class WanderingTraderScheduler { * @symbol ?writeSaveData\@WanderingTraderScheduler\@\@QEBAXXZ */ MCAPI void writeSaveData() const; - /** - * @symbol ??1WanderingTraderScheduler\@\@QEAA\@XZ - */ - MCAPI ~WanderingTraderScheduler(); //private: /** diff --git a/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp b/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp index 6329208bd9..97acd4e067 100644 --- a/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp +++ b/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp @@ -126,9 +126,5 @@ class WarpedFungusOnAStickItem : public Item { * @symbol ?mineBlock\@WarpedFungusOnAStickItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; - /** - * @symbol ??0WarpedFungusOnAStickItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - MCAPI WarpedFungusOnAStickItem(std::string const &, int); }; diff --git a/LiteLoader/include/llapi/mc/WaterAnimalPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/WaterAnimalPreAIStepSystem.hpp index 7108618569..5798989a83 100644 --- a/LiteLoader/include/llapi/mc/WaterAnimalPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/WaterAnimalPreAIStepSystem.hpp @@ -37,6 +37,10 @@ class WaterAnimalPreAIStepSystem { * @symbol ?_doWaterAnimalPreAIStepSystem\@WaterAnimalPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doWaterAnimalPreAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); + /** + * @symbol ?_tickWaterAnimalPreAIStepSystem\@WaterAnimalPreAIStepSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UWaterAnimalFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void _tickWaterAnimalPreAIStepSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>); private: diff --git a/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp b/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp index 5acd2664c9..b681cf0307 100644 --- a/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp @@ -113,12 +113,8 @@ class WaterLilyBlockItem : public BlockItem { virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** * @vftbl 132 - * @symbol ?_useOn\@WaterLilyBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_useOn\@WaterLilyBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; - /** - * @symbol ??0WaterLilyBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - MCAPI WaterLilyBlockItem(std::string const &, int); + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; }; diff --git a/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp b/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp index 6f26cdb4a6..728d64cbbb 100644 --- a/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp +++ b/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp @@ -201,30 +201,30 @@ class WaterlilyBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 135 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 136 * @symbol ?getColor\@WaterlilyBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 137 + * @vftbl 138 * @symbol ?getColorAtPos\@WaterlilyBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -236,30 +236,35 @@ class WaterlilyBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 180 * @symbol ?canSurvive\@WaterlilyBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** * @symbol ??0WaterlilyBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/WeakStorageEntity.hpp b/LiteLoader/include/llapi/mc/WeakStorageEntity.hpp index a4311e6207..15f4ebc63c 100644 --- a/LiteLoader/include/llapi/mc/WeakStorageEntity.hpp +++ b/LiteLoader/include/llapi/mc/WeakStorageEntity.hpp @@ -53,9 +53,9 @@ class WeakStorageEntity { //protected: /** - * @symbol ??0WeakStorageEntity\@\@IEAA\@W4VariadicInit\@0\@AEBVEntityContext\@\@\@Z + * @symbol ??0WeakStorageEntity\@\@IEAA\@W4EmptyInit\@0\@\@Z */ - MCAPI WeakStorageEntity(enum class WeakStorageEntity::VariadicInit, class EntityContext const &); + MCAPI WeakStorageEntity(enum class WeakStorageEntity::EmptyInit); /** * @symbol ??0WeakStorageEntity\@\@IEAA\@AEBVStackResultStorageEntity\@\@\@Z */ @@ -64,18 +64,14 @@ class WeakStorageEntity { * @symbol ??0WeakStorageEntity\@\@IEAA\@AEBVOwnerStorageEntity\@\@\@Z */ MCAPI WeakStorageEntity(class OwnerStorageEntity const &); - /** - * @symbol ??0WeakStorageEntity\@\@IEAA\@W4EmptyInit\@0\@\@Z - */ - MCAPI WeakStorageEntity(enum class WeakStorageEntity::EmptyInit); - /** - * @symbol ?_isSet\@WeakStorageEntity\@\@IEBA_NXZ - */ - MCAPI bool _isSet() const; /** * @symbol ?_reset\@WeakStorageEntity\@\@IEAAXXZ */ MCAPI void _reset(); + /** + * @symbol ??1WeakStorageEntity\@\@IEAA\@XZ + */ + MCAPI ~WeakStorageEntity(); protected: diff --git a/LiteLoader/include/llapi/mc/WeaponItem.hpp b/LiteLoader/include/llapi/mc/WeaponItem.hpp index 429d348a03..38acb99b86 100644 --- a/LiteLoader/include/llapi/mc/WeaponItem.hpp +++ b/LiteLoader/include/llapi/mc/WeaponItem.hpp @@ -156,9 +156,5 @@ class WeaponItem : public Item { * @symbol ?hurtActor\@WeaponItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; - /** - * @symbol ??0WeaponItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVTier\@Item\@\@\@Z - */ - MCAPI WeaponItem(std::string const &, int, class Item::Tier const &); }; diff --git a/LiteLoader/include/llapi/mc/WeatherCommand.hpp b/LiteLoader/include/llapi/mc/WeatherCommand.hpp index e7488d0d05..3aad26629d 100644 --- a/LiteLoader/include/llapi/mc/WeatherCommand.hpp +++ b/LiteLoader/include/llapi/mc/WeatherCommand.hpp @@ -36,7 +36,7 @@ class WeatherCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@WeatherCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/WebBlock.hpp b/LiteLoader/include/llapi/mc/WebBlock.hpp index bc9f65fe73..8f24922bc1 100644 --- a/LiteLoader/include/llapi/mc/WebBlock.hpp +++ b/LiteLoader/include/llapi/mc/WebBlock.hpp @@ -186,25 +186,25 @@ class WebBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@WebBlock\@\@UEAAXXZ + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void _addHardCodedBlockComponents(); + virtual void __unk_vfn_157(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol ?_addHardCodedBlockComponents\@WebBlock\@\@UEAAXXZ */ - virtual void __unk_vfn_165(); + virtual void _addHardCodedBlockComponents(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -216,32 +216,37 @@ class WebBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 188 * @symbol ?playerDestroy\@WebBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@WebBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/WebSocketPacketData.hpp b/LiteLoader/include/llapi/mc/WebSocketPacketData.hpp index ef12d472e6..69809aacad 100644 --- a/LiteLoader/include/llapi/mc/WebSocketPacketData.hpp +++ b/LiteLoader/include/llapi/mc/WebSocketPacketData.hpp @@ -11,15 +11,15 @@ #undef BEFORE_EXTRA -class WebSocketPacketData { +struct WebSocketPacketData { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_WEBSOCKETPACKETDATA public: - class WebSocketPacketData& operator=(class WebSocketPacketData const &) = delete; - WebSocketPacketData(class WebSocketPacketData const &) = delete; + struct WebSocketPacketData& operator=(struct WebSocketPacketData const &) = delete; + WebSocketPacketData(struct WebSocketPacketData const &) = delete; WebSocketPacketData() = delete; #endif @@ -29,4 +29,4 @@ class WebSocketPacketData { */ MCAPI WebSocketPacketData(std::string const &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp b/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp index 77df632a72..aeadc8e09a 100644 --- a/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp +++ b/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp @@ -206,25 +206,25 @@ class WeepingVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 162 - * @symbol ?onRemove\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void onRemove(class BlockSource &, class BlockPos const &) const; + virtual void __unk_vfn_157(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol ?onRemove\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_165(); + virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -237,41 +237,46 @@ class WeepingVinesBlock : public BlockLegacy { virtual void __unk_vfn_167(); /** * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 169 * @symbol ?onPlace\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 171 + * @vftbl 172 * @symbol ?tick\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 179 + * @vftbl 180 * @symbol ?canSurvive\@WeepingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@WeepingVinesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; @@ -285,10 +290,6 @@ class WeepingVinesBlock : public BlockLegacy { MCAPI static void placeVineString(class BlockSource &, class Random &, class BlockPos const &, int, int, int); //private: - /** - * @symbol ?_getAge\@WeepingVinesBlock\@\@AEBAHAEBVBlock\@\@\@Z - */ - MCAPI int _getAge(class Block const &) const; /** * @symbol ?_shouldGrow\@WeepingVinesBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_K\@Z */ diff --git a/LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp b/LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp index 506a0d1ffd..02d640845a 100644 --- a/LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp +++ b/LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp @@ -181,20 +181,20 @@ class WeightedPressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,42 +206,47 @@ class WeightedPressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); /** - * @vftbl 194 + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); + /** + * @vftbl 195 * @symbol ?getTickDelay\@WeightedPressurePlateBlock\@\@UEBAHXZ */ virtual int getTickDelay() const; /** - * @vftbl 195 + * @vftbl 196 * @symbol ?getSignalStrength\@WeightedPressurePlateBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getSignalStrength(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 196 + * @vftbl 197 * @symbol ?getSignalForData\@WeightedPressurePlateBlock\@\@MEBAHH\@Z */ virtual int getSignalForData(int) const; /** - * @vftbl 197 + * @vftbl 198 * @symbol ?getRedstoneSignal\@WeightedPressurePlateBlock\@\@MEBAHH\@Z */ virtual int getRedstoneSignal(int) const; diff --git a/LiteLoader/include/llapi/mc/WitchPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/WitchPreAIStepSystem.hpp index 1177fe66b2..8976842e15 100644 --- a/LiteLoader/include/llapi/mc/WitchPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/WitchPreAIStepSystem.hpp @@ -37,6 +37,10 @@ class WitchPreAIStepSystem { * @symbol ?_doWitchPreAIStepSystem\@WitchPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doWitchPreAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); + /** + * @symbol ?_tickWitchPreAIStepSystem\@WitchPreAIStepSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UWitchFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void _tickWitchPreAIStepSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>); private: diff --git a/LiteLoader/include/llapi/mc/WitherBossPostAIStepSystem.hpp b/LiteLoader/include/llapi/mc/WitherBossPostAIStepSystem.hpp deleted file mode 100644 index 042b53a056..0000000000 --- a/LiteLoader/include/llapi/mc/WitherBossPostAIStepSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file WitherBossPostAIStepSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class WitherBossPostAIStepSystem. - * - */ -class WitherBossPostAIStepSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_WITHERBOSSPOSTAISTEPSYSTEM -public: - class WitherBossPostAIStepSystem& operator=(class WitherBossPostAIStepSystem const &) = delete; - WitherBossPostAIStepSystem(class WitherBossPostAIStepSystem const &) = delete; - WitherBossPostAIStepSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@WitherBossPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doWitherBossPostAIStepSystem\@WitherBossPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUWitherBossPreAIStepResultComponent\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doWitherBossPostAIStepSystem(class StrictEntityContext const &, struct WitherBossPreAIStepResultComponent const &, class ActorOwnerComponent &); - -private: - -}; diff --git a/LiteLoader/include/llapi/mc/WitherBossPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/WitherBossPreAIStepSystem.hpp index 9d6296fe28..490ff8ccf8 100644 --- a/LiteLoader/include/llapi/mc/WitherBossPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/WitherBossPreAIStepSystem.hpp @@ -37,6 +37,10 @@ class WitherBossPreAIStepSystem { * @symbol ?_doWitherBossPreAIStepSystem\@WitherBossPreAIStepSystem\@\@CAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UWitherBossPreAIStepResultComponent\@\@\@\@\@Z */ MCAPI static void _doWitherBossPreAIStepSystem(class StrictEntityContext &, class ActorOwnerComponent &, class EntityModifierT); + /** + * @symbol ?_tickWitherBossPreAIStepSystem\@WitherBossPreAIStepSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UWitherBossFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UWitherBossPreAIStepResultComponent\@\@\@\@\@Z + */ + MCAPI static void _tickWitherBossPreAIStepSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>, class EntityModifierT); private: diff --git a/LiteLoader/include/llapi/mc/WitherRandomAttackPosGoal.hpp b/LiteLoader/include/llapi/mc/WitherRandomAttackPosGoal.hpp index 2be54ddda7..830ab2429c 100644 --- a/LiteLoader/include/llapi/mc/WitherRandomAttackPosGoal.hpp +++ b/LiteLoader/include/llapi/mc/WitherRandomAttackPosGoal.hpp @@ -65,9 +65,5 @@ class WitherRandomAttackPosGoal : public RandomStrollGoal { * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); - /** - * @symbol ??0WitherRandomAttackPosGoal\@\@QEAA\@AEAVMob\@\@MHH\@Z - */ - MCAPI WitherRandomAttackPosGoal(class Mob &, float, int, int); }; diff --git a/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp b/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp index 11088ea9d5..166644fd23 100644 --- a/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp +++ b/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp @@ -196,40 +196,40 @@ class WitherRoseBlock : public FlowerBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@WitherRoseBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@WitherRoseBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 + * @vftbl 148 * @symbol ?canSpawnOn\@WitherRoseBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 151 + * @vftbl 152 * @symbol ?animateTick\@WitherRoseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -241,27 +241,32 @@ class WitherRoseBlock : public FlowerBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@WitherRoseBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/WoodBlock.hpp b/LiteLoader/include/llapi/mc/WoodBlock.hpp index ad96dee8f5..7fd1906225 100644 --- a/LiteLoader/include/llapi/mc/WoodBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoodBlock.hpp @@ -191,35 +191,35 @@ class WoodBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@WoodBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@WoodBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@WoodBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -231,42 +231,47 @@ class WoodBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 * @symbol ?use\@WoodBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@WoodBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@WoodBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@WoodBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/WoodButtonBlock.hpp b/LiteLoader/include/llapi/mc/WoodButtonBlock.hpp index 64f406b5f7..3ac801757a 100644 --- a/LiteLoader/include/llapi/mc/WoodButtonBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoodButtonBlock.hpp @@ -176,20 +176,20 @@ class WoodButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -201,25 +201,30 @@ class WoodButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_179(); + /** + * @vftbl 187 + * @symbol __unk_vfn_187 + */ + virtual void __unk_vfn_187(); /** * @symbol ??0WoodButtonBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/WoodSlabBlock.hpp b/LiteLoader/include/llapi/mc/WoodSlabBlock.hpp index c93ae303f5..281a9d9a29 100644 --- a/LiteLoader/include/llapi/mc/WoodSlabBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoodSlabBlock.hpp @@ -186,35 +186,35 @@ class WoodSlabBlock : public SlabBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 133 + * @vftbl 132 + * @symbol __unk_vfn_132 + */ + virtual void __unk_vfn_132(); + /** + * @vftbl 134 * @symbol ?buildDescriptionId\@WoodSlabBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?isAuxValueRelevantForPicking\@WoodSlabBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 147 * @symbol ?getVariant\@WoodSlabBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -226,37 +226,42 @@ class WoodSlabBlock : public SlabBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 + */ + virtual void __unk_vfn_168(); + /** + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_171(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_175(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 185 + * @vftbl 186 * @symbol ?getMapColor\@WoodSlabBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@WoodSlabBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@WoodSlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp b/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp index 2d7ce0c877..7a1ed9ae26 100644 --- a/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp @@ -181,25 +181,25 @@ class WoolCarpetBlock : public CarpetBlock { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@WoolCarpetBlock\@\@UEBA_NXZ + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual bool isAuxValueRelevantForPicking() const; + virtual void __unk_vfn_132(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 135 + * @symbol ?isAuxValueRelevantForPicking\@WoolCarpetBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_156(); + virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_157(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -211,37 +211,42 @@ class WoolCarpetBlock : public CarpetBlock { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 175 + * @symbol __unk_vfn_175 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_175(); /** - * @vftbl 185 + * @vftbl 179 + * @symbol __unk_vfn_179 + */ + virtual void __unk_vfn_179(); + /** + * @vftbl 186 * @symbol ?getMapColor\@WoolCarpetBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); /** - * @vftbl 188 + * @vftbl 189 * @symbol ?getResourceItem\@WoolCarpetBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 191 * @symbol ?getSilkTouchItemInstance\@WoolCarpetBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/WorkComposterDefinition.hpp b/LiteLoader/include/llapi/mc/WorkComposterDefinition.hpp index dded13a20c..e08f4e0e3f 100644 --- a/LiteLoader/include/llapi/mc/WorkComposterDefinition.hpp +++ b/LiteLoader/include/llapi/mc/WorkComposterDefinition.hpp @@ -31,10 +31,6 @@ class WorkComposterDefinition { * @symbol ??0WorkComposterDefinition\@\@QEAA\@XZ */ MCAPI WorkComposterDefinition(); - /** - * @symbol ?initialize\@WorkComposterDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVWorkComposterGoal\@\@\@Z - */ - MCAPI void initialize(class EntityContext &, class WorkComposterGoal &) const; /** * @symbol ?buildSchema\@WorkComposterDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VWorkComposterDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/WorkComposterGoal.hpp b/LiteLoader/include/llapi/mc/WorkComposterGoal.hpp index 3b606c55d2..b0c8599d2a 100644 --- a/LiteLoader/include/llapi/mc/WorkComposterGoal.hpp +++ b/LiteLoader/include/llapi/mc/WorkComposterGoal.hpp @@ -58,10 +58,6 @@ class WorkComposterGoal : public WorkGoal { * @symbol ?useWorkstation\@WorkComposterGoal\@\@UEAAXXZ */ virtual void useWorkstation(); - /** - * @symbol ??0WorkComposterGoal\@\@QEAA\@AEAVMob\@\@\@Z - */ - MCAPI WorkComposterGoal(class Mob &); //private: /** diff --git a/LiteLoader/include/llapi/mc/WorkDefinition.hpp b/LiteLoader/include/llapi/mc/WorkDefinition.hpp index 76e74211f2..e26df6b696 100644 --- a/LiteLoader/include/llapi/mc/WorkDefinition.hpp +++ b/LiteLoader/include/llapi/mc/WorkDefinition.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "JsonUtil.hpp" #define BEFORE_EXTRA @@ -22,7 +21,6 @@ class WorkDefinition { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_WORKDEFINITION public: - class WorkDefinition& operator=(class WorkDefinition const &) = delete; WorkDefinition(class WorkDefinition const &) = delete; #endif @@ -38,12 +36,8 @@ class WorkDefinition { */ MCAPI WorkDefinition(); /** - * @symbol ?initialize\@WorkDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVWorkGoal\@\@\@Z + * @symbol ??4WorkDefinition\@\@QEAAAEAV0\@AEBV0\@\@Z */ - MCAPI void initialize(class EntityContext &, class WorkGoal &) const; - /** - * @symbol ?buildSchema\@WorkDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VWorkDefinition\@\@\@JsonUtil\@\@\@3\@\@Z - */ - MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); + MCAPI class WorkDefinition & operator=(class WorkDefinition const &); }; diff --git a/LiteLoader/include/llapi/mc/WorkbenchBlock.hpp b/LiteLoader/include/llapi/mc/WorkbenchBlock.hpp index d7661eb86e..e817e2b559 100644 --- a/LiteLoader/include/llapi/mc/WorkbenchBlock.hpp +++ b/LiteLoader/include/llapi/mc/WorkbenchBlock.hpp @@ -176,25 +176,25 @@ class WorkbenchBlock : public BlockLegacy { */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 129 + * @symbol __unk_vfn_129 */ - virtual void __unk_vfn_131(); + virtual void __unk_vfn_129(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 132 + * @symbol __unk_vfn_132 */ - virtual void __unk_vfn_156(); + virtual void __unk_vfn_132(); /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@WorkbenchBlock\@\@UEAAXXZ + * @vftbl 157 + * @symbol __unk_vfn_157 */ - virtual void _addHardCodedBlockComponents(); + virtual void __unk_vfn_157(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol ?_addHardCodedBlockComponents\@WorkbenchBlock\@\@UEAAXXZ */ - virtual void __unk_vfn_165(); + virtual void _addHardCodedBlockComponents(); /** * @vftbl 166 * @symbol __unk_vfn_166 @@ -206,30 +206,35 @@ class WorkbenchBlock : public BlockLegacy { */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 168 + * @symbol __unk_vfn_168 */ - virtual void __unk_vfn_170(); + virtual void __unk_vfn_168(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_174(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 + * @vftbl 175 + * @symbol __unk_vfn_175 + */ + virtual void __unk_vfn_175(); + /** + * @vftbl 178 * @symbol ?use\@WorkbenchBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol __unk_vfn_178 + * @vftbl 179 + * @symbol __unk_vfn_179 */ - virtual void __unk_vfn_178(); + virtual void __unk_vfn_179(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 187 + * @symbol __unk_vfn_187 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_187(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WORKBENCHBLOCK /** * @symbol ?isCraftingBlock\@WorkbenchBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/WorkerPool.hpp b/LiteLoader/include/llapi/mc/WorkerPool.hpp index bd984b66ca..01ac58d833 100644 --- a/LiteLoader/include/llapi/mc/WorkerPool.hpp +++ b/LiteLoader/include/llapi/mc/WorkerPool.hpp @@ -48,10 +48,6 @@ class WorkerPool { * @symbol ?queue\@WorkerPool\@\@QEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@_N\@Z */ MCAPI void queue(class std::shared_ptr, bool); - /** - * @symbol ?resortPriorityQueue\@WorkerPool\@\@QEAAXXZ - */ - MCAPI void resortPriorityQueue(); /** * @symbol ?size\@WorkerPool\@\@QEBA_KXZ */ diff --git a/LiteLoader/include/llapi/mc/WorldBuilderCommand.hpp b/LiteLoader/include/llapi/mc/WorldBuilderCommand.hpp index dfc6545897..d02475d275 100644 --- a/LiteLoader/include/llapi/mc/WorldBuilderCommand.hpp +++ b/LiteLoader/include/llapi/mc/WorldBuilderCommand.hpp @@ -36,7 +36,7 @@ class WorldBuilderCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@WorldBuilderCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/WorldGenCache.hpp b/LiteLoader/include/llapi/mc/WorldGenCache.hpp index f6d279e169..d9938b581e 100644 --- a/LiteLoader/include/llapi/mc/WorldGenCache.hpp +++ b/LiteLoader/include/llapi/mc/WorldGenCache.hpp @@ -29,18 +29,6 @@ class WorldGenCache { #endif public: - /** - * @symbol ??0WorldGenCache\@\@QEAA\@VChunkLocalNoiseCache\@\@VSurfaceLevelCache\@\@\@Z - */ - MCAPI WorldGenCache(class ChunkLocalNoiseCache, class SurfaceLevelCache); - /** - * @symbol ?getChunkLocalNoiseCache\@WorldGenCache\@\@QEBAAEBVChunkLocalNoiseCache\@\@XZ - */ - MCAPI class ChunkLocalNoiseCache const & getChunkLocalNoiseCache() const; - /** - * @symbol ?getSurfaceLevelCache\@WorldGenCache\@\@QEBAAEBVSurfaceLevelCache\@\@XZ - */ - MCAPI class SurfaceLevelCache const & getSurfaceLevelCache() const; /** * @symbol ??1WorldGenCache\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/WorldGenClimateMappingAttributes.hpp b/LiteLoader/include/llapi/mc/WorldGenClimateMappingAttributes.hpp index afb0a28d5d..ec7dc1dfd9 100644 --- a/LiteLoader/include/llapi/mc/WorldGenClimateMappingAttributes.hpp +++ b/LiteLoader/include/llapi/mc/WorldGenClimateMappingAttributes.hpp @@ -33,9 +33,5 @@ class WorldGenClimateMappingAttributes { * @symbol ??4WorldGenClimateMappingAttributes\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class WorldGenClimateMappingAttributes & operator=(class WorldGenClimateMappingAttributes &&); - /** - * @symbol ??1WorldGenClimateMappingAttributes\@\@QEAA\@XZ - */ - MCAPI ~WorldGenClimateMappingAttributes(); }; diff --git a/LiteLoader/include/llapi/mc/WorldHistoryPackSource.hpp b/LiteLoader/include/llapi/mc/WorldHistoryPackSource.hpp index 9f554bc3c5..950a9e6607 100644 --- a/LiteLoader/include/llapi/mc/WorldHistoryPackSource.hpp +++ b/LiteLoader/include/llapi/mc/WorldHistoryPackSource.hpp @@ -6,7 +6,6 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Bedrock.hpp" -#include "Core.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -71,18 +70,6 @@ class WorldHistoryPackSource { */ MCVAPI void forEachPackConst(class std::function) const; #endif - /** - * @symbol ??0WorldHistoryPackSource\@\@QEAA\@AEBVPath\@Core\@\@W4PackType\@\@\@Z - */ - MCAPI WorldHistoryPackSource(class Core::Path const &, enum class PackType); - /** - * @symbol ?getPathToWorld\@WorldHistoryPackSource\@\@QEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ - */ - MCAPI class Core::PathBuffer const & getPathToWorld() const; - /** - * @symbol ?generateHistoryFilePath\@WorldHistoryPackSource\@\@SA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@W4PackType\@\@\@Z - */ - MCAPI static class Core::PathBuffer generateHistoryFilePath(class Core::Path const &, enum class PackType); //private: /** diff --git a/LiteLoader/include/llapi/mc/WorldPackHistory.hpp b/LiteLoader/include/llapi/mc/WorldPackHistory.hpp index 17194a9092..0a01f6ddd6 100644 --- a/LiteLoader/include/llapi/mc/WorldPackHistory.hpp +++ b/LiteLoader/include/llapi/mc/WorldPackHistory.hpp @@ -25,7 +25,6 @@ class WorldPackHistory { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_WORLDPACKHISTORY public: class WorldPackHistory& operator=(class WorldPackHistory const &) = delete; - WorldPackHistory() = delete; #endif public: @@ -38,44 +37,16 @@ class WorldPackHistory { */ MCAPI WorldPackHistory(class WorldPackHistory const &); /** - * @symbol ?getCanBeRedownloaded\@WorldPackHistory\@\@QEBA_NXZ + * @symbol ??0WorldPackHistory\@\@QEAA\@XZ */ - MCAPI bool getCanBeRedownloaded() const; - /** - * @symbol ?getLocalizedNames\@WorldPackHistory\@\@QEBAAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getLocalizedNames() const; - /** - * @symbol ?getPackIdVersion\@WorldPackHistory\@\@QEBAAEBUPackIdVersion\@\@XZ - */ - MCAPI struct PackIdVersion const & getPackIdVersion() const; - /** - * @symbol ?getSourceUUID\@WorldPackHistory\@\@QEBAAEBVUUID\@mce\@\@XZ - */ - MCAPI class mce::UUID const & getSourceUUID() const; - /** - * @symbol ?getSubpackCount\@WorldPackHistory\@\@QEBAHXZ - */ - MCAPI int getSubpackCount() const; - /** - * @symbol ?getUnlocalizedName\@WorldPackHistory\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getUnlocalizedName() const; - /** - * @symbol ?hasLocalizedNames\@WorldPackHistory\@\@QEBA_NXZ - */ - MCAPI bool hasLocalizedNames() const; - /** - * @symbol ?hasSourceUUID\@WorldPackHistory\@\@QEBA_NXZ - */ - MCAPI bool hasSourceUUID() const; - /** - * @symbol ?hasSubpacks\@WorldPackHistory\@\@QEBA_NXZ - */ - MCAPI bool hasSubpacks() const; + MCAPI WorldPackHistory(); /** * @symbol ?initializeFromJson\@WorldPackHistory\@\@QEAA_NAEBVValue\@Json\@\@\@Z */ MCAPI bool initializeFromJson(class Json::Value const &); + /** + * @symbol ??1WorldPackHistory\@\@QEAA\@XZ + */ + MCAPI ~WorldPackHistory(); }; diff --git a/LiteLoader/include/llapi/mc/WorldPacksHistoryFile.hpp b/LiteLoader/include/llapi/mc/WorldPacksHistoryFile.hpp deleted file mode 100644 index 064f108fad..0000000000 --- a/LiteLoader/include/llapi/mc/WorldPacksHistoryFile.hpp +++ /dev/null @@ -1,51 +0,0 @@ -/** - * @file WorldPacksHistoryFile.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "Json.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class WorldPacksHistoryFile. - * - */ -class WorldPacksHistoryFile { - -#define AFTER_EXTRA -// Add Member There -public: -enum class ParseResult; - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_WORLDPACKSHISTORYFILE -public: - class WorldPacksHistoryFile& operator=(class WorldPacksHistoryFile const &) = delete; - WorldPacksHistoryFile(class WorldPacksHistoryFile const &) = delete; -#endif - -public: - /** - * @symbol ??0WorldPacksHistoryFile\@\@QEAA\@XZ - */ - MCAPI WorldPacksHistoryFile(); - /** - * @symbol ?getPacks\@WorldPacksHistoryFile\@\@QEBAAEBV?$vector\@VWorldPackHistory\@\@V?$allocator\@VWorldPackHistory\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector const & getPacks() const; - /** - * @symbol ?initializeFromJson\@WorldPacksHistoryFile\@\@QEAA?AW4ParseResult\@1\@AEBVValue\@Json\@\@\@Z - */ - MCAPI enum class WorldPacksHistoryFile::ParseResult initializeFromJson(class Json::Value const &); - /** - * @symbol ??1WorldPacksHistoryFile\@\@QEAA\@XZ - */ - MCAPI ~WorldPacksHistoryFile(); - -}; diff --git a/LiteLoader/include/llapi/mc/WorldTemplateLevelData.hpp b/LiteLoader/include/llapi/mc/WorldTemplateLevelData.hpp index 14ecda00ef..24d6552160 100644 --- a/LiteLoader/include/llapi/mc/WorldTemplateLevelData.hpp +++ b/LiteLoader/include/llapi/mc/WorldTemplateLevelData.hpp @@ -28,10 +28,6 @@ class WorldTemplateLevelData { #endif public: - /** - * @symbol ??0WorldTemplateLevelData\@\@QEAA\@_N0AEBVBaseGameVersion\@\@1\@Z - */ - MCAPI WorldTemplateLevelData(bool, bool, class BaseGameVersion const &, class BaseGameVersion const &); /** * @symbol ??0WorldTemplateLevelData\@\@QEAA\@XZ */ @@ -40,50 +36,6 @@ class WorldTemplateLevelData { * @symbol ?getBaseGameVersion\@WorldTemplateLevelData\@\@QEBAAEBVBaseGameVersion\@\@XZ */ MCAPI class BaseGameVersion const & getBaseGameVersion() const; - /** - * @symbol ?getContentIdentity\@WorldTemplateLevelData\@\@QEBAAEBVContentIdentity\@\@XZ - */ - MCAPI class ContentIdentity const & getContentIdentity() const; - /** - * @symbol ?getTagData\@WorldTemplateLevelData\@\@QEAAXAEBVCompoundTag\@\@\@Z - */ - MCAPI void getTagData(class CompoundTag const &); - /** - * @symbol ?getWorldTemplateIdentity\@WorldTemplateLevelData\@\@QEBAAEBUPackIdVersion\@\@XZ - */ - MCAPI struct PackIdVersion const & getWorldTemplateIdentity() const; - /** - * @symbol ?isFromWorldTemplate\@WorldTemplateLevelData\@\@QEBA_NXZ - */ - MCAPI bool isFromWorldTemplate() const; - /** - * @symbol ?isWorldTemplateOptionLocked\@WorldTemplateLevelData\@\@QEBA_NXZ - */ - MCAPI bool isWorldTemplateOptionLocked() const; - /** - * @symbol ?setBaseGameVersion\@WorldTemplateLevelData\@\@QEAAXAEBVBaseGameVersion\@\@\@Z - */ - MCAPI void setBaseGameVersion(class BaseGameVersion const &); - /** - * @symbol ?setContentIdentity\@WorldTemplateLevelData\@\@QEAAXAEBVContentIdentity\@\@\@Z - */ - MCAPI void setContentIdentity(class ContentIdentity const &); - /** - * @symbol ?setIsWorldTemplateOptionLocked\@WorldTemplateLevelData\@\@QEAAX_N\@Z - */ - MCAPI void setIsWorldTemplateOptionLocked(bool); - /** - * @symbol ?setMaxBaseGameVersion\@WorldTemplateLevelData\@\@QEAAXAEBVBaseGameVersion\@\@\@Z - */ - MCAPI void setMaxBaseGameVersion(class BaseGameVersion const &); - /** - * @symbol ?setTagData\@WorldTemplateLevelData\@\@QEBAXAEAVCompoundTag\@\@\@Z - */ - MCAPI void setTagData(class CompoundTag &) const; - /** - * @symbol ?setWorldTemplateIdentity\@WorldTemplateLevelData\@\@QEAAXAEBUPackIdVersion\@\@\@Z - */ - MCAPI void setWorldTemplateIdentity(struct PackIdVersion const &); /** * @symbol ??1WorldTemplateLevelData\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/WorldTemplatePackManifest.hpp b/LiteLoader/include/llapi/mc/WorldTemplatePackManifest.hpp index f262da4152..bf2143514f 100644 --- a/LiteLoader/include/llapi/mc/WorldTemplatePackManifest.hpp +++ b/LiteLoader/include/llapi/mc/WorldTemplatePackManifest.hpp @@ -48,17 +48,9 @@ class WorldTemplatePackManifest { * @symbol ??0WorldTemplatePackManifest\@\@QEAA\@XZ */ MCAPI WorldTemplatePackManifest(); - /** - * @symbol ??0WorldTemplatePackManifest\@\@QEAA\@$$QEAVPackManifest\@\@\@Z - */ - MCAPI WorldTemplatePackManifest(class PackManifest &&); /** * @symbol ?getGameType\@WorldTemplatePackManifest\@\@QEBA?AW4GameType\@\@XZ */ MCAPI enum class GameType getGameType() const; - /** - * @symbol ?setGameType\@WorldTemplatePackManifest\@\@QEAAXW4GameType\@\@\@Z - */ - MCAPI void setGameType(enum class GameType); }; diff --git a/LiteLoader/include/llapi/mc/WritableBookItem.hpp b/LiteLoader/include/llapi/mc/WritableBookItem.hpp index 2a0f902e48..20aa4ec3b0 100644 --- a/LiteLoader/include/llapi/mc/WritableBookItem.hpp +++ b/LiteLoader/include/llapi/mc/WritableBookItem.hpp @@ -116,10 +116,6 @@ class WritableBookItem : public Item { * @symbol ?getInteractText\@WritableBookItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@\@Z */ virtual std::string getInteractText(class Player const &) const; - /** - * @symbol ??0WritableBookItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - MCAPI WritableBookItem(std::string const &, int); /** * @symbol ?addPageAt\@WritableBookItem\@\@SAXAEAVItemStack\@\@HAEBUPageContent\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/WrittenBookItem.hpp b/LiteLoader/include/llapi/mc/WrittenBookItem.hpp index 25e0c40778..ed95bbfef3 100644 --- a/LiteLoader/include/llapi/mc/WrittenBookItem.hpp +++ b/LiteLoader/include/llapi/mc/WrittenBookItem.hpp @@ -131,10 +131,6 @@ class WrittenBookItem : public Item { * @symbol ?getInteractText\@WrittenBookItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@\@Z */ virtual std::string getInteractText(class Player const &) const; - /** - * @symbol ??0WrittenBookItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - MCAPI WrittenBookItem(std::string const &, int); /** * @symbol ?MAX_GENERATION\@WrittenBookItem\@\@2HB */ diff --git a/LiteLoader/include/llapi/mc/XPCommand.hpp b/LiteLoader/include/llapi/mc/XPCommand.hpp index b4992efbb4..0bc508fcc7 100644 --- a/LiteLoader/include/llapi/mc/XPCommand.hpp +++ b/LiteLoader/include/llapi/mc/XPCommand.hpp @@ -36,7 +36,7 @@ class XPCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 1 + * @vftbl 2 * @symbol ?execute\@XPCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ZlibFileAccessWrapper.hpp b/LiteLoader/include/llapi/mc/ZlibFileAccessWrapper.hpp index df0aec80b0..052534e664 100644 --- a/LiteLoader/include/llapi/mc/ZlibFileAccessWrapper.hpp +++ b/LiteLoader/include/llapi/mc/ZlibFileAccessWrapper.hpp @@ -34,10 +34,6 @@ class ZlibFileAccessWrapper { * @symbol ??0ZlibFileAccessWrapper\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VIFileAccess\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI ZlibFileAccessWrapper(class gsl::not_null>); - /** - * @symbol ?getZipFunctions\@ZlibFileAccessWrapper\@\@QEBAPEAUzlib_filefunc64_32_def_s\@\@XZ - */ - MCAPI struct zlib_filefunc64_32_def_s * getZipFunctions() const; /** * @symbol ??1ZlibFileAccessWrapper\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/gametest.hpp b/LiteLoader/include/llapi/mc/gametest.hpp new file mode 100644 index 0000000000..5db4df57f6 --- /dev/null +++ b/LiteLoader/include/llapi/mc/gametest.hpp @@ -0,0 +1,39 @@ +/** + * @file gametest.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Scripting.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace gametest { + +#define AFTER_EXTRA + + +enum class GameTestErrorType : int { + UNKNOWN_TYPE = 0x0, + WAITING_ERROR = 0x1, + EXHAUSTED_ATTEMPTS_ERROR = 0x2, + ASSERT_AT_POSITION_ERROR = 0x3, + METHOD_NOT_IMPLEMENTED_ERROR = 0x4, + EXECUTION_TIMEOUT_ERROR = 0x5, + LEVEL_STATE_MODIFICATION_ERROR = 0x6, + FAIL_CONDITIONS_MET_ERROR = 0x7, + ASSERTION_ERROR = 0x8, + SIMULATED_PLAYER_OUT_OF_BOUNDS_ERROR = 0x9, +}; + +#undef AFTER_EXTRA + /** + * @symbol ?bindGameTestErrorType\@gametest\@\@YA?AV?$EnumBindingBuilder\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4GameTestErrorType\@gametest\@\@\@Scripting\@\@XZ + */ + MCAPI class Scripting::EnumBindingBuilder bindGameTestErrorType(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/hc_websocket_impl.hpp b/LiteLoader/include/llapi/mc/hc_websocket_impl.hpp deleted file mode 100644 index 20e7336185..0000000000 --- a/LiteLoader/include/llapi/mc/hc_websocket_impl.hpp +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @file hc_websocket_impl.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure hc_websocket_impl. - * - */ -struct hc_websocket_impl { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_HC_WEBSOCKET_IMPL -public: - struct hc_websocket_impl& operator=(struct hc_websocket_impl const &) = delete; - hc_websocket_impl(struct hc_websocket_impl const &) = delete; - hc_websocket_impl() = delete; -#endif - -public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_HC_WEBSOCKET_IMPL - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~hc_websocket_impl(); -#endif - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/http_header_compare.hpp b/LiteLoader/include/llapi/mc/http_header_compare.hpp deleted file mode 100644 index 991b752743..0000000000 --- a/LiteLoader/include/llapi/mc/http_header_compare.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file http_header_compare.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -class http_header_compare { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_HTTP_HEADER_COMPARE -public: - class http_header_compare& operator=(class http_header_compare const &) = delete; - http_header_compare(class http_header_compare const &) = delete; - http_header_compare() = delete; -#endif - -public: - /** - * @symbol ??Rhttp_header_compare\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$http_stl_allocator\@D\@\@\@std\@\@0\@Z - */ - MCAPI bool operator()(class std::basic_string, class http_stl_allocator> const &, class std::basic_string, class http_stl_allocator> const &) const; - -}; diff --git a/LiteLoader/include/llapi/mc/inc/enums.inc b/LiteLoader/include/llapi/mc/inc/enums.inc index c17ce17b0e..58c7285b82 100644 --- a/LiteLoader/include/llapi/mc/inc/enums.inc +++ b/LiteLoader/include/llapi/mc/inc/enums.inc @@ -42,10 +42,11 @@ enum class ContainerType : char { }; enum class GameType : int { - GameTypeSurvival = 0, - GameTypeCreative = 1, - GameTypeAdventure = 2, - GameTypeSpectator = 6 + Survival = 0, + Creative = 1, + Adventure = 2, + Default = 5, + Spectator = 6 }; enum class Difficulty : int { @@ -55,11 +56,11 @@ enum class Difficulty : int { DifficultyHard = 3 }; -enum class PlayerPermissionLevel : int { - PlayerPermissionLevelVisitor = 0, - PlayerPermissionLevelMember = 1, - PlayerPermissionLevelOperator = 2, - PlayerPermissionLevelCustom = 3 +enum class PlayerPermissionLevel : __int8 { + Visitor = 0, + Member = 1, + Operator = 2, + Custom = 3 }; enum class CommandPermissionLevel : char { @@ -346,7 +347,9 @@ enum class ParticleType { wax = 0x50, electricspark = 0x51, shriek = 0x52, - sculksoul = 0x53 + sculksoul = 0x53, + sonicexplosion = 0x54, + brushdust = 0x55, }; enum class transactionType { @@ -620,7 +623,10 @@ enum class MinecraftPacketIds : int { ClientCheatAbility = 0xC5, CameraPresets = 0xC6, UnlockedRecipes = 0xC7, - CameraInstruction = 0x12C // 300 + CameraInstruction = 0x12C, // 300 + CompressedBiomeDefinitionList = 0x12D, + TrimData = 0x12E, + OpenSign = 0x12F, }; enum class ItemStackNetResult : unsigned char { @@ -908,136 +914,153 @@ enum class ActorCategory { NonTargetable = 262144, }; -enum class ActorType : __int32 { - Undefined_2 = 0x1, - TypeMask = 0xFF, - Mob = 0x100, - PathfinderMob = 0x300, - Monster = 0xB00, - Animal = 0x1300, - TamableAnimal = 0x5300, - Ambient = 0x8100, - UndeadMob = 0x10B00, - ZombieMonster = 0x30B00, - Arthropod = 0x40B00, - Minecart = 0x80000, - SkeletonMonster = 0x110B00, - EquineAnimal = 0x205300, - Projectile = 0x400000, - AbstractArrow = 0x800000, - WaterAnimal = 0x2300, - VillagerBase = 0x1000300, - Chicken = 0x130A, - Cow = 0x130B, - Pig = 0x130C, - Sheep = 0x130D, - Wolf = 0x530E, - Villager = 0x100030F, - MushroomCow = 0x1310, - Squid = 0x2311, - Rabbit = 0x1312, - Bat = 0x8113, - IronGolem = 0x314, - SnowGolem = 0x315, - Ocelot = 0x5316, - Horse = 0x205317, - PolarBear = 0x131C, - Llama = 0x131D, - Parrot = 0x531E, - Dolphin = 0x231F, - Donkey = 0x205318, - Mule = 0x205319, - SkeletonHorse = 0x215B1A, - ZombieHorse = 0x215B1B, - Zombie = 0x30B20, - Creeper = 0xB21, - Skeleton = 0x110B22, - Spider = 0x40B23, - PigZombie = 0x10B24, - Slime = 0xB25, - EnderMan = 0xB26, - Silverfish = 0x40B27, - CaveSpider = 0x40B28, - Ghast = 0xB29, - LavaSlime = 0xB2A, - Blaze = 0xB2B, - ZombieVillager = 0x30B2C, - Witch = 0xB2D, - Stray = 0x110B2E, - Husk = 0x30B2F, - WitherSkeleton = 0x110B30, - Guardian = 0xB31, - ElderGuardian = 0xB32, - Npc = 0x133, - WitherBoss = 0x10B34, - Dragon = 0xB35, - Shulker = 0xB36, - Endermite = 0x40B37, - Agent = 0x138, - Vindicator = 0xB39, - Phantom = 0x10B3A, - IllagerBeast = 0xB3B, - ArmorStand = 0x13D, - TripodCamera = 0x13E, - Player_0 = 0x13F, - ItemEntity = 0x40, - PrimedTnt = 0x41, - FallingBlock = 0x42, - MovingBlock = 0x43, - ExperiencePotion = 0x400044, - Experience = 0x45, - EyeOfEnder = 0x46, - EnderCrystal = 0x47, - FireworksRocket = 0x48, - Trident = 0xC00049, - Turtle = 0x134A, - Cat = 0x534B, - ShulkerBullet = 0x40004C, - FishingHook = 0x4D, - Chalkboard = 0x4E, - DragonFireball = 0x40004F, - Arrow = 0xC00050, - Snowball = 0x400051, - ThrownEgg = 0x400052, - Painting = 0x53, - LargeFireball = 0x400055, - ThrownPotion = 0x400056, - Enderpearl = 0x400057, - LeashKnot = 0x58, - WitherSkull = 0x400059, - BoatRideable = 0x5A, - WitherSkullDangerous = 0x40005B, - LightningBolt = 0x5D, - SmallFireball = 0x40005E, - AreaEffectCloud = 0x5F, - LingeringPotion = 0x400065, - LlamaSpit = 0x400066, - EvocationFang = 0x400067, - EvocationIllager = 0xB68, - Vex = 0xB69, - MinecartRideable = 0x80054, - MinecartHopper = 0x80060, - MinecartTNT = 0x80061, - MinecartChest = 0x80062, - MinecartFurnace = 0x80063, - MinecartCommandBlock = 0x80064, - IceBomb = 0x40006A, - Balloon = 0x6B, - Pufferfish = 0x236C, - Salmon = 0x236D, - Drowned = 0x30B6E, - Tropicalfish = 0x236F, - Fish = 0x2370, - Panda = 0x1371, - Pillager = 0xB72, - VillagerV2 = 0x1000373, - ZombieVillagerV2 = 0x30B74, - Shield = 0x75, - WanderingTrader = 0x376, - Lectern = 0x77, - ElderGuardianGhost = 0xB78, - Fox = 0x1379, - Bee = 0x17A, +enum class ActorType : __int32 +{ + None = 0x1, + TypeMask = 0xFF, + Mob = 0x100, + PathfinderMob = 0x300, + Monster = 0xB00, + Animal = 0x1300, + TamableAnimal = 0x5300, + Ambient = 0x8100, + UndeadMob = 0x10B00, + ZombieMonster = 0x30B00, + Arthropod = 0x40B00, + Minecart = 0x80000, + IronGolem = 0x314, + SnowGolem = 0x315, + Ocelot = 0x5316, + Horse = 0x205317, + PolarBear = 0x131C, + Llama = 0x131D, + Parrot = 0x531E, + Dolphin = 0x231F, + Donkey = 0x205318, + SkeletonMonster = 0x110B00, + EquineAnimal = 0x205300, + Projectile = 0x400000, + AbstractArrow = 0x800000, + WaterAnimal = 0x2300, + VillagerBase = 0x1000300, + Chicken = 0x130A, + Cow = 0x130B, + Pig = 0x130C, + Sheep = 0x130D, + Wolf = 0x530E, + Villager = 0x100030F, + MushroomCow = 0x1310, + Squid = 0x2311, + Rabbit = 0x1312, + Bat = 0x8113, + Mule = 0x205319, + SkeletonHorse = 0x215B1A, + ZombieHorse = 0x215B1B, + Zombie = 0x30B20, + Creeper = 0xB21, + Skeleton = 0x110B22, + Spider = 0x40B23, + PigZombie = 0x10B24, + Slime = 0xB25, + EnderMan = 0xB26, + Silverfish = 0x40B27, + CaveSpider = 0x40B28, + ElderGuardian = 0xB32, + Npc = 0x133, + WitherBoss = 0x10B34, + Dragon = 0xB35, + Ghast = 0xB29, + LavaSlime = 0xB2A, + Blaze = 0xB2B, + ZombieVillager = 0x30B2C, + Witch = 0xB2D, + Stray = 0x110B2E, + Husk = 0x30B2F, + WitherSkeleton = 0x110B30, + Guardian = 0xB31, + Shulker = 0xB36, + Endermite = 0x40B37, + Agent = 0x138, + Vindicator = 0xB39, + Phantom = 0x10B3A, + IllagerBeast = 0xB3B, + ArmorStand = 0x13D, + ThrownPotion = 0x400056, + PiglinBrute = 0x17F, + Goat = 0x1380, + TripodCamera = 0x13E, + Player = 0x13F, + ItemEntity = 0x40, + PrimedTnt = 0x41, + FallingBlock = 0x42, + MovingBlock = 0x43, + ExperiencePotion = 0x400044, + Experience = 0x45, + EyeOfEnder = 0x46, + EnderCrystal = 0x47, + FireworksRocket = 0x48, + Trident = 0xC00049, + Turtle = 0x134A, + Cat = 0x534B, + ShulkerBullet = 0x40004C, + FishingHook = 0x4D, + Chalkboard = 0x4E, + DragonFireball = 0x40004F, + Arrow = 0xC00050, + Snowball = 0x400051, + ThrownEgg = 0x400052, + Painting = 0x53, + LargeFireball = 0x400055, + Enderpearl = 0x400057, + LeashKnot = 0x58, + WitherSkull = 0x400059, + BoatRideable = 0x5A, + WitherSkullDangerous = 0x40005B, + LightningBolt = 0x5D, + SmallFireball = 0x40005E, + AreaEffectCloud = 0x5F, + LingeringPotion = 0x400065, + LlamaSpit = 0x400066, + EvocationFang = 0x400067, + EvocationIllager = 0xB68, + Vex = 0xB69, + GlowSquid = 0x2381, + Axolotl = 0x1382, + Warden = 0xB83, + Frog = 0x1384, + MinecartRideable = 0x80054, + MinecartHopper = 0x80060, + MinecartTNT = 0x80061, + MinecartChest = 0x80062, + MinecartFurnace = 0x80063, + MinecartCommandBlock = 0x80064, + IceBomb = 0x40006A, + Balloon = 0x6B, + Pufferfish = 0x236C, + Salmon = 0x236D, + Drowned = 0x30B6E, + Tropicalfish = 0x236F, + Fish = 0x2370, + Panda = 0x1371, + Pillager = 0xB72, + VillagerV2 = 0x1000373, + ZombieVillagerV2 = 0x30B74, + Shield = 0x75, + WanderingTrader = 0x376, + Lectern = 0x77, + ElderGuardianGhost = 0xB78, + TraderLlama = 0x139D, + Camel = 0x138A, + Sniffer = 0x138B, + Fox = 0x1379, + Bee = 0x17A, + Piglin = 0x17B, + Hoglin = 0x137C, + Strider = 0x137D, + Zoglin = 0x10B7E, + Tadpole = 0x2385, + Allay = 0x186, + ChestBoatRideable = 0xDA, }; enum class BlockActorType { @@ -1088,6 +1111,11 @@ enum class BlockActorType { GlowItemFrame = 0x2F, SculkCatalyst = 0x30, SculkShrieker = 0x31, + HangingSign = 0x32, + ChiseledBookshelf = 0x33, + BrushableBlock = 0x34, + DecoratedPot = 0x35, + CalibratedSculkSensor = 0x36 }; enum class BlockProperty : int64_t { @@ -1142,4 +1170,5 @@ enum class BlockProperty : int64_t { CanHaltWhenClimbing = 0x1000000000000, }; + // clang-format on diff --git a/LiteLoader/include/llapi/mc/typeid_t.hpp b/LiteLoader/include/llapi/mc/typeid_t.hpp deleted file mode 100644 index a29b5098f0..0000000000 --- a/LiteLoader/include/llapi/mc/typeid_t.hpp +++ /dev/null @@ -1,118 +0,0 @@ -#pragma once -#include "llapi/mc/Json.hpp" -#include - -template -class typeid_t { -public: - inline static unsigned short count = 0; - unsigned short value; - typeid_t(typeid_t const& id) - : value(id.value){}; - typeid_t(unsigned short value) - : value(value){}; -}; - -template -typeid_t type_id() { - static typeid_t id = typeid_t::count++; - return id; -} - -class CommandRegistry; -enum class ActorDamageCause : int; -template -class AutomaticID; -template -class CommandSelector; -namespace Json { -class Value; -} -class CommandIntegerRange; -struct ActorDefinitionIdentifier; -class CommandItem; - -template <> -class typeid_t { -public: - MCAPI static unsigned short count; - unsigned short value; - typeid_t(typeid_t const& id) - : value(id.value){}; - typeid_t(unsigned short value) - : value(value){}; -}; - -template <> -MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id>(); -// template MCAPI typeid_t type_id(); -// template MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id>(); -template <> -MCAPI typeid_t type_id>(); -template <> -MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id>(); -template <> -MCAPI typeid_t type_id>(); -// template MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id(); -// template MCAPI typeid_t type_id(); - -template <> -inline typeid_t type_id() { - static typeid_t id = *(typeid_t*)dlsym_real("?id@?1???$type_id@VCommandRegistry@@PEBUActorDefinitionIdentifier@@@@YA?AV?$typeid_t@VCommandRegistry@@@@XZ@4V1@A"); - // static typeid_t id = ([]() -> typeid_t { - // CommandParameterData data = SymCall("??$mandatory@VRideCommand@@PEBUActorDefinitionIdentifier@@@commands@@YA?AVCommandParameterData@@PEQRideCommand@@PEBUActorDefinitionIdentifier@@PEBDPEQ2@_N@Z", - // CommandParameterData, void*, char const*, uintptr_t)(nullptr, "entityType", 0); - // return data.tid; - // })(); - return id; -}; - -template <> -inline typeid_t type_id() { - static typeid_t id = *(typeid_t*)dlsym_real("?id@?1???$type_id@VCommandRegistry@@VCommandItem@@@@YA?AV?$typeid_t@VCommandRegistry@@@@XZ@4V1@A"); - return id; -}; - -template <> -inline typeid_t type_id() { - static typeid_t id = *(typeid_t*)dlsym_real("?id@?1???$type_id@VCommandRegistry@@_N@@YA?AV?$typeid_t@VCommandRegistry@@@@XZ@4V1@A"); - return id; -}; - -template <> -inline typeid_t type_id() { - static typeid_t id = *(typeid_t*)dlsym_real("?id@?1???$type_id@VCommandRegistry@@VCommandBlockName@@@@YA?AV?$typeid_t@VCommandRegistry@@@@XZ@4V1@A"); - return id; -}; diff --git a/LiteLoader/include/llapi/mc/winhttp_websocket_impl.hpp b/LiteLoader/include/llapi/mc/winhttp_websocket_impl.hpp deleted file mode 100644 index e432c66861..0000000000 --- a/LiteLoader/include/llapi/mc/winhttp_websocket_impl.hpp +++ /dev/null @@ -1,57 +0,0 @@ -/** - * @file winhttp_websocket_impl.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure winhttp_websocket_impl. - * - */ -struct winhttp_websocket_impl { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_WINHTTP_WEBSOCKET_IMPL -public: - struct winhttp_websocket_impl& operator=(struct winhttp_websocket_impl const &) = delete; - winhttp_websocket_impl(struct winhttp_websocket_impl const &) = delete; - winhttp_websocket_impl() = delete; -#endif - -public: - /** - * @symbol ?connect_websocket\@winhttp_websocket_impl\@\@QEAAJPEAUHC_WEBSOCKET\@\@PEAUXAsyncBlock\@\@V?$shared_ptr\@UWinHttpState\@httpclient\@xbox\@\@\@std\@\@\@Z - */ - MCAPI long connect_websocket(struct HC_WEBSOCKET *, struct XAsyncBlock *, class std::shared_ptr); - /** - * @symbol ?send_websocket_binary_message_async\@winhttp_websocket_impl\@\@QEAAJPEAUXAsyncBlock\@\@PEBEI\@Z - */ - MCAPI long send_websocket_binary_message_async(struct XAsyncBlock *, unsigned char const *, unsigned int); - /** - * @symbol ?send_websocket_message_async\@winhttp_websocket_impl\@\@QEAAJPEAUXAsyncBlock\@\@PEBD\@Z - */ - MCAPI long send_websocket_message_async(struct XAsyncBlock *, char const *); - -//private: - /** - * @symbol ?enqueue_message\@winhttp_websocket_impl\@\@AEAAJV?$shared_ptr\@Usend_msg_context\@winhttp_websocket_impl\@\@\@std\@\@\@Z - */ - MCAPI long enqueue_message(class std::shared_ptr); - /** - * @symbol ?send_complete\@winhttp_websocket_impl\@\@AEAAXJ\@Z - */ - MCAPI void send_complete(long); - /** - * @symbol ?send_message\@winhttp_websocket_impl\@\@AEAAXV?$shared_ptr\@Usend_msg_context\@winhttp_websocket_impl\@\@\@std\@\@\@Z - */ - MCAPI void send_message(class std::shared_ptr); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/wspp_websocket_impl.hpp b/LiteLoader/include/llapi/mc/wspp_websocket_impl.hpp index 2c22be0e61..719b3b7b8a 100644 --- a/LiteLoader/include/llapi/mc/wspp_websocket_impl.hpp +++ b/LiteLoader/include/llapi/mc/wspp_websocket_impl.hpp @@ -44,9 +44,9 @@ struct wspp_websocket_impl { */ MCAPI long sendBinary(struct XAsyncBlock *, unsigned char const *, unsigned int); /** - * @symbol ??0wspp_websocket_impl\@\@QEAA\@PEAUHC_WEBSOCKET\@\@PEBD1\@Z + * @symbol ??0wspp_websocket_impl\@\@QEAA\@PEAUHC_WEBSOCKET_OBSERVER\@\@PEBD1\@Z */ - MCAPI wspp_websocket_impl(struct HC_WEBSOCKET *, char const *, char const *); + MCAPI wspp_websocket_impl(struct HC_WEBSOCKET_OBSERVER *, char const *, char const *); //private: /** diff --git a/LiteLoader/src/liteloader/BuiltinBugFix.cpp b/LiteLoader/src/liteloader/BuiltinBugFix.cpp index d979816573..6846dc039d 100644 --- a/LiteLoader/src/liteloader/BuiltinBugFix.cpp +++ b/LiteLoader/src/liteloader/BuiltinBugFix.cpp @@ -173,16 +173,16 @@ TInstanceHook(void, "?moveSpawnView@Player@@QEAAXAEBVVec3@@V?$AutomaticID@VDimen return original(this, pos, dimid); fixPlayerPosition(this, false); } - -TClasslessInstanceHook(__int64, - "?move@ChunkViewSource@@QEAAXAEBVBlockPos@@H_NW4ChunkSourceViewGenerateMode@@V?$function@$$" - "A6AXV?$buffer_span_mut@V?$shared_ptr@VLevelChunk@@@std@@@@V?$buffer_span@I@@@Z@std@@@Z", - BlockPos a2, int a3, unsigned __int8 a4, int a5, __int64 a6) { - if (validPosition(a2)) - return original(this, a2, a3, a4, a5, a6); - fixPlayerPosition(movingViewPlayer); - return 0; -} +// 这个函数没有了，我也不知这个修的是啥，就注释了 +//TClasslessInstanceHook(__int64, +// "?move@ChunkViewSource@@QEAAXAEBVBlockPos@@H_NW4ChunkSourceViewGenerateMode@@V?$function@$$" +// "A6AXV?$buffer_span_mut@V?$shared_ptr@VLevelChunk@@@std@@@@V?$buffer_span@I@@@Z@std@@@Z", +// BlockPos a2, int a3, unsigned __int8 a4, int a5, __int64 a6) { +// if (validPosition(a2)) +// return original(this, a2, a3, a4, a5, a6); +// fixPlayerPosition(movingViewPlayer); +// return 0; +//} TInstanceHook(void, "?move@Player@@UEAAXAEBVVec3@@@Z", Player, Vec3 pos) { if (validPosition(pos)) @@ -282,7 +282,7 @@ TInstanceHook(LevelData*, // Disable 'Running AutoCompaction...' log. bool pauseBLogging = false; -THook(__int64, "std::_Func_impl_no_alloc<,TaskResult>::_Do_call", __int64 a1, +THook(__int64, "std::_Func_impl_no_alloc<,TaskResult>::_Do_call", __int64 a1, __int64 a2) { if (ll::globalConfig.disableAutoCompactionLog) { pauseBLogging = true; diff --git a/LiteLoader/src/llapi/EventAPI.cpp b/LiteLoader/src/llapi/EventAPI.cpp index 748a1b6f33..2191c39703 100644 --- a/LiteLoader/src/llapi/EventAPI.cpp +++ b/LiteLoader/src/llapi/EventAPI.cpp @@ -32,10 +32,8 @@ #include "llapi/mc/PlayerActionPacket.hpp" #include "llapi/mc/RespawnPacket.hpp" #include "llapi/mc/Scoreboard.hpp" -#include "llapi/mc/NpcActionsContainer.hpp" #include "llapi/mc/NpcSceneDialogueData.hpp" #include "llapi/mc/ArmorStand.hpp" -#include "llapi/mc/NpcAction.hpp" #include "llapi/mc/NpcComponent.hpp" #include "llapi/mc/Container.hpp" #include "llapi/mc/ScoreboardId.hpp" @@ -1364,7 +1362,7 @@ TInstanceHook(bool, "?destroyBlock@GameMode@@UEAA_NAEBVBlockPos@@E@Z", GameMode, } /////////////////// PlayerUseItemOn /////////////////// -TInstanceHook(bool, "?useItemOn@GameMode@@UEAA_NAEAVItemStack@@AEBVBlockPos@@EAEBVVec3@@PEBVBlock@@@Z", GameMode, +TInstanceHook(bool, "?useItemOn@GameMode@@UEAA?AVInteractionResult@@AEAVItemStack@@AEBVBlockPos@@EAEBVVec3@@PEBVBlock@@@Z", GameMode, ItemStack& item, BlockPos blockPosPtr, unsigned char side, Vec3* clickPos, void* a6_block) { IF_LISTENED(PlayerUseItemOnEvent) { PlayerUseItemOnEvent ev{}; @@ -1436,7 +1434,7 @@ struct BucketPlayerAndActor { }; // 也许这个结构体可以用偏移获取替代？ -THook(void, "::operator()", BucketPlayerAndActor* a1) { +THook(void, "::operator()", BucketPlayerAndActor* a1) { IF_LISTENED(PlayerUseBucketEvent) { BucketPlayerAndActor mBucketPlayerAndActor = *a1; if (mBucketPlayerAndActor.owner->getTypeName() == "minecraft:cow" || @@ -1487,7 +1485,7 @@ THook(void, "?implInteraction@BucketableComponent@@SAXAEAVActor@@AEAVPlayer@@@Z" return original(actor, player); } -TInstanceHook(bool, "?useOn@ItemStack@@QEAA_NAEAVActor@@HHHEAEBVVec3@@@Z", ItemStack, Actor* actor, int x, int y, int z, +TInstanceHook(bool, "?useOn@ItemStack@@QEAA?AVInteractionResult@@AEAVActor@@HHHEAEBVVec3@@@Z", ItemStack, Actor* actor, int x, int y, int z, unsigned char face, Vec3 clickPos) { IF_LISTENED(PlayerUseBucketEvent) { if (actor->getTypeName() != "minecraft:player") { @@ -1835,11 +1833,11 @@ TClasslessInstanceHook(void, "?releaseUsing@TridentItem@@UEBAXAEAVItemStack@@PEA #include "llapi/mc/WeakEntityRef.hpp" #include "llapi/mc/EntityContext.hpp" +#include "llapi/mc/Npc.hpp" ////////////// NpcCmd ////////////// TInstanceHook(void, - "?executeCommandAction@NpcComponent@@QEAAXAEAVActor@@AEAVPlayer@@HAEBV?$basic_string@DU?$char_traits@D@" - "std@@V?$allocator@D@2@@std@@@Z", + "?executeCommandAction@NpcComponent@@QEAAXAEAVActor@@AEAVPlayer@@HAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z", NpcComponent, Actor* ac, Player* player, int a4, string& a5) { IF_LISTENED(NpcCmdEvent) { // IDA NpcComponent::executeCommandAction @@ -1848,15 +1846,19 @@ TInstanceHook(void, NpcSceneDialogueData data(WeakEntityRef(ac->getEntityContext().getWeakRef()), a5); auto container = data.getActionsContainer(); - auto actionAt = container->getActionAt(a4); - if (actionAt && dAccess(actionAt, 8) == (char)1) { - - NpcCmdEvent ev{}; - ev.mPlayer = player; - ev.mNpc = ac; - ev.mCommand = actionAt->getText(); - if (!ev.call()) - return; + if (container) { + auto actionAt = container->at(a4); + if (actionAt) { + if (auto* command = std::get_if(actionAt)) { + NpcCmdEvent ev{}; + ev.mPlayer = player; + ev.mNpc = ac; + ev.mCommand = command->mActionValue.mText; + if (!ev.call()) + return; + } + + } } } IF_LISTENED_END(NpcCmdEvent) diff --git a/LiteLoader/src/llapi/command/DynamicCommandAPI.cpp b/LiteLoader/src/llapi/command/DynamicCommandAPI.cpp index 398c6ced54..57d00210dd 100644 --- a/LiteLoader/src/llapi/command/DynamicCommandAPI.cpp +++ b/LiteLoader/src/llapi/command/DynamicCommandAPI.cpp @@ -504,9 +504,9 @@ DynamicCommandInstance* DynamicCommand::_setup(std::unique_ptr->_addEnumValuesInternal(fixedView.data(), values, typeid_t::count++, &CommandRegistry::parseEnumStringAndInt).val; + Global->_addEnumValuesInternal(fixedView.data(), values, Bedrock::typeid_t::count++, &CommandRegistry::parseEnumStringAndInt).val; #else - Global->_addEnumValuesInternal(fixedView.data(), values, typeid_t::count++, &CommandRegistry::parseEnum).val; + Global->_addEnumValuesInternal(fixedView.data(), values, Bedrock::typeid_t::count++, &CommandRegistry::parseEnum).val; #endif // USE_PARSE_ENUM_STRING } commandInstance->enumRanges.swap(convertedEnumRanges); diff --git a/LiteLoader/src/llapi/mc/LevelAPI.cpp b/LiteLoader/src/llapi/mc/LevelAPI.cpp index fefc05c41c..8a4b5ed385 100644 --- a/LiteLoader/src/llapi/mc/LevelAPI.cpp +++ b/LiteLoader/src/llapi/mc/LevelAPI.cpp @@ -25,6 +25,7 @@ #include "llapi/mc/LoopbackPacketSender.hpp" #include "llapi/mc/ServerCommandOrigin.hpp" #include "llapi/mc/PlayerCommandOrigin.hpp" +#include "llapi/mc/CommandOriginLoader.hpp" Actor* Level::getEntity(ActorUniqueID uniqueId) { try { @@ -173,14 +174,14 @@ std::unique_ptr getPlayerOriginTag(Player& player) { } bool Level::executeCommand(const string& cmd) { - auto origin = ::ServerCommandOrigin::load(getServerOriginTag(), *Global); + auto origin = CommandOriginLoader::load(getServerOriginTag(), *Global); return MinecraftCommands::_runcmd(std::move(origin), cmd); } std::unordered_map resultOfOrigin = {}; std::pair Level::executeCommandEx(const string& cmd) { - auto origin = ::ServerCommandOrigin::load(getServerOriginTag(), *Global); + auto origin = CommandOriginLoader::load(getServerOriginTag(), *Global); string val; auto ptr = origin.get(); resultOfOrigin[ptr] = &val; @@ -192,7 +193,7 @@ std::pair Level::executeCommandEx(const string& cmd) { bool Level::executeCommandAs(Player* pl, const string& cmd) { auto tag = getPlayerOriginTag(*pl); - auto origin = PlayerCommandOrigin::load(*tag, *Global); + auto origin = CommandOriginLoader::load(*tag, *Global); return MinecraftCommands::_runcmd(std::move(origin), cmd); } diff --git a/LiteLoader/src/llapi/mc/MolangAPI.cpp b/LiteLoader/src/llapi/mc/MolangAPI.cpp index c5abfdbfcb..423e927d7e 100644 --- a/LiteLoader/src/llapi/mc/MolangAPI.cpp +++ b/LiteLoader/src/llapi/mc/MolangAPI.cpp @@ -76,7 +76,7 @@ bool MolangInstance::isInitialized() { } bool MolangInstance::isValid() { - return ((ExpressionNode*)expression)->isValid(); + return ((ExpressionNode*)expression)->_checkAllOperationsAreValid(); } bool MolangInstance::parse(const string& expressionStr, MolangVersion version, diff --git a/LiteLoader/src/llapi/mc/PlayerAPI.cpp b/LiteLoader/src/llapi/mc/PlayerAPI.cpp index b478298ba2..3fd25e5c42 100644 --- a/LiteLoader/src/llapi/mc/PlayerAPI.cpp +++ b/LiteLoader/src/llapi/mc/PlayerAPI.cpp @@ -330,7 +330,7 @@ bool Player::runcmd(const string& cmd) { } Container* Player::getEnderChestContainer() { - return dAccess(this, 3800); // IDA Player::Player() 782 + return dAccess(this, 3264); // IDA Player::Player() 782 } bool Player::transferServer(const string& address, unsigned short port) { @@ -1051,7 +1051,7 @@ std::string getServerId(mce::UUID const& uuid) { bool Player::deletePlayerNbt(mce::UUID const& uuid) { try { auto& dbStorage = *Global; - auto serverId = getServerId(uuid); + auto serverId = ::getServerId(uuid); if (serverId.empty()) return false; if (!dbStorage.hasKey(serverId, playerCategory)) { @@ -1065,7 +1065,7 @@ bool Player::deletePlayerNbt(mce::UUID const& uuid) { } std::unique_ptr getOfflineNbt(mce::UUID const& uuid) { - auto serverId = getServerId(uuid); + auto serverId = ::getServerId(uuid); if (serverId.empty()) { return nullptr; } @@ -1085,7 +1085,7 @@ std::unique_ptr Player::getPlayerNbt(mce::UUID const& uuid) { bool setOfflineNbt(mce::UUID const& uuid, CompoundTag* nbt) { try { auto& data = *nbt; - auto serverId = getServerId(uuid); + auto serverId = ::getServerId(uuid); if (serverId.empty()) { return false; } @@ -1097,7 +1097,7 @@ bool setOfflineNbt(mce::UUID const& uuid, CompoundTag* nbt) { bool Player::setPlayerNbt(mce::UUID const& uuid, CompoundTag* nbt) { try { - auto serverId = getServerId(uuid); + auto serverId = ::getServerId(uuid); if (serverId.empty()) { return false; } @@ -1114,7 +1114,7 @@ bool Player::setPlayerNbt(mce::UUID const& uuid, CompoundTag* nbt) { bool Player::setPlayerNbtTags(mce::UUID const& uuid, CompoundTag* nbt, const vector& tags) { try { auto& data = *nbt; - auto serverId = getServerId(uuid); + auto serverId = ::getServerId(uuid); if (serverId.empty()) { return false; } diff --git a/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp b/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp index 923f96b848..6e6cb5b51a 100644 --- a/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp +++ b/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp @@ -15,8 +15,10 @@ Block const* mElements[119]; Block const* mAcaciaButton; Block const* mAcaciaDoor; +Block const* mAcaciaFence; Block const* mAcaciaFenceGate; Block const* mAcaciaHangingSign; +Block const* mAcaciaLog; Block const* mAcaciaPressurePlate; Block const* mAcaciaStairs; Block const* mAcaciaStandingSign; @@ -65,8 +67,10 @@ Block const* mBell; Block const* mBigDripleaf; Block const* mBirchButton; Block const* mBirchDoor; +Block const* mBirchFence; Block const* mBirchFenceGate; Block const* mBirchHangingSign; +Block const* mBirchLog; Block const* mBirchPressurePlate; Block const* mBirchStairs; Block const* mBirchStandingSign; @@ -104,6 +108,7 @@ Block const* mBuddingAmethyst; Block const* mCactus; Block const* mCake; Block const* mCalcite; +Block const* mCalibratedSculkSensor; Block const* mCamera; Block const* mCampFire; Block const* mCandle; @@ -121,6 +126,23 @@ Block const* mChainCommandBlock; Block const* mChalkboard; Block const* mChemicalHeat; Block const* mChemistryTable; +Block const* mCherryButton; +Block const* mCherryDoor; +Block const* mCherryDoubleSlab; +Block const* mCherryFence; +Block const* mCherryFenceGate; +Block const* mCherryHangingSign; +Block const* mCherryLeaves; +Block const* mCherryLog; +Block const* mCherryPlanks; +Block const* mCherryPressurePlate; +Block const* mCherrySapling; +Block const* mCherrySlab; +Block const* mCherryStairs; +Block const* mCherryStandingSign; +Block const* mCherryTrapdoor; +Block const* mCherryWallSign; +Block const* mCherryWood; Block const* mChest; Block const* mChiseledBookshelf; Block const* mChiseledDeepslate; @@ -189,7 +211,9 @@ Block const* mCyanGlazedTerracotta; Block const* mCyanWool; Block const* mDarkOakButton; Block const* mDarkOakDoor; +Block const* mDarkOakFence; Block const* mDarkOakFenceGate; +Block const* mDarkOakLog; Block const* mDarkOakPressurePlate; Block const* mDarkOakStairs; Block const* mDarkOakTrapdoor; @@ -256,7 +280,6 @@ Block const* mExposedCutCopperSlab; Block const* mExposedCutCopperStairs; Block const* mExposedDoubleCutCopperSlab; Block const* mFarmlandBlock; -Block const* mFence; Block const* mFenceGate; Block const* mFire; Block const* mFletchingTable; @@ -316,8 +339,10 @@ Block const* mJigsaw; Block const* mJukebox; Block const* mJungleButton; Block const* mJungleDoor; +Block const* mJungleFence; Block const* mJungleFenceGate; Block const* mJungleHangingSign; +Block const* mJungleLog; Block const* mJunglePressurePlate; Block const* mJungleStairs; Block const* mJungleStandingSign; @@ -357,8 +382,6 @@ Block const* mLitRedstoneLamp; Block const* mLitRedstoneOre; Block const* mLitSmoker; Block const* mLodestone; -Block const* mLog; -Block const* mLog2; Block const* mLoom; Block const* mMagentaCandle; Block const* mMagentaCandleCake; @@ -416,7 +439,9 @@ Block const* mNetherrack; Block const* mNetherreactor; Block const* mNormalStoneStairs; Block const* mNoteblock; +Block const* mOakFence; Block const* mOakHangingSign; +Block const* mOakLog; Block const* mOakStairs; Block const* mObserver; Block const* mObsidian; @@ -436,6 +461,7 @@ Block const* mPearlescentFroglight; Block const* mPinkCandle; Block const* mPinkCandleCake; Block const* mPinkGlazedTerracotta; +Block const* mPinkPetals; Block const* mPinkWool; Block const* mPiston; Block const* mPistonArmCollision; @@ -547,8 +573,10 @@ Block const* mSponge; Block const* mSporeBlossom; Block const* mSpruceButton; Block const* mSpruceDoor; +Block const* mSpruceFence; Block const* mSpruceFenceGate; Block const* mSpruceHangingSign; +Block const* mSpruceLog; Block const* mSprucePressurePlate; Block const* mSpruceStairs; Block const* mSpruceStandingSign; @@ -576,6 +604,8 @@ Block const* mStonecutterBlock; Block const* mStrippedAcaciaLog; Block const* mStrippedBambooBlock; Block const* mStrippedBirchLog; +Block const* mStrippedCherryLog; +Block const* mStrippedCherryWood; Block const* mStrippedCrimsonHyphae; Block const* mStrippedCrimsonStem; Block const* mStrippedDarkOakLog; @@ -588,6 +618,7 @@ Block const* mStrippedWarpedHyphae; Block const* mStrippedWarpedStem; Block const* mStructureBlock; Block const* mStructureVoid; +Block const* mSuspiciousGravel; Block const* mSuspiciousSand; Block const* mSweetBerryBush; Block const* mTallGrass; @@ -684,8 +715,10 @@ void assignBlocks() { } mAcaciaButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaButton, true); mAcaciaDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaDoor, true); + mAcaciaFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaFence, true); mAcaciaFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaFenceGate, true); mAcaciaHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaHangingSign, true); + mAcaciaLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaLog, true); mAcaciaPressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaPressurePlate, true); mAcaciaStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaStairs, true); mAcaciaStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaStandingSign, true); @@ -735,8 +768,10 @@ void assignBlocks() { mBigDripleaf = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BigDripleaf, true); mBirchButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchButton, true); mBirchDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchDoor, true); + mBirchFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchFence, true); mBirchFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchFenceGate, true); mBirchHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchHangingSign, true); + mBirchLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchLog, true); mBirchPressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchPressurePlate, true); mBirchStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchStairs, true); mBirchStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchStandingSign, true); @@ -774,6 +809,7 @@ void assignBlocks() { mCactus = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Cactus, true); mCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Cake, true); mCalcite = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Calcite, true); + mCalibratedSculkSensor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CalibratedSculkSensor, true); mCamera = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Camera, true); mCampFire = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CampFire, true); mCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Candle, true); @@ -793,6 +829,23 @@ void assignBlocks() { mChalkboard = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Chalkboard, true); mChemicalHeat = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ChemicalHeat, true); mChemistryTable = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ChemistryTable, true); + mCherryButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryButton, true); + mCherryDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryDoor, true); + mCherryDoubleSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryDoubleSlab, true); + mCherryFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryFence, true); + mCherryFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryFenceGate, true); + mCherryHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryHangingSign, true); + mCherryLeaves = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryLeaves, true); + mCherryLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryLog, true); + mCherryPlanks = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryPlanks, true); + mCherryPressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryPressurePlate, true); + mCherrySapling = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherrySapling, true); + mCherrySlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherrySlab, true); + mCherryStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryStairs, true); + mCherryStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryStandingSign, true); + mCherryTrapdoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryTrapdoor, true); + mCherryWallSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryWallSign, true); + mCherryWood = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CherryWood, true); mChest = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Chest, true); mChiseledBookshelf = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ChiseledBookshelf, true); mChiseledDeepslate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ChiseledDeepslate, true); @@ -867,7 +920,9 @@ void assignBlocks() { mCyanWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::CyanWool, true); mDarkOakButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakButton, true); mDarkOakDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakDoor, true); + mDarkOakFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakFence, true); mDarkOakFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakFenceGate, true); + mDarkOakLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakLog, true); mDarkOakPressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakPressurePlate, true); mDarkOakStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakStairs, true); mDarkOakTrapdoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakTrapdoor, true); @@ -939,7 +994,6 @@ void assignBlocks() { mExposedDoubleCutCopperSlab = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ExposedDoubleCutCopperSlab, true); mFarmlandBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::FarmlandBlock, true); - mFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Fence, true); mFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::FenceGate, true); mFire = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Fire, true); mFletchingTable = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::FletchingTable, true); @@ -1000,8 +1054,10 @@ void assignBlocks() { mJukebox = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Jukebox, true); mJungleButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleButton, true); mJungleDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleDoor, true); + mJungleFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleFence, true); mJungleFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleFenceGate, true); mJungleHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleHangingSign, true); + mJungleLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleLog, true); mJunglePressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JunglePressurePlate, true); mJungleStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleStairs, true); mJungleStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleStandingSign, true); @@ -1044,8 +1100,6 @@ void assignBlocks() { mLitRedstoneOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LitRedstoneOre, true); mLitSmoker = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::LitSmoker, true); mLodestone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Lodestone, true); - mLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Log, true); - mLog2 = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Log2, true); mLoom = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Loom, true); mMagentaCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MagentaCandle, true); mMagentaCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::MagentaCandleCake, true); @@ -1105,7 +1159,9 @@ void assignBlocks() { mNetherreactor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Netherreactor, true); mNormalStoneStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::NormalStoneStairs, true); mNoteblock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Noteblock, true); + mOakFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OakFence, true); mOakHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OakHangingSign, true); + mOakLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OakLog, true); mOakStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OakStairs, true); mObserver = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Observer, true); mObsidian = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Obsidian, true); @@ -1128,6 +1184,7 @@ void assignBlocks() { mPinkCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PinkCandle, true); mPinkCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PinkCandleCake, true); mPinkGlazedTerracotta = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PinkGlazedTerracotta, true); + mPinkPetals = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PinkPetals, true); mPinkWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PinkWool, true); mPiston = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Piston, true); mPistonArmCollision = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PistonArmCollision, true); @@ -1257,8 +1314,10 @@ void assignBlocks() { mSporeBlossom = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SporeBlossom, true); mSpruceButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceButton, true); mSpruceDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceDoor, true); + mSpruceFence = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceFence, true); mSpruceFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceFenceGate, true); mSpruceHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceHangingSign, true); + mSpruceLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceLog, true); mSprucePressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SprucePressurePlate, true); mSpruceStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceStairs, true); mSpruceStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceStandingSign, true); @@ -1287,6 +1346,8 @@ void assignBlocks() { mStrippedAcaciaLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedAcaciaLog, true); mStrippedBambooBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedBambooBlock, true); mStrippedBirchLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedBirchLog, true); + mStrippedCherryLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedCherryLog, true); + mStrippedCherryWood = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedCherryWood, true); mStrippedCrimsonHyphae = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedCrimsonHyphae, true); mStrippedCrimsonStem = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedCrimsonStem, true); mStrippedDarkOakLog = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedDarkOakLog, true); @@ -1299,6 +1360,7 @@ void assignBlocks() { mStrippedWarpedStem = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedWarpedStem, true); mStructureBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StructureBlock, true); mStructureVoid = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StructureVoid, true); + mSuspiciousGravel = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SuspiciousGravel, true); mSuspiciousSand = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SuspiciousSand, true); mSweetBerryBush = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SweetBerryBush, true); mTallGrass = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::TallGrass, true); diff --git a/LiteLoader/src/llapi/network/PacketAPI.cpp b/LiteLoader/src/llapi/network/PacketAPI.cpp index d619daf3e8..3ec6a52a29 100644 --- a/LiteLoader/src/llapi/network/PacketAPI.cpp +++ b/LiteLoader/src/llapi/network/PacketAPI.cpp @@ -206,6 +206,9 @@ using ll::logger; #include "llapi/mc/CameraPresetsPacket.hpp" #include "llapi/mc/UnlockedRecipesPacket.hpp" #include "llapi/mc/CameraInstructionPacket.hpp" +#include "llapi/mc/CompressedBiomeDefinitionListPacket.hpp" +#include "llapi/mc/TrimDataPacket.hpp" +#include "llapi/mc/OpenSignPacket.hpp" #endif INCLUDE_ALL_PACKET @@ -406,7 +409,10 @@ using ll::logger; Func(ClientCheatAbilityPacket) \ Func(CameraPresetsPacket) \ Func(UnlockedRecipesPacket) \ - Func(CameraInstructionPacket) + Func(CameraInstructionPacket) \ + Func(CompressedBiomeDefinitionListPacket) \ + Func(TrimDataPacket) \ + Func(OpenSignPacket) #define DeclearClass(packet) class packet; @@ -832,6 +838,9 @@ static_assert(sizeof(ClientCheatAbilityPacket) == 0x58, "size of ClientCheatAbil static_assert(sizeof(CameraPresetsPacket) == 0x48, "size of CameraPresetsPacket should be 72"); static_assert(sizeof(UnlockedRecipesPacket) == 0x50, "size of UnlockedRecipesPacket should be 80"); static_assert(sizeof(CameraInstructionPacket) == 0x48, "size of CameraInstructionPacket should be 72"); +static_assert(sizeof(CompressedBiomeDefinitionListPacket) == 0x48, "size of CompressedBiomeDefinitionListPacket should be 72"); +static_assert(sizeof(TrimDataPacket) == 0x60, "size of TrimDataPacket should be 96"); +static_assert(sizeof(OpenSignPacket) == 0x40, "size of OpenSignPacket should be 64"); #endif // SIZE_STATIC_ASSERT @@ -1030,5 +1039,8 @@ static_assert(sizeof(ClientCheatAbilityPacket) == 0x58 || sizeof(ClientCheatAbil static_assert(sizeof(CameraPresetsPacket) == 0x48 || sizeof(CameraPresetsPacket) == 48, "size of CameraPresetsPacket should be 72 or 48(default)"); static_assert(sizeof(UnlockedRecipesPacket) == 0x50 || sizeof(UnlockedRecipesPacket) == 48, "size of UnlockedRecipesPacket should be 80 or 48(default)"); static_assert(sizeof(CameraInstructionPacket) == 0x48 || sizeof(CameraInstructionPacket) == 48, "size of CameraInstructionPacket should be 72 or 48(default)"); +static_assert(sizeof(CompressedBiomeDefinitionListPacket) == 0x48 || sizeof(CompressedBiomeDefinitionListPacket) == 48, "size of CompressedBiomeDefinitionListPacket should be 72 or 48(default)"); +static_assert(sizeof(TrimDataPacket) == 0x60 || sizeof(TrimDataPacket) == 48, "size of TrimDataPacket should be 96 or 48(default)"); +static_assert(sizeof(OpenSignPacket) == 0x40 || sizeof(OpenSignPacket) == 48, "size of OpenSignPacket should be 64 or 48(default)"); #endif // SIZE_STATIC_ASSERT_IF_DEFINE diff --git a/ScriptEngine/src/api/ItemAPI.cpp b/ScriptEngine/src/api/ItemAPI.cpp index e560edc53b..e7bcb92d99 100644 --- a/ScriptEngine/src/api/ItemAPI.cpp +++ b/ScriptEngine/src/api/ItemAPI.cpp @@ -7,6 +7,7 @@ #include "api/NativeAPI.h" #include #include +#include #include #include @@ -256,7 +257,7 @@ Local ItemClass::isLiquidClipItem() { Local ItemClass::isMusicDiscItem() { try { - return Boolean::newBoolean(item->isMusicDiscItem()); + return Boolean::newBoolean(item->getItem()->isMusicDisk()); } CATCH("Fail in isMusicDiscItem!"); } diff --git a/ScriptEngine/src/api/PlayerAPI.cpp b/ScriptEngine/src/api/PlayerAPI.cpp index 9052a44b12..e9dcc24ea6 100644 --- a/ScriptEngine/src/api/PlayerAPI.cpp +++ b/ScriptEngine/src/api/PlayerAPI.cpp @@ -1269,9 +1269,9 @@ Local PlayerClass::setPermLevel(const Arguments& args) { fmt::format("Set Player {} Permission Level as {}.", player->getRealName(), newPerm)); player->setPermissions((CommandPermissionLevel)newPerm); if (newPerm >= 1) { - player->getAbilities().setPlayerPermissions(PlayerPermissionLevel::PlayerPermissionLevelOperator); + player->getAbilities().setPlayerPermissions(PlayerPermissionLevel::Operator); } else { - player->getAbilities().setPlayerPermissions(PlayerPermissionLevel::PlayerPermissionLevelMember); + player->getAbilities().setPlayerPermissions(PlayerPermissionLevel::Member); } UpdateAbilitiesPacket uPkt(player->getUniqueID(), player->getAbilities()); player->sendNetworkPacket(uPkt); diff --git a/scripts/LINK.txt b/scripts/LINK.txt index ed9978b96b..ece74b87b0 100644 --- a/scripts/LINK.txt +++ b/scripts/LINK.txt @@ -1 +1 @@ -https://minecraft.azureedge.net/bin-win/bedrock-server-1.19.72.01.zip \ No newline at end of file +https://minecraft.azureedge.net/bin-win/bedrock-server-1.19.81.01.zip \ No newline at end of file From 0a6aa7d0bcdc97ceddbddd7e8366e60459a2d111 Mon Sep 17 00:00:00 2001 From: student_2333 Date: Sun, 30 Apr 2023 18:48:34 +0800 Subject: [PATCH 03/11] refactor: add unused module.exports for BaseLib.js (#1230) --- ScriptEngine/assets/BaseLib.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ScriptEngine/assets/BaseLib.js b/ScriptEngine/assets/BaseLib.js index adbb7e52fe..ec9fef0f8d 100644 --- a/ScriptEngine/assets/BaseLib.js +++ b/ScriptEngine/assets/BaseLib.js @@ -395,6 +395,9 @@ SOFTWARE. cjs.js end */ +globalThis.exports = {}; +globalThis.module = { exports: {} }; + /* For Compatibility */ @@ -412,4 +415,4 @@ globalThis.LXL_Item = LLSE_Item; globalThis.LXL_Player = LLSE_Player; globalThis.LXL_Objective = LLSE_Objective; ll.export = ll.exports; -ll.import = ll.imports; \ No newline at end of file +ll.import = ll.imports; From e9f70dfb27400dc458a41a470d5b0112abef64c4 Mon Sep 17 00:00:00 2001 From: harryxi Date: Sun, 30 Apr 2023 18:49:11 +0800 Subject: [PATCH 04/11] feat(llse): effect method of Entity(#1225) (#1236) add getAllEffects() addEffect() removeEffect() to llse Entity class --- ScriptEngine/src/api/EntityAPI.cpp | 59 ++++++++++++++++++++++++++++++ ScriptEngine/src/api/EntityAPI.h | 5 +++ 2 files changed, 64 insertions(+) diff --git a/ScriptEngine/src/api/EntityAPI.cpp b/ScriptEngine/src/api/EntityAPI.cpp index 5ce6fa2a07..1551389bd8 100644 --- a/ScriptEngine/src/api/EntityAPI.cpp +++ b/ScriptEngine/src/api/EntityAPI.cpp @@ -118,6 +118,10 @@ ClassDefine EntityClassBuilder = .instanceFunction("getBiomeId", &EntityClass::getBiomeId) .instanceFunction("quickEvalMolangScript", &EntityClass::quickEvalMolangScript) + .instanceFunction("getAllEffects", &EntityClass::getAllEffects) + .instanceFunction("addEffect", &EntityClass::addEffect) + .instanceFunction("removeEffect", &EntityClass::removeEffect) + // For Compatibility .instanceFunction("setTag", &EntityClass::setNbt) .instanceFunction("setOnFire", &EntityClass::setOnFire) @@ -1503,6 +1507,61 @@ Local EntityClass::getBiomeName() { CATCH("Fail in getBiomeName!"); } +Local EntityClass::getAllEffects() { + try { + Actor* actor = get(); + if (!actor) { + return Local(); + } + auto effects = actor->getAllEffects(); + if (effects.size() == 0) { + return Local(); + } + Local effectList = Array::newArray(); + for (auto effect : effects) + effectList.add(Number::newNumber((int)effect.getId())); + return effectList; + } + CATCH("Fail in getAllEffects!") +} + +Local EntityClass::addEffect(const Arguments& args) { + CHECK_ARGS_COUNT(args, 4); + CHECK_ARG_TYPE(args[0], ValueKind::kNumber); + CHECK_ARG_TYPE(args[1], ValueKind::kNumber); + CHECK_ARG_TYPE(args[2], ValueKind::kNumber); + CHECK_ARG_TYPE(args[3], ValueKind::kBoolean); + try { + Actor* actor = get(); + if (!actor) { + return Boolean::newBoolean(false); + } + unsigned int id = args[0].asNumber().toInt32(); + int tick = args[1].asNumber().toInt32(); + int level = args[2].asNumber().toInt32(); + bool showParticles = args[3].asBoolean().value(); + MobEffectInstance effect = MobEffectInstance(id, tick, level, false, showParticles, false); + actor->addEffect(effect); + return Boolean::newBoolean(true); + } + CATCH("Fail in addEffect!"); +} + +Local EntityClass::removeEffect(const Arguments& args) { + CHECK_ARGS_COUNT(args, 1); + CHECK_ARG_TYPE(args[0], ValueKind::kNumber); + try { + Actor* actor = get(); + if (!actor) { + return Boolean::newBoolean(false); + } + int id = args[0].asNumber().toInt32(); + actor->removeEffect(id); + return Boolean::newBoolean(true); + } + CATCH("Fail in removeEffect!"); +} + Local McClass::getAllEntities(const Arguments& args) { try { auto entityList = Level::getAllEntities(); diff --git a/ScriptEngine/src/api/EntityAPI.h b/ScriptEngine/src/api/EntityAPI.h index eb71846bc4..9293d30f75 100644 --- a/ScriptEngine/src/api/EntityAPI.h +++ b/ScriptEngine/src/api/EntityAPI.h @@ -111,6 +111,11 @@ class EntityClass : public ScriptClass { Local getBlockFromViewVector(const Arguments& args); Local quickEvalMolangScript(const Arguments& args); + + Local getAllEffects(); + Local addEffect(const Arguments& args); + Local removeEffect(const Arguments& args); + }; extern ClassDefine EntityClassBuilder; extern ClassDefine ActorDamageCauseBuilder; \ No newline at end of file From ed2061d2d03fe03ab2b50f06caec6de0e29085cd Mon Sep 17 00:00:00 2001 From: harryxi Date: Sun, 30 Apr 2023 18:49:28 +0800 Subject: [PATCH 05/11] fix: fix #1232 (#1235) --- ScriptEngine/src/main/NodeJsHelper.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ScriptEngine/src/main/NodeJsHelper.cpp b/ScriptEngine/src/main/NodeJsHelper.cpp index 52e7cf5ff8..2ef50db6bc 100644 --- a/ScriptEngine/src/main/NodeJsHelper.cpp +++ b/ScriptEngine/src/main/NodeJsHelper.cpp @@ -111,6 +111,7 @@ bool loadPluginCode(script::ScriptEngine* engine, std::string entryScriptPath, s if (!EndsWith(pluginDirPath, "/")) pluginDirPath += "/"; pluginDirPath = ReplaceStr(pluginDirPath, "\\", "/"); + entryScriptPath = ReplaceStr(entryScriptPath, "\\", "/"); // Find setup auto it = setups->find(engine); From 43328f32fcbd7985d5130ffb3c89d6dd33d69dbe Mon Sep 17 00:00:00 2001 From: Qiuzhizhe <42761326+quizhizhe@users.noreply.github.com> Date: Sun, 30 Apr 2023 18:49:45 +0800 Subject: [PATCH 06/11] feat: add 'RaidMobSpawnEvent' event (#1229) --- LiteLoader/include/llapi/EventAPI.h | 33 +++++++++++++++++++++++++++++ LiteLoader/src/llapi/EventAPI.cpp | 16 ++++++++++++++ ScriptEngine/src/api/EventAPI.cpp | 11 ++++++++++ 3 files changed, 60 insertions(+) diff --git a/LiteLoader/include/llapi/EventAPI.h b/LiteLoader/include/llapi/EventAPI.h index 4e6d3ad4a9..5e3bf03ad7 100644 --- a/LiteLoader/include/llapi/EventAPI.h +++ b/LiteLoader/include/llapi/EventAPI.h @@ -51,6 +51,7 @@ class BlockLegacy; class ArmorStand; class Objective; struct ScoreboardId; +class Village; /** * @brief The event system. @@ -713,6 +714,38 @@ class MobSpawnedEvent : public EventTemplate { Vec3 mPos; int mDimensionId = -1; }; +/** + * @brief An event that Raid mob spawn. + * + * @note This event cannot be suppressed. + */ +class RaidMobSpawnEvent : public EventTemplate { +public: + + /** + * @brief Village Center generated by which village raid + * + */ + Vec3 mVillageCenter; + + /** + * @brief Spawn Pos; + * + */ + Vec3 mPos; + + /** + * @brief Raid spawn wave number + * + */ + int mWaveNum; + + /** + * @brief Spawn Entity IDs; + * + */ + int mActorNum; +}; /* endregion */ diff --git a/LiteLoader/src/llapi/EventAPI.cpp b/LiteLoader/src/llapi/EventAPI.cpp index 2191c39703..14aa0e07c5 100644 --- a/LiteLoader/src/llapi/EventAPI.cpp +++ b/LiteLoader/src/llapi/EventAPI.cpp @@ -300,6 +300,7 @@ DECLARE_EVENT_DATA(PlayerBedEnterEvent); DECLARE_EVENT_DATA(ScriptPluginManagerEvent); DECLARE_EVENT_DATA(MobTrySpawnEvent); DECLARE_EVENT_DATA(MobSpawnedEvent); +DECLARE_EVENT_DATA(RaidMobSpawnEvent); DECLARE_EVENT_DATA(FormResponsePacketEvent); DECLARE_EVENT_DATA(ResourcePackInitEvent); DECLARE_EVENT_DATA(PlayerOpenInventoryEvent); @@ -2131,6 +2132,21 @@ TClasslessInstanceHook(void, "?_setRespawnStage@EndDragonFight@@AEAAXW4RespawnAn IF_LISTENED_END(MobSpawnedEvent) } } +#include "llapi/mc/Village.hpp" +TInstanceHook(void,"?_spawnRaidGroup@Village@@AEBA_NVVec3@@EAEAV?$unordered_set@UActorUniqueID@@U?$hash@UActorUniqueID@@@std@@U?$equal_to@UActorUniqueID@@@3@V?$allocator@UActorUniqueID@@@3@@std@@@Z", + Village, Vec3 pos, unsigned char num, std::unordered_set &actorIDs){ + // actorIDs其实是std::unordered_set，懒得写hash函数 + original(this,pos,num,actorIDs); + IF_LISTENED(RaidMobSpawnEvent) { + RaidMobSpawnEvent ev{}; + ev.mVillageCenter = this->getCenter(); + ev.mPos = pos; + ev.mWaveNum = num; + ev.mActorNum = actorIDs.size(); + ev.call(); + } + IF_LISTENED_END(RaidMobSpawnEvent) +} #include "llapi/impl/FormPacketHelper.h" #include "llapi/mc/Json.hpp" diff --git a/ScriptEngine/src/api/EventAPI.cpp b/ScriptEngine/src/api/EventAPI.cpp index a24d4630bf..0ef9b68943 100644 --- a/ScriptEngine/src/api/EventAPI.cpp +++ b/ScriptEngine/src/api/EventAPI.cpp @@ -89,6 +89,7 @@ enum class EVENT_TYPES : int { /* Entity Events */ onMobDie, onMobHurt, + onRaidMobSpawn, onEntityExplode, onProjectileHitEntity, onWitherBossDestroy, @@ -839,6 +840,16 @@ void EnableEventListener(int eventId) { }); break; + case EVENT_TYPES::onRaidMobSpawn: + Event::RaidMobSpawnEvent::subscribe([](const RaidMobSpawnEvent& ev) { + IF_LISTENED(EVENT_TYPES::onRaidMobSpawn) { + CallEvent(EVENT_TYPES::onRaidMobSpawn, IntPos::newPos(ev.mVillageCenter), IntPos::newPos(ev.mPos), + Number::newNumber(ev.mWaveNum), Number::newNumber(ev.mActorNum)); + } + IF_LISTENED_END(EVENT_TYPES::onRaidMobSpawn) + }); + break; + case EVENT_TYPES::onStepOnPressurePlate: Event::EntityStepOnPressurePlateEvent::subscribe([](const EntityStepOnPressurePlateEvent& ev) { IF_LISTENED(EVENT_TYPES::onStepOnPressurePlate) { From c67b74cc06eb74166a38f37dc8d48b7fc8215cb8 Mon Sep 17 00:00:00 2001 From: qingyu <62042544+dreamguxiang@users.noreply.github.com> Date: Sun, 30 Apr 2023 21:41:47 +0800 Subject: [PATCH 07/11] fix: fix RegCmd error --- LiteLoader/include/llapi/DynamicCommandAPI.h | 3 ++- LiteLoader/include/llapi/mc/Bedrock.hpp | 25 ++++++++++++------- LiteLoader/include/llapi/mc/Command.hpp | 1 + .../include/llapi/mc/CommandRegistry.hpp | 2 +- .../include/llapi/mc/CommandSelectorBase.hpp | 9 ++++--- .../src/llapi/command/DynamicCommandAPI.cpp | 2 +- 6 files changed, 26 insertions(+), 16 deletions(-) diff --git a/LiteLoader/include/llapi/DynamicCommandAPI.h b/LiteLoader/include/llapi/DynamicCommandAPI.h index 53c82ae51a..d7588464e3 100644 --- a/LiteLoader/include/llapi/DynamicCommandAPI.h +++ b/LiteLoader/include/llapi/DynamicCommandAPI.h @@ -403,7 +403,8 @@ class DynamicCommand : public Command { } template CommandParameterData makeParameterData() const { - CommandParameterData param{type == ParameterType::Enum ? Bedrock::typeid_t::count++ + CommandParameterData param { + type == ParameterType::Enum ? Bedrock::typeid_t::_getCounter().fetch_add(1) : Bedrock::type_id(), type == ParameterType::Enum ? &CommandRegistry::fakeParse : CommandRegistry::getParseFn(), name, diff --git a/LiteLoader/include/llapi/mc/Bedrock.hpp b/LiteLoader/include/llapi/mc/Bedrock.hpp index c87973f27a..1777963575 100644 --- a/LiteLoader/include/llapi/mc/Bedrock.hpp +++ b/LiteLoader/include/llapi/mc/Bedrock.hpp @@ -138,15 +138,21 @@ class typeid_t { template typeid_t type_id() { - static typeid_t id = typeid_t::count++; + static typeid_t id = typeid_t::_getCounter().fetch_add(1); return id; } template <> class typeid_t { public: - inline static unsigned short count = 0; unsigned short value; + + inline static std::atomic& _getCounter(){ + std::atomic& id = *(std::atomic*)dlsym_real( + "?storage@?1??_getCounter@?$typeid_t@VCommandRegistry@@@Bedrock@@CAAEAU?$atomic@G@std@@XZ@4U45@A"); + return id; + } + typeid_t(typeid_t const& id) : value(id.value){}; typeid_t(unsigned short value) : value(value){}; }; @@ -156,7 +162,8 @@ MCAPI typeid_t type_id(); template <> MCAPI typeid_t type_id>(); // template MCAPI typeid_t type_id(); -// template MCAPI typeid_t type_id(); +template<> +MCAPI typeid_t type_id(); template <> MCAPI typeid_t type_id(); template <> @@ -218,12 +225,12 @@ inline typeid_t type_id() { return id; }; -template <> -inline typeid_t type_id() { - static typeid_t id = *(typeid_t*)dlsym_real( - "??$type_id@VCommandRegistry@@H@Bedrock@@YA?AV?$typeid_t@VCommandRegistry@@@0@XZ"); - return id; -}; +//template <> +//inline typeid_t type_id() { +// static typeid_t id = *(typeid_t*)dlsym_real( +// "??$type_id@VCommandRegistry@@H@Bedrock@@YA?AV?$typeid_t@VCommandRegistry@@@0@XZ"); +// return id; +//}; template <> inline typeid_t type_id() { diff --git a/LiteLoader/include/llapi/mc/Command.hpp b/LiteLoader/include/llapi/mc/Command.hpp index 1a16793e30..75906a55c1 100644 --- a/LiteLoader/include/llapi/mc/Command.hpp +++ b/LiteLoader/include/llapi/mc/Command.hpp @@ -11,6 +11,7 @@ #include "CommandRegistry.hpp" #include "CommandParameterData.hpp" #include "CommandFlag.hpp" +#include "Bedrock.hpp" class CommandRegistry; class CommandOutput; diff --git a/LiteLoader/include/llapi/mc/CommandRegistry.hpp b/LiteLoader/include/llapi/mc/CommandRegistry.hpp index e623b8282a..62ec8308e0 100644 --- a/LiteLoader/include/llapi/mc/CommandRegistry.hpp +++ b/LiteLoader/include/llapi/mc/CommandRegistry.hpp @@ -145,7 +145,7 @@ class CommandRegistry { struct Enum { std::string name; // 0 - Bedrock::typeid_t type; // 32 + Bedrock::typeid_t type; // 32 ParseFn parse; // 40 std::vector> values; // 48 diff --git a/LiteLoader/include/llapi/mc/CommandSelectorBase.hpp b/LiteLoader/include/llapi/mc/CommandSelectorBase.hpp index f1d1f0ed70..44da888817 100644 --- a/LiteLoader/include/llapi/mc/CommandSelectorBase.hpp +++ b/LiteLoader/include/llapi/mc/CommandSelectorBase.hpp @@ -11,7 +11,7 @@ #include #include "ActorDefinitionIdentifier.hpp" #include "CommandPosition.hpp" -#include "BlockPos.hpp" +#include "Vec3.hpp" class CommandOrigin; class Actor; class Player; @@ -36,19 +36,20 @@ class CommandSelectorBase { std::vector> mTagFilters; std::vector> mFilterChain; CommandPosition mPosition; - BlockPos mBoxDeltas; + Vec3 mBoxDeltas; float mRadiusMin; float mRadiusMax; uint64_t mCount; bool mIncludeDeadPlayers; bool mIsPositionBound; bool mDistanceFiltered; + bool mPositionFiltered; + bool mCountFiltered; bool mHaveDeltas; bool mForcePlayer; + bool mExcludeAgents; bool mIsExplicitIdSelector; - // c++ buffer, issue #1006. - char unk[8]; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMMANDSELECTORBASE diff --git a/LiteLoader/src/llapi/command/DynamicCommandAPI.cpp b/LiteLoader/src/llapi/command/DynamicCommandAPI.cpp index 57d00210dd..77a1581946 100644 --- a/LiteLoader/src/llapi/command/DynamicCommandAPI.cpp +++ b/LiteLoader/src/llapi/command/DynamicCommandAPI.cpp @@ -504,7 +504,7 @@ DynamicCommandInstance* DynamicCommand::_setup(std::unique_ptr->_addEnumValuesInternal(fixedView.data(), values, Bedrock::typeid_t::count++, &CommandRegistry::parseEnumStringAndInt).val; + Global->_addEnumValuesInternal(fixedView.data(), values, Bedrock::typeid_t::_getCounter().fetch_add(1), &CommandRegistry::parseEnumStringAndInt).val; #else Global->_addEnumValuesInternal(fixedView.data(), values, Bedrock::typeid_t::count++, &CommandRegistry::parseEnum).val; #endif // USE_PARSE_ENUM_STRING From adbcc9ecf329c70bd9fd2dc81f84828cb30f7d8c Mon Sep 17 00:00:00 2001 From: ShrBox Date: Mon, 1 May 2023 12:40:50 +0800 Subject: [PATCH 08/11] fix: fix UseItemOnEvent #1227 --- LiteLoader/include/llapi/mc/inc/enums.inc | 11 ++++++++- LiteLoader/src/llapi/EventAPI.cpp | 29 +++++++++++++---------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/LiteLoader/include/llapi/mc/inc/enums.inc b/LiteLoader/include/llapi/mc/inc/enums.inc index 58c7285b82..c5fb05dcf4 100644 --- a/LiteLoader/include/llapi/mc/inc/enums.inc +++ b/LiteLoader/include/llapi/mc/inc/enums.inc @@ -1170,5 +1170,14 @@ enum class BlockProperty : int64_t { CanHaltWhenClimbing = 0x1000000000000, }; +#include +class InteractionResult { +public: + enum Result : __int32 { + Success = 0x1, + Fail = 0x2, + }; + std::underlying_type_t mResult; +}; -// clang-format on +// clang-format on \ No newline at end of file diff --git a/LiteLoader/src/llapi/EventAPI.cpp b/LiteLoader/src/llapi/EventAPI.cpp index 14aa0e07c5..1f41a56aff 100644 --- a/LiteLoader/src/llapi/EventAPI.cpp +++ b/LiteLoader/src/llapi/EventAPI.cpp @@ -1363,8 +1363,9 @@ TInstanceHook(bool, "?destroyBlock@GameMode@@UEAA_NAEBVBlockPos@@E@Z", GameMode, } /////////////////// PlayerUseItemOn /////////////////// -TInstanceHook(bool, "?useItemOn@GameMode@@UEAA?AVInteractionResult@@AEAVItemStack@@AEBVBlockPos@@EAEBVVec3@@PEBVBlock@@@Z", GameMode, - ItemStack& item, BlockPos blockPosPtr, unsigned char side, Vec3* clickPos, void* a6_block) { +TInstanceHook(InteractionResult, + "?useItemOn@GameMode@@UEAA?AVInteractionResult@@AEAVItemStack@@AEBVBlockPos@@EAEBVVec3@@PEBVBlock@@@Z", + GameMode, ItemStack& item, BlockPos& blockPosPtr, unsigned char side, Vec3* clickPos, Block* block) { IF_LISTENED(PlayerUseItemOnEvent) { PlayerUseItemOnEvent ev{}; ev.mPlayer = this->getPlayer(); @@ -1373,10 +1374,10 @@ TInstanceHook(bool, "?useItemOn@GameMode@@UEAA?AVInteractionResult@@AEAVItemStac ev.mFace = side; ev.mClickPos = *clickPos; if (!ev.call()) - return false; + return InteractionResult { InteractionResult::Fail }; } IF_LISTENED_END(PlayerUseItemOnEvent) - return original(this, item, blockPosPtr, side, clickPos, a6_block); + return original(this, item, blockPosPtr, side, clickPos, block); } /////////////////// PlayerUseBucket /////////////////// @@ -1486,8 +1487,8 @@ THook(void, "?implInteraction@BucketableComponent@@SAXAEAVActor@@AEAVPlayer@@@Z" return original(actor, player); } -TInstanceHook(bool, "?useOn@ItemStack@@QEAA?AVInteractionResult@@AEAVActor@@HHHEAEBVVec3@@@Z", ItemStack, Actor* actor, int x, int y, int z, - unsigned char face, Vec3 clickPos) { +TInstanceHook(InteractionResult, "?useOn@ItemStack@@QEAA?AVInteractionResult@@AEAVActor@@HHHEAEBVVec3@@@Z", ItemStack, Actor* actor, + int x, int y, int z, unsigned char face, Vec3 clickPos) { IF_LISTENED(PlayerUseBucketEvent) { if (actor->getTypeName() != "minecraft:player") { PlayerUseBucketEvent ev{}; @@ -1498,7 +1499,7 @@ TInstanceHook(bool, "?useOn@ItemStack@@QEAA?AVInteractionResult@@AEAVActor@@HHHE ev.mTargetActor = actor; ev.mFace = face; if (!ev.call()) - return false; + return InteractionResult { InteractionResult::Fail }; } } IF_LISTENED_END(PlayerUseBucketEvent) @@ -1838,7 +1839,8 @@ TClasslessInstanceHook(void, "?releaseUsing@TridentItem@@UEBAXAEAVItemStack@@PEA ////////////// NpcCmd ////////////// TInstanceHook(void, - "?executeCommandAction@NpcComponent@@QEAAXAEAVActor@@AEAVPlayer@@HAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z", + "?executeCommandAction@NpcComponent@@QEAAXAEAVActor@@AEAVPlayer@@HAEBV?$basic_string@DU?$char_traits@D@" + "std@@V?$allocator@D@2@@std@@@Z", NpcComponent, Actor* ac, Player* player, int a4, string& a5) { IF_LISTENED(NpcCmdEvent) { // IDA NpcComponent::executeCommandAction @@ -1858,7 +1860,6 @@ TInstanceHook(void, if (!ev.call()) return; } - } } } @@ -2132,11 +2133,15 @@ TClasslessInstanceHook(void, "?_setRespawnStage@EndDragonFight@@AEAAXW4RespawnAn IF_LISTENED_END(MobSpawnedEvent) } } + #include "llapi/mc/Village.hpp" -TInstanceHook(void,"?_spawnRaidGroup@Village@@AEBA_NVVec3@@EAEAV?$unordered_set@UActorUniqueID@@U?$hash@UActorUniqueID@@@std@@U?$equal_to@UActorUniqueID@@@3@V?$allocator@UActorUniqueID@@@3@@std@@@Z", - Village, Vec3 pos, unsigned char num, std::unordered_set &actorIDs){ + +TInstanceHook(void, + "?_spawnRaidGroup@Village@@AEBA_NVVec3@@EAEAV?$unordered_set@UActorUniqueID@@U?$hash@UActorUniqueID@@@" + "std@@U?$equal_to@UActorUniqueID@@@3@V?$allocator@UActorUniqueID@@@3@@std@@@Z", + Village, Vec3 pos, unsigned char num, std::unordered_set& actorIDs) { // actorIDs其实是std::unordered_set，懒得写hash函数 - original(this,pos,num,actorIDs); + original(this, pos, num, actorIDs); IF_LISTENED(RaidMobSpawnEvent) { RaidMobSpawnEvent ev{}; ev.mVillageCenter = this->getCenter(); From 87fa1d2c7bd27f7aadd9b86384ff81b55649d46b Mon Sep 17 00:00:00 2001 From: ShrBox Date: Mon, 1 May 2023 18:40:37 +0800 Subject: [PATCH 09/11] fix: fix wrong symbol in Bedrock.hpp --- LiteLoader/include/llapi/mc/Bedrock.hpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/LiteLoader/include/llapi/mc/Bedrock.hpp b/LiteLoader/include/llapi/mc/Bedrock.hpp index 1777963575..e10e6301ae 100644 --- a/LiteLoader/include/llapi/mc/Bedrock.hpp +++ b/LiteLoader/include/llapi/mc/Bedrock.hpp @@ -207,8 +207,7 @@ MCAPI typeid_t type_id(); template <> inline typeid_t type_id() { static typeid_t id = - *(typeid_t*)dlsym_real("?id@?1???$type_id@VCommandRegistry@@PEBUActorDefinitionIdentifier@@@@" - "YA?AV?$typeid_t@VCommandRegistry@@@@XZ@4V1@A"); + *(typeid_t*)dlsym_real("??$type_id@VCommandRegistry@@PEBUActorDefinitionIdentifier@@@Bedrock@@YA?AV?$typeid_t@VCommandRegistry@@@0@XZ"); // static typeid_t id = ([]() -> typeid_t { // CommandParameterData data = // SymCall("??$mandatory@VRideCommand@@PEBUActorDefinitionIdentifier@@@commands@@YA?AVCommandParameterData@@PEQRideCommand@@PEBUActorDefinitionIdentifier@@PEBDPEQ2@_N@Z", @@ -221,7 +220,7 @@ inline typeid_t type_id inline typeid_t type_id() { static typeid_t id = *(typeid_t*)dlsym_real( - "?id@?1???$type_id@VCommandRegistry@@VCommandItem@@@@YA?AV?$typeid_t@VCommandRegistry@@@@XZ@4V1@A"); + "??$type_id@VCommandRegistry@@VCommandItem@@@Bedrock@@YA?AV?$typeid_t@VCommandRegistry@@@0@XZ"); return id; }; @@ -235,7 +234,7 @@ inline typeid_t type_id() { template <> inline typeid_t type_id() { static typeid_t id = *(typeid_t*)dlsym_real( - "?id@?1???$type_id@VCommandRegistry@@VCommandBlockName@@@@YA?AV?$typeid_t@VCommandRegistry@@@@XZ@4V1@A"); + "??$type_id@VCommandRegistry@@VCommandBlockName@@@Bedrock@@YA?AV?$typeid_t@VCommandRegistry@@@0@XZ"); return id; }; From 02d9a5e0a70e2e925870c977d8006a08c0fef462 Mon Sep 17 00:00:00 2001 From: ShrBox Date: Tue, 2 May 2023 20:24:33 +0800 Subject: [PATCH 10/11] fix: fix typo in SimpleServerLogger.cpp --- LiteLoader/src/liteloader/SimpleServerLogger.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LiteLoader/src/liteloader/SimpleServerLogger.cpp b/LiteLoader/src/liteloader/SimpleServerLogger.cpp index f5eb28fcad..3cd3272945 100644 --- a/LiteLoader/src/liteloader/SimpleServerLogger.cpp +++ b/LiteLoader/src/liteloader/SimpleServerLogger.cpp @@ -59,7 +59,7 @@ TInstanceHook(void, "?setPermissions@Player@@QEAAXW4CommandPermissionLevel@@@Z", void LogCommandRegistration(std::string const& name, char const* description, enum CommandPermissionLevel perm, short flag1, short flag2) { - static Logger logger("RegsterCommand"); + static Logger logger("RegisterCommand"); logger.consoleLevel = logger.debug.level; logger.debug("{:<18} - {:<12} - 0x{:<5x} - {}", name, magic_enum::enum_name(perm), flag1 | flag2, I18n::get(description)); } From e8081280e51f7d112d28407cce01ac14fb249c91 Mon Sep 17 00:00:00 2001 From: ShrBox Date: Tue, 2 May 2023 22:50:39 +0800 Subject: [PATCH 11/11] chore: update release note --- RELEASE_NOTES.md | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e1842ae399..e23f9e2536 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,25 +1,17 @@ -# Release 2.12.4 +# Release 2.13.0-beta.1 -![BDS 1.19.73.02](https://img.shields.io/badge/BDS-1.19.73.02-blue?style=for-the-badge) ![Protocol 575](https://img.shields.io/badge/Protocol-575-orange?style=for-the-badge) - -# Warning -![BDS 1.19.70.02](https://img.shields.io/badge/NoSupport-1.19.70.02-red?style=for-the-badge) -**SDK in this version have a great change, please use the latest `prepare_libraries.cmd` from template!** +![BDS 1.19.81.01](https://img.shields.io/badge/BDS-1.19.81.01-blue?style=for-the-badge) ![Protocol 582](https://img.shields.io/badge/Protocol-582-orange?style=for-the-badge) ## Added -- feat: add Item.maxStackSize for LLSE (#1189) (by @student_2333) -- feat: add event PlayerPullFishingHook #1201 (#1204) (by @Tsubasa6848) +feat: add 'RaidMobSpawnEvent' event (#1229) (by @Qiuzhizhe) +feat(llse): effect method of Entity(#1225) (#1236) (by @harryxi) +feat: adapt to 1.19.81 (#1237) (by @ShrBox @dreamguxiang @OEOTYAN @quizhizhe) ## Changed -- refactor(preloader): use api instead of cmd call (by @RimuruChan) -- refactor: #1200 (#1203) (by @student_2333) +refactor: add unused module.exports for BaseLib.js (#1230) (by @student_2333) ## Fixed -- fix: fix argument checking logic of clearItem (by @ShrBox) -- fix: fix Block api (by @WangYneos) -- fix: fix #1187 (by @OEOTYAN) -- fix: fix setPermLevel's issue #1194 (#1207) (by @ShrBox) -- fix: fix logger.setConsole #1188 (by @ShrBox) \ No newline at end of file +fix: fix #1232 (#1235) (by @harryxi) \ No newline at end of file