Merge branch 'weight-tweak-tweak' into 'main'

add `spawnable_position` to weight rule component's "weight" expression Closes #2145 See merge request cable-mc/cobblemon!2521
Merge branch 'main' into 'main'
2026-11-07 16:58:53 -05:00 · 2026-11-07 08:20:09 +00:00 · 2026-11-07 08:19:02 +00:00 · 2026-11-07 04:42:37 +00:00 · 2026-11-07 04:39:00 +00:00 · 2026-11-07 03:31:36 +00:00
22 changed files with 13 additions and 63 deletions
@@ -11,17 +11,22 @@
 - Amethyst now grows from Typegem core blocks like typegems do
 - Updated the recipe category for the Create compatibility EXP Candy recipe
 - Added No Man's Lands' Honeyed Apple to the Leaves Leftovers tag
+- Updated Unown's punctuation form names from `!` and `?` to `Exclamation` and `Question`, changing their visible form labels in tooltips and mod integrations.

 ### Fixes
 - Fixed Ponigiri food values for AppleSkin integration
 - Fixed errors emitted by typos in Parched Peat bog structure files
+- Fixed Unown punctuation forms (? and !) resolving to duplicate Showdown IDs and colliding in form displays.

 ### Developer
+- Fixed JsonArray to MoValue conversion not working properly. 

 ### Molang & Datapacks
 - `q.is_standing_on_blocks` now properly checks for non-full blocks like slabs, Mud or Soul Sand
 - Added Molang functions to play footstep sounds based on the corresponding surface. These are intended to be used by Pokémon animations.
 - Pokémon can now have their Minecraft footstep sounds silenced in their poser. This doesn't affect emitting game events.
+- Fixed the Molang coalescing operator not working the way you'd expect a coalesce operator to. 
+- Added `v.spawnable_position` to the weight spawn rule component's "weight" expression

 ### Particles

@@ -41,6 +41,7 @@ class WeightTweakRuleComponent : SpawnRuleComponent {
        return if (spawnDetailSelector.selects(detail) && spawnablePositionSelector.selects(spawnablePosition)) {
            runtime.environment.setSimpleVariable("spawn", detail.struct)
            runtime.environment.setSimpleVariable("spawn_detail", detail.struct)
+            runtime.environment.setSimpleVariable("spawnable_position", spawnablePosition.getOrSetupStruct())
            runtime.environment.setSimpleVariable("weight", DoubleValue(weight.toDouble()))
            runtime.resolveFloat(this.weight)
        } else {
@@ -548,7 +548,7 @@
      "battleOnly": false
    },
    {
-      "name": "!",
+      "name": "Exclamation",
      "primaryType": "psychic",
      "maleRatio": -1,
      "height": 5,
@@ -563,7 +563,7 @@
      "battleOnly": false
    },
    {
-      "name": "?",
+      "name": "Question",
      "primaryType": "psychic",
      "maleRatio": -1,
      "height": 5,
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>local.com.bedrockk</groupId>
-    <artifactId>molang</artifactId>
-    <version>1.1.12</version>
-</project>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>local.com.bedrockk</groupId>
-    <artifactId>molang</artifactId>
-    <version>1.1.13</version>
-</project>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>local.com.bedrockk</groupId>
-    <artifactId>molang</artifactId>
-    <version>1.1.15</version>
-</project>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>local.com.bedrockk</groupId>
-    <artifactId>molang</artifactId>
-    <version>1.1.16</version>
-</project>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>local.com.bedrockk</groupId>
-    <artifactId>molang</artifactId>
-    <version>1.1.18</version>
-</project>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>local.com.bedrockk</groupId>
-    <artifactId>molang</artifactId>
-    <version>1.1.19</version>
-</project>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>local.com.bedrockk</groupId>
-    <artifactId>molang</artifactId>
-    <version>1.1.20</version>
-</project>
@@ -4,5 +4,5 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>local.com.bedrockk</groupId>
    <artifactId>molang</artifactId>
-    <version>1.1.14</version>
+    <version>1.1.21</version>
 </project>
@@ -3,10 +3,10 @@
  <groupId>local.com.bedrockk</groupId>
  <artifactId>molang</artifactId>
  <versioning>
-    <release>1.1.20</release>
+    <release>1.1.21</release>
    <versions>
-      <version>1.1.20</version>
+      <version>1.1.21</version>
    </versions>
-    <lastUpdated>20231949390007</lastUpdated>
+    <lastUpdated>20231949390008</lastUpdated>
  </versioning>
 </metadata>
@@ -14,7 +14,7 @@ architectury-plugin = "3.4-SNAPSHOT"
 moddev = "1.0.11"

 # Common
-molang = "1.1.20"
+molang = "1.1.21"
 jei-api = "19.22.1.316"
 appleskin-api = "mc1.21-3.0.5"
Author	SHA1	Message	Date
Hiroku	10c9931d2c	Merge branch 'weight-tweak-tweak' into 'main' add `spawnable_position` to weight rule component's "weight" expression Closes #2145 See merge request cable-mc/cobblemon!2521	2026-11-07 08:20:09 +00:00
Hiroku	0e55165570	Merge branch 'main' into 'main' Main - fixs #2142, unown name issue. See merge request cable-mc/cobblemon!2523	2026-11-07 08:19:02 +00:00
Matthew Baerg	b6b87621a5	Update file CHANGELOG.md	2026-11-07 04:42:37 +00:00
Matthew Baerg	71b01d562b	Update file CHANGELOG.md	2026-11-07 04:39:00 +00:00
Matthew Baerg	21eb66e69b	Update file unown.json	2026-11-07 03:31:36 +00:00
Matthew Baerg	8b04e57a1d	Update file unown.json	2026-11-07 02:35:21 +00:00
Hiroku	1ff3b7ee96	Updated molang dep for some library fixes	2026-11-07 12:07:03 +10:00
spacky	8a2d6096e3	update changelog	2026-11-03 09:02:01 -08:00
spacky	2645b5e375	add `spawnable_position` to weight rule component's "weight" expression	2026-11-03 08:03:14 -08:00