Fixed compile errors in MapIO
This commit is contained in:
Anuken
@@ -1,149 +1,42 @@
|
|||||||
package io.anuke.mindustry.io;
|
package io.anuke.mindustry.io;
|
||||||
|
|
||||||
import io.anuke.arc.collection.IntIntMap;
|
|
||||||
import io.anuke.arc.collection.ObjectMap;
|
import io.anuke.arc.collection.ObjectMap;
|
||||||
import io.anuke.arc.collection.ObjectMap.Entry;
|
import io.anuke.arc.collection.ObjectMap.Entry;
|
||||||
import io.anuke.arc.graphics.Color;
|
|
||||||
import io.anuke.arc.graphics.Pixmap;
|
import io.anuke.arc.graphics.Pixmap;
|
||||||
import io.anuke.arc.graphics.Pixmap.Format;
|
|
||||||
import io.anuke.arc.util.Pack;
|
import io.anuke.arc.util.Pack;
|
||||||
import io.anuke.arc.util.Structs;
|
|
||||||
import io.anuke.mindustry.content.Blocks;
|
import io.anuke.mindustry.content.Blocks;
|
||||||
|
import io.anuke.mindustry.game.MappableContent;
|
||||||
import io.anuke.mindustry.game.Team;
|
import io.anuke.mindustry.game.Team;
|
||||||
import io.anuke.mindustry.maps.Map;
|
import io.anuke.mindustry.maps.Map;
|
||||||
import io.anuke.mindustry.type.ContentType;
|
|
||||||
import io.anuke.mindustry.world.Block;
|
|
||||||
import io.anuke.mindustry.world.ColorMapper;
|
|
||||||
import io.anuke.mindustry.world.LegacyColorMapper;
|
|
||||||
import io.anuke.mindustry.world.LegacyColorMapper.LegacyBlock;
|
|
||||||
import io.anuke.mindustry.world.Tile;
|
import io.anuke.mindustry.world.Tile;
|
||||||
import io.anuke.mindustry.world.blocks.BlockPart;
|
import io.anuke.mindustry.world.blocks.BlockPart;
|
||||||
|
|
||||||
import java.io.DataInputStream;
|
import java.io.DataInputStream;
|
||||||
import java.io.DataOutputStream;
|
import java.io.DataOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.OutputStream;
|
|
||||||
|
|
||||||
import static io.anuke.mindustry.Vars.*;
|
import static io.anuke.mindustry.Vars.content;
|
||||||
|
import static io.anuke.mindustry.Vars.world;
|
||||||
|
|
||||||
/**
|
/** Reads and writes map files.*/
|
||||||
* Reads and writes map files.
|
|
||||||
*/
|
|
||||||
public class MapIO{
|
public class MapIO{
|
||||||
private static final int version = 0;
|
private static final int version = 0;
|
||||||
private static IntIntMap defaultBlockMap = new IntIntMap();
|
|
||||||
|
|
||||||
private static void loadDefaultBlocks(){
|
//TODO implement
|
||||||
for(Block block : content.blocks()){
|
public static Pixmap generatePixmap(Map map){
|
||||||
defaultBlockMap.put(block.id, block.id);
|
return null;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Pixmap generatePixmap(MapTileData data){
|
//TODO implement
|
||||||
Pixmap pixmap = new Pixmap(data.width(), data.height(), Format.RGBA8888);
|
/**Reads a pixmap in the 3.5 pixmap format.*/
|
||||||
data.position(0, 0);
|
public static Tile[][] readLegacyPixmap(Pixmap pixmap){
|
||||||
|
return null;
|
||||||
TileDataMarker marker = data.newDataMarker();
|
|
||||||
|
|
||||||
for(int y = 0; y < data.height(); y++){
|
|
||||||
for(int x = 0; x < data.width(); x++){
|
|
||||||
data.read(marker);
|
|
||||||
byte elev = y >= data.height() - 1 ? 0 : data.read(x, y + 1, DataPosition.elevation);
|
|
||||||
Block floor = content.block(marker.floor);
|
|
||||||
Block wall = content.block(marker.wall);
|
|
||||||
int color = ColorMapper.colorFor(floor, wall, Team.all[marker.team]);
|
|
||||||
pixmap.drawPixel(x, pixmap.getHeight() - 1 - y, color);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
data.position(0, 0);
|
|
||||||
|
|
||||||
return pixmap;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**Reads a pixmap in the old (3.5) map format.*/
|
//TODO implement
|
||||||
public static MapTileData readLegacyPixmap(Pixmap pixmap){
|
/**Reads a pixmap in the 4.0 .mmap format.*/
|
||||||
MapTileData data = new MapTileData(pixmap.getWidth(), pixmap.getHeight());
|
public static Tile[][] readLegacyMmap(DataInputStream stream) throws IOException{
|
||||||
|
return null;
|
||||||
for(int x = 0; x < data.width(); x++){
|
|
||||||
for(int y = 0; y < data.height(); y++){
|
|
||||||
int color = pixmap.getPixel(x, pixmap.getHeight() - 1 - y);
|
|
||||||
LegacyBlock block = LegacyColorMapper.get(color);
|
|
||||||
|
|
||||||
data.write(x, y, DataPosition.floor, block.floor.id);
|
|
||||||
data.write(x, y, DataPosition.elevation, (byte)block.elevation);
|
|
||||||
|
|
||||||
//place spawn
|
|
||||||
if(color == Color.rgba8888(Color.RED)){
|
|
||||||
data.write(x, y, DataPosition.wall, Blocks.spawn.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
//place core
|
|
||||||
if(color == Color.rgba8888(Color.GREEN)){
|
|
||||||
for(int dx = 0; dx < 3; dx++){
|
|
||||||
for(int dy = 0; dy < 3; dy++){
|
|
||||||
int worldx = dx - 1 + x;
|
|
||||||
int worldy = dy - 1 + y;
|
|
||||||
|
|
||||||
if(Structs.inBounds(worldx, worldy, pixmap.getWidth(), pixmap.getHeight())){
|
|
||||||
data.write(worldx, worldy, DataPosition.wall, Blocks.blockpart.id);
|
|
||||||
data.write(worldx, worldy, DataPosition.rotationTeam, Pack.byteByte((byte)0, (byte)Team.blue.ordinal()));
|
|
||||||
data.write(worldx, worldy, DataPosition.link, Pack.byteByte((byte) (dx - 1 + 8), (byte) (dy - 1 + 8)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
data.write(x, y, DataPosition.wall, Blocks.core.id);
|
|
||||||
data.write(x, y, DataPosition.rotationTeam, Pack.byteByte((byte)0, (byte)Team.blue.ordinal()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void writeMap(OutputStream stream, ObjectMap<String, String> tags, MapTileData data) throws IOException{
|
|
||||||
if(defaultBlockMap == null){
|
|
||||||
loadDefaultBlocks();
|
|
||||||
}
|
|
||||||
|
|
||||||
MapMeta meta = new MapMeta(version, tags, data.width(), data.height(), defaultBlockMap);
|
|
||||||
|
|
||||||
DataOutputStream ds = new DataOutputStream(stream);
|
|
||||||
|
|
||||||
writeMapMeta(ds, meta);
|
|
||||||
ds.write(data.toArray());
|
|
||||||
|
|
||||||
ds.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reads tile data, skipping meta.
|
|
||||||
*/
|
|
||||||
public static MapTileData readTileData(DataInputStream stream, boolean readOnly) throws IOException{
|
|
||||||
MapMeta meta = readMapMeta(stream);
|
|
||||||
return readTileData(stream, meta, readOnly);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Does not skip meta. Call after reading meta.
|
|
||||||
*/
|
|
||||||
public static MapTileData readTileData(DataInputStream stream, MapMeta meta, boolean readOnly) throws IOException{
|
|
||||||
byte[] bytes = new byte[stream.available()];
|
|
||||||
stream.readFully(bytes);
|
|
||||||
return new MapTileData(bytes, meta.width, meta.height, meta.blockMap, readOnly);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reads tile data, skipping meta tags.
|
|
||||||
*/
|
|
||||||
public static MapTileData readTileData(Map map, boolean readOnly){
|
|
||||||
try(DataInputStream ds = new DataInputStream(map.stream.get())){
|
|
||||||
return MapIO.readTileData(ds, readOnly);
|
|
||||||
}catch(IOException e){
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void writeMap(Map map, Tile[][] tiles, DataOutputStream stream) throws IOException{
|
public static void writeMap(Map map, Tile[][] tiles, DataOutputStream stream) throws IOException{
|
||||||
@@ -155,11 +48,7 @@ public class MapIO{
|
|||||||
stream.writeUTF(entry.value);
|
stream.writeUTF(entry.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
stream.writeShort(content.blocks().size);
|
SaveIO.getSaveWriter().writeContentHeader(stream);
|
||||||
for(Block block : content.blocks()){
|
|
||||||
stream.writeShort(block.id);
|
|
||||||
stream.writeUTF(block.name);
|
|
||||||
}
|
|
||||||
|
|
||||||
stream.writeShort(tiles.length);
|
stream.writeShort(tiles.length);
|
||||||
stream.writeShort(tiles[0].length);
|
stream.writeShort(tiles[0].length);
|
||||||
@@ -175,6 +64,7 @@ public class MapIO{
|
|||||||
}else if(tile.entity != null){
|
}else if(tile.entity != null){
|
||||||
stream.writeByte(Pack.byteByte(tile.getTeamID(), tile.getRotation())); //team + rotation
|
stream.writeByte(Pack.byteByte(tile.getTeamID(), tile.getRotation())); //team + rotation
|
||||||
stream.writeShort((short) tile.entity.health); //health
|
stream.writeShort((short) tile.entity.health); //health
|
||||||
|
tile.entity.writeConfig(stream);
|
||||||
}else if(tile.block() == Blocks.air){
|
}else if(tile.block() == Blocks.air){
|
||||||
int consecutives = 0;
|
int consecutives = 0;
|
||||||
|
|
||||||
@@ -196,9 +86,8 @@ public class MapIO{
|
|||||||
|
|
||||||
public static Map readMap(String useName, DataInputStream stream) throws IOException{
|
public static Map readMap(String useName, DataInputStream stream) throws IOException{
|
||||||
ObjectMap<String, String> tags = new ObjectMap<>();
|
ObjectMap<String, String> tags = new ObjectMap<>();
|
||||||
IntIntMap map = new IntIntMap();
|
|
||||||
|
|
||||||
int version = stream.readInt();
|
stream.readInt(); //version
|
||||||
byte tagAmount = stream.readByte();
|
byte tagAmount = stream.readByte();
|
||||||
|
|
||||||
for(int i = 0; i < tagAmount; i++){
|
for(int i = 0; i < tagAmount; i++){
|
||||||
@@ -207,93 +96,65 @@ public class MapIO{
|
|||||||
tags.put(name, value);
|
tags.put(name, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
short blocks = stream.readShort();
|
|
||||||
for(int i = 0; i < blocks; i++){
|
|
||||||
short id = stream.readShort();
|
|
||||||
String name = stream.readUTF();
|
|
||||||
Block block = content.getByName(ContentType.block, name);
|
|
||||||
if(block == null){
|
|
||||||
block = Blocks.air;
|
|
||||||
}
|
|
||||||
map.put(id, block.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Map(useName);
|
return new Map(useName);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Tile[][] readTiles(DataInputStream stream) throws IOException{
|
public static Tile[][] readTiles(DataInputStream stream) throws IOException{
|
||||||
|
readMap("this map name is utterly irrelevant", stream);
|
||||||
|
|
||||||
|
MappableContent[][] c = SaveIO.getSaveWriter().readContentHeader(stream);
|
||||||
|
|
||||||
int width = stream.readShort();
|
int width = stream.readShort();
|
||||||
int height = stream.readShort();
|
int height = stream.readShort();
|
||||||
|
|
||||||
Tile[][] tiles = new Tile[width][height];
|
try{
|
||||||
|
|
||||||
for(int i = 0; i < width * height; i++){
|
content.setTemporaryMapper(c);
|
||||||
int x = i % width, y = i / width;
|
|
||||||
byte floorid = stream.readByte();
|
|
||||||
byte wallid = stream.readByte();
|
|
||||||
|
|
||||||
Tile tile = new Tile(x, y, floorid, wallid);
|
Tile[][] tiles = new Tile[width][height];
|
||||||
|
|
||||||
if(wallid == Blocks.blockpart.id){
|
for(int i = 0; i < width * height; i++){
|
||||||
tile.link = stream.readByte();
|
int x = i % width, y = i / width;
|
||||||
}else if(tile.entity != null){
|
byte floorid = stream.readByte();
|
||||||
byte tr = stream.readByte();
|
byte wallid = stream.readByte();
|
||||||
short health = stream.readShort();
|
|
||||||
|
|
||||||
byte team = Pack.leftByte(tr);
|
Tile tile = new Tile(x, y, floorid, wallid);
|
||||||
byte rotation = Pack.rightByte(tr);
|
|
||||||
|
|
||||||
Team t = Team.all[team];
|
if(wallid == Blocks.blockpart.id){
|
||||||
|
tile.link = stream.readByte();
|
||||||
|
}else if(tile.entity != null){
|
||||||
|
byte tr = stream.readByte();
|
||||||
|
short health = stream.readShort();
|
||||||
|
|
||||||
tile.setTeam(Team.all[team]);
|
byte team = Pack.leftByte(tr);
|
||||||
tile.entity.health = health;
|
byte rotation = Pack.rightByte(tr);
|
||||||
tile.setRotation(rotation);
|
|
||||||
|
|
||||||
if(tile.entity.items != null) tile.entity.items.read(stream);
|
Team t = Team.all[team];
|
||||||
if(tile.entity.power != null) tile.entity.power.read(stream);
|
|
||||||
if(tile.entity.liquids != null) tile.entity.liquids.read(stream);
|
|
||||||
if(tile.entity.cons != null) tile.entity.cons.read(stream);
|
|
||||||
|
|
||||||
tile.entity.readConfig(stream);
|
tile.setTeam(Team.all[team]);
|
||||||
tile.entity.read(stream);
|
tile.entity.health = health;
|
||||||
|
tile.setRotation(rotation);
|
||||||
|
|
||||||
if(tile.block() == Blocks.core){
|
tile.entity.readConfig(stream);
|
||||||
state.teams.get(t).cores.add(tile);
|
}else if(wallid == 0){
|
||||||
}
|
int consecutives = stream.readUnsignedByte();
|
||||||
}else if(wallid == 0){
|
|
||||||
int consecutives = stream.readUnsignedByte();
|
|
||||||
|
|
||||||
for(int j = i + 1; j < i + 1 + consecutives; j++){
|
for(int j = i + 1; j < i + 1 + consecutives; j++){
|
||||||
int newx = j % width, newy = j / width;
|
int newx = j % width, newy = j / width;
|
||||||
Tile newTile = new Tile(newx, newy, floorid, wallid);
|
Tile newTile = new Tile(newx, newy, floorid, wallid);
|
||||||
tiles[newx][newy] = newTile;
|
tiles[newx][newy] = newTile;
|
||||||
|
}
|
||||||
|
|
||||||
|
i += consecutives;
|
||||||
}
|
}
|
||||||
|
|
||||||
i += consecutives;
|
tiles[x][y] = tile;
|
||||||
}
|
}
|
||||||
|
|
||||||
tiles[x][y] = tile;
|
return tiles;
|
||||||
|
|
||||||
|
}finally{
|
||||||
|
content.setTemporaryMapper(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
return tiles;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void writeMapMeta(DataOutputStream stream, MapMeta meta) throws IOException{
|
|
||||||
stream.writeInt(meta.version);
|
|
||||||
stream.writeByte((byte) meta.tags.size);
|
|
||||||
|
|
||||||
for(Entry<String, String> entry : meta.tags.entries()){
|
|
||||||
stream.writeUTF(entry.key);
|
|
||||||
stream.writeUTF(entry.value);
|
|
||||||
}
|
|
||||||
|
|
||||||
stream.writeShort(content.blocks().size);
|
|
||||||
for(Block block : content.blocks()){
|
|
||||||
stream.writeShort(block.id);
|
|
||||||
stream.writeUTF(block.name);
|
|
||||||
}
|
|
||||||
|
|
||||||
stream.writeShort(meta.width);
|
|
||||||
stream.writeShort(meta.height);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user