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

Cleanup, main menu progress

Browse Source
This commit is contained in:
Anuken
2019-07-03 23:36:51 -04:00
parent 0837c476a1 77a41b1783
commit d43d4a1773
90 changed files with 4123 additions and 16883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,8 +13,7 @@ import io.anuke.mindustry.entities.bullet.BulletType;
import io.anuke.mindustry.game.ContentList;
import io.anuke.mindustry.graphics.*;
import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.*;
import io.anuke.mindustry.world.blocks.defense.*;
import io.anuke.mindustry.world.blocks.defense.turrets.*;
@@ -310,11 +309,11 @@ public class Blocks implements ContentList{
saltRocks = new StaticWall("saltrocks"){{
}};
sporePine = new StaticWall("spore-pine"){{
sporePine = new StaticTree("spore-pine"){{
variants = 0;
}};
pine = new StaticWall("pine"){{
pine = new StaticTree("pine"){{
variants = 0;
}};

18
core/src/io/anuke/mindustry/content/TypeIDs.java Normal file
View File

@@ -0,0 +1,18 @@
package io.anuke.mindustry.content;
import io.anuke.mindustry.entities.effect.Fire;
import io.anuke.mindustry.entities.effect.Puddle;
import io.anuke.mindustry.entities.type.Player;
import io.anuke.mindustry.game.ContentList;
import io.anuke.mindustry.game.TypeID;
public class TypeIDs implements ContentList{
public static TypeID fire, puddle, player;
@Override
public void load(){
fire = new TypeID("fire", Fire::new);
puddle = new TypeID("puddle", Puddle::new);
player = new TypeID("player", Player::new);
}
}