From 7e2502dbe424d56362b0d6d2431d9be3273eed78 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 29 Dec 2017 23:05:52 -0500 Subject: [PATCH 1/2] Added some new block types, fixed some save dialog issues --- .gitignore | 5 +++-- core/assets/bundles/bundle.properties | 1 + core/src/io/anuke/mindustry/Vars.java | 7 +++++-- core/src/io/anuke/mindustry/ui/LoadDialog.java | 9 +++++++++ core/src/io/anuke/mindustry/ui/SaveDialog.java | 8 ++------ .../mindustry/world/blocks/ProductionBlocks.java | 13 +++++++++++++ .../world/blocks/types/logic/LogicBlock.java | 10 ++++++++++ .../world/blocks/types/production/LiquidDrill.java | 10 ++++++++++ 8 files changed, 53 insertions(+), 10 deletions(-) create mode 100644 core/src/io/anuke/mindustry/world/blocks/types/logic/LogicBlock.java create mode 100644 core/src/io/anuke/mindustry/world/blocks/types/production/LiquidDrill.java diff --git a/.gitignore b/.gitignore index e50192a4ef..eef26a8b5e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,8 +9,8 @@ /desktop/mindustry-maps/ /desktop/gifexport/ /core/lib/ -/core/assets/mindustry-saves/ -/core/assets/mindustry-maps/ +/android/assets/mindustry-maps/ +/android/assets/mindustry-saves/ /core/assets/gifexport/ *.gif @@ -129,3 +129,4 @@ gradle-app.setting ## OS Specific .DS_Store Thumbs.db +android/libs/ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 114ce1c65a..7a49495043 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -16,6 +16,7 @@ text.tutorial.next=Next > text.save.new=New Save text.save.overwrite=Are you sure you want to overwrite\nthis save slot? text.overwrite=Overwrite +text.save.none=No saves found! text.saveload=[accent]Saving... text.savefail=Failed to save game! text.save.delete.confirm=Are you sure you want to delete this save? diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index e10eebe103..7cd08e69d1 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -7,6 +7,7 @@ import com.badlogic.gdx.utils.I18NBundle; import io.anuke.mindustry.core.*; import io.anuke.mindustry.entities.Player; +import io.anuke.ucore.UCore; import io.anuke.ucore.scene.ui.layout.Unit; public class Vars{ @@ -30,9 +31,11 @@ public class Vars{ //discord group URL public static final String discordURL = "https://discord.gg/r8BkXNd"; //directory for user-created map data - public static final FileHandle customMapDirectory = gwt ? null : Gdx.files.local("mindustry-maps/"); + public static final FileHandle customMapDirectory = gwt ? null : UCore.isAssets ? + Gdx.files.local("../../desktop/mindustry-maps") : Gdx.files.local("mindustry-maps/"); //save file directory - public static final FileHandle saveDirectory = gwt ? null : Gdx.files.local("mindustry-saves/"); + public static final FileHandle saveDirectory = gwt ? null : UCore.isAssets ? + Gdx.files.local("../../desktop/mindustry-saves") : Gdx.files.local("mindustry-saves/"); //scale of the font public static float fontscale = Math.max(Unit.dp.scl(1f)/2f, 0.5f); //camera zoom displayed on startup diff --git a/core/src/io/anuke/mindustry/ui/LoadDialog.java b/core/src/io/anuke/mindustry/ui/LoadDialog.java index 102fb596f7..6305512309 100644 --- a/core/src/io/anuke/mindustry/ui/LoadDialog.java +++ b/core/src/io/anuke/mindustry/ui/LoadDialog.java @@ -151,6 +151,15 @@ public class LoadDialog extends FloatingDialog{ content().add(pane); + addSetup(); + } + + public void addSetup(){ + if(Vars.control.getSaves().getSaveSlots().size != 0) return; + + slots.row(); + slots.addButton("$text.save.none", "clear", ()->{}) + .disabled(true).fillX().margin(20f).minWidth(340f).height(80f).pad(4f); } public void modifyButton(TextButton button, SaveSlot slot){ diff --git a/core/src/io/anuke/mindustry/ui/SaveDialog.java b/core/src/io/anuke/mindustry/ui/SaveDialog.java index b6a0592d24..ab83bfa171 100644 --- a/core/src/io/anuke/mindustry/ui/SaveDialog.java +++ b/core/src/io/anuke/mindustry/ui/SaveDialog.java @@ -20,10 +20,7 @@ public class SaveDialog extends LoadDialog{ super("$text.savegame"); } - @Override - protected void setup(){ - super.setup(); - + public void addSetup(){ if(!Vars.control.getSaves().canAddSave()){ return; } @@ -34,10 +31,9 @@ public class SaveDialog extends LoadDialog{ Vars.control.getSaves().addSave(text); setup(); }); - }).fillX().margin(10f).height(70f).pad(4f).padRight(-4); + }).fillX().margin(10f).minWidth(300f).height(70f).pad(4f).padRight(-4); } - @Override public void modifyButton(TextButton button, SaveSlot slot){ button.clicked(() -> { diff --git a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java index ada072edf1..90f5707602 100644 --- a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java @@ -63,6 +63,19 @@ public class ProductionBlocks{ health = 70; } }, + + //TODO + /*siliconextractor = new LiquidCrafter("siliconextractor"){ + { + input = Item.sand; + inputAmount = 5; + inputLiquid = Liquid.water; + liquidAmount = 18.99f; + output = Item.silicon; + health = 50; + purifyTime = 50; + } + },*/ oilrefinery = new LiquidCrafter("oilrefinery"){ { diff --git a/core/src/io/anuke/mindustry/world/blocks/types/logic/LogicBlock.java b/core/src/io/anuke/mindustry/world/blocks/types/logic/LogicBlock.java new file mode 100644 index 0000000000..a5fc8b5fba --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/types/logic/LogicBlock.java @@ -0,0 +1,10 @@ +package io.anuke.mindustry.world.blocks.types.logic; + +import io.anuke.mindustry.world.Block; + +public class LogicBlock extends Block{ + + public LogicBlock(String name) { + super(name); + } +} diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/LiquidDrill.java b/core/src/io/anuke/mindustry/world/blocks/types/production/LiquidDrill.java new file mode 100644 index 0000000000..5240bab4bf --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/LiquidDrill.java @@ -0,0 +1,10 @@ +package io.anuke.mindustry.world.blocks.types.production; + +import io.anuke.mindustry.world.Block; + +public class LiquidDrill extends Block { + + public LiquidDrill(String name) { + super(name); + } +} From 1cb2609be8eb047eda7d8992c7f1a1a525223aad Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 30 Dec 2017 10:44:08 -0500 Subject: [PATCH 2/2] Updated uCore, removed debug save message --- build.gradle | 2 +- core/src/io/anuke/mindustry/io/Saves.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index c1cbc42c37..915102bda6 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ allprojects { appName = "Mindustry" gdxVersion = '1.9.8' aiVersion = '1.8.1' - uCoreVersion = '2a09b97'; + uCoreVersion = 'afc7fe249f'; } repositories { diff --git a/core/src/io/anuke/mindustry/io/Saves.java b/core/src/io/anuke/mindustry/io/Saves.java index 967806b0af..b8b583cb6d 100644 --- a/core/src/io/anuke/mindustry/io/Saves.java +++ b/core/src/io/anuke/mindustry/io/Saves.java @@ -42,7 +42,6 @@ public class Saves { time += Timers.delta(); if(time > Settings.getInt("saveinterval")*60) { saving = true; - Vars.ui.showError("sacving"); exec.submit(() -> { SaveIO.saveToSlot(current.index);