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 fa1878850..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,23 +44,11 @@ public class ShulkerHitBox extends AbstractHitBox { if (this.interactionEntity) { // make it a litter bigger - InteractionEntityData.Height.addEntityDataIfNotDefaultValue((float) (getHeight(peek, scale, direction) + 0.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); } } - private static double getHeight(byte inPeek, float scale, Direction direction) { - float peek = getPhysicalPeek(inPeek * 0.01F); - double y1 = 0.0; - double y2 = scale; - double dy = (double) direction.stepY() * peek * (double) scale; - if (dy > 0) { - y2 += dy; - } else if (dy < 0) { - y1 += dy; - } - return y2 - y1; - } @Override public Optional optionalCollider() { 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..cc5ca5e33 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