mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-05 16:37:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed legacy color mapping

Browse Source
This commit is contained in:
Anuken 2019-02-07 10:40:29 -05:00
parent c2919f7e7a
commit beb25bd595
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,37 +20,35 @@ public class LegacyColorMapper implements ContentList{
public void load(){ public void load(){
defaultValue = new LegacyBlock(Blocks.stone, Blocks.air); defaultValue = new LegacyBlock(Blocks.stone, Blocks.air);
//TODO remap colors later map("ff0000", Blocks.stainedStone);
// map("ff0000", Blocks.dirt, 0); map("00ff00", Blocks.stone);
map("00ff00", Blocks.stone, 0); map("323232", Blocks.stone);
map("323232", Blocks.stone, 0); map("646464", Blocks.stone, Blocks.rocks);
map("646464", Blocks.stone, 1); map("50965a", Blocks.stainedStone);
//map("50965a", Blocks.grass, 0); map("5ab464", Blocks.stainedStone, Blocks.stainedRocks);
//map("5ab464", Blocks.grass, 1); map("506eb4", Blocks.water);
map("506eb4", Blocks.water, 0); map("465a96", Blocks.deepwater);
map("465a96", Blocks.deepwater, 0); map("252525", Blocks.ignarock);
//map("252525", Blocks.blackstone, 0); map("575757", Blocks.ignarock, Blocks.duneRocks);
//map("575757", Blocks.blackstone, 1); map("988a67", Blocks.sand);
map("988a67", Blocks.sand, 0); map("e5d8bb", Blocks.sand, Blocks.duneRocks);
map("e5d8bb", Blocks.sand, 1); map("c2d1d2", Blocks.snow);
map("c2d1d2", Blocks.snow, 0); map("c4e3e7", Blocks.ice);
map("c4e3e7", Blocks.ice, 0); map("f7feff", Blocks.snow, Blocks.snowrocks);
map("f7feff", Blocks.snow, 1); map("6e501e", Blocks.stainedStone);
//map("6e501e", Blocks.dirt, 0); map("ed5334", Blocks.ignarock);
//map("ed5334", Blocks.blackstone, 0); map("292929", Blocks.tar);
map("292929", Blocks.tar, 0); map("c3a490", OreBlock.get(Blocks.stone, Items.copper));
map("c3a490", OreBlock.get(Blocks.stone, Items.copper), 0); map("161616", OreBlock.get(Blocks.stone, Items.coal));
map("161616", OreBlock.get(Blocks.stone, Items.coal), 0); map("6277bc", OreBlock.get(Blocks.stone, Items.titanium));
map("6277bc", OreBlock.get(Blocks.stone, Items.titanium), 0); map("83bc58", OreBlock.get(Blocks.stone, Items.thorium));
map("83bc58", OreBlock.get(Blocks.stone, Items.thorium), 0);
} }
private void map(String color, Block block, Block wall){ private void map(String color, Block block, Block wall){
blockMap.put(Color.rgba8888(Color.valueOf(color)), new LegacyBlock(block, wall)); blockMap.put(Color.rgba8888(Color.valueOf(color)), new LegacyBlock(block, wall));
} }
//todo fix this, implement proper mapping w/ walls private void map(String color, Block block){
private void map(String color, Block block, int __TODO_fix_this){
blockMap.put(Color.rgba8888(Color.valueOf(color)), new LegacyBlock(block, Blocks.air)); blockMap.put(Color.rgba8888(Color.valueOf(color)), new LegacyBlock(block, Blocks.air));
} }