From 5ac33bfb5ef1a71547e80f45bb9bf15d02217ae1 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Wed, 2 Apr 2025 16:37:23 +0800 Subject: [PATCH 1/2] fix hitbox --- .../bukkit/entity/furniture/LoadedFurniture.java | 1 + .../entity/furniture/hitbox/ShulkerHitBox.java | 2 +- .../craftengine/core/font/EmojiManager.java | 9 --------- gradle.properties | 14 +++++++------- 4 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 core/src/main/java/net/momirealms/craftengine/core/font/EmojiManager.java diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/LoadedFurniture.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/LoadedFurniture.java index 90841f3e7..36d76dec5 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/LoadedFurniture.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/LoadedFurniture.java @@ -126,6 +126,7 @@ public class LoadedFurniture { if (colliderSize != 0) { Object world = FastNMS.INSTANCE.field$CraftWorld$ServerLevel(this.location.getWorld()); for (int i = 0; i < colliderSize; i++) { + // TODO better shulker hitbox Collider collider = placement.colliders()[i]; Vector3f offset = conjugated.transform(new Vector3f(collider.position())); Vector3d offset1 = collider.point1(); diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/hitbox/ShulkerHitBox.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/hitbox/ShulkerHitBox.java index f4bcbebb7..f4d61ad0d 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/hitbox/ShulkerHitBox.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/hitbox/ShulkerHitBox.java @@ -44,7 +44,7 @@ public class ShulkerHitBox extends AbstractHitBox { if (this.interactionEntity) { // make it a litter bigger - InteractionEntityData.Height.addEntityDataIfNotDefaultValue(getPhysicalPeek(peek * 0.01F) * scale + 1.01f, cachedInteractionValues); + InteractionEntityData.Height.addEntityDataIfNotDefaultValue((getPhysicalPeek(peek * 0.01F) + 1) * scale + 0.01f, cachedInteractionValues); InteractionEntityData.Width.addEntityDataIfNotDefaultValue(scale + 0.005f, cachedInteractionValues); InteractionEntityData.Responsive.addEntityDataIfNotDefaultValue(interactive, cachedInteractionValues); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/font/EmojiManager.java b/core/src/main/java/net/momirealms/craftengine/core/font/EmojiManager.java deleted file mode 100644 index 868846fd6..000000000 --- a/core/src/main/java/net/momirealms/craftengine/core/font/EmojiManager.java +++ /dev/null @@ -1,9 +0,0 @@ -package net.momirealms.craftengine.core.font; - -import net.momirealms.craftengine.core.plugin.config.ConfigSectionParser; - -public interface EmojiManager extends ConfigSectionParser { - String CONFIG_SECTION_NAME = "emojis"; - - -} diff --git a/gradle.properties b/gradle.properties index 0d5805a02..f05f586d7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -49,7 +49,7 @@ mojang_brigadier_version=1.0.18 byte_buddy_version=1.15.11 snake_yaml_version=2.3 anti_grief_version=0.13 -nms_helper_version=0.28 +nms_helper_version=0.29 # Ignite Dependencies mixinextras_version=0.4.1 mixin_version=0.15.2+mixin.0.8.7 @@ -63,9 +63,9 @@ modmenu_version=13.0.3 cloth_version=17.0.144 # Proxy settings -#systemProp.socks.proxyHost=127.0.0.1 -#systemProp.socks.proxyPort=7890 -#systemProp.http.proxyHost=127.0.0.1 -#systemProp.http.proxyPort=7890 -#systemProp.https.proxyHost=127.0.0.1 -#systemProp.https.proxyPort=7890 \ No newline at end of file +systemProp.socks.proxyHost=127.0.0.1 +systemProp.socks.proxyPort=7890 +systemProp.http.proxyHost=127.0.0.1 +systemProp.http.proxyPort=7890 +systemProp.https.proxyHost=127.0.0.1 +systemProp.https.proxyPort=7890 \ No newline at end of file From 5c56b82acee50ecbaf8d79caf0aed3c1cefc7cdc Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Wed, 2 Apr 2025 16:37:43 +0800 Subject: [PATCH 2/2] Update gradle.properties --- gradle.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index f05f586d7..cc5ca5e33 100644 --- a/gradle.properties +++ b/gradle.properties @@ -63,9 +63,9 @@ modmenu_version=13.0.3 cloth_version=17.0.144 # Proxy settings -systemProp.socks.proxyHost=127.0.0.1 -systemProp.socks.proxyPort=7890 -systemProp.http.proxyHost=127.0.0.1 -systemProp.http.proxyPort=7890 -systemProp.https.proxyHost=127.0.0.1 -systemProp.https.proxyPort=7890 \ No newline at end of file +#systemProp.socks.proxyHost=127.0.0.1 +#systemProp.socks.proxyPort=7890 +#systemProp.http.proxyHost=127.0.0.1 +#systemProp.http.proxyPort=7890 +#systemProp.https.proxyHost=127.0.0.1 +#systemProp.https.proxyPort=7890 \ No newline at end of file