Skip to content

Commit 2b9625a

Browse files
Singl-DaemonSingl-Daemon
committed
Merge branch 'develop' of https://github.com/TelluriumDev/Komomo into develop
2 parents e6b6422 + 6c2791f commit 2b9625a

File tree

2 files changed

+201
-1
lines changed

2 files changed

+201
-1
lines changed

‎CODE_OF_CONDUCT.md

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, religion, or sexual identity
10+
and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
[email protected].
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
82+
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series
86+
of actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or
93+
permanent ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within
113+
the community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.0, available at
119+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
120+
121+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122+
enforcement ladder](https://github.com/mozilla/diversity).
123+
124+
[homepage]: https://www.contributor-covenant.org
125+
126+
For answers to common questions about this code of conduct, see the FAQ at
127+
https://www.contributor-covenant.org/faq. Translations are available at
128+
https://www.contributor-covenant.org/translations.

‎src/Manager/BindAPI.h

Lines changed: 73 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,30 @@
33
#include "API/Actor/Actor.h"
44
#include "API/Actor/ActorDamageSource.h"
55
#include "API/Actor/ActorDefinitionIdentifier.h"
6+
#include "API/Actor/ActorInteraction.h"
67
#include "API/Actor/ActorUniqueID.h"
78
#include "API/Actor/ItemActor.h"
9+
#include "API/Actor/SculkCatalystBlockActor.h"
810
#include "API/Block/Block.h"
911
#include "API/Block/BlockPos.h"
1012
#include "API/Block/BlockSource.h"
13+
#include "API/Block/BlockState.h"
14+
#include "API/Block/IConstBlockSource.h"
15+
#include "API/Block/Material.h"
1116
#include "API/Command/Command.h"
1217
#include "API/Command/CommandContext.h"
18+
#include "API/Command/CommandFlag.h"
1319
#include "API/Command/CommandOrigin.h"
1420
#include "API/Command/CommandOutput.h"
21+
#include "API/Command/CommandRegistry.h"
1522
#include "API/Command/MinecraftCommands.h"
23+
#include "API/Command/MCRESULT.h"
1624
#include "API/Container/Container.h"
25+
#include "API/Dimension/AutomaticID.h"
26+
#include "API/Dimension/ChangeDimensionRequest.h"
27+
#include "API/Dimension/Dimension.h"
28+
#include "API/Dimension/DimensionType.h"
29+
#include "API/Entity/EntityContext.h"
1730
#include "API/Enum/EnumBuilder.h"
1831
#include "API/Event/Event.h"
1932
#include "API/Event/Listener.h"
@@ -23,20 +36,41 @@
2336
#include "API/Form/SimpleForm.h"
2437
#include "API/Item/Item.h"
2538
#include "API/Item/ItemStack.h"
39+
#include "API/Item/ItemStackBase.h"
40+
#include "API/Item/ItemStackRequestActionTransferBase.h"
2641
#include "API/Level/Level.h"
42+
#include "API/Level/Explosion.h"
2743
#include "API/Logger/Logger.h"
44+
#include "API/Math/AABB.h"
45+
#include "API/Math/HitResult.h"
46+
#include "API/Math/Random.h"
47+
#include "API/Math/UUID.h"
48+
#include "API/Math/Vec.h"
49+
#include "API/Math/Vec2.h"
2850
#include "API/Math/Vec3.h"
2951
#include "API/Mob/Agent.h"
3052
#include "API/Mob/Mob.h"
53+
#include "API/Mob/MobEffectInstance.h"
3154
#include "API/Mod/Mod.h"
55+
#include "API/Network/ConnectionRequest.h"
56+
#include "API/Network/LoopbackPacketSender.h"
57+
#include "API/Network/NetworkIdentifier.h"
58+
#include "API/Network/ServerNetworkHandler.h"
59+
#include "API/Network/Packet/ChangeDimensionPacket.h"
60+
#include "API/Network/Packet/Packet.h"
61+
#include "API/Network/Packet/UpdateEquipPacket.h"
62+
#include "API/Network/Packet/UpdateTradePacket.h"
3263
#include "API/Player/Gamemode.h"
3364
#include "API/Player/LayeredAbilities.h"
3465
#include "API/Player/Player.h"
66+
#include "API/Player/PlayerMovementSettings.h"
67+
#include "API/Player/ServerPlayer.h"
3568
#include "API/Player/SimulatedPlayer.h"
3669
#include "API/Service/Service.h"
3770

3871
#include "ExtraAPI/Config/Config.h"
3972
#include "ExtraAPI/KeyValueDb/KeyValueDB.h"
73+
#include "ExtraAPI/NetWork/WebSocket.h"
4074
#include "Utils/Using.h"
4175

4276

@@ -51,6 +85,8 @@ inline void BindAPI(ScriptEngine* engine) {
5185
engine->registerNativeClass<PlayerClass>(playerClassBuilder);
5286
engine->registerNativeClass<GameModeClass>(gameModeClassBuilder);
5387
engine->registerNativeClass<LayeredAbilitiesClass>(layeredAbilitiesClassBuilder);
88+
engine->registerNativeClass<PlayerMovementSettingsClass>(playerMovementSettingsClassBuilder);
89+
// engine->registerNativeClass<ServerPlayerClass>(serverplayerClassBuilder);
5490
engine->registerNativeClass<SimulatedPlayerClass>(simulatedPlayerClassBuilder);
5591

5692
engine->registerNativeClass<EventBusClass>(eventBusClassBuilder);
@@ -66,37 +102,73 @@ inline void BindAPI(ScriptEngine* engine) {
66102
engine->registerNativeClass<ItemClass>(itemClassBuilder);
67103
engine->registerNativeClass<ItemStackClass>(itemStackClassBuilder);
68104
engine->registerNativeClass<ItemActorClass>(itemActorClassBuilder);
105+
engine->registerNativeClass<ItemStackBaseClass>(itemStackBaseClassBuilder);
106+
engine->registerNativeClass<ItemStackRequestActionTransferBaseClass>(itemStackRequestActionTransferBaseClassBuilder);
69107

70108
engine->registerNativeClass<ActorClass>(actorClassBuilder);
71109
engine->registerNativeClass<ActorDefinitionIdentifierClass>(actorDefinitionIdentifierClassBuilder);
110+
engine->registerNativeClass<ActorInteractionClass>(actorInteractionClassBuilder);
72111
engine->registerNativeClass<ActorUniqueIDClass>(actorUniqueIDClassBuilder);
73112
engine->registerNativeClass<AgentClass>(agentClassBuilder);
74113
engine->registerNativeClass<ActorDamageSourceClass>(actorDamageSourceClassBuilder);
114+
engine->registerNativeClass<SculkCatalystBlockActorClass>(sculkCatalystBlockActorClassBuilder);
75115

76116
engine->registerNativeClass<BlockClass>(blockClassBuilder);
77117
engine->registerNativeClass<BlockPosClass>(blockPosClassBuilder);
78118
engine->registerNativeClass<BlockSourceClass>(blockSourceClassBuilder);
119+
// engine->registerNativeClass<BlockStateClass>(blockStateClassBuilder);
120+
// engine->registerNativeClass<IConstBlockSourceClass>(iConstBlockSourceClassBuilder);
121+
engine->registerNativeClass<MaterialClass>(materialClassBuilder);
79122

80123
engine->registerNativeClass<CommandClass>(commandClassBuilder);
124+
engine->registerNativeClass<CommandFlagClass>(commandFlagClassBuilder);
81125
engine->registerNativeClass<CommandOriginClass>(commandOriginClassBuilder);
82126
engine->registerNativeClass<CommandOutputClass>(commandOutputClassBuilder);
83127
engine->registerNativeClass<CommandContextClass>(commandContextClassBuilder);
128+
engine->registerNativeClass<CommandRegistryClass>(commandRegistryClassBuilder);
84129
// engine->registerNativeClass<RuntimeOverloadClass>(runtimeOverloadClassBuilder);
85130
engine->registerNativeClass<MinecraftCommandsClass>(minecraftCommandsClassBuilder);
131+
engine->registerNativeClass<MCRESULTClass>(MCRESULTClassBuilder);
86132

87-
engine->registerNativeClass<LevelClass>(levelClassBuilder);
133+
//engine->registerNativeClass<AutomaticIDClass>(automaticIDClassBuilder);
134+
engine->registerNativeClass<ChangeDimensionRequestClass>(changeDimensionRequestClassBuilder);
135+
engine->registerNativeClass<DimensionClass>(dimensionClassBuilder);
136+
engine->registerNativeClass<DimensionTypeClass>(dimensionTypeClassBuilder);
137+
138+
engine->registerNativeClass<EntityContextClass>(entityContextClassBuilder);
88139

140+
engine->registerNativeClass<LevelClass>(levelClassBuilder);
141+
engine->registerNativeClass<ExplosionClass>(explosionClassBuilder);
142+
143+
engine->registerNativeClass<AABBClass>(aabbClassBuilder);
144+
engine->registerNativeClass<HitResultClass>(hitResultClassBuilder);
145+
engine->registerNativeClass<RandomClass>(randomClassBuilder);
146+
engine->registerNativeClass<UUIDClass>(uuidClassBuilder);
147+
engine->registerNativeClass<VecClass>(vecClassBuilder);
148+
engine->registerNativeClass<Vec2Class>(vec2ClassBuilder);
89149
engine->registerNativeClass<Vec3Class>(vec3ClassBuilder);
90150

91151
engine->registerNativeClass<MobClass>(mobClassBuilder);
152+
engine->registerNativeClass<MobEffectInstanceClass>(mobEffectInstanceClassBuilder);
153+
154+
engine->registerNativeClass<ConnectionRequestClass>(connectionRequestClassBuilder);
155+
engine->registerNativeClass<LoopbackPacketSenderClass>(loopbackPacketSenderClassBuilder);
156+
engine->registerNativeClass<NetworkIdentifierClass>(networkIdentifierClassBuilder);
157+
engine->registerNativeClass<ServerNetworkHandlerClass>(serverNetworkHandlerClassBuilder);
158+
engine->registerNativeClass<ChangeDimensionPacketClass>(changeDimensionPacketClassBuilder);
159+
engine->registerNativeClass<PacketClass>(packetClassBuilder);
160+
engine->registerNativeClass<UpdateEquipPacketClass>(updateEquipPacketClassBuilder);
161+
engine->registerNativeClass<UpdateTradePacketClass>(updateTradePacketClassBuilder);
92162

93163
engine->registerNativeClass<ServiceClass>(serviceClassBuilder);
94164

95165
engine->registerNativeClass<LoggerClass>(loggerClassBuilder);
96166

97167
engine->registerNativeClass<ConfigClass>(configClassBuilder);
98168
engine->registerNativeClass<KeyValueDBClass>(keyValueDBClassBuilder);
169+
// engine->registerNativeClass<WebSocketClass>(webSocketClassBuilder);
99170
}
100171

101172

102173
} // namespace Komomo
174+

0 commit comments

Comments
 (0)