diff --git a/core/src/mindustry/entities/effect/MultiEffect.java b/core/src/mindustry/entities/effect/MultiEffect.java index a969b3e440..a93c3bd276 100644 --- a/core/src/mindustry/entities/effect/MultiEffect.java +++ b/core/src/mindustry/entities/effect/MultiEffect.java @@ -25,8 +25,13 @@ public class MultiEffect extends Effect{ @Override public void render(EffectContainer e){ + int index = 0; for(Effect f : effects){ - e.scaled(f.lifetime, f::render); + int i = ++index; + e.scaled(f.lifetime, cont -> { + cont.id = e.id + i; + f.render(cont); + }); clip = Math.max(clip, f.clip); } } diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java index 2b3ccefb46..8aa304065f 100644 --- a/core/src/mindustry/graphics/Shaders.java +++ b/core/src/mindustry/graphics/Shaders.java @@ -142,6 +142,10 @@ public class Shaders{ } } + /** @deprecated transition class for mods; use UnitBuildShader instead. */ + @Deprecated + public static class UnitBuild extends UnitBuildShader{} + public static class UnitBuildShader extends LoadShader{ public float progress, time; public Color color = new Color(); diff --git a/gradle.properties b/gradle.properties index e52e016fb3..e33614b1b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=72dd3ba5d27fddfbf52719c10738d790e129e5db +archash=f49f7c824adc556cba6b94579c6b0d4e24574b3e