Name cleanup

This commit is contained in:
Anuken
2021-02-12 19:40:29 -05:00
parent 2e6b90d4d5
commit 9050937900
9 changed files with 122 additions and 54 deletions

View File

@@ -15,10 +15,10 @@ import mindustry.type.*;
import static mindustry.Vars.*;
public class Shaders{
public static BlockBuild blockbuild;
public static BlockBuildShader blockbuild;
public static @Nullable ShieldShader shield;
public static BuildBeamShader buildBeam;
public static UnitBuild build;
public static UnitBuildShader build;
public static DarknessShader darkness;
public static LightShader light;
public static SurfaceShader water, mud, tar, slag, space;
@@ -31,7 +31,7 @@ public class Shaders{
public static void init(){
mesh = new MeshShader();
blockbuild = new BlockBuild();
blockbuild = new BlockBuildShader();
try{
shield = new ShieldShader();
}catch(Throwable t){
@@ -40,7 +40,7 @@ public class Shaders{
t.printStackTrace();
}
buildBeam = new BuildBeamShader();
build = new UnitBuild();
build = new UnitBuildShader();
darkness = new DarknessShader();
light = new LightShader();
water = new SurfaceShader("water");
@@ -142,12 +142,12 @@ public class Shaders{
}
}
public static class UnitBuild extends LoadShader{
public static class UnitBuildShader extends LoadShader{
public float progress, time;
public Color color = new Color();
public TextureRegion region;
public UnitBuild(){
public UnitBuildShader(){
super("unitbuild", "default");
}
@@ -162,11 +162,11 @@ public class Shaders{
}
}
public static class BlockBuild extends LoadShader{
public static class BlockBuildShader extends LoadShader{
public float progress;
public TextureRegion region = new TextureRegion();
public BlockBuild(){
public BlockBuildShader(){
super("blockbuild", "default");
}