fixup! ARC merged

clean
TinyLake · Jun 5, 2024 · a6aa79c · a6aa79c
1 parent 19a4f83
commit a6aa79c
Show file tree

Hide file tree

Showing 25 changed files with 138 additions and 177 deletions.
diff --git a/core/src/mindustry/arcModule/RFuncs.java b/core/src/mindustry/arcModule/RFuncs.java
@@ -8,6 +8,7 @@
 import arc.util.*;
 import mindustry.*;
 import mindustry.content.*;
+import mindustry.ctype.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.ui.*;
@@ -21,11 +22,7 @@
 import static mindustry.arcModule.ARCVars.arcui;
 
 public class RFuncs{
-    static final int msgSeperator = 145;
-
-    public interface Stringf<T>{
-        String get(T i);
-    }
+    private static final int msgSeperator = 145;
 
     public static void sendChatMsg(String msg){
         for(int i = 0; i < msg.length() / (float)msgSeperator; i++){
@@ -35,18 +32,18 @@ public static void sendChatMsg(String msg){
 
     public static void colorizeContent(){
         if(!Core.settings.getBool("colorizedContent")) return;
-        content.items().each(c -> c.localizedName = colorized(c.color, c.localizedName));
-        content.liquids().each(c -> c.localizedName = colorized(c.color, c.localizedName));
-        content.statusEffects().each(c -> c.localizedName = colorized(c.color, c.localizedName));
-        content.planets().each(c -> c.localizedName = colorized(c.atmosphereColor, c.localizedName));
+        content.items().each(c -> colorizeContent(c, c.color));
+        content.liquids().each(c -> colorizeContent(c, c.color));
+        content.statusEffects().each(c -> colorizeContent(c, c.color));
+        content.planets().each(c -> colorizeContent(c, c.atmosphereColor));
         content.blocks().each(c -> {
-            if(c.hasColor) c.localizedName = colorized(blockColor(c), c.localizedName);
-            else if(c.itemDrop != null) c.localizedName = colorized(c.itemDrop.color, c.localizedName);
+            if(c.hasColor) colorizeContent(c, blockColor(c));
+            else if(c.itemDrop != null) colorizeContent(c, c.itemDrop.color);
         });
     }
 
-    private static String colorized(Color color, String name){
-        return "[#" + color + "]" + name + "[]";
+    private static void colorizeContent(UnlockableContent c, Color color){
+        c.localizedName = "[#" + color + "]" + c.localizedName + "[]";
     }
 
     private static Color blockColor(Block block){
@@ -70,8 +67,8 @@ private static Color blockColor(Block block){
         return bestColor;
     }
 
-    public static String arcShareWaveInfo(int waves){
-        if(!state.rules.waves) return " ";
+    public static void shareWaveInfo(int waves){
+        if(!state.rules.waves) return;
         StringBuilder builder = new StringBuilder(getPrefix("orange", "Wave"));
         builder.append("标记了第").append(waves).append("波");
         if(waves < state.wave){
@@ -85,7 +82,7 @@ public static String arcShareWaveInfo(int waves){
         }
 
         builder.append(arcWaveInfo(waves));
-        return builder.toString();
+        sendChatMsg(builder.toString());
     }
 
     public static String calWaveTimer(){
@@ -180,10 +177,6 @@ public static String fixedTime(int timer){
         return fixedTime(timer, true);
     }
 
-    public static StringBuilder getPrefix(Color color, String type){
-        return getPrefix("#" + color, type);
-    }
-
     public static StringBuilder getPrefix(String color, String type){
         StringBuilder prefix = new StringBuilder();
         if(ui.chatfrag.mode == ChatFragment.ChatMode.team) prefix.append("/t ");

diff --git a/core/src/mindustry/arcModule/draw/ARCUnits.java b/core/src/mindustry/arcModule/draw/ARCUnits.java
@@ -15,8 +15,6 @@
 import mindustryX.features.*;
 
 import static mindustry.Vars.*;
-import static mindustry.arcModule.ARCVars.maxBuildPlans;
-import static mindustry.arcModule.DrawUtilities.drawNSideRegion;
 
 public class ARCUnits{
     private static boolean alwaysShowPlayerUnit, alwaysShowUnitRTSAi, unitHealthBar, unitLogicMoveLine, unitLogicTimerBars, unithitbox, unitBuildPlan;
@@ -264,7 +262,7 @@ private static void drawBuildPlan(Unit unit){
                 for(BuildPlan b : unit.plans()){
                     unit.drawPlan(b, 0.5f);
                     counter += 1;
-                    if(counter >= maxBuildPlans) break;
+                    if(counter >= ARCVars.maxBuildPlans) break;
                 }
             }
             counter = 0;
@@ -280,7 +278,7 @@ private static void drawBuildPlan(Unit unit){
                 y = b.drawy();
                 s = b.block.size * 2f;
                 counter += 1;
-                if(counter >= maxBuildPlans) break;
+                if(counter >= ARCVars.maxBuildPlans) break;
             }
 
             counter = 0;
@@ -299,7 +297,7 @@ private static void drawBuildPlan(Unit unit){
                 y = b.drawy();
                 s = b.block.size * 2f;
                 counter += 1;
-                if(counter >= maxBuildPlans) break;
+                if(counter >= ARCVars.maxBuildPlans) break;
             }
             Draw.reset();
         }
@@ -317,9 +315,9 @@ private static void detailBuildMode(){
         if(!arcBuildInfo) return;
         if(control.input.droppingItem){
             Color color = player.within(Core.input.mouseWorld(control.input.getMouseX(), control.input.getMouseY()), itemTransferRange) ? Color.gold : Color.red;
-            drawNSideRegion(player.unit().x, player.unit().y, 3, player.unit().type.buildRange, player.unit().rotation, color, 0.25f, player.unit().stack.item.uiIcon, false);
+            DrawUtilities.drawNSideRegion(player.unit().x, player.unit().y, 3, player.unit().type.buildRange, player.unit().rotation, color, 0.25f, player.unit().stack.item.uiIcon, false);
         }else if(control.input.isBuilding || control.input.selectedBlock() || !player.unit().plans().isEmpty()){
-            drawNSideRegion(player.unit().x, player.unit().y, 3, player.unit().type.buildRange, player.unit().rotation, Pal.heal, 0.25f, Icon.wrench.getRegion(), true);
+            DrawUtilities.drawNSideRegion(player.unit().x, player.unit().y, 3, player.unit().type.buildRange, player.unit().rotation, Pal.heal, 0.25f, Icon.wrench.getRegion(), true);
         }
     }
 }
diff --git a/core/src/mindustry/arcModule/toolpack/arcChatPicture.java b/core/src/mindustry/arcModule/toolpack/arcChatPicture.java
@@ -17,7 +17,6 @@
 
 import static mindustry.Vars.*;
 import static mindustry.arcModule.ARCVars.arcui;
-import static mindustry.arcModule.RFuncs.getPrefix;
 
 public class arcChatPicture{
 
@@ -81,7 +80,7 @@ public static void arcSharePicture(){
             figureLink = t.field("在此输入图片网址api", text -> {
             }).width(400f).get();
             t.button("♐", () -> {
-                Call.sendChatMessage(getPrefix("yellow", "Picture").append(figureLink.getText()).toString().replace(" ", ""));
+                Call.sendChatMessage(RFuncs.getPrefix("yellow", "Picture").append(figureLink.getText()).toString().replace(" ", ""));
                 figureLink.clear();
             }).disabled(disable -> !figureLink.getText().startsWith("http"));
             t.row();

diff --git a/core/src/mindustry/arcModule/toolpack/arcScanner.java b/core/src/mindustry/arcModule/toolpack/arcScanner.java
@@ -7,6 +7,7 @@
 import arc.scene.event.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
+import mindustry.arcModule.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
@@ -17,7 +18,6 @@
 import mindustryX.features.*;
 
 import static mindustry.Vars.*;
-import static mindustry.arcModule.DrawUtilities.drawText;
 
 public class arcScanner{
 
@@ -121,9 +121,9 @@ public static void drawScanner(){
             Lines.stroke(expandRate * 0.75f);
             Lines.circle(player.x, player.y, (radarCir * i * tilesize) / rRatio);
             float cirRatio = (radarCir * i * tilesize) / rRatio + 2f;
-            drawText(i * (int)radarCir + "", 0.2f / Scl.scl(1f) * expandRate, player.x, player.y + cirRatio, Pal.accent, Align.center);
-            drawText(i * (int)radarCir + "", 0.2f / Scl.scl(1f) * expandRate, player.x + cirRatio * Mathf.cos(Mathf.PI * 7 / 6), player.y + cirRatio * Mathf.sin(Mathf.PI * 7 / 6), Pal.accent, Align.center);
-            drawText(i * (int)radarCir + "", 0.2f / Scl.scl(1f) * expandRate, player.x + cirRatio * Mathf.cos(Mathf.PI * 11 / 6), player.y + cirRatio * Mathf.sin(Mathf.PI * 11 / 6), Pal.accent, Align.center);
+            DrawUtilities.drawText(i * (int)radarCir + "", 0.2f / Scl.scl(1f) * expandRate, player.x, player.y + cirRatio, Pal.accent, Align.center);
+            DrawUtilities.drawText(i * (int)radarCir + "", 0.2f / Scl.scl(1f) * expandRate, player.x + cirRatio * Mathf.cos(Mathf.PI * 7 / 6), player.y + cirRatio * Mathf.sin(Mathf.PI * 7 / 6), Pal.accent, Align.center);
+            DrawUtilities.drawText(i * (int)radarCir + "", 0.2f / Scl.scl(1f) * expandRate, player.x + cirRatio * Mathf.cos(Mathf.PI * 11 / 6), player.y + cirRatio * Mathf.sin(Mathf.PI * 11 / 6), Pal.accent, Align.center);
         }
 
         if(scanRate < 1f){

diff --git a/core/src/mindustry/arcModule/toolpack/arcWaveSpawner.java b/core/src/mindustry/arcModule/toolpack/arcWaveSpawner.java
@@ -8,14 +8,14 @@
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.arcModule.*;
 import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.game.*;
 import mindustry.world.*;
 import mindustryX.features.ui.*;
 
 import static mindustry.Vars.*;
-import static mindustry.arcModule.DrawUtilities.arcDashCircling;
 
 public class arcWaveSpawner{
 
@@ -51,7 +51,7 @@ public static void drawSpawner(){
             if(Core.settings.getBool("alwaysshowdropzone")){
                 Draw.alpha(0.8f);
                 for(Tile tile : spawner.getSpawns()){
-                    arcDashCircling(tile.worldx(), tile.worldy(), state.rules.dropZoneRadius, -flyerSpawnerRadius / state.rules.dropZoneRadius * 0.1f);
+                    DrawUtilities.arcDashCircling(tile.worldx(), tile.worldy(), state.rules.dropZoneRadius, -flyerSpawnerRadius / state.rules.dropZoneRadius * 0.1f);
                 }
             }else{
                 for(Tile tile : spawner.getSpawns()){
@@ -73,7 +73,7 @@ public static void drawSpawner(){
                     }
                     Draw.color(Color.gray, Color.lightGray, Mathf.absin(Time.time, 8f, 1f));
                     Draw.alpha(0.8f);
-                    arcDashCircling(spawnX, spawnY, flyerSpawnerRadius, 0.1f);
+                    DrawUtilities.arcDashCircling(spawnX, spawnY, flyerSpawnerRadius, 0.1f);
 
                     Draw.color();
                     Draw.alpha(0.5f);

diff --git a/core/src/mindustry/arcModule/ui/ArcWaveInfoDialog.java b/core/src/mindustry/arcModule/ui/ArcWaveInfoDialog.java
@@ -12,6 +12,7 @@
 import arc.struct.*;
 import arc.util.*;
 import mindustry.ai.types.*;
+import mindustry.arcModule.*;
 import mindustry.arcModule.toolpack.*;
 import mindustry.content.*;
 import mindustry.core.*;
@@ -28,7 +29,6 @@
 import java.util.*;
 
 import static mindustry.Vars.*;
-import static mindustry.arcModule.RFuncs.*;
 import static mindustry.arcModule.toolpack.arcWaveSpawner.calWinWave;
 import static mindustry.game.SpawnGroup.never;
 import static mindustry.ui.Styles.*;
@@ -333,13 +333,13 @@ void setup(){
                                 tt.row();
                                 float firstWaveTime = state.rules.initialWaveSpacing <= 0 ? (2 * state.rules.waveSpacing) : state.rules.initialWaveSpacing;
                                 int thisTime = (int)(finalWave * state.rules.waveSpacing + firstWaveTime);
-                                tt.add(fixedTime(thisTime, false)).row();
+                                tt.add(RFuncs.fixedTime(thisTime, false)).row();
                                 Label waveTime = tt.add("").get();
                                 tt.update(() -> {
                                     if(!state.isGame()) waveTime.setText("");
                                     else{
                                         int deltaTime = thisTime - (int)(state.wave <= 1 ? (firstWaveTime - state.wavetime) : (firstWaveTime + state.rules.waveSpacing * (state.wave - 1) - state.wavetime));
-                                        waveTime.setText(arcColorTime(deltaTime, false));
+                                        waveTime.setText(RFuncs.arcColorTime(deltaTime, false));
                                     }
                                 });
                             }).width(120f).left();

diff --git a/core/src/mindustry/arcModule/ui/PowerInfo.java b/core/src/mindustry/arcModule/ui/PowerInfo.java
@@ -60,8 +60,9 @@ public float getSatisfaction(){
     public static void update(){
         info.clear();
         Groups.powerGraph.each(item -> {
-            if(item.graph().team == Vars.player.team())
-                info.add(item.graph().getPowerBalance(), item.graph().getLastPowerStored(), item.graph().getLastCapacity(), item.graph().getLastPowerProduced(), item.graph().getLastPowerNeeded());
+            var graph = item.graph();
+            if(graph.all.isEmpty() || graph.all.first().team != Vars.player.team()) return;
+            info.add(item.graph().getPowerBalance(), item.graph().getLastPowerStored(), item.graph().getLastCapacity(), item.graph().getLastPowerProduced(), item.graph().getLastPowerNeeded());
         });
     }
 

diff --git a/core/src/mindustry/arcModule/ui/RStyles.java b/core/src/mindustry/arcModule/ui/RStyles.java
@@ -11,12 +11,9 @@
 import static mindustry.ui.Styles.*;
 
 public class RStyles{
-    public static TextureRegionDrawable whiteuir;
     public static Drawable black1;
 
     public static TextButtonStyle
-    logicButton,
-    flatt,
     clearLineNonet,
     clearLineNoneTogglet;
 
@@ -27,28 +24,15 @@ public class RStyles{
     clearLineNoneTogglei;
 
     public static void load(){
-        whiteuir = (TextureRegionDrawable)Tex.whiteui;
+        var whiteuir = (TextureRegionDrawable)Tex.whiteui;
 
         black1 = whiteuir.tint(0f, 0f, 0f, 0.1f);
 
-        logicButton = new TextButtonStyle(){{
-            up = none;
-            over = flatOver;
-            font = Fonts.outline;
-            fontColor = Color.white;
-        }};
-
-        flatt = new TextButtonStyle(){{
+        clearLineNonet = new TextButtonStyle(){{
             font = Fonts.def;
             fontColor = Color.white;
-            down = flatOver;
-            up = black;
-            over = flatOver;
             disabled = black;
             disabledFontColor = Color.gray;
-        }};
-
-        clearLineNonet = new TextButtonStyle(flatt){{
             up = none;
             over = accentDrawable;
             down = underlineWhite;

diff --git a/core/src/mindustry/arcModule/ui/dialogs/MessageDialog.java b/core/src/mindustry/arcModule/ui/dialogs/MessageDialog.java
@@ -7,14 +7,11 @@
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
-import mindustry.*;
 import mindustry.arcModule.*;
 import mindustry.arcModule.toolpack.*;
-import mindustry.arcModule.ui.*;
 import mindustry.core.*;
 import mindustry.game.*;
 import mindustry.gen.*;
-import mindustry.input.*;
 import mindustry.ui.*;
 import mindustry.ui.dialogs.*;
 import mindustry.world.blocks.storage.*;
@@ -25,7 +22,6 @@
 
 import static mindustry.Vars.*;
 import static mindustry.arcModule.ARCVars.arcui;
-import static mindustry.ui.Styles.*;
 
 public class MessageDialog extends BaseDialog{
 
@@ -101,7 +97,7 @@ void build(){
                     tt.add(formatTime(thisMsg.time)).style(Styles.outlineLabel).color(thisMsg.msgType.color).left().padLeft(20f).width(100f);
 
                     if(thisMsg.msgLoc.x != -1){
-                        tt.button("♐： " + (int)(thisMsg.msgLoc.x / tilesize) + "," + (int)(thisMsg.msgLoc.y / tilesize), RStyles.logicButton, () -> {
+                        tt.button("♐： " + (int)(thisMsg.msgLoc.x / tilesize) + "," + (int)(thisMsg.msgLoc.y / tilesize), Styles.logict, () -> {
                             control.input.panCamera(thisMsg.msgLoc);
                             MarkerType.mark.at(Tmp.v1.scl(thisMsg.msgLoc.x, thisMsg.msgLoc.y)).color = color;
                             hide();
@@ -128,7 +124,7 @@ void build(){
                     tt.left();
                     tt.marginLeft(4);
                     tt.setColor(thisMsg.msgType.color);
-                    if(fieldMode) tt.field(thisMsg.message, nodeArea, text -> {
+                    if(fieldMode) tt.field(thisMsg.message, Styles.nodeArea, text -> {
                     }).growX();
                     else tt.labelWrap(getPlayerMsg(thisMsg)).growX();
                 }).pad(4).padTop(2).growX().grow();
@@ -176,10 +172,10 @@ private void arcMsgSettingTable(){
             t.add("调整显示的信息").height(50f);
             t.row();
             t.table(tt -> {
-                tt.button("关闭全部", cleart, () -> {
+                tt.button("关闭全部", Styles.cleart, () -> {
                     for(arcMsgType type : arcMsgType.values()) type.show = false;
                 }).width(200f).height(50f);
-                tt.button("默认", cleart, () -> {
+                tt.button("默认", Styles.cleart, () -> {
                     for(arcMsgType type : arcMsgType.values()) type.show = true;
                     arcMsgType.serverTips.show = false;
                 }).width(200f).height(50f);