Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 31 additions & 16 deletions assets/bundles/bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,24 @@ setting.cui-ShowUnitTable.name =[accent]Show Units table
setting.cui-separateTeamsUnit.name =Separate per team's Units
setting.cui-teamtotalunitcount.name =Show total unit counts
setting.cui-unitFlagCoreUnitHides.name =Hide Units spawned by a core
setting.cui-unitFlagCoreUnitHides.description =Any unit with `spawnedByCore` Flag set\nTurn off to just use the blacklist
setting.cui-unitFlagCoreUnitHides.description =Hide units with `spawnedByCore` Flag set\nTurn off to just use the blacklist
setting.cui-teamtotalunitcount =Show total count
setting.cui-unitsPlayerTableStyle.name =Amount style:
setting.cui-unitsPlayerTableStyle.name =Unit counter\namount style:
setting.cui-buttonSize.name =Button Sizes
setting.cui-buttonSize.description =Default: 40
setting.cui-unitsPlayerTableSize.name =Counter Table max icons/row
setting.cui-unitsPlayerTableSize.description =Default: 6
setting.cui-playerunitstablecontols.name =Show Counter controls
setting.cui-playerunitstablecontols.description =Add/remove On screen controls to hide/show core units etc & summarize mini player list \nDoes not affect hotkeys!
setting.cui-playerunitstablecstoptracking.name = Stop Tracking button
setting.cui-playerunitstablecstoptracking.description =[accent]Meant for the two people who use this on mobile[]
setting.cui-PlayerUnitsTableSide.name =Counter Side:
setting.cui-PlayerUnitsTableSide.description =Default: Bottom Left\nApplies next map change / Ui rebuilt
setting.cui-playerunitstablestyle.name =Counter Table Style
setting.cui-playerunitstablestyle.description =Default: ButtonTrans\nApplies next map change / Ui rebuilt
setting.cui-playerunitstables-x.name =Counter X offset
setting.cui-playerunitstables-y.name =Counter Y offset
setting.cui-unitsPlayerTableFont.name =Counter Font Size:

setting.cui-units-category.name =Units options
setting.cui-showUnitBar.name =Show unit Health and Shield bars ([accent]wip[])
Expand Down Expand Up @@ -97,18 +100,19 @@ setting.cui-hotkeys-category.name =HotKey options

setting.cui-input-category.name =Input options
setting.cui-maxZoom.name =Zoom IN Limit
setting.cui-maxZoom.description =Default: 6x
setting.cui-maxZoom.description =Default: 6x[accent] \nLower = Further\nHigher = Closer
setting.cui-minZoom.name =Zoom OUT Limit
setting.cui-minZoom.description =Default: 1.5x
setting.cui-minZoom.description =Default: 1.5x[accent]\nLower = Further\nHigher = Closer
setting.cui-minimalCursor.name =Custom Cursor
setting.cui-minimalCursor.description =Replace the mouse cursor to a minal version\nRestart Required!
setting.cui-respectCommandMode.name =Hotkeys works in command mode
setting.cui-respectTyping.name =Hotkeys works while typing in chat
setting.cui-respectLockInputs.name =Hotkeys while inputs are locked
setting.cui-respectDialog.name =Hotkeys while a Dialog is open
setting.cui-respectLockInputs.description =Aka world logic cutscenes
setting.cui-hideWithMenus.name =Hide CUI Hud/menu with hud/menu fragment
setting.cui-auto-toggle-menu.name =Hide Game's hud on Start
setting.cui-hideWithMenus.name =[accent]Sync CUI Elements with Hud's visibility
setting.cui-hideWithMenus.description =Hide Cui's Ui when vaniila Ui is hidden
setting.cui-auto-toggle-menu.name =[accent]Hide Game's hud on Start

setting.cui-blocks-category.name =Blocks options
setting.cui-showPowerBar.name =Show Power bar ([scarlet]not working[])
Expand All @@ -134,16 +138,17 @@ setting.cui-blockinfoSide.description =Default: Left\nApplies next map change /
setting.cui-blockinfo-x.name =Block Info X Offset:
setting.cui-blockinfo-y.name =Block Info Y Offset:
setting.cui-blockinfo-colour.name =Block info Team colour background
setting.cui-domination-toggle.name =[accent]Show Block Counter
setting.cui-domination-vertical.name =Vertical Block Counter
setting.cui-domination-toggle.name =[accent]Domination[] (block counts)
setting.cui-domination-vertical.name =Vertical Domination
setting.cui-domination-TeamIcons.name =Show Team Icons
setting.cui-domination-TeamIcons.description =Applies next map change / Ui rebuilt
setting.cui-domination-side.name =Domination Side
setting.cui-domination-x.name =Block Count X offset
setting.cui-domination-y.name =Block Count Y offset
setting.cui-domination-trans.name =Block Count Transparency
setting.cui-domination-font-size.name =Domination font Size
setting.cui-domination-x.name =Domination X offset
setting.cui-domination-y.name =Domination Y offset
setting.cui-domination-trans.name =Domination Transparency

setting.cui-domination-category.name =Config Block Counts
setting.cui-domination-category.name =Config Domination
setting.cui-domination-raw.name =Total \ue811 Raw Blocks
setting.cui-domination-raw.description =This will count all blocks including hidden & non buildable blocks
setting.cui-domination-percent.name =Show \ue827 Percent
Expand All @@ -159,7 +164,9 @@ setting.cui-domination-crafting.name =Total \ue830 Crafting blocks
setting.cui-domination-units.name =Total \ue86d Units blocks
setting.cui-domination-effect.name =Total \ue853 effect blocks
setting.cui-domination-logic.name =Total \ue80e logic blocks
setting.cui-domination-graph.name =Display Team's Best Power Grid
setting.cui-domination-graph.name = Teams's \uf781Best Power Grid
setting.cui-domination-battery.name = Teams's \uf87b Battery %
setting.cui-domination-battery.description =Only shows the battery in the best power grid!

setting.cui-advance-category.name =Advance options
setting.cui-unitsPlayerTableUpdateRate.name =Update rate of Hud elements
Expand All @@ -178,9 +185,12 @@ setting.cui-TeamItemsShortenItems.description =Item numbers are shown full/raw n
setting.cui-TeamItemsAlpha.name =Team Items Transparency
setting.cui-TeamItemsAlpha.description =Default: 80%
setting.cui-TeamItemsSide.name =Team Items Side:
setting.cui-TeamItems-icon-size.name =Team Items icon size
setting.cui-TeamItems-font-size.name =Team Items font size
setting.cui-TeamItemsSide.description =Default: Right\nApplies next map change / Ui rebuilt
setting.cui-TeamItems-x.name =Team Items X Offset:
setting.cui-TeamItems-y.name =Team Items Y Offset:
setting.cui-TeamItemsIconStyle.name =Team item\nIcon Style

cui-rebuild =Rebuild Ui
cui-rebuild-info =Apply ui changes without changing maps
Expand All @@ -195,6 +205,7 @@ cui-teamblacklister =Filter Teams

settings.cui-preset =Presets
settings.cui-preset.disclaimer =This will [scarlet]override all settings[]
settings.cui-preset.lol =Todo: bully rushie to add a export/imports here lol
settings.cui-reset =Reset [scarlet]ALL[] to Defaults


Expand Down Expand Up @@ -294,8 +305,9 @@ cui-factoryProgress4 =Top Bar
cui-factoryProgress5 =Bottom Bar
cui-factoryProgress6 =%

cui-unitsplayer-style0 =BESIDE Icon
cui-unitsplayer-style1 =INSIDE Icon
cui-unitsplayer-style0 =After Icon \n(\ue86d 0)
cui-unitsplayer-style1 =Inside Icon \n(\ue86d)
cui-unitsplayer-style2 =Before Icon \n(0 \ue86d)

cui-unitshealtbar-style1 =centered bar
cui-unitshealtbar-style2 =right bar
Expand Down Expand Up @@ -324,4 +336,7 @@ cui-cmd-limits3 =ALL units
cui-filter0 =Domination
cui-filter1 =Units
cui-filter2 =Core Items
cui-filter3 =Cycle players
cui-filter3 =Cycle players

cui-zoom-unbalance-in= Lower than Zoom Out!
cui-zoom-unbalance-out= Higher than Zoom in!
4 changes: 2 additions & 2 deletions mod.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -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.1 (v7) Helping you cast games~"
version: 5.1
subtitle: "v5.2 (v7) Helping you cast games~"
version: 5.2

minGameVersion: 140.4
hidden: true
Expand Down
2 changes: 1 addition & 1 deletion src/casterui/CuiMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public CuiMain() {
Events.on(EventType.ClientLoadEvent.class, you -> CuiVars.init());
Events.on(EventType.WorldLoadEvent.class, you -> CuiVars.postInt());
Events.run(EventType.Trigger.update, CuiVars::update);
Events.on(EventType.BlockDestroyEvent.class, block -> CuiVars.renderer.coreDestroyAlert(block));
Events.on(EventType.BlockDestroyEvent.class, block -> CuiVars.cuiRenderer.coreDestroyAlert(block));
} catch (Exception e){
Log.err("CUI UI: can't load " + "\n: " + e + e.getCause());
}
Expand Down
24 changes: 19 additions & 5 deletions src/casterui/CuiVars.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import static casterui.io.CuiBinding.toggle_cui_kill_switch;

public class CuiVars {
public static CuiWorldRenderer renderer = new CuiWorldRenderer();
public static CuiWorldRenderer cuiRenderer = new CuiWorldRenderer();
public static CuiFragment fragment = new CuiFragment();
public static CuiInputs inputs = new CuiInputs();
public static CuiTeamMangerDialog teamManger = new CuiTeamMangerDialog();
Expand All @@ -41,20 +41,21 @@ public class CuiVars {
public static Vec2[] savedCameras = new Vec2[11];

public static DecimalFormat decFor = new DecimalFormat("#.##"), decForMini = new DecimalFormat("#.#");
public static boolean[] dominationSettings = new boolean[15];
public static boolean[] dominationSettings = new boolean[16];
public static boolean
showBlockInfo = false, showCountersUnits = false, showCountersPlayers = false, showCountersButton = false,
showBlockInfo = false, showCountersUnits = false, showCountersPlayers = false, showCountersButton = false, showStopTrackingButton = false,
countersSeparateTeams = false, countersCoreUnits = false, countersCoreFlagged = false, countersTotals = false,
dominationVertical = false, dominationColoured = false, dominationIcons = false,
showTeamItems = false, showDomination = false;
public static float dominationFontSize = 0, teamItemsFontSize = 0, teamItemsIconSize = 0;
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(){
updateChecker.run();
CuiSettingsDialog.buildCategory();
renderer.worldRenderer();
cuiRenderer.worldRenderer();
rebindDialog.load();
if(Core.settings.getBool("cui-minimalCursor")) overrideCursors();
animateCats = Core.settings.getBool("cui-animateSettings");
Expand All @@ -65,7 +66,7 @@ public static void init(){

public static void postInt(){
fragment.clearTables();
renderer.circleQueue.clear();
cuiRenderer.circleQueue.clear();
updateSettings(true);

CuiVars.heldUnit = null;
Expand Down Expand Up @@ -144,6 +145,7 @@ public static void updateSettings(boolean full){
dominationSettings[12] = settings.getBool("cui-domination-percent");
dominationSettings[13] = settings.getBool("cui-domination-raw");
dominationSettings[14] = settings.getBool("cui-domination-graph");
dominationSettings[15] = settings.getBool("cui-domination-battery");

if(!full) return;

Expand All @@ -159,6 +161,18 @@ public static void updateSettings(boolean full){
countersSeparateTeams = settings.getBool("cui-separateTeamsUnit");
countersCoreUnits = settings.getBool("cui-unitsTableCoreUnits");
countersTotals = settings.getBool("cui-teamtotalunitcount");
showStopTrackingButton = settings.getBool("cui-playerunitstablecstoptracking");

dominationFontSize = settings.getInt("cui-domination-font-size") /20f;
teamItemsFontSize = settings.getInt("cui-TeamItems-font-size") /20f;
teamItemsIconSize = settings.getInt("cui-TeamItems-icon-size") /20f;

if(dominationFontSize <= 0) dominationFontSize = 0.01f;
if(teamItemsFontSize <= 0) teamItemsFontSize = 0.01f;
if(teamItemsIconSize <= 0) teamItemsIconSize = 0.01f;
float x= settings.getInt("cui-maxZoom"), n = settings.getInt("cui-minZoom") ;
if(x != 12) Vars.renderer.maxZoom = x == 0 ? 0.01f : x * 0.5f;
if(n != 12) Vars.renderer.minZoom = n == 0 ? 0.01f : n * 0.5f;
}

public static void updateHiddenTeams(){
Expand Down
Loading