Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2021-07-20 08:49:10 -04:00
4 changed files with 10 additions and 2 deletions

View File

@@ -290,6 +290,7 @@ public class NetClient implements ApplicationListener{
@Remote(called = Loc.client, variants = Variant.one)
public static void connect(String ip, int port){
if(!steam && ip.startsWith("steam:")) return;
netClient.disconnectQuietly();
logic.reset();

View File

@@ -2,16 +2,22 @@ package mindustry.world.draw;
import arc.*;
import arc.graphics.g2d.*;
import mindustry.graphics.*;
import mindustry.world.*;
import mindustry.world.blocks.production.GenericCrafter.*;
public class DrawRotator extends DrawBlock{
public TextureRegion rotator, top;
public boolean drawSpinSprite = false;
@Override
public void draw(GenericCrafterBuild build){
Draw.rect(build.block.region, build.x, build.y);
Draw.rect(rotator, build.x, build.y, build.totalProgress * 2f);
if(drawSpinSprite){
Drawf.spinSprite(rotator, build.x, build.y, build.totalProgress * 2f);
}else{
Draw.rect(rotator, build.x, build.y, build.totalProgress * 2f);
}
if(top.found()) Draw.rect(top, build.x, build.y);
}