Reorganize

This commit is contained in:
Kam committed 2026-02-22 03:28:56 -05:00
1 parent 18968bf7c7
commit f58a6010d9
106 files changed
+377 -392

No files matched your search

@@ -2,11 +2,11 @@ package noppes.npcs;
import kamkeel.npcs.controllers.AbilityController;
import kamkeel.npcs.controllers.data.ability.Ability;
import kamkeel.npcs.controllers.data.ability.AbilityPhase;
import kamkeel.npcs.controllers.data.ability.ChainedAbility;
import kamkeel.npcs.controllers.data.ability.ChainedAbilityEntry;
import kamkeel.npcs.controllers.data.ability.enums.AbilityPhase;
import kamkeel.npcs.controllers.data.ability.data.ChainedAbility;
import kamkeel.npcs.controllers.data.ability.data.entry.ChainedAbilityEntry;
import kamkeel.npcs.controllers.data.ability.ConcurrentSlot;
import kamkeel.npcs.controllers.data.ability.ToggleEntry;
import kamkeel.npcs.controllers.data.ability.data.entry.AbilityToggleEntry;
import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.DamageSource;
@@ -296,7 +296,7 @@ public abstract class AbstractDataAbilities {
/**
* Currently active toggles. Key = ability key, Value = toggle entry with state and tick counter.
*/
protected Map<String, ToggleEntry> activeToggles = new LinkedHashMap<>();
protected Map<String, AbilityToggleEntry> activeToggles = new LinkedHashMap<>();
/**
* Cycle a toggle ability to its next state.
@@ -306,7 +306,7 @@ public abstract class AbstractDataAbilities {
* @return The new state (0 = off, 1+ = active state number)
*/
public int toggleAbility(String key) {
ToggleEntry existing = activeToggles.get(key);
AbilityToggleEntry existing = activeToggles.get(key);
if (existing != null) {
int currentState = existing.getState();
int maxStates = existing.getAbility().getToggleStates();
@@ -326,7 +326,7 @@ public abstract class AbstractDataAbilities {
* @return 0 if not active, 1+ for active state
*/
public int getToggleState(String key) {
ToggleEntry entry = activeToggles.get(key);
AbilityToggleEntry entry = activeToggles.get(key);
return entry != null ? entry.getState() : 0;
}
@@ -340,7 +340,7 @@ public abstract class AbstractDataAbilities {
}
return;
}
ToggleEntry existing = activeToggles.get(key);
AbilityToggleEntry existing = activeToggles.get(key);
if (existing != null) {
int currentState = existing.getState();
if (currentState != state) {
@@ -373,7 +373,7 @@ public abstract class AbstractDataAbilities {
if (fireToggleEvent(ability, 0, state)) return false;
ToggleEntry entry = new ToggleEntry(ability, state);
AbilityToggleEntry entry = new AbilityToggleEntry(ability, state);
activeToggles.put(key, entry);
ability.onToggleOn(getEntity());
ability.onToggleStateChanged(getEntity(), 0, state);
@@ -381,7 +381,7 @@ public abstract class AbstractDataAbilities {
return true;
}
private int cycleToggleState(String key, ToggleEntry entry, int oldState, int newState) {
private int cycleToggleState(String key, AbilityToggleEntry entry, int oldState, int newState) {
Ability ability = entry.getAbility();
if (newState < 1 || newState > ability.getToggleStates()) return oldState;
@@ -394,7 +394,7 @@ public abstract class AbstractDataAbilities {
}
private void deactivateToggle(String key) {
ToggleEntry entry = activeToggles.get(key);
AbilityToggleEntry entry = activeToggles.get(key);
if (entry == null) return;
int oldState = entry.getState();
@@ -418,8 +418,8 @@ public abstract class AbstractDataAbilities {
EntityLivingBase entity = getEntity();
List<String> toRemove = null;
for (Map.Entry<String, ToggleEntry> mapEntry : activeToggles.entrySet()) {
ToggleEntry entry = mapEntry.getValue();
for (Map.Entry<String, AbilityToggleEntry> mapEntry : activeToggles.entrySet()) {
AbilityToggleEntry entry = mapEntry.getValue();
entry.incrementTick();
if (entry.getAbility().hasActiveToggle()) {
@@ -441,7 +441,7 @@ public abstract class AbstractDataAbilities {
if (toRemove != null) {
for (String key : toRemove) {
ToggleEntry entry = activeToggles.remove(key);
AbilityToggleEntry entry = activeToggles.remove(key);
if (entry != null) {
int oldState = entry.getState();
entry.getAbility().onToggleOff(entity);
@@ -483,8 +483,8 @@ public abstract class AbstractDataAbilities {
protected void clearActiveToggles() {
if (activeToggles.isEmpty()) return;
EntityLivingBase entity = getEntity();
for (Map.Entry<String, ToggleEntry> mapEntry : activeToggles.entrySet()) {
ToggleEntry entry = mapEntry.getValue();
for (Map.Entry<String, AbilityToggleEntry> mapEntry : activeToggles.entrySet()) {
AbilityToggleEntry entry = mapEntry.getValue();
entry.getAbility().onToggleOff(entity);
entry.getAbility().onToggleStateChanged(entity, entry.getState(), 0);
}
@@ -502,7 +502,7 @@ public abstract class AbstractDataAbilities {
Ability ability = AbilityController.Instance != null
? AbilityController.Instance.resolveAbility(key) : null;
if (ability != null && ability.isToggleable()) {
activeToggles.put(key, new ToggleEntry(ability, state));
activeToggles.put(key, new AbilityToggleEntry(ability, state));
}
} else {
activeToggles.remove(key);