Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Vidal committed 2026-01-31 16:48:35 -03:00
commit c9c44d6bf8
15 files changed
+448 -32

No files matched your search

+1 -1
Submodule src/api updated: db6a68e430...bf650319da.
@@ -63,6 +63,7 @@ public class RenderAbilityBeam extends RenderAbilityProjectile {
float headSize = beam.getHeadSize();
int innerColor = beam.getInnerColor();
int outerColor = beam.getOuterColor();
float outerAlpha = beam.getOuterColorAlpha();
// Render everything relative to origin position
GL11.glPushMatrix();
@@ -74,7 +75,7 @@ public class RenderAbilityBeam extends RenderAbilityProjectile {
// Render tail orb at origin (0,0,0) - only in anchored mode
// Don't render if head is too close to origin (would cause overlap/extra orb appearance)
if (beam.shouldRenderTailOrb() && headDistFromOrigin > headSize * 0.5) {
renderTailOrb(headSize * 0.8f, innerColor, outerColor, beam.isOuterColorEnabled(), beam.getOuterColorWidth());
renderTailOrb(headSize * 0.8f, innerColor, outerColor, beam.isOuterColorEnabled(), beam.getOuterColorWidth(), outerAlpha);
}
// Render trail segments with smooth connections (with fading for non-anchored)
@@ -85,7 +86,7 @@ public class RenderAbilityBeam extends RenderAbilityProjectile {
}
// Render head at interpolated offset position
renderHead(beam, headOffsetX, headOffsetY, headOffsetZ, headSize, innerColor, outerColor, partialTicks);
renderHead(beam, headOffsetX, headOffsetY, headOffsetZ, headSize, innerColor, outerColor, outerAlpha, partialTicks);
GL11.glPopMatrix();
@@ -128,10 +129,11 @@ public class RenderAbilityBeam extends RenderAbilityProjectile {
// Render outer glow only if enabled
if (beam.isOuterColorEnabled()) {
float outerScale = innerScale + beam.getOuterColorWidth();
float outerAlpha = beam.getOuterColorAlpha();
GL11.glDepthMask(false);
GL11.glPushMatrix();
GL11.glScalef(outerScale, outerScale, outerScale);
renderCube(outerColor, 0.5f, 0.5f);
renderCube(outerColor, outerAlpha, 0.5f);
GL11.glPopMatrix();
GL11.glDepthMask(true);
}
@@ -148,7 +150,7 @@ public class RenderAbilityBeam extends RenderAbilityProjectile {
* Render the tail orb at the origin (where the beam emanates from).
* This orb does not rotate - it's a stable anchor point.
*/
private void renderTailOrb(float size, int innerColor, int outerColor, boolean outerColorEnabled, float outerColorWidth) {
private void renderTailOrb(float size, int innerColor, int outerColor, boolean outerColorEnabled, float outerColorWidth, float outerAlpha) {
GL11.glPushMatrix();
// Already at origin (0,0,0)
@@ -162,7 +164,7 @@ public class RenderAbilityBeam extends RenderAbilityProjectile {
GL11.glDepthMask(false);
GL11.glPushMatrix();
GL11.glScalef(size * outerScale, size * outerScale, size * outerScale);
renderCube(outerColor, 0.4f, 0.5f);
renderCube(outerColor, outerAlpha, 0.5f);
GL11.glPopMatrix();
GL11.glDepthMask(true);
}
@@ -532,7 +534,7 @@ public class RenderAbilityBeam extends RenderAbilityProjectile {
* Coordinates are relative to origin.
*/
private void renderHead(EntityAbilityBeam beam, double x, double y, double z,
float size, int innerColor, int outerColor, float partialTicks) {
float size, int innerColor, int outerColor, float outerAlpha, float partialTicks) {
GL11.glPushMatrix();
GL11.glTranslated(x, y, z);
@@ -564,7 +566,7 @@ public class RenderAbilityBeam extends RenderAbilityProjectile {
GL11.glDepthMask(false);
GL11.glPushMatrix();
GL11.glScalef(outerScale, outerScale, outerScale);
renderCube(outerColor, 0.5f, 0.5f);
renderCube(outerColor, outerAlpha, 0.5f);
GL11.glPopMatrix();
GL11.glDepthMask(true);
}
@@ -4,6 +4,9 @@ import kamkeel.npcs.controllers.data.ability.Ability;
import kamkeel.npcs.controllers.data.ability.AbilityController;
import net.minecraft.command.ICommandSender;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import static kamkeel.npcs.util.ColorUtil.sendError;
@@ -369,7 +369,7 @@ public abstract class Ability implements IAbility {
* Create a telegraph instance for this ability.
* Override for custom telegraph shapes.
*
* @param npc The caster
* @param caster The caster
* @param target The target (for position calculation)
* @return The telegraph instance, or null if no telegraph
*/
@@ -31,14 +31,6 @@ public abstract class BuiltInAbility extends Ability {
return registryKey;
}
/**
* Built-in abilities are not customizable.
*/
@Override
public boolean isCustomizable() {
return false;
}
/**
* Built-in abilities do not write type-specific NBT (they have fixed configs).
*/
@@ -24,25 +24,25 @@ public class EnergyAnchorData {
}
public EnergyAnchorData(int anchorPoint) {
this.anchorPoint = AnchorPoint.fromId(anchorPoint);
this.anchorPoint = AnchorPoint.fromOrdinal(anchorPoint);
}
public EnergyAnchorData(int anchorPoint, float anchorOffsetX, float anchorOffsetY, float anchorOffsetZ) {
this.anchorPoint = AnchorPoint.fromId(anchorPoint);
this.anchorPoint = AnchorPoint.fromOrdinal(anchorPoint);
this.anchorOffsetX = anchorOffsetX;
this.anchorOffsetY = anchorOffsetY;
this.anchorOffsetZ = anchorOffsetZ;
}
public void writeNBT(NBTTagCompound nbt) {
nbt.setInteger("anchorPoint", anchorPoint.getId());
nbt.setInteger("anchorPoint", anchorPoint.ordinal());
nbt.setFloat("anchorOffsetX", anchorOffsetX);
nbt.setFloat("anchorOffsetY", anchorOffsetY);
nbt.setFloat("anchorOffsetZ", anchorOffsetZ);
}
public void readNBT(NBTTagCompound nbt) {
this.anchorPoint = nbt.hasKey("anchorPoint") ? AnchorPoint.fromId(nbt.getInteger("anchorPoint")) : AnchorPoint.FRONT;
this.anchorPoint = nbt.hasKey("anchorPoint") ? AnchorPoint.fromOrdinal(nbt.getInteger("anchorPoint")) : AnchorPoint.FRONT;
this.anchorOffsetX = nbt.hasKey("anchorOffsetX") ? nbt.getFloat("anchorOffsetX") : 0;
this.anchorOffsetY = nbt.hasKey("anchorOffsetY") ? nbt.getFloat("anchorOffsetY") : 0;
this.anchorOffsetZ = nbt.hasKey("anchorOffsetZ") ? nbt.getFloat("anchorOffsetZ") : 0;
@@ -260,10 +260,10 @@ public class AbilityDisc extends Ability implements IAbilityDisc {
public void setAnchorOffsetZ(float z) { this.anchorData.anchorOffsetZ = z; }
@Override
public int getAnchorPoint() { return anchorData.anchorPoint.getId(); }
public int getAnchorPoint() { return anchorData.anchorPoint.ordinal(); }
@Override
public void setAnchorPoint(int point) { this.anchorData.anchorPoint = AnchorPoint.fromId(point); }
public void setAnchorPoint(int point) { this.anchorData.anchorPoint = AnchorPoint.fromOrdinal(point); }
@Override
@SideOnly(Side.CLIENT)
@@ -263,10 +263,10 @@ public class AbilityEnergyBeam extends Ability implements IAbilityEnergyBeam {
public void setAnchorOffsetZ(float z) { this.anchorData.anchorOffsetZ = z; }
@Override
public int getAnchorPoint() { return anchorData.anchorPoint.getId(); }
public int getAnchorPoint() { return anchorData.anchorPoint.ordinal(); }
@Override
public void setAnchorPoint(int point) { this.anchorData.anchorPoint = AnchorPoint.fromId(point); }
public void setAnchorPoint(int point) { this.anchorData.anchorPoint = AnchorPoint.fromOrdinal(point); }
@Override
@SideOnly(Side.CLIENT)
@@ -396,12 +396,12 @@ public class AbilityOrb extends Ability implements IAbilityOrb {
public void setAnchorOffsetZ(float z) { this.anchorData.anchorOffsetZ = z; }
public int getAnchorPoint() {
return anchorData.anchorPoint.getId();
return anchorData.anchorPoint.ordinal();
}
@Override
public void setAnchorPoint(int point) {
this.anchorData.anchorPoint = AnchorPoint.fromId(point);
this.anchorData.anchorPoint = AnchorPoint.fromOrdinal(point);
}
@Override
@@ -320,7 +320,7 @@ public class ClientProxy extends CommonProxy {
Minecraft mc = Minecraft.getMinecraft();
NPCButton = new KeyBinding("NPC Inventory", Keyboard.KEY_N, "key.categories.customnpc");
SpecialKey = new KeyBinding("key.customnpcs.special", Keyboard.KEY_C, "key.categories.customnpc");
SpecialKey = new KeyBinding("key.customnpcs.special", Keyboard.KEY_B, "key.categories.customnpc");
ClientRegistry.registerKeyBinding(NPCButton);
ClientRegistry.registerKeyBinding(SpecialKey);
@@ -5,6 +5,7 @@ import net.minecraft.item.ItemStack;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.api.IPos;
import noppes.npcs.api.ITimers;
import noppes.npcs.api.ability.IDataAbilities;
import noppes.npcs.api.entity.ICustomNpc;
import noppes.npcs.api.entity.IEntityLivingBase;
import noppes.npcs.api.entity.IPlayer;
@@ -51,6 +52,7 @@ import noppes.npcs.scripted.roles.ScriptRoleInterface;
import noppes.npcs.scripted.roles.ScriptRoleMailman;
import noppes.npcs.scripted.roles.ScriptRoleTrader;
import noppes.npcs.scripted.roles.ScriptRoleTransporter;
import noppes.npcs.scripted.wrapper.ScriptDataAbilities;
import noppes.npcs.util.ValueUtil;
import java.util.ArrayList;
@@ -1458,7 +1460,7 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
return npc.stats.magicData;
}
public noppes.npcs.api.ability.IDataAbilities getAbilityData() {
return new noppes.npcs.scripted.wrapper.ScriptDataAbilities(npc);
public IDataAbilities getAbilityData() {
return new ScriptDataAbilities(npc);
}
}
@@ -2,12 +2,15 @@ package noppes.npcs.scripted.wrapper;
import kamkeel.npcs.controllers.data.ability.Ability;
import kamkeel.npcs.controllers.data.ability.AbilityController;
import kamkeel.npcs.controllers.data.ability.AbilitySlot;
import net.minecraft.entity.EntityLivingBase;
import noppes.npcs.DataAbilities;
import noppes.npcs.api.ability.IAbility;
import noppes.npcs.api.ability.IDataAbilities;
import noppes.npcs.entity.EntityNPCInterface;
import java.util.List;
/**
* Script wrapper for DataAbilities providing API access to NPC abilities.
*/
@@ -65,7 +68,7 @@ public class ScriptDataAbilities implements IDataAbilities {
@Override
public boolean isAbilityReference(String abilityId) {
List<kamkeel.npcs.controllers.data.ability.AbilitySlot> slots = data.getAbilitySlots();
List<AbilitySlot> slots = data.getAbilitySlots();
for (int i = 0; i < slots.size(); i++) {
kamkeel.npcs.controllers.data.ability.AbilitySlot slot = slots.get(i);
if (slot.isReference()) {
@@ -21,7 +21,7 @@ public class ScriptPlayerAbilityData implements IPlayerAbilityData {
@Override
public String[] getUnlockedAbilities() {
return data.getUnlockedAbilities().toArray(new String[0]);
return data.getUnlockedAbilities();
}
@Override
@@ -79,6 +79,11 @@ public class ScriptPlayerAbilityData implements IPlayerAbilityData {
data.interruptCurrentAbility();
}
@Override
public boolean isOnCooldown() {
return data.isOnCooldown();
}
@Override
public boolean isOnCooldown(String key) {
EntityPlayer player = playerData.player;
@@ -86,6 +91,11 @@ public class ScriptPlayerAbilityData implements IPlayerAbilityData {
return data.isOnCooldown(key, player);
}
@Override
public void resetCooldown() {
data.resetCooldown();
}
@Override
public void resetCooldown(String key) {
data.resetCooldown(key);
@@ -0,0 +1,203 @@
{
"Loop": 0,
"Speed": 1.0f,
"Frames": [
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 3.0f,
"FrameParts": [
{
"Pivot2": -1.0f,
"Part": "RIGHT_LEG",
"Rotation1": 31.0f,
"Rotation0": 18.0f,
"Pivot0": -3.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "LEFT_LEG",
"Rotation1": -31.0f,
"Rotation0": 18.0f,
"Pivot0": 3.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -3.0f,
"Part": "RIGHT_ARM",
"Rotation1": -25.0f,
"Rotation0": -90.0f,
"Pivot0": 1.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -3.0f,
"Part": "LEFT_ARM",
"Rotation1": 25.0f,
"Rotation0": -90.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 2
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 3.0f,
"FrameParts": [
{
"Pivot2": -1.0f,
"Part": "RIGHT_LEG",
"Rotation1": 31.0f,
"Rotation0": 18.0f,
"Pivot0": -3.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "LEFT_LEG",
"Rotation1": -31.0f,
"Rotation0": 18.0f,
"Pivot0": 3.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -3.0f,
"Part": "RIGHT_ARM",
"Rotation1": -25.0f,
"Rotation0": -85.0f,
"Pivot0": 1.0f,
"Pivot1": 1.0f,
"Rotation2": 20.0f
},
{
"Pivot2": -3.0f,
"Part": "LEFT_ARM",
"Rotation1": 25.0f,
"Rotation0": -85.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": -20.0f
},
{
"Pivot2": -1.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 2
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 3.0f,
"FrameParts": [
{
"Pivot2": -1.0f,
"Part": "RIGHT_LEG",
"Rotation1": 31.0f,
"Rotation0": 18.0f,
"Pivot0": -3.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "LEFT_LEG",
"Rotation1": -31.0f,
"Rotation0": 18.0f,
"Pivot0": 3.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -3.0f,
"Part": "RIGHT_ARM",
"Rotation1": -25.0f,
"Rotation0": -85.0f,
"Pivot0": 1.0f,
"Pivot1": 1.0f,
"Rotation2": -20.0f
},
{
"Pivot2": -3.0f,
"Part": "LEFT_ARM",
"Rotation1": 25.0f,
"Rotation0": -85.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": 20.0f
},
{
"Pivot2": -1.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 2
}
],
"CurrentFrameTime": 0,
"CurrentFrame": 3,
"Smooth": 0b,
"ID": 12,
"WhileAttacking": 1b,
"WhileWalking": 1b,
"Name": "Ability_DualBeam_Active",
"WhileStanding": 1b
}
@@ -0,0 +1,201 @@
{
"Loop": -1,
"Speed": 1.0f,
"Frames": [
{
"ColorMarker": 16777215,
"Comment": "",
"FrameParts": [
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": 0.0f,
"Rotation0": -6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 18.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 0.0f,
"Rotation0": -6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -18.0f
},
{
"Pivot2": -5.0f,
"Part": "RIGHT_ARM",
"Rotation1": 90.0f,
"Rotation0": -90.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -5.0f,
"Part": "LEFT_ARM",
"Rotation1": -90.0f,
"Rotation0": -90.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -5.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": 25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -5.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
}
],
"Duration": 60
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 2.0f,
"FrameParts": [
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": 0.0f,
"Rotation0": 12.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 18.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 0.0f,
"Rotation0": 12.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -18.0f
},
{
"Pivot2": 4.0f,
"Part": "RIGHT_ARM",
"Rotation1": 75.0f,
"Rotation0": -90.0f,
"Pivot0": 0.0f,
"Pivot1": 2.0f,
"Rotation2": -25.0f
},
{
"Pivot2": 4.0f,
"Part": "LEFT_ARM",
"Rotation1": -75.0f,
"Rotation0": -90.0f,
"Pivot0": 0.0f,
"Pivot1": 2.0f,
"Rotation2": 25.0f
},
{
"Pivot2": 3.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": -18.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 3.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": -31.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 5
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 3.0f,
"FrameParts": [
{
"Pivot2": -1.0f,
"Part": "RIGHT_LEG",
"Rotation1": 31.0f,
"Rotation0": 18.0f,
"Pivot0": -3.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "LEFT_LEG",
"Rotation1": -31.0f,
"Rotation0": 18.0f,
"Pivot0": 3.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -3.0f,
"Part": "RIGHT_ARM",
"Rotation1": -25.0f,
"Rotation0": -90.0f,
"Pivot0": 1.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -3.0f,
"Part": "LEFT_ARM",
"Rotation1": 25.0f,
"Rotation0": -90.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 15
}
],
"CurrentFrameTime": 0,
"CurrentFrame": 2,
"Smooth": 0b,
"ID": 11,
"WhileAttacking": 1b,
"WhileWalking": 1b,
"Name": "Ability_DualBeam_Windup",
"WhileStanding": 1b
}