update clang-format

fix registerCommand error
fix mc.pyi

.clang-format

@@ -1,6 +1,14 @@
 # Author: twoone-3
 # Reference: https://releases.llvm.org/13.0.0/tools/clang/docs/ClangFormatStyleOptions.html
 
+# General Options
+BasedOnStyle: LLVM
+Language: Cpp
+Standard: Auto
+TabWidth: 4
+UseTab: ForIndentation
+
+# Other Options
 AccessModifierOffset: -4
 AlignAfterOpenBracket: DontAlign
 AlignArrayOfStructures: Left
@@ -10,31 +18,34 @@ AlignConsecutiveDeclarations: None
 AlignConsecutiveMacros: None
 AlignEscapedNewlines: Left
 AlignOperands: DontAlign
-AlignTrailingComments: false
+AlignTrailingComments: true
 AllowAllArgumentsOnNextLine: true
 AllowAllConstructorInitializersOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: Empty
 AllowShortCaseLabelsOnASingleLine: true
-AllowShortEnumsOnASingleLine: false
+AllowShortEnumsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLambdasOnASingleLine: All
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterReturnType: None
 AlwaysBreakTemplateDeclarations: Yes
-BasedOnStyle: LLVM
 BinPackArguments: false
 BinPackParameters: false
-BreakBeforeBraces: Attach
+BreakBeforeBraces: Custom
+BraceWrapping:
+  BeforeCatch: true
+  BeforeElse: true
+  BeforeWhile: true
 ColumnLimit: 0
 Cpp11BracedListStyle: true
+EmptyLineAfterAccessModifier: Leave
 FixNamespaceComments: true
 IndentCaseLabels: true
 IndentPPDirectives: None
 IndentWidth: 4
 KeepEmptyLinesAtTheStartOfBlocks: false
-Language: Cpp
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
 PointerAlignment: Left
@@ -45,10 +56,8 @@ SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeParens: ControlStatements
+SpacesBeforeTrailingComments: 0
 SpaceInEmptyParentheses: false
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard: Latest
-TabWidth: 4
-UseTab: Always

API/BlockAPI.cpp

@@ -1,4 +1,4 @@
-#include "BlockAPI.h"
+#include "BlockAPI.h"
 #include "McAPI.h"
 #include "ContainerAPI.h"
 #include "BlockEntityAPI.h"

API/BlockAPI.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <Global.hpp>
 #include <MC/BlockInstance.hpp>
 

API/BlockEntityAPI.cpp

@@ -1,4 +1,4 @@
-#include "BlockAPI.h"
+#include "BlockAPI.h"
 #include "BlockEntityAPI.h"
 #include "NBTAPI.h"
 #include <MC/BlockActor.hpp>

API/BlockEntityAPI.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <Global.hpp>
 
 class BlockActor;
@@ -8,7 +8,7 @@ struct BlockEntityClass {
 	BlockActor* thiz;
 	int dim;
 
-	BlockEntityClass(BlockActor* be,int dim);
+	BlockEntityClass(BlockActor* be, int dim);
 
 	BlockPos getPos();
 	int getType();

API/CommandAPI.cpp

@@ -1,4 +1,4 @@
-#include "CommandAPI.h"
+#include "CommandAPI.h"
 #include "McAPI.h"
 #include "ItemAPI.h"
 #include "EntityAPI.h"
@@ -14,68 +14,68 @@
 
 py::object convertResult(const DynamicCommand::Result& result) {
 	if (!result.isSet)
-		return py::object(); // null
+		return py::object();// null
 	switch (result.type) {
-	case DynamicCommand::ParameterType::Bool:
-		return py::bool_(result.getRaw<bool>());
-	case DynamicCommand::ParameterType::Int:
-		return py::int_(result.getRaw<int>());
-	case DynamicCommand::ParameterType::Float:
-		return py::float_(result.getRaw<float>());
-	case DynamicCommand::ParameterType::String:
-		return py::str(result.getRaw<string>());
-	case DynamicCommand::ParameterType::Actor: {
-		py::list arr;
-		for (auto i : result.get<vector<Actor*>>()) {
-			arr.append(EntityClass(i));
+		case DynamicCommand::ParameterType::Bool:
+			return py::bool_(result.getRaw<bool>());
+		case DynamicCommand::ParameterType::Int:
+			return py::int_(result.getRaw<int>());
+		case DynamicCommand::ParameterType::Float:
+			return py::float_(result.getRaw<float>());
+		case DynamicCommand::ParameterType::String:
+			return py::str(result.getRaw<string>());
+		case DynamicCommand::ParameterType::Actor: {
+			py::list arr;
+			for (auto i : result.get<vector<Actor*>>()) {
+				arr.append(EntityClass(i));
+			}
+			return arr;
 		}
-		return arr;
-	}
-	case DynamicCommand::ParameterType::Player: {
-		py::list arr;
-		for (auto i : result.get<vector<Player*>>()) {
-			arr.append(PlayerClass(i));
+		case DynamicCommand::ParameterType::Player: {
+			py::list arr;
+			for (auto i : result.get<vector<Player*>>()) {
+				arr.append(PlayerClass(i));
+			}
+			return arr;
 		}
-		return arr;
-	}
-	case DynamicCommand::ParameterType::BlockPos: {
-		py::list arr;
-		arr.append(result.get<BlockPos>());
-		auto dim = result.origin->getDimension();
-		arr.append(dim ? int(dim->getDimensionId()) : -1);
-		return arr;
-	}
-	case DynamicCommand::ParameterType::Vec3: {
-		py::list arr;
-		arr.append(result.get<Vec3>());
-		auto dim = result.origin->getDimension();
-		arr.append(dim ? int(dim->getDimensionId()) : -1);
-		return arr;
-	}
-	case DynamicCommand::ParameterType::Message:
-		return py::str(result.getRaw<CommandMessage>().getMessage(*result.origin));
-	case DynamicCommand::ParameterType::RawText:
-		return py::str(result.getRaw<string>());
-	case DynamicCommand::ParameterType::JsonValue:
-		return py::str(JsonHelpers::serialize(result.getRaw<Json::Value>()));
-	case DynamicCommand::ParameterType::Item:
-		return py::cast(ItemClass(new ItemStack(result.getRaw<CommandItem>().createInstance(1, 1, nullptr, true).value_or(ItemInstance::EMPTY_ITEM))));
-	case DynamicCommand::ParameterType::Block:
-		return py::cast(BlockClass(BlockInstance::createBlockInstance(
-			const_cast<Block*>(result.getRaw<Block const*>()), BlockPos::MIN, -1)));
-	case DynamicCommand::ParameterType::Effect:
-		return py::str(result.getRaw<MobEffect const*>()->getResourceName());
-	case DynamicCommand::ParameterType::Enum:
-		return py::str(result.getRaw<string>());
-	case DynamicCommand::ParameterType::SoftEnum:
-		return py::str(result.getRaw<string>());
-	case DynamicCommand::ParameterType::Command:
-		return py::str(result.getRaw<unique_ptr<Command>>()->getCommandName());
-	case DynamicCommand::ParameterType::ActorType:
-		return py::str(result.getRaw<ActorDefinitionIdentifier const*>()->getCanonicalName());
-	default:
-		return py::object(); // null
-		break;
+		case DynamicCommand::ParameterType::BlockPos: {
+			py::list arr;
+			arr.append(result.get<BlockPos>());
+			auto dim = result.origin->getDimension();
+			arr.append(dim ? int(dim->getDimensionId()) : -1);
+			return arr;
+		}
+		case DynamicCommand::ParameterType::Vec3: {
+			py::list arr;
+			arr.append(result.get<Vec3>());
+			auto dim = result.origin->getDimension();
+			arr.append(dim ? int(dim->getDimensionId()) : -1);
+			return arr;
+		}
+		case DynamicCommand::ParameterType::Message:
+			return py::str(result.getRaw<CommandMessage>().getMessage(*result.origin));
+		case DynamicCommand::ParameterType::RawText:
+			return py::str(result.getRaw<string>());
+		case DynamicCommand::ParameterType::JsonValue:
+			return py::str(JsonHelpers::serialize(result.getRaw<Json::Value>()));
+		case DynamicCommand::ParameterType::Item:
+			return py::cast(ItemClass(new ItemStack(result.getRaw<CommandItem>().createInstance(1, 1, nullptr, true).value_or(ItemInstance::EMPTY_ITEM))));
+		case DynamicCommand::ParameterType::Block:
+			return py::cast(BlockClass(BlockInstance::createBlockInstance(
+			    const_cast<Block*>(result.getRaw<Block const*>()), BlockPos::MIN, -1)));
+		case DynamicCommand::ParameterType::Effect:
+			return py::str(result.getRaw<MobEffect const*>()->getResourceName());
+		case DynamicCommand::ParameterType::Enum:
+			return py::str(result.getRaw<string>());
+		case DynamicCommand::ParameterType::SoftEnum:
+			return py::str(result.getRaw<string>());
+		case DynamicCommand::ParameterType::Command:
+			return py::str(result.getRaw<unique_ptr<Command>>()->getCommandName());
+		case DynamicCommand::ParameterType::ActorType:
+			return py::str(result.getRaw<ActorDefinitionIdentifier const*>()->getCanonicalName());
+		default:
+			return py::object();// null
+			break;
 	}
 }
 
@@ -157,13 +157,12 @@ bool CommandClass::setCallback(const py::function& cb) {
 	if (thiz == nullptr)
 		return false;
 	thiz->setCallback(
-		[cb](const DynamicCommand& command, const CommandOrigin& origin,
-			CommandOutput& output, std::unordered_map<string, DynamicCommand::Result>& results) {
-			PY_TRY;
-			py::gil_scoped_acquire gil_;
-			cb(CommandOriginClass(const_cast<CommandOrigin*>(&origin)), results);
-			PY_CATCH;
-		});
+	    [cb](const DynamicCommand& command, const CommandOrigin& origin, CommandOutput& output, std::unordered_map<string, DynamicCommand::Result>& results) {
+		    PY_TRY;
+		    py::gil_scoped_acquire gil_;
+		    cb(CommandOriginClass(const_cast<CommandOrigin*>(&origin)), results);
+		    PY_CATCH;
+	    });
 	return true;
 }
 

API/CommandAPI.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <Global.hpp>
 #include <DynamicCommandAPI.h>
 
@@ -11,17 +11,13 @@ struct CommandClass {
 	string getName();
 	bool setAlias(const string& alias);
 	// name, type, description, identifier, option
-	int64_t mandatory(const string& name, DynamicCommand::ParameterType type,
-		string description = "", string identifier = "", CommandParameterOption option = None);
+	int64_t mandatory(const string& name, DynamicCommand::ParameterType type, string description = "", string identifier = "", CommandParameterOption option = None);
 	// name, type, description, option
-	int64_t mandatory(const string& name, DynamicCommand::ParameterType type,
-		string description = "", CommandParameterOption option = None);
+	int64_t mandatory(const string& name, DynamicCommand::ParameterType type, string description = "", CommandParameterOption option = None);
 	// name, type, description, identifier, option
-	int64_t optional(const string& name, DynamicCommand::ParameterType type,
-		string description = "", string identifier = "", CommandParameterOption option = None);
+	int64_t optional(const string& name, DynamicCommand::ParameterType type, string description = "", string identifier = "", CommandParameterOption option = None);
 	// name, type, description, option
-	int64_t optional(const string& name, DynamicCommand::ParameterType type,
-		string description = "", CommandParameterOption option = None);
+	int64_t optional(const string& name, DynamicCommand::ParameterType type, string description = "", CommandParameterOption option = None);
 	bool addOverload();
 	// vector<index>
 	bool addOverload(const vector<size_t>& args);
@@ -33,10 +29,10 @@ struct CommandClass {
 	bool setup();
 	string toString();
 
-	// SoftEnum 是带补全的字符串
-	// 补全项可以实时更改
-	// 不同选项不能接不同参数
-	// Enum 则可以做到
+	// SoftEnum 是带补全的字符串
+	// 补全项可以实时更改
+	// 不同选项不能接不同参数
+	// Enum 则可以做到
 	// cmd <add|remove> name
 	// cmd <list>
 	// cmd <rename> name name2
@@ -48,4 +44,3 @@ struct CommandClass {
 	vector<string> getSoftEnumValues(const string& name);
 	vector<string> getSoftEnumNames();
 };
-

API/CommandOriginAPI.cpp

@@ -1,4 +1,4 @@
-#include "CommandOriginAPI.h"
+#include "CommandOriginAPI.h"
 #include "NBTAPI.h"
 #include "EntityAPI.h"
 #include "BlockAPI.h"

API/CommandOriginAPI.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <Global.hpp>
 
 struct EntityClass;

API/CommandOutputAPI.cpp

@@ -1,7 +1,6 @@
-#include "CommandOutputAPI.h"
+#include "CommandOutputAPI.h"
 #include <MC/CommandOutput.hpp>
 
-
 CommandOutputClass::CommandOutputClass(CommandOutput* p) : thiz(p) {}
 
 bool CommandOutputClass::empty() {

API/CommandOutputAPI.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <Global.hpp>
 
 class CommandOutput;

API/ContainerAPI.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <Global.hpp>
 
 class Container;

API/EntityAPI.cpp

@@ -1,4 +1,4 @@
-#include "BlockAPI.h"
+#include "BlockAPI.h"
 #include "EntityAPI.h"
 #include "PlayerAPI.h"
 #include "ItemAPI.h"
@@ -82,7 +82,7 @@ float EntityClass::getSpeed() {
 
 Vec2 EntityClass::getDirection() {
 	if (thiz == nullptr)
-		return Vec2(0.f,0.f);
+		return Vec2(0.f, 0.f);
 	return *thiz->getDirection();
 }
 
@@ -219,7 +219,7 @@ EntityClass EntityClass::getEntityFromViewVector(float maxDistance) {
 	return thiz->getActorFromViewVector(maxDistance);
 }
 
-BlockClass EntityClass::getBlockFromViewVector(bool includeLiquid, bool solidOnly, float maxDistance, bool ignoreBorderBlocks, bool fullOnly) {	
+BlockClass EntityClass::getBlockFromViewVector(bool includeLiquid, bool solidOnly, float maxDistance, bool ignoreBorderBlocks, bool fullOnly) {
 	if (thiz == nullptr)
 		return BlockInstance::Null;
 	return thiz->getBlockFromViewVector(includeLiquid, solidOnly, maxDistance, ignoreBorderBlocks, fullOnly);

API/EntityAPI.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <Global.hpp>
 
 class Actor;
@@ -49,9 +49,9 @@ struct EntityClass {
 	vector<string> getAllTags();
 	EntityClass getEntityFromViewVector(float maxDistance = 5.25f);
 	BlockClass getBlockFromViewVector(
-		bool includeLiquid = false,
-		bool solidOnly = false,
-		float maxDistance = 5.25f,
-		bool ignoreBorderBlocks = true,
-		bool fullOnly = false);
+	    bool includeLiquid = false,
+	    bool solidOnly = false,
+	    float maxDistance = 5.25f,
+	    bool ignoreBorderBlocks = true,
+	    bool fullOnly = false);
 };