mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-13 19:39:04 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added all export/import menus, fixed bad icons for editor blocks

Browse Source
This commit is contained in:
Anuken 2018-05-22 23:56:29 -04:00
parent b20f026c7b
commit c920fa6740
17 changed files with 621 additions and 413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/ui/icons/icon-file-image.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 198 B

BIN
core/assets-raw/sprites/ui/icons/icon-file.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 184 B

BIN
core/assets-raw/sprites/ui/icons/icon-floppy-16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 199 B

18
core/assets/bundles/bundle.properties
View File

@ -150,8 +150,8 @@ text.enemies={0} Enemies
text.enemies.single={0} Enemy
text.loadimage=Load Image
text.saveimage=Save Image
text.oregen=Ore Generation
text.unknown=Unknown
text.editor.oregen=Ore Generation
text.editor.mapinfo=Map Info
text.editor.author=Author:
text.editor.description=Description:
@ -164,8 +164,21 @@ text.editor.generate=Generate
text.editor.resize=Resize
text.editor.loadmap=Load Map
text.editor.savemap=Save Map
text.editor.saved=Saved!
text.editor.save.noname=Your map does not have a name! Set one in the 'map info' menu.
text.editor.save.overwrite=Your map overwrites a built-in map! Pick a different name in the 'map info' menu.
text.editor.import=Import...
text.editor.importmap=Import Map
text.editor.exportmap=Export Map
text.editor.importmap.description=Import an already existing map
text.editor.importfile=Import File
text.editor.importfile.description=Import an external map file
text.editor.importimage=Import Terrain Image
text.editor.importimage.description=Import an external map image file
text.editor.export=Export...
text.editor.exportfile=Export File
text.editor.exportfile.description=Export a map file
text.editor.exportimage=Export Terrain Image
text.editor.exportimage.description=Export a map image file
text.editor.loadimage=Import Terrain
text.editor.saveimage=Export Terrain
text.editor.unsaved=[scarlet]You have unsaved changes![]\nAre you sure you want to exit?
@ -177,7 +190,6 @@ text.editor.resizemap=Resize Map
text.editor.resizebig=[scarlet]Warning!\n[]Maps larger than 256 units may be laggy and unstable.
text.editor.mapname=Map Name:
text.editor.overwrite=[accent]Warning!\nThis overwrites an existing map.
text.editor.failoverwrite=[crimson]Cannot overwrite default map!
text.editor.selectmap=Select a map to load:
text.width=Width:
text.height=Height:

651
core/assets/sprites/sprites.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 108 KiB

8
core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java
View File

@ -1,16 +1,12 @@
package io.anuke.mindustry.content.blocks;
import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.UnitTypes;
import io.anuke.mindustry.type.ItemStack;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.blocks.types.units.RepairPoint;
import io.anuke.mindustry.world.blocks.types.units.ResupplyPoint;
import io.anuke.mindustry.world.blocks.types.units.UnitFactory;
public class UnitBlocks {
public static final Block
/*
droneFactory = new UnitFactory("dronefactory"){{
type = UnitTypes.drone;
produceTime = 200;
@ -36,7 +32,7 @@ public class UnitBlocks {
requirements = new ItemStack[]{
new ItemStack(Items.stone, 1)
};
}},
}},*/
resupplyPoint = new ResupplyPoint("resupplypoint"){{
shadow = "shadow-round-1";

1
core/src/io/anuke/mindustry/core/Control.java
View File

@ -269,6 +269,7 @@ public class Control extends Module{
public void dispose(){
Platform.instance.onGameExit();
Net.dispose();
ui.editor.dispose();
}
@Override

10
core/src/io/anuke/mindustry/core/UI.java
View File

@ -23,11 +23,13 @@ import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.modules.SceneModule;
import io.anuke.ucore.scene.Group;
import io.anuke.ucore.scene.Skin;
import io.anuke.ucore.scene.actions.Actions;
import io.anuke.ucore.scene.builders.build;
import io.anuke.ucore.scene.ui.Dialog;
import io.anuke.ucore.scene.ui.TextField;
import io.anuke.ucore.scene.ui.TextField.TextFieldFilter;
import io.anuke.ucore.scene.ui.TooltipManager;
import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.scene.ui.layout.Unit;
import io.anuke.ucore.util.Mathf;
@ -239,6 +241,14 @@ public class UI extends SceneModule{
showTextInput(title, text, def, (field, c) -> true, confirmed);
}
public void showInfoFade(String info){
Table table = new Table();
table.setFillParent(true);
table.actions(Actions.fadeOut(7f, Interpolation.fade), Actions.removeActor());
table.top().add(info).padTop(8);
Core.scene.add(table);
}
public void showInfo(String info){
new Dialog("$text.info.title", "dialog"){{
content().margin(15).add(info).width(600f).get().setWrap(true);

129
core/src/io/anuke/mindustry/editor/MapEditorDialog.java
View File

@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Disposable;
import com.badlogic.gdx.utils.ObjectMap;
import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.game.Team;
@ -18,6 +19,7 @@ import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.core.Inputs;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.function.Listenable;
import io.anuke.ucore.graphics.Pixmaps;
import io.anuke.ucore.input.Input;
import io.anuke.ucore.scene.Element;
@ -39,7 +41,7 @@ import java.io.IOException;
import static io.anuke.mindustry.Vars.*;
public class MapEditorDialog extends Dialog{
public class MapEditorDialog extends Dialog implements Disposable{
private MapEditor editor;
private MapView view;
private MapInfoDialog infoDialog;
@ -72,7 +74,7 @@ public class MapEditorDialog extends Dialog{
if(!editor.getTags().containsKey("name")){
tags.put("name", result.nameWithoutExtension());
}
MapIO.writeMap(result, editor.getTags(), editor.getMap());
MapIO.writeMap(result.write(false), editor.getTags(), editor.getMap());
}catch (Exception e){
ui.showError(Bundles.format("text.editor.errorimagesave", Strings.parseException(e, false)));
Log.err(e);
@ -128,9 +130,30 @@ public class MapEditorDialog extends Dialog{
menu.addCloseButton();
float isize = 16*2f;
float swidth = 180f;
menu.content().table(t -> {
t.defaults().size(230f, 60f).padBottom(5).padRight(5).padLeft(5);
t.defaults().size(swidth, 60f).padBottom(5).padRight(5).padLeft(5);
t.addImageTextButton("$text.editor.savemap", "icon-floppy-16", isize, () -> {
String name = editor.getTags().get("name", "");
if(name.isEmpty()){
ui.showError("$text.editor.save.noname");
}else{
Map map = world.maps().getByName(name);
if(map != null && !map.custom){
ui.showError("$text.editor.save.overwrite");
}else{
world.maps().saveAndReload(name, editor.getMap(), editor.getTags());
ui.showInfoFade("$text.editor.saved");
}
}
menu.hide();
}).size(swidth*2f + 10, 60f).colspan(2);
t.row();
t.addImageTextButton("$text.editor.mapinfo", "icon-pencil", isize, () -> {
infoDialog.show();
@ -144,40 +167,18 @@ public class MapEditorDialog extends Dialog{
t.row();
t.addImageTextButton("$text.editor.savemap", "icon-save-map", isize, () -> {
saveDialog.show();
menu.hide();
});
t.addImageTextButton("$text.editor.import", "icon-load-map", isize, () ->
createDialog("$text.editor.import",
"$text.editor.importmap", "$text.editor.importmap.description", "icon-load-map", (Listenable)loadDialog::show,
"$text.editor.importfile", "$text.editor.importfile.description", "icon-file", (Listenable)openFile::show,
"$text.editor.importimage", "$text.editor.importimage.description", "icon-file-image", (Listenable)openImage::show));
t.addImageTextButton("$text.editor.loadmap", "icon-load-map", isize, () -> {
loadDialog.show();
menu.hide();
});
t.addImageTextButton("$text.editor.export", "icon-save-map", isize, () -> createDialog("$text.editor.export",
"$text.editor.exportfile", "$text.editor.exportfile.description", "icon-file", (Listenable)saveFile::show,
"$text.editor.exportimage", "$text.editor.exportimage.description", "icon-file-image", (Listenable)saveImage::show));
t.row();
t.addImageTextButton("$text.editor.importmap", "icon-save-map", isize, () -> {
saveFile.show();
menu.hide();
});
t.addImageTextButton("$text.editor.exportmap", "icon-load-map", isize, () -> {
openFile.show();
menu.hide();
});
t.row();
t.addImageTextButton("$text.editor.saveimage", "icon-save-map", isize, () -> {
saveImage.show();
menu.hide();
});
t.addImageTextButton("$text.editor.loadimage", "icon-load-map", isize, () -> {
openImage.show();
menu.hide();
});
t.row();
});
@ -190,7 +191,7 @@ public class MapEditorDialog extends Dialog{
hide();
}
menu.hide();
}).size(470f, 60f);
}).padTop(-5).size(swidth*2f + 10, 60f);
resizeDialog = new MapResizeDialog(editor, (x, y) -> {
if(!(editor.getMap().width() == x && editor.getMap().height() == y)){
@ -259,12 +260,63 @@ public class MapEditorDialog extends Dialog{
hidden(() -> Platform.instance.updateRPC());
}
/**Argument format:
* 0) button name
* 1) description
* 2) icon name
* 3) listener
*/
private FloatingDialog createDialog(String title, Object... arguments){
FloatingDialog dialog = new FloatingDialog(title);
float h = 90f;
dialog.content().defaults().size(360f, h).padBottom(5).padRight(5).padLeft(5);
for(int i = 0; i < arguments.length; i += 4){
String name = (String)arguments[i];
String description = (String)arguments[i + 1];
String iconname = (String)arguments[i + 2];
Listenable listenable = (Listenable)arguments[i + 3];
TextButton button = dialog.content().addButton(name, () -> {
listenable.listen();
dialog.hide();
menu.hide();
}).left().get();
button.clearChildren();
button.table("button", t -> {
t.addImage(iconname).size(16*3);
t.update(() -> t.background(button.getClickListener().isOver() ? "button-over" : "button"));
}).padLeft(-10).padBottom(-3).size(h);
button.table(t -> {
t.add(name).growX().wrap();
t.row();
t.add(description).color(Color.GRAY).growX().wrap();
}).growX().padLeft(8);
button.row();
dialog.content().row();
}
dialog.addCloseButton();
dialog.show();
return dialog;
}
@Override
public Dialog show(){
return super.show(Core.scene, Actions.sequence(Actions.alpha(0f), Actions.scaleTo(1f, 1f), Actions.fadeIn(0.3f)));
}
@Override
public void dispose(){
editor.renderer().dispose();
}
public MapView getView() {
return view;
}
@ -449,12 +501,9 @@ public class MapEditorDialog extends Dialog{
int i = 0;
for(Block block : Block.getAllBlocks()){
TextureRegion[] regions;
try {
regions = block.getCompactIcon();
}catch (Exception e){
continue;
}
TextureRegion[] regions = block.getCompactIcon();
if(regions.length == 0) continue;
Stack stack = new Stack();

7
core/src/io/anuke/mindustry/editor/MapInfoDialog.java
View File

@ -60,6 +60,13 @@ public class MapInfoDialog extends FloatingDialog{
}).size(400, 55f).get();
author.setMessageText("$text.unknown");
content().row();
content().add().padRight(8).left();
content().addCheck("$text.editor.oregen", enabled -> {
tags.put("oregen", enabled ? "1" : "0");
}).left();
Platform.instance.addDialog(name, 50);
Platform.instance.addDialog(author, 50);
Platform.instance.addDialog(description, 1000);

98
core/src/io/anuke/mindustry/editor/MapRenderer.java
View File

@ -1,29 +1,99 @@
package io.anuke.mindustry.editor;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.graphics.Pixmap.Format;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.Texture.TextureFilter;
import com.badlogic.gdx.graphics.g2d.PixmapPacker;
import com.badlogic.gdx.graphics.g2d.PixmapPacker.Page;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.utils.Disposable;
import com.badlogic.gdx.utils.IntSet;
import com.badlogic.gdx.utils.IntSet.IntSetIterator;
import io.anuke.mindustry.content.blocks.Blocks;
import com.badlogic.gdx.utils.ObjectMap;
import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.io.MapTileData.TileDataMarker;
import io.anuke.mindustry.world.Block;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.IndexedRenderer;
import io.anuke.ucore.util.Log;
import static io.anuke.mindustry.Vars.tilesize;
public class MapRenderer {
public class MapRenderer implements Disposable{
private static final int chunksize = 64;
private IndexedRenderer[][] chunks;
private IntSet updates = new IntSet();
private MapEditor editor;
private int width, height;
private ObjectMap<Block, TextureRegion> blockIcons = new ObjectMap<>();
private ObjectMap<String, TextureRegion> regions = new ObjectMap<>();
private Texture blockTexture;
public MapRenderer(MapEditor editor){
this.editor = editor;
createTexture();
}
private void createTexture(){
Timers.mark();
PixmapPacker packer = new PixmapPacker(512, 512, Format.RGBA8888, 2, true);
Pixmap pixmap = Core.atlas.getPixmapOf("blank");
for(Block block : Block.getAllBlocks()){
TextureRegion[] regions = block.getBlockIcon();
if(regions.length > 0){
Pixmap result = new Pixmap(regions[0].getRegionWidth(), regions[0].getRegionHeight(), Format.RGBA8888);
for(TextureRegion region : regions){
result.drawPixmap(pixmap, 0, 0, region.getRegionX(), region.getRegionY(), region.getRegionWidth(), region.getRegionHeight());
}
packer.pack(block.name, result);
result.dispose();
}
}
add("clear", packer);
add("block-border", packer);
if(packer.getPages().size > 1){
throw new IllegalArgumentException("Pixmap packer may not have more than 1 page!");
}
Page page = packer.getPages().first();
page.updateTexture(TextureFilter.Nearest, TextureFilter.Nearest, false);
blockTexture = page.getTexture();
for(String str : page.getRects().keys()){
if(Block.getByName(str) == null) continue;
Rectangle rect = page.getRects().get(str);
blockIcons.put(Block.getByName(str),
new TextureRegion(blockTexture,
(int)rect.x, (int)rect.y, (int)rect.width, (int)rect.height));
}
packer.dispose();
Core.atlas.disposePixmaps();
Log.info("Packing elapsed: {0}", Timers.elapsed());
}
private void add(String name, PixmapPacker packer){
TextureRegion region = Draw.region(name);
Pixmap result = new Pixmap(region.getRegionWidth(), region.getRegionHeight(), Format.RGBA8888);
result.drawPixmap(Core.atlas.getPixmapOf(region), 0, 0, region.getRegionX(), region.getRegionY(), region.getRegionWidth(), region.getRegionHeight());
Rectangle rect = packer.pack(name, result);
result.dispose();
Gdx.app.postRunnable(() -> regions.put(name, new TextureRegion(packer.getPages().first().getTexture(), (int)rect.x, (int)rect.y, (int)rect.width, (int)rect.height)));
}
public void resize(int width, int height){
@ -68,7 +138,7 @@ public class MapRenderer {
th / (height * tilesize), 1f);
mesh.setProjectionMatrix(Core.batch.getProjectionMatrix());
mesh.render(Core.atlas.getTextures().first());
mesh.render(blockTexture);
}
}
@ -98,14 +168,10 @@ public class MapRenderer {
int offsetx = -(wall.size-1)/2;
int offsety = -(wall.size-1)/2;
String fregion = Draw.hasRegion(floor.name) ? floor.name : (Draw.hasRegion(floor.name + "1") ? (floor.name + "1") : "clear");
TextureRegion region = Draw.region(fregion);
TextureRegion region = blockIcons.get(floor, regions.get("clear"));
mesh.draw((wx % chunksize) + (wy % chunksize)*chunksize, region, wx * tilesize, wy * tilesize, 8, 8);
TextureRegion wregion = (wall == Blocks.air || wall == Blocks.blockpart) ? Draw.region("clear"): wall.getBlockIcon()[wall.getBlockIcon().length-1];
region = wregion;
region = blockIcons.get(wall, regions.get("clear"));
if(wall.rotate){
mesh.draw((wx % chunksize) + (wy % chunksize)*chunksize + chunksize*chunksize, region,
@ -119,15 +185,25 @@ public class MapRenderer {
if(wall.update || wall.destructible) {
mesh.setColor(Team.values()[data.team].color);
region = Draw.region("block-border");
region = regions.get("block-border");
}else{
region = Draw.region("clear");
region = regions.get("clear");
}
mesh.draw((wx % chunksize) + (wy % chunksize)*chunksize + chunksize*chunksize*2, region,
wx * tilesize + offsetx*tilesize, wy * tilesize + offsety * tilesize,
region.getRegionWidth(), region.getRegionHeight());
mesh.setColor(Color.WHITE);
}
@Override
public void dispose() {
for(int x = 0; x < chunks.length; x ++){
for(int y = 0; y < chunks[0].length; y ++){
if(chunks[x][y] != null){
chunks[x][y].dispose();
}
}
}
}
}

10
core/src/io/anuke/mindustry/io/MapIO.java
View File

@ -1,7 +1,6 @@
package io.anuke.mindustry.io;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.graphics.Pixmap.Format;
@ -15,10 +14,7 @@ import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.ColorMapper;
import io.anuke.mindustry.world.ColorMapper.BlockPair;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.*;
import static io.anuke.mindustry.Vars.customMapDirectory;
import static io.anuke.mindustry.Vars.mapExtension;
@ -80,10 +76,10 @@ public class MapIO {
return data;
}
public static void writeMap(FileHandle file, ObjectMap<String, String> tags, MapTileData data) throws IOException{
public static void writeMap(OutputStream stream, ObjectMap<String, String> tags, MapTileData data) throws IOException{
MapMeta meta = new MapMeta(version, tags, data.width(), data.height(), defaultBlockMap);
DataOutputStream ds = new DataOutputStream(file.write(false));
DataOutputStream ds = new DataOutputStream(stream);
writeMapMeta(ds, meta);
ds.write(data.toArray());

61
core/src/io/anuke/mindustry/io/Maps.java
View File

@ -3,18 +3,12 @@ package io.anuke.mindustry.io;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Disposable;
import com.badlogic.gdx.utils.Json;
import com.badlogic.gdx.utils.ObjectMap;
import com.badlogic.gdx.utils.*;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.function.Supplier;
import io.anuke.ucore.util.Log;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.*;
import static io.anuke.mindustry.Vars.*;
@ -32,6 +26,8 @@ public class Maps implements Disposable{
private Array<Map> returnArray = new Array<>();
/**Used for writing a list of custom map names on GWT.*/
private Json json = new Json();
/**Used for storing a list of custom map names for GWT.*/
private Array<String> customMapNames;
public Maps(){
@ -80,7 +76,33 @@ public class Maps implements Disposable{
}
public void saveAndReload(String name, MapTileData data, ObjectMap<String, String> tags){
FileHandle file = customMapDirectory.child(name + "." + mapExtension);
try {
if (!gwt) {
FileHandle file = customMapDirectory.child(name + "." + mapExtension);
MapIO.writeMap(file.write(false), tags, data);
} else {
ByteArrayOutputStream stream = new ByteArrayOutputStream();
MapIO.writeMap(stream, tags, data);
Settings.putString("map-data-" + name, new String(Base64Coder.encode(stream.toByteArray())));
if(!customMapNames.contains(name, false)){
customMapNames.add(name);
Settings.putString("custom-maps", json.toJson(customMapNames));
}
Settings.save();
}
if(maps.containsKey(name)){
maps.get(name).texture.dispose();
}
Map map = new Map(name, new MapMeta(version, tags, data.width(), data.height(), null), true, getStreamFor(name));
if (!headless){
map.texture = new Texture(MapIO.generatePixmap(data));
}
maps.put(name, map);
}catch (IOException e){
throw new RuntimeException(e);
}
//todo implement
}
@ -88,7 +110,9 @@ public class Maps implements Disposable{
try(DataInputStream ds = new DataInputStream(supplier.get())) {
MapMeta meta = MapIO.readMapMeta(ds);
Map map = new Map(name, meta, custom, supplier);
if (!headless) map.texture = new Texture(MapIO.generatePixmap(MapIO.readTileData(ds, meta, true)));
if (!headless){
map.texture = new Texture(MapIO.generatePixmap(MapIO.readTileData(ds, meta, true)));
}
maps.put(map.name, map);
allMaps.add(map);
@ -109,12 +133,12 @@ public class Maps implements Disposable{
}
}else{
Array<String> maps = json.fromJson(Array.class, Settings.getString("custom-maps", "{}"));
customMapNames = json.fromJson(Array.class, Settings.getString("custom-maps", "{}"));
for(String name : maps){
for(String name : customMapNames){
try{
String data = Settings.getString("map-data-" + name);
byte[] bytes = data.getBytes();
byte[] bytes = Base64Coder.decode(data);
loadMap(name, () -> new ByteArrayInputStream(bytes), true);
}catch (Exception e){
Log.err("Failed to load custom map '{0}'!", name);
@ -124,6 +148,17 @@ public class Maps implements Disposable{
}
}
/**Returns an input stream supplier for a given map name.*/
private Supplier<InputStream> getStreamFor(String name){
if(!gwt){
return customMapDirectory.child(name + "." + mapExtension)::read;
}else{
String data = Settings.getString("map-data-" + name);
byte[] bytes = Base64Coder.decode(data);
return () -> new ByteArrayInputStream(bytes);
}
}
@Override
public void dispose() {

17
core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java
View File

@ -1,9 +1,12 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.utils.Align;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.scene.ui.Dialog;
import io.anuke.ucore.scene.ui.ScrollPane;
public class FloatingDialog extends Dialog{
@ -14,13 +17,25 @@ public class FloatingDialog extends Dialog{
getTitleTable().row();
getTitleTable().addImage("white", Palette.accent)
.growX().height(3f).pad(4f);
boolean[] done = {false};
shown(() -> Gdx.app.postRunnable(() ->
forEach(child -> {
if (done[0]) return;
if (child instanceof ScrollPane) {
Core.scene.setScrollFocus(child);
done[0] = true;
}
})));
}
@Override
public void addCloseButton(){
buttons().addImageTextButton("$text.back", "icon-arrow-left", 30f, this::hide).size(230f, 64f);
keyDown(key->{
keyDown(key -> {
if(key == Keys.ESCAPE || key == Keys.BACK)
hide();
});

18
core/src/io/anuke/mindustry/ui/dialogs/LevelDialog.java
View File

@ -5,9 +5,7 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion;
import io.anuke.mindustry.game.Difficulty;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.io.Map;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.scene.event.Touchable;
import io.anuke.ucore.scene.ui.*;
import io.anuke.ucore.scene.ui.layout.Stack;
@ -26,15 +24,12 @@ public class LevelDialog extends FloatingDialog{
getTitleTable().getCell(title()).growX().center();
getTitleTable().center();
addCloseButton();
setup();
}
public void reload(){
content().clear();
setup();
shown(this::setup);
}
void setup(){
content().clear();
Table maps = new Table();
pane = new ScrollPane(maps);
pane.setFadeScrollBars(false);
@ -126,13 +121,6 @@ public class LevelDialog extends FloatingDialog{
}
content().add(pane).uniformX();
shown(()->{
//this is necessary for some reason?
Timers.run(2f, ()->{
Core.scene.setScrollFocus(pane);
});
});
}
private void displayGameModeHelp() {

6
core/src/io/anuke/mindustry/world/Block.java
View File

@ -316,9 +316,11 @@ public class Block extends BaseBlock {
icon = new TextureRegion[]{Draw.region(name + "-icon")};
} else if (Draw.hasRegion(name + "1")) {
icon = new TextureRegion[]{Draw.region(name + "1")};
} else {
} else if (Draw.hasRegion(name)){
icon = new TextureRegion[]{Draw.region(name)};
}
}else{
icon = new TextureRegion[]{};
}
}
return icon;