diff --git a/mod.hjson b/mod.hjson index 9cd5335..551a41f 100644 --- a/mod.hjson +++ b/mod.hjson @@ -2,8 +2,8 @@ name: "caster-ui-java" displayName: "Caster User interface" description: "Aming to make the client a bit better for casting! with ease of use, simplicity and elegance in mind \n \n Java rewrite of 'JiroCab/Caster-Ui' which was based off 'Ferlern/extended-UI' \nconflicts with 'Ferlern/extended-UI' \n\nPLEASE DON'T THIS FOR AN ADVANTAGE IN PVP THANKS" author: "RushieWashie, WMF Industries" -subtitle: "v5.2 (v7) Helping you cast games~" -version: 5.2 +subtitle: "v5.3 (v7) Helping you cast games~" +version: 5.3 minGameVersion: 140.4 hidden: true diff --git a/src/casterui/io/ui/CuiFragment.java b/src/casterui/io/ui/CuiFragment.java index bc52cb5..30b8ccd 100644 --- a/src/casterui/io/ui/CuiFragment.java +++ b/src/casterui/io/ui/CuiFragment.java @@ -384,9 +384,9 @@ public void buildTeamItemTable() { new Label((!settings.getBool("cui-TeamItemsShortenItems") ? amount : UI.formatAmount(amount)) + " ") ).fontScale(teamItemsFontSize).size(iconSizes * teamItemsIconSize).center(); }else { - if(iconPlace == 0)sub.label(() -> (!settings.getBool("cui-TeamItemsShortenItems") ? amount : UI.formatAmount(amount)) + " ").fontScale(teamItemsFontSize); - sub.image(item.uiIcon).size(iconSizes * teamItemsIconSize).left(); if(iconPlace == 2) sub.label(() -> (!settings.getBool("cui-TeamItemsShortenItems") ? amount : UI.formatAmount(amount)) + " ").fontScale(teamItemsFontSize); + sub.image(item.uiIcon).size(iconSizes * teamItemsIconSize).left(); + if(iconPlace == 0)sub.label(() -> (!settings.getBool("cui-TeamItemsShortenItems") ? amount : UI.formatAmount(amount)) + " ").fontScale(teamItemsFontSize); } if (itemTypes[0] >= teamItemsMax) { diff --git a/src/casterui/io/ui/dialog/CuiSettingsDialog.java b/src/casterui/io/ui/dialog/CuiSettingsDialog.java index 16c83fa..b190536 100644 --- a/src/casterui/io/ui/dialog/CuiSettingsDialog.java +++ b/src/casterui/io/ui/dialog/CuiSettingsDialog.java @@ -137,7 +137,7 @@ public void counterCategory(SettingsMenuDialog.SettingsTable table) { subTable.pref(new CollapserSetting("cui-offset-div", 6)); subTable.sliderPref("cui-unitsIconSize", 32, 1, 100, String::valueOf); - subTable.sliderPref("cui-unitsPlayerTableFont", 20, 0, fontScaleMax, s-> "x" + decForS.format(s == 0 ? 0.01f : s/20f) + "x"); + subTable.sliderPref("cui-unitsPlayerTableFont", 20, 0, fontScaleMax, s-> "x" + decForS.format(s == 0 ? 0.01f : s/20f) ); subTable.sliderPref("cui-PlayerUnitsTableSide", 1, 0, 8, s -> bundle.get("cui-side"+s)); subTable.sliderPref("cui-playerunitstablestyle", 0, 0 , 9, s -> bundle.get("cui-blockinfostyle-s" + s )); subTable.sliderPref("cui-playerunitstables-x", 0, -offsetMinMax , offsetMinMax, String::valueOf); @@ -240,7 +240,7 @@ public void teamsCategory(SettingsMenuDialog.SettingsTable table){ subTable.checkPref("cui-TeamItemsShortenItems", true); subTable.sliderPref("cui-TeamItemsAlpha", 8, 0, 10, s -> s > 0 ? s != 10 ? s + "0%" : "100%" : "@off"); subTable.sliderPref("cui-TeamItemsRow", 6, 0, 10, s -> s +1 + ""); - subTable.sliderPref("cui-TeamItemsIconStyle", 0, 0, 2, s -> bundle.get("cui-unitsplayer-style" + s)); + subTable.sliderPref("cui-TeamItemsIconStyle", 2, 0, 2, s -> bundle.get("cui-unitsplayer-style" + s)); subTable.pref(new CollapserSetting("cui-offset-div", 6)); subTable.sliderPref("cui-TeamItemsSide", 8, 0, 8, s -> bundle.get("cui-side"+s));