From 9f979cba0dc2bcbb5e9ed273d9d0bb0676ef336a Mon Sep 17 00:00:00 2001
From: Skat <55407440+skykatik@users.noreply.github.com>
Date: Sat, 7 Nov 2020 19:46:37 +0300
Subject: [PATCH] Rollback

---
 core/src/mindustry/core/Control.java          | 2 +-
 core/src/mindustry/graphics/MenuRenderer.java | 2 +-
 core/src/mindustry/logic/LogicOp.java         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java
index 4a3d1fc675..cdb6738ebd 100644
--- a/core/src/mindustry/core/Control.java
+++ b/core/src/mindustry/core/Control.java
@@ -186,7 +186,7 @@ public class Control implements ApplicationListener, Loadable{
                 if(state.isCampaign()){
                     ui.announce("[accent]" + state.rules.sector.name() + "\n" +
                         (state.rules.sector.info.resources.any() ? "[lightgray]" + bundle.get("sectors.resources") + "[white] " +
-                            state.rules.sector.info.resources.toString(" ", UnlockableContent::emoji) : ""), 5);
+                            state.rules.sector.info.resources.toString(" ", u -> u.emoji()) : ""), 5);
                 }
             });
         });
diff --git a/core/src/mindustry/graphics/MenuRenderer.java b/core/src/mindustry/graphics/MenuRenderer.java
index 1be946cbd7..87ab169670 100644
--- a/core/src/mindustry/graphics/MenuRenderer.java
+++ b/core/src/mindustry/graphics/MenuRenderer.java
@@ -42,7 +42,7 @@ public class MenuRenderer implements Disposable{
     private void generate(){
         world.beginMapLoad();
         Tiles tiles = world.resize(width, height);
-        Seq<Block> ores = content.blocks().select(OreBlock.class::isInstance);
+        Seq<Block> ores = content.blocks().select(b -> b instanceof OreBlock);
         shadows = new FrameBuffer(width, height);
         int offset = Mathf.random(100000);
         Simplex s1 = new Simplex(offset);
diff --git a/core/src/mindustry/logic/LogicOp.java b/core/src/mindustry/logic/LogicOp.java
index 23f4ee11b3..3d7d60a8d9 100644
--- a/core/src/mindustry/logic/LogicOp.java
+++ b/core/src/mindustry/logic/LogicOp.java
@@ -4,7 +4,7 @@ import arc.math.*;
 import arc.util.*;
 
 public enum LogicOp{
-    add("+", Double::sum),
+    add("+", (a, b) -> a + b),
     sub("-", (a, b) -> a - b),
     mul("*", (a, b) -> a * b),
     div("/", (a, b) -> a / b),
@@ -29,7 +29,7 @@ public enum LogicOp{
     noise("noise", LExecutor.noise::rawNoise2D),
 
     not("not", a -> ~(long)(a)),
-    abs("abs", Math::abs),
+    abs("abs", a -> Math.abs(a)),
     log("log", Math::log),
     log10("log10", Math::log10),
     sin("sin", d -> Math.sin(d * 0.017453292519943295D)),