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

Fixed player dupes, new breaking system, multiplayer block edits

Browse Source
This commit is contained in:
Anuken
2018-06-09 23:23:14 -04:00
parent d5a58be440
commit aca1001f9a
22 changed files with 533 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/io/anuke/mindustry/content/blocks/Blocks.java
View File

@@ -12,7 +12,7 @@ import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.*;
public class Blocks extends BlockList implements ContentList{
public static Block air, spawn, blockpart, build1, build2, build3, build4, build5, build6, defaultFloor, space, metalfloor, deepwater, water, lava, oil, stone, blackstone, iron, lead, coal, titanium, thorium, dirt, sand, ice, snow, grass, sandblock, snowblock, stoneblock, blackstoneblock, grassblock, mossblock, shrub, rock, icerock, blackrock, dirtblock;
public static Block air, spawn, blockpart, defaultFloor, space, metalfloor, deepwater, water, lava, oil, stone, blackstone, iron, lead, coal, titanium, thorium, dirt, sand, ice, snow, grass, sandblock, snowblock, stoneblock, blackstoneblock, grassblock, mossblock, shrub, rock, icerock, blackrock, dirtblock;
@Override
public void load() {
@@ -23,17 +23,10 @@ public class Blocks extends BlockList implements ContentList{
blockpart = new BlockPart();
build1 = new BuildBlock("build1");
build2 = new BuildBlock("build2");
build3 = new BuildBlock("build3");
build4 = new BuildBlock("build4");
build5 = new BuildBlock("build5");
build6 = new BuildBlock("build6");
for(int i = 1; i <= 6; i ++){
new BuildBlock("build" + i);
new BreakBlock("break" + i);
}
defaultFloor = new Floor("defaultfloor");