Removed core bullet shield / Drill ore-count

core/src/io/anuke/mindustry/content/Items.java

@@ -16,12 +16,14 @@ public class Items implements ContentList{
             type = ItemType.material;
             hardness = 1;
             cost = 0.6f;
+            genOre = true;
         }};
 
         lead = new Item("lead", Color.valueOf("8c7fa9")){{
             type = ItemType.material;
             hardness = 1;
             cost = 0.9f;
+            genOre = true;
         }};
 
         densealloy = new Item("dense-alloy", Color.valueOf("b2c6d2")){{
@@ -33,12 +35,14 @@ public class Items implements ContentList{
             explosiveness = 0.2f;
             flammability = 0.5f;
             hardness = 2;
+            genOre = true;
         }};
 
         titanium = new Item("titanium", Color.valueOf("8da1e3")){{
             type = ItemType.material;
             hardness = 3;
             cost = 1.1f;
+            genOre = true;
         }};
 
         thorium = new Item("thorium", Color.valueOf("f9a3c7")){{
@@ -47,6 +51,7 @@ public class Items implements ContentList{
             hardness = 4;
             radioactivity = 0.5f;
             cost = 1.4f;
+            genOre = true;
         }};
 
         stone = new Item("stone", Color.valueOf("777777")){{

core/src/io/anuke/mindustry/content/blocks/OreBlocks.java

@@ -1,12 +1,12 @@
 package io.anuke.mindustry.content.blocks;
 
 import com.badlogic.gdx.utils.ObjectMap;
-import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.blocks.Floor;
 import io.anuke.mindustry.world.blocks.OreBlock;
-import static io.anuke.mindustry.Vars.*;
+
+import static io.anuke.mindustry.Vars.content;
 
 public class OreBlocks extends BlockList{
     private static final ObjectMap<Item, ObjectMap<Block, Block>> oreBlockMap = new ObjectMap<>();
@@ -20,9 +20,9 @@ public class OreBlocks extends BlockList{
 
     @Override
     public void load(){
-        Item[] ores = {Items.copper, Items.lead, Items.coal, Items.titanium, Items.thorium};
 
-        for(Item item : ores){
+        for(Item item : content.items()){
+            if(!item.genOre) continue;
             ObjectMap<Block, Block> map = new ObjectMap<>();
             oreBlockMap.put(item, map);