qiuzhi/LiteLoaderBDS-1.16.40
1
0
Fork 0
mirror of https://github.com/quizhizhe/LiteLoaderBDS-1.16.40.git synced 2025-06-06 04:03:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

至少不报错了，因函数实现未找到无法编译

Browse Source
This commit is contained in:
Qiuzhizhe 2022-09-30 09:30:15 +08:00
parent 861cccdf7e
commit 7ee5dfd7b5
No known key found for this signature in database
GPG Key ID: 4EF4BF5521540263
36 changed files with 2093 additions and 1887 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LiteLoader/Header/MC/Actor.hpp
View File

@ -32,7 +32,7 @@ public:
LIAPI std::string getTypeName() const; LIAPI std::string getTypeName() const;
LIAPI Vec3 getFeetPosition() const; LIAPI Vec3 getFeetPosition() const;
//LIAPI BlockSource* getBlockSource() const; LIAPI BlockSource* getBlockSource() const;
LIAPI Vec2* getDirection() const; LIAPI Vec2* getDirection() const;
LIAPI ActorUniqueID getActorUniqueId() const; LIAPI ActorUniqueID getActorUniqueId() const;
LIAPI Vec3 getCameraPos() const; LIAPI Vec3 getCameraPos() const;
@ -79,6 +79,10 @@ public:
inline bool isMoving() const{ inline bool isMoving() const{
return getStatusFlag(ActorFlags::MOVING); return getStatusFlag(ActorFlags::MOVING);
}; };
inline bool hasCategory(enum ActorCategory actorCategory) const{
// IDA Player::take Line123
return (dAccess<ActorCategory>(this, 79) & actorCategory) !=0;
};
#undef AFTER_EXTRA #undef AFTER_EXTRA
#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTOR #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTOR

2
LiteLoader/Header/MC/ActorDefinitionIdentifier.hpp
View File

@ -4,7 +4,7 @@
#include "../Global.h" #include "../Global.h"
#define BEFORE_EXTRA #define BEFORE_EXTRA
#include "MC/HashedString.hpp"
#undef BEFORE_EXTRA #undef BEFORE_EXTRA
struct ActorDefinitionIdentifier { struct ActorDefinitionIdentifier {

84
LiteLoader/Header/MC/Bedrock.hpp
View File

@ -10,7 +10,23 @@
namespace Bedrock { namespace Bedrock {
#define AFTER_EXTRA #define AFTER_EXTRA
// Add Member There
struct PlatformRuntimeInfo {
PlatformRuntimeInfo() = delete;
PlatformRuntimeInfo(PlatformRuntimeInfo const&) = delete;
PlatformRuntimeInfo(PlatformRuntimeInfo const&&) = delete;
};
class CrashTelemetryProcessor {
public:
CrashTelemetryProcessor() = delete;
CrashTelemetryProcessor(CrashTelemetryProcessor const&) = delete;
CrashTelemetryProcessor(CrashTelemetryProcessor const&&) = delete;
};
struct CrashUploadStatus {
CrashUploadStatus() = delete;
CrashUploadStatus(CrashUploadStatus const&) = delete;
CrashUploadStatus(CrashUploadStatus const&&) = delete;
};
template <typename T0> template <typename T0>
class NonOwnerPointer { class NonOwnerPointer {
public: public:
@ -19,7 +35,71 @@ public:
NonOwnerPointer(T0& a1) { NonOwnerPointer(T0& a1) {
mPtr = std::make_shared<T0>(a1); mPtr = std::make_shared<T0>(a1);
} }
};
struct StorageMigration {
enum StorageMigrationType;
StorageMigration() = delete;
StorageMigration(StorageMigration const&) = delete;
StorageMigration(StorageMigration const&&) = delete;
};
namespace PubSub {
class Subscription {
public:
Subscription() = delete;
Subscription(Subscription const&) = delete;
Subscription(Subscription const&&) = delete;
};
} // namespace PubSub
namespace Threading {
enum AsyncStatus;
template <typename T0>
class UniqueLock;
class CountReference
{
public:
CountReference() = delete;
CountReference(CountReference const&) = delete;
CountReference(CountReference const&&) = delete;
};
template <typename T0>
class IAsyncResult {
public:
IAsyncResult() = delete;
IAsyncResult(IAsyncResult const&) = delete;
IAsyncResult(IAsyncResult const&&) = delete;
};
template <typename T0, typename T1>
class ThreadLocalObject {
public:
ThreadLocalObject() = delete;
ThreadLocalObject(ThreadLocalObject const&) = delete;
ThreadLocalObject(ThreadLocalObject const&&) = delete;
};
//template <typename T>
//class LockGuard
//{
// MCAPI LockGuard(T);
// MCAPI ~LockGuard();
//};
} // namespace Threading
class ScopeExit;
class Http {
public:
enum Implementation;
};
class SessionInfo
{
public:
SessionInfo() = delete;
SessionInfo(SessionInfo const&) = delete;
SessionInfo(SessionInfo const&&) = delete;
}; };
#undef AFTER_EXTRA #undef AFTER_EXTRA

19
LiteLoader/Header/MC/BedrockLog.hpp
View File

@ -5,13 +5,28 @@
#include "Core.hpp" #include "Core.hpp"
#define BEFORE_EXTRA #define BEFORE_EXTRA
// Include Headers or Declare Types Here
enum LogAreaID;
#undef BEFORE_EXTRA #undef BEFORE_EXTRA
namespace BedrockLog { namespace BedrockLog {
#define AFTER_EXTRA #define AFTER_EXTRA
// Add Member There
class LogAreaFilter {
public:
LogAreaFilter() = delete;
LogAreaFilter(LogAreaFilter const&) = delete;
LogAreaFilter(LogAreaFilter const&&) = delete;
};
enum LogChannel;
enum LogRule;
enum LogCategory;
struct LogDetails {
LogDetails() = delete;
LogDetails(LogDetails const&) = delete;
LogDetails(LogDetails const&&) = delete;
};
#undef AFTER_EXTRA #undef AFTER_EXTRA
MCAPI enum LogAreaID _areaFilterFromString(std::string const &); MCAPI enum LogAreaID _areaFilterFromString(std::string const &);
MCAPI bool _constructAreaFilterFromString(std::string const &, class BedrockLog::LogAreaFilter &); MCAPI bool _constructAreaFilterFromString(std::string const &, class BedrockLog::LogAreaFilter &);

11
LiteLoader/Header/MC/BlockSource.hpp
View File

@ -8,7 +8,8 @@
#include "Dimension.hpp" #include "Dimension.hpp"
#undef BEFORE_EXTRA #undef BEFORE_EXTRA
#include "MC/LevelChunk.hpp"
#include "MC/ChunkPos.hpp"
class BlockSource { class BlockSource {
#define AFTER_EXTRA #define AFTER_EXTRA
@ -20,11 +21,15 @@ public:
// MCAPI static const std::function<bool(class Block const&)> CHECK_ALL_BLOCKS; // MCAPI static const std::function<bool(class Block const&)> CHECK_ALL_BLOCKS;
// }; // };
LIAPI BlockInstance getBlockInstance(BlockPos); LIAPI BlockInstance getBlockInstance(BlockPos);
inline AutomaticID<Dimension, int> getDimensionId(){ AutomaticID<class Dimension, int> getDimensionId(){
//Dimension::onBlockEvent Line24 //Dimension::onBlockEvent Line24
Dimension* mDimension = dAccess< Dimension*>(this, 4); Dimension* mDimension = dAccess< Dimension*>(this, 4);
return dAccess<AutomaticID<Dimension, int>>(mDimension, 192); return dAccess<AutomaticID<class Dimension, int>>(mDimension, 192);
}; };
LevelChunk * getChunkAt(BlockPos& pos) const{
ChunkPos chunkPos = ChunkPos(pos.x>>4, pos.z>>4);
return getChunk(chunkPos);
}
#undef AFTER_EXTRA #undef AFTER_EXTRA
#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKSOURCE #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKSOURCE

10
LiteLoader/Header/MC/ChunkPos.hpp
View File

@ -10,7 +10,15 @@
class ChunkPos { class ChunkPos {
#define AFTER_EXTRA #define AFTER_EXTRA
// Add Member There
public:
int x, z;
long long hash() {
return *((long long*)this);
}
ChunkPos(int ix, int iz)
: x(ix)
, z(iz){};
#undef AFTER_EXTRA #undef AFTER_EXTRA
#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CHUNKPOS #ifndef DISABLE_CONSTRUCTOR_PREVENTION_CHUNKPOS
public: public:

6
LiteLoader/Header/MC/ColorFormat.hpp
View File

@ -4,7 +4,7 @@
#include "../Global.h" #include "../Global.h"
#define BEFORE_EXTRA #define BEFORE_EXTRA
using namespace mce;
#undef BEFORE_EXTRA #undef BEFORE_EXTRA
namespace ColorFormat { namespace ColorFormat {
@ -45,8 +45,8 @@ LIAPI std::string& transferColorCodeToConsole(std::string& str, bool keepColorCo
MCAPI extern std::string const BLACK; MCAPI extern std::string const BLACK;
MCAPI extern std::string const BLUE; MCAPI extern std::string const BLUE;
MCAPI extern std::string const BOLD; MCAPI extern std::string const BOLD;
MCAPI std::string ColorCodeFromColor(class mce::Color const &); MCAPI std::string ColorCodeFromColor(class Color const &);
MCAPI class mce::Color const * ColorFromColorCode(std::string const &); MCAPI class Color const * ColorFromColorCode(std::string const &);
MCAPI extern std::string const DARK_AQUA; MCAPI extern std::string const DARK_AQUA;
MCAPI extern std::string const DARK_BLUE; MCAPI extern std::string const DARK_BLUE;
MCAPI extern std::string const DARK_GRAY; MCAPI extern std::string const DARK_GRAY;

30
LiteLoader/Header/MC/CommandRegistry.hpp
View File

@ -4,13 +4,41 @@
#include "../Global.h" #include "../Global.h"
#define BEFORE_EXTRA #define BEFORE_EXTRA
template <typename T>
class typeid_t {
public:
typeid_t& operator=(typeid_t const&) = delete;
typeid_t(typeid_t const&) = delete;
};
#undef BEFORE_EXTRA #undef BEFORE_EXTRA
class CommandRegistry { class CommandRegistry {
#define AFTER_EXTRA #define AFTER_EXTRA
public:
struct ParseTable;
class Symbol {
Symbol& operator=(Symbol const&) = delete;
Symbol(Symbol const&) = delete;
};
struct ParseToken {
ParseToken() = delete;
ParseToken(ParseToken const&) = delete;
ParseToken(ParseToken const&&) = delete;
};
struct Overload {
Overload() = delete;
Overload(Overload const&) = delete;
Overload(Overload const&&) = delete;
};
struct Signature {
Signature() = delete;
Signature(Signature const&) = delete;
Signature(Signature const&&) = delete;
};
#undef AFTER_EXTRA #undef AFTER_EXTRA
#ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMMANDREGISTRY #ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMMANDREGISTRY
public: public:

11
LiteLoader/Header/MC/DBStorage.hpp
View File

@ -8,13 +8,20 @@
#include "LevelStorage.hpp" #include "LevelStorage.hpp"
#define BEFORE_EXTRA #define BEFORE_EXTRA
// Include Headers or Declare Types Here
#include "third-party/leveldb/status.h"
#undef BEFORE_EXTRA #undef BEFORE_EXTRA
class DBStorage : public LevelStorage { class DBStorage : public LevelStorage {
#define AFTER_EXTRA #define AFTER_EXTRA
// Add Member There
public:
struct PendingWriteResult {
PendingWriteResult() = delete;
PendingWriteResult(PendingWriteResult const&) = delete;
PendingWriteResult(PendingWriteResult const&&) = delete;
};
#undef AFTER_EXTRA #undef AFTER_EXTRA
#ifndef DISABLE_CONSTRUCTOR_PREVENTION_DBSTORAGE #ifndef DISABLE_CONSTRUCTOR_PREVENTION_DBSTORAGE
public: public:

6
LiteLoader/Header/MC/Dimension.hpp
View File

@ -4,15 +4,15 @@
#include "../Global.h" #include "../Global.h"
#define BEFORE_EXTRA #define BEFORE_EXTRA
#include "MC/BlockSource.hpp"
#undef BEFORE_EXTRA #undef BEFORE_EXTRA
class Dimension { class Dimension {
#define AFTER_EXTRA #define AFTER_EXTRA
public: public:
LIAPI BlockSource& getBlockSourceFromMainChunkSource(){ BlockSource& getBlockSourceFromMainChunkSource() const{
return dAccess<BlockSource&>(this, 96); return *dAccess<BlockSource*>(this, 96);
}; };
#undef AFTER_EXTRA #undef AFTER_EXTRA
#ifndef DISABLE_CONSTRUCTOR_PREVENTION_DIMENSION #ifndef DISABLE_CONSTRUCTOR_PREVENTION_DIMENSION

30
LiteLoader/Header/MC/Level.hpp
View File

@ -120,25 +120,25 @@ public:
} }
}; };
LIAPI static bool executeCommandAs(Player* player, const string& cmd); // LIAPI static bool executeCommandAs(Player* player, const string& cmd);
LIAPI static std::pair<bool, string> executeCommandEx(const string& cmd); // LIAPI static std::pair<bool, string> executeCommandEx(const string& cmd);
LIAPI static bool executeCommand(const string& cmd); // LIAPI static bool executeCommand(const string& cmd);
//For compatibility //For compatibility
LIAPI static bool runcmdAs(Player* pl, const string& cmd) // LIAPI static bool runcmdAs(Player* pl, const string& cmd)
{ // {
return executeCommandAs(pl, cmd); // return executeCommandAs(pl, cmd);
} // }
LIAPI static std::pair<bool, string> runcmdEx(const string& cmd) // LIAPI static std::pair<bool, string> runcmdEx(const string& cmd)
{ // {
return executeCommandEx(cmd); // return executeCommandEx(cmd);
} // }
LIAPI static bool runcmd(const string& cmd) // LIAPI static bool runcmd(const string& cmd)
{ // {
return executeCommand(cmd); // return executeCommand(cmd);
} // }
#undef AFTER_EXTRA #undef AFTER_EXTRA
#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEVEL #ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEVEL

5
LiteLoader/Header/MC/LevelChunk.hpp
View File

@ -39,6 +39,11 @@ struct HardcodedSpawningArea {
class BoundingBox aabb; class BoundingBox aabb;
enum HardcodedSpawnAreaType type; enum HardcodedSpawnAreaType type;
}; };
public:
struct Tick const & getLastTick() const{
//CommandAreaFactory::_getArea Line156
return *dAccess<Tick*>(this, 144);
};
#undef AFTER_EXTRA #undef AFTER_EXTRA
#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEVELCHUNK #ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEVELCHUNK
public: public:

8
LiteLoader/Header/MC/LevelStorageWriteBatch.hpp
View File

@ -10,7 +10,13 @@
class LevelStorageWriteBatch { class LevelStorageWriteBatch {
#define AFTER_EXTRA #define AFTER_EXTRA
// Add Member There
public:
struct BatchEntry {
BatchEntry() = delete;
BatchEntry(BatchEntry const&) = delete;
BatchEntry(BatchEntry const&&) = delete;
};
#undef AFTER_EXTRA #undef AFTER_EXTRA
#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEVELSTORAGEWRITEBATCH #ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEVELSTORAGEWRITEBATCH
public: public:

8
LiteLoader/Header/MC/MapItemTrackedActor.hpp
View File

@ -10,7 +10,13 @@
class MapItemTrackedActor { class MapItemTrackedActor {
#define AFTER_EXTRA #define AFTER_EXTRA
// Add Member There
public:
struct UniqueId {
UniqueId() = delete;
UniqueId(UniqueId const&) = delete;
UniqueId(UniqueId const&&) = delete;
};
#undef AFTER_EXTRA #undef AFTER_EXTRA
#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MAPITEMTRACKEDACTOR #ifndef DISABLE_CONSTRUCTOR_PREVENTION_MAPITEMTRACKEDACTOR
public: public:

34
LiteLoader/Header/MC/NetworkPeer.hpp
View File

@ -10,7 +10,41 @@
class NetworkPeer { class NetworkPeer {
#define AFTER_EXTRA #define AFTER_EXTRA
// Add Member There
public:
enum Reliability : int {
Reliable = 0x0,
ReliableOrdered = 0x1,
Unreliable = 0x2,
UnreliableSequenced = 0x3,
};
enum DataStatus : int {
HasData = 0x0,
NoData = 0x1,
BrokenData = 0x2,
};
enum NetworkLoad : __int32 {
Unrestricted = 0x0,
Low = 0x1,
Medium = 0x2,
High = 0x3,
};
struct NetworkStatus {
NetworkLoad mLoad;
int mCurrentPing;
int mAveragePing;
int mApproximateMaxBps;
float mCurrentPacketLoss;
float mAveragePacketLoss;
unsigned __int64 mTotalBytesReceived;
unsigned __int64 mTotalBytesSent;
unsigned __int64 unk40;
int unk48;
bool unk52;
};
#undef AFTER_EXTRA #undef AFTER_EXTRA
#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETWORKPEER #ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETWORKPEER
public: public:

6
LiteLoader/Header/MC/PlayerActionPacket.hpp
View File

@ -46,9 +46,9 @@ class PlayerActionPacket : public Packet {
// Add Member There // Add Member There
public: public:
BlockPos position; // 48 BlockPos position; // 48
FaceID blockFace; // 72 FaceID blockFace; // 60
PlayerActionType actionType; // 76 PlayerActionType actionType; // 64
ActorRuntimeID runtimeID; // 80 ActorRuntimeID runtimeID; // 72
inline std::string toDebugString() { inline std::string toDebugString() {
return fmt::format("{}: position: ({}), blockFace: {}, actionType: {}, runtimeID: {}", return fmt::format("{}: position: ({}), blockFace: {}, actionType: {}, runtimeID: {}",

6
LiteLoader/Header/MC/PropertiesSettings.hpp
View File

@ -10,7 +10,11 @@
class PropertiesSettings { class PropertiesSettings {
#define AFTER_EXTRA #define AFTER_EXTRA
public:
inline bool useOnlineAuthentication(){
//PropertiesSettings::PropertiesSettings Line550;
return dAccess<bool>(this, 417);
}
#undef AFTER_EXTRA #undef AFTER_EXTRA
#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PROPERTIESSETTINGS #ifndef DISABLE_CONSTRUCTOR_PREVENTION_PROPERTIESSETTINGS
public: public:

2
LiteLoader/Header/MC/RakNet.hpp
View File

@ -25,7 +25,7 @@ namespace RakNet {
struct SystemAddress { struct SystemAddress {
char filler[17 * 8]; // uncertain? char filler[17 * 8]; // uncertain?
MCAPI const char* ToString(bool, char) const; MCAPI void ToString_New(bool, char, char*);
}; };
struct RakNetGUID { struct RakNetGUID {
uint64_t unk; uint64_t unk;

6
LiteLoader/Header/MC/RakPeerHelper.hpp
View File

@ -11,6 +11,12 @@
class RakPeerHelper { class RakPeerHelper {
#define AFTER_EXTRA #define AFTER_EXTRA
public:
struct IPSupportInterface{
IPSupportInterface() = delete;
IPSupportInterface(struct IPSupportInterface&) = delete;
IPSupportInterface(struct IPSupportInterface&&) = delete;
};
#undef AFTER_EXTRA #undef AFTER_EXTRA
#ifndef DISABLE_CONSTRUCTOR_PREVENTION_RAKPEERHELPER #ifndef DISABLE_CONSTRUCTOR_PREVENTION_RAKPEERHELPER

6
LiteLoader/Header/MC/VarIntDataOutput.hpp
View File

@ -10,7 +10,11 @@
class VarIntDataOutput { class VarIntDataOutput {
#define AFTER_EXTRA #define AFTER_EXTRA
BinaryStream *mStream;
public:
VarIntDataOutput(BinaryStream *stream){
mStream = stream;
};
#undef AFTER_EXTRA #undef AFTER_EXTRA
#ifndef DISABLE_CONSTRUCTOR_PREVENTION_VARINTDATAOUTPUT #ifndef DISABLE_CONSTRUCTOR_PREVENTION_VARINTDATAOUTPUT
public: public:

174
LiteLoader/Header/RegCommandAPI.h
View File

@ -1,87 +1,87 @@
#pragma once //#pragma once
#include "Global.h" //#include "Global.h"
#include "MC/Actor.hpp" //#include "MC/Actor.hpp"
#include "MC/Player.hpp" //#include "MC/Player.hpp"
#include "MC/Command.hpp" //#include "MC/Command.hpp"
#include "MC/CommandMessage.hpp" //#include "MC/CommandMessage.hpp"
#include "MC/CommandOutput.hpp" //#include "MC/CommandOutput.hpp"
#include "MC/CommandParameterData.hpp" //#include "MC/CommandParameterData.hpp"
#include "MC/CommandPosition.hpp" //#include "MC/CommandPosition.hpp"
#include "MC/CommandSelector.hpp" //#include "MC/CommandSelector.hpp"
#include "MC/CommandRegistry.hpp" //#include "MC/CommandRegistry.hpp"
#include <tuple> //#include <tuple>
//
namespace RegisterCommandHelper { //namespace RegisterCommandHelper {
template <typename Command, typename Type> //template <typename Command, typename Type>
static int getOffset(Type Command::*src) { //static int getOffset(Type Command::*src) {
union { // union {
Type Command::*src; // Type Command::*src;
int value; // int value;
} u; // } u;
u.src = src; // u.src = src;
return u.value; // return u.value;
} //}
//
using ParseFn = bool (CommandRegistry::*)( //using ParseFn = bool (CommandRegistry::*)(
void*, CommandRegistry::ParseToken const&, CommandOrigin const&, int, std::string&, // void*, CommandRegistry::ParseToken const&, CommandOrigin const&, int, std::string&,
std::vector<std::string>&) const; // std::vector<std::string>&) const;
//
template <typename Command, typename Type> //template <typename Command, typename Type>
static CommandParameterData makeMandatory(Type Command::*field, std::string name, bool Command::*isSet = nullptr) { //static CommandParameterData makeMandatory(Type Command::*field, std::string name, bool Command::*isSet = nullptr) {
//
return { // return {
type_id<CommandRegistry, Type>(), // type_id<CommandRegistry, Type>(),
CommandRegistry::getParseFn<Type>(), // CommandRegistry::getParseFn<Type>(),
name, // name,
CommandParameterDataType::NORMAL, // CommandParameterDataType::NORMAL,
nullptr, // nullptr,
getOffset(field), // getOffset(field),
false, // false,
isSet ? getOffset(isSet) : -1, // isSet ? getOffset(isSet) : -1,
}; // };
} //}
template <CommandParameterDataType DataType, typename Command, typename Type> //template <CommandParameterDataType DataType, typename Command, typename Type>
static CommandParameterData //static CommandParameterData
makeMandatory(Type Command::*field, std::string name, char const* desc = nullptr, bool Command::*isSet = nullptr) { // makeMandatory(Type Command::*field, std::string name, char const* desc = nullptr, bool Command::*isSet = nullptr) {
return { // return {
type_id<CommandRegistry, Type>(), // type_id<CommandRegistry, Type>(),
CommandRegistry::getParseFn<Type>(), // CommandRegistry::getParseFn<Type>(),
name, // name,
DataType, // DataType,
desc, // desc,
getOffset(field), // getOffset(field),
false, // false,
isSet ? getOffset(isSet) : -1, // isSet ? getOffset(isSet) : -1,
}; // };
} //}
template <typename Command, typename Type> //template <typename Command, typename Type>
static CommandParameterData makeOptional(Type Command::*field, std::string name, bool Command::*isSet = nullptr) { //static CommandParameterData makeOptional(Type Command::*field, std::string name, bool Command::*isSet = nullptr) {
typeid_t<CommandRegistry> tpid{0}; // typeid_t<CommandRegistry> tpid{0};
//
return { // return {
type_id<CommandRegistry, Type>(), // type_id<CommandRegistry, Type>(),
CommandRegistry::getParseFn<Type>(), // CommandRegistry::getParseFn<Type>(),
name, // name,
CommandParameterDataType::NORMAL, // CommandParameterDataType::NORMAL,
nullptr, // nullptr,
getOffset(field), // getOffset(field),
true, // true,
isSet ? getOffset(isSet) : -1, // isSet ? getOffset(isSet) : -1,
}; // };
} //}
template <CommandParameterDataType DataType, typename Command, typename Type> //template <CommandParameterDataType DataType, typename Command, typename Type>
static CommandParameterData //static CommandParameterData
makeOptional(Type Command::*field, std::string name, char const* desc = nullptr, bool Command::*isSet = nullptr) { // makeOptional(Type Command::*field, std::string name, char const* desc = nullptr, bool Command::*isSet = nullptr) {
//
return { // return {
type_id<CommandRegistry, Type>(), // type_id<CommandRegistry, Type>(),
CommandRegistry::getParseFn<Type>(), // CommandRegistry::getParseFn<Type>(),
name, // name,
DataType, // DataType,
desc, // desc,
getOffset(field), // getOffset(field),
true, // true,
isSet ? getOffset(isSet) : -1, // isSet ? getOffset(isSet) : -1,
}; // };
} //}
} // namespace RegisterCommandHelper //} // namespace RegisterCommandHelper

32
LiteLoader/Kernel/MC/ActorAPI.cpp
View File

@ -37,9 +37,9 @@ MCINLINE Vec3 Actor::getFeetPosition() const {
return CommandUtils::getFeetPos(this); return CommandUtils::getFeetPos(this);
} }
// BlockSource* Actor::getBlockSource() const { BlockSource* Actor::getBlockSource() const {
// return Level::getBlockSource((Actor*)this); return Level::getBlockSource((Actor*)this);
// } }
bool Actor::isPlayer(bool allowSimulatedPlayer) const { bool Actor::isPlayer(bool allowSimulatedPlayer) const {
if (!this) if (!this)
@ -51,9 +51,9 @@ bool Actor::isPlayer(bool allowSimulatedPlayer) const {
} catch (...) { return false; } } catch (...) { return false; }
} }
// bool Actor::isItemActor() const { bool Actor::isItemActor() const {
// return hasCategory((ActorCategory)1024); // IDA Player::take return hasCategory((ActorCategory)1024); // IDA Player::take
// } }
bool Actor::isOnGround() const { bool Actor::isOnGround() const {
return (dAccess<bool, 472>(this)); // IDA DirectActorProxyImpl<IMobMovementProxy>::isOnGround return (dAccess<bool, 472>(this)); // IDA DirectActorProxyImpl<IMobMovementProxy>::isOnGround
@ -169,16 +169,16 @@ Vec3 Actor::getCameraPos() const {
return pos; return pos;
} }
// Tick* Actor::getLastTick() const { Tick* Actor::getLastTick() const {
// auto bs = getBlockSource(); auto bs = getBlockSource();
// if (!bs) if (!bs)
// return nullptr; return nullptr;
// auto bpos = getPos().toBlockPos(); auto bpos = getPos().toBlockPos();
// LevelChunk* lc = bs->getChunkAt(bpos); LevelChunk* lc = bs->getChunkAt(bpos);
// if (!lc) if (!lc)
// return nullptr; return nullptr;
// return (Tick*)&lc->getLastTick(); return (Tick*)&lc->getLastTick();
// } }
//enum ActorLocation; //enum ActorLocation;
// BlockInstance Actor::getBlockFromViewVector(FaceID& face, bool includeLiquid, bool solidOnly, float maxDistance, bool ignoreBorderBlocks, bool fullOnly) const { // BlockInstance Actor::getBlockFromViewVector(FaceID& face, bool includeLiquid, bool solidOnly, float maxDistance, bool ignoreBorderBlocks, bool fullOnly) const {

3
LiteLoader/Kernel/MC/NetworkIdentifierAPI.cpp
View File

@ -2,6 +2,7 @@
#include <MC/RakNet.hpp> #include <MC/RakNet.hpp>
string NetworkIdentifier::getIP() { string NetworkIdentifier::getIP() {
string rv = Global<RakNet::RakPeer>->getAdr(*this).ToString(true, ':'); string rv;
Global<RakNet::RakPeer>->getAdr(*this).ToString_New(true, ':', rv.data());
return rv.substr(0, rv.find('|')); return rv.substr(0, rv.find('|'));
} }

10
LiteLoader/Kernel/Network/BinaryStreamAPI.cpp
View File

@ -71,15 +71,9 @@ std::string& BinaryStream::getRaw() {
return *dAccess<std::string*, 15>(this); // BinaryStream::getAndReleaseData return *dAccess<std::string*, 15>(this); // BinaryStream::getAndReleaseData
} }
struct IDataOutput{
void* pVT;
BinaryStream* pBinaryStream;
};
void BinaryStream::writeCompoundTag(class CompoundTag const& tag) { void BinaryStream::writeCompoundTag(class CompoundTag const& tag) {
//serialize<DataItem>::write in case 5 //serialize<DataItem>::write in case 5
IDataOutput pVTVarIntDataOutput; VarIntDataOutput pVTVarIntDataOutput = VarIntDataOutput(this);
pVTVarIntDataOutput.pVT = dlsym("??_7VarIntDataOutput@@6B@"); NbtIo::write(&tag,(IDataOutput&)pVTVarIntDataOutput);
pVTVarIntDataOutput.pBinaryStream = this;
NbtIo::write(&tag,pVTVarIntDataOutput);
} }

2
LiteLoader/Kernel/Network/PacketAPI.cpp
View File

@ -845,7 +845,7 @@ static_assert(sizeof(MobArmorEquipmentPacket) == 0x198 || sizeof(MobArmorEquipme
static_assert(sizeof(InteractPacket) == 0x50 || sizeof(InteractPacket) == 48, "size of InteractPacket should be 80 or 48(default)"); static_assert(sizeof(InteractPacket) == 0x50 || sizeof(InteractPacket) == 48, "size of InteractPacket should be 80 or 48(default)");
static_assert(sizeof(BlockPickRequestPacket) == 0x40 || sizeof(BlockPickRequestPacket) == 48, "size of BlockPickRequestPacket should be 64 or 48(default)"); static_assert(sizeof(BlockPickRequestPacket) == 0x40 || sizeof(BlockPickRequestPacket) == 48, "size of BlockPickRequestPacket should be 64 or 48(default)");
static_assert(sizeof(ActorPickRequestPacket) == 0x40 || sizeof(ActorPickRequestPacket) == 48, "size of ActorPickRequestPacket should be 64 or 48(default)"); static_assert(sizeof(ActorPickRequestPacket) == 0x40 || sizeof(ActorPickRequestPacket) == 48, "size of ActorPickRequestPacket should be 64 or 48(default)");
static_assert(sizeof(PlayerActionPacket) == 0x58 || sizeof(PlayerActionPacket) == 48, "size of PlayerActionPacket should be 88 or 48(default)"); static_assert(sizeof(PlayerActionPacket) == 0x50 || sizeof(PlayerActionPacket) == 48, "size of PlayerActionPacket should be 88 or 48(default)");
static_assert(sizeof(HurtArmorPacket) == 0x40 || sizeof(HurtArmorPacket) == 48, "size of HurtArmorPacket should be 64 or 48(default)"); static_assert(sizeof(HurtArmorPacket) == 0x40 || sizeof(HurtArmorPacket) == 48, "size of HurtArmorPacket should be 64 or 48(default)");
static_assert(sizeof(SetActorDataPacket) == 0x58 || sizeof(SetActorDataPacket) == 48, "size of SetActorDataPacket should be 88 or 48(default)"); static_assert(sizeof(SetActorDataPacket) == 0x58 || sizeof(SetActorDataPacket) == 48, "size of SetActorDataPacket should be 88 or 48(default)");
static_assert(sizeof(SetActorMotionPacket) == 0x48 || sizeof(SetActorMotionPacket) == 48, "size of SetActorMotionPacket should be 72 or 48(default)"); static_assert(sizeof(SetActorMotionPacket) == 0x48 || sizeof(SetActorMotionPacket) == 48, "size of SetActorMotionPacket should be 72 or 48(default)");

16
LiteLoader/Kernel/ParticleAPI.cpp
View File

@ -9,11 +9,11 @@
#include <MC/ResourcePackStack.hpp> #include <MC/ResourcePackStack.hpp>
#include <EventAPI.h> #include <EventAPI.h>
#include <MC/ResourcePackRepository.hpp> #include <MC/ResourcePackRepository.hpp>
void InitParticle() { //void InitParticle() {
Event::ResourcePackInitEvent::subscribe([](const Event::ResourcePackInitEvent& ev) { // Event::ResourcePackInitEvent::subscribe([](const Event::ResourcePackInitEvent& ev) {
ev.mRepo->setCustomResourcePackPath(PackType::PackType_Resources, R"(plugins/LiteLoader/ResourcePacks)"); // ev.mRepo->setCustomResourcePackPath(PackType::PackType_Resources, R"(plugins/LiteLoader/ResourcePacks)");
return true; // return true;
}); // });
} //}
//
ParticleAPI ParticleCUI::api{}; //ParticleAPI ParticleCUI::api{};

2
LiteLoader/Kernel/PlayerInfoAPI.cpp
View File

@ -148,7 +148,7 @@ bool InitPlayerDatabase() {
// return true; // return true;
// }); // });
Event::PlayerJoinEvent::subscribe([](const Event::PlayerJoinEvent& e) { Event::PlayerJoinEvent::subscribe([](const Event::PlayerJoinEvent& e) {
if (!e.mPlayer->isSimulatedPlayer()) { if (!e.mPlayer) {
insert(e.mPlayer->getRealName(), e.mPlayer->getXuid(), e.mPlayer->getUuid()); insert(e.mPlayer->getRealName(), e.mPlayer->getXuid(), e.mPlayer->getUuid());
} }
return true; return true;

2
LiteLoader/Kernel/Scoreboard/ObjectiveAPI.cpp
View File

@ -28,5 +28,5 @@ bool Objective::setDisplay(const std::string& slotName, ObjectiveSortOrder sort)
std::string Objective::getName(){ std::string Objective::getName(){
//ScoreboardCommand::applyPlayerOperation Line186 //ScoreboardCommand::applyPlayerOperation Line186
return dAccess<std::string&>(this, 64); return dAccess<std::string>(this, 64);
}; };

1354
LiteLoader/Main/AddonsHelper.cpp
View File

File diff suppressed because it is too large Load Diff

852
LiteLoader/Main/BuiltinBugFix.cpp
View File

@ -1,426 +1,426 @@
#include <unordered_map> //#include <unordered_map>
//
#include <Main/Config.h> //#include <Main/Config.h>
#include <Main/LiteLoader.h> //#include <Main/LiteLoader.h>
#include <HookAPI.h> //#include <HookAPI.h>
#include <LoggerAPI.h> //#include <LoggerAPI.h>
//
#include <MC/InventoryTransactionPacket.hpp> //#include <MC/InventoryTransactionPacket.hpp>
#include <MC/NetworkIdentifier.hpp> //#include <MC/NetworkIdentifier.hpp>
#include <MC/Player.hpp> //#include <MC/Player.hpp>
#include <MC/ServerPlayer.hpp> //#include <MC/ServerPlayer.hpp>
#include <MC/ServerNetworkHandler.hpp> //#include <MC/ServerNetworkHandler.hpp>
#include <MC/ClientCacheBlobStatusPacket.hpp> //#include <MC/ClientCacheBlobStatusPacket.hpp>
#include <MC/BinaryStream.hpp> //#include <MC/BinaryStream.hpp>
#include <EventAPI.h> //#include <EventAPI.h>
//
#include <MC/SharedConstants.hpp> //#include <MC/SharedConstants.hpp>
#include <MC/PropertiesSettings.hpp> //#include <MC/PropertiesSettings.hpp>
#include <MC/ServerPlayer.hpp> //#include <MC/ServerPlayer.hpp>
#include <ScheduleAPI.h> //#include <ScheduleAPI.h>
//
using namespace LL; //using namespace LL;
//
// Fix bug //// Fix bug
TClasslessInstanceHook(bool, "?_read@ClientCacheBlobStatusPacket@@EEAA?AW4StreamReadResult@@AEAVReadOnlyBinaryStream@@@Z", //TClasslessInstanceHook(bool, "?_read@ClientCacheBlobStatusPacket@@EEAA?AW4StreamReadResult@@AEAVReadOnlyBinaryStream@@@Z",
ReadOnlyBinaryStream* a2) { // ReadOnlyBinaryStream* a2) {
ReadOnlyBinaryStream pkt(a2->getData(), false); // ReadOnlyBinaryStream pkt(a2->getData(), false);
pkt.getUnsignedVarInt(); // pkt.getUnsignedVarInt();
if (pkt.getUnsignedVarInt() >= 0xfff) // if (pkt.getUnsignedVarInt() >= 0xfff)
return false; // return false;
if (pkt.getUnsignedVarInt() >= 0xfff) // if (pkt.getUnsignedVarInt() >= 0xfff)
return false; // return false;
return original(this, a2); // return original(this, a2);
} //}
//
// Fix bug //// Fix bug
TClasslessInstanceHook(void*, "?_read@PurchaseReceiptPacket@@EEAA?AW4StreamReadResult@@AEAVReadOnlyBinaryStream@@@Z", //TClasslessInstanceHook(void*, "?_read@PurchaseReceiptPacket@@EEAA?AW4StreamReadResult@@AEAVReadOnlyBinaryStream@@@Z",
ReadOnlyBinaryStream* a2) { // ReadOnlyBinaryStream* a2) {
return (void*)1; // return (void*)1;
} //}
//
// Fix bug //// Fix bug
TClasslessInstanceHook(void*, "?_read@EduUriResourcePacket@@EEAA?AW4StreamReadResult@@AEAVReadOnlyBinaryStream@@@Z", //TClasslessInstanceHook(void*, "?_read@EduUriResourcePacket@@EEAA?AW4StreamReadResult@@AEAVReadOnlyBinaryStream@@@Z",
ReadOnlyBinaryStream* a2) { // ReadOnlyBinaryStream* a2) {
return (void*)1; // return (void*)1;
} //}
//
// Fix the listening port twice //// Fix the listening port twice
TClasslessInstanceHook(__int64, "?LogIPSupport@RakPeerHelper@@AEAAXXZ") { //TClasslessInstanceHook(__int64, "?LogIPSupport@RakPeerHelper@@AEAAXXZ") {
static bool isFirstLog = true; // static bool isFirstLog = true;
if (globalConfig.enableFixListenPort) { // if (globalConfig.enableFixListenPort) {
if (isFirstLog) { // if (isFirstLog) {
isFirstLog = false; // isFirstLog = false;
original(this); // original(this);
endTime = clock(); // endTime = clock();
Logger("Server").info("Done (" + fmt::format("{:.1f}", (endTime - startTime) * 1.0 / 1000) + "s)! For help, type \"help\" or \"?\""); // Logger("Server").info("Done (" + fmt::format("{:.1f}", (endTime - startTime) * 1.0 / 1000) + "s)! For help, type \"help\" or \"?\"");
return 1; // return 1;
} // }
return 0; // return 0;
} else { // } else {
original(this); // original(this);
if (!isFirstLog) { // if (!isFirstLog) {
endTime = clock(); // endTime = clock();
Logger("Server").info("Done (" + fmt::format("{:.1f}", (endTime - startTime) * 1.0 / 1000) + "s)! For help, type \"help\" or \"?\""); // Logger("Server").info("Done (" + fmt::format("{:.1f}", (endTime - startTime) * 1.0 / 1000) + "s)! For help, type \"help\" or \"?\"");
} // }
isFirstLog = false; // isFirstLog = false;
return 1; // return 1;
} // }
} //}
//
// Fix abnormal items //// Fix abnormal items
#include <MC/InventorySource.hpp> //#include <MC/InventorySource.hpp>
#include <MC/InventoryTransaction.hpp> //#include <MC/InventoryTransaction.hpp>
#include <MC/InventoryAction.hpp> //#include <MC/InventoryAction.hpp>
#include <MC/Level.hpp> //#include <MC/Level.hpp>
#include <MC/ElementBlock.hpp> //#include <MC/ElementBlock.hpp>
#include <MC/IContainerManager.hpp> //#include <MC/IContainerManager.hpp>
#include <MC/ColorFormat.hpp> //#include <MC/ColorFormat.hpp>
#include <magic_enum/magic_enum.hpp> //#include <magic_enum/magic_enum.hpp>
//
inline bool itemMayFromReducer(ItemStack const& item) { //inline bool itemMayFromReducer(ItemStack const& item) {
return item.isNull() || (ElementBlock::isElement(item) && !item.hasUserData()); // return item.isNull() || (ElementBlock::isElement(item) && !item.hasUserData());
} //}
//
TInstanceHook(void, "?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVInventoryTransactionPacket@@@Z", //TInstanceHook(void, "?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVInventoryTransactionPacket@@@Z",
ServerNetworkHandler, NetworkIdentifier const& netid, InventoryTransactionPacket* pk) { // ServerNetworkHandler, NetworkIdentifier const& netid, InventoryTransactionPacket* pk) {
if (globalConfig.enableAntiGive) { // if (globalConfig.enableAntiGive) {
auto sp = (Player*)this->getServerPlayer(netid); // auto sp = (Player*)this->getServerPlayer(netid);
auto& actions = pk->transaction->data.actions; // auto& actions = pk->transaction->data.actions;
bool abnormal = false; // bool abnormal = false;
bool mayFromReducer = true; // bool mayFromReducer = true;
bool isContainer = false; // bool isContainer = false;
for (auto& action : actions) { // for (auto& action : actions) {
if (action.first.type == InventorySourceType::Container) { // if (action.first.type == InventorySourceType::Container) {
isContainer = true; // isContainer = true;
if (abnormal) { // if (abnormal) {
logger.warn(tr("ll.antiAbnormalItem.detected", sp->getRealName())); // logger.warn(tr("ll.antiAbnormalItem.detected", sp->getRealName()));
mayFromReducer = false; // mayFromReducer = false;
} // }
} // }
if (action.first.type == InventorySourceType::NONIMPLEMENTEDTODO) { // if (action.first.type == InventorySourceType::NONIMPLEMENTEDTODO) {
for (auto& a : action.second) { // for (auto& a : action.second) {
auto fromDesc = ItemStack::fromDescriptor(a.fromDescriptor, Global<Level>->getBlockPalette(), true); // auto fromDesc = ItemStack::fromDescriptor(a.fromDescriptor, Global<Level>->getBlockPalette(), true);
auto toDesc = ItemStack::fromDescriptor(a.fromDescriptor, Global<Level>->getBlockPalette(), true); // auto toDesc = ItemStack::fromDescriptor(a.fromDescriptor, Global<Level>->getBlockPalette(), true);
if ( isContainer || !itemMayFromReducer(fromDesc) || !itemMayFromReducer(toDesc) || !itemMayFromReducer(a.fromItem) || !itemMayFromReducer(a.toItem)) { // if ( isContainer || !itemMayFromReducer(fromDesc) || !itemMayFromReducer(toDesc) || !itemMayFromReducer(a.fromItem) || !itemMayFromReducer(a.toItem)) {
if (mayFromReducer) { // if (mayFromReducer) {
logger.warn(tr("ll.antiAbnormalItem.detected", sp->getRealName())); // logger.warn(tr("ll.antiAbnormalItem.detected", sp->getRealName()));
} // }
if (!toDesc.isNull()) { // if (!toDesc.isNull()) {
logger.warn(tr("ll.antiAbnormalItem.itemInfo", toDesc.toString())); // logger.warn(tr("ll.antiAbnormalItem.itemInfo", toDesc.toString()));
} // }
mayFromReducer = false; // mayFromReducer = false;
} // }
} // }
abnormal = true; // abnormal = true;
} // }
} // }
//
if (abnormal && !mayFromReducer) { // if (abnormal && !mayFromReducer) {
string cmd = globalConfig.antiGiveCommand; // string cmd = globalConfig.antiGiveCommand;
ReplaceStr(cmd, "{player}", "\"" + sp->getRealName() + "\""); // ReplaceStr(cmd, "{player}", "\"" + sp->getRealName() + "\"");
Level::runcmd(cmd); // Level::runcmd(cmd);
return; // return;
} // }
} // }
return original(this, netid, pk); // return original(this, netid, pk);
} //}
//
TInstanceHook(size_t, "??0PropertiesSettings@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z", PropertiesSettings, const std::string& file) { //TInstanceHook(size_t, "??0PropertiesSettings@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z", PropertiesSettings, const std::string& file) {
auto out = original(this, file); // auto out = original(this, file);
if (LL::globalConfig.enableUnoccupyPort19132) { // if (LL::globalConfig.enableUnoccupyPort19132) {
// logger.warn("If you turn on this feature, your server will not be displayed on the LAN"); // // logger.warn("If you turn on this feature, your server will not be displayed on the LAN");
DWORD v4Flag, v6Flag; // DWORD v4Flag, v6Flag;
VirtualProtect((void*)&SharedConstants::NetworkDefaultGamePort, 4, PAGE_READWRITE, &v4Flag); // VirtualProtect((void*)&SharedConstants::NetworkDefaultGamePort, 4, PAGE_READWRITE, &v4Flag);
*(unsigned short*)&SharedConstants::NetworkDefaultGamePort = getServerPort(); // *(unsigned short*)&SharedConstants::NetworkDefaultGamePort = getServerPort();
VirtualProtect((void*)&SharedConstants::NetworkDefaultGamePort, 4, v4Flag, NULL); // VirtualProtect((void*)&SharedConstants::NetworkDefaultGamePort, 4, v4Flag, NULL);
//
VirtualProtect((void*)&SharedConstants::NetworkDefaultGamePortv6, 4, PAGE_READWRITE, &v6Flag); // VirtualProtect((void*)&SharedConstants::NetworkDefaultGamePortv6, 4, PAGE_READWRITE, &v6Flag);
*(unsigned short*)&SharedConstants::NetworkDefaultGamePortv6 = getServerPortv6(); // *(unsigned short*)&SharedConstants::NetworkDefaultGamePortv6 = getServerPortv6();
VirtualProtect((void*)&SharedConstants::NetworkDefaultGamePortv6, 4, v6Flag, NULL); // VirtualProtect((void*)&SharedConstants::NetworkDefaultGamePortv6, 4, v6Flag, NULL);
} // }
// Global service // // Global service
Global<PropertiesSettings> = this; // Global<PropertiesSettings> = this;
return out; // return out;
} //}
//
// Fix move view crash (ref PlayerAuthInput[MoveView]) //// Fix move view crash (ref PlayerAuthInput[MoveView])
Player* movingViewPlayer = nullptr; //Player* movingViewPlayer = nullptr;
TInstanceHook(void, "?moveView@Player@@UEAAXXZ", //TInstanceHook(void, "?moveView@Player@@UEAAXXZ",
Player) { // Player) {
movingViewPlayer = this; // movingViewPlayer = this;
original(this); // original(this);
movingViewPlayer = nullptr; // movingViewPlayer = nullptr;
} //}
#include <MC/ChunkViewSource.hpp> //#include <MC/ChunkViewSource.hpp>
inline bool Interval(int a1) { //inline bool Interval(int a1) {
if (a1 < 0x5ffffff && a1 > -0x5ffffff) // if (a1 < 0x5ffffff && a1 > -0x5ffffff)
return true; // return true;
return false; // return false;
} //}
template <typename T> //template <typename T>
inline bool validPosition(T const& pos) { //inline bool validPosition(T const& pos) {
if (isnan(static_cast<float>(pos.x)) || isnan(static_cast<float>(pos.z))) // if (isnan(static_cast<float>(pos.x)) || isnan(static_cast<float>(pos.z)))
return false; // return false;
return Interval(static_cast<int>(pos.x)) && Interval(static_cast<int>(pos.y)) && Interval(static_cast<int>(pos.z)); // return Interval(static_cast<int>(pos.x)) && Interval(static_cast<int>(pos.y)) && Interval(static_cast<int>(pos.z));
} //}
inline void fixPlayerPosition(Player* pl, bool kick = true) { //inline void fixPlayerPosition(Player* pl, bool kick = true) {
if (pl->isPlayer()) { // if (pl->isPlayer()) {
logger.warn << "Player(" << pl->getRealName() << ") sent invalid MoveView Packet!" << Logger::endl; // logger.warn << "Player(" << pl->getRealName() << ") sent invalid MoveView Packet!" << Logger::endl;
auto& pos = pl->getPosPrev(); // auto& pos = pl->getPosPrev();
if (validPosition(pos)) // if (validPosition(pos))
pl->setPos(pl->getPosition()); // pl->setPos(pl->getPosition());
else // else
pl->setPos(Global<Level>->getDefaultSpawn().bottomCenter()); // pl->setPos(Global<Level>->getDefaultSpawn().bottomCenter());
if (kick) // if (kick)
pl->kick("error move"); // pl->kick("error move");
} // }
} //}
TInstanceHook(void, "?moveSpawnView@Player@@QEAAXAEBVVec3@@V?$AutomaticID@VDimension@@H@@@Z", //TInstanceHook(void, "?moveSpawnView@Player@@QEAAXAEBVVec3@@V?$AutomaticID@VDimension@@H@@@Z",
Player, class Vec3 const& pos, class AutomaticID<class Dimension, int> dimid) { // Player, class Vec3 const& pos, class AutomaticID<class Dimension, int> dimid) {
if (validPosition(pos)) // if (validPosition(pos))
return original(this, pos, dimid); // return original(this, pos, dimid);
fixPlayerPosition(this, false); // fixPlayerPosition(this, false);
} //}
TClasslessInstanceHook(__int64, "?move@ChunkViewSource@@QEAAXAEBVBlockPos@@H_NW4ChunkSourceViewGenerateMode@ChunkSource@@V?$function@$$A6AXV?$buffer_span_mut@V?$shared_ptr@VLevelChunk@@@std@@@@V?$buffer_span@I@@@Z@std@@UActorUniqueID@@@Z", //TClasslessInstanceHook(__int64, "?move@ChunkViewSource@@QEAAXAEBVBlockPos@@H_NW4ChunkSourceViewGenerateMode@ChunkSource@@V?$function@$$A6AXV?$buffer_span_mut@V?$shared_ptr@VLevelChunk@@@std@@@@V?$buffer_span@I@@@Z@std@@UActorUniqueID@@@Z",
BlockPos a2, int a3, unsigned __int8 a4, int a5, __int64 a6, __int64 a7) { // BlockPos a2, int a3, unsigned __int8 a4, int a5, __int64 a6, __int64 a7) {
if (validPosition(a2)) // if (validPosition(a2))
return original(this, a2, a3, a4,a5,a6,a7); // return original(this, a2, a3, a4,a5,a6,a7);
fixPlayerPosition(movingViewPlayer); // fixPlayerPosition(movingViewPlayer);
return 0; // return 0;
} //}
//
TInstanceHook(void, "?move@Player@@UEAAXAEBVVec3@@@Z", Player, Vec3 pos) { //TInstanceHook(void, "?move@Player@@UEAAXAEBVVec3@@@Z", Player, Vec3 pos) {
if (validPosition(pos)) // if (validPosition(pos))
return original(this, pos); // return original(this, pos);
logger.warn << "Player(" << this->getRealName() << ") sent invalid Move Packet!" << Logger::endl; // logger.warn << "Player(" << this->getRealName() << ") sent invalid Move Packet!" << Logger::endl;
this->kick("error move"); // this->kick("error move");
return; // return;
} //}
//
#if false //#if false
TInstanceHook(void, "?die@ServerPlayer@@UEAAXAEBVActorDamageSource@@@Z", ServerPlayer , ActorDamageSource* ds) //TInstanceHook(void, "?die@ServerPlayer@@UEAAXAEBVActorDamageSource@@@Z", ServerPlayer , ActorDamageSource* ds)
{ //{
original(this, ds); // original(this, ds);
if (LL::globalConfig.enableFixMcBug) // if (LL::globalConfig.enableFixMcBug)
{ // {
auto name = getRealName(); // auto name = getRealName();
Schedule::delay([name]() { // Schedule::delay([name]() {
auto pl = Global<Level>->getPlayer(name); // auto pl = Global<Level>->getPlayer(name);
if (pl) // if (pl)
pl->kill(); // pl->kill();
},1); // },1);
} // }
} //}
#endif //#endif
//
// Fix Fishing Hook changeDimension Crash //// Fix Fishing Hook changeDimension Crash
TInstanceHook(__int64, "?changeDimension@Actor@@UEAAXV?$AutomaticID@VDimension@@H@@@Z", Actor, unsigned int a1) { //TInstanceHook(__int64, "?changeDimension@Actor@@UEAAXV?$AutomaticID@VDimension@@H@@@Z", Actor, unsigned int a1) {
if (!LL::globalConfig.enableFixMcBug) // if (!LL::globalConfig.enableFixMcBug)
return original(this, a1); // return original(this, a1);
if ((int)this->getEntityTypeId() == 0x4D) // if ((int)this->getEntityTypeId() == 0x4D)
return 0; // return 0;
return original(this, a1); // return original(this, a1);
} //}
//
TClasslessInstanceHook(__int64, "?teleportEntity@EndGatewayBlockActor@@QEAAXAEAVActor@@@Z", Actor* a1) { //TClasslessInstanceHook(__int64, "?teleportEntity@EndGatewayBlockActor@@QEAAXAEAVActor@@@Z", Actor* a1) {
if (!LL::globalConfig.enableFixMcBug) // if (!LL::globalConfig.enableFixMcBug)
return original(this, a1); // return original(this, a1);
if ((int)a1->getEntityTypeId() == 0x4D) // if ((int)a1->getEntityTypeId() == 0x4D)
return 0; // return 0;
return original(this, a1); // return original(this, a1);
} //}
//
// Fix wine stop //// Fix wine stop
TClasslessInstanceHook(void, "?leaveGameSync@ServerInstance@@QEAAXXZ") { //TClasslessInstanceHook(void, "?leaveGameSync@ServerInstance@@QEAAXXZ") {
original(this); // original(this);
if (IsWineEnvironment()) { // if (IsWineEnvironment()) {
std::cerr << "Quit correctly" << std::endl; // std::cerr << "Quit correctly" << std::endl;
auto proc = GetCurrentProcess(); // auto proc = GetCurrentProcess();
TerminateProcess(proc, 0); // TerminateProcess(proc, 0);
} // }
} //}
//
TClasslessInstanceHook(enum StartupResult, "?Startup@RakPeer@RakNet@@UEAA?AW4StartupResult@2@IPEAUSocketDescriptor@2@IH@Z", //TClasslessInstanceHook(enum StartupResult, "?Startup@RakPeer@RakNet@@UEAA?AW4StartupResult@2@IPEAUSocketDescriptor@2@IH@Z",
unsigned int maxConnections, class SocketDescriptor* socketDescriptors, unsigned socketDescriptorCount, int threadPriority) { // unsigned int maxConnections, class SocketDescriptor* socketDescriptors, unsigned socketDescriptorCount, int threadPriority) {
if (maxConnections > 0xFFFF) { // if (maxConnections > 0xFFFF) {
maxConnections = 0xFFFF; // maxConnections = 0xFFFF;
} // }
return original(this, maxConnections, socketDescriptors, socketDescriptorCount, threadPriority); // return original(this, maxConnections, socketDescriptors, socketDescriptorCount, threadPriority);
} //}
//
// Fix command crash when server is stopping //// Fix command crash when server is stopping
TClasslessInstanceHook(void, "?fireEventPlayerMessage@MinecraftEventing@@AEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@000@Z", //TClasslessInstanceHook(void, "?fireEventPlayerMessage@MinecraftEventing@@AEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@000@Z",
std::string const& a1, std::string const& a2, std::string const& a3, std::string const& a4) { // std::string const& a1, std::string const& a2, std::string const& a3, std::string const& a4) {
if (LL::isServerStopping()) // if (LL::isServerStopping())
return; // return;
original(this, a1, a2, a3, a4); // original(this, a1, a2, a3, a4);
} //}
TClasslessInstanceHook(void, "?fireEventPlayerTransform@MinecraftEventing@@SAXAEAVPlayer@@@Z", //TClasslessInstanceHook(void, "?fireEventPlayerTransform@MinecraftEventing@@SAXAEAVPlayer@@@Z",
class Player& a1) { // class Player& a1) {
if (LL::isServerStopping()) // if (LL::isServerStopping())
return; // return;
original(this, a1); // original(this, a1);
} //}
//
TClasslessInstanceHook(void, "?fireEventPlayerTravelled@MinecraftEventing@@UEAAXPEAVPlayer@@M@Z", //TClasslessInstanceHook(void, "?fireEventPlayerTravelled@MinecraftEventing@@UEAAXPEAVPlayer@@M@Z",
class Player& a1, float a2) { // class Player& a1, float a2) {
if (LL::isServerStopping()) // if (LL::isServerStopping())
return; // return;
original(this, a1, a2); // original(this, a1, a2);
} //}
TClasslessInstanceHook(void, "?fireEventPlayerTeleported@MinecraftEventing@@SAXPEAVPlayer@@MW4TeleportationCause@1@H@Z", //TClasslessInstanceHook(void, "?fireEventPlayerTeleported@MinecraftEventing@@SAXPEAVPlayer@@MW4TeleportationCause@1@H@Z",
class Player* a1, float a2, int a3, int a4) { // class Player* a1, float a2, int a3, int a4) {
if (LL::isServerStopping()) // if (LL::isServerStopping())
return; // return;
original(this, a1, a2, a3, a4); // original(this, a1, a2, a3, a4);
} //}
//
// Set stdin mode to text mode if in wine environment //// Set stdin mode to text mode if in wine environment
inline bool _tryFixConsoleInputMode() { //inline bool _tryFixConsoleInputMode() {
if ((LL::globalConfig.enableFixMcBug && IsWineEnvironment()) || LL::globalConfig.enableForceUtf8Input) { // if ((LL::globalConfig.enableFixMcBug && IsWineEnvironment()) || LL::globalConfig.enableForceUtf8Input) {
int result = _setmode(_fileno(stdin), _O_U8TEXT); // int result = _setmode(_fileno(stdin), _O_U8TEXT);
if (result == -1) { // if (result == -1) {
logger.error("Cannot set stdin to utf8 text mode"); // logger.error("Cannot set stdin to utf8 text mode");
return false; // return false;
} // }
return true; // return true;
} // }
return true; // return true;
} //}
//
// Fix wine console input //// Fix wine console input
THook(std::wistream&, //THook(std::wistream&,
"??$getline@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@0@$$" // "??$getline@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@0@$$"
"QEAV10@AEAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@_W@Z", // "QEAV10@AEAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@_W@Z",
std::wistream&& ret, std::wstring& a1, wchar_t a2) { // std::wistream&& ret, std::wstring& a1, wchar_t a2) {
if (&ret == &std::wcin) { // if (&ret == &std::wcin) {
static bool fixed = _tryFixConsoleInputMode(); // static bool fixed = _tryFixConsoleInputMode();
} // }
return original(std::move(ret), a1, a2); // return original(std::move(ret), a1, a2);
} //}
//
// Fix server broadcast bug. //// Fix server broadcast bug.
TClasslessInstanceHook(bool, "?getLANBroadcast@LevelData@@QEBA_NXZ") { //TClasslessInstanceHook(bool, "?getLANBroadcast@LevelData@@QEBA_NXZ") {
if (LL::globalConfig.enableFixBroadcastBug) { // if (LL::globalConfig.enableFixBroadcastBug) {
return true; // return true;
} // }
return original(this); // return original(this);
} //}
//
TClasslessInstanceHook(bool, "?getLANBroadcastIntent@LevelData@@QEBA_NXZ") { //TClasslessInstanceHook(bool, "?getLANBroadcastIntent@LevelData@@QEBA_NXZ") {
if (LL::globalConfig.enableFixBroadcastBug) { // if (LL::globalConfig.enableFixBroadcastBug) {
return true; // return true;
} // }
return original(this); // return original(this);
} //}
//
// Disable 'Running AutoCompaction...' log. //// Disable 'Running AutoCompaction...' log.
bool pauseBLogging = false; //bool pauseBLogging = false;
THook(__int64, "std::_Func_impl_no_alloc<<lambda_bc4a73e92ba7b703b39f322d94bb55f6>,TaskResult>::_Do_call", //THook(__int64, "std::_Func_impl_no_alloc<<lambda_bc4a73e92ba7b703b39f322d94bb55f6>,TaskResult>::_Do_call",
__int64 a1, __int64 a2) { // __int64 a1, __int64 a2) {
if (LL::globalConfig.disableAutoCompactionLog) { // if (LL::globalConfig.disableAutoCompactionLog) {
pauseBLogging = true; // pauseBLogging = true;
auto v = original(a1, a2); // auto v = original(a1, a2);
pauseBLogging = false; // pauseBLogging = false;
return v; // return v;
} // }
return original(a1, a2); // return original(a1, a2);
} //}
//
TClasslessInstanceHook(char, "?log_va@BedrockLog@@YAXW4LogCategory@1@V?$bitset@$02@std@@W4LogRule@1@W4LogAreaID@@IPEBDH4PEAD@Z", //TClasslessInstanceHook(char, "?log_va@BedrockLog@@YAXW4LogCategory@1@V?$bitset@$02@std@@W4LogRule@1@W4LogAreaID@@IPEBDH4PEAD@Z",
char a2, int a3, int a4, unsigned int a5, __int64 a6, int a7, __int64 a8, __int64 a9) { // char a2, int a3, int a4, unsigned int a5, __int64 a6, int a7, __int64 a8, __int64 a9) {
if (LL::globalConfig.disableAutoCompactionLog && pauseBLogging) { // if (LL::globalConfig.disableAutoCompactionLog && pauseBLogging) {
return 0; // return 0;
} // }
return original(this, a2, a3, a4, a5, a6, a7, a8, a9); // return original(this, a2, a3, a4, a5, a6, a7, a8, a9);
} //}
//
//
//Try Fix BDS Crash ////Try Fix BDS Crash
//Beta ////Beta
//
THook(void*, "??0ScopedTimer@ImguiProfiler@@QEAA@PEBD0_N@Z", //THook(void*, "??0ScopedTimer@ImguiProfiler@@QEAA@PEBD0_N@Z",
void* self, char* a2, char* a3, char a4) { // void* self, char* a2, char* a3, char a4) {
if (LL::globalConfig.enableFixBDSCrash) { // if (LL::globalConfig.enableFixBDSCrash) {
return nullptr; // return nullptr;
} // }
return original(self, a2, a3, a4); // return original(self, a2, a3, a4);
} //}
//
THook(void, "??1ScopedTimer@ImguiProfiler@@UEAA@XZ", //THook(void, "??1ScopedTimer@ImguiProfiler@@UEAA@XZ",
void* self) { // void* self) {
if (LL::globalConfig.enableFixBDSCrash) { // if (LL::globalConfig.enableFixBDSCrash) {
return; // return;
} // }
return original(self); // return original(self);
} //}
//
SHook2("_tickDimensionTransition", __int64, "40 53 55 41 56 41 57 48 ?? ?? ?? ?? ?? ?? 48 ?? ?? ?? ?? ?? ?? 48 33 " //SHook2("_tickDimensionTransition", __int64, "40 53 55 41 56 41 57 48 ?? ?? ?? ?? ?? ?? 48 ?? ?? ?? ?? ?? ?? 48 33 "
"C4 48 89 ?? ?? ?? 48 8B C2 4C 8B F9 48 8B C8 33 D2 49 8B D9 49 8B E8 E8 ?? ?? ?? ?? 4C 8B F0 48 85 C0", // "C4 48 89 ?? ?? ?? 48 8B C2 4C 8B F9 48 8B C8 33 D2 49 8B D9 49 8B E8 E8 ?? ?? ?? ?? 4C 8B F0 48 85 C0",
__int64 a1, ActorOwnerComponent* a2, __int64 a3, void* a4) { // __int64 a1, ActorOwnerComponent* a2, __int64 a3, void* a4) {
if (LL::globalConfig.enableFixBDSCrash) { // if (LL::globalConfig.enableFixBDSCrash) {
auto ac = Actor::tryGetFromComponent(*a2, 0); // auto ac = Actor::tryGetFromComponent(*a2, 0);
if (ac) { // if (ac) {
auto bs = &ac->getRegionConst(); // auto bs = &ac->getRegionConst();
if (bs == nullptr || !bs) // if (bs == nullptr || !bs)
return NULL; // return NULL;
} // }
} // }
return original(a1, a2, a3, a4); // return original(a1, a2, a3, a4);
} //}
//
THook(void, "?_trackMovement@GameEventMovementTrackingSystem@@CAXAEAVActor@@AEAVGameEventMovementTrackingComponent@@@Z", //THook(void, "?_trackMovement@GameEventMovementTrackingSystem@@CAXAEAVActor@@AEAVGameEventMovementTrackingComponent@@@Z",
Actor* a1, void* self) { // Actor* a1, void* self) {
if (LL::globalConfig.enableFixBDSCrash) { // if (LL::globalConfig.enableFixBDSCrash) {
auto bs = &a1->getRegionConst(); // auto bs = &a1->getRegionConst();
if (bs == nullptr || !bs) { // if (bs == nullptr || !bs) {
return; // return;
} // }
} // }
original(a1, self); // original(a1, self);
} //}
//
#include <MC/LevelChunk.hpp> //#include <MC/LevelChunk.hpp>
#include <MC/ChunkSource.hpp> //#include <MC/ChunkSource.hpp>
//
THook(LevelChunk*, "?getChunk@BlockSource@@QEBAPEAVLevelChunk@@AEBVChunkPos@@@Z", //THook(LevelChunk*, "?getChunk@BlockSource@@QEBAPEAVLevelChunk@@AEBVChunkPos@@@Z",
BlockSource* self, ChunkPos* a2) { // BlockSource* self, ChunkPos* a2) {
if (LL::globalConfig.enableFixBDSCrash) { // if (LL::globalConfig.enableFixBDSCrash) {
LevelChunk* ptr = nullptr; // LevelChunk* ptr = nullptr;
try { // try {
ptr = original(self, a2); // ptr = original(self, a2);
} catch (...) { // } catch (...) {
return nullptr; // return nullptr;
} // }
return ptr; // return ptr;
} // }
return original(self, a2); // return original(self, a2);
} //}
//
//
THook(__int64, "?getAvailableChunk@ChunkSource@@QEAA?AV?$shared_ptr@VLevelChunk@@@std@@AEBVChunkPos@@@Z", //THook(__int64, "?getAvailableChunk@ChunkSource@@QEAA?AV?$shared_ptr@VLevelChunk@@@std@@AEBVChunkPos@@@Z",
__int64 a1, __int64 a2) { // __int64 a1, __int64 a2) {
if (LL::globalConfig.enableFixBDSCrash) { // if (LL::globalConfig.enableFixBDSCrash) {
__int64 ptr = NULL; // __int64 ptr = NULL;
try { // try {
ptr = original(a1, a2); // ptr = original(a1, a2);
} catch (...) { // } catch (...) {
return NULL; // return NULL;
} // }
return ptr; // return ptr;
} // }
return original(a1, a2); // return original(a1, a2);
} //}
//
TInstanceHook(BlockSource*, "?getRegionConst@Actor@@QEBAAEBVBlockSource@@XZ", //TInstanceHook(BlockSource*, "?getRegionConst@Actor@@QEBAAEBVBlockSource@@XZ",
Actor) { // Actor) {
//
auto bs = original(this); // auto bs = original(this);
if (LL::globalConfig.enableFixBDSCrash) { // if (LL::globalConfig.enableFixBDSCrash) {
if (!bs) { // if (!bs) {
return Level::getBlockSource(getDimensionId()); // return Level::getBlockSource(getDimensionId());
} // }
} // }
return bs; // return bs;
} //}

778
LiteLoader/Main/BuiltinCommands.cpp
View File

@ -1,389 +1,389 @@
#include <filesystem> //#include <filesystem>
#include <EventAPI.h> //#include <EventAPI.h>
#include <LLAPI.h> //#include <LLAPI.h>
#include <ServerAPI.h> //#include <ServerAPI.h>
#include <RegCommandAPI.h> //#include <RegCommandAPI.h>
#include <MC/CommandOrigin.hpp> //#include <MC/CommandOrigin.hpp>
#include <MC/CommandOutput.hpp> //#include <MC/CommandOutput.hpp>
#include <MC/CommandPosition.hpp> //#include <MC/CommandPosition.hpp>
#include <MC/CommandRegistry.hpp> //#include <MC/CommandRegistry.hpp>
#include <MC/Packet.hpp> //#include <MC/Packet.hpp>
#include <MC/ServerPlayer.hpp> //#include <MC/ServerPlayer.hpp>
#include <MC/VanillaDimensions.hpp> //#include <MC/VanillaDimensions.hpp>
#include <Main/Config.h> //#include <Main/Config.h>
#include <Main/PluginManager.h> //#include <Main/PluginManager.h>
#include "../ScriptEngine/Main/Configs.h" //#include "../ScriptEngine/Main/Configs.h"
//
using namespace RegisterCommandHelper; //using namespace RegisterCommandHelper;
using namespace LL; //using namespace LL;
//
static_assert(sizeof(CommandSelector<Player>) == 200); //static_assert(sizeof(CommandSelector<Player>) == 200);
//
class TeleportDimensionCommand : public Command { //class TeleportDimensionCommand : public Command {
//
enum class DimensionType { // enum class DimensionType {
OverWorld, // OverWorld,
Nether, // Nether,
TheEnd, // TheEnd,
} DimensionId; // } DimensionId;
CommandSelector<Actor> Victim; // CommandSelector<Actor> Victim;
CommandPosition CommandPos; // CommandPosition CommandPos;
bool Victim_isSet = false; // bool Victim_isSet = false;
bool CommandPos_isSet = false; // bool CommandPos_isSet = false;
//
Vec3 getTargetPos(CommandOrigin const& ori, Actor* actor) const { // Vec3 getTargetPos(CommandOrigin const& ori, Actor* actor) const {
if (CommandPos_isSet) // if (CommandPos_isSet)
return CommandPos.getPosition(ori, {0, 0, 0}); // return CommandPos.getPosition(ori, {0, 0, 0});
auto pos = actor->getPosition(); // auto pos = actor->getPosition();
Vec3 result = pos; // Vec3 result = pos;
int actorDimensionId = actor->getDimensionId(); // int actorDimensionId = actor->getDimensionId();
switch (DimensionId) { // switch (DimensionId) {
case TeleportDimensionCommand::DimensionType::OverWorld: // case TeleportDimensionCommand::DimensionType::OverWorld:
if (actorDimensionId == 1) // if (actorDimensionId == 1)
result = {pos.x * 8, pos.y, pos.z * 8}; // result = {pos.x * 8, pos.y, pos.z * 8};
break; // break;
case TeleportDimensionCommand::DimensionType::Nether: // case TeleportDimensionCommand::DimensionType::Nether:
if (actorDimensionId != 1) // if (actorDimensionId != 1)
result = {pos.x / 8, pos.y, pos.z / 8}; // result = {pos.x / 8, pos.y, pos.z / 8};
break; // break;
case TeleportDimensionCommand::DimensionType::TheEnd: // case TeleportDimensionCommand::DimensionType::TheEnd:
if (actorDimensionId != 2) // if (actorDimensionId != 2)
result = {100, 50, 0}; // result = {100, 50, 0};
break; // break;
default: // default:
break; // break;
} // }
return result; // return result;
} // }
//
bool teleportTarget(CommandOrigin const& ori, CommandOutput& output, Actor* actor) const { // bool teleportTarget(CommandOrigin const& ori, CommandOutput& output, Actor* actor) const {
auto dim = VanillaDimensions::toString((int)DimensionId); // auto dim = VanillaDimensions::toString((int)DimensionId);
auto pos = getTargetPos(ori, actor); // auto pos = getTargetPos(ori, actor);
actor->teleport(pos, (int)DimensionId); // actor->teleport(pos, (int)DimensionId);
output.trSuccess("ll.cmd.tpdim.success", actor->getNameTag(), dim, pos.x, pos.y, pos.z); // output.trSuccess("ll.cmd.tpdim.success", actor->getNameTag(), dim, pos.x, pos.y, pos.z);
return true; // return true;
} // }
//
bool teleportTargets(CommandOrigin const& ori, CommandOutput& output, CommandSelectorResults<Actor>& actors) const { // bool teleportTargets(CommandOrigin const& ori, CommandOutput& output, CommandSelectorResults<Actor>& actors) const {
auto dim = VanillaDimensions::toString((int)DimensionId); // auto dim = VanillaDimensions::toString((int)DimensionId);
std::string names; // std::string names;
for (auto& actor : actors) { // for (auto& actor : actors) {
std::string actorName = actor->getNameTag(); // std::string actorName = actor->getNameTag();
if (actorName.empty()) { // if (actorName.empty()) {
actorName = actor->getTypeName(); // actorName = actor->getTypeName();
} // }
names.append(", ").append(actorName); // names.append(", ").append(actorName);
if (actor->teleport(getTargetPos(ori, actor), (int)DimensionId)) { // if (actor->teleport(getTargetPos(ori, actor), (int)DimensionId)) {
output.success(); // output.success();
} // }
} // }
if (output.getSuccessCount() == 0) { // if (output.getSuccessCount() == 0) {
output.trError("ll.cmd.tpdim.error.noActorTeleported"); // output.trError("ll.cmd.tpdim.error.noActorTeleported");
return false; // return false;
} else { // } else {
std::string message = fmt::format("Teleported {} to {}", names.substr(2), dim); // std::string message = fmt::format("Teleported {} to {}", names.substr(2), dim);
if (CommandPos_isSet) { // if (CommandPos_isSet) {
auto pos = CommandPos.getPosition(ori, {0, 0, 0}); // auto pos = CommandPos.getPosition(ori, {0, 0, 0});
message.append(fmt::format(" ({:2f}, {:2f}, {:2f})", pos.x, pos.y, pos.z)); // message.append(fmt::format(" ({:2f}, {:2f}, {:2f})", pos.x, pos.y, pos.z));
} // }
output.addMessage(message); // output.addMessage(message);
return true; // return true;
} // }
} // }
//
public: //public:
void execute(CommandOrigin const& ori, CommandOutput& output) const override { // void execute(CommandOrigin const& ori, CommandOutput& output) const override {
output.setLanguageCode(ori); // output.setLanguageCode(ori);
if ((int)DimensionId < 0 || (int)DimensionId > 2) { // if ((int)DimensionId < 0 || (int)DimensionId > 2) {
output.trError("ll.cmd.tpdim.invalidDimid", (int)DimensionId); // output.trError("ll.cmd.tpdim.invalidDimid", (int)DimensionId);
return; // return;
} // }
if (Victim_isSet) { // if (Victim_isSet) {
auto result = Victim.results(ori); // auto result = Victim.results(ori);
if (result.empty()) // if (result.empty())
output.trError("ll.cmd.tpdim.error.noActorSpecified"); // output.trError("ll.cmd.tpdim.error.noActorSpecified");
else if (result.count() == 1) // else if (result.count() == 1)
teleportTarget(ori, output, *result.begin()); // teleportTarget(ori, output, *result.begin());
else // else
teleportTargets(ori, output, result); // teleportTargets(ori, output, result);
} else { // } else {
auto actor = ori.getEntity(); // auto actor = ori.getEntity();
if (!actor) // if (!actor)
output.trError("ll.cmd.tpdim.error.noActorSpecified"); // output.trError("ll.cmd.tpdim.error.noActorSpecified");
else // else
teleportTarget(ori, output, actor); // teleportTarget(ori, output, actor);
} // }
} // }
//
static void setup(CommandRegistry* registry) { // static void setup(CommandRegistry* registry) {
registry->registerCommand( // registry->registerCommand(
"tpdim", "Teleport to Dimension", CommandPermissionLevel::GameMasters, // "tpdim", "Teleport to Dimension", CommandPermissionLevel::GameMasters,
{(CommandFlagValue)0}, {(CommandFlagValue)0x80}); // {(CommandFlagValue)0}, {(CommandFlagValue)0x80});
registry->addEnum<DimensionType>("DimensionType", // registry->addEnum<DimensionType>("DimensionType",
{ // {
{"overworld", DimensionType::OverWorld}, // {"overworld", DimensionType::OverWorld},
{"o", DimensionType::OverWorld}, // {"o", DimensionType::OverWorld},
{"nether", DimensionType::Nether}, // {"nether", DimensionType::Nether},
{"n", DimensionType::Nether}, // {"n", DimensionType::Nether},
{"end", DimensionType::TheEnd}, // {"end", DimensionType::TheEnd},
{"e", DimensionType::TheEnd}, // {"e", DimensionType::TheEnd},
}); // });
auto dimensionTypeParam = makeMandatory<CommandParameterDataType::ENUM>(&TeleportDimensionCommand::DimensionId, // auto dimensionTypeParam = makeMandatory<CommandParameterDataType::ENUM>(&TeleportDimensionCommand::DimensionId,
"Dimension", "DimensionType"); // "Dimension", "DimensionType");
auto dimensionIdParam = makeMandatory((int TeleportDimensionCommand::*)&TeleportDimensionCommand::DimensionId, // auto dimensionIdParam = makeMandatory((int TeleportDimensionCommand::*)&TeleportDimensionCommand::DimensionId,
"DimensionId"); // "DimensionId");
auto victimParam = makeMandatory(&TeleportDimensionCommand::Victim, "victim", // auto victimParam = makeMandatory(&TeleportDimensionCommand::Victim, "victim",
&TeleportDimensionCommand::Victim_isSet); // &TeleportDimensionCommand::Victim_isSet);
auto positionParam = makeOptional(&TeleportDimensionCommand::CommandPos, // auto positionParam = makeOptional(&TeleportDimensionCommand::CommandPos,
"Position", &TeleportDimensionCommand::CommandPos_isSet); // "Position", &TeleportDimensionCommand::CommandPos_isSet);
//
registry->registerOverload<TeleportDimensionCommand>( // registry->registerOverload<TeleportDimensionCommand>(
"tpdim", victimParam, dimensionTypeParam, positionParam); // "tpdim", victimParam, dimensionTypeParam, positionParam);
registry->registerOverload<TeleportDimensionCommand>( // registry->registerOverload<TeleportDimensionCommand>(
"tpdim", victimParam, dimensionIdParam, positionParam); // "tpdim", victimParam, dimensionIdParam, positionParam);
// registry->registerOverload<TeleportDimensionCommand>( // // registry->registerOverload<TeleportDimensionCommand>(
// "tpdim", dimensionTypeParam, positionParam); // // "tpdim", dimensionTypeParam, positionParam);
registry->registerOverload<TeleportDimensionCommand>( // registry->registerOverload<TeleportDimensionCommand>(
"tpdim", dimensionIdParam, positionParam); // "tpdim", dimensionIdParam, positionParam);
} // }
}; //};
//
void LLListPluginsCommand(CommandOutput& output) { //void LLListPluginsCommand(CommandOutput& output) {
auto plugins = LL::getAllPlugins(); // auto plugins = LL::getAllPlugins();
output.trSuccess("ll.cmd.listPlugin.overview", plugins.size()); // output.trSuccess("ll.cmd.listPlugin.overview", plugins.size());
//
std::ostringstream oss; // std::ostringstream oss;
for (auto& [name, plugin] : plugins) { // for (auto& [name, plugin] : plugins) {
string pluginName = name; // string pluginName = name;
if (pluginName.find("§") == string::npos) // if (pluginName.find("§") == string::npos)
pluginName = "§b" + pluginName; // pluginName = "§b" + pluginName;
string desc = plugin->desc; // string desc = plugin->desc;
if (desc.find("§") == string::npos) // if (desc.find("§") == string::npos)
desc = "§7" + desc; // desc = "§7" + desc;
//
auto fileName = UTF82String(std::filesystem::path(str2wstr(plugin->filePath)).filename().u8string()); // auto fileName = UTF82String(std::filesystem::path(str2wstr(plugin->filePath)).filename().u8string());
oss << fmt::format("- {} §a[v{}] §8({})\n {}\n", // oss << fmt::format("- {} §a[v{}] §8({})\n {}\n",
pluginName, plugin->version.toString(), fileName, desc); // pluginName, plugin->version.toString(), fileName, desc);
} // }
output.success(oss.str() + '\n'); // output.success(oss.str() + '\n');
output.trAddMessage("ll.cmd.listPlugin.tip"); // output.trAddMessage("ll.cmd.listPlugin.tip");
} //}
//
void LLPluginInfoCommand(CommandOutput& output, const string& pluginName) { //void LLPluginInfoCommand(CommandOutput& output, const string& pluginName) {
auto plugin = LL::getPlugin(pluginName); // auto plugin = LL::getPlugin(pluginName);
if (plugin) { // if (plugin) {
std::map<std::string, std::string> outs; // std::map<std::string, std::string> outs;
std::ostringstream oss; // std::ostringstream oss;
auto fn = UTF82String(std::filesystem::path(str2wstr(plugin->filePath)).filename().u8string()); // auto fn = UTF82String(std::filesystem::path(str2wstr(plugin->filePath)).filename().u8string());
string pluginType = plugin->type == Plugin::PluginType::ScriptPlugin ? "Script Plugin" : "DLL Plugin"; // string pluginType = plugin->type == Plugin::PluginType::ScriptPlugin ? "Script Plugin" : "DLL Plugin";
//
output.trAddMessage("ll.cmd.pluginInfo.title", pluginName); // output.trAddMessage("ll.cmd.pluginInfo.title", pluginName);
//
outs.emplace("Name", fmt::format("{} ({})", plugin->name, fn)); // outs.emplace("Name", fmt::format("{} ({})", plugin->name, fn));
outs.emplace("Description", plugin->desc); // outs.emplace("Description", plugin->desc);
outs.emplace("Version", "v" + plugin->version.toString(true)); // outs.emplace("Version", "v" + plugin->version.toString(true));
outs.emplace("Type", pluginType); // outs.emplace("Type", pluginType);
outs.emplace("File Path", plugin->filePath); // outs.emplace("File Path", plugin->filePath);
outs.merge(plugin->others); // outs.merge(plugin->others);
size_t width = 10; // size_t width = 10;
for (auto& [k, _] : outs) // for (auto& [k, _] : outs)
width = std::max(width, k.length()); // width = std::max(width, k.length());
for (auto& [k, v] : outs) { // for (auto& [k, v] : outs) {
if (k != "PluginType" && k != "PluginFilePath") // if (k != "PluginType" && k != "PluginFilePath")
oss << "- §l" << std::setw(width) << std::left << k << "§r: " << v << std::endl; // oss << "- §l" << std::setw(width) << std::left << k << "§r: " << v << std::endl;
} // }
auto text = oss.str(); // auto text = oss.str();
text.pop_back(); // text.pop_back();
output.success(text, {}); // output.success(text, {});
} else { // } else {
output.trError("ll.cmd.pluginInfo.error.pluginNotFound", pluginName); // output.trError("ll.cmd.pluginInfo.error.pluginNotFound", pluginName);
} // }
} //}
//
void LLVersionCommand(CommandOutput& output) { //void LLVersionCommand(CommandOutput& output) {
output.trSuccess("ll.cmd.version.msg", LL::getBdsVersion(), LL::getLoaderVersionString(), LL::getServerProtocolVersion()); // output.trSuccess("ll.cmd.version.msg", LL::getBdsVersion(), LL::getLoaderVersionString(), LL::getServerProtocolVersion());
} //}
//
void LLHelpCommand(CommandOutput& output) { //void LLHelpCommand(CommandOutput& output) {
output.trSuccess("ll.cmd.help.msg"); // output.trSuccess("ll.cmd.help.msg");
} //}
//
void LLLoadPluginCommand(CommandOutput& output, const string& path) { //void LLLoadPluginCommand(CommandOutput& output, const string& path) {
// if (!LL::isDebugMode()) // // if (!LL::isDebugMode())
// return; // // return;
if (PluginManager::loadPlugin(path, true)) { // if (PluginManager::loadPlugin(path, true)) {
output.trSuccess("ll.cmd.loadPlugin.success", path); // output.trSuccess("ll.cmd.loadPlugin.success", path);
} else { // } else {
output.trError("ll.cmd.loadPlugin.fail", path); // output.trError("ll.cmd.loadPlugin.fail", path);
} // }
} //}
//
void LLUnloadPluginCommand(CommandOutput& output, const string& pluginName) { //void LLUnloadPluginCommand(CommandOutput& output, const string& pluginName) {
// if (!LL::isDebugMode()) // // if (!LL::isDebugMode())
// return; // // return;
if (PluginManager::unloadPlugin(pluginName, true)) { // if (PluginManager::unloadPlugin(pluginName, true)) {
output.trSuccess("ll.cmd.unloadPlugin.success", pluginName); // output.trSuccess("ll.cmd.unloadPlugin.success", pluginName);
} else { // } else {
output.trError("ll.cmd.unloadPlugin.fail", pluginName); // output.trError("ll.cmd.unloadPlugin.fail", pluginName);
} // }
} //}
//
void LLReloadPluginCommand(CommandOutput& output, const string& pluginName, bool reloadAll) { //void LLReloadPluginCommand(CommandOutput& output, const string& pluginName, bool reloadAll) {
// if (!LL::isDebugMode()) // // if (!LL::isDebugMode())
// return; // // return;
if (!reloadAll) { // if (!reloadAll) {
if (PluginManager::reloadPlugin(pluginName, true)) { // if (PluginManager::reloadPlugin(pluginName, true)) {
output.trSuccess("ll.cmd.reloadPlugin.success", pluginName); // output.trSuccess("ll.cmd.reloadPlugin.success", pluginName);
} else { // } else {
output.trError("ll.cmd.reloadPlugin.fail", pluginName); // output.trError("ll.cmd.reloadPlugin.fail", pluginName);
} // }
} else { // } else {
int cnt = PluginManager::reloadAllPlugins(true); // int cnt = PluginManager::reloadAllPlugins(true);
if (cnt > 0) { // if (cnt > 0) {
output.trSuccess("ll.cmd.reloadAllPlugins.success", cnt); // output.trSuccess("ll.cmd.reloadAllPlugins.success", cnt);
} else { // } else {
output.trError("ll.cmd.reloadAllPlugins.fail"); // output.trError("ll.cmd.reloadAllPlugins.fail");
} // }
} // }
} //}
//
class LLCommand : public Command { //class LLCommand : public Command {
//
enum class Operation { // enum class Operation {
Version, // Version,
List, // List,
Help, // Help,
Load, // Load,
Unload, // Unload,
Reload // Reload
}; // };
//
Operation operation; // Operation operation;
bool hasUpgradeOption, hasPluginNameSet; // bool hasUpgradeOption, hasPluginNameSet;
CommandRawText pluginNameToDoOperation; // CommandRawText pluginNameToDoOperation;
//
public: //public:
void execute(CommandOrigin const& ori, CommandOutput& output) const override { // void execute(CommandOrigin const& ori, CommandOutput& output) const override {
output.setLanguageCode(ori); // output.setLanguageCode(ori);
std::string pluginName = ""; // std::string pluginName = "";
if (hasPluginNameSet) { // if (hasPluginNameSet) {
pluginName = pluginNameToDoOperation; // pluginName = pluginNameToDoOperation;
if (pluginName.size() > 1 && pluginName[0] == '"' && pluginName[pluginName.size() - 1] == '"' && pluginName[pluginName.size() - 2] != '\\') { // if (pluginName.size() > 1 && pluginName[0] == '"' && pluginName[pluginName.size() - 1] == '"' && pluginName[pluginName.size() - 2] != '\\') {
pluginName.erase(0, 1); // pluginName.erase(0, 1);
pluginName.pop_back(); // pluginName.pop_back();
} // }
} // }
switch (operation) { // switch (operation) {
case Operation::Version: // case Operation::Version:
LLVersionCommand(output); // LLVersionCommand(output);
break; // break;
case Operation::List: // case Operation::List:
if (!hasPluginNameSet) // if (!hasPluginNameSet)
LLListPluginsCommand(output); // LLListPluginsCommand(output);
else // else
LLPluginInfoCommand(output, pluginName); // LLPluginInfoCommand(output, pluginName);
break; // break;
case Operation::Load: // case Operation::Load:
if (hasPluginNameSet) // if (hasPluginNameSet)
LLLoadPluginCommand(output, pluginName); // LLLoadPluginCommand(output, pluginName);
else // else
output.trError("ll.cmd.error.noPathSpecified"); // output.trError("ll.cmd.error.noPathSpecified");
break; // break;
case Operation::Unload: // case Operation::Unload:
if (hasPluginNameSet) // if (hasPluginNameSet)
LLUnloadPluginCommand(output, pluginName); // LLUnloadPluginCommand(output, pluginName);
else // else
output.trError("ll.cmd.error.noNameSpecified"); // output.trError("ll.cmd.error.noNameSpecified");
break; // break;
case Operation::Reload: // case Operation::Reload:
if (hasPluginNameSet) // if (hasPluginNameSet)
LLReloadPluginCommand(output, pluginName, false); // LLReloadPluginCommand(output, pluginName, false);
else // else
LLReloadPluginCommand(output, "", true); // LLReloadPluginCommand(output, "", true);
break; // break;
case Operation::Help: // case Operation::Help:
LLHelpCommand(output); // LLHelpCommand(output);
break; // break;
default: // default:
break; // break;
} // }
} // }
//
static void setup(CommandRegistry* registry) { // static void setup(CommandRegistry* registry) {
// Register Cmd // // Register Cmd
registry->registerCommand("ll", "LiteLoaderBDS plugin operations", // registry->registerCommand("ll", "LiteLoaderBDS plugin operations",
CommandPermissionLevel::Console, {(CommandFlagValue)0}, {(CommandFlagValue)0x80}); // CommandPermissionLevel::Console, {(CommandFlagValue)0}, {(CommandFlagValue)0x80});
//
// Register softenum // // Register softenum
vector<string> pluginList; // vector<string> pluginList;
for (auto& [name, p] : LL::getAllPlugins()) { // for (auto& [name, p] : LL::getAllPlugins()) {
pluginList.push_back(name); // pluginList.push_back(name);
} // }
registry->addSoftEnum("PluginName", pluginList); // registry->addSoftEnum("PluginName", pluginList);
//
// ll version & help // // ll version & help
registry->addEnum<Operation>("Operation_Common", {{"version", Operation::Version}, // registry->addEnum<Operation>("Operation_Common", {{"version", Operation::Version},
{"help", Operation::Help}}); // {"help", Operation::Help}});
registry->registerOverload<LLCommand>( // registry->registerOverload<LLCommand>(
"ll", // "ll",
makeMandatory<CommandParameterDataType::ENUM>(&LLCommand::operation, "Operation", "Operation_Common").addOptions((CommandParameterOption)1)); // makeMandatory<CommandParameterDataType::ENUM>(&LLCommand::operation, "Operation", "Operation_Common").addOptions((CommandParameterOption)1));
//
// ll load // // ll load
registry->addEnum<Operation>("Operation_FreeFilePath", { // registry->addEnum<Operation>("Operation_FreeFilePath", {
{"load", Operation::Load}, // {"load", Operation::Load},
}); // });
registry->registerOverload<LLCommand>( // registry->registerOverload<LLCommand>(
"ll", // "ll",
makeMandatory<CommandParameterDataType::ENUM>(&LLCommand::operation, "Operation", "Operation_FreeFilePath").addOptions((CommandParameterOption)1), // makeMandatory<CommandParameterDataType::ENUM>(&LLCommand::operation, "Operation", "Operation_FreeFilePath").addOptions((CommandParameterOption)1),
makeMandatory<CommandParameterDataType::NORMAL>(&LLCommand::pluginNameToDoOperation, "pluginPath", nullptr, &LLCommand::hasPluginNameSet)); // makeMandatory<CommandParameterDataType::NORMAL>(&LLCommand::pluginNameToDoOperation, "pluginPath", nullptr, &LLCommand::hasPluginNameSet));
//
// ll unload // // ll unload
registry->addEnum<Operation>("Operation_MustPluginName", { // registry->addEnum<Operation>("Operation_MustPluginName", {
{"unload", Operation::Unload}, // {"unload", Operation::Unload},
}); // });
registry->registerOverload<LLCommand>( // registry->registerOverload<LLCommand>(
"ll", // "ll",
makeMandatory<CommandParameterDataType::ENUM>(&LLCommand::operation, "Operation", "Operation_MustPluginName").addOptions((CommandParameterOption)1), // makeMandatory<CommandParameterDataType::ENUM>(&LLCommand::operation, "Operation", "Operation_MustPluginName").addOptions((CommandParameterOption)1),
makeMandatory<CommandParameterDataType::SOFT_ENUM>((std::string LLCommand::*)&LLCommand::pluginNameToDoOperation, "pluginName", "PluginName", &LLCommand::hasPluginNameSet)); // makeMandatory<CommandParameterDataType::SOFT_ENUM>((std::string LLCommand::*)&LLCommand::pluginNameToDoOperation, "pluginName", "PluginName", &LLCommand::hasPluginNameSet));
//
// ll list & reload // // ll list & reload
registry->addEnum<Operation>("Operation_OptionalPluginName", { // registry->addEnum<Operation>("Operation_OptionalPluginName", {
{"list", Operation::List}, // {"list", Operation::List},
{"plugins", Operation::List}, // {"plugins", Operation::List},
{"reload", Operation::Reload}, // {"reload", Operation::Reload},
}); // });
registry->registerOverload<LLCommand>( // registry->registerOverload<LLCommand>(
"ll", // "ll",
makeMandatory<CommandParameterDataType::ENUM>(&LLCommand::operation, "Operation", "Operation_OptionalPluginName").addOptions((CommandParameterOption)1), // makeMandatory<CommandParameterDataType::ENUM>(&LLCommand::operation, "Operation", "Operation_OptionalPluginName").addOptions((CommandParameterOption)1),
makeOptional<CommandParameterDataType::SOFT_ENUM>((std::string LLCommand::*)&LLCommand::pluginNameToDoOperation, "pluginName", "PluginName", &LLCommand::hasPluginNameSet)); // makeOptional<CommandParameterDataType::SOFT_ENUM>((std::string LLCommand::*)&LLCommand::pluginNameToDoOperation, "pluginName", "PluginName", &LLCommand::hasPluginNameSet));
} // }
}; //};
//
class VersionCommand : public Command { //class VersionCommand : public Command {
//
public: //public:
void execute(CommandOrigin const& ori, CommandOutput& output) const override { // void execute(CommandOrigin const& ori, CommandOutput& output) const override {
output.setLanguageCode(ori); // output.setLanguageCode(ori);
#ifdef DEBUG //#ifdef DEBUG
Logger("CommandOrigin").warn(ori.serialize().toSNBT()); // Logger("CommandOrigin").warn(ori.serialize().toSNBT());
#endif // DEBUG //#endif // DEBUG
LLVersionCommand(output); // LLVersionCommand(output);
} // }
//
static void setup(CommandRegistry* registry) { // static void setup(CommandRegistry* registry) {
registry->registerCommand("version", "Get the version of this server", // registry->registerCommand("version", "Get the version of this server",
CommandPermissionLevel::GameMasters, {(CommandFlagValue)0}, {(CommandFlagValue)0x80}); // CommandPermissionLevel::GameMasters, {(CommandFlagValue)0}, {(CommandFlagValue)0x80});
registry->registerOverload<VersionCommand>("version"); // registry->registerOverload<VersionCommand>("version");
} // }
}; //};
//
void RegisterCommands() { //void RegisterCommands() {
Event::RegCmdEvent::subscribe([](Event::RegCmdEvent ev) { // Register commands // Event::RegCmdEvent::subscribe([](Event::RegCmdEvent ev) { // Register commands
LLCommand::setup(ev.mCommandRegistry); // LLCommand::setup(ev.mCommandRegistry);
VersionCommand::setup(ev.mCommandRegistry); // VersionCommand::setup(ev.mCommandRegistry);
if (LL::globalConfig.enableTpdimCommand) { // if (LL::globalConfig.enableTpdimCommand) {
TeleportDimensionCommand::setup(ev.mCommandRegistry); // TeleportDimensionCommand::setup(ev.mCommandRegistry);
} // }
return true; // return true;
}); // });
} //}

198
LiteLoader/Main/BuiltinUnlockCmd.cpp
View File

@ -1,102 +1,102 @@
#include "Global.h" //#include "Global.h"
#include <Main/Config.h> //#include <Main/Config.h>
#include <MC/CommandParameterData.hpp>
#include <LoggerAPI.h>
/////////////////// Built in UnlockCmd ///////////////////
bool isUnlockCmdEnabled = true;
// ==> LiteLoader/Main/SimpleServerLogger.cpp
void LogCommandRegistration(std::string const& name, char const* description, enum CommandPermissionLevel perm, short flag1, short flag2);
TInstanceHook(void, "?registerCommand@CommandRegistry@@QEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBDW4CommandPermissionLevel@@UCommandFlag@@3@Z",
CommandRegistry, std::string const& name, char const* description, enum CommandPermissionLevel perm, short flag1, short flag2) {
// For #643
if (name.find(' ') == std::string::npos) { // If no space inside
// Check whether command is already exists before registering
if (this->findCommand(name)) {
// throw to prevent setup function, then this exception can be caught by event handler
throw std::runtime_error("There is already a command named " + name);
}
}
if (LL::globalConfig.enableUnlockCmd) {
flag1 |= 0x80;
}
if (LL::globalConfig.debugMode) {
LogCommandRegistration(name, description, perm, flag1, flag2);
}
return original(this, name, description, perm, flag1, flag2);
}
class CommandSelectorBase;
class CommandOrigin;
TClasslessInstanceHook(bool, "?isExpansionAllowed@CommandSelectorBase@@AEBA_NAEBVCommandOrigin@@@Z",
CommandOrigin* a2) {
if (LL::globalConfig.enableUnlockCmd) {
original(this, a2);
return true;
}
return original(this, a2);
}
//#include <MC/AllowListCommand.hpp>
//#include <MC/CommandVersion.hpp>
//#include <MC/CommandRegistry.hpp>
//#include <MC/CommandParameterData.hpp> //#include <MC/CommandParameterData.hpp>
// inline void tryChangeStringToRawText(CommandParameterData& data) //#include <LoggerAPI.h>
//{ ///////////////////// Built in UnlockCmd ///////////////////
// if (false /* config.xxxx*/ && data.tid.value == type_id<CommandRegistry, std::string>().value) //
// { //bool isUnlockCmdEnabled = true;
// data.tid = type_id<CommandRegistry, CommandRawText>(); //
// data.parser = CommandRegistry::getParseFn<CommandRawText>(); //// ==> LiteLoader/Main/SimpleServerLogger.cpp
//void LogCommandRegistration(std::string const& name, char const* description, enum CommandPermissionLevel perm, short flag1, short flag2);
//
//TInstanceHook(void, "?registerCommand@CommandRegistry@@QEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBDW4CommandPermissionLevel@@UCommandFlag@@3@Z",
// CommandRegistry, std::string const& name, char const* description, enum CommandPermissionLevel perm, short flag1, short flag2) {
// // For #643
// if (name.find(' ') == std::string::npos) { // If no space inside
// // Check whether command is already exists before registering
// if (this->findCommand(name)) {
// // throw to prevent setup function, then this exception can be caught by event handler
// throw std::runtime_error("There is already a command named " + name);
// }
// } // }
// if (LL::globalConfig.enableUnlockCmd) {
// flag1 |= 0x80;
// }
// if (LL::globalConfig.debugMode) {
// LogCommandRegistration(name, description, perm, flag1, flag2);
// }
// return original(this, name, description, perm, flag1, flag2);
//} //}
//// allowlist //
// TInstanceHook(CommandRegistry::Overload*, "??$_registerOverload@VAllowListCommand@@VCommandParameterData@@V2@@CommandRegistry@@AEAAPEAUOverload@0@PEBDVCommandVersion@@AEBVCommandParameterData@@2@Z", //class CommandSelectorBase;
// CommandRegistry, char const* unk, class CommandVersion version, class CommandParameterData const& operationParam, class CommandParameterData& nameParam) //class CommandOrigin;
//{ //TClasslessInstanceHook(bool, "?isExpansionAllowed@CommandSelectorBase@@AEBA_NAEBVCommandOrigin@@@Z",
// tryChangeStringToRawText(nameParam); // CommandOrigin* a2) {
// return original(this, unk, version, operationParam, nameParam); // if (LL::globalConfig.enableUnlockCmd) {
// } // original(this, a2);
//// op // return true;
// TInstanceHook(CommandRegistry::Overload*, "??$_registerOverload@VOpCommand@@VCommandParameterData@@@CommandRegistry@@AEAAPEAUOverload@0@PEBDVCommandVersion@@AEBVCommandParameterData@@@Z", // }
// CommandRegistry, char const* unk, class CommandVersion version, class CommandParameterData& nameParam) // return original(this, a2);
//{ //}
// tryChangeStringToRawText(nameParam); //
// return original(this, unk, version, nameParam); ////#include <MC/AllowListCommand.hpp>
// } ////#include <MC/CommandVersion.hpp>
//// deop ////#include <MC/CommandRegistry.hpp>
// TInstanceHook(CommandRegistry::Overload*, "??$_registerOverload@VDeOpCommand@@VCommandParameterData@@@CommandRegistry@@AEAAPEAUOverload@0@PEBDVCommandVersion@@AEBVCommandParameterData@@@Z", ////#include <MC/CommandParameterData.hpp>
// CommandRegistry, char const* unk, class CommandVersion version, class CommandParameterData& nameParam) //// inline void tryChangeStringToRawText(CommandParameterData& data)
//{ ////{
// tryChangeStringToRawText(nameParam); //// if (false /* config.xxxx*/ && data.tid.value == type_id<CommandRegistry, std::string>().value)
// return original(this, unk, version, nameParam); //// {
// } //// data.tid = type_id<CommandRegistry, CommandRawText>();
// bool unlockNewExecute = true; //// data.parser = CommandRegistry::getParseFn<CommandRawText>();
// TClasslessInstanceHook(bool, "?isEnabled@FeatureToggles@@QEBA_NW4FeatureOptionID@@@Z", //// }
// int feature) ////}
// { ////// allowlist
// if (feature == 54 && unlockNewExecute) //// TInstanceHook(CommandRegistry::Overload*, "??$_registerOverload@VAllowListCommand@@VCommandParameterData@@V2@@CommandRegistry@@AEAAPEAUOverload@0@PEBDVCommandVersion@@AEBVCommandParameterData@@2@Z",
// return true; //// CommandRegistry, char const* unk, class CommandVersion version, class CommandParameterData const& operationParam, class CommandParameterData& nameParam)
// return original(this, feature); ////{
// } //// tryChangeStringToRawText(nameParam);
// TClasslessInstanceHook(void, "?addSemanticConstraint@CommandRegistry@@AEAAXW4SemanticConstraint@@@Z", //// return original(this, unk, version, operationParam, nameParam);
// enum SemanticConstraint) //// }
//{ ////// op
// return; //// TInstanceHook(CommandRegistry::Overload*, "??$_registerOverload@VOpCommand@@VCommandParameterData@@@CommandRegistry@@AEAAPEAUOverload@0@PEBDVCommandVersion@@AEBVCommandParameterData@@@Z",
// } //// CommandRegistry, char const* unk, class CommandVersion version, class CommandParameterData& nameParam)
TClasslessInstanceHook(void, "?addEnumValueConstraints@CommandRegistry@@QEAAXAEBV?$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@W4SemanticConstraint@@@Z", ////{
std::string const& enumName, std::vector<std::string> const& enumValues, SemanticConstraint constraint) { //// tryChangeStringToRawText(nameParam);
if (!LL::globalConfig.enableUnlockCmd) //// return original(this, unk, version, nameParam);
return original(this, enumName, enumValues, constraint); //// }
if (constraint & SemanticConstraint::RequiresCheatsEnabled) { ////// deop
constraint = (SemanticConstraint)(constraint & (~SemanticConstraint::RequiresCheatsEnabled)); //// TInstanceHook(CommandRegistry::Overload*, "??$_registerOverload@VDeOpCommand@@VCommandParameterData@@@CommandRegistry@@AEAAPEAUOverload@0@PEBDVCommandVersion@@AEBVCommandParameterData@@@Z",
constraint = (SemanticConstraint)(constraint | SemanticConstraint::RequiresElevatedPermissions); //// CommandRegistry, char const* unk, class CommandVersion version, class CommandParameterData& nameParam)
} ////{
// if (constraint & SemanticConstraint::RequiresHostPermissions) //// tryChangeStringToRawText(nameParam);
//{ //// return original(this, unk, version, nameParam);
// constraint = (SemanticConstraint)(constraint & (~SemanticConstraint::RequiresHostPermissions)); //// }
// constraint = (SemanticConstraint)(constraint | SemanticConstraint::RequiresElevatedPermissions); //// bool unlockNewExecute = true;
// } //// TClasslessInstanceHook(bool, "?isEnabled@FeatureToggles@@QEBA_NW4FeatureOptionID@@@Z",
return original(this, enumName, enumValues, constraint); //// int feature)
} //// {
//// if (feature == 54 && unlockNewExecute)
//// return true;
//// return original(this, feature);
//// }
//// TClasslessInstanceHook(void, "?addSemanticConstraint@CommandRegistry@@AEAAXW4SemanticConstraint@@@Z",
//// enum SemanticConstraint)
////{
//// return;
//// }
//TClasslessInstanceHook(void, "?addEnumValueConstraints@CommandRegistry@@QEAAXAEBV?$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@W4SemanticConstraint@@@Z",
// std::string const& enumName, std::vector<std::string> const& enumValues, SemanticConstraint constraint) {
// if (!LL::globalConfig.enableUnlockCmd)
// return original(this, enumName, enumValues, constraint);
// if (constraint & SemanticConstraint::RequiresCheatsEnabled) {
// constraint = (SemanticConstraint)(constraint & (~SemanticConstraint::RequiresCheatsEnabled));
// constraint = (SemanticConstraint)(constraint | SemanticConstraint::RequiresElevatedPermissions);
// }
// // if (constraint & SemanticConstraint::RequiresHostPermissions)
// //{
// // constraint = (SemanticConstraint)(constraint & (~SemanticConstraint::RequiresHostPermissions));
// // constraint = (SemanticConstraint)(constraint | SemanticConstraint::RequiresElevatedPermissions);
// // }
// return original(this, enumName, enumValues, constraint);
//}

68
LiteLoader/Main/LiteLoader.cpp
View File

@ -196,34 +196,34 @@ void CheckProtocolVersion() {
} }
} }
BOOL WINAPI ConsoleExitHandler(DWORD CEvent) { //BOOL WINAPI ConsoleExitHandler(DWORD CEvent) {
switch (CEvent) { // switch (CEvent) {
case CTRL_C_EVENT: // case CTRL_C_EVENT:
case CTRL_CLOSE_EVENT: // case CTRL_CLOSE_EVENT:
case CTRL_SHUTDOWN_EVENT: { // case CTRL_SHUTDOWN_EVENT: {
if (Global<Minecraft>) { // if (Global<Minecraft>) {
Global<Minecraft>->requestServerShutdown(); // Global<Minecraft>->requestServerShutdown();
} else { // } else {
std::terminate(); // std::terminate();
} // }
return TRUE; // return TRUE;
} // }
} // }
return FALSE; // return FALSE;
} //}
void UnixSignalHandler(int signum) { //void UnixSignalHandler(int signum) {
switch (signum) { // switch (signum) {
case SIGINT: // case SIGINT:
case SIGTERM: { // case SIGTERM: {
if (Global<Minecraft>) { // if (Global<Minecraft>) {
Global<Minecraft>->requestServerShutdown(); // Global<Minecraft>->requestServerShutdown();
} else { // } else {
std::terminate(); // std::terminate();
} // }
} // }
} // }
} //}
// extern // extern
extern void EndScheduleSystem(); extern void EndScheduleSystem();
@ -294,9 +294,9 @@ void LLMain() {
SetWindowText(hwnd, s.c_str()); SetWindowText(hwnd, s.c_str());
// Register Exit Event Handler. // Register Exit Event Handler.
SetConsoleCtrlHandler(ConsoleExitHandler, TRUE); // SetConsoleCtrlHandler(ConsoleExitHandler, TRUE);
signal(SIGTERM, UnixSignalHandler); // signal(SIGTERM, UnixSignalHandler);
signal(SIGINT, UnixSignalHandler); // signal(SIGINT, UnixSignalHandler);
// Welcome // Welcome
Welcome(); Welcome();
@ -305,15 +305,15 @@ void LLMain() {
CheckDevMode(); CheckDevMode();
// Addon Helper // Addon Helper
if (LL::globalConfig.enableAddonsHelper) { // if (LL::globalConfig.enableAddonsHelper) {
InitAddonsHelper(); // InitAddonsHelper();
} // }
// Load plugins // Load plugins
LL::LoadMain(); LL::LoadMain();
// Register built-in commands // Register built-in commands
RegisterCommands(); //RegisterCommands();
// Register simple server logger // Register simple server logger
RegisterSimpleServerLogger(); RegisterSimpleServerLogger();

2
LiteLoader/Main/Loader.cpp
View File

@ -184,7 +184,7 @@ void LoadParticleAPI() {
auto lib = LoadLibrary(str2wstr(path).c_str()); auto lib = LoadLibrary(str2wstr(path).c_str());
if (lib) { if (lib) {
logger.info(tr("ll.loader.loadParticleAPI.success")); logger.info(tr("ll.loader.loadParticleAPI.success"));
ParticleCUI::init(lib); //ParticleCUI::init(lib);
} else { } else {
logger.error("Fail to load ParticleAPI!"); logger.error("Fail to load ParticleAPI!");
logger.error("Error: Code[{}] - {}", GetLastError(), GetLastErrorMessage()); logger.error("Error: Code[{}] - {}", GetLastError(), GetLastErrorMessage());

94
LiteLoader/Main/ModifyInfomation.cpp
View File

@ -79,50 +79,50 @@ THook(void, "?log@BedrockLog@@YAXW4LogCategory@1@V?$bitset@$02@std@@W4LogRule@1@
return BedrockLog::log_va(a1, a2, a3, a4, a5, a6, a7, a8, va); return BedrockLog::log_va(a1, a2, a3, a4, a5, a6, a7, a8, va);
} }
#include <MC/ColorFormat.hpp> //#include <MC/ColorFormat.hpp>
#include <MC/CommandOrigin.hpp> //#include <MC/CommandOrigin.hpp>
#include <MC/CommandOutput.hpp> //#include <MC/CommandOutput.hpp>
extern std::unordered_map<CommandOrigin const*, string*> resultOfOrigin; //extern std::unordered_map<CommandOrigin const*, string*> resultOfOrigin;
TClasslessInstanceHook(void*, "?send@CommandOutputSender@@UEAAXAEBVCommandOrigin@@AEBVCommandOutput@@@Z", //TClasslessInstanceHook(void*, "?send@CommandOutputSender@@UEAAXAEBVCommandOrigin@@AEBVCommandOutput@@@Z",
class CommandOrigin const& origin, class CommandOutput const& output) { // class CommandOrigin const& origin, class CommandOutput const& output) {
std::stringbuf tmpBuf; // std::stringbuf tmpBuf;
auto oldBuf = std::cout.rdbuf(); // auto oldBuf = std::cout.rdbuf();
std::cout.rdbuf(&tmpBuf); // std::cout.rdbuf(&tmpBuf);
auto rv = original(this, origin, output); // auto rv = original(this, origin, output);
std::cout.rdbuf(oldBuf); // std::cout.rdbuf(oldBuf);
if (LL::isDebugMode() && LL::globalConfig.tickThreadId != std::this_thread::get_id()) { // if (LL::isDebugMode() && LL::globalConfig.tickThreadId != std::this_thread::get_id()) {
logger.warn("The thread executing the CommandOutputSender::send is not the \"MC_SERVER\" thread"); // logger.warn("The thread executing the CommandOutputSender::send is not the \"MC_SERVER\" thread");
logger.warn("Output: {}", tmpBuf.str()); // logger.warn("Output: {}", tmpBuf.str());
} // }
//
auto it = resultOfOrigin.find(&origin); // auto it = resultOfOrigin.find(&origin);
if (it != resultOfOrigin.end()) { // if (it != resultOfOrigin.end()) {
try { // try {
// May crash for incomprehensible reasons // // May crash for incomprehensible reasons
it->second->assign(tmpBuf.str()); // it->second->assign(tmpBuf.str());
while (it->second->size() && (it->second->back() == '\n' || it->second->back() == '\r')) // while (it->second->size() && (it->second->back() == '\n' || it->second->back() == '\r'))
it->second->pop_back(); // it->second->pop_back();
it->second = nullptr; // it->second = nullptr;
resultOfOrigin.erase(it); // resultOfOrigin.erase(it);
return rv; // return rv;
} catch (...) { // } catch (...) {
if (LL::isDebugMode()) { // if (LL::isDebugMode()) {
logger.warn("Output: {}", tmpBuf.str()); // logger.warn("Output: {}", tmpBuf.str());
logger.warn("size of resultOfOrigin: {}", resultOfOrigin.size()); // logger.warn("size of resultOfOrigin: {}", resultOfOrigin.size());
} // }
#ifdef DEBUG //#ifdef DEBUG
__debugbreak(); // __debugbreak();
#endif // DEBUG //#endif // DEBUG
} // }
} // }
auto& log = output.getSuccessCount() > 0 ? serverLogger.info : serverLogger.error; // auto& log = output.getSuccessCount() > 0 ? serverLogger.info : serverLogger.error;
std::istringstream iss(tmpBuf.str()); // std::istringstream iss(tmpBuf.str());
string line; // string line;
while (getline(iss, line)) { // while (getline(iss, line)) {
if (LL::globalConfig.colorLog) // if (LL::globalConfig.colorLog)
log << ColorFormat::convertToConsole(line, false) << Logger::endl; // log << ColorFormat::convertToConsole(line, false) << Logger::endl;
else // else
log << ColorFormat::removeColorCode(line) << Logger::endl; // log << ColorFormat::removeColorCode(line) << Logger::endl;
} // }
return rv; // return rv;
} //}

97
LiteLoader/Main/ModifyPack.cpp
View File

@ -1,49 +1,48 @@
#include <Global.h> //#include <Global.h>
#include <MC/Core.hpp> //#include <MC/Core.hpp>
#include "LiteLoader.h" //#include "LiteLoader.h"
#include <MC/ResourcePack.hpp> //#include <MC/ResourcePack.hpp>
#include <MC/Pack.hpp> //#include <MC/Pack.hpp>
#include <MC/ResourceLocation.hpp> //#include <MC/ResourceLocation.hpp>
#include <MC/ResourcePackRepository.hpp> //#include <MC/ResourcePackRepository.hpp>
#include <MC/Types.hpp> //#include <MC/Types.hpp>
#include <MC/SemVersion.hpp> //#include <MC/SemVersion.hpp>
#include <MC/PackManifest.hpp> //#include <MC/PackManifest.hpp>
#include <MC/ResourcePackStack.hpp> //#include <MC/ResourcePackStack.hpp>
#include <MC/PackSettingsFactory.hpp> //#include <MC/PackSettingsFactory.hpp>
#include <MC/PackSettings.hpp> //#include <MC/PackSettings.hpp>
#include <MC/PackInstance.hpp> //#include <MC/PackInstance.hpp>
#include <MC/IResourcePackRepository.hpp> //#include <MC/PackIdVersion.hpp>
#include <MC/PackIdVersion.hpp> //
//namespace ModifyPack {
namespace ModifyPack { // vector<PackIdVersion> PackListCache;
vector<PackIdVersion> PackListCache; //}
} //
//THook(ResourcePack*, "??0ResourcePack@@QEAA@AEAVPack@@@Z",
THook(ResourcePack*, "??0ResourcePack@@QEAA@AEAVPack@@@Z", // ResourcePack* self, Pack* a2) {
ResourcePack* self, Pack* a2) { // auto Pack = original(self, a2);
auto Pack = original(self, a2); // auto manifest = &Pack->getManifest();
auto manifest = &Pack->getManifest(); // if (manifest && manifest->getPackOrigin() == PackOrigin::PackOrigin_Dev) {
if (manifest && manifest->getPackOrigin() == PackOrigin::PackOrigin_Dev) { // ModifyPack::PackListCache.push_back(a2->getManifest().getIdentity());
ModifyPack::PackListCache.push_back(a2->getManifest().getIdentity()); // }
} // return Pack;
return Pack; //}
} //
//THook(std::unique_ptr<ResourcePackStack>, "?deserialize@ResourcePackStack@@SA?AV?$unique_ptr@VResourcePackStack@@U?$default_delete@VResourcePackStack@@@std@@@std@@AEAV?$basic_istream@DU?$char_traits@D@std@@@3@AEBVIResourcePackRepository@@@Z",
THook(std::unique_ptr<ResourcePackStack>, "?deserialize@ResourcePackStack@@SA?AV?$unique_ptr@VResourcePackStack@@U?$default_delete@VResourcePackStack@@@std@@@std@@AEAV?$basic_istream@DU?$char_traits@D@std@@@3@AEBVIResourcePackRepository@@@Z", // __int64 a2, ResourcePackRepository* a3) {
__int64 a2, ResourcePackRepository* a3) { // auto Stack = original( a2, a3);
auto Stack = original( a2, a3); // for (auto& id : ModifyPack::PackListCache) {
for (auto& id : ModifyPack::PackListCache) { // auto Pack = a3->getResourcePackForPackId(id);
auto Pack = a3->getResourcePackForPackId(id); // auto& SettingsFactory = a3->getPackSettingsFactory();
auto& SettingsFactory = a3->getPackSettingsFactory(); // auto settings = SettingsFactory.getPackSettings(Pack->getManifest());
auto settings = SettingsFactory.getPackSettings(Pack->getManifest()); // char gsl[16];
char gsl[16]; // auto gslPath = SymCall("??$?0PEAVResourcePack@@X@?$not_null@V?$NonOwnerPointer@VResourcePack@@@Bedrock@@@gsl@@QEAA@AEBV?$not_null@PEAVResourcePack@@@1@@Z",
auto gslPath = SymCall("??$?0PEAVResourcePack@@X@?$not_null@V?$NonOwnerPointer@VResourcePack@@@Bedrock@@@gsl@@QEAA@AEBV?$not_null@PEAVResourcePack@@@1@@Z", // void*, char*, ResourcePack**)(gsl, &Pack);
void*, char*, ResourcePack**)(gsl, &Pack); // char size[480];
char size[480]; // auto Instance = SymCall("??0PackInstance@@QEAA@V?$not_null@V?$NonOwnerPointer@VResourcePack@@@Bedrock@@@gsl@@H_NPEAVPackSettings@@@Z",
auto Instance = SymCall("??0PackInstance@@QEAA@V?$not_null@V?$NonOwnerPointer@VResourcePack@@@Bedrock@@@gsl@@H_NPEAVPackSettings@@@Z", // PackInstance*, char*, void*, int, bool, PackSettings*)(size, gslPath, 0, false, settings);
PackInstance*, char*, void*, int, bool, PackSettings*)(size, gslPath, 0, false, settings); // Stack->add(*Instance, *(IResourcePackRepository*)a3, 0);
Stack->add(*Instance, *(IResourcePackRepository*)a3, 0); // }
} // ModifyPack::PackListCache.clear();
ModifyPack::PackListCache.clear(); // return Stack;
return Stack; //}
}