basic bundle & pressure liquid bar

stabu-dev · Nov 20, 2024 · 30629a6 · 30629a6
1 parent 7ad37bd
commit 30629a6
Show file tree

Hide file tree

Showing 20 changed files with 350 additions and 272 deletions.
diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties
diff --git a/assets/icons/omaloon-icons.properties b/assets/icons/omaloon-icons.properties
@@ -11,4 +11,6 @@
 #\uC355
 50005=small-shelter|omaloon-small-shelter-icon
 #\uC356
-50006=carborundum|omaloon-carborundum-icon
+50006=carborundum|omaloon-carborundum-icon
+#\uC357
+50007=pressure|omaloon-pressure-icon
diff --git a/assets/mod.json b/assets/mod.json
@@ -4,7 +4,7 @@
 "author": "stabu_, uujuju, randomguy",
 "main": "omaloon.OmaloonMod",
 "description": "An ambitious modification aimed at expanding the game's standard campaign by adding a new star system.",
-"version": "v0.1A",
-"minGameVersion": 145,
+"version": "0.1A",
+"minGameVersion": 146,
 "java": true
 }
diff --git a/assets/sprites/ui/pressure-icon.png b/assets/sprites/ui/pressure-icon.png
diff --git a/mod.json b/mod.json
@@ -4,7 +4,7 @@
 "author": "stabu_, uujuju, randomguy",
 "main": "omaloon.OmaloonMod",
 "description": "An ambitious modification aimed at expanding the game's standard campaign by adding a new star system.",
-"version": "v0.1A",
-"minGameVersion": 145,
+"version": "0.1A",
+"minGameVersion": 146,
 "java": true
-}
+}
diff --git a/src/omaloon/OmaloonMod.java b/src/omaloon/OmaloonMod.java
@@ -64,24 +64,15 @@ public OmaloonMod(){
             EventHints.addHints();
             CustomShapePropProcess.instance = new CustomShapePropProcess();
             Vars.asyncCore.processes.add(CustomShapePropProcess.instance);
-            app.post(() -> {
-                if(!settings.getBool("@setting.omaloon.show-disclaimer")){
-                    new OlDisclaimerDialog().show();
-                }
-
-                if(settings.getBool("@setting.omaloon.check-updates")){
-                    OlUpdateCheckerDialog.check();
-                }
-            });
         });
 
         Events.on(EventType.FileTreeInitEvent.class, e ->
                 app.post(OlShaders::load)
         );
 
-        Events.on(EventType.MusicRegisterEvent.class, e -> {
-            OlMusics.load();
-        });
+        Events.on(EventType.MusicRegisterEvent.class, e ->
+                OlMusics.load()
+        );
 
         Events.on(EventType.DisposeEvent.class, e ->
                 OlShaders.dispose()

diff --git a/src/omaloon/content/blocks/OlCraftingBlocks.java b/src/omaloon/content/blocks/OlCraftingBlocks.java
@@ -27,7 +27,7 @@ public static void load() {
 
 			consumeItems(with(Items.beryllium, 1, OlItems.cobalt, 1));
 			consume(new ConsumePressure(6f, false));
-			consume(new PressureEfficiencyRange(5f, 100f, 1.6f, false));
+			consume(new PressureEfficiencyRange(5f, 50f, 1.6f, false));
 
 			outputItems = with(OlItems.carborundum, 1);
 		}};
@@ -45,7 +45,7 @@ public static void load() {
 			craftEffect = Fx.pulverizeMedium;
 			consumeItem(Items.coal, 4);
 			consume(new ConsumePressure(8f, false));
-			consume(new PressureEfficiencyRange(10f, 100f, 1.5f, false));
+			consume(new PressureEfficiencyRange(10f, 50f, 1.5f, false));
 
 			outputItem = new ItemStack(Items.graphite, 2);
 		}};

diff --git a/src/omaloon/core/OlSettings.java b/src/omaloon/core/OlSettings.java
@@ -9,12 +9,12 @@
 import mindustry.ui.dialogs.SettingsMenuDialog.SettingsTable.*;
 import omaloon.*;
 import omaloon.content.*;
-import omaloon.ui.dialogs.*;
 
 import static arc.Core.*;
 import static mindustry.Vars.*;
 
 public class OlSettings{
+    public static String discordURL = "https://discord.gg/bNMT82Hswb";
     public static void load(){
         //add omaloon settings
         ui.settings.addCategory("@settings.omaloon", OlIcons.settings, table -> {
@@ -28,7 +28,7 @@ public static void load(){
                       () -> OmaloonMod.olInputDialog.show()
                     ).growX().marginLeft(8f).height(50f).row();
                     cat.button(
-                      "@settings.data",
+                      "@settings.omaloon-moddata",
                       Icon.save,
                       Styles.flatt,
                       iconMed,
@@ -48,7 +48,12 @@ public static void load(){
                     .button(
                             Icon.discord,
                             new ImageButton.ImageButtonStyle(),
-                            new OlDiscordLink()::show
+                            () -> {
+                                if(!app.openURI(discordURL)) {
+                                    ui.showInfoFade("@linkfail");
+                                    app.setClipboardText(discordURL);
+                                }
+                            }
                     )
                     .marginTop(9f)
                     .marginLeft(10f)

diff --git a/src/omaloon/ui/OlBinding.java b/src/omaloon/ui/OlBinding.java
@@ -8,7 +8,6 @@
 import static arc.Core.*;
 
 public enum OlBinding implements KeyBind {
-    skip_build(KeyCode.z, "omaloon-general"),
     shaped_env_placer(KeyCode.o, "omaloon-editor"),
     cliff_placer(KeyCode.p, "omaloon-editor");
 

diff --git a/src/omaloon/ui/StartSplash.java b/src/omaloon/ui/StartSplash.java
@@ -5,15 +5,16 @@
 import arc.scene.*;
 import arc.scene.actions.*;
 import arc.scene.event.*;
-import arc.scene.ui.Label;
 import arc.scene.ui.layout.*;
 import mindustry.ui.*;
+import omaloon.ui.dialogs.*;
 
-import static arc.Core.scene;
-import static omaloon.OmaloonMod.*;
+import static arc.Core.*;
 
 public class StartSplash {
     private static Table omaloonIcon, cont;
+    private static boolean finished = false;
+
     public static void build(Group group){
         group.fill(t -> {
             cont = t;
@@ -39,9 +40,23 @@ public static void show(){
                 Actions.fadeOut(1f, Interp.pow3Out)
         );
 
-        cont.actions(Actions.delay(6f, Actions.fadeOut(1f)), Actions.run(() -> {
-            cont.visible(() -> false);
-            cont.touchable(() -> Touchable.disabled);
-        }));
+        cont.actions(
+                Actions.delay(6f, Actions.fadeOut(1f)),
+                Actions.run(() -> {
+                    cont.visible(() -> false);
+                    cont.touchable(() -> Touchable.disabled);
+                    onComplete();
+                })
+        );
+    }
+
+    private static void onComplete() {
+        if (!settings.getBool("@setting.omaloon-show-disclaimer")) {
+            new OlDisclaimerDialog().show();
+        }
+
+        if (settings.getBool("@setting.omaloon-check-updates")) {
+            OlUpdateCheckerDialog.check();
+        }
     }
 }
diff --git a/src/omaloon/ui/dialogs/OlDisclaimerDialog.java b/src/omaloon/ui/dialogs/OlDisclaimerDialog.java
@@ -9,9 +9,9 @@
 
 public class OlDisclaimerDialog extends BaseDialog {
     public OlDisclaimerDialog() {
-        super("@dialog.omaloon.disclaimer.title", Core.scene.getStyle(DialogStyle.class));
+        super("@dialog.omaloon-disclaimer.title", Core.scene.getStyle(DialogStyle.class));
 
-        cont.add("@dialog.omaloon.disclaimer")
+        cont.add("@dialog.omaloon-disclaimer")
                 .width(500f)
                 .wrap()
                 .pad(4f)
@@ -42,9 +42,9 @@ public OlDisclaimerDialog() {
         b.getStyle().disabledFontColor = b.getStyle().fontColor;
         b.getStyle().disabled = b.getStyle().up;
 
-        TextButton s = buttons.button("@button.omaloon.show-disclaimer", Icon.cancel, () -> {
+        TextButton s = buttons.button("@button.omaloon-show-disclaimer", Icon.cancel, () -> {
             hide();
-            Core.settings.put("@setting.omaloon.show-disclaimer", true);
+            Core.settings.put("@setting.omaloon-show-disclaimer", true);
         }).get();
 
         s.setDisabled(() ->
@@ -64,6 +64,6 @@ public OlDisclaimerDialog() {
     }
 
     boolean shouldSkip() {
-        return Core.settings.getBool("@setting.omaloon.show-disclaimer", false);
+        return Core.settings.getBool("@setting.omaloon-show-disclaimer", false);
     }
 }
diff --git a/src/omaloon/ui/dialogs/OlDiscordLink.java b/src/omaloon/ui/dialogs/OlDiscordLink.java
@@ -7,7 +7,8 @@
 import static arc.Core.*;
 import static mindustry.Vars.*;
 
-public class OlDiscordLink extends Dialog {public String discordURL = "https://discord.gg/bNMT82Hswb";
+public class OlDiscordLink extends Dialog {
+    public String discordURL = "https://discord.gg/bNMT82Hswb";
 
     public OlDiscordLink() {
         super("");
@@ -29,7 +30,7 @@ public OlDiscordLink() {
 
             t.table(i -> i.image(Icon.discord)).size(40).left();
 
-            t.add("@setting.ol.discord").growX().pad(10);
+            t.add("@setting.omaloon-discord").growX().pad(10);
         }).size(580f, h).pad(10f).left();
 
         buttons.defaults().size(190f, 50);

diff --git a/src/omaloon/ui/dialogs/OlEndDialog.java b/src/omaloon/ui/dialogs/OlEndDialog.java
@@ -4,15 +4,17 @@
 import arc.scene.ui.layout.*;
 import mindustry.ui.dialogs.*;
 
+import static mindustry.Vars.*;
+
 public class OlEndDialog extends BaseDialog {
 	public OlEndDialog() {
-		super("very very silly");
+		super("");
 		titleTable.remove();
 		buttons.remove();
 
 		cont.stack(
 			new Table(t -> t.add("@ui.omaloon-finished-campaign")),
-			new Table(t -> t.add("@ui.omaloon-exit-dialog")).bottom().left()
+			new Table(t -> t.add(mobile ? "@ui.omaloon-exit-dialog.mobile" : "@ui.omaloon-exit-dialog")).bottom().left()
 		).grow();
 
 		actions(Actions.fadeOut(1));

diff --git a/src/omaloon/ui/dialogs/OlUpdateCheckerDialog.java b/src/omaloon/ui/dialogs/OlUpdateCheckerDialog.java
@@ -35,9 +35,9 @@ public static void check() {
             download = json.get("assets").asArray().get(0).getString("browser_download_url");
 
             if(!latest.equals(mod.meta.version)){
-                BaseDialog dialog = new BaseDialog("@dialog.omaloon.updater.tile");
+                BaseDialog dialog = new BaseDialog("@dialog.omaloon-updater.tile");
 
-                dialog.cont.add(bundle.format("@dialog.omaloon.updater", mod.meta.version, latest))
+                dialog.cont.add(bundle.format("dialog.omaloon-updater", mod.meta.version, latest))
                         .width(mobile ? 400f : 500f)
                         .wrap()
                         .pad(4f)
@@ -47,20 +47,20 @@ public static void check() {
                 dialog.buttons.defaults().size(200f, 54f).pad(2f);
 
                 dialog.setFillParent(false);
-                dialog.buttons.button("@button.omaloon.update-later", Icon.refresh, dialog::hide);
+                dialog.buttons.button("@button.omaloon-update-later", Icon.refresh, dialog::hide);
 
-                dialog.buttons.button("@button.omaloon.updater-show-changes", Icon.link, () -> {
+                dialog.buttons.button("@button.omaloon-updater-show-changes", Icon.link, () -> {
                     if(!Core.app.openURI(changes)){
                         ui.showInfoFade("@linkfail");
                         Core.app.setClipboardText(changes);
                     }
                 });
 
-                dialog.buttons.button("@button.omaloon.install-update", Icon.download, OlUpdateCheckerDialog::update);
+                dialog.buttons.button("@button.omaloon-install-update", Icon.download, OlUpdateCheckerDialog::update);
 
                 dialog.keyDown(KeyCode.escape, dialog::hide);
                 dialog.keyDown(KeyCode.back, dialog::hide);
-                dialog.show();
+                Core.app.post(dialog::show);
             }else{
                 Log.info("Omaloon has latest version");
             }

diff --git a/src/omaloon/ui/fragments/ShapedEnvPlacerFragment.java b/src/omaloon/ui/fragments/ShapedEnvPlacerFragment.java
@@ -57,7 +57,7 @@ public ShapedEnvPlacerFragment() {
             t1.margin(10f);
             t1.table(t2 -> {
                 t2.image(Icon.treeSmall).size(15f).center().padRight(15f).color(col2);
-                t2.label(() -> "@fragment.omaloon.shaped-env-placer").grow().center().get().setAlignment(Align.center);
+                t2.label(() -> "@fragment.omaloon-shaped-env-placer").grow().center().get().setAlignment(Align.center);
                 t2.image(Icon.treeSmall).size(15f).center().padLeft(15f).color(col2);
             }).growX();
             t1.row();

diff --git a/src/omaloon/world/blocks/liquid/PressureLiquidPump.java b/src/omaloon/world/blocks/liquid/PressureLiquidPump.java
@@ -2,6 +2,7 @@
 
 import arc.*;
 import arc.graphics.g2d.*;
+import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
@@ -102,7 +103,7 @@ public void load() {
 	public void setStats() {
 		super.setStats();
 		pressureConfig.addStats(stats);
-		stats.add(OlStats.pressureFlow, Strings.autoFixed(pressureTransfer * 60f, 2), OlStats.pressureSecond);
+		stats.add(OlStats.pressureFlow, Mathf.round(pressureTransfer * 60f, 2), OlStats.pressureSecond);
 	}
 
 	public class PressureLiquidPumpBuild extends LiquidBuild implements HasPressure {

diff --git a/src/omaloon/world/blocks/liquid/PressureLiquidValve.java b/src/omaloon/world/blocks/liquid/PressureLiquidValve.java
@@ -114,7 +114,7 @@ public void setBars() {
 	public void setStats() {
 		super.setStats();
 		pressureConfig.addStats(stats);
-		stats.add(OlStats.pressureFlow, Strings.autoFixed(pressureLoss * 60f, 2), OlStats.pressureSecond);
+		stats.add(OlStats.pressureFlow, Mathf.round(pressureLoss * 60f, 2), OlStats.pressureSecond);
 	}
 
 	public class PressureLiquidValveBuild extends LiquidBuild implements HasPressure {

diff --git a/src/omaloon/world/consumers/ConsumePressure.java b/src/omaloon/world/consumers/ConsumePressure.java
@@ -1,5 +1,6 @@
 package omaloon.world.consumers;
 
+import arc.math.*;
 import arc.util.*;
 import mindustry.gen.*;
 import mindustry.world.*;
@@ -32,9 +33,9 @@ public HasPressure cast(Building build) {
 	@Override
 	public void display(Stats stats) {
 		if (continuous) {
-			stats.add(OlStats.consumePressure, Strings.autoFixed(amount * 60f, 2), OlStats.pressureSecond);
+			stats.add(OlStats.consumePressure, Mathf.round(amount * 60f, 2), OlStats.pressureSecond);
 		} else {
-			stats.add(OlStats.consumePressure, Strings.autoFixed(amount, 2), OlStats.pressureUnits);
+			stats.add(OlStats.consumePressure, Mathf.round(amount, 2), OlStats.pressureUnits);
 		}
 	}
 

diff --git a/src/omaloon/world/meta/OlStats.java b/src/omaloon/world/meta/OlStats.java
@@ -11,13 +11,13 @@ public class OlStats {
 
 		pressureFlow = new Stat("omaloon-pressureflow", pressure),
 
-		minPressure = new Stat("omaloon-minPressure", pressure),
 		maxPressure = new Stat("omaloon-maxPressure", pressure),
+		minPressure = new Stat("omaloon-minPressure", pressure),
 		consumePressure = new Stat("omaloon-consumePressure", pressure),
 		pressureRange = new Stat("omaloon-pressurerange", pressure),
 		outputPressure = new Stat("omaloon-outputPressure", pressure);
 
 	public static final StatUnit
-		pressureUnits = new StatUnit("omaloon-pressureUnits"),
-		pressureSecond = new StatUnit("omaloon-pressureSecond");
+		pressureUnits = new StatUnit("omaloon-pressureUnits", "\uC357"),
+		pressureSecond = new StatUnit("omaloon-pressureSecond", "\uC357");
 }