fix: fix 50 50 branch cords

Zadudoder · Zadudoder · commit 022ae01fe4da · 2025-06-25T02:44:05.000+03:00
diff --git a/src/main/java/zadudoder/spmhelper/mixin/GameHudMixin.java b/src/main/java/zadudoder/spmhelper/mixin/GameHudMixin.java
@@ -49,17 +49,14 @@ public void render(DrawContext context, RenderTickCounter tickCounter, CallbackI
             int screenHeight = client.getWindow().getScaledHeight();
 
             if(branchCoords.branch == HubBranch.HUB) {
-                // Для HUB
                 int X = (int) (screenWidth * (SPmHelperConfig.get().SPmNavX / 100.0) - textRenderer.getWidth(branchName) / 2);
                 int Y = (int) (screenHeight * (SPmHelperConfig.get().SPmNavY / 100.0));
                 X = Math.max(0, Math.min(X, screenWidth - textRenderer.getWidth(branchName) - 4));
                 Y = Math.max(0, Math.min(Y, screenHeight - 10));
 
-                // Сначала фон, потом текст
                 context.fill(X - 4, Y - 4, X + textRenderer.getWidth(branchName) + 4, Y + textRenderer.fontHeight + 2, 0x60000000);
                 context.drawTextWithShadow(textRenderer, branchName, X, Y, 0xFFFFFF);
             } else {
-                // Для других веток
                 Text fullText = branchName.copy().append(Text.literal(" | " + branchCoords.pos));
                 int X = (int) (screenWidth * (SPmHelperConfig.get().SPmNavX / 100.0) - textRenderer.getWidth(fullText) / 2);
                 int Y = (int) (screenHeight * (SPmHelperConfig.get().SPmNavY / 100.0));
diff --git a/src/main/java/zadudoder/spmhelper/utils/Misc.java b/src/main/java/zadudoder/spmhelper/utils/Misc.java
@@ -17,27 +17,40 @@ public static boolean isNumeric(String str) {
         }
     }
 
-    public static BranchCoords getBranch(BlockPos blockPos){
-        BranchCoords branchCoords = new BranchCoords();
-        int absX = Math.abs(blockPos.getX());
-        int absZ = Math.abs(blockPos.getZ());
-        if(blockPos.getZ()<-40 && absZ>absX){
-            branchCoords.branch = HubBranch.RED;
-            branchCoords.pos = absZ;
-        } else
-        if(blockPos.getX()<-40 && absX>absZ){
-            branchCoords.branch = HubBranch.BLUE;
-            branchCoords.pos = absX;
-        } else
-        if(blockPos.getX()>40 && absX>absZ){
-            branchCoords.branch = HubBranch.GREEN;
-            branchCoords.pos = absX;
-        } else
-        if(blockPos.getZ()>40 && absZ>absX){
-            branchCoords.branch = HubBranch.YELLOW;
-            branchCoords.pos = absZ;
+    public static BranchCoords getBranch(BlockPos blockPos) {
+        int x = blockPos.getX();
+        int z = blockPos.getZ();
+        int absX = Math.abs(x);
+        int absZ = Math.abs(z);
+
+        final int BRANCH_BORDER = 40;
+        if (absX <= BRANCH_BORDER && absZ <= BRANCH_BORDER) {
+            return new BranchCoords(HubBranch.HUB, 0);
+        }
+        boolean onDiagonal = (x == z) || (x == -z);
+
+        if (onDiagonal && absX > BRANCH_BORDER) {
+            if (x < -BRANCH_BORDER && z < -BRANCH_BORDER) {
+                return new BranchCoords(HubBranch.PURPLE, absX); // Красная+Синяя
+            } else if (x > BRANCH_BORDER && z < -BRANCH_BORDER) {
+                return new BranchCoords(HubBranch.ORANGE, absX); // Красная+Зелёная
+            } else if (x > BRANCH_BORDER && z > BRANCH_BORDER) {
+                return new BranchCoords(HubBranch.LIME, absX); // Жёлтая+Зелёная
+            } else if (x < -BRANCH_BORDER && z > BRANCH_BORDER) {
+                return new BranchCoords(HubBranch.CYAN, absX); // Жёлтая+Синяя
+            }
         }
-        return branchCoords;
+        if (z < -BRANCH_BORDER && absZ >= absX) {
+            return new BranchCoords(HubBranch.RED, absZ);
+        } else if (x < -BRANCH_BORDER && absX >= absZ) {
+            return new BranchCoords(HubBranch.BLUE, absX);
+        } else if (x > BRANCH_BORDER && absX >= absZ) {
+            return new BranchCoords(HubBranch.GREEN, absX);
+        } else if (z > BRANCH_BORDER && absZ >= absX) {
+            return new BranchCoords(HubBranch.YELLOW, absZ);
+        }
+
+        return new BranchCoords(HubBranch.HUB, 0);
     }
 }
 
diff --git a/src/main/java/zadudoder/spmhelper/utils/types/BranchCoords.java b/src/main/java/zadudoder/spmhelper/utils/types/BranchCoords.java
@@ -20,6 +20,10 @@ public int getBranchColor(){
             case BLUE -> color = 0x3232FF;
             case GREEN -> color = 0x32FF32;
             case YELLOW -> color = 0xFFFF32;
+            case PURPLE -> color = 0xA000FF;     // Фиолетовый
+            case ORANGE -> color = 0xFFAA32;     // Оранжевый
+            case LIME -> color = 0xAAFF32;     // Лаймовый
+            case CYAN -> color = 0x32FFFF;     // Голубой
         }
         return color;
     }
diff --git a/src/main/java/zadudoder/spmhelper/utils/types/HubBranch.java b/src/main/java/zadudoder/spmhelper/utils/types/HubBranch.java
@@ -5,5 +5,9 @@ public enum HubBranch {
     BLUE,
     GREEN,
     YELLOW,
+    PURPLE,    // Фиолетовая (Красная + Синяя)
+    ORANGE,    // Оранжевая (Красная + Зелёная)
+    LIME,      // Лаймовая (Жёлтая + Зелёная)
+    CYAN,      // Циановая (Жёлтая + Синяя)
     HUB
 }
diff --git a/src/main/resources/assets/spmhelper/lang/en_us.json b/src/main/resources/assets/spmhelper/lang/en_us.json
@@ -9,7 +9,7 @@
   "text.spmhelper.config.category": "Mod settings",
 
   "text.spmhelper.option.enableMenuButton": "Enable SPmHelper button in main menu: ",
-  "text.spmhelper.option.enableSPmHelperNav" : "Enable SPmNav",
+  "text.spmhelper.option.enableSPmHelperNav" : "Enable SPmHelperNav",
   "text.spmhelper.option.defaultScreen": "Select which screen the button will lead to: ",
   "text.spmhelper.option.numberOfCardInComment": "Show the card number in comments?",
   "text.spmhelper.option.SPmHelperNavX": "SPmHelperNav X-axis position (width):",
@@ -134,5 +134,9 @@
   "text.spmhelper.branch_name.blue": "Blue",
   "text.spmhelper.branch_name.green": "Green",
   "text.spmhelper.branch_name.yellow": "Yellow",
+  "text.spmhelper.branch_name.purple": "Purple",
+  "text.spmhelper.branch_name.orange": "Orange",
+  "text.spmhelper.branch_name.lime": "Lime",
+  "text.spmhelper.branch_name.cyan": "Cyan",
   "text.spmhelper.branch_name.hub": "Hub"
 }
diff --git a/src/main/resources/assets/spmhelper/lang/ru_ru.json b/src/main/resources/assets/spmhelper/lang/ru_ru.json
@@ -9,7 +9,7 @@
   "text.spmhelper.config.category": "Настройки мода",
 
   "text.spmhelper.option.enableMenuButton": "Включить кнопку SPmHelper в основном меню: ",
-  "text.spmhelper.option.enableSPmHelperNav": "Включить SPmNav",
+  "text.spmhelper.option.enableSPmHelperNav": "Включить SPmHelperNav",
   "text.spmhelper.option.defaultScreen": "На какой экран будет вести эта кнопка: ",
   "text.spmhelper.option.numberOfCardInComment": "Указывать номер карты куда вы переводите в комментарии?",
   "text.spmhelper.option.SPmHelperNavX": "Расположение SPmHelperNav по оси Х (ширина):",
@@ -132,5 +132,9 @@
   "text.spmhelper.branch_name.blue": "Синяя",
   "text.spmhelper.branch_name.green": "Зелёная",
   "text.spmhelper.branch_name.yellow": "Жёлтая",
+  "text.spmhelper.branch_name.purple": "Фиолетовая",
+  "text.spmhelper.branch_name.orange": "Оранжевая",
+  "text.spmhelper.branch_name.lime": "Лаймовая",
+  "text.spmhelper.branch_name.cyan": "Голубая",
   "text.spmhelper.branch_name.hub": "Хаб"
 }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,10 @@ public int getBranchColor(){`
`20`	`20`	`case BLUE -> color = 0x3232FF;`
`21`	`21`	`case GREEN -> color = 0x32FF32;`
`22`	`22`	`case YELLOW -> color = 0xFFFF32;`
	`23`	`+ case PURPLE -> color = 0xA000FF; // Фиолетовый`
	`24`	`+ case ORANGE -> color = 0xFFAA32; // Оранжевый`
	`25`	`+ case LIME -> color = 0xAAFF32; // Лаймовый`
	`26`	`+ case CYAN -> color = 0x32FFFF; // Голубой`
`23`	`27`	`}`
`24`	`28`	`return color;`
`25`	`29`	`}`