Merge pull request #38 from JiroCab/Development

JiroCab · web-flow · commit 80dea4158743 · 2025-02-05T23:27:16.000+08:00
slightly more better filters
diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties
@@ -23,6 +23,10 @@ setting.cui-playerTrackedAlpha.description =Default: 100%
 setting.cui-playerIconSize.name =Player's Unit icon size:
 setting.cui-playerIconSize.description =Default: 35\nApplies next map change / Ui rebuilt
 setting.cui-playerHoldTrackMouse =Hold Track player mouse
+setting.cui-useCycleFilter.name =Hide Cursor of ignored players
+setting.cui-useCycleFilter.description =Same as`Filter Teams (Cycle player)`
+setting.cui-cyclePlayersIgnoreNoCore.name =Cycle Players ignores players w/o cores
+setting.cui-cyclePlayersIgnoreNoCore.description =Useful for cases where a team losses their core
 
 setting.cui-counter-category.name =Counters options
 setting.cui-ShowPlayerList.name =Mini Player Table
@@ -176,7 +180,8 @@ cui-hiddenInfo =Units to show/hide in Unit table
 cui-hiddenCoreUnits =Hidden Core units
 cui-hiddenCoreInfo =Units to ignore for `Hide Core units`
 cui-unbind =Unbind
-cui-filterTeams =Filter Teams
+cui-filterTeams =Filter Teams\n({0})
+cui-filterTeamsShort =Filter Teams ({0})
 cui-teamblacklister =Filter Teams
 
 settings.cui-preset =Presets
@@ -289,9 +294,10 @@ cui-unitshealtbar-style3 =left bar
 cui-unitshealtbar-style4 =no bg + centered bar
 cui-unitshealtbar-style5 =no bg + left bar
 cui-unitshealtbar-style6 =no bg + right bar
-cui-unitshealtbar-style7 =boarder + centered bar
-cui-unitshealtbar-style8 =boarder + left bar
-cui-unitshealtbar-style9 =boarder + right bar
+cui-unitshealtbar-style7 =Border + centered bar
+cui-unitshealtbar-style8 =Border + left bar
+cui-unitshealtbar-style9 =Border + right bar
+cui-unitshealtbar-style10 = Hud Diamond
 
 cui-unittext-style1 =%
 cui-unittext-style2 =raw hp
@@ -305,3 +311,8 @@ cui-preset4 =bottom` centric
 cui-cmd-limits1 =Mouse
 cui-cmd-limits2 =On screen
 cui-cmd-limits3 =ALL units
+
+cui-filter0 =Domination
+cui-filter1 =Units
+cui-filter2 =Core Items
+cui-filter3 =Cycle players
diff --git 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: "v4.8 Helping you cast games~"
-version: 4.8
+subtitle: "v4.9 Helping you cast games~"
+version: 4.9
 
 minGameVersion: 140.4
 hidden: true
diff --git a/src/casterui/CuiVars.java b/src/casterui/CuiVars.java
@@ -52,8 +52,8 @@ public class CuiVars {
             countersSeparateTeams = false, countersCoreUnits = false, countersCoreFlagged = false, countersTotals = false,
             dominationVertical = false, dominationColoured = false, dominationIcons = false,
             showTeamItems = false, showDomination = false;
-    public static boolean[] hiddenTeamsDomination = new boolean[Team.all.length], hiddenTeamsUnits = new boolean[Team.all.length], hiddenTeamsItems = new boolean[Team.all.length];
-    public static boolean[][]  hiddenTeamList = {hiddenTeamsDomination, hiddenTeamsUnits, hiddenTeamsItems};
+    public static boolean[] hiddenTeamsDomination = new boolean[Team.all.length], hiddenTeamsUnits = new boolean[Team.all.length], hiddenTeamsItems = new boolean[Team.all.length], hiddenCycleTeam = new boolean[Team.all.length];
+    public static boolean[][]  hiddenTeamList = {hiddenTeamsDomination, hiddenTeamsUnits, hiddenTeamsItems, hiddenCycleTeam};
     public static Table updateCheckTable = new Table();
 
     public static void init(){
diff --git a/src/casterui/io/CuiBinding.java b/src/casterui/io/CuiBinding.java
@@ -14,12 +14,14 @@ public enum CuiBinding implements KeyBinds.KeyBind {
     spectate_previous_player(KeyCode.apostrophe),
     spectate_next_core(KeyCode.unknown),
     spectate_previous_core(KeyCode.unknown),
+    spectate_ignore_coreless(KeyCode.unknown),
 
     toggle_units_player_table_controls(KeyCode.unknown, "cui-counter"),
     toggle_table_core_units(KeyCode.unknown),
     toggle_table_summarize_players(KeyCode.unknown),
 
     toggle_player_cursor(KeyCode.unknown, "cui-trackers"),
+    filter_player_cursor(KeyCode.unknown),
     toggle_track_logic(KeyCode.unknown),
     toggle_unit_cmd(KeyCode.unknown),
     toggle_unit_Cmd_type(KeyCode.unknown),
diff --git a/src/casterui/io/CuiInputs.java b/src/casterui/io/CuiInputs.java
@@ -78,6 +78,8 @@ public void update(){
         if(cuiKeyTap(toggle_cui_kill_switch)) settings.put("cui-killswitch", !settings.getBool("cui-killswitch")); //haha this will be one way but lulz
         if(cuiKeyTap(toggle_unit_Cmd_type)) settings.put("cui-unitCmdNonMv", !settings.getBool("cui-unitCmdNonMv"));
         if(cuiKeyTap(toggle_domination)) settings.put("cui-domination-toggle", !settings.getBool("cui-domination-toggle"));
+        if(cuiKeyTap(spectate_ignore_coreless)) settings.put("cui-cyclePlayersIgnoreNoCore", !settings.getBool("cui-cyclePlayersIgnoreNoCore"));
+        if(cuiKeyTap(filter_player_cursor)) settings.put("cui-useCycleFilter", !settings.getBool("cui-useCycleFilter"));
 
 
 
@@ -194,6 +196,9 @@ void cyclePlayers(boolean increment){
             if (p != player) ply.add(p);
         }
         ply.remove(player);
+        ply.removeAll(p -> CuiVars.hiddenCycleTeam[p.team().id]);
+        if(settings.getBool("cui-cyclePlayersIgnoreNoCore")) ply.removeAll(p->p.team().cores().size == 0);
+
 
         if (ply.size < 1) return;
         int number = playerNumber;
diff --git a/src/casterui/io/ui/CuiWorldRenderer.java b/src/casterui/io/ui/CuiWorldRenderer.java
@@ -26,7 +26,7 @@
 import mindustry.world.blocks.storage.CoreBlock;
 import mindustry.world.blocks.units.UnitFactory;
 
-import static arc.graphics.g2d.Draw.draw;
+import static arc.graphics.g2d.Draw.*;
 import static mindustry.Vars.*;
 
 
@@ -42,6 +42,7 @@ public void worldRenderer(){
             if (!CuiVars.globalShow) return;
             boolean unitBars = Core.settings.getInt("cui-showUnitBarStyle") > 0;
             boolean trackPlayerCursor = Core.settings.getBool("cui-TrackPlayerCursor");
+            boolean filterPlayerCursor = Core.settings.getBool("cui-useCycleFilter"), filterNoCores = Core.settings.getBool("cui-cyclePlayersIgnoreNoCore");
             boolean trackLogicControl = Core.settings.getInt("cui-logicLineAlpha") > 0;
             boolean unitCmds = Core.settings.getInt("cui-unitscommands") > 0;
 
@@ -63,6 +64,7 @@ public void worldRenderer(){
                 }));
                 if(unitCmds) drawUnitPointer();
                 if(trackPlayerCursor) Groups.player.each(ply ->{
+                    if(filterPlayerCursor && (CuiVars.hiddenCycleTeam[ply.team().id] || (filterNoCores && ply.team().cores().size == 0))) return;
                     if(ply.unit() != null){drawPlayerCursor(ply);}
                 });
             }
@@ -119,28 +121,39 @@ public void drawUnitBars(Unit unit, int style, float alpha, float stroke){
         Color shclr = new Color().set(unit.team.color).lerp(Color.black, 0.25f).a(alpha);
 
         Draw.alpha(alpha);
-        Draw.draw(Layer.flyingUnit +2, () ->{
+        Draw.draw(Layer.flyingUnit +2, () -> {
             if(Core.settings.getInt("cui-showUnitTextStyle") > 0){
                 int tstyle = Core.settings.getInt("cui-showUnitTextStyle");
                 String txt = "[red]";
                 if(tstyle == 1){
-                    txt  += Mathf.round(hp * 100) + "%[]";
+                    txt += Mathf.round(hp * 100) + "%[]";
                     if(shield > 0) txt += "\n" + CuiVars.decFor.format(unit.shield);
                 }else if(style == 2){
-                    txt  += CuiVars.decFor.format(unit.health) + "[]";
+                    txt += CuiVars.decFor.format(unit.health) + "[]";
                     if(shield > 0) txt += "\n" + CuiVars.decFor.format(unit.shield);
-                } else {
-                    txt  += (CuiVars.decFor.format(unit.health) + "[][white]/[][pink]"+ Math.round(unit.maxHealth) +"[]");
+                }else{
+                    txt += (CuiVars.decFor.format(unit.health) + "[][white]/[][pink]" + Math.round(unit.maxHealth) + "[]");
                     if(shield > 0) txt += "\n" + CuiVars.decFor.format(unit.shield);
                 }
 
                 drawLabel(unit.x, unit.y, txt, colour);
 
             }
-            if(stroke == 0) return;
+        });
+        if(stroke == 0) return;
+        Draw.draw(Layer.flyingUnit +1.99f, () ->{
             float yShield = y - offset + stroke, yShieldAlt = yShield + (stroke /2.5f);
             float yOff = y - offset;
+
             switch (style) {
+                case  10 -> { //diamonds, (don't remember which mod that used to do this so ughh yes)
+                    drawInner(Pal.darkishGray, 1f, false, x - (offset /1.5f), y - (offset /2), (width / 2f), unit.hitSize,  1);
+                    drawInner(colour, hp ,false, x - (offset /1.5f), y - (offset /2), (width / 2f), unit.hitSize,  1);
+                    if(shield > 0){
+                        drawInner(Pal.darkishGray, 1f, true, x + (offset /1.5f), y - (offset /2), (width / 2f), unit.hitSize,  1);
+                        drawInner(colour, shield ,true, x + (offset /1.5f), y - (offset /2), (width / 2f), unit.hitSize,  1);
+                    }
+                }
                 case 9 -> {//boarder - right
                     if(shield > 0)drawBoardedLine(colour, x + width, yShield, x - (width), yShield,x + offset + ((width * 2) * shield), yShield, x + offset, yShield, stroke, bg);
                     drawBoardedLine(colour, x + width, yOff, x - (width), yOff,x + offset + ((width * 2) * hp), yOff, x + offset, yOff, stroke, bg);
@@ -356,6 +369,48 @@ public void drawPointer(Color color, float x, float y, Position unit, int style)
         Draw.reset();
     }
 
+    public void drawInner(Color color, float fract, boolean flip, float x, float y, float width, float height, float parentAlpha){
+        if(fract < 0) return;
+
+        fract = Mathf.clamp(fract);
+        if(flip){
+            x += width;
+            width = -width;
+        }
+
+        float stroke = width * 0.35f;
+        float bh = height/2f;
+        Draw.color(color, parentAlpha);
+
+        float f1 = Math.min(fract * 2f, 1f), f2 = (fract - 0.5f) * 2f;
+
+        float bo = -(1f - f1) * (width - stroke);
+
+        Fill.quad(
+        x, y,
+        x + stroke, y,
+        x + width + bo, y + bh * f1,
+        x + width - stroke + bo, y + bh * f1
+        );
+
+        if(f2 > 0){
+            float bx = x + (width - stroke) * (1f - f2);
+            Fill.quad(
+            x + width, y + bh,
+            x + width - stroke, y + bh,
+            bx, y + height * fract,
+            bx + stroke, y + height * fract
+            );
+        }
+
+        Draw.reset();
+
+        if(flip){
+            width = -width;
+            x -= width;
+        }
+    }
+
     public static void drawBoardedLine(Color color, float x, float y, float x2, float y2, float x3, float y3, float stoke, Color bg){
         drawBoardedLine(color, x, y, x2, y2, x3, y3, x, y, stoke, bg);
     }
diff --git a/src/casterui/io/ui/dialog/CuiSettingsDialog.java b/src/casterui/io/ui/dialog/CuiSettingsDialog.java
@@ -65,6 +65,7 @@ public void add(SettingsMenuDialog.SettingsTable table) {
                 case 8 -> unitsCategory(table);
                 case 9 -> dominationSubCategory(table);
                 case 10 -> updateHeader(table);
+                case 11 -> cyclePlayerSubCategory(table);
                 default -> advanceCategory(table);
             }
         }
@@ -83,9 +84,15 @@ public void trackingCategory(SettingsMenuDialog.SettingsTable table){
                 subTable.sliderPref("cui-playerTrackAlpha", 7, 0, 10, s -> s  > 0 ? s != 10 ? s + "0%" : "100%" : "@off");
                 subTable.sliderPref("cui-playerTrackedAlpha", 10, 0, 10, s -> s > 0 ? s != 10 ? s + "0%" : "100%" : "@off");
                 subTable.sliderPref("cui-playerIconSize", 35, 1, 100, String::valueOf);
+                subTable.checkPref("cui-useCycleFilter", true);
+
+                subTable.pref(new CollapserSetting("cui-offset-div", 6));
+                subTable.pref(new CollapserSetting("cui-playerCycle-more", 11));
+                subTable.checkPref("cui-cyclePlayersIgnoreNoCore", true);
 
-                allCuiOptions.add(subTable);
                 t.add(subTable);
+                allCuiOptions.addAll(subTable);
+
             }, CuiVars.animateCats , () ->tracking[0]).growX().row();
         }
 
@@ -95,12 +102,12 @@ public void counterCategory(SettingsMenuDialog.SettingsTable table) {
             table.collapser( t -> {
                 SettingsMenuDialog.SettingsTable subTable = new SettingsMenuDialog.SettingsTable();
                 //TODO: SAVE THESE AND LOAD THEM
-                t.button(bundle.get("cui-hiddenUnits"), Icon.eyeOffSmall,() -> showBanned(bundle.get("cui-hiddenUnits"), hiddenUnits)).tooltip(bundle.get("cui-hiddenInfo")).center().width(400f).top().row();
-                t.button(bundle.get("cui-hiddenCoreUnits"), Icon.cancel,() -> showBanned(bundle.get("cui-hiddenCoreUnits"), coreUnitsTypes, true)).tooltip(bundle.get("cui-hiddenCoreInfo")).center().width(400f).top().row();
-                t.button(bundle.get("cui-filterTeams"), Icon.eraserSmall,() ->{
+                t.button(bundle.get("cui-hiddenUnits"), Icon.eyeOffSmall,() -> showBanned(bundle.get("cui-hiddenUnits"), hiddenUnits)).tooltip(bundle.get("cui-hiddenInfo")).center().width(400f).height(40).top().row();
+                t.button(bundle.get("cui-hiddenCoreUnits"), Icon.cancel, () -> showBanned(bundle.get("cui-hiddenCoreUnits"), coreUnitsTypes, true)).tooltip(bundle.get("cui-hiddenCoreInfo")).center().width(400f).height(40).top().row();
+                t.button(bundle.format("cui-filterTeamsShort", bundle.get("cui-filter1")), Icon.eraserSmall, () ->{
                     TeamBlackListerDialog teamBlackListerDialog = new TeamBlackListerDialog();
                     teamBlackListerDialog.show(1);
-                }).marginLeft(14f).width(400f).scaling(Scaling.bounded).row();
+                }).height(40).marginLeft(14f).width(400f).scaling(Scaling.bounded).row();
 
                 //Counter table
                 subTable.checkPref("cui-ShowUnitTable", true);
@@ -135,7 +142,7 @@ public void unitsCategory(SettingsMenuDialog.SettingsTable table) {
             table.collapser( t -> {
                 SettingsMenuDialog.SettingsTable subTable = new SettingsMenuDialog.SettingsTable();
                 //hp bars
-                subTable.sliderPref("cui-showUnitBarStyle", 7, 0, 9, s -> s == 0 ? "@off" :bundle.get("cui-unitshealtbar-style" + s));
+                subTable.sliderPref("cui-showUnitBarStyle", 7, 0, 10, s -> s == 0 ? "@off" :bundle.get("cui-unitshealtbar-style" + s));
                 subTable.sliderPref("cui-showUnitBarSize", 4, 0, 100, s -> s == 0 ? "@off" : decFor.format(s * 0.25f));
                 subTable.sliderPref("cui-showUnitBarAlpha", 10, 1, 10, s ->  s + "0%");
                 subTable.sliderPref("cui-showUnitTextStyle", 1, 0, 3, s -> s == 0 ? "@off" :bundle.get("cui-unittext-style" + s));
@@ -237,7 +244,7 @@ public void teamsCategory(SettingsMenuDialog.SettingsTable table){
                 subTable.sliderPref("cui-domination-x", 0, -offsetMinMax , offsetMinMax, String::valueOf);
                 subTable.sliderPref("cui-domination-y", 0, -offsetMinMax , offsetMinMax, String::valueOf);
 
-                t.button(bundle.get("cui-filterTeams"), Icon.eraserSmall,() ->{
+                t.button(bundle.format("cui-filterTeams", bundle.get("cui-filter2")), Icon.eraser,() ->{
                     TeamBlackListerDialog teamBlackListerDialog = new TeamBlackListerDialog();
                     teamBlackListerDialog.show(2);
                 }).marginLeft(14f).width(400f).scaling(Scaling.bounded).row();
@@ -307,7 +314,7 @@ public void advanceCategory(SettingsMenuDialog.SettingsTable table){
 
         public void dominationSubCategory(SettingsMenuDialog.SettingsTable table){
             boolean[] dominactionShown = {false};
-            table.button(bundle.get("cui-filterTeams"), Icon.eraserSmall,() ->{
+            table.button(bundle.format("cui-filterTeams", bundle.get("cui-filter0")), Icon.eraser,() ->{
                 TeamBlackListerDialog teamBlackListerDialog = new TeamBlackListerDialog();
                 teamBlackListerDialog.show(0);
             }).marginLeft(14f).width(400f).scaling(Scaling.bounded).row();
@@ -340,6 +347,13 @@ public void dominationSubCategory(SettingsMenuDialog.SettingsTable table){
         public void updateHeader(SettingsMenuDialog.SettingsTable table){
             table.add(CuiVars.updateCheckTable).growX().center().row();
         }
+
+        public void cyclePlayerSubCategory(SettingsMenuDialog.SettingsTable table){
+            table.button(bundle.format("cui-filterTeams", bundle.get("cui-filter3")), Icon.eraser,() ->{
+                TeamBlackListerDialog teamBlackListerDialog = new TeamBlackListerDialog();
+                teamBlackListerDialog.show(3);
+            }).marginLeft(14f).width(400f).scaling(Scaling.bounded).row();
+        };
     }
 
 
diff --git a/src/casterui/io/ui/dialog/TeamBlackListerDialog.java b/src/casterui/io/ui/dialog/TeamBlackListerDialog.java
@@ -23,6 +23,7 @@
 import java.io.*;
 import java.util.*;
 
+import static arc.Core.bundle;
 import static casterui.CuiVars.*;
 import static mindustry.Vars.*;
 
@@ -33,7 +34,7 @@ public class TeamBlackListerDialog extends BaseDialog{
     public int sort = 0;
     public String sortTxt = "";
     private int write;
-    public static String headerSub[] = {"teams", "counter", "team"};
+    public static String headerSub[] = {"teams", "counter", "team", "cycle"};
 
 
     public TeamBlackListerDialog(){
@@ -60,6 +61,7 @@ public TeamBlackListerDialog(){
 
     public void show(int write){
         this.write = write;
+        this.title.setText(Core.bundle.get("cui-teamblacklister") + " - " + bundle.get("cui-filter" + write));
         show();
     }
 
