From 10f8cfdeaa961f52f3229e07c5fc9aa0fb15e734 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 9 Mar 2026 17:26:55 -0400 Subject: [PATCH 1/2] Add Absorbing Radius to Barriers --- .../npcs/api/entity/IEnergyBarrier.java | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/java/noppes/npcs/api/entity/IEnergyBarrier.java b/java/noppes/npcs/api/entity/IEnergyBarrier.java index 724364d..243ca1c 100644 --- a/java/noppes/npcs/api/entity/IEnergyBarrier.java +++ b/java/noppes/npcs/api/entity/IEnergyBarrier.java @@ -57,10 +57,72 @@ public interface IEnergyBarrier extends IEnergyAbility { void setKnockbackStrength(float strength); + /** + * Returns whether this barrier absorbs damage on behalf of its owner. + * When absorbing is enabled, incoming damage to the barrier's owner is redirected + * to the barrier instead, subject to the absorb radius check. + * + * @return {@code true} if the barrier absorbs the owner's incoming damage + * @see #getAbsorbRadius() + */ boolean isAbsorbing(); + /** + * Sets whether this barrier absorbs damage on behalf of its owner. + * When absorbing is enabled, incoming damage to the barrier's owner is redirected + * to the barrier instead, subject to the absorb radius check. + * + * @param absorbing {@code true} to enable damage absorption for the owner + * @see #setAbsorbRadius(float) + */ void setAbsorbing(boolean absorbing); + /** + * Gets the absorb radius for this barrier. + * The absorb radius determines the maximum distance from the barrier's current + * position at which the owner's incoming damage will still be redirected to the barrier. + * This check uses the barrier entity's live position, so it works correctly with + * moving barriers (following domes, moving walls, shields, etc.). + * + *
    + *
  • {@code -1} = No distance limit. Damage is always absorbed regardless of distance.
  • + *
  • {@code 0} = Uses the barrier's own geometric extent as the effective radius. + *
      + *
    • Domes: the dome radius (sphere radius in blocks).
    • + *
    • Panels: {@code (max(width, height) * 0.5 + 1.0) * 3} + * (i.e. {@code max(width, height) * 1.5 + 3.0} blocks).
    • + *
    + *
  • + *
  • Positive values = The owner must be within this many blocks of the barrier entity.
  • + *
+ * + * @return the absorb radius in blocks, or {@code -1} for unlimited, or {@code 0} for barrier extent + */ + float getAbsorbRadius(); + + /** + * Sets the absorb radius for this barrier. + * The absorb radius determines the maximum distance from the barrier's current + * position at which the owner's incoming damage will still be redirected to the barrier. + * This check uses the barrier entity's live position, so it works correctly with + * moving barriers (following domes, moving walls, shields, etc.). + * + *
    + *
  • {@code -1} = No distance limit. Damage is always absorbed regardless of distance.
  • + *
  • {@code 0} = Uses the barrier's own geometric extent as the effective radius. + *
      + *
    • Domes: the dome radius (sphere radius in blocks).
    • + *
    • Panels: {@code (max(width, height) * 0.5 + 1.0) * 3} + * (i.e. {@code max(width, height) * 1.5 + 3.0} blocks).
    • + *
    + *
  • + *
  • Positive values = The owner must be within this many blocks of the barrier entity.
  • + *
+ * + * @param radius the absorb radius in blocks, or {@code -1} for unlimited, or {@code 0} for barrier extent + */ + void setAbsorbRadius(float radius); + /** * Returns the barrier type: 0=Dome, 1=Panel * @return the barrier type ordinal From 4ee1c41d061eb4638b923cd3a430c7b63767ebdb Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 9 Mar 2026 17:36:55 -0400 Subject: [PATCH 2/2] Renaming Scheme for Energy Handler and Energy Extender --- java/noppes/npcs/api/AbstractNpcAPI.java | 2 +- .../npcs/api/{IEnergyController.java => IEnergyHandler.java} | 2 +- java/noppes/npcs/api/entity/IEnergyExplosion.java | 4 ++-- java/noppes/npcs/api/entity/IEnergySweeper.java | 2 +- java/noppes/npcs/api/entity/IEnergyZone.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename java/noppes/npcs/api/{IEnergyController.java => IEnergyHandler.java} (99%) diff --git a/java/noppes/npcs/api/AbstractNpcAPI.java b/java/noppes/npcs/api/AbstractNpcAPI.java index 75fcfba..23957b5 100644 --- a/java/noppes/npcs/api/AbstractNpcAPI.java +++ b/java/noppes/npcs/api/AbstractNpcAPI.java @@ -285,7 +285,7 @@ public abstract class AbstractNpcAPI { public abstract IDamageSource getIDamageSource(IEntity entity); - public abstract IEnergyController getEnergyController(); + public abstract IEnergyHandler getEnergyHandler(); public abstract EventBus events(); diff --git a/java/noppes/npcs/api/IEnergyController.java b/java/noppes/npcs/api/IEnergyHandler.java similarity index 99% rename from java/noppes/npcs/api/IEnergyController.java rename to java/noppes/npcs/api/IEnergyHandler.java index a3cd8f7..463f4ee 100644 --- a/java/noppes/npcs/api/IEnergyController.java +++ b/java/noppes/npcs/api/IEnergyHandler.java @@ -11,7 +11,7 @@ import noppes.npcs.api.entity.IEnergyExplosion; * Configure the entity, then call fire() (projectiles) or spawn() (zones/sweepers/panels) * to place it in the world. */ -public interface IEnergyController { +public interface IEnergyHandler { // ==================== PROJECTILE CREATION ==================== diff --git a/java/noppes/npcs/api/entity/IEnergyExplosion.java b/java/noppes/npcs/api/entity/IEnergyExplosion.java index 2a9fe91..40964bf 100644 --- a/java/noppes/npcs/api/entity/IEnergyExplosion.java +++ b/java/noppes/npcs/api/entity/IEnergyExplosion.java @@ -1,11 +1,11 @@ package noppes.npcs.api.entity; import net.minecraft.entity.Entity; -import noppes.npcs.api.INbt; +import noppes.npcs.api.IEnergyHandler; /** * Represents a standalone energy explosion entity. - * Created via {@link noppes.npcs.api.IEnergyController#createExplosion}. + * Created via {@link IEnergyHandler#createExplosion}. * Configure visual/damage properties, then call {@link #spawn()} to place in the world. * * When damage is set (> 0), the explosion will deal area damage on the first tick diff --git a/java/noppes/npcs/api/entity/IEnergySweeper.java b/java/noppes/npcs/api/entity/IEnergySweeper.java index da0f545..11e2dd5 100644 --- a/java/noppes/npcs/api/entity/IEnergySweeper.java +++ b/java/noppes/npcs/api/entity/IEnergySweeper.java @@ -4,7 +4,7 @@ import net.minecraft.entity.Entity; /** * Entity-level interface for sweeper beam entities. - * Created via IEnergyController.createSweeper(). + * Created via IEnergyHandler.createSweeper(). * Configure properties, then call spawn() to place in the world. */ public interface IEnergySweeper extends IEnergyAbility { diff --git a/java/noppes/npcs/api/entity/IEnergyZone.java b/java/noppes/npcs/api/entity/IEnergyZone.java index 2dad28a..878791d 100644 --- a/java/noppes/npcs/api/entity/IEnergyZone.java +++ b/java/noppes/npcs/api/entity/IEnergyZone.java @@ -4,7 +4,7 @@ import net.minecraft.entity.Entity; /** * Entity-level interface for zone entities (Hazard and Trap). - * Created via IEnergyController.createHazard() or createTrap(). + * Created via IEnergyHandler.createHazard() or createTrap(). * Configure properties, then call spawn() to place in the world. */ public interface IEnergyZone extends IEntity {