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

Updated bundles

Browse Source
This commit is contained in:
Anuken
2018-07-27 09:10:39 -04:00
parent ce2896cb38
commit acfa02475b
14 changed files with 114 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/world/BaseBlock.java
View File

@@ -85,8 +85,8 @@ public abstract class BaseBlock{
public boolean acceptLiquid(Tile tile, Tile source, Liquid liquid, float amount){
return hasLiquids && tile.entity.liquids.get(liquid) + amount < liquidCapacity &&
(!singleLiquid || (tile.entity.liquids.current() == liquid || tile.entity.liquids.get(tile.entity.liquids.current()) < 0.01f))
&& (!consumes.has(ConsumeLiquid.class) || consumes.liquid() == liquid);
(!singleLiquid || (tile.entity.liquids.current() == liquid || tile.entity.liquids.get(tile.entity.liquids.current()) < 0.01f)) &&
(!consumes.has(ConsumeLiquid.class) || consumes.liquid() == liquid);
}
public void handleLiquid(Tile tile, Tile source, Liquid liquid, float amount){

13
core/src/io/anuke/mindustry/world/blocks/production/PowerCrafter.java
View File

@@ -12,13 +12,9 @@ import io.anuke.ucore.core.Timers;
public class PowerCrafter extends Block{
protected final int timerDump = timers++;
/**
* Optional.
*/
/**Optional.*/
protected Item outputItem;
/**
* Optional. Set hasLiquids to true when using.
*/
/**Optional. Set hasLiquids to true when using.*/
protected Liquid outputLiquid;
protected float outputLiquidAmount;
protected float craftTime;
@@ -31,6 +27,11 @@ public class PowerCrafter extends Block{
hasItems = true;
}
@Override
public boolean acceptLiquid(Tile tile, Tile source, Liquid liquid, float amount){
return false;
}
@Override
public void init(){
super.init();