From bb16d1c613fda9d49e905e37943832be5812bdd1 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 28 Nov 2020 19:12:27 -0500
Subject: [PATCH] Removed Abstract block classes for better code inspection

---
 core/src/mindustry/ClientLauncher.java                        | 4 ++--
 .../mindustry/world/blocks/defense/turrets/BaseTurret.java    | 2 +-
 .../mindustry/world/blocks/defense/turrets/ReloadTurret.java  | 2 +-
 core/src/mindustry/world/blocks/defense/turrets/Turret.java   | 2 +-
 core/src/mindustry/world/blocks/power/PowerBlock.java         | 2 +-
 core/src/mindustry/world/blocks/production/Drill.java         | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
index 3777da85c7..978361898a 100644
--- a/core/src/mindustry/ClientLauncher.java
+++ b/core/src/mindustry/ClientLauncher.java
@@ -112,8 +112,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
         super.add(module);
 
         //autoload modules when necessary
-        if(module instanceof Loadable){
-            assets.load((Loadable)module);
+        if(module instanceof Loadable l){
+            assets.load(l);
         }
     }
 
diff --git a/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java b/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java
index e10b1612e9..44d4f63f93 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java
@@ -11,7 +11,7 @@ import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
-public abstract class BaseTurret extends Block{
+public class BaseTurret extends Block{
     public float range = 80f;
     public float rotateSpeed = 5;
 
diff --git a/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java
index 33538771a1..bc172e9c46 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java
@@ -9,7 +9,7 @@ import mindustry.world.meta.values.*;
 
 import static mindustry.Vars.*;
 
-public abstract class ReloadTurret extends BaseTurret{
+public class ReloadTurret extends BaseTurret{
     public float reloadTime = 10f;
 
     public ReloadTurret(String name){
diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
index 4572852eb2..4409fa6533 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
@@ -27,7 +27,7 @@ import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
-public abstract class Turret extends ReloadTurret{
+public class Turret extends ReloadTurret{
     //after being logic-controlled and this amount of time passes, the turret will resume normal AI
     public final static float logicControlCooldown = 60 * 2;
 
diff --git a/core/src/mindustry/world/blocks/power/PowerBlock.java b/core/src/mindustry/world/blocks/power/PowerBlock.java
index e71c17aba7..4aad16ec6e 100644
--- a/core/src/mindustry/world/blocks/power/PowerBlock.java
+++ b/core/src/mindustry/world/blocks/power/PowerBlock.java
@@ -3,7 +3,7 @@ package mindustry.world.blocks.power;
 import mindustry.world.*;
 import mindustry.world.meta.*;
 
-public abstract class PowerBlock extends Block{
+public class PowerBlock extends Block{
 
     public PowerBlock(String name){
         super(name);
diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java
index cc0c14b278..49c5576a29 100644
--- a/core/src/mindustry/world/blocks/production/Drill.java
+++ b/core/src/mindustry/world/blocks/production/Drill.java
@@ -259,7 +259,7 @@ public class Drill extends Block{
                 progress += delta() * dominantItems * speed * warmup;
 
                 if(Mathf.chanceDelta(updateEffectChance * warmup))
-                    updateEffect.at(getX() + Mathf.range(size * 2f), getY() + Mathf.range(size * 2f));
+                    updateEffect.at(x + Mathf.range(size * 2f), y + Mathf.range(size * 2f));
             }else{
                 lastDrillSpeed = 0f;
                 warmup = Mathf.lerpDelta(warmup, 0f, warmupSpeed);
@@ -274,7 +274,7 @@ public class Drill extends Block{
                 index ++;
                 progress %= delay;
 
-                drillEffect.at(getX() + Mathf.range(size), getY() + Mathf.range(size), dominantItem.color);
+                drillEffect.at(x + Mathf.range(size), y + Mathf.range(size), dominantItem.color);
             }
         }