Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-05-04 10:58:04 -04:00
parent ea2adbd63b f10bdbf775
commit 25178d0531
5 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/distribution/StackConveyor.java
View File

@@ -78,7 +78,7 @@ public class StackConveyor extends Block implements Autotiler{
for(int i = 0; i < 4; i++){
if((bits[3] & (1 << i)) == 0){
Draw.rect(edgeRegion, req.drawx(), req.drawy(), (req.rotation - i) * 90);
Draw.rect(edgeRegion, req.drawx(), req.drawy(), region.getWidth() * Draw.scl * req.animScale, region.getHeight() * Draw.scl * req.animScale, (req.rotation - i) * 90);
}
}
}

4
core/src/mindustry/world/blocks/liquid/LiquidBlock.java
View File

@@ -9,8 +9,8 @@ import mindustry.world.meta.*;
public class LiquidBlock extends Block{
public @Load("@-liquid") TextureRegion liquidRegion;
public @Load("@-top") TextureRegion bottomRegion;
public @Load("@-bottom") TextureRegion topRegion;
public @Load("@-top") TextureRegion topRegion;
public @Load("@-bottom") TextureRegion bottomRegion;
public LiquidBlock(String name){
super(name);

2
core/src/mindustry/world/blocks/production/Pump.java
View File

@@ -3,6 +3,7 @@ package mindustry.world.blocks.production;
import arc.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import mindustry.annotations.Annotations.*;
import mindustry.type.*;
import mindustry.ui.*;
import mindustry.world.*;
@@ -12,6 +13,7 @@ import mindustry.world.meta.*;
import static mindustry.Vars.*;
public class Pump extends LiquidBlock{
public @Load("pump-liquid") TextureRegion liquidRegion;
public final int timerContentCheck = timers++;
/** Pump amount, total. */