From 7202f74e785118b277f20a4c4bfd3f3516838eba Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 1 Mar 2026 02:50:44 -0500 Subject: [PATCH] Update API and Cleanup Unused Code --- src/api | 2 +- .../npcs/client/renderer/RenderAbilityDome.java | 7 ------- .../data/ability/conditions/ConditionItem.java | 14 ++++++-------- .../data/ability/type/AbilityCutter.java | 6 ------ 4 files changed, 7 insertions(+), 22 deletions(-) diff --git a/src/api b/src/api index 27a41e3a8..b28a7a5c4 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 27a41e3a8e55c853ac40242064ee0417102243f6 +Subproject commit b28a7a5c4d025ec3d5207cd8d4714f14c3a5de72 diff --git a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityDome.java b/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityDome.java index cfe3b27d5..b90b09382 100644 --- a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityDome.java +++ b/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityDome.java @@ -10,7 +10,6 @@ import org.lwjgl.opengl.GL11; /** * Renders the Dome entity as a translucent sphere. * Inner layer solid, outer layer translucent glow. - * Optional skybox texture rendered on the interior surface. */ @SideOnly(Side.CLIENT) public class RenderAbilityDome extends RenderEnergyBarrier { @@ -47,11 +46,6 @@ public class RenderAbilityDome extends RenderEnergyBarrier { renderSphere(dome.getOuterColor(), outerAlpha + (dome.getOuterColorAlpha() > 0 ? flashAlpha : 0), radius * outerScale, 8); } - // TODO: Skybox Feature - // if (dome.isSkyboxEnabled() && !dome.getSkyboxTexture().isEmpty()) { - // renderSkyboxSphere(dome.getSkyboxTexture(), radius, radius * 0.94f, 32, x, y, z); - // } - GL11.glDepthMask(true); // Render inner dome (depth write enabled so inner sphere properly occludes) renderSphere(dome.getInnerColor(), dome.getInnerAlpha() * healthPercent, radius * innerScale, 8); @@ -114,5 +108,4 @@ public class RenderAbilityDome extends RenderEnergyBarrier { tess.draw(); } - // TODO: Skybox Feature — renderSkyboxSphere method removed } diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionItem.java b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionItem.java index df6d01e04..552bb5de9 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionItem.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionItem.java @@ -137,21 +137,19 @@ public class ConditionItem extends AbilityCondition { this::getUsageType, this::setUsageType)); defs.add(FieldDef.stringField("condition.item_name", - this::getItemName, this::setItemName)); -// .hover("condition.hover.item_name")); - - + this::getItemName, this::setItemName) + .hover("condition.hover.item_name")); defs.add(FieldDef.enumField("condition.armor_slot", ArmorSlot.class, this::getArmorSlot, this::setArmorSlot) - .visibleWhen(() -> usageType == UsageType.ARMOR)); -// .hover("condition.hover.armor_slots")); + .visibleWhen(() -> usageType == UsageType.ARMOR) + .hover("condition.hover.armor_slots")); defs.add(FieldDef.intField("condition.item_count", this::getRequiredCount, this::setRequiredCount) .range(1, 64) - .visibleWhen(() -> usageType == UsageType.AMMO && userType.allowsPlayer())); -// .hover("condition.hover.required_count")); + .visibleWhen(() -> usageType == UsageType.AMMO && userType.allowsPlayer()) + .hover("condition.hover.required_count")); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCutter.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCutter.java index d2e4a3200..2fdc8fd48 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCutter.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCutter.java @@ -298,12 +298,6 @@ public class AbilityCutter extends Ability implements IAbilityCutter { return entityRelative >= minAngle && entityRelative <= maxAngle; } - private boolean isInArc(double dx, double dz, float casterYaw, float arcWidth) { - double angleToEntity = Math.toDegrees(Math.atan2(-dx, dz)); - double angleDiff = normalizeAngle(angleToEntity - casterYaw); - return Math.abs(angleDiff) <= arcWidth / 2.0; - } - private double normalizeAngle(double angle) { while (angle > 180) angle -= 360; while (angle < -180) angle += 360;