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-10-26 09:57:04 -04:00
parent 23b9556105 ad080036c2
commit 78afbb3e95
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/sandbox/ItemVoid.java
View File

@@ -3,11 +3,13 @@ package mindustry.world.blocks.sandbox;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.meta.*;
public class ItemVoid extends Block{ public class ItemVoid extends Block{
public ItemVoid(String name){ public ItemVoid(String name){
super(name); super(name);
group = BlockGroup.transportation;
update = solid = acceptsItems = true; update = solid = acceptsItems = true;
} }

2
core/src/mindustry/world/blocks/sandbox/LiquidSource.java
View File

@@ -9,6 +9,7 @@ import mindustry.gen.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.blocks.*; import mindustry.world.blocks.*;
import mindustry.world.meta.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
@@ -25,6 +26,7 @@ public class LiquidSource extends Block{
saveConfig = true; saveConfig = true;
noUpdateDisabled = true; noUpdateDisabled = true;
displayFlow = false; displayFlow = false;
group = BlockGroup.liquids;
config(Liquid.class, (LiquidSourceBuild tile, Liquid l) -> tile.source = l); config(Liquid.class, (LiquidSourceBuild tile, Liquid l) -> tile.source = l);
configClear((LiquidSourceBuild tile) -> tile.source = null); configClear((LiquidSourceBuild tile) -> tile.source = null);

2
core/src/mindustry/world/blocks/sandbox/LiquidVoid.java
View File

@@ -3,6 +3,7 @@ package mindustry.world.blocks.sandbox;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.meta.*;
public class LiquidVoid extends Block{ public class LiquidVoid extends Block{
@@ -11,6 +12,7 @@ public class LiquidVoid extends Block{
hasLiquids = true; hasLiquids = true;
solid = true; solid = true;
update = true; update = true;
group = BlockGroup.liquids;
} }
@Override @Override