mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 04:13:44 +07:00
Code Issues Packages Projects Releases Wiki Activity

Drawer cleanup

Browse Source
This commit is contained in:
Anuken 2021-12-22 22:35:51 -05:00
parent 438661e239
commit f755fd76b4
8 changed files with 8 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/world/draw/DrawBubbles.java
View File

@ -3,11 +3,9 @@ package mindustry.world.draw;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.util.*; import arc.util.*;
import mindustry.entities.units.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.world.*;
public class DrawBubbles extends DrawBlock{ public class DrawBubbles extends DrawPartial{
public Color color = Color.valueOf("7457ce"); public Color color = Color.valueOf("7457ce");
public int amount = 12, sides = 8; public int amount = 12, sides = 8;
@ -22,9 +20,6 @@ public class DrawBubbles extends DrawBlock{
public DrawBubbles(){ public DrawBubbles(){
} }
@Override
public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){}
@Override @Override
public void drawBase(Building build){ public void drawBase(Building build){
if(build.warmup() <= 0.001f) return; if(build.warmup() <= 0.001f) return;

7
core/src/mindustry/world/draw/DrawCircles.java
View File

@ -4,11 +4,9 @@ import arc.graphics.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.math.*; import arc.math.*;
import arc.util.*; import arc.util.*;
import mindustry.entities.units.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.world.*;
public class DrawCircles extends DrawBlock{ public class DrawCircles extends DrawPartial{
public Color color = Color.valueOf("7457ce"); public Color color = Color.valueOf("7457ce");
public int amount = 5, sides = 15; public int amount = 5, sides = 15;
@ -23,9 +21,6 @@ public class DrawCircles extends DrawBlock{
public DrawCircles(){ public DrawCircles(){
} }
@Override
public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){}
@Override @Override
public void drawBase(Building build){ public void drawBase(Building build){
if(build.warmup() <= 0.001f) return; if(build.warmup() <= 0.001f) return;

6
core/src/mindustry/world/draw/DrawCrucible.java
View File

@ -5,11 +5,9 @@ import arc.graphics.g2d.*;
import arc.math.*; import arc.math.*;
import arc.math.Interp.*; import arc.math.Interp.*;
import arc.util.*; import arc.util.*;
import mindustry.entities.units.*;
import mindustry.gen.*; 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 Color flameColor = Color.valueOf("f58349"), midColor = Color.valueOf("f2d585");
public float flameRad = 1f, circleSpace = 2f, flameRadiusScl = 10f, flameRadiusMag = 0.6f, circleStroke = 1.5f; 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<BuildPlan> list){}
} }

7
core/src/mindustry/world/draw/DrawGlowRegion.java
View File

@ -4,14 +4,12 @@ import arc.*;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.math.*; import arc.math.*;
import arc.util.*;
import mindustry.entities.units.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.world.*; import mindustry.world.*;
/** Not standalone. */ /** Not standalone. */
public class DrawGlowRegion extends DrawBlock{ public class DrawGlowRegion extends DrawPartial{
public Blending blending = Blending.additive; public Blending blending = Blending.additive;
public String suffix = "-glow"; public String suffix = "-glow";
public float alpha = 0.9f, glowScale = 10f, glowIntensity = 0.5f; public float alpha = 0.9f, glowScale = 10f, glowIntensity = 0.5f;
@ -56,7 +54,4 @@ public class DrawGlowRegion extends DrawBlock{
public void load(Block block){ public void load(Block block){
region = Core.atlas.find(block.name + suffix); region = Core.atlas.find(block.name + suffix);
} }
@Override
public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){}
} }

6
core/src/mindustry/world/draw/DrawLiquidRegion.java
View File

@ -3,14 +3,13 @@ package mindustry.world.draw;
import arc.*; import arc.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.util.*; import arc.util.*;
import mindustry.entities.units.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.world.*; import mindustry.world.*;
/** Not standalone. */ /** Not standalone. */
public class DrawLiquidRegion extends DrawBlock{ public class DrawLiquidRegion extends DrawPartial{
public Liquid drawLiquid; public Liquid drawLiquid;
public TextureRegion liquid; public TextureRegion liquid;
public String suffix = "-liquid"; public String suffix = "-liquid";
@ -23,9 +22,6 @@ public class DrawLiquidRegion extends DrawBlock{
public DrawLiquidRegion(){ public DrawLiquidRegion(){
} }
@Override
public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){}
@Override @Override
public void drawBase(Building build){ public void drawBase(Building build){
if(!build.block.hasLiquids) return; if(!build.block.hasLiquids) return;

8
core/src/mindustry/world/draw/DrawLiquidTile.java
View File

@ -1,14 +1,11 @@
package mindustry.world.draw; package mindustry.world.draw;
import arc.util.*;
import mindustry.entities.units.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.world.*;
import mindustry.world.blocks.liquid.*; import mindustry.world.blocks.liquid.*;
/** Not standalone. */ /** Not standalone. */
public class DrawLiquidTile extends DrawBlock{ public class DrawLiquidTile extends DrawPartial{
public Liquid drawLiquid; public Liquid drawLiquid;
public float padding; public float padding;
public float alpha = 1f; public float alpha = 1f;
@ -25,9 +22,6 @@ public class DrawLiquidTile extends DrawBlock{
public DrawLiquidTile(){ public DrawLiquidTile(){
} }
@Override
public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){}
@Override @Override
public void drawBase(Building build){ public void drawBase(Building build){
Liquid drawn = drawLiquid != null ? drawLiquid : build.liquids.current(); Liquid drawn = drawLiquid != null ? drawLiquid : build.liquids.current();

8
core/src/mindustry/world/draw/DrawSpikes.java
View File

@ -2,12 +2,9 @@ package mindustry.world.draw;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.util.*;
import mindustry.entities.units.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.world.*;
public class DrawSpikes extends DrawBlock{ public class DrawSpikes extends DrawPartial{
public Color color = Color.valueOf("7457ce"); public Color color = Color.valueOf("7457ce");
public int amount = 10, layers = 1; public int amount = 10, layers = 1;
@ -21,9 +18,6 @@ public class DrawSpikes extends DrawBlock{
public DrawSpikes(){ public DrawSpikes(){
} }
@Override
public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){}
@Override @Override
public void drawBase(Building build){ public void drawBase(Building build){
if(build.warmup() <= 0.001f) return; if(build.warmup() <= 0.001f) return;

2
gradle.properties
View File

@ -24,4 +24,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=0370ef92e5 archash=3ac9f5e0ef