Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed Abstract block classes for better code inspection

Browse Source
This commit is contained in:
Anuken
2020-11-28 19:12:27 -05:00
parent b8cb17c0c5
commit bb16d1c613
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/ClientLauncher.java
View File

@@ -112,8 +112,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
super.add(module); super.add(module);
//autoload modules when necessary //autoload modules when necessary
if(module instanceof Loadable){ if(module instanceof Loadable l){
assets.load((Loadable)module); assets.load(l);
} }
} }

2
core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java
View File

@@ -11,7 +11,7 @@ import mindustry.world.meta.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public abstract class BaseTurret extends Block{ public class BaseTurret extends Block{
public float range = 80f; public float range = 80f;
public float rotateSpeed = 5; public float rotateSpeed = 5;

2
core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java
View File

@@ -9,7 +9,7 @@ import mindustry.world.meta.values.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public abstract class ReloadTurret extends BaseTurret{ public class ReloadTurret extends BaseTurret{
public float reloadTime = 10f; public float reloadTime = 10f;
public ReloadTurret(String name){ public ReloadTurret(String name){

2
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -27,7 +27,7 @@ import mindustry.world.meta.*;
import static mindustry.Vars.*; 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 //after being logic-controlled and this amount of time passes, the turret will resume normal AI
public final static float logicControlCooldown = 60 * 2; public final static float logicControlCooldown = 60 * 2;

2
core/src/mindustry/world/blocks/power/PowerBlock.java
View File

@@ -3,7 +3,7 @@ package mindustry.world.blocks.power;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.meta.*; import mindustry.world.meta.*;
public abstract class PowerBlock extends Block{ public class PowerBlock extends Block{
public PowerBlock(String name){ public PowerBlock(String name){
super(name); super(name);

4
core/src/mindustry/world/blocks/production/Drill.java
View File

@@ -259,7 +259,7 @@ public class Drill extends Block{
progress += delta() * dominantItems * speed * warmup; progress += delta() * dominantItems * speed * warmup;
if(Mathf.chanceDelta(updateEffectChance * 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{ }else{
lastDrillSpeed = 0f; lastDrillSpeed = 0f;
warmup = Mathf.lerpDelta(warmup, 0f, warmupSpeed); warmup = Mathf.lerpDelta(warmup, 0f, warmupSpeed);
@@ -274,7 +274,7 @@ public class Drill extends Block{
index ++; index ++;
progress %= delay; 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);
} }
} }