Merge pull request #23 from Redart15/next-Redart15

Some improvement to effects and its stacks

Author: MartinSVK12

effects/src/main/java/sunsetsatellite/catalyst/effects/api/effect/Effect.java

@@ -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);
 	}
+
 }

effects/src/main/java/sunsetsatellite/catalyst/effects/api/effect/EffectStack.java

@@ -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);
 		}
 	}
 
@@ -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) {
@@ -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() {