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

Cleanup

Browse Source
This commit is contained in:
Anuken 2020-09-30 14:50:05 -04:00
parent d2728c2bf0
commit 03d676403f
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -299,7 +299,7 @@ project(":core"){
compileOnly project(":annotations") compileOnly project(":annotations")
annotationProcessor project(":annotations") annotationProcessor project(":annotations")
annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:0.3.0' annotationProcessor 'com.github.Anuken:jabel:40eec868af'
} }
} }

BIN
core/assets/sprites/fallback/sprites5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 186 KiB

After

Width:  |  Height:  |  Size: 179 KiB

BIN
core/assets/sprites/sprites2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 187 KiB

After

Width:  |  Height:  |  Size: 180 KiB

10
core/src/mindustry/graphics/Drawf.java
View File

@ -97,17 +97,15 @@ public class Drawf{
} }
public static void liquid(TextureRegion region, float x, float y, float alpha, Color color, float rotation){ public static void liquid(TextureRegion region, float x, float y, float alpha, Color color, float rotation){
Draw.color(color); Draw.color(color, alpha);
Draw.alpha(alpha);
Draw.rect(region, x, y, rotation); Draw.rect(region, x, y, rotation);
Draw.reset(); Draw.color();
} }
public static void liquid(TextureRegion region, float x, float y, float alpha, Color color){ public static void liquid(TextureRegion region, float x, float y, float alpha, Color color){
Draw.color(color); Draw.color(color, alpha);
Draw.alpha(alpha);
Draw.rect(region, x, y); Draw.rect(region, x, y);
Draw.reset(); Draw.color();
} }
public static void dashCircle(float x, float y, float rad, Color color){ public static void dashCircle(float x, float y, float rad, Color color){

5
core/src/mindustry/world/blocks/liquid/Conduit.java
View File

@ -103,10 +103,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
Draw.color(botColor); Draw.color(botColor);
Draw.rect(sliced(botRegions[bits], slice), x, y, rotation); Draw.rect(sliced(botRegions[bits], slice), x, y, rotation);
Draw.color(liquids.current().color); Drawf.liquid(sliced(botRegions[bits], slice), x, y, smoothLiquid, liquids.current().color, rotation);
Draw.alpha(smoothLiquid);
Draw.rect(sliced(botRegions[bits], slice), x, y, rotation);
Draw.color();
Draw.rect(sliced(topRegions[bits], slice), x, y, rotation); Draw.rect(sliced(topRegions[bits], slice), x, y, rotation);
} }