Skip to content

Commit 274556a

Browse files
committed
bug fix
- fixed team items' icon being inverted & made default be similar to old version
1 parent ec2c340 commit 274556a

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

mod.hjson

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: "caster-ui-java"
22
displayName: "Caster User interface"
33
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"
44
author: "RushieWashie, WMF Industries"
5-
subtitle: "v5.2 (v7) Helping you cast games~"
6-
version: 5.2
5+
subtitle: "v5.3 (v7) Helping you cast games~"
6+
version: 5.3
77

88
minGameVersion: 140.4
99
hidden: true

src/casterui/io/ui/CuiFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,9 +384,9 @@ public void buildTeamItemTable() {
384384
new Label((!settings.getBool("cui-TeamItemsShortenItems") ? amount : UI.formatAmount(amount)) + " ")
385385
).fontScale(teamItemsFontSize).size(iconSizes * teamItemsIconSize).center();
386386
}else {
387-
if(iconPlace == 0)sub.label(() -> (!settings.getBool("cui-TeamItemsShortenItems") ? amount : UI.formatAmount(amount)) + " ").fontScale(teamItemsFontSize);
388-
sub.image(item.uiIcon).size(iconSizes * teamItemsIconSize).left();
389387
if(iconPlace == 2) sub.label(() -> (!settings.getBool("cui-TeamItemsShortenItems") ? amount : UI.formatAmount(amount)) + " ").fontScale(teamItemsFontSize);
388+
sub.image(item.uiIcon).size(iconSizes * teamItemsIconSize).left();
389+
if(iconPlace == 0)sub.label(() -> (!settings.getBool("cui-TeamItemsShortenItems") ? amount : UI.formatAmount(amount)) + " ").fontScale(teamItemsFontSize);
390390
}
391391

392392
if (itemTypes[0] >= teamItemsMax) {

src/casterui/io/ui/dialog/CuiSettingsDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public void counterCategory(SettingsMenuDialog.SettingsTable table) {
137137

138138
subTable.pref(new CollapserSetting("cui-offset-div", 6));
139139
subTable.sliderPref("cui-unitsIconSize", 32, 1, 100, String::valueOf);
140-
subTable.sliderPref("cui-unitsPlayerTableFont", 20, 0, fontScaleMax, s-> "x" + decForS.format(s == 0 ? 0.01f : s/20f) + "x");
140+
subTable.sliderPref("cui-unitsPlayerTableFont", 20, 0, fontScaleMax, s-> "x" + decForS.format(s == 0 ? 0.01f : s/20f) );
141141
subTable.sliderPref("cui-PlayerUnitsTableSide", 1, 0, 8, s -> bundle.get("cui-side"+s));
142142
subTable.sliderPref("cui-playerunitstablestyle", 0, 0 , 9, s -> bundle.get("cui-blockinfostyle-s" + s ));
143143
subTable.sliderPref("cui-playerunitstables-x", 0, -offsetMinMax , offsetMinMax, String::valueOf);
@@ -240,7 +240,7 @@ public void teamsCategory(SettingsMenuDialog.SettingsTable table){
240240
subTable.checkPref("cui-TeamItemsShortenItems", true);
241241
subTable.sliderPref("cui-TeamItemsAlpha", 8, 0, 10, s -> s > 0 ? s != 10 ? s + "0%" : "100%" : "@off");
242242
subTable.sliderPref("cui-TeamItemsRow", 6, 0, 10, s -> s +1 + "");
243-
subTable.sliderPref("cui-TeamItemsIconStyle", 0, 0, 2, s -> bundle.get("cui-unitsplayer-style" + s));
243+
subTable.sliderPref("cui-TeamItemsIconStyle", 2, 0, 2, s -> bundle.get("cui-unitsplayer-style" + s));
244244

245245
subTable.pref(new CollapserSetting("cui-offset-div", 6));
246246
subTable.sliderPref("cui-TeamItemsSide", 8, 0, 8, s -> bundle.get("cui-side"+s));

0 commit comments

Comments
 (0)