mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-14 11:59:20 +07:00
Code Issues Packages Projects Releases Wiki Activity

Disabled core recipe

Browse Source
This commit is contained in:
Anuken 2018-10-09 23:10:04 -04:00
parent 38f2f1e30a
commit f2ac9ed385
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/io/anuke/mindustry/content/Recipes.java
View File

@ -132,11 +132,12 @@ public class Recipes implements ContentList{
new Recipe(distribution, StorageBlocks.unloader, new ItemStack(Items.densealloy, 40), new ItemStack(Items.silicon, 50));
new Recipe(distribution, StorageBlocks.vault, new ItemStack(Items.densealloy, 500), new ItemStack(Items.thorium, 350));
new Recipe(distribution, StorageBlocks.core,
//core disabled due to being broken
/*new Recipe(distribution, StorageBlocks.core,
new ItemStack(Items.copper, 2000), new ItemStack(Items.densealloy, 1500),
new ItemStack(Items.silicon, 1500), new ItemStack(Items.thorium, 500),
new ItemStack(Items.surgealloy, 500), new ItemStack(Items.phasematter, 750)
);
);*/
//DRILLS, PRODUCERS
new Recipe(production, ProductionBlocks.mechanicalDrill, new ItemStack(Items.copper, 45)).setAlwaysUnlocked(true);

46
core/src/io/anuke/mindustry/world/LegacyColorMapper.java
View File

@ -21,28 +21,28 @@ public class LegacyColorMapper implements ContentList{
public void load(){
defaultValue = new LegacyBlock(Blocks.stone, 0);
insert("ff0000", Blocks.dirt, 0);
insert("00ff00", Blocks.stone, 0);
insert("323232", Blocks.stone, 0);
insert("646464", Blocks.stone, 1);
insert("50965a", Blocks.grass, 0);
insert("5ab464", Blocks.grass, 1);
insert("506eb4", Blocks.water, 0);
insert("465a96", Blocks.deepwater, 0);
insert("252525", Blocks.blackstone, 0);
insert("575757", Blocks.blackstone, 1);
insert("988a67", Blocks.sand, 0);
insert("e5d8bb", Blocks.sand, 1);
insert("c2d1d2", Blocks.snow, 0);
insert("c4e3e7", Blocks.ice, 0);
insert("f7feff", Blocks.snow, 1);
insert("6e501e", Blocks.dirt, 0);
insert("ed5334", Blocks.lava, 0);
insert("292929", Blocks.oil, 0);
insert("c3a490", OreBlocks.get(Blocks.stone, Items.copper), 0);
insert("161616", OreBlocks.get(Blocks.stone, Items.coal), 0);
insert("6277bc", OreBlocks.get(Blocks.stone, Items.titanium), 0);
insert("83bc58", OreBlocks.get(Blocks.stone, Items.thorium), 0);
map("ff0000", Blocks.dirt, 0);
map("00ff00", Blocks.stone, 0);
map("323232", Blocks.stone, 0);
map("646464", Blocks.stone, 1);
map("50965a", Blocks.grass, 0);
map("5ab464", Blocks.grass, 1);
map("506eb4", Blocks.water, 0);
map("465a96", Blocks.deepwater, 0);
map("252525", Blocks.blackstone, 0);
map("575757", Blocks.blackstone, 1);
map("988a67", Blocks.sand, 0);
map("e5d8bb", Blocks.sand, 1);
map("c2d1d2", Blocks.snow, 0);
map("c4e3e7", Blocks.ice, 0);
map("f7feff", Blocks.snow, 1);
map("6e501e", Blocks.dirt, 0);
map("ed5334", Blocks.lava, 0);
map("292929", Blocks.oil, 0);
map("c3a490", OreBlocks.get(Blocks.stone, Items.copper), 0);
map("161616", OreBlocks.get(Blocks.stone, Items.coal), 0);
map("6277bc", OreBlocks.get(Blocks.stone, Items.titanium), 0);
map("83bc58", OreBlocks.get(Blocks.stone, Items.thorium), 0);
}
@Override
@ -50,7 +50,7 @@ public class LegacyColorMapper implements ContentList{
return ContentType.block;
}
private void insert(String color, Block block, int elevation){
private void map(String color, Block block, int elevation){
blockMap.put(Color.rgba8888(Color.valueOf(color)), new LegacyBlock(block, elevation));
}