This should avoid some unnecessary animation overhead

Fix particles that use local space and are bound to pokemon locators
Add is_alive molang function. Useful to terminate particles
2026-11-13 03:38:53 -05:00 · 2026-11-12 15:26:38 -05:00 · 2026-11-12 15:24:39 -05:00 · 2026-11-12 15:01:53 -05:00 · 2026-11-08 10:32:42 +10:00 · 2026-11-07 08:20:09 +00:00
53 changed files with 1076 additions and 728 deletions
@@ -3,22 +3,34 @@

 ### Additions
 - Added the `healersSetSpawn` gamerule. When enabled, using a healing machine will set your spawnpoint.
+- A Pokémon holding a Power item now gains 1 point in the corresponding riding stat every two minutes while being ridden. The interval is configurable, and can be disabled with `-1`.
+- Added sounds to Gigaton Hammer and Pyro Ball
+- Added stepsounds to Venusaur, Blastoise, Dewgong, Rhydon, Rhyhorn, Parasect and Mr. Mime.

 ### Changes
 - 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
+- Added `is_alive` function to entities. Can be useful for terminating particles bound to them.

 ### Particles
+- Fixed local space settings for particles that are attached to Pokemon locators. Should fix a lot of jitters and rotation issues.

 ### Localization
 - Updated translations for:
@@ -266,6 +266,9 @@ object EntityMoLangFunctions : AbstractMoLangFunctionHolder<Entity>() {
            entity.noPhysics = intangible
            DoubleValue.ONE
        }
+        functions["is_alive"] = { params ->
+            if (entity.isAlive) DoubleValue.ONE else DoubleValue.ZERO
+        }

        when (entity) {
            is PosableEntity -> {
@@ -9,9 +9,12 @@
 package com.cobblemon.mod.common.api.riding.stats

 import com.cobblemon.mod.common.api.cooking.Flavour
+import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.util.lang
 import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.MutableComponent
+import net.minecraft.tags.TagKey
+import net.minecraft.world.item.Item

 /**
 * A stat that is used for riding Pokémon. The exact implementation of each of these depends on the [com.cobblemon.mod.common.api.riding.controller.RideController].
@@ -20,13 +23,14 @@ import net.minecraft.network.chat.MutableComponent
 * @since February 17th, 2025
 */
 enum class RidingStat(
-    val flavour: Flavour
+    val flavour: Flavour,
+    val powerItem: TagKey<Item>
 ) {
-    ACCELERATION(Flavour.SPICY),
-    SKILL(Flavour.DRY),
-    SPEED(Flavour.SWEET),
-    STAMINA(Flavour.SOUR),
-    JUMP(Flavour.BITTER);
+    ACCELERATION(Flavour.SPICY, CobblemonItemTags.POWER_BRACER),
+    SKILL(Flavour.DRY, CobblemonItemTags.POWER_BELT),
+    SPEED(Flavour.SWEET, CobblemonItemTags.POWER_ANKLET),
+    STAMINA(Flavour.SOUR, CobblemonItemTags.POWER_WEIGHT),
+    JUMP(Flavour.BITTER, CobblemonItemTags.POWER_BAND);

    companion object {
        fun getByName(name: String) = RidingStat.entries.firstOrNull { it.name.equals(name, ignoreCase = true) }
@@ -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 {
@@ -169,7 +169,6 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {

        if (fullClusterCount == 0) {
            if (gemCount < Cobblemon.config.typeGemMinGrowth && clusters.isNotEmpty()) {
-                println("Force set a cluster to FULL at size $gemCount")
                val randomCluster = clusters.random()
                level.setBlockAndUpdate(randomCluster.second, randomCluster.first.setValue(GROWTH_TYPE, GrowthType.FULL))
            }
@@ -15,7 +15,9 @@ import com.cobblemon.mod.common.ModAPI
 import com.cobblemon.mod.common.api.snowstorm.ParticleMaterial
 import com.cobblemon.mod.common.api.snowstorm.ParticleMaterials
 import com.cobblemon.mod.common.api.snowstorm.UVDetails
+import com.cobblemon.mod.common.client.MountedPokemonAnimationRenderController
 import com.cobblemon.mod.common.client.particle.ParticleStorm
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.math.geometry.transformDirection
 import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.resolveDouble
@@ -140,6 +142,19 @@ class SnowstormParticle(
           }
        }

+        /* Without this, locators will lag behind the animation because particles render before Pokemon.
+         * This is important for particles attached to locators using local position/rotation.
+         *
+         * In the future, we may want to make `MountedPokemonAnimationRenderController` a more
+         * generic utility for bedrock models if we see a case where other non-pokemon models (ie. NPCs)
+         * should emit particles in their animations that utilise local space.
+         */
+        storm.entity?.let {
+            if (storm.effect.space.localPosition && it is PokemonEntity) {
+                MountedPokemonAnimationRenderController.setup(it, tickDelta)
+            }
+        }
+
        applyRandoms()
        setParticleAgeInRuntime()
        storm.effect.curves.forEach { it.apply(runtime) }
@@ -147,11 +162,16 @@ class SnowstormParticle(

        val vec3d = camera.position

+        // Interpolate because we are often between the ticks where these positions update.
        val interpLocalX = Mth.lerp(tickDelta.toDouble(), prevLocalX, localX)
        val interpLocalY = Mth.lerp(tickDelta.toDouble(), prevLocalY, localY)
        val interpLocalZ = Mth.lerp(tickDelta.toDouble(), prevLocalZ, localZ)

-        val pos = if (storm.effect.space.localRotation) {
+        val pos = if (storm.effect.space.localPosition && storm.effect.space.localRotation) {
+            val vec = Vec3(interpLocalX, interpLocalY, interpLocalZ)
+            val rotated = storm.attachedMatrix.matrix.transformDirection(vec)
+            Vector3d(rotated.x, rotated.y, rotated.z)
+        } else if (storm.effect.space.localRotation) {
            val interpRotation = Mth.lerp(tickDelta.toDouble(), 0.0, currentRotation.angle)
            val vec = Vector3d(interpLocalX, interpLocalY, interpLocalZ)
            oldAxisRotation.transform(vec)
@@ -160,9 +180,11 @@ class SnowstormParticle(
            Vector3d(interpLocalX, interpLocalY, interpLocalZ)
        }

-        val f = (pos.x + originPos.x - vec3d.x()).toFloat()
-        val g = (pos.y + originPos.y - vec3d.y()).toFloat()
-        val h = (pos.z + originPos.z - vec3d.z()).toFloat()
+        val origin = if (storm.effect.space.localPosition) storm.attachedMatrix.getOrigin() else originPos
+
+        val f = (pos.x + origin.x - vec3d.x()).toFloat()
+        val g = (pos.y + origin.y - vec3d.y()).toFloat()
+        val h = (pos.z + origin.z - vec3d.z()).toFloat()
        val quaternion = storm.effect.particle.cameraMode.getRotation(
            matrixWrapper = matrixWrapper,
            prevAngle = oRoll,
@@ -231,7 +253,7 @@ class SnowstormParticle(

    override fun tick() {
        if (storm.effect.space.localPosition) {
-            originPos = matrixWrapper.getOrigin()
+            originPos = storm.attachedMatrix.getOrigin()
        }

        applyRandoms()
@@ -47,6 +47,10 @@ class CobblemonConfig {
    @IntConstraint(min = 0, max = 1000)
    var maxPokemonFriendship = 255

+    @CobblemonConfigField(Category.Pokemon, lang = "power_item_ride_stat_gain_interval_seconds", SERVER)
+    @IntConstraint(min = -1, max = Int.MAX_VALUE)
+    var powerItemRideStatGainIntervalSeconds = 120
+
    @CobblemonConfigField(Category.Pokemon, lang = "announce_drop_items", SERVER)
    var announceDropItems = true
    @CobblemonConfigField(Category.Pokemon, lang = "default_drop_item_method", SERVER)
@@ -22,6 +22,7 @@ import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.feature.TickingSpeciesFeature
 import com.cobblemon.mod.common.api.pokemon.status.Statuses
+import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.api.spawning.fishing.FishingSpawnCause.Companion.DROPS_REROLL_ASPECT
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.battles.BattleRegistry
@@ -46,10 +47,15 @@ import kotlin.math.*

 /** Handles purely server logic for a Pokémon */
 class PokemonServerDelegate : PokemonSideDelegate {
+    companion object {
+        private const val RIDE_STAT_GAIN_AMOUNT = 1F
+    }
+
    lateinit var entity: PokemonEntity
    var acknowledgedHPValue = -1
    var acknowledgedLevel = -1
    val passengerOffsets = mutableMapOf<Int, Vec3>()
+    private var rideStatGainAnchor: Vec3? = null

    /** Mocked properties exposed to the client [PokemonEntity]. */
    private val mock: PokemonProperties?
@@ -355,9 +361,30 @@ class PokemonServerDelegate : PokemonSideDelegate {
            }
        }

+        val rideStatGainIntervalSeconds = Cobblemon.config.powerItemRideStatGainIntervalSeconds
+        if (rideStatGainIntervalSeconds > 0) {
+            val rideStatGainIntervalTicks = rideStatGainIntervalSeconds * 20L
+            if (entity.level().gameTime % rideStatGainIntervalTicks == 0L) {
+                trainRideStats()
+            }
+        }
+
        updateTrackedValues()
    }

+    private fun trainRideStats() {
+        val position = entity.position()
+        val anchor = rideStatGainAnchor
+        rideStatGainAnchor = position
+        if (anchor == null || anchor == position || entity.passengers.isEmpty()) return
+
+        val heldItem = entity.pokemon.heldItemNoCopy()
+        if (heldItem.isEmpty) return
+
+        val stat = RidingStat.entries.firstOrNull { heldItem.`is`(it.powerItem) } ?: return
+        entity.pokemon.addRideBoost(stat, RIDE_STAT_GAIN_AMOUNT)
+    }
+
    fun updateShownItem() {
        val trackedShownItem = when {
            // Show Hand Item if Held item is hidden
@@ -456,6 +456,12 @@
 				"cannon_left": {
 					"position": [0, 0, 3]
 				}
+			},
+			"timeline": {
+				"0.25": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.25": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"2.25": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"3.25": "q.run_molang('cobblemon:stepsound_standard_large');"
 			}
 		},
 		"animation.blastoise.ground_run": {
@@ -83,6 +83,7 @@
 		},
 		"animation.parasect.ground_walk": {
 			"loop": true,
+			"animation_length": 1,
 			"bones": {
 				"body": {
 					"rotation": [0, 0, 0],
@@ -134,6 +135,12 @@
 				"locator_seat_1": {
 					"rotation": [7.5, 0, 0]
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_minecraft');",
+				"0.25": "q.run_molang('cobblemon:stepsound_minecraft');",
+				"0.5": "q.run_molang('cobblemon:stepsound_minecraft');",
+				"0.75": "q.run_molang('cobblemon:stepsound_minecraft');"
 			}
 		},
 		"animation.parasect.ground_run": {
@@ -258,6 +265,10 @@
 					"rotation": ["5+Math.cos((query.anim_time) * 90 * 16 - 90) * 2", 0, 0],
 					"position": [0, "0+Math.cos((query.anim_time) * 90 * 32) * -0.2", -0.25]
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_minecraft');",
+				"0.125": "q.run_molang('cobblemon:stepsound_minecraft');"
 			}
 		},
 		"animation.parasect.ride_ground_run": {
@@ -391,6 +391,10 @@
 						"0.7083": [0, 0, 0]
 					}
 				}
+			},
+			"timeline": {
+				"0.0833": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"0.2917": "q.run_molang('cobblemon:stepsound_standard_medium');"
 			}
 		},
 		"animation.dewgong.water_idle": {
@@ -1071,6 +1071,16 @@
 				"head": {
 					"rotation": ["-0.8*math.cos(q.anim_time*90*8-120)", 0, "3*math.sin(q.anim_time*90*4+70)"]
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"0.5": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.5": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"2.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"2.5": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"3.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"3.5": "q.run_molang('cobblemon:stepsound_standard_large');"
 			}
 		},
 		"animation.rhyhorn.ride_ground_walk": {
@@ -1917,6 +1927,16 @@
 					],
 					"position": [0, "0.4+0.6*math.cos(q.anim_time*90*8-120)", 0]
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"0.375": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"0.5": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"0.875": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"1.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.375": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"1.5": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.875": "q.run_molang('cobblemon:stepsound_standard_medium');"
 			}
 		},
 		"animation.rhyhorn.ride_ground_run": {
@@ -329,6 +329,12 @@
 				"locator_seat_1": {
 					"rotation": [-15, 0, 0]
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"2.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"3.0": "q.run_molang('cobblemon:stepsound_standard_large');"
 			}
 		},
 		"animation.rhydon.ride_ground_walk": {
@@ -807,6 +813,12 @@
 				"locator_seat_1": {
 					"rotation": [-15, 0, 0]
 				}
+			},
+			"timeline": {
+				"0.3333": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"0.8333": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.3333": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.8333": "q.run_molang('cobblemon:stepsound_standard_large');"
 			}
 		},
 		"animation.rhydon.ride_ground_run": {
@@ -391,6 +391,10 @@
 						"1.0": [0, 0, 0]
 					}
 				}
+			},
+			"timeline": {
+				"0.0833": "q.run_molang('cobblemon:stepsound_minecraft');",
+				"0.5833": "q.run_molang('cobblemon:stepsound_minecraft');"
 			}
 		},
 		"animation.mr_mime.ground_run": {
@@ -2434,6 +2434,8 @@
  "cobblemon.config.ui.max_pokemon_level.tooltip": "The maximum level Pokémon can get to.",
  "cobblemon.config.ui.max_pokemon_friendship": "Max Pokémon Friendship",
  "cobblemon.config.ui.max_pokemon_friendship.tooltip": "The maximum friendship value.",
+  "cobblemon.config.ui.power_item_ride_stat_gain_interval_seconds": "Power Item Riding Stat Training Interval (Seconds)",
+  "cobblemon.config.ui.power_item_ride_stat_gain_interval_seconds.tooltip": "Seconds between riding stat gains while riding a Pokémon holding a Power item. Defaults to 120 seconds. Set to -1 or 0 to disable; values below -1 are clamped to -1.",
  "cobblemon.config.ui.announce_drop_items": "Announce Drop Items",
  "cobblemon.config.ui.announce_drop_items.tooltip": "Whether to notify the Player of dropped items from defeating wild Pokémon.",
  "cobblemon.config.ui.default_drop_item_method": "Default Drop Item Method",
@@ -1653,6 +1653,18 @@
  "move.horndrill.target_2": {
    "sounds": [ { "name": "cobblemon:move/horndrill/horndrill_target_2", "volume": 1.0 } ]
  },
+  "move.gigatonhammer.actor": {
+    "sounds": [ { "name": "cobblemon:move/gigatonhammer/gigatonhammer_actor", "volume": 1.0 } ]
+  },
+  "move.gigatonhammer.target": {
+    "sounds": [ { "name": "cobblemon:move/gigatonhammer/gigatonhammer_target", "volume": 1.0 } ]
+  },
+  "move.pyroball.actor": {
+    "sounds": [ { "name": "cobblemon:move/pyroball/pyroball_actor", "volume": 1.0 } ]
+  },
+  "move.pyroball.target": {
+    "sounds": [ { "name": "cobblemon:move/pyroball/pyroball_target", "volume": 1.0 } ]
+  },
  "impact.normal": {
    "sounds": [
      { "name": "cobblemon:move/impact_generic/impact_generic_fighting_1", "volume": 0.8 },
@@ -8672,6 +8684,9 @@
  "pokemon.cinderace.cry": {
    "sounds": [ { "name": "cobblemon:pokemon/cinderace/cinderace_cry", "volume": 0.8 } ]
  },
+  "pokemon.cinderace.pyroball": {
+    "sounds": [ { "name": "cobblemon:pokemon/cinderace/cinderace_pyroball", "volume": 0.5 } ]
+  },
  "pokemon.sobble.cry": {
    "sounds": [ {  "name": "cobblemon:pokemon/sobble/sobble_cry", "volume": 0.8 } ]
  },
@@ -0,0 +1,35 @@
+{
+  "timeline": [
+    {
+      "type": "add_holds",
+      "holds": ["effects"]
+    },
+    {
+      "type": "animation",
+      "animation": ["gigatonhammer"],
+      "delay": 0.3
+    },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == true",
+      "expressions": ["q.sound('move.gigatonhammer.actor');"]
+    },
+    {
+      "type": "pause",
+      "pause": 1.1
+    },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
+      "expressions": ["q.sound('move.gigatonhammer.target');"]
+    },
+    {
+      "type": "remove_holds",
+      "holds": ["effects"]
+    },
+    {
+      "type": "pause",
+      "pause": 1.5
+    }
+  ]
+}
@@ -3,11 +3,38 @@
    {
      "type": "add_holds",
      "holds": ["effects"]
+
    },
    {
      "type": "animation",
-      "animation": ["pyroball"],
-      "delay": 2.05
+      "animation": ["pyroball"]
+    },
+    {
+      "type": "pause",
+      "pause" : 0.1
+    },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == true",
+      "expressions": ["q.sound('move.pyroball.actor');"]
+    },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == true",
+      "expressions": ["q.sound('pokemon.cinderace.pyroball');"]
+    },
+    {
+      "type": "pause",
+      "pause" : 1.875
+    },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
+      "expressions": ["q.sound('move.pyroball.target');"]
+    },
+    {
+      "type": "pause",
+      "pause" : 0.175
    },
    {
      "type": "entity_particles",
@@ -14,7 +14,7 @@
    }
  ],
    "type": "cobblemon:cooking_pot_shapeless",
-    "category": "medicines",
+    "category": "misc",
    "ingredients": [
        {
            "item": "create:experience_nugget"
@@ -6,6 +6,7 @@
  "maleRatio": 0.875,
  "height": 16,
  "weight": 855,
+  "silenceStepSounds": true,
  "pokedex": [
    "cobblemon.species.blastoise.desc"
  ],
@@ -7,6 +7,7 @@
  "maleRatio": 0.5,
  "height": 17,
  "weight": 1200,
+  "silenceStepSounds": true,
  "pokedex": [
    "cobblemon.species.dewgong.desc"
  ],
@@ -7,6 +7,7 @@
  "maleRatio": 0.5,
  "height": 13,
  "weight": 545,
+  "silenceStepSounds": true,
  "pokedex": [
    "cobblemon.species.mrmime.desc"
  ],
@@ -7,6 +7,7 @@
  "maleRatio": 0.5,
  "height": 10,
  "weight": 295,
+  "silenceStepSounds": true,
  "pokedex": [
    "cobblemon.species.parasect.desc"
  ],
@@ -7,6 +7,7 @@
  "maleRatio": 0.5,
  "height": 19,
  "weight": 1200,
+  "silenceStepSounds": true,
  "pokedex": [
    "cobblemon.species.rhydon.desc"
  ],
@@ -7,6 +7,7 @@
  "maleRatio": 0.5,
  "height": 10,
  "weight": 1150,
+  "silenceStepSounds": true,
  "pokedex": [
    "cobblemon.species.rhyhorn.desc"
  ],
@@ -7,6 +7,7 @@
  "maleRatio": 0.875,
  "height": 20,
  "weight": 1000,
+  "silenceStepSounds": true,
  "pokedex": [
    "cobblemon.species.venusaur.desc"
  ],
@@ -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,
@@ -6,6 +6,7 @@
    "cobblemon:tart_apple",
 	"cobblemon:syrupy_apple",
 	"cobblemon:candied_apple",
-    { "id": "create:honeyed_apple","required": false }
+    { "id": "create:honeyed_apple","required": false },
+    { "id": "nomansland:honeyed_apple","required": false }
  ]
 }
@@ -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
Landon Wills	e52d007e6e	This should avoid some unnecessary animation overhead	2026-11-12 15:26:38 -05:00
Landon Wills	1110c62b14	Fix particles that use local space and are bound to pokemon locators	2026-11-12 15:24:39 -05:00
Landon Wills	7ff0585e49	Add is_alive molang function. Useful to terminate particles	2026-11-12 15:01:53 -05:00
Hiroku	99e72339db	Remove rogue println, closes #2147	2026-11-08 10:32:42 +10:00
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
Polymeta	99e0a26d7b	Merge branch 'compat-improvements' into 'main' teeny fixes to compat See merge request cable-mc/cobblemon!2520	2026-11-02 09:17:39 +00:00
dhi_holo	71753df513	Leftovers Also a slight fix to the order in changelog	2026-11-02 13:30:23 +10:00
dhi_holo	729f080f6e	Merge branch 'main' into compat-improvements	2026-11-02 13:26:43 +10:00
dhi_holo	13eb57afb1	category fix Fixing one recipe category I missed teehee	2026-11-02 13:23:42 +10:00
Jackson Bowes	72b6cb06ff	Merge branch 'soon-to-be-implemented-steps' into 'main' Implementing some steps See merge request cable-mc/cobblemon!2519	2026-11-01 08:15:06 -06:00
Jackson Bowes	74a57eb972	Merge branch 'sterr/move-sound-implementation' into 'main' Added sounds to Gigaton Hammer and Pyro Ball See merge request cable-mc/cobblemon!2518	2026-11-01 08:14:14 -06:00
Sterrezo	7246c7f8e6	Update CHANGELOG.md	2026-11-01 13:22:32 +01:00
Sterrezo	cd05f741ae	Merge branch 'main' into soon-to-be-implemented-steps	2026-11-01 13:21:23 +01:00
Sterrezo	00222d929d	Added sounds to Gigaton Hammer and Pyro Ball	2026-11-01 13:18:22 +01:00
Polymeta	b8f4637cb3	Merge branch 'feat/power-ride-training' into 'main' power bracer ride stat training See merge request cable-mc/cobblemon!2503	2026-10-31 12:33:22 +00:00
Ronak Chavva	9f572250f5	fix(*): modularization	2026-10-31 06:59:37 -05:00
Ronak Chavva	0927d6fa43	fix(*): enum change, configurable item stat	2026-10-31 06:26:45 -05:00
Ronak Chavva	a293b3d71f	changelog additions	2026-10-31 05:09:36 -05:00
Ronak Chavva	162b1cc68f	Merge branch 'main' of https://gitlab.com/ronakch8/cobblemon into feat/power-ride-training	2026-10-31 05:07:29 -05:00
Ronak Chavva	066a6b56f7	Merge branch 'main' of https://gitlab.com/ronakch8/cobblemon into feat/power-ride-training	2026-10-23 18:13:32 -05:00
Ronak Chavva	7687833add	mapping rewrite	2026-10-22 21:35:48 -05:00
Ronak Chavva	cb9ba82fcc	holding power bracer while riding, 1 to all 5 stats	2026-10-22 03:11:14 -05:00
Sterrezo	4221993f7d	Added stepsounds to Mr. Mime	2026-10-03 14:39:21 +02:00
Sterrezo	a616c25c8c	Added stepsounds to Parasect	2026-09-30 14:45:00 +02:00
Sterrezo	6ce4bf5673	Added stepsounds to Rhyhorn	2026-09-30 14:34:07 +02:00
Sterrezo	1b652ba99f	Added stepsounds to Rhydron	2026-09-30 14:01:50 +02:00
Sterrezo	11b59df386	Added stepsounds to Dewgong	2026-09-28 20:20:16 +02:00
Sterrezo	ac2b068bf3	Added stepsounds to Blastoise	2026-09-28 14:06:42 +02:00
Sterrezo	8e8f346e52	Added stepsounds keyframes to Venusaur	2026-09-28 13:47:47 +02:00