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

Bundles updated / Fixed some localization bugs

Browse Source
This commit is contained in:
Anuken
2018-08-16 17:43:43 -04:00
parent 01f205d352
commit 53d35e8c77
18 changed files with 304 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@ public class Blocks extends BlockList implements ContentList{
stone = new Floor("stone"){{
hasOres = true;
drops = new ItemStack(Items.stone, 1);
blends = block -> block != this && !(block instanceof Ore);
blends = block -> block != this && !(block instanceof OreBlock);
minimapColor = Color.valueOf("323232");
playerUnmineable = true;
}};

12
core/src/io/anuke/mindustry/world/blocks/Ore.java
View File

@@ -1,12 +0,0 @@
package io.anuke.mindustry.world.blocks;
import io.anuke.mindustry.content.blocks.Blocks;
public class Ore extends Floor{
public Ore(String name){
super(name);
blends = block -> block != this && block != Blocks.stone;
}
}

2
core/src/io/anuke/mindustry/world/blocks/OreBlock.java
View File

@@ -14,7 +14,7 @@ public class OreBlock extends Floor{
public OreBlock(Item ore, Floor base){
super("ore-" + ore.name + "-" + base.name);
this.formalName = ore.name + " " + base.formalName;
this.formalName = ore.localizedName() + " " + base.formalName;
this.drops = new ItemStack(ore, 1);
this.base = base;
this.variants = 3;