Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unnecessary 'chat' font

Browse Source
This commit is contained in:
Anuken
2021-08-13 09:20:46 -04:00
parent 1b0de739f9
commit 033dadae2c
6 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/core/UI.java
View File

@@ -130,7 +130,7 @@ public class UI implements ApplicationListener, Loadable{
@Override @Override
public Seq<AssetDescriptor> getDependencies(){ public Seq<AssetDescriptor> getDependencies(){
return Seq.with(new AssetDescriptor<>(Control.class), new AssetDescriptor<>("outline", Font.class), new AssetDescriptor<>("default", Font.class), new AssetDescriptor<>("chat", Font.class)); return Seq.with(new AssetDescriptor<>(Control.class), new AssetDescriptor<>("outline", Font.class), new AssetDescriptor<>("default", Font.class));
} }
@Override @Override

4
core/src/mindustry/ui/Fonts.java
View File

@@ -37,7 +37,6 @@ public class Fonts{
public static Font def; public static Font def;
public static Font outline; public static Font outline;
public static Font chat;
public static Font icon; public static Font icon;
public static Font iconLarge; public static Font iconLarge;
public static Font tech; public static Font tech;
@@ -76,7 +75,6 @@ public class Fonts{
FreeTypeFontParameter param = fontParameter(); FreeTypeFontParameter param = fontParameter();
Core.assets.load("default", Font.class, new FreeTypeFontLoaderParameter(mainFont, param)).loaded = f -> Fonts.def = (Font)f; Core.assets.load("default", Font.class, new FreeTypeFontLoaderParameter(mainFont, param)).loaded = f -> Fonts.def = (Font)f;
Core.assets.load("chat", Font.class, new FreeTypeFontLoaderParameter(mainFont, param)).loaded = f -> Fonts.chat = (Font)f;
Core.assets.load("icon", Font.class, new FreeTypeFontLoaderParameter("fonts/icon.ttf", new FreeTypeFontParameter(){{ Core.assets.load("icon", Font.class, new FreeTypeFontLoaderParameter("fonts/icon.ttf", new FreeTypeFontParameter(){{
size = 30; size = 30;
incremental = true; incremental = true;
@@ -104,7 +102,7 @@ public class Fonts{
} }
public static void loadContentIcons(){ public static void loadContentIcons(){
Seq<Font> fonts = Seq.with(Fonts.chat, Fonts.def, Fonts.outline); Seq<Font> fonts = Seq.with(Fonts.def, Fonts.outline);
Texture uitex = Core.atlas.find("logo").texture; Texture uitex = Core.atlas.find("logo").texture;
int size = (int)(Fonts.def.getData().lineHeight/Fonts.def.getData().scaleY); int size = (int)(Fonts.def.getData().lineHeight/Fonts.def.getData().scaleY);

8
core/src/mindustry/ui/Styles.java
View File

@@ -357,7 +357,7 @@ public class Styles{
}}; }};
defaultField = new TextFieldStyle(){{ defaultField = new TextFieldStyle(){{
font = Fonts.chat; font = Fonts.def;
fontColor = Color.white; fontColor = Color.white;
disabledFontColor = Color.gray; disabledFontColor = Color.gray;
disabledBackground = underlineDisabled; disabledBackground = underlineDisabled;
@@ -370,7 +370,7 @@ public class Styles{
}}; }};
nodeField = new TextFieldStyle(){{ nodeField = new TextFieldStyle(){{
font = Fonts.chat; font = Fonts.def;
fontColor = Color.white; fontColor = Color.white;
disabledFontColor = Color.gray; disabledFontColor = Color.gray;
disabledBackground = underlineDisabled; disabledBackground = underlineDisabled;
@@ -383,7 +383,7 @@ public class Styles{
}}; }};
areaField = new TextFieldStyle(){{ areaField = new TextFieldStyle(){{
font = Fonts.chat; font = Fonts.def;
fontColor = Color.white; fontColor = Color.white;
disabledFontColor = Color.gray; disabledFontColor = Color.gray;
selection = Tex.selection; selection = Tex.selection;
@@ -394,7 +394,7 @@ public class Styles{
}}; }};
nodeArea = new TextFieldStyle(){{ nodeArea = new TextFieldStyle(){{
font = Fonts.chat; font = Fonts.def;
fontColor = Color.white; fontColor = Color.white;
disabledFontColor = Color.gray; disabledFontColor = Color.gray;
selection = Tex.selection; selection = Tex.selection;

5
core/src/mindustry/ui/fragments/ChatFragment.java
View File

@@ -9,6 +9,7 @@ import arc.math.*;
import arc.scene.*; import arc.scene.*;
import arc.scene.ui.*; import arc.scene.ui.*;
import arc.scene.ui.Label.*; import arc.scene.ui.Label.*;
import arc.scene.ui.TextField.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*; import arc.util.*;
@@ -18,7 +19,6 @@ import mindustry.input.*;
import mindustry.ui.*; import mindustry.ui.*;
import static arc.Core.*; import static arc.Core.*;
import static mindustry.Vars.net;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class ChatFragment extends Table{ public class ChatFragment extends Table{
@@ -104,10 +104,9 @@ public class ChatFragment extends Table{
fieldlabel.getStyle().font = font; fieldlabel.getStyle().font = font;
fieldlabel.setStyle(fieldlabel.getStyle()); fieldlabel.setStyle(fieldlabel.getStyle());
chatfield = new TextField("", new TextField.TextFieldStyle(scene.getStyle(TextField.TextFieldStyle.class))); chatfield = new TextField("", new TextFieldStyle(scene.getStyle(TextFieldStyle.class)));
chatfield.setMaxLength(Vars.maxTextLength); chatfield.setMaxLength(Vars.maxTextLength);
chatfield.getStyle().background = null; chatfield.getStyle().background = null;
chatfield.getStyle().font = Fonts.chat;
chatfield.getStyle().fontColor = Color.white; chatfield.getStyle().fontColor = Color.white;
chatfield.setStyle(chatfield.getStyle()); chatfield.setStyle(chatfield.getStyle());

4
core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
View File

@@ -8,6 +8,7 @@ import arc.math.*;
import arc.scene.*; import arc.scene.*;
import arc.scene.ui.*; import arc.scene.ui.*;
import arc.scene.ui.Label.*; import arc.scene.ui.Label.*;
import arc.scene.ui.TextField.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*; import arc.util.*;
@@ -93,9 +94,8 @@ public class ScriptConsoleFragment extends Table{
fieldlabel.getStyle().font = font; fieldlabel.getStyle().font = font;
fieldlabel.setStyle(fieldlabel.getStyle()); fieldlabel.setStyle(fieldlabel.getStyle());
chatfield = new TextField("", new TextField.TextFieldStyle(scene.getStyle(TextField.TextFieldStyle.class))); chatfield = new TextField("", new TextFieldStyle(scene.getStyle(TextFieldStyle.class)));
chatfield.getStyle().background = null; chatfield.getStyle().background = null;
chatfield.getStyle().font = Fonts.chat;
chatfield.getStyle().fontColor = Color.white; chatfield.getStyle().fontColor = Color.white;
chatfield.setStyle(chatfield.getStyle()); chatfield.setStyle(chatfield.getStyle());

2
gradle.properties
View File

@@ -11,4 +11,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
http.socketTimeout=80000 http.socketTimeout=80000
http.connectionTimeout=80000 http.connectionTimeout=80000
archash=98b38438ccb72669a73349bd5ffd60905ed231a7 archash=fbbdf8776142ba1980855c954dcfbf00e96cbeb7