Merge pull request #141 from MrTroble/fix/signals-and-signs

fix: lang keys and wn models
MrTroble · Oct 19, 2022 · 21dc60e · 21dc60e
2 parents fe20c75 + 31c52ef
commit 21dc60e
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 9 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [Fix]
+* fix: missing language keys
+* fix: mechanical wn signal models
+
 ## [Update]
 
 * feat: added bue east signal

diff --git a/src/main/java/eu/gir/girsignals/blocks/SwitchHandle.java b/src/main/java/eu/gir/girsignals/blocks/SwitchHandle.java
@@ -74,4 +74,4 @@ public int getWeakPower(final IBlockState blockState, final IBlockAccess blockAc
     public boolean canProvidePower(final IBlockState state) {
         return true;
     }
-}
+}
diff --git a/src/main/resources/assets/girsignals/lang/de_de.lang b/src/main/resources/assets/girsignals/lang/de_de.lang
@@ -37,7 +37,7 @@ tile.andreascross.name=Andreaskreuz
 tile.tssignal.name=Ts Signal
 tile.etcssignal.name=ETCS Signal
 tile.rosignal.name=Ro Signal
-tile.tramsignssignal.name=Tram Signale
+tile.tramsignsignal.name=Tram Signale
 tile.railroadgate.name=Schranken
 tile.switchhandle.name=Weichenhebel/ Wn Signal
 

diff --git a/src/main/resources/assets/girsignals/lang/en_us.lang b/src/main/resources/assets/girsignals/lang/en_us.lang
@@ -37,7 +37,7 @@ tile.andreascross.name=Andreascross
 tile.tssignal.name=Ts Signal
 tile.etcssignal.name=ETCS Signal
 tile.rosignal.name=Ro Signal
-tile.tramsignssignal.name=Tram Signal
+tile.tramsignsignal.name=Tram Signal
 tile.railroadgate.name=Railroad Gates
 tile.switchhandle.name=Switch Handle/ Wn Signal
 

diff --git a/src/main/resources/assets/girsignals/modeldefinitions/switchhandle.json b/src/main/resources/assets/girsignals/modeldefinitions/switchhandle.json
@@ -696,10 +696,24 @@
         "wn/wn2_mech": {
             "textures": [
                 {
-                    "blockstate": "hasandisnot(SWITCHSIDE) && hasandisnot(MANUAL) && with(WN_MECH.WN2)"
+                    "blockstate": "hasandisnot(SWITCHSIDE) && hasandisnot(SWITCHPLACESIDE) && hasandisnot(MANUAL) && with(WN_MECH.WN2)"
                 },
                 {
-                    "blockstate": "hasandis(SWITCHSIDE) && hasandisnot(MANUAL) && with(WN_MECH.WN2)",
+                    "blockstate": "hasandis(SWITCHSIDE) && hasandisnot(SWITCHPLACESIDE) && hasandisnot(MANUAL) && with(WN_MECH.WN2)",
+                    "retexture": {
+                        "5": "wn2_2"
+                    }
+                }
+            ],
+            "y": 0
+        },
+        "wn/wn2_mech_right": {
+            "textures": [
+                {
+                    "blockstate": "hasandisnot(SWITCHSIDE) && hasandis(SWITCHPLACESIDE) && hasandisnot(MANUAL) && with(WN_MECH.WN2)"
+                },
+                {
+                    "blockstate": "hasandis(SWITCHSIDE) && hasandis(SWITCHPLACESIDE) && hasandisnot(MANUAL) && with(WN_MECH.WN2)",
                     "retexture": {
                         "5": "wn2_2"
                     }
@@ -710,10 +724,24 @@
         "wn/wn1_mech": {
             "textures": [
                 {
-                    "blockstate": "hasandisnot(SWITCHSIDE) && hasandisnot(MANUAL) && with(WN_MECH.WN1)"
+                    "blockstate": "hasandisnot(SWITCHSIDE) && hasandisnot(SWITCHPLACESIDE) && hasandisnot(MANUAL) && with(WN_MECH.WN1)"
+                },
+                {
+                    "blockstate": "hasandis(SWITCHSIDE) && hasandisnot(SWITCHPLACESIDE) && hasandisnot(MANUAL) && with(WN_MECH.WN1)",
+                    "retexture": {
+                        "5": "wn2_2"
+                    }
+                }
+            ],
+            "y": 0
+        },
+        "wn/wn1_mech_right": {
+            "textures": [
+                {
+                    "blockstate": "hasandisnot(SWITCHSIDE) && hasandis(SWITCHPLACESIDE) && hasandisnot(MANUAL) && with(WN_MECH.WN1)"
                 },
                 {
-                    "blockstate": "hasandis(SWITCHSIDE) && hasandisnot(MANUAL) && with(WN_MECH.WN1)",
+                    "blockstate": "hasandis(SWITCHSIDE) && hasandis(SWITCHPLACESIDE) && hasandisnot(MANUAL) && with(WN_MECH.WN1)",
                     "retexture": {
                         "5": "wn2_2"
                     }

diff --git a/src/main/resources/assets/girsignals/models/block/wn/wn1_mech.json b/src/main/resources/assets/girsignals/models/block/wn/wn1_mech.json
@@ -1 +1 @@
-{"credit": "Made with Blockbench by Mc_Jeronimo", "textures": {"0": "girsignals:blocks/default/shield_black", "1": "girsignals:blocks/default/black", "3": "girsignals:blocks/default/shield_gray", "4": "girsignals:blocks/wn/wn1", "5": "girsignals:blocks/wn/wn2_1", "6": "girsignals:blocks/wn/wn2_3", "particle": "girsignals:blocks/default/shield_black"}, "elements": [{"from": [6.5, 0, 6], "to": [9.5, 2, 9], "faces": {"north": {"uv": [0, 0, 3, 2], "texture": "#3"}, "east": {"uv": [0, 0, 3, 2], "texture": "#3"}, "south": {"uv": [0, 0, 3, 2], "texture": "#3"}, "west": {"uv": [0, 0, 3, 2], "texture": "#3"}, "up": {"uv": [0, 0, 3, 3], "texture": "#3"}}}, {"name": "wn", "from": [6.5, 7, 4.5], "to": [9.5, 13, 10.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 7.5]}, "faces": {"north": {"uv": [0, 0, 6, 12], "texture": "#4"}, "east": {"uv": [0, 0, 12, 12], "texture": "#6"}, "south": {"uv": [0, 0, 6, 12], "texture": "#4"}, "west": {"uv": [0, 0, 12, 12], "texture": "#5"}, "up": {"uv": [0, 0, 6, 3], "rotation": 270, "texture": "#0"}, "down": {"uv": [0, 0, 6, 3], "rotation": 90, "texture": "#0"}}}, {"from": [7.5, 1, 7], "to": [8.5, 7, 8], "faces": {"north": {"uv": [0, 0, 1, 6], "texture": "#1"}, "east": {"uv": [0, 0, 1, 6], "texture": "#1"}, "south": {"uv": [0, 0, 1, 6], "texture": "#1"}, "west": {"uv": [0, 0, 1, 6], "texture": "#1"}, "down": {"uv": [0, 0, 1, 1], "texture": "#1"}}}], "groups": [0, 1, 2, {"name": "handle", "origin": [8, 8, 8], "color": 0, "children": []}]}
+{"credit": "Made with Blockbench by Mc_Jeronimo", "textures": {"0": "girsignals:blocks/default/shield_black", "1": "girsignals:blocks/default/black", "2": "girsignals:blocks/default/controlbox", "3": "girsignals:blocks/default/shield_gray", "4": "girsignals:blocks/wn/wn1", "5": "girsignals:blocks/wn/wn2_1", "6": "girsignals:blocks/wn/wn2_3", "8": "girsignals:blocks/default/gravel", "particle": "girsignals:blocks/default/shield_black"}, "elements": [{"from": [-16, 0, 6], "to": [0, 1, 9], "faces": {"north": {"uv": [0, 0, 16, 1], "texture": "#2"}, "east": {"uv": [0, 0, 3, 1], "texture": "#2"}, "south": {"uv": [0, 0, 16, 1], "texture": "#2"}, "west": {"uv": [0, 0, 3, 1], "texture": "#2"}, "up": {"uv": [0, 0, 16, 3], "texture": "#2"}, "down": {"uv": [0, 0, 16, 3], "texture": "#2"}}}, {"from": [6.5, 1, 6], "to": [9.5, 3, 9], "faces": {"north": {"uv": [0, 0, 3, 2], "texture": "#3"}, "east": {"uv": [0, 0, 3, 2], "texture": "#3"}, "south": {"uv": [0, 0, 3, 2], "texture": "#3"}, "west": {"uv": [0, 0, 3, 2], "texture": "#3"}, "up": {"uv": [0, 0, 3, 3], "texture": "#3"}}}, {"name": "wn", "from": [6.5, 7, 4.5], "to": [9.5, 13, 10.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 7.5]}, "faces": {"north": {"uv": [0, 0, 6, 12], "texture": "#4"}, "east": {"uv": [0, 0, 12, 12], "texture": "#6"}, "south": {"uv": [0, 0, 6, 12], "texture": "#4"}, "west": {"uv": [0, 0, 12, 12], "texture": "#5"}, "up": {"uv": [0, 0, 6, 3], "rotation": 270, "texture": "#0"}, "down": {"uv": [0, 0, 6, 3], "rotation": 90, "texture": "#0"}}}, {"from": [7.5, 1, 7], "to": [8.5, 7, 8], "faces": {"north": {"uv": [0, 0, 1, 6], "texture": "#1"}, "east": {"uv": [0, 0, 1, 6], "texture": "#1"}, "south": {"uv": [0, 0, 1, 6], "texture": "#1"}, "west": {"uv": [0, 0, 1, 6], "texture": "#1"}, "down": {"uv": [0, 0, 1, 1], "texture": "#1"}}}, {"from": [0, 0, 6], "to": [16, 1, 9], "faces": {"north": {"uv": [0, 0, 16, 1], "texture": "#2"}, "east": {"uv": [0, 0, 3, 1], "texture": "#2"}, "south": {"uv": [0, 0, 16, 1], "texture": "#2"}, "west": {"uv": [0, 0, 3, 1], "texture": "#2"}, "up": {"uv": [0, 0, 16, 3], "texture": "#2"}, "down": {"uv": [0, 0, 16, 3], "texture": "#2"}}}, {"from": [0, 0.01, 0], "to": [16, 0.01, 16], "faces": {"up": {"uv": [0, 0, 16, 16], "texture": "#8"}}}, {"from": [-16, 0.01, 0], "to": [0, 0.01, 16], "faces": {"up": {"uv": [0, 0, 16, 16], "texture": "#8"}}}]}
diff --git a/src/main/resources/assets/girsignals/models/block/wn/wn1_mech_right.json b/src/main/resources/assets/girsignals/models/block/wn/wn1_mech_right.json
@@ -0,0 +1 @@
+{"credit": "Made with Blockbench by Mc_Jeronimo", "textures": {"0": "girsignals:blocks/default/shield_black", "1": "girsignals:blocks/default/black", "2": "girsignals:blocks/default/controlbox", "3": "girsignals:blocks/default/shield_gray", "4": "girsignals:blocks/wn/wn1", "5": "girsignals:blocks/wn/wn2_1", "6": "girsignals:blocks/wn/wn2_3", "8": "girsignals:blocks/default/gravel", "particle": "girsignals:blocks/default/shield_black"}, "elements": [{"from": [16, 0, 6], "to": [32, 1, 9], "faces": {"north": {"uv": [0, 0, 16, 1], "texture": "#2"}, "east": {"uv": [0, 0, 3, 1], "texture": "#2"}, "south": {"uv": [0, 0, 16, 1], "texture": "#2"}, "west": {"uv": [0, 0, 3, 1], "texture": "#2"}, "up": {"uv": [0, 0, 16, 3], "texture": "#2"}, "down": {"uv": [0, 0, 16, 3], "texture": "#2"}}}, {"from": [6.5, 1, 6], "to": [9.5, 3, 9], "faces": {"north": {"uv": [0, 0, 3, 2], "texture": "#3"}, "east": {"uv": [0, 0, 3, 2], "texture": "#3"}, "south": {"uv": [0, 0, 3, 2], "texture": "#3"}, "west": {"uv": [0, 0, 3, 2], "texture": "#3"}, "up": {"uv": [0, 0, 3, 3], "texture": "#3"}}}, {"name": "wn", "from": [6.5, 7, 4.5], "to": [9.5, 13, 10.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 7.5]}, "faces": {"north": {"uv": [0, 0, 6, 12], "texture": "#4"}, "east": {"uv": [0, 0, 12, 12], "texture": "#5"}, "south": {"uv": [0, 0, 6, 12], "texture": "#4"}, "west": {"uv": [0, 0, 12, 12], "texture": "#6"}, "up": {"uv": [0, 0, 6, 3], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 0, 6, 3], "rotation": 270, "texture": "#0"}}}, {"from": [7.5, 1, 7], "to": [8.5, 7, 8], "faces": {"north": {"uv": [0, 0, 1, 6], "texture": "#1"}, "east": {"uv": [0, 0, 1, 6], "texture": "#1"}, "south": {"uv": [0, 0, 1, 6], "texture": "#1"}, "west": {"uv": [0, 0, 1, 6], "texture": "#1"}, "down": {"uv": [0, 0, 1, 1], "texture": "#1"}}}, {"from": [0, 0, 6], "to": [16, 1, 9], "faces": {"north": {"uv": [0, 0, 16, 1], "texture": "#2"}, "east": {"uv": [0, 0, 3, 1], "texture": "#2"}, "south": {"uv": [0, 0, 16, 1], "texture": "#2"}, "west": {"uv": [0, 0, 3, 1], "texture": "#2"}, "up": {"uv": [0, 0, 16, 3], "texture": "#2"}, "down": {"uv": [0, 0, 16, 3], "texture": "#2"}}}, {"from": [0, 0.01, 0], "to": [16, 0.01, 16], "faces": {"up": {"uv": [0, 0, 16, 16], "texture": "#8"}}}, {"from": [16, 0.01, 0], "to": [32, 0.01, 16], "faces": {"up": {"uv": [0, 0, 16, 16], "texture": "#8"}}}]}
diff --git a/src/main/resources/assets/girsignals/models/block/wn/wn2_mech.json b/src/main/resources/assets/girsignals/models/block/wn/wn2_mech.json
@@ -1 +1 @@
-{"credit": "Made with Blockbench by Mc_Jeronimo", "textures": {"0": "girsignals:blocks/default/shield_black", "1": "girsignals:blocks/default/black", "3": "girsignals:blocks/default/shield_gray", "4": "girsignals:blocks/wn/wn1", "5": "girsignals:blocks/wn/wn2_1", "6": "girsignals:blocks/wn/wn2_3", "particle": "girsignals:blocks/default/shield_black"}, "elements": [{"from": [6.5, 0, 6], "to": [9.5, 2, 9], "faces": {"north": {"uv": [0, 0, 3, 2], "texture": "#3"}, "east": {"uv": [0, 0, 3, 2], "texture": "#3"}, "south": {"uv": [0, 0, 3, 2], "texture": "#3"}, "west": {"uv": [0, 0, 3, 2], "texture": "#3"}, "up": {"uv": [0, 0, 3, 3], "texture": "#3"}}}, {"name": "wn", "from": [5, 7, 6], "to": [11, 13, 9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 7.5]}, "faces": {"north": {"uv": [0, 0, 12, 12], "texture": "#5"}, "east": {"uv": [0, 0, 6, 12], "texture": "#4"}, "south": {"uv": [0, 0, 12, 12], "texture": "#6"}, "west": {"uv": [0, 0, 6, 12], "texture": "#4"}, "up": {"uv": [0, 0, 6, 3], "texture": "#0"}, "down": {"uv": [0, 0, 6, 3], "texture": "#0"}}}, {"from": [7.5, 1, 7], "to": [8.5, 7, 8], "faces": {"north": {"uv": [0, 0, 1, 6], "texture": "#1"}, "east": {"uv": [0, 0, 1, 6], "texture": "#1"}, "south": {"uv": [0, 0, 1, 6], "texture": "#1"}, "west": {"uv": [0, 0, 1, 6], "texture": "#1"}, "down": {"uv": [0, 0, 1, 1], "texture": "#1"}}}], "groups": [0, 1, 2, {"name": "handle", "origin": [8, 8, 8], "color": 0, "children": []}]}
+{"credit": "Made with Blockbench by Mc_Jeronimo", "textures": {"0": "girsignals:blocks/default/shield_black", "1": "girsignals:blocks/default/black", "2": "girsignals:blocks/default/controlbox", "3": "girsignals:blocks/default/shield_gray", "4": "girsignals:blocks/wn/wn1", "5": "girsignals:blocks/wn/wn2_1", "6": "girsignals:blocks/wn/wn2_3", "8": "girsignals:blocks/default/gravel", "particle": "girsignals:blocks/default/shield_black"}, "elements": [{"from": [-16, 0, 6], "to": [0, 1, 9], "faces": {"north": {"uv": [0, 0, 16, 1], "texture": "#2"}, "east": {"uv": [0, 0, 3, 1], "texture": "#2"}, "south": {"uv": [0, 0, 16, 1], "texture": "#2"}, "west": {"uv": [0, 0, 3, 1], "texture": "#2"}, "up": {"uv": [0, 0, 16, 3], "texture": "#2"}, "down": {"uv": [0, 0, 16, 3], "texture": "#2"}}}, {"from": [6.5, 1, 6], "to": [9.5, 3, 9], "faces": {"north": {"uv": [0, 0, 3, 2], "texture": "#3"}, "east": {"uv": [0, 0, 3, 2], "texture": "#3"}, "south": {"uv": [0, 0, 3, 2], "texture": "#3"}, "west": {"uv": [0, 0, 3, 2], "texture": "#3"}, "up": {"uv": [0, 0, 3, 3], "texture": "#3"}}}, {"name": "wn", "from": [5, 7, 6], "to": [11, 13, 9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 7.5]}, "faces": {"north": {"uv": [0, 0, 12, 12], "texture": "#5"}, "east": {"uv": [0, 0, 6, 12], "texture": "#4"}, "south": {"uv": [0, 0, 12, 12], "texture": "#6"}, "west": {"uv": [0, 0, 6, 12], "texture": "#4"}, "up": {"uv": [0, 0, 6, 3], "texture": "#0"}, "down": {"uv": [0, 0, 6, 3], "texture": "#0"}}}, {"from": [7.5, 1, 7], "to": [8.5, 7, 8], "faces": {"north": {"uv": [0, 0, 1, 6], "texture": "#1"}, "east": {"uv": [0, 0, 1, 6], "texture": "#1"}, "south": {"uv": [0, 0, 1, 6], "texture": "#1"}, "west": {"uv": [0, 0, 1, 6], "texture": "#1"}, "down": {"uv": [0, 0, 1, 1], "texture": "#1"}}}, {"from": [0, 0, 6], "to": [16, 1, 9], "faces": {"north": {"uv": [0, 0, 16, 1], "texture": "#2"}, "east": {"uv": [0, 0, 3, 1], "texture": "#2"}, "south": {"uv": [0, 0, 16, 1], "texture": "#2"}, "west": {"uv": [0, 0, 3, 1], "texture": "#2"}, "up": {"uv": [0, 0, 16, 3], "texture": "#2"}, "down": {"uv": [0, 0, 16, 3], "texture": "#2"}}}, {"from": [0, 0.01, 0], "to": [16, 0.01, 16], "faces": {"up": {"uv": [0, 0, 16, 16], "texture": "#8"}}}, {"from": [-16, 0.01, 0], "to": [0, 0.01, 16], "faces": {"up": {"uv": [0, 0, 16, 16], "texture": "#8"}}}]}
diff --git a/src/main/resources/assets/girsignals/models/block/wn/wn2_mech_right.json b/src/main/resources/assets/girsignals/models/block/wn/wn2_mech_right.json
@@ -0,0 +1 @@
+{"credit": "Made with Blockbench by Mc_Jeronimo", "textures": {"0": "girsignals:blocks/default/shield_black", "1": "girsignals:blocks/default/black", "2": "girsignals:blocks/default/controlbox", "3": "girsignals:blocks/default/shield_gray", "4": "girsignals:blocks/wn/wn1", "5": "girsignals:blocks/wn/wn2_1", "6": "girsignals:blocks/wn/wn2_3", "8": "girsignals:blocks/default/gravel", "particle": "girsignals:blocks/default/shield_black"}, "elements": [{"from": [16, 0, 6], "to": [32, 1, 9], "faces": {"north": {"uv": [0, 0, 16, 1], "texture": "#2"}, "east": {"uv": [0, 0, 3, 1], "texture": "#2"}, "south": {"uv": [0, 0, 16, 1], "texture": "#2"}, "west": {"uv": [0, 0, 3, 1], "texture": "#2"}, "up": {"uv": [0, 0, 16, 3], "texture": "#2"}, "down": {"uv": [0, 0, 16, 3], "texture": "#2"}}}, {"from": [6.5, 1, 6], "to": [9.5, 3, 9], "faces": {"north": {"uv": [0, 0, 3, 2], "texture": "#3"}, "east": {"uv": [0, 0, 3, 2], "texture": "#3"}, "south": {"uv": [0, 0, 3, 2], "texture": "#3"}, "west": {"uv": [0, 0, 3, 2], "texture": "#3"}, "up": {"uv": [0, 0, 3, 3], "texture": "#3"}}}, {"name": "wn", "from": [5, 7, 6], "to": [11, 13, 9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 7.5]}, "faces": {"north": {"uv": [0, 0, 12, 12], "texture": "#5"}, "east": {"uv": [0, 0, 6, 12], "texture": "#4"}, "south": {"uv": [0, 0, 12, 12], "texture": "#6"}, "west": {"uv": [0, 0, 6, 12], "texture": "#4"}, "up": {"uv": [0, 0, 6, 3], "texture": "#0"}, "down": {"uv": [0, 0, 6, 3], "texture": "#0"}}}, {"from": [7.5, 1, 7], "to": [8.5, 7, 8], "faces": {"north": {"uv": [0, 0, 1, 6], "texture": "#1"}, "east": {"uv": [0, 0, 1, 6], "texture": "#1"}, "south": {"uv": [0, 0, 1, 6], "texture": "#1"}, "west": {"uv": [0, 0, 1, 6], "texture": "#1"}, "down": {"uv": [0, 0, 1, 1], "texture": "#1"}}}, {"from": [0, 0, 6], "to": [16, 1, 9], "faces": {"north": {"uv": [0, 0, 16, 1], "texture": "#2"}, "east": {"uv": [0, 0, 3, 1], "texture": "#2"}, "south": {"uv": [0, 0, 16, 1], "texture": "#2"}, "west": {"uv": [0, 0, 3, 1], "texture": "#2"}, "up": {"uv": [0, 0, 16, 3], "texture": "#2"}, "down": {"uv": [0, 0, 16, 3], "texture": "#2"}}}, {"from": [0, 0.01, 0], "to": [16, 0.01, 16], "faces": {"up": {"uv": [0, 0, 16, 16], "texture": "#8"}}}, {"from": [16, 0.01, 0], "to": [32, 0.01, 16], "faces": {"up": {"uv": [0, 0, 16, 16], "texture": "#8"}}}]}