Merge pull request #39 from JiroCab/Development

v8 port

Author: JiroCab

assets/bundles/bundle.properties

@@ -27,6 +27,10 @@ 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-trackOnLostFocus.name =Track in background
+setting.cui-trackOnLostFocus.description =Whether tracking continues if you click off the window
+setting.cui-trackwhileChatting.name =Track in typing
+setting.cui-trackwhileChatting.description =Whether tracking continues if you're typing in a text box
 
 setting.cui-counter-category.name =Counters options
 setting.cui-ShowPlayerList.name =Mini Player Table
@@ -76,7 +80,7 @@ setting.cui-alertStyle.description =Default: Circle
 setting.cui-AlertsUseBottom.name =Bottom Toasts alerts
 setting.cui-AlertsHideWithUi.name =Custom Toasts
 setting.cui-AlertsHideWithUi.description =Whether to use custom toast or built in ones \nreduces conflict with world logic toasts
-setting.cui-SendChatCoreLost.name =Send a CHAT message on a Core's Death
+setting.cui-SendChatCoreLost.name =Send CHAT message on a Core's Death
 setting.cui-ShowAlertsCircles.name =Draw a Circle on a Core's Death
 setting.cui-alertCircleSpeed.name =Alert Grow speed:
 setting.cui-alertCircleSpeed.description =Do note that this is constant and doesn't scale with map size\nWon't matter much unless Reverse Growth is enabled\nDefault: 6.0x
@@ -127,6 +131,7 @@ setting.cui-blockinfoSide.name =Block Info Side:
 setting.cui-blockinfoSide.description =Default: Left\nApplies next map change / Ui rebuilt
 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-TeamIcons.name =Show Team Icons
@@ -136,6 +141,7 @@ 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-category.name =Config Block Counts
 setting.cui-domination-raw.name =Total \ue811 Raw Blocks
 setting.cui-domination-raw.description =This will count all blocks including hidden & non buildable blocks
@@ -160,6 +166,7 @@ setting.cui-animateSettings.name =Animate settings category
 setting.cui-TeamItemsUpdateRate.name =Team Items Update rate
 setting.cui-TeamItemsUpdateRate.description =Default: Normal, \nFast to use every tick, \nNormal to update every (update speed * 2)~\nSlow to update every (update speed * 5)~
 setting.cui-updateAvailable = Cui {0} is out! kindly update the mod thx 
+setting.cui-killswitchEnables.name =Kill switch also turns mod on 
 
 setting.cui-teams-category.name =Team options
 setting.cui-ShowTeamItems.name =[accent]Display Team items

build.gradle

@@ -1,29 +1,35 @@
 plugins {
     id 'java'
     id("fr.xpdustry.toxopid") version "3.2.0"
+    id 'maven-publish'
 }
 
 version '1.0'
 
 targetCompatibility = 8
-sourceCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_17
 
 sourceSets.main.java.srcDirs = ["src"]
 
+import fr.xpdustry.toxopid.spec.ModPlatform
+
 repositories{
     mavenCentral()
     maven{ url "https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository" }
     maven { url 'https://jitpack.io' }
+    anukenJitpack()
 }
 
 ext{
     //the build number that this mod is made for
-    mindustryVersion = 'v146'
+    mindustryVersion = 'v150'
     jabelVersion = "93fde537c7"
+    //windows sucks
+    isWindows = System.getProperty("os.name").toLowerCase().contains("windows")
     sdkRoot = System.getenv("ANDROID_HOME") ?: System.getenv("ANDROID_SDK_ROOT")
 }
 
-import fr.xpdustry.toxopid.spec.ModPlatform
+
 toxopid {
     compileVersion.set("$mindustryVersion")
     runtimeVersion.set("$mindustryVersion")

mod.hjson

@@ -2,10 +2,10 @@ 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.9 Helping you cast games~"
-version: 4.9
+subtitle: "v5.0 Helping you cast games~"
+version: 5.0
 
-minGameVersion: 140.4
+minGameVersion: 147
 hidden: true
 main: "casterui.CuiMain"
 java: true

src/casterui/CuiMain.java

@@ -1,9 +1,9 @@
 package casterui;
 
-import arc.Events;
-import arc.util.Log;
-import mindustry.game.EventType;
-import mindustry.mod.Mod;
+import arc.*;
+import arc.util.*;
+import mindustry.game.*;
+import mindustry.mod.*;
 
 public class CuiMain extends Mod {
 

src/casterui/CuiVars.java

@@ -1,39 +1,33 @@
 package casterui;
 
-import arc.Core;
-import arc.Graphics;
-import arc.graphics.Pixmap;
-import arc.graphics.Pixmaps;
+import arc.*;
+import arc.graphics.*;
 import arc.math.geom.*;
 import arc.scene.ui.layout.*;
-import arc.struct.*;
 import arc.util.*;
-import casterui.io.CuiInputs;
-import casterui.io.ui.CuiFragment;
-import casterui.io.ui.CuiWorldRenderer;
+import casterui.io.*;
+import casterui.io.ui.*;
 import casterui.io.ui.dialog.*;
 import casterui.util.*;
-import mindustry.Vars;
+import mindustry.*;
 import mindustry.game.*;
-import mindustry.gen.Player;
-import mindustry.gen.Unit;
-import mindustry.mod.Mods;
-import mindustry.ui.Fonts;
-import mindustry.world.Tile;
-import mindustry.world.blocks.storage.CoreBlock;
+import mindustry.gen.*;
+import mindustry.mod.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.blocks.storage.*;
 
-import java.text.DecimalFormat;
-import java.util.HashMap;
-import java.util.Map;
+import java.text.*;
+import java.util.*;
 
 import static arc.Core.settings;
+import static casterui.io.CuiBinding.toggle_cui_kill_switch;
 
 public class CuiVars {
     public static CuiWorldRenderer renderer = new CuiWorldRenderer();
     public static CuiFragment fragment = new CuiFragment();
     public static CuiInputs inputs = new CuiInputs();
     public static CuiTeamMangerDialog teamManger = new CuiTeamMangerDialog();
-    public static CuiRebindDialog rebindDialog = new CuiRebindDialog();
     public static CuiUpdateChecker updateChecker = new CuiUpdateChecker();
 
     public static boolean initialized = false, globalHidden = true, fastUpdate = false, drawRally = false, globalShow = true, animateCats = Core.settings.getBool("cui-animateSettings");
@@ -57,10 +51,10 @@ public class CuiVars {
     public static Table updateCheckTable = new Table();
 
     public static void init(){
+        CuiBinding.init();
         updateChecker.run();
         CuiSettingsDialog.buildCategory();
         renderer.worldRenderer();
-        rebindDialog.load();
         if(Core.settings.getBool("cui-minimalCursor")) overrideCursors();
         animateCats = Core.settings.getBool("cui-animateSettings");
         updateHiddenTeams();
@@ -85,6 +79,7 @@ public static void postInt(){
 
     public static void update(){
         globalShow = !Core.settings.getBool("cui-killswitch");
+        if(Core.input.keyTap(toggle_cui_kill_switch) && (globalShow || settings.getBool("cui-killswitchEnables"))) settings.put("cui-killswitch", !settings.getBool("cui-killswitch")); //haha this will be one way but lulz
         if (!globalShow) return;
         inputs.update();
         fragment.UpdateTables();

src/casterui/io/CuiBinding.java

@@ -1,95 +1,72 @@
 package casterui.io;
 
-import arc.KeyBinds;
-import arc.input.InputDevice;
-import arc.input.KeyCode;
-
-public enum CuiBinding implements KeyBinds.KeyBind {
-    track_cursor(KeyCode.h, "cui"),
-    last_destroyed_core(KeyCode.g),
-    toggle_cui_menu(KeyCode.f7),
-    change_teams(KeyCode.home),
-
-    spectate_next_player(KeyCode.semicolon, "cui-cycle"), // [ & ] is used by default cargo pickup/drop mb
-    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),
-
-
-    toggle_unit_hp_bars(KeyCode.unknown, "cui-settings"),
-    toggle_shorten_items_info(KeyCode.unknown),
-    toggle_block_hp(KeyCode.unknown),
-    toggle_team_items(KeyCode.unknown),
-    toggle_shorten_team_items(KeyCode.unknown),
-    toggle_alerts_circle(KeyCode.unknown),
-    toggle_alerts_circle_reverse_growth(KeyCode.unknown),
-    toggle_alerts_toast(KeyCode.unknown),
-    toggle_alerts_toast_bottom(KeyCode.unknown),
-    toggle_factory_style(KeyCode.unknown),
-    toggle_domination(KeyCode.unknown),
-
-    toggle_cui_kill_switch(KeyCode.unknown),
-
-    map_player_1 (KeyCode.num1,"cui-player-mapping"),
-    map_player_2(KeyCode.num2),
-    map_player_3(KeyCode.num3),
-    map_player_4(KeyCode.num4),
-    map_player_5(KeyCode.num5),
-    map_player_6(KeyCode.num6),
-    map_player_7(KeyCode.num7),
-    map_player_8(KeyCode.num8),
-    map_player_9(KeyCode.num9),
-    map_player_10(KeyCode.unknown),
-
-    save_camera (KeyCode.unknown,"cui-camera-mapping"),
-    move_camera (KeyCode.unknown),
-    map_camera_1 (KeyCode.unknown),
-    map_camera_2(KeyCode.unknown),
-    map_camera_3(KeyCode.unknown),
-    map_camera_4(KeyCode.unknown),
-    map_camera_5(KeyCode.unknown),
-    map_camera_6(KeyCode.unknown),
-    map_camera_7(KeyCode.unknown),
-    map_camera_8(KeyCode.unknown),
-    map_camera_9(KeyCode.unknown),
-    map_camera_10(KeyCode.unknown),
-
-
+import arc.input.*;
+
+public class CuiBinding {
+
+    public static final KeyBind
+        toggle_cui_kill_switch = KeyBind.add("cui-toggle_cui_kill_switch", KeyCode.unset, "cui"),
+        track_cursor = KeyBind.add("cui-track_cursor", KeyCode.h, "cui"),
+        last_destroyed_core = KeyBind.add("cui-last_destroyed_core", KeyCode.g, "cui"),
+        toggle_cui_menu = KeyBind.add("cui-toggle_cui_menu", KeyCode.f7, "cui"),
+        change_teams = KeyBind.add("cui-change_teams", KeyCode.home, "cui"),
+
+        spectate_next_player = KeyBind.add("cui-spectate_next_player", KeyCode.semicolon, "cui-spectate"),
+        spectate_previous_player = KeyBind.add("cui-spectate_previous_player", KeyCode.apostrophe, "cui-spectate"),
+        spectate_next_core = KeyBind.add("cui-spectate_next_core", KeyCode.unset, "cui-spectate"),
+        spectate_previous_core = KeyBind.add("cui-spectate_previous_core", KeyCode.unset, "cui-spectate"),
+        spectate_ignore_coreless = KeyBind.add("cui-spectate_ignore_coreless", KeyCode.unset, "cui-spectate"),
+
+        toggle_units_player_table_controls = KeyBind.add("cui-toggle_units_player_table_controls", KeyCode.unset, "cui-counter"),
+        toggle_table_core_units = KeyBind.add("cui-toggle_table_core_units", KeyCode.unset, "cui-counter"),
+        toggle_table_summarize_players = KeyBind.add("cui-toggle_table_summarize_players", KeyCode.unset, "cui-counter"),
+
+        toggle_player_cursor = KeyBind.add("cui-toggle_player_cursor", KeyCode.unset, "cui-trackers"),
+        filter_player_cursor = KeyBind.add("cui-filter_player_cursor", KeyCode.unset, "cui-trackers"),
+        toggle_track_logic = KeyBind.add("cui-toggle_track_logic", KeyCode.unset, "cui-trackers"),
+        toggle_unit_cmd = KeyBind.add("cui-toggle_unit_cmd", KeyCode.unset, "cui-trackers"),
+        toggle_unit_Cmd_type = KeyBind.add("cui-toggle_unit_Cmd_type", KeyCode.unset, "cui-trackers"),
+
+        toggle_unit_hp_bars = KeyBind.add("cui-toggle_unit_hp_bars", KeyCode.unset, "cui-settings"),
+        toggle_shorten_items_info = KeyBind.add("cui-toggle_shorten_items_info", KeyCode.unset, "cui-settings"),
+        toggle_block_hp = KeyBind.add("cui-toggle_block_hp", KeyCode.unset, "cui-settings"),
+        toggle_team_items = KeyBind.add("cui-toggle_team_items", KeyCode.unset, "cui-settings"),
+        toggle_shorten_team_items = KeyBind.add("cui-toggle_shorten_team_items", KeyCode.unset, "cui-settings"),
+        toggle_alerts_circle = KeyBind.add("cui-toggle_alerts_circle", KeyCode.unset, "cui-settings"),
+        toggle_alerts_circle_reverse_growth = KeyBind.add("cui-toggle_alerts_circle_reverse_growth", KeyCode.unset, "cui-settings"),
+        toggle_alerts_toast = KeyBind.add("cui-toggle_alerts_toast", KeyCode.unset, "cui-settings"),
+        toggle_alerts_toast_bottom = KeyBind.add("cui-toggle_alerts_toast_bottom", KeyCode.unset, "cui-settings"),
+        toggle_factory_style = KeyBind.add("cui-toggle_factory_style", KeyCode.unset, "cui-settings"),
+        toggle_domination = KeyBind.add("cui-toggle_domination", KeyCode.unset, "cui-settings"),
+
+        map_player_1 = KeyBind.add("cui-map_player_1", KeyCode.num1, "cui-mapping"),
+        map_player_2 = KeyBind.add("cui-map_player_2", KeyCode.num2, "cui-mapping"),
+        map_player_3 = KeyBind.add("cui-map_player_3", KeyCode.num3, "cui-mapping"),
+        map_player_4 = KeyBind.add("cui-map_player_4", KeyCode.num4, "cui-mapping"),
+        map_player_5 = KeyBind.add("cui-map_player_5", KeyCode.num5, "cui-mapping"),
+        map_player_6 = KeyBind.add("cui-map_player_6", KeyCode.num6, "cui-mapping"),
+        map_player_7 = KeyBind.add("cui-map_player_7", KeyCode.num7, "cui-mapping"),
+        map_player_8 = KeyBind.add("cui-map_player_8", KeyCode.num8, "cui-mapping"),
+        map_player_9 = KeyBind.add("cui-map_player_9", KeyCode.num9, "cui-mapping"),
+        map_player_10 = KeyBind.add("cui-map_player_10", KeyCode.num0, "cui-mapping"),
+
+        save_camera = KeyBind.add("cui-save_camera", KeyCode.unset, "cui-camera"),
+        move_camera = KeyBind.add("cui-move_camera", KeyCode.unset, "cui-camera"),
+        map_camera_1 = KeyBind.add("cui-map_camera_1", KeyCode.unset, "cui-camera"),
+        map_camera_2 = KeyBind.add("cui-map_camera_2", KeyCode.unset, "cui-camera"),
+        map_camera_3 = KeyBind.add("cui-map_camera_3", KeyCode.unset, "cui-camera"),
+        map_camera_4 = KeyBind.add("cui-map_camera_4", KeyCode.unset, "cui-camera"),
+        map_camera_5 = KeyBind.add("cui-map_camera_5", KeyCode.unset, "cui-camera"),
+        map_camera_6 = KeyBind.add("cui-map_camera_6", KeyCode.unset, "cui-camera"),
+        map_camera_7 = KeyBind.add("cui-map_camera_7", KeyCode.unset, "cui-camera"),
+        map_camera_8 = KeyBind.add("cui-map_camera_8", KeyCode.unset, "cui-camera"),
+        map_camera_9 = KeyBind.add("cui-map_camera_9", KeyCode.unset, "cui-camera"),
+        map_camera_10 = KeyBind.add("cui-map_camera_10", KeyCode.unset, "cui-camera")
     ;
 
+    public static void init(){}
 
-    private final KeyBinds.KeybindValue defaultValue;
-    private final String category;
-
-    CuiBinding(KeyBinds.KeybindValue defaultValue, String category) {
-        this.defaultValue = defaultValue;
-        this.category = category;
-    }
-
-    CuiBinding(KeyBinds.KeybindValue defaultValue) {
-        this(defaultValue, null);
-    }
-
-    @Override
-    public KeyBinds.KeybindValue defaultValue(InputDevice.DeviceType type) {
-        return defaultValue;
-    }
-
-    @Override
-    public String category() {
-        return category;
+    public static boolean isUnSet(KeyBind e) {
+        return e.value == null || e.value.key == KeyCode.anyKey || e.value.key == KeyCode.unknown;
     }
-
-
 }