Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2026-01-03 22:26:16 +00:00
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/dev' into dev

Browse Source 
# Conflicts:
#	gradle.properties
This commit is contained in:
jhqwqmc
2025-05-22 23:00:11 +08:00
parent 6b5b500576 99a161a308
commit 9737fc9f77
9 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/net/momirealms/craftengine/core/entity/furniture/AbstractFurnitureManager.java
View File

@@ -126,7 +126,7 @@ public abstract class AbstractFurnitureManager implements FurnitureManager {
// add hitboxes
List<HitBox> hitboxes = ResourceConfigUtils.parseConfigAsList(placementArguments.get("hitboxes"), HitBoxTypes::fromMap);
if (hitboxes.isEmpty() && externalModel.isEmpty()) {
hitboxes.add(defaultHitBox());
hitboxes = List.of(defaultHitBox());
}
// rules

2
core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java
View File

@@ -312,7 +312,7 @@ public abstract class CraftEngine implements Plugin {
Dependencies.BOOSTED_YAML,
Dependencies.OPTION,
Dependencies.EXAMINATION_API, Dependencies.EXAMINATION_STRING,
Dependencies.ADVENTURE_KEY, Dependencies.ADVENTURE_API,
Dependencies.ADVENTURE_KEY, Dependencies.ADVENTURE_API, Dependencies.ADVENTURE_NBT,
Dependencies.MINIMESSAGE,
Dependencies.TEXT_SERIALIZER_COMMONS, Dependencies.TEXT_SERIALIZER_LEGACY, Dependencies.TEXT_SERIALIZER_GSON, Dependencies.TEXT_SERIALIZER_GSON_LEGACY, Dependencies.TEXT_SERIALIZER_JSON,
Dependencies.AHO_CORASICK,

14
core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java
View File

@@ -197,6 +197,20 @@ public class Dependencies {
Relocation.of("adventure", "net{}kyori{}adventure"))
);
public static final Dependency ADVENTURE_NBT = new Dependency(
"adventure-nbt",
"net{}kyori",
"adventure-nbt",
List.of(Relocation.of("option", "net{}kyori{}option"),
Relocation.of("examination", "net{}kyori{}examination"),
Relocation.of("adventure", "net{}kyori{}adventure"))
) {
@Override
public String getVersion() {
return ADVENTURE_API.getVersion();
}
};
public static final Dependency ADVENTURE_KEY = new Dependency(
"adventure-key",
"net{}kyori",