Merge pull request #241 from MrTroble/feats/1.16

Feats/1.16
MrTroble · Aug 13, 2024 · 27f52ea · 27f52ea
2 parents 7334f7e + d6dd918
commit 27f52ea
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 15 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -30,7 +30,7 @@ jobs:
     if: endswith(github.ref_name, 'master') && github.ref_protected && github.ref_type == 'branch'
     runs-on: ubuntu-latest
     env:
-      APPVEYOR_BUILD_VERSION: '3.6.0'
+      APPVEYOR_BUILD_VERSION: '3.6.1'
       CURSETOKEN: ${{ secrets.CURSETOKEN }}
     steps:
     - uses: actions/checkout@v3

diff --git a/build.gradle b/build.gradle
@@ -43,7 +43,7 @@ curseforge {
   project {
     id = '440990'
     changelog = file('changelog.md')
-    releaseType = 'beta'
+    releaseType = 'release'
     changelogType = 'markdown'
     addGameVersion '1.16.5'
   }

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.16.5 - 3.6.1]
+* fix: issues with InterSignalBoxPathways
+* fix: issue with Zs3V in HV
+
 ## [1.16.5 - 3.6.0]
 
 * feat: added black dots mast sign

diff --git a/src/main/java/com/troblecodings/signals/enums/PathwayRequestResult.java b/src/main/java/com/troblecodings/signals/enums/PathwayRequestResult.java
@@ -34,8 +34,7 @@ public PathwayData getPathwayData() {
     }
 
     public boolean canBeAddedToSaver() {
-        return this == ALREADY_USED || this == NO_PATH
-                || !(data != null && !data.isInterSignalBoxPathway());
+        return this == ALREADY_USED || this == NO_PATH;
     }
 
     public boolean isPass() {

diff --git a/src/main/java/com/troblecodings/signals/signalbox/SignalBoxGrid.java b/src/main/java/com/troblecodings/signals/signalbox/SignalBoxGrid.java
@@ -311,6 +311,10 @@ public List<Map.Entry<Point, Point>> getNextPathways() {
     public boolean addNextPathway(final Point start, final Point end) {
         final Map.Entry<Point, Point> entry = Maps.immutableEntry(start, end);
         if (!nextPathways.contains(entry)) {
+            final SignalBoxPathway pw = startsToPath.get(start);
+            if (pw != null && pw.isInterSignalBoxPathway()) {
+                return false;
+            }
             if (executingForEach) {
                 toAdd.add(entry);
             } else {

diff --git a/src/main/java/com/troblecodings/signals/signalbox/SignalBoxPathway.java b/src/main/java/com/troblecodings/signals/signalbox/SignalBoxPathway.java
@@ -664,4 +664,8 @@ public boolean isShuntingPath() {
     public PathType getPathType() {
         return data.getPathType();
     }
+
+    public boolean isInterSignalBoxPathway() {
+        return this instanceof InterSignalBoxPathway;
+    }
 }
diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/hv_hv_config.json b/src/main/resources/assets/opensignals/signalconfigs/change/hv_hv_config.json
@@ -7,10 +7,6 @@
         "slow": "config(stopsignal.HP2) || config(hphome.HP2)"
     },
     "values": {
-        "map(stop)": ["distantsignal.VR0", "zs3v.OFF"],
-        "map(drive)": ["distantsignal.VR1"],
-        "map(slow)": ["distantsignal.VR2"],
-        "signalRepeater(true)": ["vrlight.true"],
 
         "(config(zs3.Z1) || config(zs3plate.Z1))": ["zs3v.Z1"],
         "(config(zs3.Z2) || config(zs3plate.Z2))": ["zs3v.Z2"],
@@ -28,6 +24,11 @@
         "(config(zs3.Z14) || config(zs3plate.Z14))": ["zs3v.Z14"],
         "(config(zs3.Z15) || config(zs3plate.Z15))": ["zs3v.Z15"],
 
+        "map(stop)": ["distantsignal.VR0", "zs3v.OFF"],
+        "map(drive)": ["distantsignal.VR1"],
+        "map(slow)": ["distantsignal.VR2"],
+        "signalRepeater(true)": ["vrlight.true"],
+
         "speed(<.1) || speed(>.15)": ["stopsignal.HP1", "hphome.HP1", "hpblock.HP1"],
         "speed(==.1)": ["zs3.Z1", "stopsignal.HP2", "hphome.HP2", "hpblock.HP1"],
         "speed(==.2)": ["zs3.Z2", "stopsignal.HP2", "hphome.HP2", "hpblock.HP1"],

diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/hv_ks_config.json b/src/main/resources/assets/opensignals/signalconfigs/change/hv_ks_config.json
@@ -6,9 +6,6 @@
         "drive": "config(kombisignal.KS1) || config(kombisignal_main.KS1) || config(kombisignal.KS1_BLINK) || config(kombisignal.KS1_BLINK_LIGHT) || config(kombisignal.KS2) || config(kombisignal.KS2_LIGHT)"
     },
     "values": {
-        "map(stop)": ["distantsignal.VR0", "zs3v.OFF"],
-        "map(drive)": ["distantsignal.VR1"],
-        "signalRepeater(true)": ["vrlight.true"],
 
         "(config(zs3.Z1) || config(zs3plate.Z1))": ["zs3v.Z1", "distantsignal.VR2"],
         "(config(zs3.Z2) || config(zs3plate.Z2))": ["zs3v.Z2", "distantsignal.VR2"],
@@ -26,6 +23,10 @@
         "(config(zs3.Z14) || config(zs3plate.Z14))": ["zs3v.Z14", "distantsignal.VR1"],
         "(config(zs3.Z15) || config(zs3plate.Z15))": ["zs3v.Z15", "distantsignal.VR1"],
 
+        "map(stop)": ["distantsignal.VR0", "zs3v.OFF"],
+        "map(drive)": ["distantsignal.VR1"],
+        "signalRepeater(true)": ["vrlight.true"],
+
         "speed(<.1) || speed(>.15)": ["stopsignal.HP1", "hphome.HP1", "hpblock.HP1"],
         "speed(==.1)": ["zs3.Z1", "stopsignal.HP2", "hphome.HP2", "hpblock.HP1"],
         "speed(==.2)": ["zs3.Z2", "stopsignal.HP2", "hphome.HP2", "hpblock.HP1"],

diff --git a/src/main/resources/assets/opensignals/signalconfigs/change/hv_sema.json b/src/main/resources/assets/opensignals/signalconfigs/change/hv_sema.json
@@ -7,10 +7,6 @@
         "slow": "config(wing1.TRUE) && config(wing2.TRUE)"
     },
     "values": {
-        "map(stop)": ["distantsignal.VR0", "zs3v.OFF"],
-        "map(drive)": ["distantsignal.VR1"],
-        "map(slow)": ["distantsignal.VR2"],
-        "signalRepeater(true)": ["vrlight.true"],
 
         "(config(zs3.Z1) || config(zs3plate.Z1))": ["zs3v.Z1"],
         "(config(zs3.Z2) || config(zs3plate.Z2))": ["zs3v.Z2"],
@@ -28,6 +24,11 @@
         "(config(zs3.Z14) || config(zs3plate.Z14))": ["zs3v.Z14"],
         "(config(zs3.Z15) || config(zs3plate.Z15))": ["zs3v.Z15"],
 
+        "map(stop)": ["distantsignal.VR0", "zs3v.OFF"],
+        "map(drive)": ["distantsignal.VR1"],
+        "map(slow)": ["distantsignal.VR2"],
+        "signalRepeater(true)": ["vrlight.true"],
+
         "speed(<.1) || speed(>.15)": ["stopsignal.HP1", "hphome.HP1", "hpblock.HP1"],
         "speed(==.1)": ["zs3.Z1", "stopsignal.HP2", "hphome.HP2", "hpblock.HP1"],
         "speed(==.2)": ["zs3.Z2", "stopsignal.HP2", "hphome.HP2", "hpblock.HP1"],