Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Commit

Permalink
Release 2.13.0-beta.1 (LiteLDev#1247)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShrBox
ShrBox authored May 2, 2023
2 parents 4341232 + e808128 commit d610ac6
Show file tree
Hide file tree
Showing 1,656 changed files with 21,865 additions and 20,114 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish_release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions LiteLoader/include/liteloader/Version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
5 changes: 3 additions & 2 deletions LiteLoader/include/llapi/DynamicCommandAPI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,8 +403,9 @@ class DynamicCommand : public Command {
}
template <ParameterType type, typename T>
CommandParameterData makeParameterData() const {
CommandParameterData param{
type == ParameterType::Enum ? typeid_t<CommandRegistry>::count++ : type_id<CommandRegistry, T>(),
CommandParameterData param {
type == ParameterType::Enum ? Bedrock::typeid_t<CommandRegistry>::_getCounter().fetch_add(1)
: Bedrock::type_id<CommandRegistry, T>(),
type == ParameterType::Enum ? &CommandRegistry::fakeParse<T> : CommandRegistry::getParseFn<T>(),
name,
getCommandParameterDataType<type>(),
Expand Down
33 changes: 33 additions & 0 deletions LiteLoader/include/llapi/EventAPI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ class BlockLegacy;
class ArmorStand;
class Objective;
struct ScoreboardId;
class Village;

/**
* @brief The event system.
Expand Down Expand Up @@ -713,6 +714,38 @@ class MobSpawnedEvent : public EventTemplate<MobSpawnedEvent> {
Vec3 mPos;
int mDimensionId = -1;
};
/**
* @brief An event that Raid mob spawn.
*
* @note This event cannot be suppressed.
*/
class RaidMobSpawnEvent : public EventTemplate<RaidMobSpawnEvent> {
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 */

Expand Down
10 changes: 5 additions & 5 deletions LiteLoader/include/llapi/RegCommandAPI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ template <typename Command, typename Type>
static CommandParameterData makeMandatory(Type Command::*field, std::string name, bool Command::*isSet = nullptr) {

return {
type_id<CommandRegistry, Type>(),
Bedrock::type_id<CommandRegistry, Type>(),
CommandRegistry::getParseFn<Type>(),
name,
CommandParameterDataType::NORMAL,
Expand All @@ -44,7 +44,7 @@ template <CommandParameterDataType DataType, typename Command, typename Type>
static CommandParameterData
makeMandatory(Type Command::*field, std::string name, char const* desc = nullptr, bool Command::*isSet = nullptr) {
return {
type_id<CommandRegistry, Type>(),
Bedrock::type_id<CommandRegistry, Type>(),
CommandRegistry::getParseFn<Type>(),
name,
DataType,
Expand All @@ -56,10 +56,10 @@ static CommandParameterData
}
template <typename Command, typename Type>
static CommandParameterData makeOptional(Type Command::*field, std::string name, bool Command::*isSet = nullptr) {
typeid_t<CommandRegistry> tpid{0};
Bedrock::typeid_t<CommandRegistry> tpid{0};

return {
type_id<CommandRegistry, Type>(),
Bedrock::type_id<CommandRegistry, Type>(),
CommandRegistry::getParseFn<Type>(),
name,
CommandParameterDataType::NORMAL,
Expand All @@ -74,7 +74,7 @@ static CommandParameterData
makeOptional(Type Command::*field, std::string name, char const* desc = nullptr, bool Command::*isSet = nullptr) {

return {
type_id<CommandRegistry, Type>(),
Bedrock::type_id<CommandRegistry, Type>(),
CommandRegistry::getParseFn<Type>(),
name,
DataType,
Expand Down
25 changes: 1 addition & 24 deletions LiteLoader/include/llapi/mc/AABBBucket.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

};
16 changes: 0 additions & 16 deletions LiteLoader/include/llapi/mc/Abilities.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,6 @@ class Abilities {
* @symbol ?forEachAbility\@Abilities\@\@QEBAXAEBV?$function\@$$A6AXAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z\@std\@\@W4Options\@Ability\@\@\@Z
*/
MCAPI void forEachAbility(class std::function<void (class Ability const &, enum class AbilitiesIndex)> 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
*/
Expand All @@ -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
*/
Expand Down
8 changes: 4 additions & 4 deletions LiteLoader/include/llapi/mc/Ability.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
2 changes: 1 addition & 1 deletion LiteLoader/include/llapi/mc/AbilityCommand.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions LiteLoader/include/llapi/mc/AbsorptionMobEffect.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

};
94 changes: 33 additions & 61 deletions LiteLoader/include/llapi/mc/AbstractCandleBlock.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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<void (class Vec3 const &, int)>) 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
Expand Down Expand Up @@ -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:

Expand Down
8 changes: 8 additions & 0 deletions LiteLoader/include/llapi/mc/AcaciaTreeCanopy.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,12 @@ class AcaciaTreeCanopy {
*/
virtual class std::optional<class BlockPos> placeCanopy(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &, struct TreeHelper::TreeParams const &, std::vector<class BlockPos> 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<class Block const *>, struct TreeHelper::TreeParams const &) const;

private:

};
Loading

0 comments on commit d610ac6

Please sign in to comment.