Skip to content

Some improvement to effects and its stacks #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartinSVK12 merged 2 commits into from
Feb 15, 2026
Merged

Some improvement to effects and its stacks #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62272c4
effect::stackAdded only called when a stack is added, and if the dura…
Redart15 Feb 15, 2026
fa34182
refactored the syncing to be its own function, made a function to res…
Redart15 Feb 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions effects/src/main/java/sunsetsatellite/catalyst/effects/api/effect/Effect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,13 @@ public <T> void stackSubtracted(EffectStack effectStack, EffectContainer<T> effe

}

public <T> void stackRefreshed(EffectStack effectStack, EffectContainer<T> effectContainer) {

}

@Override
public boolean isIn(Tag tag) {
return tag.appliesTo(this);
}

}
53 changes: 33 additions & 20 deletions effects/src/main/java/sunsetsatellite/catalyst/effects/api/effect/EffectStack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,34 +49,28 @@ public EffectStack(CompoundTag tag) {
this.timeLeft = tag.getInteger("timeLeft");
}

public <T> void start(EffectContainer<T> container) {
public <T> void start(EffectContainer<T> effectContainer) {
if (state == State.INACTIVE) {
state = State.ACTIVE;
timeLeft = duration;
effect.activated(this, container);

if (EnvironmentHelper.isServerEnvironment())
NetworkHandler.sendToAllPlayers(new SyncEffectContainerForEntityNetworkMessage((Entity) container.getParent()));
effect.activated(this, effectContainer);
syncEffectsStack(effectContainer);
}
}

public <T> void pause(EffectContainer<T> container) {
public <T> void pause(EffectContainer<T> effectContainer) {
if (state == State.ACTIVE) {
state = State.PAUSED;
effect.paused(this, container);

if (EnvironmentHelper.isServerEnvironment())
NetworkHandler.sendToAllPlayers(new SyncEffectContainerForEntityNetworkMessage((Entity) container.getParent()));
effect.paused(this, effectContainer);
syncEffectsStack(effectContainer);
}
}

public <T> void unpause(EffectContainer<T> container) {
public <T> void unpause(EffectContainer<T> effectContainer) {
if (state == State.PAUSED) {
state = State.ACTIVE;
effect.unpaused(this, container);

if (EnvironmentHelper.isServerEnvironment())
NetworkHandler.sendToAllPlayers(new SyncEffectContainerForEntityNetworkMessage((Entity) container.getParent()));
effect.unpaused(this, effectContainer);
syncEffectsStack(effectContainer);
}
}

Expand All @@ -88,6 +82,16 @@ public <T> void finish(EffectContainer<T> effectContainer) {
}
}

public <T> void restart(int amount, EffectContainer<T> effectContainer) {
if (state == State.FINISHED) {
timeLeft = duration;
state = State.ACTIVE;
this.amount -= amount;
effect.stackSubtracted(this, effectContainer);
syncEffectsStack(effectContainer);
}
}

public <T> void tick(EffectContainer<T> effectContainer) {
if (state == State.ACTIVE) {
if (effect.getTimeType() == EffectTimeType.PERMANENT) {
Expand All @@ -107,23 +111,32 @@ public <T> void add(int amount, EffectContainer<T> effectContainer) {
this.amount += amount;
if (effect.getTimeType() == EffectTimeType.RESET) {
timeLeft = duration;
effect.stackRefreshed(this, effectContainer);
}
if (effect.getTimeType() == EffectTimeType.ADD) {
timeLeft += effect.getDurationIncrease();
}

effect.stackAdded(this, effectContainer);
if (amount > 0) {
effect.stackAdded(this, effectContainer);
}

if (EnvironmentHelper.isServerEnvironment())
NetworkHandler.sendToAllPlayers(new SyncEffectContainerForEntityNetworkMessage((Entity) effectContainer.getParent()));
syncEffectsStack(effectContainer);
}

public <T> void subtract(int amount, EffectContainer<T> effectContainer) {
this.amount -= amount;
effect.stackSubtracted(this, effectContainer);

if (EnvironmentHelper.isServerEnvironment())
if (amount > 0) {
effect.stackSubtracted(this, effectContainer);
}
syncEffectsStack(effectContainer);
}

private static <T> void syncEffectsStack(EffectContainer<T> effectContainer) {
if (EnvironmentHelper.isServerEnvironment()) {
NetworkHandler.sendToAllPlayers(new SyncEffectContainerForEntityNetworkMessage((Entity) effectContainer.getParent()));
}
}

public boolean isActive() {
Expand Down