Re-added remote effect methods

core/src/mindustry/entities/Effect.java

@@ -1,15 +1,26 @@
 package mindustry.entities;
 
+import arc.*;
 import arc.func.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
 
 public class Effect{
+    private static final float shakeFalloff = 10000f;
     private static final EffectContainer container = new EffectContainer();
-    private static int lastid = 0;
+    private static final Seq<Effect> all = new Seq<>();
 
     public final int id;
     public final Cons<EffectContainer> renderer;
@@ -21,10 +32,11 @@ public class Effect{
     public float groundDuration;
 
     public Effect(float life, float clipsize, Cons<EffectContainer> renderer){
-        this.id = lastid++;
+        this.id = all.size;
         this.lifetime = life;
         this.renderer = renderer;
         this.size = clipsize;
+        all.add(this);
     }
 
     public Effect(float life, Cons<EffectContainer> renderer){
@@ -43,35 +55,35 @@ public class Effect{
     }
 
     public void at(Position pos){
-        Effects.create(this, pos.getX(), pos.getY(), 0, Color.white, null);
+        create(this, pos.getX(), pos.getY(), 0, Color.white, null);
     }
 
     public void at(Position pos, float rotation){
-        Effects.create(this, pos.getX(), pos.getY(), rotation, Color.white, null);
+        create(this, pos.getX(), pos.getY(), rotation, Color.white, null);
     }
 
     public void at(float x, float y){
-        Effects.create(this, x, y, 0, Color.white, null);
+        create(this, x, y, 0, Color.white, null);
     }
 
     public void at(float x, float y, float rotation){
-        Effects.create(this, x, y, rotation, Color.white, null);
+        create(this, x, y, rotation, Color.white, null);
     }
 
     public void at(float x, float y, float rotation, Color color){
-        Effects.create(this, x, y, rotation, color, null);
+        create(this, x, y, rotation, color, null);
     }
 
     public void at(float x, float y, Color color){
-        Effects.create(this, x, y, 0, color, null);
+        create(this, x, y, 0, color, null);
     }
 
     public void at(float x, float y, float rotation, Color color, Object data){
-        Effects.create(this, x, y, rotation, color, data);
+        create(this, x, y, rotation, color, data);
     }
 
     public void at(float x, float y, float rotation, Object data){
-        Effects.create(this, x, y, rotation, Color.white, data);
+        create(this, x, y, rotation, Color.white, data);
     }
 
     public void render(int id, Color color, float life, float rotation, float x, float y, Object data){
@@ -81,6 +93,84 @@ public class Effect{
         Draw.reset();
     }
 
+    public static @Nullable Effect get(int id){
+        return id >= all.size || id < 0 ? null : all.get(id);
+    }
+
+    private static void shake(float intensity, float duration){
+        if(!headless){
+            Vars.renderer.shake(intensity, duration);
+        }
+    }
+
+    public static void shake(float intensity, float duration, float x, float y){
+        if(Core.camera == null) return;
+
+        float distance = Core.camera.position.dst(x, y);
+        if(distance < 1) distance = 1;
+
+        shake(Mathf.clamp(1f / (distance * distance / shakeFalloff)) * intensity, duration);
+    }
+
+    public static void shake(float intensity, float duration, Position loc){
+        shake(intensity, duration, loc.getX(), loc.getY());
+    }
+
+    public static void create(Effect effect, float x, float y, float rotation, Color color, Object data){
+        if(headless || effect == Fx.none) return;
+        if(Core.settings.getBool("effects")){
+            Rect view = Core.camera.bounds(Tmp.r1);
+            Rect pos = Tmp.r2.setSize(effect.size).setCenter(x, y);
+
+            if(view.overlaps(pos)){
+                EffectState entity = EffectState.create();
+                entity.effect(effect);
+                entity.rotation(rotation);
+                entity.data(data);
+                entity.lifetime(effect.lifetime);
+                entity.set(x, y);
+                entity.color().set(color);
+                if(data instanceof Posc) entity.parent((Posc)data);
+                entity.add();
+            }
+        }
+    }
+
+    public static void decal(TextureRegion region, float x, float y, float rotation){
+        decal(region, x, y, rotation, 3600f, Pal.rubble);
+    }
+
+    public static void decal(TextureRegion region, float x, float y, float rotation, float lifetime, Color color){
+        if(headless || region == null || !Core.atlas.isFound(region)) return;
+
+        Tile tile = world.tileWorld(x, y);
+        if(tile == null || tile.floor().isLiquid) return;
+
+        Decal decal = Decal.create();
+        decal.set(x, y);
+        decal.rotation(rotation);
+        decal.lifetime(lifetime);
+        decal.color().set(color);
+        decal.region(region);
+        decal.add();
+    }
+
+    public static void scorch(float x, float y, int size){
+        if(headless) return;
+
+        size = Mathf.clamp(size, 0, 9);
+
+        TextureRegion region = Core.atlas.find("scorch-" + size + "-" + Mathf.random(2));
+        decal(region, x, y, Mathf.random(4) * 90, 3600, Pal.rubble);
+    }
+
+    public static void rubble(float x, float y, int blockSize){
+        if(headless) return;
+
+        TextureRegion region = Core.atlas.find("rubble-" + blockSize + "-" + (Core.atlas.has("rubble-" + blockSize + "-1") ? Mathf.random(0, 1) : "0"));
+        decal(region, x, y, Mathf.random(4) * 90, 3600, Pal.rubble);
+    }
+
     public static class EffectContainer implements Scaled{
         public float x, y, time, lifetime, rotation;
         public Color color;