Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -3,11 +3,13 @@ package mindustry.world.blocks.sandbox;
|
||||
import mindustry.gen.*;
|
||||
import mindustry.type.*;
|
||||
import mindustry.world.*;
|
||||
import mindustry.world.meta.*;
|
||||
|
||||
public class ItemVoid extends Block{
|
||||
|
||||
public ItemVoid(String name){
|
||||
super(name);
|
||||
group = BlockGroup.transportation;
|
||||
update = solid = acceptsItems = true;
|
||||
}
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ import mindustry.gen.*;
|
||||
import mindustry.type.*;
|
||||
import mindustry.world.*;
|
||||
import mindustry.world.blocks.*;
|
||||
import mindustry.world.meta.*;
|
||||
|
||||
import static mindustry.Vars.*;
|
||||
|
||||
@@ -25,6 +26,7 @@ public class LiquidSource extends Block{
|
||||
saveConfig = true;
|
||||
noUpdateDisabled = true;
|
||||
displayFlow = false;
|
||||
group = BlockGroup.liquids;
|
||||
|
||||
config(Liquid.class, (LiquidSourceBuild tile, Liquid l) -> tile.source = l);
|
||||
configClear((LiquidSourceBuild tile) -> tile.source = null);
|
||||
|
||||
@@ -3,6 +3,7 @@ package mindustry.world.blocks.sandbox;
|
||||
import mindustry.gen.*;
|
||||
import mindustry.type.*;
|
||||
import mindustry.world.*;
|
||||
import mindustry.world.meta.*;
|
||||
|
||||
public class LiquidVoid extends Block{
|
||||
|
||||
@@ -11,6 +12,7 @@ public class LiquidVoid extends Block{
|
||||
hasLiquids = true;
|
||||
solid = true;
|
||||
update = true;
|
||||
group = BlockGroup.liquids;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user