From 0cc5945331930b23bcc2286871b73649303420f7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 15 Aug 2020 10:12:34 -0400 Subject: [PATCH] Better mod dialog layout / Less obnoxious button sound --- .../android/AndroidRhinoContext.java | 10 +---- .../sprites/blocks/props/white-tree-dead.png | Bin 9858 -> 9855 bytes .../sprites/blocks/props/white-tree.png | Bin 7579 -> 7561 bytes core/assets/sounds/press.ogg | Bin 4735 -> 5138 bytes core/src/mindustry/core/NetServer.java | 2 +- core/src/mindustry/entities/GroupDefs.java | 2 +- core/src/mindustry/ui/dialogs/ModsDialog.java | 38 +++++++----------- .../world/blocks/environment/TreeBlock.java | 2 +- 8 files changed, 18 insertions(+), 36 deletions(-) diff --git a/android/src/mindustry/android/AndroidRhinoContext.java b/android/src/mindustry/android/AndroidRhinoContext.java index 513911820d..c4468ecead 100644 --- a/android/src/mindustry/android/AndroidRhinoContext.java +++ b/android/src/mindustry/android/AndroidRhinoContext.java @@ -121,7 +121,7 @@ public class AndroidRhinoContext{ } return loadClass(dex, name); }catch(IOException | ClassNotFoundException e){ - throw new FatalLoadingException(e); + throw new RuntimeException("Failed to define class", e); } } @@ -151,14 +151,6 @@ public class AndroidRhinoContext{ } } - - /** Might be thrown in any Rhino method that loads bytecode if the loading failed. */ - public static class FatalLoadingException extends RuntimeException{ - FatalLoadingException(Throwable t){ - super("Failed to define class", t); - } - } - static class FileAndroidClassLoader extends BaseAndroidClassLoader{ private static int instanceCounter = 0; private final File dexFile; diff --git a/core/assets-raw/sprites/blocks/props/white-tree-dead.png b/core/assets-raw/sprites/blocks/props/white-tree-dead.png index 018c4edd20efb4f7ca6cb69a1e95f03475df7419..cfb6d65cf1f7ce1a9678a64499c3ec0ea2f865f5 100644 GIT binary patch delta 9394 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 delta 9406 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 diff --git a/core/assets-raw/sprites/blocks/props/white-tree.png b/core/assets-raw/sprites/blocks/props/white-tree.png index e8396ad684da602e9ddc4a2063518e2f1e80ac72..91f17de31696eabdfa783975e53a206f65e394f0 100644 GIT binary patch delta 7132 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 literal 4735 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 PR)(PzXdn)XF_;_xiv+V- diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index a9bc49007c..53e7c317ce 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -780,7 +780,7 @@ public class NetServer implements ApplicationListener{ syncStream.reset(); short sent = 0; - for(Building entity : Groups.tile){ + for(Building entity : Groups.build){ if(!entity.block().sync) continue; sent ++; diff --git a/core/src/mindustry/entities/GroupDefs.java b/core/src/mindustry/entities/GroupDefs.java index 3d2dcc1580..60bdbb5fd3 100644 --- a/core/src/mindustry/entities/GroupDefs.java +++ b/core/src/mindustry/entities/GroupDefs.java @@ -8,7 +8,7 @@ class GroupDefs{ @GroupDef(value = Playerc.class, mapping = true) G player; @GroupDef(value = Bulletc.class, spatial = true, collide = true) G bullet; @GroupDef(value = Unitc.class, spatial = true, mapping = true) G unit; - @GroupDef(value = Buildingc.class) G tile; + @GroupDef(value = Buildingc.class) G build; @GroupDef(value = Syncc.class, mapping = true) G sync; @GroupDef(value = Drawc.class) G draw; @GroupDef(value = WeatherStatec.class) G weather; diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index 9b9e40232a..322fa8f365 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -52,7 +52,7 @@ public class ModsDialog extends BaseDialog{ void setup(){ float h = 110f; - float w = mobile ? 430f : 524f; + float w = mobile ? 440f : 524f; cont.clear(); cont.defaults().width(mobile ? 500 : 560f).pad(4); @@ -153,7 +153,6 @@ public class ModsDialog extends BaseDialog{ boolean anyDisabled = false; for(LoadedMod mod : mods.list()){ - String letter = (Strings.stripColors(mod.name).charAt(0) + "").toUpperCase(); if(!mod.enabled() && !anyDisabled && mods.list().size > 0){ anyDisabled = true; @@ -170,36 +169,27 @@ public class ModsDialog extends BaseDialog{ t.table(title -> { title.left(); - title.add(new BorderImage(){ - { - if(mod.iconTexture != null){ - setDrawable(new TextureRegion(mod.iconTexture)); - }else{ - setDrawable(Tex.clear); - } - border(Pal.accent); + title.add(new BorderImage(){{ + if(mod.iconTexture != null){ + setDrawable(new TextureRegion(mod.iconTexture)); + }else{ + setDrawable(Tex.nomap); } + border(Pal.accent); + }}).size(h - 8f).padTop(-8f).padLeft(-8f).padRight(8f); - @Override - public void draw(){ - super.draw(); + title.add("" + mod.meta.displayName() + "\n[lightgray]v" + mod.meta.version + (mod.enabled() ? "" : "\n" + Core.bundle.get("mod.disabled") + "")) + .wrap().top().width(170f).growX().left(); - if(mod.iconTexture == null){ - Fonts.def.draw(letter, x + width/2f, y + height/2f, Align.center); - } - } - }).size(h - 8f).padTop(-8f).padLeft(-8f).padRight(8f); - - title.add("" + mod.meta.displayName() + "\n[lightgray]v" + mod.meta.version + (mod.enabled() ? "" : "\n" + Core.bundle.get("mod.disabled") + "")).wrap().width(170f).growX(); title.add().growX(); - }).growX().left(); + }).growX().growY().left(); t.table(right -> { right.right(); - right.button(mod.enabled() ? "@mod.disable" : "@mod.enable", mod.enabled() ? Icon.downOpen : Icon.upOpen, Styles.transt, () -> { + right.button(mod.enabled() ? Icon.downOpen : Icon.upOpen, Styles.clearPartiali, () -> { mods.setEnabled(mod, !mod.enabled()); setup(); - }).height(50f).margin(8f).width(130f).disabled(!mod.isSupported()); + }).size(50f).disabled(!mod.isSupported()); right.button(mod.hasSteamID() ? Icon.link : Icon.trash, Styles.clearPartiali, () -> { if(!mod.hasSteamID()){ @@ -218,7 +208,7 @@ public class ModsDialog extends BaseDialog{ platform.publish(mod); }).size(50f); } - }).growX().right(); + }).growX().right().padRight(-8f).padTop(-8f); t.row(); if(!mod.isSupported()){ diff --git a/core/src/mindustry/world/blocks/environment/TreeBlock.java b/core/src/mindustry/world/blocks/environment/TreeBlock.java index fec36ae331..bf7382cbaa 100644 --- a/core/src/mindustry/world/blocks/environment/TreeBlock.java +++ b/core/src/mindustry/world/blocks/environment/TreeBlock.java @@ -11,7 +11,7 @@ import mindustry.world.Tile; public class TreeBlock extends Block{ public @Load("@-shadow") TextureRegion shadow; - public float shadowOffset = -3f; + public float shadowOffset = -4f; public TreeBlock(String name){ super(name);