From f755fd76b459622711460f77dffeb55aa86de133 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 22 Dec 2021 22:35:51 -0500 Subject: [PATCH] Drawer cleanup --- core/src/mindustry/world/draw/DrawBubbles.java | 7 +------ core/src/mindustry/world/draw/DrawCircles.java | 7 +------ core/src/mindustry/world/draw/DrawCrucible.java | 6 +----- core/src/mindustry/world/draw/DrawGlowRegion.java | 7 +------ core/src/mindustry/world/draw/DrawLiquidRegion.java | 6 +----- core/src/mindustry/world/draw/DrawLiquidTile.java | 8 +------- core/src/mindustry/world/draw/DrawSpikes.java | 8 +------- gradle.properties | 2 +- 8 files changed, 8 insertions(+), 43 deletions(-) diff --git a/core/src/mindustry/world/draw/DrawBubbles.java b/core/src/mindustry/world/draw/DrawBubbles.java index 57377a1751..b8d955937b 100644 --- a/core/src/mindustry/world/draw/DrawBubbles.java +++ b/core/src/mindustry/world/draw/DrawBubbles.java @@ -3,11 +3,9 @@ package mindustry.world.draw; import arc.graphics.*; import arc.graphics.g2d.*; import arc.util.*; -import mindustry.entities.units.*; import mindustry.gen.*; -import mindustry.world.*; -public class DrawBubbles extends DrawBlock{ +public class DrawBubbles extends DrawPartial{ public Color color = Color.valueOf("7457ce"); public int amount = 12, sides = 8; @@ -22,9 +20,6 @@ public class DrawBubbles extends DrawBlock{ public DrawBubbles(){ } - @Override - public void drawPlan(Block block, BuildPlan plan, Eachable list){} - @Override public void drawBase(Building build){ if(build.warmup() <= 0.001f) return; diff --git a/core/src/mindustry/world/draw/DrawCircles.java b/core/src/mindustry/world/draw/DrawCircles.java index aaa6856b9c..d2132a55d7 100644 --- a/core/src/mindustry/world/draw/DrawCircles.java +++ b/core/src/mindustry/world/draw/DrawCircles.java @@ -4,11 +4,9 @@ import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; import arc.util.*; -import mindustry.entities.units.*; import mindustry.gen.*; -import mindustry.world.*; -public class DrawCircles extends DrawBlock{ +public class DrawCircles extends DrawPartial{ public Color color = Color.valueOf("7457ce"); public int amount = 5, sides = 15; @@ -23,9 +21,6 @@ public class DrawCircles extends DrawBlock{ public DrawCircles(){ } - @Override - public void drawPlan(Block block, BuildPlan plan, Eachable list){} - @Override public void drawBase(Building build){ if(build.warmup() <= 0.001f) return; diff --git a/core/src/mindustry/world/draw/DrawCrucible.java b/core/src/mindustry/world/draw/DrawCrucible.java index 10d1c74308..70ce737095 100644 --- a/core/src/mindustry/world/draw/DrawCrucible.java +++ b/core/src/mindustry/world/draw/DrawCrucible.java @@ -5,11 +5,9 @@ import arc.graphics.g2d.*; import arc.math.*; import arc.math.Interp.*; import arc.util.*; -import mindustry.entities.units.*; import mindustry.gen.*; -import mindustry.world.*; -public class DrawCrucible extends DrawBlock{ +public class DrawCrucible extends DrawPartial{ public Color flameColor = Color.valueOf("f58349"), midColor = Color.valueOf("f2d585"); public float flameRad = 1f, circleSpace = 2f, flameRadiusScl = 10f, flameRadiusMag = 0.6f, circleStroke = 1.5f; @@ -53,6 +51,4 @@ public class DrawCrucible extends DrawBlock{ } } - @Override - public void drawPlan(Block block, BuildPlan plan, Eachable list){} } diff --git a/core/src/mindustry/world/draw/DrawGlowRegion.java b/core/src/mindustry/world/draw/DrawGlowRegion.java index 445183b4d1..800bdbcdfd 100644 --- a/core/src/mindustry/world/draw/DrawGlowRegion.java +++ b/core/src/mindustry/world/draw/DrawGlowRegion.java @@ -4,14 +4,12 @@ import arc.*; import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; -import arc.util.*; -import mindustry.entities.units.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.world.*; /** Not standalone. */ -public class DrawGlowRegion extends DrawBlock{ +public class DrawGlowRegion extends DrawPartial{ public Blending blending = Blending.additive; public String suffix = "-glow"; public float alpha = 0.9f, glowScale = 10f, glowIntensity = 0.5f; @@ -56,7 +54,4 @@ public class DrawGlowRegion extends DrawBlock{ public void load(Block block){ region = Core.atlas.find(block.name + suffix); } - - @Override - public void drawPlan(Block block, BuildPlan plan, Eachable list){} } diff --git a/core/src/mindustry/world/draw/DrawLiquidRegion.java b/core/src/mindustry/world/draw/DrawLiquidRegion.java index b8c1c11f2f..c6d744abbf 100644 --- a/core/src/mindustry/world/draw/DrawLiquidRegion.java +++ b/core/src/mindustry/world/draw/DrawLiquidRegion.java @@ -3,14 +3,13 @@ package mindustry.world.draw; import arc.*; import arc.graphics.g2d.*; import arc.util.*; -import mindustry.entities.units.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.type.*; import mindustry.world.*; /** Not standalone. */ -public class DrawLiquidRegion extends DrawBlock{ +public class DrawLiquidRegion extends DrawPartial{ public Liquid drawLiquid; public TextureRegion liquid; public String suffix = "-liquid"; @@ -23,9 +22,6 @@ public class DrawLiquidRegion extends DrawBlock{ public DrawLiquidRegion(){ } - @Override - public void drawPlan(Block block, BuildPlan plan, Eachable list){} - @Override public void drawBase(Building build){ if(!build.block.hasLiquids) return; diff --git a/core/src/mindustry/world/draw/DrawLiquidTile.java b/core/src/mindustry/world/draw/DrawLiquidTile.java index 3b6e3cfefa..be00a8622d 100644 --- a/core/src/mindustry/world/draw/DrawLiquidTile.java +++ b/core/src/mindustry/world/draw/DrawLiquidTile.java @@ -1,14 +1,11 @@ package mindustry.world.draw; -import arc.util.*; -import mindustry.entities.units.*; import mindustry.gen.*; import mindustry.type.*; -import mindustry.world.*; import mindustry.world.blocks.liquid.*; /** Not standalone. */ -public class DrawLiquidTile extends DrawBlock{ +public class DrawLiquidTile extends DrawPartial{ public Liquid drawLiquid; public float padding; public float alpha = 1f; @@ -25,9 +22,6 @@ public class DrawLiquidTile extends DrawBlock{ public DrawLiquidTile(){ } - @Override - public void drawPlan(Block block, BuildPlan plan, Eachable list){} - @Override public void drawBase(Building build){ Liquid drawn = drawLiquid != null ? drawLiquid : build.liquids.current(); diff --git a/core/src/mindustry/world/draw/DrawSpikes.java b/core/src/mindustry/world/draw/DrawSpikes.java index b1dd93ee4d..4f2acc8afb 100644 --- a/core/src/mindustry/world/draw/DrawSpikes.java +++ b/core/src/mindustry/world/draw/DrawSpikes.java @@ -2,12 +2,9 @@ package mindustry.world.draw; import arc.graphics.*; import arc.graphics.g2d.*; -import arc.util.*; -import mindustry.entities.units.*; import mindustry.gen.*; -import mindustry.world.*; -public class DrawSpikes extends DrawBlock{ +public class DrawSpikes extends DrawPartial{ public Color color = Color.valueOf("7457ce"); public int amount = 10, layers = 1; @@ -21,9 +18,6 @@ public class DrawSpikes extends DrawBlock{ public DrawSpikes(){ } - @Override - public void drawPlan(Block block, BuildPlan plan, Eachable list){} - @Override public void drawBase(Building build){ if(build.warmup() <= 0.001f) return; diff --git a/gradle.properties b/gradle.properties index c72da51d2f..1e78923bca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=0370ef92e5 +archash=3ac9f5e0ef