From 0454c4c25aa47b3751891c14806426a63d3e7b7d Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Jul 2018 09:44:38 -0400 Subject: [PATCH] Added skin aliases --- build.gradle | 2 +- core/assets/ui/uiskin.json | 26 +++++++++---------- core/src/io/anuke/mindustry/core/Control.java | 16 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 1efbc9dfa0..9548ba8daa 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ allprojects { gdxVersion = '1.9.8' roboVMVersion = '2.3.0' aiVersion = '1.8.1' - uCoreVersion = '3352bd2408' + uCoreVersion = '239e6a5bad' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/assets/ui/uiskin.json b/core/assets/ui/uiskin.json index ea7082cef6..893559d762 100644 --- a/core/assets/ui/uiskin.json +++ b/core/assets/ui/uiskin.json @@ -1,5 +1,5 @@ { -com.badlogic.gdx.graphics.g2d.BitmapFont: { +Font: { default-font: { file: square.fnt, markupEnabled: true, @@ -26,7 +26,7 @@ com.badlogic.gdx.graphics.g2d.BitmapFont: { scale: 2 } }, -com.badlogic.gdx.graphics.Color: { +Color: { black: {a: 1, b: 0, g: 0, r: 0 }, white: {a: 1, b: 1, g: 1, r: 1 }, green: {a: 1, b: 0, g: 1, r: 0 }, @@ -41,7 +41,7 @@ com.badlogic.gdx.graphics.Color: { menuitem: {a: 1, b: 0.65, g: 0.65, r: 0.65 }, link-label: {a: 1, b: 0.886, g: 0.631, r: 0.105 } }, -io.anuke.ucore.scene.Skin$TintedDrawable: { +TintedDrawable: { dialogDim: {name: white, color: {r: 0, g: 0, b: 0, a: 0.9} }, invis: {name: white, color: {r: 0, g: 0, b: 0, a: 0} } loadDim: {name: white, color: {r: 0, g: 0, b: 0, a: 0.8} }, @@ -50,12 +50,12 @@ io.anuke.ucore.scene.Skin$TintedDrawable: { clear-over: {name: white, color: {r: 1, g: 1, b: 1, a: 0.2} }, clear-down: {name: white, color: {r: 1, g: 1, b: 1, a: 0.4} } }, -io.anuke.ucore.scene.ui.Button$ButtonStyle: { +ButtonStyle: { default: {down: button-down, up: button }, menu: {up: text-sides, over: text-sides-over, down: text-sides-down}, toggle: {checked: button-down, down: button-down, up: button } }, -io.anuke.ucore.scene.ui.TextButton$TextButtonStyle: { +TextButtonStyle: { default: {over: button-over, disabled: button, font: default-font, fontColor: white, disabledFontColor: grey, down: button-down, up: button, transition: 0 }, discord: {over: discord-banner-over, font: default-font, fontColor: white, up: discord-banner}, info: {font: default-font, fontColor: white, up: info-banner}, @@ -63,7 +63,7 @@ io.anuke.ucore.scene.ui.TextButton$TextButtonStyle: { empty: {font: default-font}, toggle: {font: default-font, fontColor: white, checked: button-down, down: button-down, up: button, over: button-over, disabled: button, disabledFontColor: grey } }, -io.anuke.ucore.scene.ui.ImageButton$ImageButtonStyle: { +ImageButtonStyle: { default: {down: button-down, up: button, over: button-over, imageDisabledColor: lightgray, imageUpColor: white }, empty: { imageDownColor: accent, imageUpColor: white}, emptytoggle: {imageCheckedColor: white, imageDownColor: white, imageUpColor: lightgray}, @@ -74,37 +74,37 @@ io.anuke.ucore.scene.ui.ImageButton$ImageButtonStyle: { select: {checked: button-select, up: clear }, clear: {down: clear-down, up: clear, over: clear-over}, }, -io.anuke.ucore.scene.ui.ScrollPane$ScrollPaneStyle: { +ScrollPaneStyle: { default: {background: border, vScroll: scroll, vScrollKnob: scroll-knob-vertical-black}, horizontal: {background: border, vScroll: scroll, vScrollKnob: scroll-knob-vertical, hScroll: scroll-horizontal, hScrollKnob: scroll-knob-horizontal}, volume: {background: button-map, vScroll: scroll, vScrollKnob: scroll-knob-vertical-black}, clear: {vScroll: scroll, vScrollKnob: scroll-knob-vertical-black}, clear-black: {vScroll: scroll, vScrollKnob: scroll-knob-vertical-black} }, -io.anuke.ucore.scene.ui.Window$WindowStyle: { +WindowStyle: { default: {titleFont: default-font, background: window, titleFontColor: accent }, dialog: {stageBackground: dialogDim, titleFont: default-font, background: window-empty, titleFontColor: accent } }, -io.anuke.ucore.scene.ui.KeybindDialog$KeybindDialogStyle: { +KeybindDialogStyle: { default: {keyColor: accent, keyNameColor: white, controllerColor: menuitem, paneStyle: clear}, }, -io.anuke.ucore.scene.ui.Slider$SliderStyle: { +SliderStyle: { default-horizontal: {background: slider, knob: slider-knob, knobOver: slider-knob-over, knobDown: slider-knob-down}, default-vertical: {background: slider-vertical, knob: slider-knob, knobOver: slider-knob-over, knobDown: slider-knob-down} }, -io.anuke.ucore.scene.ui.Label$LabelStyle: { +LabelStyle: { default: {font: default-font, fontColor: white }, title: {font: title, fontColor: white }, link-label: {fontColor: link-label, font: default-font }, small: {font: default-font, fontColor: white }, menuitem-shortcut: {font: default-font, fontColor: menuitem } }, -io.anuke.ucore.scene.ui.TextField$TextFieldStyle: { +TextFieldStyle: { default: {font: default-font-chat, fontColor: white, disabledFontColor: grey, selection: selection, background: button, cursor: cursor, messageFont: default-font, messageFontColor: grey } textarea: {font: default-font-chat, fontColor: white, disabledFontColor: grey, selection: selection, background: textarea, cursor: cursor, messageFont: default-font, messageFontColor: grey } } -io.anuke.ucore.scene.ui.CheckBox$CheckBoxStyle: { +CheckBoxStyle: { default: {checkboxOn: check-on, checkboxOff: check-off, checkboxOnOver: check-on-over, checkboxOver: check-over, font: default-font, fontColor: white, disabledFontColor: grey } } } diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 5cac6e0d3d..6422d572a9 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -81,14 +81,14 @@ public class Control extends Module{ DefaultKeybinds.load(); Settings.defaultList( - "ip", "localhost", - "port", port + "", - "color-0", Color.rgba8888(playerColors[8]), - "color-1", Color.rgba8888(playerColors[11]), - "color-2", Color.rgba8888(playerColors[13]), - "color-3", Color.rgba8888(playerColors[9]), - "name", "player", - "lastBuild", 0 + "ip", "localhost", + "port", port + "", + "color-0", Color.rgba8888(playerColors[8]), + "color-1", Color.rgba8888(playerColors[11]), + "color-2", Color.rgba8888(playerColors[13]), + "color-3", Color.rgba8888(playerColors[9]), + "name", "player", + "lastBuild", 0 ); KeyBinds.load();