From 6f1a83729604a7fd2decda83787cb83e06f30744 Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 1 Mar 2026 03:00:17 -0500 Subject: [PATCH] Renaming for Better Schema --- ...erEnergyAbility.java => RenderEnergy.java} | 4 +- .../client/renderer/RenderEnergyBarrier.java | 6 +-- ...AbilityBeam.java => RenderEnergyBeam.java} | 2 +- ...AbilityDisc.java => RenderEnergyDisc.java} | 2 +- ...AbilityDome.java => RenderEnergyDome.java} | 6 +-- .../renderer/RenderEnergyExplosion.java | 2 +- ...ilityLaser.java => RenderEnergyLaser.java} | 2 +- ...erAbilityOrb.java => RenderEnergyOrb.java} | 2 +- ...ilityPanel.java => RenderEnergyPanel.java} | 6 +-- .../client/renderer/RenderEnergySlicer.java | 2 +- ...AbilitySweeper.java => RenderSweeper.java} | 8 ++-- ...RenderAbilityZone.java => RenderZone.java} | 2 +- .../controllers/data/ability/Ability.java | 22 +++++------ .../ability/type/energy/AbilityBarrier.java | 6 +-- .../data/ability/type/energy/AbilityDome.java | 8 ++-- .../ability/type/energy/AbilityShield.java | 10 ++--- .../ability/type/energy/AbilitySweeper.java | 8 ++-- .../data/ability/type/energy/AbilityWall.java | 14 +++---- .../npcs/entity/EntityAbilityBeam.java | 2 +- .../npcs/entity/EntityAbilityDisc.java | 2 +- .../npcs/entity/EntityAbilityLaser.java | 24 ++++++------ ...yBarrier.java => EntityEnergyBarrier.java} | 22 +++++------ ...AbilityDome.java => EntityEnergyDome.java} | 12 +++--- ...ilityPanel.java => EntityEnergyPanel.java} | 14 +++---- .../npcs/entity/EntityEnergyProjectile.java | 38 +++++++++---------- ...ySweeper.java => EntityEnergySweeper.java} | 16 ++++---- src/main/java/noppes/npcs/CustomNpcs.java | 16 ++++---- .../java/noppes/npcs/ServerEventsHandler.java | 12 +++--- .../java/noppes/npcs/client/ClientProxy.java | 38 +++++++++---------- .../java/noppes/npcs/scripted/NpcAPI.java | 18 ++++----- .../scripted/entity/ScriptEnergyBarrier.java | 10 ++--- .../scripted/entity/ScriptEnergyDome.java | 4 +- .../scripted/entity/ScriptEnergyPanel.java | 6 +-- .../scripted/entity/ScriptEnergySweeper.java | 4 +- 34 files changed, 175 insertions(+), 175 deletions(-) rename src/main/java/kamkeel/npcs/client/renderer/{RenderEnergyAbility.java => RenderEnergy.java} (99%) rename src/main/java/kamkeel/npcs/client/renderer/{RenderAbilityBeam.java => RenderEnergyBeam.java} (99%) rename src/main/java/kamkeel/npcs/client/renderer/{RenderAbilityDisc.java => RenderEnergyDisc.java} (99%) rename src/main/java/kamkeel/npcs/client/renderer/{RenderAbilityDome.java => RenderEnergyDome.java} (95%) rename src/main/java/kamkeel/npcs/client/renderer/{RenderAbilityLaser.java => RenderEnergyLaser.java} (99%) rename src/main/java/kamkeel/npcs/client/renderer/{RenderAbilityOrb.java => RenderEnergyOrb.java} (98%) rename src/main/java/kamkeel/npcs/client/renderer/{RenderAbilityPanel.java => RenderEnergyPanel.java} (96%) rename src/main/java/kamkeel/npcs/client/renderer/{RenderAbilitySweeper.java => RenderSweeper.java} (97%) rename src/main/java/kamkeel/npcs/client/renderer/{RenderAbilityZone.java => RenderZone.java} (99%) rename src/main/java/kamkeel/npcs/entity/{EntityAbilityBarrier.java => EntityEnergyBarrier.java} (96%) rename src/main/java/kamkeel/npcs/entity/{EntityAbilityDome.java => EntityEnergyDome.java} (98%) rename src/main/java/kamkeel/npcs/entity/{EntityAbilityPanel.java => EntityEnergyPanel.java} (98%) rename src/main/java/kamkeel/npcs/entity/{EntityAbilitySweeper.java => EntityEnergySweeper.java} (96%) diff --git a/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyAbility.java b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergy.java similarity index 99% rename from src/main/java/kamkeel/npcs/client/renderer/RenderEnergyAbility.java rename to src/main/java/kamkeel/npcs/client/renderer/RenderEnergy.java index e87e24d51..ce5d59669 100644 --- a/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyAbility.java +++ b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergy.java @@ -20,12 +20,12 @@ import org.lwjgl.opengl.GL12; * Design inspired by LouisXIV's energy rendering system. */ @SideOnly(Side.CLIENT) -public abstract class RenderEnergyAbility extends Render { +public abstract class RenderEnergy extends Render { protected static final ResourceLocation WHITE_TEXTURE = new ResourceLocation("customnpcs", "textures/entity/white.png"); protected static final int HIDE_INITIAL_ACTIVE_TICKS = 1; - public RenderEnergyAbility() { + public RenderEnergy() { this.shadowSize = 0.0f; } diff --git a/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyBarrier.java b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyBarrier.java index 676440035..846c167ea 100644 --- a/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyBarrier.java +++ b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyBarrier.java @@ -2,20 +2,20 @@ package kamkeel.npcs.client.renderer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.entity.EntityAbilityBarrier; +import kamkeel.npcs.entity.EntityEnergyBarrier; /** * Intermediate renderer base for energy barrier entities (Dome, Panel). * Provides shared hit flash alpha computation. */ @SideOnly(Side.CLIENT) -public abstract class RenderEnergyBarrier extends RenderEnergyAbility { +public abstract class RenderEnergyBarrier extends RenderEnergy { /** * Compute the alpha boost from a hit flash effect. * Flash value decays from 4 to 0, producing alpha from 0.3 to 0. */ - protected float computeFlashAlpha(EntityAbilityBarrier barrier) { + protected float computeFlashAlpha(EntityEnergyBarrier barrier) { byte flash = barrier.getHitFlash(); if (flash <= 0) return 0.0f; return flash / 4.0f * 0.3f; diff --git a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityBeam.java b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyBeam.java similarity index 99% rename from src/main/java/kamkeel/npcs/client/renderer/RenderAbilityBeam.java rename to src/main/java/kamkeel/npcs/client/renderer/RenderEnergyBeam.java index e9868854a..c5335d2ab 100644 --- a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityBeam.java +++ b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyBeam.java @@ -23,7 +23,7 @@ import java.util.List; * Design inspired by LouisXIV's energy rendering system. */ @SideOnly(Side.CLIENT) -public class RenderAbilityBeam extends RenderEnergyAbility { +public class RenderEnergyBeam extends RenderEnergy { @Override public void doRender(Entity entity, double x, double y, double z, float yaw, float partialTicks) { diff --git a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityDisc.java b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyDisc.java similarity index 99% rename from src/main/java/kamkeel/npcs/client/renderer/RenderAbilityDisc.java rename to src/main/java/kamkeel/npcs/client/renderer/RenderEnergyDisc.java index 3e3bcb025..e71e17a02 100644 --- a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityDisc.java +++ b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyDisc.java @@ -15,7 +15,7 @@ import org.lwjgl.opengl.GL11; * Design inspired by LouisXIV's energy rendering system. */ @SideOnly(Side.CLIENT) -public class RenderAbilityDisc extends RenderEnergyAbility { +public class RenderEnergyDisc extends RenderEnergy { @Override public void doRender(Entity entity, double x, double y, double z, float yaw, float partialTicks) { diff --git a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityDome.java b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyDome.java similarity index 95% rename from src/main/java/kamkeel/npcs/client/renderer/RenderAbilityDome.java rename to src/main/java/kamkeel/npcs/client/renderer/RenderEnergyDome.java index b90b09382..34465635c 100644 --- a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityDome.java +++ b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyDome.java @@ -2,7 +2,7 @@ package kamkeel.npcs.client.renderer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.entity.EntityAbilityDome; +import kamkeel.npcs.entity.EntityEnergyDome; import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.Entity; import org.lwjgl.opengl.GL11; @@ -12,14 +12,14 @@ import org.lwjgl.opengl.GL11; * Inner layer solid, outer layer translucent glow. */ @SideOnly(Side.CLIENT) -public class RenderAbilityDome extends RenderEnergyBarrier { +public class RenderEnergyDome extends RenderEnergyBarrier { @Override public void doRender(Entity entity, double x, double y, double z, float yaw, float partialTicks) { if (shouldSkipInitialActiveRender(entity)) { return; } - EntityAbilityDome dome = (EntityAbilityDome) entity; + EntityEnergyDome dome = (EntityEnergyDome) entity; float radius = dome.getDomeRadius(); float healthPercent = dome.getHealthPercent(); diff --git a/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyExplosion.java b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyExplosion.java index 850d857a4..02388621a 100644 --- a/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyExplosion.java +++ b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyExplosion.java @@ -12,7 +12,7 @@ import org.lwjgl.opengl.GL11; * Draws expanding cubic shells with a short fade-out. */ @SideOnly(Side.CLIENT) -public class RenderEnergyExplosion extends RenderEnergyAbility { +public class RenderEnergyExplosion extends RenderEnergy { private static final float MAX_OUTER_ALPHA = 0.85f; private static final float MAX_INNER_ALPHA = 1.0f; diff --git a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityLaser.java b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyLaser.java similarity index 99% rename from src/main/java/kamkeel/npcs/client/renderer/RenderAbilityLaser.java rename to src/main/java/kamkeel/npcs/client/renderer/RenderEnergyLaser.java index c2b2216df..1befc0dcc 100644 --- a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityLaser.java +++ b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyLaser.java @@ -17,7 +17,7 @@ import java.util.Map; * Design inspired by LouisXIV's energy rendering system. */ @SideOnly(Side.CLIENT) -public class RenderAbilityLaser extends RenderEnergyAbility { +public class RenderEnergyLaser extends RenderEnergy { private final Map tipLightningStates = new HashMap<>(); diff --git a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityOrb.java b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyOrb.java similarity index 98% rename from src/main/java/kamkeel/npcs/client/renderer/RenderAbilityOrb.java rename to src/main/java/kamkeel/npcs/client/renderer/RenderEnergyOrb.java index d5a44a245..08f77a522 100644 --- a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityOrb.java +++ b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyOrb.java @@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11; * Minecraft-style blocky appearance using Tessellator. */ @SideOnly(Side.CLIENT) -public class RenderAbilityOrb extends RenderEnergyAbility { +public class RenderEnergyOrb extends RenderEnergy { private static final int LIGHTNING_FADE_TICKS = 6; diff --git a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityPanel.java b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyPanel.java similarity index 96% rename from src/main/java/kamkeel/npcs/client/renderer/RenderAbilityPanel.java rename to src/main/java/kamkeel/npcs/client/renderer/RenderEnergyPanel.java index 1b382fec4..5cb9a7abc 100644 --- a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityPanel.java +++ b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergyPanel.java @@ -2,7 +2,7 @@ package kamkeel.npcs.client.renderer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.entity.EntityAbilityPanel; +import kamkeel.npcs.entity.EntityEnergyPanel; import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.Entity; import org.lwjgl.opengl.GL11; @@ -13,14 +13,14 @@ import org.lwjgl.opengl.GL11; * Voxel-blocky style with inner/outer layers. */ @SideOnly(Side.CLIENT) -public class RenderAbilityPanel extends RenderEnergyBarrier { +public class RenderEnergyPanel extends RenderEnergyBarrier { @Override public void doRender(Entity entity, double x, double y, double z, float yaw, float partialTicks) { if (shouldSkipInitialActiveRender(entity)) { return; } - EntityAbilityPanel panel = (EntityAbilityPanel) entity; + EntityEnergyPanel panel = (EntityEnergyPanel) entity; float width = panel.getPanelData().panelWidth; float height = panel.getPanelData().panelHeight; diff --git a/src/main/java/kamkeel/npcs/client/renderer/RenderEnergySlicer.java b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergySlicer.java index be0d75748..f661442c1 100644 --- a/src/main/java/kamkeel/npcs/client/renderer/RenderEnergySlicer.java +++ b/src/main/java/kamkeel/npcs/client/renderer/RenderEnergySlicer.java @@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11; * Inner solid core with outer translucent glow. */ @SideOnly(Side.CLIENT) -public class RenderEnergySlicer extends RenderEnergyAbility { +public class RenderEnergySlicer extends RenderEnergy { @Override public void doRender(Entity entity, double x, double y, double z, float yaw, float partialTicks) { diff --git a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilitySweeper.java b/src/main/java/kamkeel/npcs/client/renderer/RenderSweeper.java similarity index 97% rename from src/main/java/kamkeel/npcs/client/renderer/RenderAbilitySweeper.java rename to src/main/java/kamkeel/npcs/client/renderer/RenderSweeper.java index fc7bc33c7..01ec9b429 100644 --- a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilitySweeper.java +++ b/src/main/java/kamkeel/npcs/client/renderer/RenderSweeper.java @@ -2,7 +2,7 @@ package kamkeel.npcs.client.renderer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.entity.EntityAbilitySweeper; +import kamkeel.npcs.entity.EntityEnergySweeper; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; @@ -15,11 +15,11 @@ import org.lwjgl.opengl.GL11; * Uses similar rendering style to the Beam trail for visual consistency. */ @SideOnly(Side.CLIENT) -public class RenderAbilitySweeper extends Render { +public class RenderSweeper extends Render { @Override public void doRender(Entity entity, double x, double y, double z, float yaw, float partialTicks) { - EntityAbilitySweeper sweeper = (EntityAbilitySweeper) entity; + EntityEnergySweeper sweeper = (EntityEnergySweeper) entity; setupRenderState(); @@ -114,7 +114,7 @@ public class RenderAbilitySweeper extends Render { /** * Render a beam segment as a 3D rectangular prism with independent width and height. - * Uses the same approach as RenderAbilityBeam.renderBeamRectangle. + * Uses the same approach as RenderEnergyBeam.renderBeamRectangle. */ private void renderBeamSegment(double x1, double y1, double z1, double x2, double y2, double z2, diff --git a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityZone.java b/src/main/java/kamkeel/npcs/client/renderer/RenderZone.java similarity index 99% rename from src/main/java/kamkeel/npcs/client/renderer/RenderAbilityZone.java rename to src/main/java/kamkeel/npcs/client/renderer/RenderZone.java index 20d31c56d..1d3d92d85 100644 --- a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityZone.java +++ b/src/main/java/kamkeel/npcs/client/renderer/RenderZone.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Random; @SideOnly(Side.CLIENT) -public class RenderAbilityZone extends Render { +public class RenderZone extends Render { private static final int CIRCLE_SEGMENTS = 32; private static final int ACCENT_LINE_COUNT = 12; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java b/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java index 5d07d8a27..0b78a5b2f 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java @@ -19,9 +19,9 @@ import kamkeel.npcs.controllers.data.ability.conditions.AbilityCondition; import kamkeel.npcs.controllers.data.telegraph.Telegraph; import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; -import kamkeel.npcs.entity.EntityAbilityBarrier; -import kamkeel.npcs.entity.EntityAbilityDome; -import kamkeel.npcs.entity.EntityAbilityPanel; +import kamkeel.npcs.entity.EntityEnergyBarrier; +import kamkeel.npcs.entity.EntityEnergyDome; +import kamkeel.npcs.entity.EntityEnergyPanel; import kamkeel.npcs.util.FileNameHelper; import net.minecraft.block.Block; import net.minecraft.entity.Entity; @@ -2475,9 +2475,9 @@ public abstract class Ability implements IAbility, IAbilityAction { double maxZ = Math.max(caster.posZ, target.posZ) + searchRange; AxisAlignedBB searchBox = AxisAlignedBB.getBoundingBox(minX, minY, minZ, maxX, maxY, maxZ); - List barriers = world.getEntitiesWithinAABB(EntityAbilityBarrier.class, searchBox); + List barriers = world.getEntitiesWithinAABB(EntityEnergyBarrier.class, searchBox); - for (EntityAbilityBarrier barrier : barriers) { + for (EntityEnergyBarrier barrier : barriers) { if (barrier.isDead) continue; if (barrier.isCharging()) continue; @@ -2488,10 +2488,10 @@ public abstract class Ability implements IAbility, IAbilityAction { if (AbilityTargetHelper.isAlly(caster, (EntityLivingBase) barrierOwner)) continue; } - if (barrier instanceof EntityAbilityDome) { - if (isDomeBlocking((EntityAbilityDome) barrier, caster, target)) return true; - } else if (barrier instanceof EntityAbilityPanel) { - if (isPanelBlocking((EntityAbilityPanel) barrier, caster, target)) return true; + if (barrier instanceof EntityEnergyDome) { + if (isDomeBlocking((EntityEnergyDome) barrier, caster, target)) return true; + } else if (barrier instanceof EntityEnergyPanel) { + if (isPanelBlocking((EntityEnergyPanel) barrier, caster, target)) return true; } } @@ -2502,7 +2502,7 @@ public abstract class Ability implements IAbility, IAbilityAction { * Check if a dome blocks an attack from caster to target. * Blocks when caster is outside and target is inside the dome. */ - private static boolean isDomeBlocking(EntityAbilityDome dome, EntityLivingBase caster, EntityLivingBase target) { + private static boolean isDomeBlocking(EntityEnergyDome dome, EntityLivingBase caster, EntityLivingBase target) { float radius = dome.getDomeRadius(); double cdx = caster.posX - dome.posX; @@ -2523,7 +2523,7 @@ public abstract class Ability implements IAbility, IAbilityAction { * Check if a panel blocks an attack from caster to target. * Checks if the line from caster to target crosses through the panel bounds. */ - private static boolean isPanelBlocking(EntityAbilityPanel panel, EntityLivingBase caster, EntityLivingBase target) { + private static boolean isPanelBlocking(EntityEnergyPanel panel, EntityLivingBase caster, EntityLivingBase target) { float halfW = panel.getPanelData().panelWidth * 0.5f; float halfH = panel.getPanelData().panelHeight * 0.5f; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityBarrier.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityBarrier.java index 38cbb177d..1a7734a1e 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityBarrier.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityBarrier.java @@ -5,7 +5,7 @@ import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.AbilityController; import kamkeel.npcs.controllers.data.ability.data.energy.EnergyBarrierData; import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; -import kamkeel.npcs.entity.EntityAbilityBarrier; +import kamkeel.npcs.entity.EntityEnergyBarrier; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; @@ -27,7 +27,7 @@ public abstract class AbilityBarrier extends AbilityEnergy { protected float offsetZ = 0.0f; // Runtime entity tracking - protected transient EntityAbilityBarrier barrierEntity; + protected transient EntityEnergyBarrier barrierEntity; protected AbilityBarrier(EnergyDisplayData displayData, EnergyBarrierData barrierData) { super(displayData); @@ -39,7 +39,7 @@ public abstract class AbilityBarrier extends AbilityEnergy { /** * Create and spawn the barrier entity during execution. */ - protected abstract EntityAbilityBarrier createBarrierEntity(EntityLivingBase caster, EntityLivingBase target); + protected abstract EntityEnergyBarrier createBarrierEntity(EntityLivingBase caster, EntityLivingBase target); /** * Add type-specific GUI field definitions. diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityDome.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityDome.java index 743579e0f..cacda2061 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityDome.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityDome.java @@ -8,8 +8,8 @@ import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; import kamkeel.npcs.controllers.data.ability.data.energy.EnergyBarrierData; import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; -import kamkeel.npcs.entity.EntityAbilityBarrier; -import kamkeel.npcs.entity.EntityAbilityDome; +import kamkeel.npcs.entity.EntityEnergyBarrier; +import kamkeel.npcs.entity.EntityEnergyDome; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.builder.FieldDef; @@ -52,8 +52,8 @@ public class AbilityDome extends AbilityBarrier { // ==================== ABSTRACT IMPLEMENTATIONS ==================== @Override - protected EntityAbilityBarrier createBarrierEntity(EntityLivingBase caster, EntityLivingBase target) { - EntityAbilityDome dome = new EntityAbilityDome( + protected EntityEnergyBarrier createBarrierEntity(EntityLivingBase caster, EntityLivingBase target) { + EntityEnergyDome dome = new EntityEnergyDome( caster.worldObj, caster, caster.posX + offsetX, caster.posY + offsetY, caster.posZ + offsetZ, domeRadius, displayData.copy(), lightningData.copy(), barrierData.copy() diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityShield.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityShield.java index ce7b41b88..0adf474ca 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityShield.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityShield.java @@ -10,8 +10,8 @@ import kamkeel.npcs.controllers.data.ability.data.energy.EnergyBarrierData; import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; import kamkeel.npcs.controllers.data.ability.data.energy.EnergyPanelData; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; -import kamkeel.npcs.entity.EntityAbilityBarrier; -import kamkeel.npcs.entity.EntityAbilityPanel; +import kamkeel.npcs.entity.EntityEnergyBarrier; +import kamkeel.npcs.entity.EntityEnergyPanel; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.builder.FieldDef; @@ -55,7 +55,7 @@ public class AbilityShield extends AbilityBarrier { // ==================== ABSTRACT IMPLEMENTATIONS ==================== @Override - protected EntityAbilityBarrier createBarrierEntity(EntityLivingBase caster, EntityLivingBase target) { + protected EntityEnergyBarrier createBarrierEntity(EntityLivingBase caster, EntityLivingBase target) { EnergyPanelData panelData = new EnergyPanelData(shieldWidth, shieldHeight, offsetY); panelData.offsetX = offsetX; panelData.offsetZ = offsetZ; @@ -66,10 +66,10 @@ public class AbilityShield extends AbilityBarrier { double spawnY = caster.posY + (caster.height * 0.5f); double spawnZ = caster.posZ + (Math.cos(yawRad) * frontDist) + offsetZ; - EntityAbilityPanel panel = new EntityAbilityPanel( + EntityEnergyPanel panel = new EntityEnergyPanel( caster.worldObj, caster, spawnX, spawnY, spawnZ, caster.rotationYaw, - EntityAbilityPanel.PanelMode.HELD, + EntityEnergyPanel.PanelMode.HELD, displayData.copy(), lightningData.copy(), barrierData.copy(), panelData ); panel.setSourceAbility(this); diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilitySweeper.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilitySweeper.java index 1ef5f92e0..f87561174 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilitySweeper.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilitySweeper.java @@ -9,7 +9,7 @@ import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.controllers.data.telegraph.Telegraph; import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; -import kamkeel.npcs.entity.EntityAbilitySweeper; +import kamkeel.npcs.entity.EntityEnergySweeper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.api.ability.type.IAbilitySweeper; @@ -23,7 +23,7 @@ import java.util.List; * Players can jump over it. The beam completes a set number of rotations before ending. * Telegraph shows a large circle on the ground indicating range. *

- * All damage logic is handled by the EntityAbilitySweeper entity to ensure + * All damage logic is handled by the EntityEnergySweeper entity to ensure * visual and damage hitbox alignment. */ public class AbilitySweeper extends AbilityEnergy implements IAbilitySweeper { @@ -40,7 +40,7 @@ public class AbilitySweeper extends AbilityEnergy implements IAbilitySweeper { private boolean lockOnTarget = false; // Runtime state (transient) - private transient EntityAbilitySweeper activeEntity = null; + private transient EntityEnergySweeper activeEntity = null; public AbilitySweeper() { super(new EnergyDisplayData(0xFF6600, 0xFF0000, true, 1.8f, 0.5f, 0.0f)); @@ -98,7 +98,7 @@ public class AbilitySweeper extends AbilityEnergy implements IAbilitySweeper { // Spawn the sweeper entity that handles BOTH visuals AND damage. // NPC: target is the aggro target — lockOnTarget tracks it during sweep. // Player: target is null — sweep rotates around caster's facing direction, lockOnTarget has no effect. - activeEntity = new EntityAbilitySweeper(caster.worldObj, caster, target, + activeEntity = new EntityEnergySweeper(caster.worldObj, caster, target, beamLength, beamWidth, beamHeight, displayData, sweepSpeed, numberOfRotations, diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityWall.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityWall.java index 97f8b0c31..104cae221 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityWall.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityWall.java @@ -9,8 +9,8 @@ import kamkeel.npcs.controllers.data.ability.data.energy.EnergyBarrierData; import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; import kamkeel.npcs.controllers.data.ability.data.energy.EnergyPanelData; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; -import kamkeel.npcs.entity.EntityAbilityBarrier; -import kamkeel.npcs.entity.EntityAbilityPanel; +import kamkeel.npcs.entity.EntityEnergyBarrier; +import kamkeel.npcs.entity.EntityEnergyPanel; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.builder.FieldDef; @@ -61,7 +61,7 @@ public class AbilityWall extends AbilityBarrier { // ==================== ABSTRACT IMPLEMENTATIONS ==================== @Override - protected EntityAbilityBarrier createBarrierEntity(EntityLivingBase caster, EntityLivingBase target) { + protected EntityEnergyBarrier createBarrierEntity(EntityLivingBase caster, EntityLivingBase target) { // Place wall between caster and target double placeX, placeY, placeZ; float yaw; @@ -97,14 +97,14 @@ public class AbilityWall extends AbilityBarrier { placeY += offsetY; placeZ += offsetZ; - EntityAbilityPanel.PanelMode mode = panelData.launching - ? EntityAbilityPanel.PanelMode.LAUNCHED - : EntityAbilityPanel.PanelMode.PLACED; + EntityEnergyPanel.PanelMode mode = panelData.launching + ? EntityEnergyPanel.PanelMode.LAUNCHED + : EntityEnergyPanel.PanelMode.PLACED; EnergyPanelData data = panelData.copy(); data.heightOffset = 0.0f; // Y offset now handled by base class via placeY - EntityAbilityPanel panel = new EntityAbilityPanel( + EntityEnergyPanel panel = new EntityEnergyPanel( caster.worldObj, caster, placeX, placeY, placeZ, yaw, mode, displayData.copy(), lightningData.copy(), barrierData.copy(), data diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityBeam.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityBeam.java index d6ffdad9e..15b1e5cbf 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityBeam.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityBeam.java @@ -699,7 +699,7 @@ public class EntityAbilityBeam extends EntityEnergyProjectile { // ==================== REFLECTION ==================== @Override - protected boolean reflectFromBarrier(EntityAbilityBarrier barrier, float reflectStrengthPct) { + protected boolean reflectFromBarrier(EntityEnergyBarrier barrier, float reflectStrengthPct) { boolean reflected = super.reflectFromBarrier(barrier, reflectStrengthPct); if (reflected) { // Switch to FREE_TRAIL: detach from caster (tail-less), trail fades out. diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityDisc.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityDisc.java index d7c74c3dc..10036b3c8 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityDisc.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityDisc.java @@ -409,7 +409,7 @@ public class EntityAbilityDisc extends EntityEnergyProjectile { // ==================== REFLECTION ==================== @Override - protected boolean reflectFromBarrier(EntityAbilityBarrier barrier, float reflectStrengthPct) { + protected boolean reflectFromBarrier(EntityEnergyBarrier barrier, float reflectStrengthPct) { boolean reflected = super.reflectFromBarrier(barrier, reflectStrengthPct); if (reflected) { // Disable boomerang on reflected discs — the original owner is no longer diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityLaser.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityLaser.java index 1619b15e1..4581340a9 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityLaser.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityLaser.java @@ -419,8 +419,8 @@ public class EntityAbilityLaser extends EntityEnergyProjectile { private boolean checkLaserBarrierCollision() { if (currentLength <= 0) return false; - List barriers = EntityAbilityBarrier.getActiveBarriers(worldObj); - for (EntityAbilityBarrier barrier : barriers) { + List barriers = EntityEnergyBarrier.getActiveBarriers(worldObj); + for (EntityEnergyBarrier barrier : barriers) { if (barrier.isDead || barrier.isCharging()) continue; if (barrier.getOwnerEntityId() == this.ownerEntityId) continue; @@ -433,17 +433,17 @@ public class EntityAbilityLaser extends EntityEnergyProjectile { } } - if (barrier instanceof EntityAbilityDome) { - EntityAbilityDome dome = (EntityAbilityDome) barrier; + if (barrier instanceof EntityEnergyDome) { + EntityEnergyDome dome = (EntityEnergyDome) barrier; float intersectDist = getLineSphereIntersection(dome); if (intersectDist >= 0) { float damage = getModifiedDamage(); - EntityAbilityBarrier.ProjectileHitOutcome hitOutcome = dome.onProjectileHitResolved(this, damage); - if (hitOutcome == null || hitOutcome.result == EntityAbilityBarrier.ProjectileHitResult.PASS) { + EntityEnergyBarrier.ProjectileHitOutcome hitOutcome = dome.onProjectileHitResolved(this, damage); + if (hitOutcome == null || hitOutcome.result == EntityEnergyBarrier.ProjectileHitResult.PASS) { continue; } - if (hitOutcome.result != EntityAbilityBarrier.ProjectileHitResult.BROKEN) { + if (hitOutcome.result != EntityEnergyBarrier.ProjectileHitResult.BROKEN) { currentLength = Math.max(0.0f, intersectDist); endX = startX + dirX * currentLength; endY = startY + dirY * currentLength; @@ -469,12 +469,12 @@ public class EntityAbilityLaser extends EntityEnergyProjectile { if (incoming) { float damage = getModifiedDamage(); - EntityAbilityBarrier.ProjectileHitOutcome hitOutcome = barrier.onProjectileHitResolved(this, damage); - if (hitOutcome == null || hitOutcome.result == EntityAbilityBarrier.ProjectileHitResult.PASS) { + EntityEnergyBarrier.ProjectileHitOutcome hitOutcome = barrier.onProjectileHitResolved(this, damage); + if (hitOutcome == null || hitOutcome.result == EntityEnergyBarrier.ProjectileHitResult.PASS) { continue; } - if (hitOutcome.result != EntityAbilityBarrier.ProjectileHitResult.BROKEN) { + if (hitOutcome.result != EntityEnergyBarrier.ProjectileHitResult.BROKEN) { endX = startX + dirX * currentLength; endY = startY + dirY * currentLength; endZ = startZ + dirZ * currentLength; @@ -491,7 +491,7 @@ public class EntityAbilityLaser extends EntityEnergyProjectile { } @Override - protected boolean reflectFromBarrier(EntityAbilityBarrier barrier, float reflectStrengthPct) { + protected boolean reflectFromBarrier(EntityEnergyBarrier barrier, float reflectStrengthPct) { if (barrier == null) { return false; } @@ -602,7 +602,7 @@ public class EntityAbilityLaser extends EntityEnergyProjectile { * Returns the distance along the laser direction to the first entry point, * or -1 if no intersection from outside. */ - private float getLineSphereIntersection(EntityAbilityDome dome) { + private float getLineSphereIntersection(EntityEnergyDome dome) { double cx = dome.posX; double cy = dome.posY; double cz = dome.posZ; diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityBarrier.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyBarrier.java similarity index 96% rename from src/main/java/kamkeel/npcs/entity/EntityAbilityBarrier.java rename to src/main/java/kamkeel/npcs/entity/EntityEnergyBarrier.java index ebcdfe655..82781eed7 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityBarrier.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyBarrier.java @@ -25,7 +25,7 @@ import java.util.List; * and barrier lifecycle management. * Extends EntityEnergyAbility for shared visual/owner/charging state. */ -public abstract class EntityAbilityBarrier extends EntityEnergyAbility { +public abstract class EntityEnergyBarrier extends EntityEnergyAbility { /** * Outcome of a projectile vs barrier interaction. @@ -77,21 +77,21 @@ public abstract class EntityAbilityBarrier extends EntityEnergyAbility { } // ==================== ACTIVE BARRIER REGISTRY ==================== - private static final List> activeBarriers = new ArrayList<>(); + private static final List> activeBarriers = new ArrayList<>(); private boolean tracked = false; - public static void trackBarrier(EntityAbilityBarrier barrier) { + public static void trackBarrier(EntityEnergyBarrier barrier) { activeBarriers.add(new WeakReference<>(barrier)); } /** * Get all living barriers in the given world. Auto-cleans dead refs. */ - public static List getActiveBarriers(World world) { - List result = new ArrayList<>(); - Iterator> it = activeBarriers.iterator(); + public static List getActiveBarriers(World world) { + List result = new ArrayList<>(); + Iterator> it = activeBarriers.iterator(); while (it.hasNext()) { - EntityAbilityBarrier b = it.next().get(); + EntityEnergyBarrier b = it.next().get(); if (b == null || b.isDead) { it.remove(); } else if (b.worldObj == world) { @@ -114,7 +114,7 @@ public abstract class EntityAbilityBarrier extends EntityEnergyAbility { protected static final int DW_HEALTH_PERCENT = 21; protected static final int DW_HIT_FLASH = 22; - public EntityAbilityBarrier(World world) { + public EntityEnergyBarrier(World world) { super(world); this.noClip = true; } @@ -506,10 +506,10 @@ public abstract class EntityAbilityBarrier extends EntityEnergyAbility { * Find a barrier that would absorb damage for the given entity (its caster). * Returns the barrier if: absorbing is enabled AND entity is the barrier's owner. */ - public static EntityAbilityBarrier getAbsorbingBarrier(Entity entity) { + public static EntityEnergyBarrier getAbsorbingBarrier(Entity entity) { if (entity == null || entity.worldObj == null) return null; - List barriers = getActiveBarriers(entity.worldObj); - for (EntityAbilityBarrier barrier : barriers) { + List barriers = getActiveBarriers(entity.worldObj); + for (EntityEnergyBarrier barrier : barriers) { if (barrier.isDead) continue; if (!barrier.barrierData.absorbing) continue; if (barrier.ownerEntityId == entity.getEntityId()) { diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityDome.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyDome.java similarity index 98% rename from src/main/java/kamkeel/npcs/entity/EntityAbilityDome.java rename to src/main/java/kamkeel/npcs/entity/EntityEnergyDome.java index 3c5caf4f2..0e8f0bf56 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityDome.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyDome.java @@ -22,9 +22,9 @@ import java.util.List; * Energy Dome entity - a spherical barrier that blocks incoming energy projectiles. * Centered on the caster's position at time of casting. * Only blocks incoming attacks (not outgoing from allies inside). - * Extends EntityAbilityBarrier for shared barrier logic. + * Extends EntityEnergyBarrier for shared barrier logic. */ -public class EntityAbilityDome extends EntityAbilityBarrier { +public class EntityEnergyDome extends EntityEnergyBarrier { // ==================== DOME-SPECIFIC PROPERTIES ==================== protected float domeRadius = 5.0f; @@ -38,16 +38,16 @@ public class EntityAbilityDome extends EntityAbilityBarrier { private boolean inTickMelee = false; private final HashSet processedMeleeSwings = new HashSet<>(); - public EntityAbilityDome(World world) { + public EntityEnergyDome(World world) { super(world); this.noClip = true; this.stepHeight = 0.0F; this.setSize(1.0f, 1.0f); } - public EntityAbilityDome(World world, EntityLivingBase owner, double x, double y, double z, - float domeRadius, EnergyDisplayData display, EnergyLightningData lightning, - EnergyBarrierData barrier) { + public EntityEnergyDome(World world, EntityLivingBase owner, double x, double y, double z, + float domeRadius, EnergyDisplayData display, EnergyLightningData lightning, + EnergyBarrierData barrier) { this(world); this.noClip = true; this.stepHeight = 0.0F; diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityPanel.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyPanel.java similarity index 98% rename from src/main/java/kamkeel/npcs/entity/EntityAbilityPanel.java rename to src/main/java/kamkeel/npcs/entity/EntityEnergyPanel.java index 90cd9885a..ad25afa0b 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityPanel.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyPanel.java @@ -21,9 +21,9 @@ import java.util.List; /** * Energy Panel entity - a flat rectangular barrier used by Wall and Shield abilities. * Supports three modes: PLACED (stationary), HELD (tracks caster), LAUNCHED (moves forward). - * Extends EntityAbilityBarrier for shared barrier logic. + * Extends EntityEnergyBarrier for shared barrier logic. */ -public class EntityAbilityPanel extends EntityAbilityBarrier { +public class EntityEnergyPanel extends EntityEnergyBarrier { public enum PanelMode { PLACED, // Stationary wall @@ -41,15 +41,15 @@ public class EntityAbilityPanel extends EntityAbilityBarrier { protected float targetPanelWidth; protected float targetPanelHeight; - public EntityAbilityPanel(World world) { + public EntityEnergyPanel(World world) { super(world); this.setSize(0.5f, 0.5f); } - public EntityAbilityPanel(World world, EntityLivingBase owner, double x, double y, double z, - float yaw, PanelMode mode, - EnergyDisplayData display, EnergyLightningData lightning, - EnergyBarrierData barrier, EnergyPanelData panel) { + public EntityEnergyPanel(World world, EntityLivingBase owner, double x, double y, double z, + float yaw, PanelMode mode, + EnergyDisplayData display, EnergyLightningData lightning, + EnergyBarrierData barrier, EnergyPanelData panel) { this(world); this.setPosition(x, y + panel.heightOffset, z); this.ownerEntityId = owner.getEntityId(); diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java index 634842ada..fbfc91d79 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java @@ -439,8 +439,8 @@ public abstract class EntityEnergyProjectile extends EntityEnergyAbility { * @return true if barrier interaction was handled (caller should stop processing this tick) */ protected boolean checkBarrierCollision() { - List barriers = EntityAbilityBarrier.getActiveBarriers(worldObj); - for (EntityAbilityBarrier barrier : barriers) { + List barriers = EntityEnergyBarrier.getActiveBarriers(worldObj); + for (EntityEnergyBarrier barrier : barriers) { if (barrier.isDead) continue; // Quick distance pre-filter @@ -453,8 +453,8 @@ public abstract class EntityEnergyProjectile extends EntityEnergyAbility { if (barrier.isIncomingProjectile(this)) { float damage = getModifiedDamage(); - EntityAbilityBarrier.ProjectileHitOutcome hitOutcome = barrier.onProjectileHitResolved(this, damage); - if (hitOutcome == null || hitOutcome.result == EntityAbilityBarrier.ProjectileHitResult.PASS) { + EntityEnergyBarrier.ProjectileHitOutcome hitOutcome = barrier.onProjectileHitResolved(this, damage); + if (hitOutcome == null || hitOutcome.result == EntityEnergyBarrier.ProjectileHitResult.PASS) { continue; } if (handleBarrierHitOutcome(barrier, hitOutcome, damage)) { @@ -473,12 +473,12 @@ public abstract class EntityEnergyProjectile extends EntityEnergyAbility { * @param fullDamage The DBC-scaled damage that was passed to the barrier (from getModifiedDamage). * @return true if caller should stop processing this tick. */ - protected boolean handleBarrierHitOutcome(EntityAbilityBarrier barrier, EntityAbilityBarrier.ProjectileHitOutcome hitOutcome, float fullDamage) { - if (hitOutcome == null || hitOutcome.result == EntityAbilityBarrier.ProjectileHitResult.PASS) { + protected boolean handleBarrierHitOutcome(EntityEnergyBarrier barrier, EntityEnergyBarrier.ProjectileHitOutcome hitOutcome, float fullDamage) { + if (hitOutcome == null || hitOutcome.result == EntityEnergyBarrier.ProjectileHitResult.PASS) { return false; } - if (hitOutcome.result == EntityAbilityBarrier.ProjectileHitResult.BROKEN) { + if (hitOutcome.result == EntityEnergyBarrier.ProjectileHitResult.BROKEN) { if (hitOutcome.remainingProjectileDamage <= 0.0f) { damageMultiplier = 0.0f; setBarrierSparkTicks(Math.max(getBarrierSparkTicks(), BARRIER_BREAK_SPARK_TICKS)); @@ -511,7 +511,7 @@ public abstract class EntityEnergyProjectile extends EntityEnergyAbility { return true; } - protected boolean reflectFromBarrier(EntityAbilityBarrier barrier, float reflectStrengthPct) { + protected boolean reflectFromBarrier(EntityEnergyBarrier barrier, float reflectStrengthPct) { if (barrier == null) { return false; } @@ -680,14 +680,14 @@ public abstract class EntityEnergyProjectile extends EntityEnergyAbility { ProjectileReflectPacket.sendToTracking(this, writeReflectionData()); } - protected double[] getBarrierImpactNormal(EntityAbilityBarrier barrier, double velocityX, double velocityY, double velocityZ) { - if (barrier instanceof EntityAbilityDome) { - EntityAbilityDome dome = (EntityAbilityDome) barrier; + protected double[] getBarrierImpactNormal(EntityEnergyBarrier barrier, double velocityX, double velocityY, double velocityZ) { + if (barrier instanceof EntityEnergyDome) { + EntityEnergyDome dome = (EntityEnergyDome) barrier; return normalizeVector(posX - dome.posX, posY - dome.posY, posZ - dome.posZ, velocityX, velocityY, velocityZ); } - if (barrier instanceof EntityAbilityPanel) { - EntityAbilityPanel panel = (EntityAbilityPanel) barrier; + if (barrier instanceof EntityEnergyPanel) { + EntityEnergyPanel panel = (EntityEnergyPanel) barrier; float yawRad = (float) Math.toRadians(panel.getPanelYaw()); double nx = -Math.sin(yawRad); double nz = Math.cos(yawRad); @@ -724,7 +724,7 @@ public abstract class EntityEnergyProjectile extends EntityEnergyAbility { return new double[]{0.0, 1.0, 0.0}; } - protected void beginBarrierImpactPause(boolean destroyOnResume, EntityAbilityBarrier barrier) { + protected void beginBarrierImpactPause(boolean destroyOnResume, EntityEnergyBarrier barrier) { if (barrierImpactPauseTicks <= 0) { pausedMotionX = motionX; pausedMotionY = motionY; @@ -748,12 +748,12 @@ public abstract class EntityEnergyProjectile extends EntityEnergyAbility { return Math.max(0.06f, Math.min(0.22f, size * 0.18f + 0.03f)); } - protected void snapOutsideBarrierForPause(EntityAbilityBarrier barrier) { + protected void snapOutsideBarrierForPause(EntityEnergyBarrier barrier) { if (barrier == null) return; float bias = getBarrierPauseOutsideDistance(); - if (barrier instanceof EntityAbilityDome) { - EntityAbilityDome dome = (EntityAbilityDome) barrier; + if (barrier instanceof EntityEnergyDome) { + EntityEnergyDome dome = (EntityEnergyDome) barrier; double nx = posX - dome.posX; double ny = posY - dome.posY; double nz = posZ - dome.posZ; @@ -784,8 +784,8 @@ public abstract class EntityEnergyProjectile extends EntityEnergyAbility { return; } - if (barrier instanceof EntityAbilityPanel) { - EntityAbilityPanel panel = (EntityAbilityPanel) barrier; + if (barrier instanceof EntityEnergyPanel) { + EntityEnergyPanel panel = (EntityEnergyPanel) barrier; float yawRad = (float) Math.toRadians(panel.getPanelYaw()); double normalX = -Math.sin(yawRad); double normalZ = Math.cos(yawRad); diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilitySweeper.java b/src/main/java/kamkeel/npcs/entity/EntityEnergySweeper.java similarity index 96% rename from src/main/java/kamkeel/npcs/entity/EntityAbilitySweeper.java rename to src/main/java/kamkeel/npcs/entity/EntityEnergySweeper.java index 69d43da0c..e64b0f6eb 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilitySweeper.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergySweeper.java @@ -29,7 +29,7 @@ import java.util.Set; *

* Design: Similar to Beam trail visuals but rotating around origin. */ -public class EntityAbilitySweeper extends EntityEnergyAbility { +public class EntityEnergySweeper extends EntityEnergyAbility { // Beam properties private float beamLength = 10.0f; @@ -61,18 +61,18 @@ public class EntityAbilitySweeper extends EntityEnergyAbility { private transient int ticksSinceDamage = 0; private transient Set hitThisTick = new HashSet<>(); - public EntityAbilitySweeper(World world) { + public EntityEnergySweeper(World world) { super(world); this.setSize(0.1f, 0.1f); this.noClip = true; } - public EntityAbilitySweeper(World world, EntityLivingBase owner, EntityLivingBase target, - float beamLength, float beamWidth, float beamHeight, - EnergyDisplayData displayData, - float sweepSpeed, int numberOfRotations, - float damage, int damageInterval, boolean piercing, - boolean lockOnTarget) { + public EntityEnergySweeper(World world, EntityLivingBase owner, EntityLivingBase target, + float beamLength, float beamWidth, float beamHeight, + EnergyDisplayData displayData, + float sweepSpeed, int numberOfRotations, + float damage, int damageInterval, boolean piercing, + boolean lockOnTarget) { this(world); this.ownerEntityId = owner.getEntityId(); diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 73f87c7f6..32ac9b796 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -29,15 +29,15 @@ import kamkeel.npcs.controllers.TelegraphController; import kamkeel.npcs.controllers.data.energycharge.EnergyChargeTracker; import kamkeel.npcs.controllers.data.profile.CNPCData; import kamkeel.npcs.developer.Developer; -import kamkeel.npcs.entity.EntityAbilityBarrier; +import kamkeel.npcs.entity.EntityEnergyBarrier; import kamkeel.npcs.entity.EntityAbilityBeam; import kamkeel.npcs.entity.EntityAbilityDisc; import kamkeel.npcs.entity.EntityAbilityLaser; import kamkeel.npcs.entity.EntityAbilityOrb; -import kamkeel.npcs.entity.EntityAbilityPanel; -import kamkeel.npcs.entity.EntityAbilitySweeper; +import kamkeel.npcs.entity.EntityEnergyPanel; +import kamkeel.npcs.entity.EntityEnergySweeper; import kamkeel.npcs.entity.EntityAbilityZone; -import kamkeel.npcs.entity.EntityAbilityDome; +import kamkeel.npcs.entity.EntityEnergyDome; import kamkeel.npcs.entity.EntityEnergyProjectile; import kamkeel.npcs.entity.EntityEnergySlicer; import kamkeel.npcs.network.PacketHandler; @@ -298,10 +298,10 @@ public class CustomNpcs { registerNewEntity(EntityAbilityDisc.class, "abilitydisc", 64, 1, true); registerNewEntity(EntityAbilityLaser.class, "abilitylaser", 64, 1, true); registerNewEntity(EntityAbilityBeam.class, "abilitybeam", 160, 1, true); - registerNewEntity(EntityAbilitySweeper.class, "abilitysweeper", 64, 3, true); + registerNewEntity(EntityEnergySweeper.class, "abilitysweeper", 64, 3, true); registerNewEntity(EntityAbilityZone.class, "abilityzone", 64, 3, true); - registerNewEntity(EntityAbilityDome.class, "energydome", 64, 3, true); - registerNewEntity(EntityAbilityPanel.class, "energypanel", 64, 3, true); + registerNewEntity(EntityEnergyDome.class, "energydome", 64, 3, true); + registerNewEntity(EntityEnergyPanel.class, "energypanel", 64, 3, true); registerNewEntity(EntityEnergySlicer.class, "energyslicer", 64, 1, true); new RecipeController(); @@ -433,7 +433,7 @@ public class CustomNpcs { } EntityEnergyProjectile.clearAllProjectiles(); - EntityAbilityBarrier.clearAllBarriers(); + EntityEnergyBarrier.clearAllBarriers(); EnergyChargeTracker.Instance.clear(); if (FMLCommonHandler.instance().getSide().isClient()) diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index 9cbede79a..04e0406d8 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -5,8 +5,8 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import kamkeel.npcs.controllers.SyncController; import kamkeel.npcs.controllers.data.energycharge.EnergyChargeTracker; -import kamkeel.npcs.entity.EntityAbilityBarrier; -import kamkeel.npcs.entity.EntityAbilityDome; +import kamkeel.npcs.entity.EntityEnergyBarrier; +import kamkeel.npcs.entity.EntityEnergyDome; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumSoundOperation; import kamkeel.npcs.network.enums.EnumSyncAction; @@ -159,7 +159,7 @@ public class ServerEventsHandler { if (event.entityLiving == null || event.entityLiving.worldObj == null || event.entityLiving.worldObj.isRemote) return; - EntityAbilityBarrier barrier = EntityAbilityBarrier.getAbsorbingBarrier(event.entityLiving); + EntityEnergyBarrier barrier = EntityEnergyBarrier.getAbsorbingBarrier(event.entityLiving); if (barrier != null) { // Redirect the caster's damage to their barrier barrier.absorbDamage(event.ammount); @@ -191,9 +191,9 @@ public class ServerEventsHandler { } if (!blacklisted) return; - List barriers = EntityAbilityBarrier.getActiveBarriers(player.worldObj); - for (EntityAbilityBarrier barrier : barriers) { - if (barrier instanceof EntityAbilityDome && barrier.isEntityInside(player)) { + List barriers = EntityEnergyBarrier.getActiveBarriers(player.worldObj); + for (EntityEnergyBarrier barrier : barriers) { + if (barrier instanceof EntityEnergyDome && barrier.isEntityInside(player)) { event.setCanceled(true); return; } diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index 971f3b0fd..3e209fa00 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -7,14 +7,14 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.ObfuscationReflectionHelper; import kamkeel.npcs.addon.client.DBCClient; import kamkeel.npcs.client.command.CommandCNPCDebugger; -import kamkeel.npcs.client.renderer.RenderAbilityBeam; -import kamkeel.npcs.client.renderer.RenderAbilityDisc; -import kamkeel.npcs.client.renderer.RenderAbilityLaser; -import kamkeel.npcs.client.renderer.RenderAbilityOrb; -import kamkeel.npcs.client.renderer.RenderAbilitySweeper; -import kamkeel.npcs.client.renderer.RenderAbilityZone; -import kamkeel.npcs.client.renderer.RenderAbilityDome; -import kamkeel.npcs.client.renderer.RenderAbilityPanel; +import kamkeel.npcs.client.renderer.RenderEnergyBeam; +import kamkeel.npcs.client.renderer.RenderEnergyDisc; +import kamkeel.npcs.client.renderer.RenderEnergyLaser; +import kamkeel.npcs.client.renderer.RenderEnergyOrb; +import kamkeel.npcs.client.renderer.RenderSweeper; +import kamkeel.npcs.client.renderer.RenderZone; +import kamkeel.npcs.client.renderer.RenderEnergyDome; +import kamkeel.npcs.client.renderer.RenderEnergyPanel; import kamkeel.npcs.client.renderer.EnergyChargePreviewRenderer; import kamkeel.npcs.client.renderer.RenderEnergyExplosion; import kamkeel.npcs.client.renderer.RenderEnergySlicer; @@ -26,10 +26,10 @@ import kamkeel.npcs.entity.EntityAbilityBeam; import kamkeel.npcs.entity.EntityAbilityDisc; import kamkeel.npcs.entity.EntityAbilityLaser; import kamkeel.npcs.entity.EntityAbilityOrb; -import kamkeel.npcs.entity.EntityAbilitySweeper; +import kamkeel.npcs.entity.EntityEnergySweeper; import kamkeel.npcs.entity.EntityAbilityZone; -import kamkeel.npcs.entity.EntityAbilityDome; -import kamkeel.npcs.entity.EntityAbilityPanel; +import kamkeel.npcs.entity.EntityEnergyDome; +import kamkeel.npcs.entity.EntityEnergyPanel; import kamkeel.npcs.entity.EntityEnergyExplosion; import kamkeel.npcs.entity.EntityEnergySlicer; import net.minecraft.client.Minecraft; @@ -280,14 +280,14 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerEntityRenderingHandler(EntityNpcDragon.class, new RenderNpcDragon(new ModelNpcDragon(0.0F), 0.5F)); RenderingRegistry.registerEntityRenderingHandler(EntityNpcSlime.class, new RenderNpcSlime(new ModelNpcSlime(16), new ModelNpcSlime(0), 0.25F)); RenderingRegistry.registerEntityRenderingHandler(EntityProjectile.class, new RenderProjectile()); - RenderingRegistry.registerEntityRenderingHandler(EntityAbilityOrb.class, new RenderAbilityOrb()); - RenderingRegistry.registerEntityRenderingHandler(EntityAbilityDisc.class, new RenderAbilityDisc()); - RenderingRegistry.registerEntityRenderingHandler(EntityAbilityLaser.class, new RenderAbilityLaser()); - RenderingRegistry.registerEntityRenderingHandler(EntityAbilityBeam.class, new RenderAbilityBeam()); - RenderingRegistry.registerEntityRenderingHandler(EntityAbilitySweeper.class, new RenderAbilitySweeper()); - RenderingRegistry.registerEntityRenderingHandler(EntityAbilityZone.class, new RenderAbilityZone()); - RenderingRegistry.registerEntityRenderingHandler(EntityAbilityDome.class, new RenderAbilityDome()); - RenderingRegistry.registerEntityRenderingHandler(EntityAbilityPanel.class, new RenderAbilityPanel()); + RenderingRegistry.registerEntityRenderingHandler(EntityAbilityOrb.class, new RenderEnergyOrb()); + RenderingRegistry.registerEntityRenderingHandler(EntityAbilityDisc.class, new RenderEnergyDisc()); + RenderingRegistry.registerEntityRenderingHandler(EntityAbilityLaser.class, new RenderEnergyLaser()); + RenderingRegistry.registerEntityRenderingHandler(EntityAbilityBeam.class, new RenderEnergyBeam()); + RenderingRegistry.registerEntityRenderingHandler(EntityEnergySweeper.class, new RenderSweeper()); + RenderingRegistry.registerEntityRenderingHandler(EntityAbilityZone.class, new RenderZone()); + RenderingRegistry.registerEntityRenderingHandler(EntityEnergyDome.class, new RenderEnergyDome()); + RenderingRegistry.registerEntityRenderingHandler(EntityEnergyPanel.class, new RenderEnergyPanel()); RenderingRegistry.registerEntityRenderingHandler(EntityEnergySlicer.class, new RenderEnergySlicer()); RenderingRegistry.registerEntityRenderingHandler(EntityEnergyExplosion.class, new RenderEnergyExplosion()); diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index 09c294e2f..0864e16ec 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -9,11 +9,11 @@ import kamkeel.npcs.controllers.ProfileController; import kamkeel.npcs.controllers.TelegraphController; import kamkeel.npcs.entity.EntityAbilityBeam; import kamkeel.npcs.entity.EntityAbilityDisc; -import kamkeel.npcs.entity.EntityAbilityDome; +import kamkeel.npcs.entity.EntityEnergyDome; import kamkeel.npcs.entity.EntityAbilityLaser; import kamkeel.npcs.entity.EntityAbilityOrb; -import kamkeel.npcs.entity.EntityAbilityPanel; -import kamkeel.npcs.entity.EntityAbilitySweeper; +import kamkeel.npcs.entity.EntityEnergyPanel; +import kamkeel.npcs.entity.EntityEnergySweeper; import kamkeel.npcs.entity.EntityEnergyProjectile; import kamkeel.npcs.entity.EntityEnergySlicer; import net.minecraft.block.Block; @@ -456,12 +456,12 @@ public class NpcAPI extends AbstractNpcAPI { data = new ScriptEntityData(new ScriptEnergySlicer<>((EntityEnergySlicer) entity)); else if (entity instanceof EntityEnergyProjectile) data = new ScriptEntityData(new ScriptEnergyProjectile((EntityEnergyProjectile) entity)); - else if (entity instanceof EntityAbilityDome) - data = new ScriptEntityData(new ScriptEnergyDome<>((EntityAbilityDome) entity)); - else if (entity instanceof EntityAbilityPanel) - data = new ScriptEntityData(new ScriptEnergyPanel<>((EntityAbilityPanel) entity)); - else if (entity instanceof EntityAbilitySweeper) - data = new ScriptEntityData(new ScriptEnergySweeper<>((EntityAbilitySweeper) entity)); + else if (entity instanceof EntityEnergyDome) + data = new ScriptEntityData(new ScriptEnergyDome<>((EntityEnergyDome) entity)); + else if (entity instanceof EntityEnergyPanel) + data = new ScriptEntityData(new ScriptEnergyPanel<>((EntityEnergyPanel) entity)); + else if (entity instanceof EntityEnergySweeper) + data = new ScriptEntityData(new ScriptEnergySweeper<>((EntityEnergySweeper) entity)); else data = new ScriptEntityData(new ScriptEntity<>(entity)); entity.registerExtendedProperties("ScriptedObject", data); diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptEnergyBarrier.java b/src/main/java/noppes/npcs/scripted/entity/ScriptEnergyBarrier.java index fe02608e1..b7f5291bd 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptEnergyBarrier.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptEnergyBarrier.java @@ -1,15 +1,15 @@ package noppes.npcs.scripted.entity; -import kamkeel.npcs.entity.EntityAbilityBarrier; -import kamkeel.npcs.entity.EntityAbilityDome; +import kamkeel.npcs.entity.EntityEnergyBarrier; +import kamkeel.npcs.entity.EntityEnergyDome; import noppes.npcs.api.entity.IEnergyBarrier; import noppes.npcs.scripted.constants.EntityType; /** * Base script wrapper for energy barrier entities (Dome, Panel). - * All shared methods delegate directly to EntityAbilityBarrier base. + * All shared methods delegate directly to EntityEnergyBarrier base. */ -public class ScriptEnergyBarrier extends ScriptEnergyAbility implements IEnergyBarrier { +public class ScriptEnergyBarrier extends ScriptEnergyAbility implements IEnergyBarrier { public ScriptEnergyBarrier(T entity) { super(entity); @@ -138,6 +138,6 @@ public class ScriptEnergyBarrier extends ScriptE } public int getBarrierType() { - return entity instanceof EntityAbilityDome ? 0 : 1; + return entity instanceof EntityEnergyDome ? 0 : 1; } } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptEnergyDome.java b/src/main/java/noppes/npcs/scripted/entity/ScriptEnergyDome.java index 9bcceefbc..e022118f7 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptEnergyDome.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptEnergyDome.java @@ -1,10 +1,10 @@ package noppes.npcs.scripted.entity; -import kamkeel.npcs.entity.EntityAbilityDome; +import kamkeel.npcs.entity.EntityEnergyDome; import noppes.npcs.api.entity.IEnergyDome; import noppes.npcs.scripted.constants.EntityType; -public class ScriptEnergyDome extends ScriptEnergyBarrier implements IEnergyDome { +public class ScriptEnergyDome extends ScriptEnergyBarrier implements IEnergyDome { public ScriptEnergyDome(T entity) { super(entity); diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptEnergyPanel.java b/src/main/java/noppes/npcs/scripted/entity/ScriptEnergyPanel.java index fa929b4a8..04c730fad 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptEnergyPanel.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptEnergyPanel.java @@ -1,10 +1,10 @@ package noppes.npcs.scripted.entity; -import kamkeel.npcs.entity.EntityAbilityPanel; +import kamkeel.npcs.entity.EntityEnergyPanel; import noppes.npcs.api.entity.IEnergyPanel; import noppes.npcs.scripted.constants.EntityType; -public class ScriptEnergyPanel extends ScriptEnergyBarrier implements IEnergyPanel { +public class ScriptEnergyPanel extends ScriptEnergyBarrier implements IEnergyPanel { public ScriptEnergyPanel(T entity) { super(entity); @@ -52,6 +52,6 @@ public class ScriptEnergyPanel extends ScriptEnerg } public boolean isLaunched() { - return entity.getMode() == EntityAbilityPanel.PanelMode.LAUNCHED; + return entity.getMode() == EntityEnergyPanel.PanelMode.LAUNCHED; } } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptEnergySweeper.java b/src/main/java/noppes/npcs/scripted/entity/ScriptEnergySweeper.java index cf957c062..52207238d 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptEnergySweeper.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptEnergySweeper.java @@ -1,8 +1,8 @@ package noppes.npcs.scripted.entity; -import kamkeel.npcs.entity.EntityAbilitySweeper; +import kamkeel.npcs.entity.EntityEnergySweeper; -public class ScriptEnergySweeper extends ScriptEnergyAbility { +public class ScriptEnergySweeper extends ScriptEnergyAbility { public ScriptEnergySweeper(T entity) { super(entity); }