Gitoido Okaski
f1d5b99292
feat: safari ball
2026-11-03 10:57:26 +03:00
Gitoido Okaski
ad8079505d
feat: lure ball
2026-11-03 10:57:17 +03:00
Gitoido Okaski
d16599b992
feat: fast ball
2026-11-03 10:57:11 +03:00
Gitoido Okaski
de5c40bb4d
feat: level ball
2026-11-03 10:57:06 +03:00
Gitoido Okaski
d2758032a5
refactor: more modifiers cleanup
2026-11-03 10:56:44 +03:00
Gitoido Okaski
e339f5a3d5
feat: party max level and avg level molang functions
2026-11-03 05:59:32 +03:00
Gitoido Okaski
1b52b3d517
feat: the strange goat (datapacked)
2026-10-28 19:27:41 +03:00
Gitoido Okaski
82b5d12f32
feat+refactor: ball registry sync, also broke all the rods guh
2026-10-28 19:27:27 +03:00
Gitoido Okaski
07c5d10f3d
feat+refactor: very cursed model loading
2026-10-28 19:23:03 +03:00
Gitoido Okaski
5ac50e0931
refactor: updated model paths for already datapacked balls
2026-10-28 19:20:00 +03:00
Gitoido Okaski
45079052de
refactor: rolled balls to a new place
2026-10-28 19:19:02 +03:00
Gitoido Okaski
76a9feb7d9
feat: not so simple balls datapacked
2026-10-28 14:12:11 +03:00
Gitoido Okaski
33faecc517
refactor: also fix a parameter name
2026-10-28 13:51:58 +03:00
Gitoido Okaski
205323d568
refactor: on a second thought, lets use simple modifier here
2026-10-28 13:51:18 +03:00
Gitoido Okaski
c6dfb77e47
feat: simple balls datapacked
2026-10-28 13:47:43 +03:00
Gitoido Okaski
2273e32d9f
perf: bail early from ExpressionModifier if default query used
2026-10-28 12:52:36 +03:00
Gitoido Okaski
ed159cf9e5
feat: add stack to pokeball molang struct
2026-10-28 12:40:18 +03:00
Gitoido Okaski
d36f69b63d
Merge remote-tracking branch 'origin/feat/datapackable-pokeballs' into feat/datapackable-pokeballs
2026-10-28 12:27:54 +03:00
Gitoido
aa2eed1f60
feat+refactor: add separate molang script modifier and rename og molang modifier to expression
2026-10-28 12:27:24 +03:00
Gitoido
7abb786157
refactor: use java.awt.Color as beam color
...
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt i/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
index 76f32afff4..a4297de4c4 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
@@ -37,6 +37,7 @@ import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
import com.cobblemon.mod.common.util.adapters.FloatNumberRangeAdapter
import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
import com.cobblemon.mod.common.util.adapters.IntRangeAdapter
+import com.cobblemon.mod.common.util.adapters.LiteralHexColorAdapter
import com.cobblemon.mod.common.util.asExpressionLike
import com.cobblemon.mod.common.util.cobblemonResource
import com.google.gson.Gson
@@ -47,6 +48,7 @@ import net.minecraft.resources.ResourceLocation
import net.minecraft.server.level.ServerPlayer
import net.minecraft.server.packs.PackType
import net.minecraft.util.LowerCaseEnumTypeAdapterFactory
+import java.awt.Color
import kotlin.math.roundToInt
/**
@@ -68,6 +70,7 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
.registerTypeAdapter(MinMaxBounds.Doubles::class.java, FloatNumberRangeAdapter)
.registerTypeAdapter(CatchRateModifier::class.java, CobblemonCatchRateModifierAdapter)
.registerTypeAdapter(CaptureEffect::class.java, CobblemonCaptureEffectAdapter)
+ .registerTypeAdapter(Color::class.java, LiteralHexColorAdapter)
.registerTypeAdapterFactory(LowerCaseEnumTypeAdapterFactory())
.disableHtmlEscaping()
.setPrettyPrinting()
@@ -384,7 +387,7 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
model3d: ResourceLocation = cobblemonResource("item/${name}_model"),
throwPower: Float = 1.25f,
ancient: Boolean = false,
- color: String = "#ff1111"
+ color: Color = Color.decode("#ff1111")
): PokeBall {
val identifier = cobblemonResource(name)
val pokeball = PokeBall(identifier, modifier, effects, PokeBall.PokeBallProperties(), waterDragValue, model2d, model3d, throwPower, ancient, color)
@@ -396,6 +399,4 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
val identifier = cobblemonResource(name)
return this.custom[identifier] ?: this.defaults[identifier]!!
}
-
- fun isAncient(identifier: ResourceLocation) = this.getPokeBall(identifier).ancient
}
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt i/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt
index cf2b05173c..a82ada3eda 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt
@@ -56,6 +56,6 @@ class EmptyPokeBallClientDelegate : PokeBallPosableState(), EntitySideDelegate<E
}
fun getBeamColor(): Vector4f {
- return Integer.decode(currentEntity.pokeBall.beamColor).toRGBA()
+ return currentEntity.pokeBall.beamColor.rgb.toRGBA()
}
}
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt i/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
index 70538ec1af..ed39f7ed1e 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
@@ -325,7 +325,7 @@ class PokemonRenderer(
val beamColorVec4f = when(beamTarget) {
is EmptyPokeBallEntity -> (beamTarget.delegate as EmptyPokeBallClientDelegate).getBeamColor()
- else -> Integer.decode(entity.pokemon.caughtBall.beamColor).toRGBA()
+ else -> entity.pokemon.caughtBall.beamColor.rgb.toRGBA()
}
val beamSourcePosition = when {
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt i/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
index 638ef99a98..d159237173 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
@@ -23,6 +23,7 @@ import net.minecraft.resources.ResourceLocation
import net.minecraft.world.item.Item
import net.minecraft.world.item.ItemStack
import net.minecraft.world.item.Rarity
+import java.awt.Color
/**
* Base poke ball object
@@ -48,17 +49,10 @@ class PokeBall(
val model3d: ResourceLocation,
val throwPower: Float,
val ancient: Boolean = false,
- val beamColor: String
+ val beamColor: Color
) {
- init {
- // color needs to be a hex string
- if (!"""#[a-zA-Z0-9]{6}""".toRegex().matches(beamColor)) {
- throw RuntimeException("")
- }
- }
-
@Transient
- val struct = ObjectValue<PokeBall>(this)
+ val struct = ObjectValue(this)
.addPokeBallFunctions(this)
// .addFunction("item") { } // requires a registry which is hard
2026-10-28 12:27:24 +03:00
Gitoido
488a89e3f1
chore: cleanup PokeBallComponent
2026-10-28 12:27:24 +03:00
Gitoido
093deb73fb
refactor: caught ball fallback to strange ball in case of datapack removal
2026-10-28 12:27:24 +03:00
Gitoido
792ce4d0cb
feat: shedders evo custom ball support
2026-10-28 12:27:24 +03:00
Gitoido
fd004cc51b
refactor: default to strange ball instead of poke ball for some cases. code cleanup
2026-10-28 12:27:24 +03:00
Gitoido
015c072a41
feat: strange ball i18n
2026-10-28 12:27:24 +03:00
Gitoido
cb389f6cef
refactor: update item renderer and model loader mixins to account for custom balls
2026-10-28 12:27:24 +03:00
Gitoido
3f1ff0503d
feat: recall beam now uses correct beam color for ball
2026-10-28 12:27:24 +03:00
Gitoido
fcf8c44aca
feat: molang effects - functional MVP is complete
2026-10-28 12:27:24 +03:00
Gitoido
c128a435c7
feat: very very very temporary assets for testing purposes
2026-10-28 12:27:24 +03:00
Gitoido
8bd20692f4
feat+refactor: add MoLangModifier, remove deprecated poke ball getters
2026-10-28 12:27:24 +03:00
Gitoido
83c019f566
fix: add strange ball to poke_balls item tag
2026-10-28 12:27:24 +03:00
Gitoido
49047cac05
refactor: use correct ball name in battle log
2026-10-28 12:27:24 +03:00
Gitoido
39c40bfebb
fix: drop correct pokeball stack on wall hit/drop
2026-10-28 12:27:24 +03:00
Gitoido
beed33ccb0
refactor: strange ball defaults for EmptyPokeBallEntity
2026-10-28 12:27:24 +03:00
Gitoido
4d8a6c8c12
feat: add possibility to change beam color of poke ball
...
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt i/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
index 8f50077bca..7180368028 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
@@ -8,6 +8,7 @@
package com.cobblemon.mod.common.api.pokeball
+import com.cobblemon.mod.common.Cobblemon
import com.cobblemon.mod.common.api.Priority
import com.cobblemon.mod.common.api.data.JsonDataRegistry
import com.cobblemon.mod.common.api.events.CobblemonEvents
@@ -332,7 +333,9 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
}
override fun reload(data: Map<ResourceLocation, PokeBall>) {
+ data.entries.forEach { it.value.name = it.key }
this.custom.clear()
+
data.forEach { (location, ball) ->
if (defaults.containsKey(location)) {
ball.stack = defaults[location]!!.stack
@@ -342,6 +345,8 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
this.custom[location] = ball
}
+
+ Cobblemon.LOGGER.info("Loaded ${data.size} custom poke balls.")
}
override fun sync(player: ServerPlayer) {
@@ -367,10 +372,11 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
model2d: ResourceLocation = cobblemonResource(name),
model3d: ResourceLocation = cobblemonResource("item/${name}_model"),
throwPower: Float = 1.25f,
- ancient: Boolean = false
+ ancient: Boolean = false,
+ color: String = "#ff1111"
): PokeBall {
val identifier = cobblemonResource(name)
- val pokeball = PokeBall(identifier, modifier, effects, PokeBall.PokeBallProperties(), waterDragValue, model2d, model3d, throwPower, ancient)
+ val pokeball = PokeBall(identifier, modifier, effects, PokeBall.PokeBallProperties(), waterDragValue, model2d, model3d, throwPower, ancient, color)
this.defaults[identifier] = pokeball
return pokeball
}
@@ -380,7 +386,7 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
return this.custom[identifier] ?: this.defaults[identifier]!!
}
- fun isAncient(identifier: ResourceLocation) = this.getPokeBall(identifier)?.ancient ?: false
+ fun isAncient(identifier: ResourceLocation) = this.getPokeBall(identifier).ancient
/**
* Backwards compatibility getters
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt i/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt
index 944dda3995..b8a34288d6 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt
@@ -16,7 +16,9 @@ import com.cobblemon.mod.common.client.render.pokeball.PokeBallPosableState
import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity
import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity.CaptureState
import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity.CaptureState.NOT
+import com.cobblemon.mod.common.util.toRGBA
import net.minecraft.network.syncher.EntityDataAccessor
+import org.joml.Vector4f
class EmptyPokeBallClientDelegate : PokeBallPosableState(), EntitySideDelegate<EmptyPokeBallEntity> {
override val stateEmitter: SettableObservable<CaptureState> = SettableObservable(NOT)
@@ -52,4 +54,8 @@ class EmptyPokeBallClientDelegate : PokeBallPosableState(), EntitySideDelegate<E
EmptyPokeBallEntity.ASPECTS -> currentAspects = currentEntity.aspects
}
}
-}
\ No newline at end of file
+
+ fun getBeamColor(): Vector4f {
+ return Integer.decode(currentEntity.pokeBall.color).toRGBA()
+ }
+}
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt i/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
index d55550f02a..227a03f4e0 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.OrientationControllable
import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
import com.cobblemon.mod.common.client.CobblemonClient
import com.cobblemon.mod.common.client.battle.ClientBallDisplay
+import com.cobblemon.mod.common.client.entity.EmptyPokeBallClientDelegate
import com.cobblemon.mod.common.client.entity.NPCClientDelegate
import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
import com.cobblemon.mod.common.client.entity.PokemonClientDelegate.Companion.BEAM_EXTEND_TIME
@@ -320,6 +321,11 @@ class PokemonRenderer(
val pokemonPosition = entity.position().add(0.0, entity.bbHeight / 2.0 * clientDelegate.activeSendoutScale.toDouble(), 0.0)
val recallBallOrigin = (beamTarget as? Player)?.let { RecallArmAnimationTracker.get(it.uuid)?.beamOrigin }
+ val beamColorVec4f = when(beamTarget) {
+ is EmptyPokeBallEntity -> (beamTarget.delegate as EmptyPokeBallClientDelegate).getBeamColor()
+ else -> recallBeamColour
+ }
+
val beamSourcePosition = when {
// cover the recall ball origin presence
recallBallOrigin != null -> recallBallOrigin
@@ -385,10 +391,10 @@ class PokemonRenderer(
partialTicks = partialTicks,
totalLevelTime = entity.level().gameTime,
height = pokemonPosition.distanceTo(beamSourcePosition.add(offset)).toFloat() * ratio,
- red = recallBeamColour.x,
- green = recallBeamColour.y,
- blue = recallBeamColour.z,
- alpha = recallBeamColour.w,
+ red = beamColorVec4f.x,
+ green = beamColorVec4f.y,
+ blue = beamColorVec4f.z,
+ alpha = beamColorVec4f.w,
beamRadius = 0.03F,
glowRadius = 0.07F,
glowAlpha = 0.4F
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt i/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
index 77c9bc35d4..98168a053e 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
@@ -19,9 +19,9 @@ import com.cobblemon.mod.common.pokemon.Pokemon
import com.cobblemon.mod.common.util.cobblemonResource
import com.cobblemon.mod.common.util.codec.CodecUtils
import com.mojang.serialization.Codec
-import net.minecraft.world.item.ItemStack
import net.minecraft.resources.ResourceLocation
import net.minecraft.world.item.Item
+import net.minecraft.world.item.ItemStack
import net.minecraft.world.item.Rarity
/**
@@ -35,9 +35,11 @@ import net.minecraft.world.item.Rarity
* @property model2d The identifier for the resource this Pokéball will use for the 2d model.
* @property model3d The identifier for the resource this Pokéball will use for the 3d model.
* @property ancient Marks this Pokéball as ancient, which makes it play different animations on catch hops
+ * @property color Defines the beam color of pokeball
*/
class PokeBall(
- val name: ResourceLocation = cobblemonResource("strange_ball"),
+ @Transient // Assigns in PokeBalls.reload
+ var name: ResourceLocation = cobblemonResource("strange_ball"),
val catchRateModifier: CatchRateModifier = CatchRateModifier.DUMMY,
val effects: List<CaptureEffect> = listOf(),
val itemProperties: PokeBallProperties = PokeBallProperties(),
@@ -45,12 +47,15 @@ class PokeBall(
val model2d: ResourceLocation,
val model3d: ResourceLocation,
val throwPower: Float,
- val ancient: Boolean = false
+ val ancient: Boolean = false,
+ val color: String
) {
- data class PokeBallProperties(
- val fireResistant: Boolean = false,
- val rarity: Rarity = Rarity.COMMON
- )
+ init {
+ // color needs to be a hex string
+ if (!"""#[a-zA-Z0-9]{6}""".toRegex().matches(color)) {
+ throw RuntimeException("")
+ }
+ }
@Transient
val struct = QueryStruct(hashMapOf())
@@ -84,7 +89,6 @@ class PokeBall(
if (this.name == PokeBalls.SAFARI_BALL.name) target.maxHealth else target.currentHealth
companion object {
-
@JvmStatic
val BY_IDENTIFIER_CODEC: Codec<PokeBall> = CodecUtils.createByIdentifierCodec(
PokeBalls::getPokeBall,
@@ -92,4 +96,9 @@ class PokeBall(
) { identifier -> "No PokeBall for ID $identifier" }
}
+
+ data class PokeBallProperties(
+ val fireResistant: Boolean = false,
+ val rarity: Rarity = Rarity.COMMON
+ )
}
2026-10-28 12:27:24 +03:00
Gitoido
ffd0ef499d
fix: default value for pokeball root bone in its posable state
2026-10-28 12:27:24 +03:00
Gitoido
56fd26d29e
refactor: derive poke ball name from component or lack of thereof
2026-10-28 12:27:24 +03:00
Gitoido
bc908a9a0a
feat: step 3 - add the Strange Ball, allow reading pokeballs from json, stubs for capture effects
...
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItemComponents.kt i/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItemComponents.kt
index bb3997bf27..bb67ce206f 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItemComponents.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItemComponents.kt
@@ -99,6 +99,12 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
.networkSynchronized(ByteBufCodecs.BOOL)
.build())
+ @JvmField
+ val POKE_BALL: DataComponentType<PokeBallComponent> = create("poke_ball", DataComponentType.builder<PokeBallComponent>()
+ .persistent(PokeBallComponent.CODEC)
+ .networkSynchronized(PokeBallComponent.PACKET_CODEC)
+ .build())
+
fun register() {
Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:pokemon_item"), POKEMON_ITEM)
Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:bait"), BAIT)
@@ -112,9 +118,10 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:food"), FOOD)
Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:mob_effects"), MOB_EFFECTS)
Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:held_item_effect"), HELD_ITEM_EFFECT)
+ Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:poke_ball"), POKE_BALL)
}
override val registry = BuiltInRegistries.DATA_COMPONENT_TYPE
override val resourceKey = Registries.DATA_COMPONENT_TYPE
-}
\ No newline at end of file
+}
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt i/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
index 02d78b1c4d..e6ff6f3bf6 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
@@ -172,6 +172,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
val ANCIENT_GIGATON_BALL = pokeBallItem(PokeBalls.ANCIENT_GIGATON_BALL)
@JvmField
val ANCIENT_ORIGIN_BALL = pokeBallItem(PokeBalls.ANCIENT_ORIGIN_BALL)
+ @JvmField
+ val STRANGE_BALL = pokeBallItem(PokeBalls.STRANGE_BALL)
val pokedexes = mutableListOf<PokedexItem>()
@JvmField
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt i/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
index cc7f986bd8..8f50077bca 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
@@ -21,14 +21,22 @@ import com.cobblemon.mod.common.api.pokemon.stats.Stats
import com.cobblemon.mod.common.api.pokemon.status.Statuses
import com.cobblemon.mod.common.api.reactive.SimpleObservable
import com.cobblemon.mod.common.api.types.ElementalTypes
+import com.cobblemon.mod.common.item.components.PokeBallComponent
import com.cobblemon.mod.common.pokeball.PokeBall
+import com.cobblemon.mod.common.util.adapters.CobblemonCaptureEffectAdapter
+import com.cobblemon.mod.common.util.adapters.CobblemonCatchRateModifierAdapter
+import com.cobblemon.mod.common.util.adapters.FloatNumberRangeAdapter
+import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
+import com.cobblemon.mod.common.util.adapters.IntRangeAdapter
import com.cobblemon.mod.common.util.cobblemonResource
import com.google.gson.Gson
import com.google.gson.GsonBuilder
import com.google.gson.reflect.TypeToken
+import net.minecraft.advancements.critereon.MinMaxBounds
import net.minecraft.resources.ResourceLocation
import net.minecraft.server.level.ServerPlayer
import net.minecraft.server.packs.PackType
+import net.minecraft.util.LowerCaseEnumTypeAdapterFactory
import kotlin.math.roundToInt
/**
@@ -43,6 +51,12 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
// ToDo once datapack pokeball is implemented add required adapters here
override val gson: Gson = GsonBuilder()
+ .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
+ .registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
+ .registerTypeAdapter(MinMaxBounds.Doubles::class.java, FloatNumberRangeAdapter)
+ .registerTypeAdapter(CatchRateModifier::class.java, CobblemonCatchRateModifierAdapter)
+ .registerTypeAdapter(CaptureEffect::class.java, CobblemonCaptureEffectAdapter)
+ .registerTypeAdapterFactory(LowerCaseEnumTypeAdapterFactory())
.disableHtmlEscaping()
.setPrettyPrinting()
.create()
@@ -50,8 +64,8 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
override val resourcePath = "pokeballs"
private val defaults = hashMapOf<ResourceLocation, PokeBall>()
- // ToDo datapack pokeball type here instead
- private val custom = hashMapOf<ResourceLocation, PokeBall>()
+
+ val custom = hashMapOf<ResourceLocation, PokeBall>()
@JvmStatic
@get:JvmName("getPokeBall")
@@ -245,6 +259,10 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
@get:JvmName("getAncientOriginBall")
val ANCIENT_ORIGIN_BALL
get() = this.byName("ancient_origin_ball")
+ @JvmStatic
+ @get:JvmName("getStrangeBall")
+ val STRANGE_BALL
+ get() = this.byName("strange_ball")
init {
createDefault("poke_ball")
@@ -257,7 +275,7 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
createDefault("ultra_ball", MultiplierModifier(2F))
createDefault("master_ball", GuaranteedModifier())
createDefault("safari_ball", CatchRateModifiers.SAFARI)
- createDefault("fast_ball", BaseStatModifier(Stats.SPEED, { it >= 100 }, 4F))
+ createDefault("fast_ball", BaseStatModifier(Stats.SPEED, 100, BaseStatModifier.Comparator.GTE, 4F))
createDefault("level_ball", CatchRateModifiers.LEVEL)
createDefault("lure_ball", CatchRateModifiers.LURE)
createDefault("heavy_ball", CatchRateModifiers.WEIGHT_BASED)
@@ -295,6 +313,9 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
createDefault("ancient_wing_ball", MultiplierModifier(1.5F), throwPower = 2.5f, ancient = true)
createDefault("ancient_jet_ball", MultiplierModifier(2F), throwPower = 2.5f, ancient = true)
createDefault("ancient_origin_ball", GuaranteedModifier(), ancient = true)
+ // for customs
+ createDefault("strange_ball")
+
// Luxury ball effect, low priority as it must be triggered before soothe bell as of gen 4
CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(priority = Priority.LOW) { event ->
if (!event.earned) {
@@ -312,7 +333,15 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
override fun reload(data: Map<ResourceLocation, PokeBall>) {
this.custom.clear()
- // ToDo once datapack pokeball is implemented load them here, we will want datapacks to be able to override our default pokeballs too, however they will never be able to disable them
+ data.forEach { (location, ball) ->
+ if (defaults.containsKey(location)) {
+ ball.stack = defaults[location]!!.stack
+ } else {
+ ball.stack = PokeBallComponent.createStack(ball)
+ }
+
+ this.custom[location] = ball
+ }
}
override fun sync(player: ServerPlayer) {
@@ -321,10 +350,11 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
/**
* Gets a Pokeball from registry name.
- * @return the pokeball object if found otherwise null.
+ * @return the pokeball object if found otherwise strange ball.
*/
@JvmStatic
- fun getPokeBall(name : ResourceLocation): PokeBall? = this.custom[name] ?: this.defaults[name]
+ fun getPokeBall(name : ResourceLocation): PokeBall =
+ this.custom[name] ?: this.defaults[name] ?: STRANGE_BALL
@JvmStatic
fun all() = this.defaults.filterKeys { !this.custom.containsKey(it) }.values + this.custom.values
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/catching/effects/FriendshipEarningBoostEffect.kt i/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/catching/effects/FriendshipEarningBoostEffect.kt
index 9dffa52c41..1c5f78f4dc 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/catching/effects/FriendshipEarningBoostEffect.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/catching/effects/FriendshipEarningBoostEffect.kt
@@ -18,6 +18,10 @@ import net.minecraft.world.entity.LivingEntity
*
* @property multiplier The multiplier for friendship gains
*/
-class FriendshipEarningBoostEffect(val multiplier: Float) : CaptureEffect {
+data class FriendshipEarningBoostEffect(val multiplier: Float) : CaptureEffect {
+ companion object {
+ const val VARIANT = "friendship_boost"
+ }
+
override fun apply(thrower: LivingEntity, pokemon: Pokemon) {}
-}
\ No newline at end of file
+}
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/item/components/PokeBallComponent.kt i/common/src/main/kotlin/com/cobblemon/mod/common/item/components/PokeBallComponent.kt
new file mode 100644
index 0000000000..12517ee396
--- /dev/null
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/item/components/PokeBallComponent.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/ .
+ */
+
+package com.cobblemon.mod.common.item.components
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.CobblemonItemComponents
+import com.cobblemon.mod.common.CobblemonItems
+import com.cobblemon.mod.common.api.pokeball.PokeBalls
+import com.cobblemon.mod.common.pokeball.PokeBall
+import com.mojang.serialization.Codec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import io.netty.buffer.ByteBuf
+import net.minecraft.network.codec.ByteBufCodecs
+import net.minecraft.network.codec.StreamCodec
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.item.ItemStack
+
+data class PokeBallComponent(val name: ResourceLocation) {
+ companion object {
+ // Codec to serialize/deserialize PokeBall
+ val CODEC: Codec<PokeBallComponent> = RecordCodecBuilder.create { instance ->
+ instance.group(
+ ResourceLocation.CODEC.fieldOf("move").forGetter { it.name } // Serialize the move's name
+ ).apply(instance) { name -> PokeBallComponent(name) }
+ }
+
+ val PACKET_CODEC: StreamCodec<ByteBuf, PokeBallComponent> = ByteBufCodecs.fromCodec(CODEC)
+
+ fun getPokeBall(stack: ItemStack): PokeBall? {
+ return stack.get(CobblemonItemComponents.POKE_BALL)?.name?.let(PokeBalls::getPokeBall)
+ }
+
+ fun setPokeBall(stack: ItemStack, ball: PokeBall): ItemStack {
+ stack.set(CobblemonItemComponents.POKE_BALL, PokeBallComponent(ball.name))
+ return stack
+ }
+
+ fun removePokeBall(stack: ItemStack): ItemStack {
+ stack.remove(CobblemonItemComponents.POKE_BALL)
+ return stack
+ }
+
+ fun createStack(ball: PokeBall?): ItemStack {
+ var result = PokeBalls.STRANGE_BALL
+ if (ball == null) {
+ Cobblemon.LOGGER.error("Attempted to create poke ball stack with null config, falling to strange ball.")
+ } else {
+ result = ball
+ }
+ val stack = ItemStack(CobblemonItems.STRANGE_BALL)
+ return setPokeBall(stack, result)
+ }
+
+ }
+
+ constructor(component: PokeBallComponent): this(component.name)
+
+ val ball: PokeBall
+ get() = PokeBalls.getPokeBall(name)
+}
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt i/common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt
index 23cd696bea..c2990fbb80 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt
@@ -11,10 +11,12 @@ package com.cobblemon.mod.common.item.group
import com.cobblemon.mod.common.Cobblemon
import com.cobblemon.mod.common.CobblemonItemComponents
import com.cobblemon.mod.common.CobblemonItems
+import com.cobblemon.mod.common.api.pokeball.PokeBalls
import com.cobblemon.mod.common.api.riding.stats.RidingStat
import com.cobblemon.mod.common.api.tms.TechnicalMachines
import com.cobblemon.mod.common.block.TypeGemClusterBlock
import com.cobblemon.mod.common.item.AprijuiceItem
+import com.cobblemon.mod.common.item.components.PokeBallComponent
import com.cobblemon.mod.common.item.components.RideBoostsComponent
import com.cobblemon.mod.common.item.components.TMMoveComponent
import com.cobblemon.mod.common.util.cobblemonResource
@@ -943,6 +945,11 @@ object CobblemonItemGroups {
private fun utilityItemEntries(displayContext: ItemDisplayParameters, entries: Output) {
CobblemonItems.pokeBalls.forEach(entries::accept)
+
+ PokeBalls.custom
+ .filter { (_, value) -> CobblemonItems.pokeBalls.none { it.pokeBall.name == value.name } }
+ .forEach { entries.accept(PokeBallComponent.createStack(it.value)) }
+
CobblemonItems.pokeRods.forEach(entries::accept)
CobblemonItems.pokedexes.forEach(entries::accept)
}
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt i/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
index 1644797628..77c9bc35d4 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
@@ -34,9 +34,10 @@ import net.minecraft.world.item.Rarity
* @property waterDragValue The value of the water drag modifier when the entity travels, default is 0.8.
* @property model2d The identifier for the resource this Pokéball will use for the 2d model.
* @property model3d The identifier for the resource this Pokéball will use for the 3d model.
+ * @property ancient Marks this Pokéball as ancient, which makes it play different animations on catch hops
*/
-open class PokeBall(
- val name: ResourceLocation = cobblemonResource("weird_ball"),
+class PokeBall(
+ val name: ResourceLocation = cobblemonResource("strange_ball"),
val catchRateModifier: CatchRateModifier = CatchRateModifier.DUMMY,
val effects: List<CaptureEffect> = listOf(),
val itemProperties: PokeBallProperties = PokeBallProperties(),
@@ -51,6 +52,7 @@ open class PokeBall(
val rarity: Rarity = Rarity.COMMON
)
+ @Transient
val struct = QueryStruct(hashMapOf())
.addFunction("name") { StringValue(name.toString()) }
.addFunction("water_drag_value") { DoubleValue(waterDragValue) }
@@ -59,6 +61,7 @@ open class PokeBall(
// .addFunction("item") { } // requires a registry which is hard
// This gets attached during item registry
+ @Transient
internal lateinit var stack: ItemStack
fun item(): PokeBallItem = this.stack.item as PokeBallItem
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CobblemonCaptureEffectAdapter.kt i/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CobblemonCaptureEffectAdapter.kt
new file mode 100644
index 0000000000..c57d7ed2f0
--- /dev/null
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CobblemonCaptureEffectAdapter.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/ .
+ */
+
+package com.cobblemon.mod.common.util.adapters
+
+import com.cobblemon.mod.common.api.pokeball.catching.CaptureEffect
+import com.cobblemon.mod.common.util.readString
+import com.cobblemon.mod.common.util.writeString
+import com.google.common.collect.HashBiMap
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import net.minecraft.network.FriendlyByteBuf
+import java.lang.reflect.Type
+import kotlin.reflect.KClass
+
+object CobblemonCaptureEffectAdapter : JsonDeserializer<CaptureEffect>, JsonSerializer<CaptureEffect> {
+ private const val VARIANT = "variant"
+
+ private val types = HashBiMap.create<String, KClass<out CaptureEffect>>()
+
+ val gson: Gson by lazy {
+ GsonBuilder()
+ .registerTypeAdapter(CaptureEffect::class.java, CobblemonCaptureEffectAdapter)
+ .setPrettyPrinting()
+ .create()
+ }
+
+ fun <T : CaptureEffect> registerType(id: String, type: KClass<T>) {
+ this.types[id.lowercase()] = type
+ }
+
+ override fun deserialize(
+ json: JsonElement,
+ typeOfT: Type,
+ context: JsonDeserializationContext,
+ ): CaptureEffect {
+ val variant =
+ json.asJsonObject
+ .get(VARIANT)
+ .asString
+ .lowercase()
+ val type = getModifierType(variant)
+ return context.deserialize(json, type.java)
+ }
+
+ override fun serialize(
+ effect: CaptureEffect,
+ typeOfSrc: Type,
+ context: JsonSerializationContext,
+ ): JsonElement {
+ val json = context.serialize(effect, effect::class.java).asJsonObject
+ val variant = getVariant(effect)
+ json.addProperty(VARIANT, variant)
+ return json
+ }
+
+ fun encode(effect: CaptureEffect, buffer: FriendlyByteBuf) {
+ buffer.writeString(gson.toJson(effect, CaptureEffect::class.java))
+ }
+
+ fun decode(buffer: FriendlyByteBuf): CaptureEffect = gson.fromJson(buffer.readString(), CaptureEffect::class.java)
+
+ private fun getVariant(effect: CaptureEffect): String {
+ val variant =
+ this.types.inverse()[effect::class]
+ ?: throw IllegalArgumentException("Cannot resolve pokeball capture effect for type ${effect::class.qualifiedName}")
+
+ return variant
+ }
+
+ private fun getModifierType(variant: String): KClass<out CaptureEffect> {
+ val effectType =
+ this.types[variant] ?: throw IllegalArgumentException("Cannot resolve pokeball capture effect type for variant $variant")
+
+ return effectType
+ }
+}
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CatchRateModifierAdapter.kt i/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CobblemonCatchRateModifierAdapter.kt
similarity index 94%
rename from common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CatchRateModifierAdapter.kt
rename to common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CobblemonCatchRateModifierAdapter.kt
index 52af19e392..d2199cc29e 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CatchRateModifierAdapter.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CobblemonCatchRateModifierAdapter.kt
@@ -30,7 +30,7 @@ import net.minecraft.resources.ResourceLocation
import java.lang.reflect.Type
import kotlin.reflect.KClass
-object CatchRateModifierAdapter : CatchRateModifierAdapter {
+object CobblemonCatchRateModifierAdapter : CatchRateModifierAdapter {
private const val VARIANT = "variant"
private val types = HashBiMap.create<String, KClass<out CatchRateModifier>>()
@@ -45,7 +45,7 @@ object CatchRateModifierAdapter : CatchRateModifierAdapter {
val gson: Gson by lazy {
GsonBuilder()
- .registerTypeAdapter(CatchRateModifier::class.java, CatchRateModifierAdapter)
+ .registerTypeAdapter(CatchRateModifier::class.java, CobblemonCatchRateModifierAdapter)
.registerTypeAdapter(PokemonProperties::class.java, pokemonPropertiesShortAdapter)
.registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
.registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
@@ -91,14 +91,14 @@ object CatchRateModifierAdapter : CatchRateModifierAdapter {
private fun getVariant(modifier: CatchRateModifier): String {
val variant =
this.types.inverse()[modifier::class]
- ?: throw IllegalArgumentException("Cannot resolve evolution requirement for type ${modifier::class.qualifiedName}")
+ ?: throw IllegalArgumentException("Cannot resolve pokeball catchrate modifier for type ${modifier::class.qualifiedName}")
return variant
}
private fun getModifierType(variant: String): KClass<out CatchRateModifier> {
val requirementType =
- this.types[variant] ?: throw IllegalArgumentException("Cannot resolve evolution requirement type for variant $variant")
+ this.types[variant] ?: throw IllegalArgumentException("Cannot resolve pokeball catchrate modifier type for variant $variant")
return requirementType
}
2026-10-28 12:27:24 +03:00
Gitoido
c5a7b4bc06
feat+refactor: introduce CatchRateModifierAdapter and update basic modifiers to support serialization
2026-10-28 12:27:24 +03:00
Gitoido
b4b55967bd
refactor: better way to derive root bone of pokeball model
2026-10-28 12:27:24 +03:00
Gitoido
ca52c578dd
fix: mixed up npc and pokeball poser directories
2026-10-28 12:27:24 +03:00
Gitoido
7d78a72925
refactor: step 2 - lets get rid of hardcoded posers
2026-10-28 12:27:23 +03:00
Gitoido
f4cea63612
refactor: step 1 - use itemStack
2026-10-28 12:27:23 +03:00
Hiroku
f4140a097d
Put the snap back on
2026-10-27 20:16:12 +10:00
Hiroku
b79dbcca80
no scope. I mean no snap
2026-10-27 19:42:59 +10:00
Hiroku
5ac12a897a
Merge remote-tracking branch 'origin/lang-updates'
2026-10-27 19:28:28 +10:00
Polymeta
ae5f7c83f2
Merge branch 'implement_pokemon' into 'main'
...
implement_pokemon
See merge request cable-mc/cobblemon!2507
2026-10-26 23:10:50 +00:00
ewwww
f14de9ab58
updated water shuriken
2026-10-26 16:35:00 -04:00
ewwww
8a1c846c2c
Merge branch 'main' into implement_pokemon
2026-10-26 16:06:28 -04:00
Polymeta
459e7d3490
this doesnt make any sense
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-26 09:16:39 +00:00
Polymeta
5a9be8944f
Merge branch 'hotbox-hitfix' into 'main'
...
Orb Ceiling Hitbox Correction
See merge request cable-mc/cobblemon!2512
2026-10-26 07:09:59 +00:00
Polymeta
3bb941b087
Merge branch 'dusclops-cry-fix' into 'main'
...
fixed dusclops using squirtle's cry
See merge request cable-mc/cobblemon!2511
2026-10-26 07:07:40 +00:00
dhi_holo
384b496d76
T H E O R B
2026-10-26 13:37:09 +10:00
geumu
4caa736e0b
Translated using Weblate (Korean)
...
Currently translated at 99.6% (9549 of 9587 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ko/
2026-10-26 02:38:47 +00:00
geumu
c3e9051918
Translated using Weblate (Korean)
...
Currently translated at 98.5% (9445 of 9587 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ko/
2026-10-26 02:26:52 +00:00
ewwww
fe940caafc
fixed dusclops using squirtle's cry
2026-10-25 21:33:38 -04:00
Polymeta
c9d148ec9c
bump showdown build and changelog
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-26 00:41:23 +00:00
Polymeta
e611bf4a77
Merge branch 'fix-missing-recipe-book-data' into 'main'
...
Fixed Cooking Pot recipe book tabs and entries on Fabric
See merge request cable-mc/cobblemon!2510
2026-10-26 00:37:47 +00:00
Polymeta
8093822140
Merge branch 'battle-selection-fix' into 'main'
...
Fixed a bug with battle selection.
See merge request cable-mc/cobblemon!2509
2026-10-26 00:27:00 +00:00
Fyre520
f695ec15f9
Fixed Cooking Pot recipe book tabs and entries on Fabric
2026-10-26 02:01:15 +05:30
Deltric
1f6c791ce6
Fixed a bug with battle selection.
2026-10-25 14:24:44 -04:00
Polymeta
570805fdf1
Merge branch 'structure-tags-for-spawning' into 'main'
...
Structure Spawn Tags
See merge request cable-mc/cobblemon!2508
2026-10-25 16:53:38 +00:00
dhi_holo
ddecb08bc7
Edit is_illager_structure.json
2026-10-26 00:21:36 +10:00
Kenji_64
a1b930a21f
More Frogadier fixes (ty Mitchoo)
2026-10-25 14:14:44 +01:00
Kenji_64
7728ff3892
Fixed Fearow missing blink crashing during gliding
2026-10-25 14:11:22 +01:00
阿鱼
0b38e063d2
Translated using Weblate (Chinese (Simplified Han script))
...
Currently translated at 98.7% (9464 of 9587 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/zh_Hans/
2026-10-25 10:52:25 +00:00
Hiroku
4d7cfcdf61
Added q.target_fainted to MoveInstruction
2026-10-25 11:11:52 +10:00
Hiroku
e56dd6ef64
snap it back on
2026-10-25 10:43:01 +10:00
Kenji_64
236b98fa78
I forgot the changelog :(
2026-10-25 02:21:08 +02:00
Kenji_64
ac61e0d4d0
Had to fix Froakie again. Heck
2026-10-25 02:20:20 +02:00
Kenji_64
d8956fd66f
Froakie line eye lid and animation fixes
2026-10-25 02:14:01 +02:00
Hiroku
ffe005511d
but what would snapshot look like when it's false?
2026-10-25 10:03:22 +10:00
Hiroku
1e634a20b8
Merge remote-tracking branch 'origin/lang-updates'
2026-10-25 09:57:49 +10:00
ewwww
50a5a78dd4
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2026-10-24 19:16:59 -04:00
ewwww
76c2654399
it appears my lang tweaks were reverted somehow
2026-10-24 19:16:20 -04:00
Polymeta
f9f4745e93
Merge branch 'implement_pokemon' into 'main'
...
Some recent riding stuff adjustments
See merge request cable-mc/cobblemon!2506
2026-10-24 16:23:07 +00:00
Kenji_64
c700674289
Fearow animations updated (again) and added all placeholders I made to the changelog
2026-10-24 18:05:05 +02:00
Kenji_64
c4f0032eee
Fixed Squawkabilly's missing toe
2026-10-24 15:24:17 +02:00
Kenji_64
d92986016b
Adjusted Fearow's ride stats further
2026-10-24 02:12:39 +02:00
Kenji_64
ab57e01242
Fearow is now rideable with temporary animations
2026-10-24 01:46:41 +02:00
Kenji_64
0da1c740a4
Adjusted Altaria ride stats
2026-10-24 01:44:26 +02:00
Kenji_64
a7979aa80c
Adjusted Togekiss ride stats. Changed style from jet to bird
2026-10-24 01:44:10 +02:00
Polymeta
59804a4e08
rescrape spawns and drops
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-23 23:36:25 +01:00
Polymeta
072c67acad
Merge branch 'implement_pokemon' into 'main'
...
implement_pokemon
See merge request cable-mc/cobblemon!2496
2026-10-23 22:30:54 +00:00
ewwww
60bbe221de
tweaked vikavolt's jump stat
2026-10-23 17:51:10 -04:00
ewwww
5f06dc214b
added vikavolt ride stats
2026-10-22 22:51:05 -04:00
ewwww
a6607e585b
changed vikavolt to bird style
2026-10-22 21:45:56 -04:00
Gitoido Okaski
20584f4507
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2026-10-23 01:02:35 +03:00
Kenji_64
9660f1f724
Fixed Appletun having a green tongue. (Likely from food coloring...)
2026-10-23 00:31:07 +03:00
Kenji_64
c8cbace800
Fixed Fearow's model being messed up and added the head_ai back
2026-10-23 00:31:07 +03:00
Kenji_64
a616a24923
Fixed Swampert's weird head_ai
2026-10-23 00:31:07 +03:00
Gitoido Okaski
12035dd589
chore: mudkip animation call fix, resolver orderings streamlined
2026-10-23 00:31:07 +03:00
Kenji_64
9627b80b01
Added Ninetales + alolan placeholder animations
2026-10-23 00:31:07 +03:00
Kenji_64
4e9cecc854
Converted Squawkabilly's poser to JSON and added placeholder animations
2026-10-23 00:31:06 +03:00
ewwww
9d4b19b185
vikavolt can be mounted (stat placeholders)
2026-10-23 00:31:06 +03:00
Kenji_64
aee96d06aa
Made Pichu shut up in its sleep
2026-10-23 00:31:06 +03:00
Kenji_64
23e3c585f7
Wave 2 of profile adjustments
2026-10-23 00:31:06 +03:00
Kenji_64
c22a88079f
Added Fearow placeholders and fixed its neck (also adjusted Swampert placeholder)
2026-10-23 00:31:06 +03:00
Kenji_64
2225402082
Added transparency to Vikavolt
2026-10-23 00:31:06 +03:00
Kenji_64
9197207431
Implemented Magby and Magmar animations
2026-10-23 00:31:06 +03:00
Kenji_64
47c7f7079c
Added placeholder animations to Mudkip, Marshtomp, Swampert and Spearow
2026-10-23 00:31:06 +03:00
Kenji_64
eb0c1dddfd
Scaled down a huge lot of small Pokémon's profiles and fixed some that were off over all
2026-10-23 00:31:06 +03:00
Kenji_64
e3dbfe6ff8
Added Eerie Spell activate and Hospitality lang (Hospitality's text does not work properly atm due to a Doubles bug)
2026-10-23 00:31:06 +03:00
whatsy
fac207f36b
Revert "Rescrape drops"
...
This reverts commit 6a7d5d2133 .
2026-10-23 00:31:06 +03:00
ewwww
379e794848
removed igglybuff, jigglypuff, and wigglytuff's rights to float
2026-10-23 00:31:06 +03:00
ewwww
9081a4b131
added water shuriken fx
2026-10-23 00:31:06 +03:00
ewwww
dc6d75b8ee
sped up cacnea and hippowdon's walk speed
2026-10-23 00:31:06 +03:00
ewwww
bb297a4448
fixed t-posing archeops during air_cry
2026-10-23 00:31:06 +03:00
whatsy
a93922c438
Rescrape drops
2026-10-23 00:31:06 +03:00
Kenji_64
f7d21c80d7
Fixed Appletun having a green tongue. (Likely from food coloring...)
2026-10-22 23:16:45 +02:00
Kenji_64
9248d26fd4
Fixed Fearow's model being messed up and added the head_ai back
2026-10-22 23:03:50 +02:00
dhi_holo
b5ac54cd16
Tweaks to prepare for Scrapes
2026-10-21 14:22:17 +10:00
dhi_holo
dc703e67f7
Merge branch 'main' into structure-tags-for-spawning
2026-10-21 14:01:10 +10:00
Kenji_64
0930721865
Fixed Swampert's weird head_ai
2026-10-19 16:34:31 +02:00
Gitoido Okaski
644ff1772e
chore: mudkip animation call fix, resolver orderings streamlined
2026-10-19 16:56:42 +03:00
Kenji_64
3c7e0bebb6
Added Ninetales + alolan placeholder animations
2026-10-19 15:44:42 +02:00
Kenji_64
0c0eea3876
Converted Squawkabilly's poser to JSON and added placeholder animations
2026-10-19 15:44:20 +02:00
ewwww
5535140bb7
vikavolt can be mounted (stat placeholders)
2026-10-19 03:37:39 -04:00
Polymeta
f9dd1448e5
Merge branch 'item-2072' into 'main'
...
Added tab completion for the alpha property and three missing property aliases
Closes #2072
See merge request cable-mc/cobblemon!2388
2026-10-18 22:33:30 +00:00
Gitoido
ecf5d57ad2
chore: resolve conflicts
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/properties/PropertiesCompletionProvider.kt
2026-10-18 22:16:27 +00:00
Polymeta
8663888abc
Merge branch 'item-2013' into 'main'
...
Fixed GUI Pokémon cries playing on the Master category instead of Friendly Creatures
Closes #2013
See merge request cable-mc/cobblemon!2389
2026-10-18 22:14:04 +00:00
Polymeta
f452cd9a05
Merge branch 'fix/ride-interact-checks' into 'main'
...
fix: stricter riding checks on server side
Closes #2124
See merge request cable-mc/cobblemon!2499
2026-10-18 22:12:19 +00:00
Kiritiop
4fe9cd7fd6
Fixed GUI pokemon cries using the Master volume slider instead of Friendly Creatures, added a new file to prevent code duplication. Credit to Gitoido
2026-10-18 13:19:07 -04:00
Kenji_64
9b0ca1c16b
Made Pichu shut up in its sleep
2026-10-18 18:46:52 +02:00
Kenji_64
052ff59f57
Wave 2 of profile adjustments
2026-10-18 18:46:15 +02:00
Kenji_64
40e5ef1c46
Added Fearow placeholders and fixed its neck (also adjusted Swampert placeholder)
2026-10-18 18:45:31 +02:00
Kenji_64
5025977d23
Added transparency to Vikavolt
2026-10-18 18:44:22 +02:00
Kenji_64
922006afe7
Implemented Magby and Magmar animations
2026-10-18 16:14:45 +02:00
Kenji_64
46cc7cb04d
Added placeholder animations to Mudkip, Marshtomp, Swampert and Spearow
2026-10-18 15:48:35 +02:00
Kenji_64
fa3e3bbb1b
Scaled down a huge lot of small Pokémon's profiles and fixed some that were off over all
2026-10-18 15:47:46 +02:00
Kenji_64
afbdcce337
Added Eerie Spell activate and Hospitality lang (Hospitality's text does not work properly atm due to a Doubles bug)
2026-10-18 15:46:19 +02:00
Gitoido Okaski
2c1d11ed11
chore: remove duplicate check that was accounted for earlier
2026-10-18 15:29:35 +03:00
Gitoido Okaski
b88adf0479
fix: stricter riding checks on server side
2026-10-18 15:21:09 +03:00
Polymeta
b1066671f5
Merge branch 'quick-fix' into 'main'
...
Flowerbed Clearning jigsaw fix, dripstone oasis jigsaw removal
See merge request cable-mc/cobblemon!2497
2026-10-18 12:09:48 +00:00
Polymeta
387e85d4ad
Merge branch 'fix/preset-conditions-mergers' into 'main'
...
fix: Some spawn conditions merge minHeight/Depth data into max instead
Closes #2111
See merge request cable-mc/cobblemon!2498
2026-10-18 12:07:55 +00:00
Nico Merenq
1fa113f5ac
Translated using Weblate (Russian)
...
Currently translated at 84.8% (8137 of 9587 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ru/
2026-10-18 11:56:30 +00:00
Gitoido Okaski
77ab58d823
fix: spawn condition mergers writing minHeight/depth into maxHeight/depth instead
2026-10-18 14:14:28 +03:00
Slippy
1a9e736d8b
Flowerbed Clearning jigsaw fix, dripstone oasis jigsaw removal
2026-10-18 00:11:56 -05:00
whatsy
f680682f61
Revert "Rescrape drops"
...
This reverts commit 6a7d5d2133 .
2026-10-17 22:51:02 -04:00
whatsy
4d93d1244d
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2026-10-17 22:40:25 -04:00
whatsy
6a7d5d2133
Rescrape drops
2026-10-17 22:40:13 -04:00
ewwww
98397cd1da
removed igglybuff, jigglypuff, and wigglytuff's rights to float
2026-10-17 21:57:59 -04:00
ewwww
fc5a610394
added water shuriken fx
2026-10-17 20:37:00 -04:00
ewwww
504df5d998
sped up cacnea and hippowdon's walk speed
2026-10-17 20:16:26 -04:00
ewwww
3b4d3ebf50
fixed t-posing archeops during air_cry
2026-10-17 20:01:56 -04:00
Hiroku
aa39c1906e
Merge branch 'implement_pokemon' into 'main'
...
implement_pokemon
See merge request cable-mc/cobblemon!2495
2026-10-17 23:48:54 +00:00
ewwww
2e460e2ca2
fixed floating frogadier
2026-10-17 19:43:44 -04:00
Polymeta
a07ff7f442
Merge branch 'implement_pokemon' into 'main'
...
implement_pokemon
See merge request cable-mc/cobblemon!2494
2026-10-17 23:37:18 +00:00
Polymeta
5374569ea1
[skip-ci] tidy up changelog
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-18 00:15:37 +01:00
Polymeta
af9c1196bf
youre meant to be looking the other way
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-18 00:08:51 +01:00
Polymeta
09d5543469
Merge branch 'fix/haters-gonna-hate-properly' into 'main'
...
fix: Anger should be directed at proper target
Closes #2112
See merge request cable-mc/cobblemon!2492
2026-10-17 23:03:41 +00:00
ewwww
49e4dd0298
helioptile & heliolisk cries
2026-10-17 19:01:46 -04:00
Polymeta
c8e408c50a
actually copy components when building up evolution displays
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-17 23:57:05 +01:00
Gitoido Okaski
e8a0467643
chore: move coercion at class variable level
2026-10-18 01:17:07 +03:00
Gitoido Okaski
2dd0b66b83
chore: remove duplicate i18n key
2026-10-18 01:04:29 +03:00
Gitoido Okaski
68374017e1
chore: changelog
2026-10-18 01:04:29 +03:00
ewwww
120520f51d
vikavolt animations + cries for grubbin, charjabug, & vikavolt
2026-10-17 18:01:25 -04:00
Gitoido Okaski
e8dea9773a
feat: make sure zangoose and zeviper 100% hate each other
2026-10-18 00:59:40 +03:00
Gitoido Okaski
7b31e6bcc4
feat: make sure hate task uses new values from config and gamerule
2026-10-18 00:59:10 +03:00
Gitoido Okaski
c6ffca639f
feat: pokemon predation chance config i18n
2026-10-18 00:58:40 +03:00
Gitoido Okaski
c491a1f7ca
feat: introduce pokemon predation chance config
2026-10-18 00:56:06 +03:00
Gitoido Okaski
0b333b743d
feat: introduce pokemon predation gamerule
2026-10-18 00:55:54 +03:00
ewwww
95e79865e5
updated posers for fennekin & braixen
2026-10-17 16:24:40 -04:00
Gitoido Okaski
0e2860cd90
chore: import cleanup skip_ci
2026-10-17 23:14:08 +03:00
Gitoido Okaski
3259bf032c
chore: changelog skip_ci
2026-10-17 23:10:15 +03:00
Gitoido Okaski
116205cdf1
fix: Anger should be directed at proper target
2026-10-17 20:07:18 +00:00
ewwww
43277d18dc
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2026-10-17 13:37:05 -04:00
Polymeta
86153419ee
Merge branch 'implement_pokemon' into 'main'
...
implement_pokemon
See merge request cable-mc/cobblemon!2480
2026-10-17 17:36:00 +00:00
Gitoido Okaski
2b4d9c451c
fix: Various poser/animation fixes (Wave 3.4.1)
2026-10-17 20:07:17 +03:00
Gitoido Okaski
7f0e2fa9d8
fix: Various poser/animation fixes (Wave 3.3)
2026-10-17 19:43:00 +03:00
Gitoido Okaski
e165095bd5
fix: Various poser/animation fixes (Wave 3.2.1)
2026-10-17 19:38:06 +03:00
Gitoido Okaski
b8708d6e10
fix: Various poser/animation fixes (Wave 3.2)
2026-10-17 19:36:25 +03:00
Kenji_64
ef536390ca
Various poser/animation fixes (Wave 3.1). The rats make me crazy.
2026-10-17 18:27:28 +02:00
ewwww
28befab173
cries for combee & vespiquen
2026-10-17 12:22:20 -04:00
ewwww
c142439d5b
cries for wurmple, silcoon, cascoon. beautifly, & dustox
2026-10-17 12:21:49 -04:00
Jerzykv
1ca7335654
Various poser/animation fixes (Wave 3)
2026-10-17 18:18:39 +02:00
ewwww
9197d9cdcd
cries for runerigus
2026-10-17 11:52:04 -04:00
ewwww
f75813e64d
cries for dusknoir
2026-10-17 11:45:44 -04:00
ewwww
1f617c76a4
cries for torkoal
2026-10-17 11:45:20 -04:00
ewwww
ebf573aa7a
cries for surskit & masquerain
2026-10-17 11:44:29 -04:00
Kenji_64
75363da470
Various poser/animation fixes (Wave 2.5)
2026-10-17 17:42:04 +02:00
ewwww
cce4b932cc
cries for hoppip, skiploom, & jumpluff
2026-10-17 11:41:45 -04:00
Kenji_64
0973e1ced0
Various poser/animation fixes (Wave 2)
2026-10-17 17:31:30 +02:00
Kenji_64
e7b5c84024
Various poser/animation fixes
2026-10-17 13:43:58 +02:00
ewwww
4001cc2a89
vikavolt animations + cries for grubbin, charjabug, & vikavolt
2026-10-17 06:08:31 -04:00
Polymeta
6e57d77d10
Merge branch 'More-Structure-Fixes' into 'main'
...
More structure fixes
See merge request cable-mc/cobblemon!2491
2026-10-16 22:54:46 +00:00
Slippy
2206d96a6e
Lots of fixing
2026-10-16 14:26:55 -05:00
Slippy
33f05858f1
structure fixes for .3
2026-10-16 13:34:04 -05:00
Watuneni iteite
8443b88c16
Translated using Weblate (Japanese)
...
Currently translated at 99.0% (9500 of 9587 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ja/
2026-10-16 17:12:33 +00:00
ewwww
a4f204a5a3
changelog
2026-10-16 06:06:11 -04:00
ewwww
31b6be2164
applin & flapple cry updates + cries for appletun & dipplin
2026-10-16 06:06:00 -04:00
ewwww
0dbf73067b
houndour & houndoom cries
2026-10-16 06:03:48 -04:00
ewwww
775703e1f5
starly, staravia, and staraptor cries
2026-10-16 06:03:20 -04:00
Polymeta
bcdfef4886
Merge branch 'lights-out' into 'main'
...
Bye Bye Magmarizer Glow
See merge request cable-mc/cobblemon!2490
2026-10-16 06:49:58 +00:00
dhi_holo
a19adb463b
Bye Bye Magmarizer Glow
...
- Removed Dynamic Lights data from the Magmarizer item for consistency with the block
2026-10-16 16:32:05 +10:00
Gustavo Puerari
b71208299f
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 96.7% (9276 of 9587 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/pt_BR/
2026-10-15 18:07:01 +00:00
Watuneni iteite
136b5824b0
Translated using Weblate (Japanese)
...
Currently translated at 98.7% (9464 of 9587 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ja/
2026-10-15 18:06:58 +00:00
Polymeta
5004edbbb6
Merge branch 'fix/party-overlay-hide-nf' into 'main'
...
fix: party overlay not hiding when player opens the pokedex scanner
Closes #2071
See merge request cable-mc/cobblemon!2467
2026-10-15 15:37:49 +00:00
Gitoido Okaski
d8bdd6329a
fix: tidy-up even more
2026-10-15 17:57:42 +03:00
Gitoido Okaski
82d56637a0
chore: method signature name
2026-10-15 17:07:28 +03:00
Gitoido Okaski
7232a43816
refactor: move and enqueue client event registration to separate fn, homogenizing behavior with common side registration
2026-10-15 17:05:50 +03:00
Gitoido Okaski
098eb7d14b
chore: tidy up changelog skip-ci
2026-10-15 16:22:30 +03:00
Gitoido Okaski
835b70ed48
feat: AppleSkin compat for dex scanner mode
2026-10-15 13:20:53 +00:00
Gitoido
9d828a86fb
fix: party overlay not hiding when player opens the pokedex scanner
2026-10-15 13:20:53 +00:00
Polymeta
910551ee70
Merge branch 'fix/berry-pots' into 'main'
...
fix: flower pots require some tending on neoforge
Closes #2126
See merge request cable-mc/cobblemon!2486
2026-10-15 07:17:23 +00:00
ewwww
9beee548d4
Merge branch 'main' into implement_pokemon
2026-10-15 01:30:50 -04:00
Watuneni iteite
f9189b265f
Translated using Weblate (Japanese)
...
Currently translated at 98.7% (9464 of 9587 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ja/
2026-10-14 15:27:44 +00:00
Polymeta
6f3894f27b
fix playermolang sometimes failing when they die
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-14 13:33:40 +01:00
Polymeta
bbc9a5e62e
Merge branch 'campfire-book-lies' into 'main'
...
Recipe Book Lies No More
See merge request cable-mc/cobblemon!2487
2026-10-14 11:32:52 +00:00
Gitoido Okaski
94765da04a
chore: small tidy-up
2026-10-14 14:11:30 +03:00
dhi_holo
8caa82f123
Recipe Book Lies No More
...
Changed the icon for the misc category
2026-10-14 18:42:58 +10:00
dhi_holo
8e1fcc6f14
Structure Spawn Tags
...
Feel free to rename, delete, or rework any of these, it's moreso just setting the groundwork
`spawns/is_aquatic_monument` - Ocean Monuments and related structures
`spawns/is_aquatic_ruins` - Ocean Ruins and similar structures
`spawns/is_civilization` - Village and Towns tag, for anything that should spawn at any kind of village/town
`spawns/is_desert_monument` - Desert Pyramids and Temples
`spawns/is_dungeon` - Modded tag, the idea is things of the Stronghold *vibe*, but not being literal strongholds
`spawns/is_end_structure` - End Cities and related structures
`spawns/is_graveyard` - Modded tag, graveyards and crypts
`spawns/is_igloo` - just the vanilla igloo, it's me just wanting stuff in tags where it isn't yet so if some addon wants to give igloos another place they can
`spawns/is_illager_outpost` - small settlements for illagers, such as campsites and other small watchtower-like things
`spawns/is_illager_structure` - Bigger illager structures, the mansion, manors, stuff that has a sense of "infrastructure" I suppose
`spawns/is_jungle_monument` - Jungle Temples and Pyramids
`spawns/is_nether_structure` - is a structure of the Nether
`spawns/is_piglin_structure` - is a structure specifically inhabited by Piglins. Can be used to either add stuff specifically around Piglins, or to prevent things around them
`spawns/is_ruins` - Taking what we have as ruins and just applying that logic to other mods
`spawns/is_shipwreck` - not sure if we use this for spawns, but if we do this can be hooked into, if not then this could be deleted, no hassle, just felt like a logical thing to include. Is related to "surface" shipwrecks, not things like the coves
`spawns/is_witch_structure` - witch structures, like huts, villages, etc. Also added any structures that force black cat spawning, as that's used to reference to witches in the vanilla tags
Mods used within the tags so far:
https://modrinth.com/mod/dungeons-and-taverns (`nova_structures`)
A lot of https://modrinth.com/organization/nuVP8uUG mods (the Yung structure ones, usually starts as `better` and then the structure name)
https://modrinth.com/mod/enderscape
https://modrinth.com/mod/aquamirae
https://modrinth.com/mod/terralith
Will continue to investigate mods to add to these
2026-10-14 17:54:34 +10:00
Watuneni iteite
21c4d0233d
Translated using Weblate (Japanese)
...
Currently translated at 98.7% (9464 of 9587 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ja/
2026-10-13 12:09:59 +00:00
Hiroku
2f87d53af6
Merge remote-tracking branch 'origin/lang-updates'
2026-10-13 17:34:12 +10:00
Gitoido Okaski
131ef31492
fix: tend to the pots registration on neoforge
2026-10-13 03:38:13 +03:00
Gitoido Okaski
b6b067b1d3
chore: changelog skip-ci
2026-10-13 03:35:28 +03:00
RedGenesectNinja
546f10eca7
Gave Audino its alpha eyes back
2026-10-12 19:19:05 -05:00
Polymeta
542839ba69
bump neoforge version
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-12 14:36:24 +01:00
Landon
efab1bba08
Merge branch 'fix/custom-choice-feature-tab-completion' into 'main'
...
fix: choice properties must always tab complete
See merge request cable-mc/cobblemon!2483
2026-10-12 08:42:42 +00:00
Landon
8f986bc326
Merge branch 'fix/molang-fn-changes' into 'main'
...
fix: behavior of `q.pokemon.nature` and `q.entity.is_looking_at`
Closes #2113
See merge request cable-mc/cobblemon!2482
2026-10-12 08:41:14 +00:00
Polymeta
e155d32aaf
small pokeball fix
...
Closes #1601
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-12 08:54:52 +01:00
Polymeta
743e0b7d66
changelog [skip-ci]
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-12 07:49:14 +01:00
Polymeta
1518d703f9
Merge branch 'restore-the-menu' into 'main'
...
Fixed Mixins for Recipe Book causing conflict issues with other mods.
See merge request cable-mc/cobblemon!2484
2026-10-12 06:44:16 +00:00
Gertimoshka
af9d851d67
Fixed Mixins being aggresive, causing massive issues with mod compatibility
2026-10-12 00:17:09 +02:00
Polymeta
20ca91f1c9
fix friendship booster item tag location
...
Closes #2125
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-11 21:15:53 +01:00
Polymeta
6fb3c0e49a
more evo dex fixes and crashes
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-11 21:12:22 +01:00
Watuneni iteite
5cb4ff5f5f
Translated using Weblate (Japanese)
...
Currently translated at 100.0% (9464 of 9464 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ja/
2026-10-11 15:26:12 +00:00
Gitoido
5b0c34ce9a
feat+refactor: add separate molang script modifier and rename og molang modifier to expression
2026-10-11 14:17:09 +03:00
Gitoido
37f70903c5
refactor: use java.awt.Color as beam color
...
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt i/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
index 76f32afff4..a4297de4c4 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
@@ -37,6 +37,7 @@ import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
import com.cobblemon.mod.common.util.adapters.FloatNumberRangeAdapter
import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
import com.cobblemon.mod.common.util.adapters.IntRangeAdapter
+import com.cobblemon.mod.common.util.adapters.LiteralHexColorAdapter
import com.cobblemon.mod.common.util.asExpressionLike
import com.cobblemon.mod.common.util.cobblemonResource
import com.google.gson.Gson
@@ -47,6 +48,7 @@ import net.minecraft.resources.ResourceLocation
import net.minecraft.server.level.ServerPlayer
import net.minecraft.server.packs.PackType
import net.minecraft.util.LowerCaseEnumTypeAdapterFactory
+import java.awt.Color
import kotlin.math.roundToInt
/**
@@ -68,6 +70,7 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
.registerTypeAdapter(MinMaxBounds.Doubles::class.java, FloatNumberRangeAdapter)
.registerTypeAdapter(CatchRateModifier::class.java, CobblemonCatchRateModifierAdapter)
.registerTypeAdapter(CaptureEffect::class.java, CobblemonCaptureEffectAdapter)
+ .registerTypeAdapter(Color::class.java, LiteralHexColorAdapter)
.registerTypeAdapterFactory(LowerCaseEnumTypeAdapterFactory())
.disableHtmlEscaping()
.setPrettyPrinting()
@@ -384,7 +387,7 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
model3d: ResourceLocation = cobblemonResource("item/${name}_model"),
throwPower: Float = 1.25f,
ancient: Boolean = false,
- color: String = "#ff1111"
+ color: Color = Color.decode("#ff1111")
): PokeBall {
val identifier = cobblemonResource(name)
val pokeball = PokeBall(identifier, modifier, effects, PokeBall.PokeBallProperties(), waterDragValue, model2d, model3d, throwPower, ancient, color)
@@ -396,6 +399,4 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
val identifier = cobblemonResource(name)
return this.custom[identifier] ?: this.defaults[identifier]!!
}
-
- fun isAncient(identifier: ResourceLocation) = this.getPokeBall(identifier).ancient
}
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt i/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt
index cf2b05173c..a82ada3eda 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt
@@ -56,6 +56,6 @@ class EmptyPokeBallClientDelegate : PokeBallPosableState(), EntitySideDelegate<E
}
fun getBeamColor(): Vector4f {
- return Integer.decode(currentEntity.pokeBall.beamColor).toRGBA()
+ return currentEntity.pokeBall.beamColor.rgb.toRGBA()
}
}
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt i/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
index 70538ec1af..ed39f7ed1e 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
@@ -325,7 +325,7 @@ class PokemonRenderer(
val beamColorVec4f = when(beamTarget) {
is EmptyPokeBallEntity -> (beamTarget.delegate as EmptyPokeBallClientDelegate).getBeamColor()
- else -> Integer.decode(entity.pokemon.caughtBall.beamColor).toRGBA()
+ else -> entity.pokemon.caughtBall.beamColor.rgb.toRGBA()
}
val beamSourcePosition = when {
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt i/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
index 638ef99a98..d159237173 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
@@ -23,6 +23,7 @@ import net.minecraft.resources.ResourceLocation
import net.minecraft.world.item.Item
import net.minecraft.world.item.ItemStack
import net.minecraft.world.item.Rarity
+import java.awt.Color
/**
* Base poke ball object
@@ -48,17 +49,10 @@ class PokeBall(
val model3d: ResourceLocation,
val throwPower: Float,
val ancient: Boolean = false,
- val beamColor: String
+ val beamColor: Color
) {
- init {
- // color needs to be a hex string
- if (!"""#[a-zA-Z0-9]{6}""".toRegex().matches(beamColor)) {
- throw RuntimeException("")
- }
- }
-
@Transient
- val struct = ObjectValue<PokeBall>(this)
+ val struct = ObjectValue(this)
.addPokeBallFunctions(this)
// .addFunction("item") { } // requires a registry which is hard
2026-10-11 14:17:07 +03:00
Gitoido
1149880926
chore: cleanup PokeBallComponent
2026-10-11 14:16:37 +03:00
Gitoido
42d569b4fa
refactor: caught ball fallback to strange ball in case of datapack removal
2026-10-11 14:16:36 +03:00
Gitoido
f1f1f183f1
feat: shedders evo custom ball support
2026-10-11 14:16:36 +03:00
Gitoido
c4fdb4c89e
refactor: default to strange ball instead of poke ball for some cases. code cleanup
2026-10-11 14:16:36 +03:00
Gitoido
87510acd17
feat: strange ball i18n
2026-10-11 14:16:36 +03:00
Gitoido
dc8821ed8d
refactor: update item renderer and model loader mixins to account for custom balls
2026-10-11 14:16:36 +03:00
Gitoido
04478d7807
feat: recall beam now uses correct beam color for ball
2026-10-11 14:16:36 +03:00
Gitoido
f708c1bddb
feat: molang effects - functional MVP is complete
2026-10-11 14:16:36 +03:00
Gitoido
97b7cf4bee
feat: very very very temporary assets for testing purposes
2026-10-11 14:16:36 +03:00
Gitoido
0447ecded7
feat+refactor: add MoLangModifier, remove deprecated poke ball getters
2026-10-11 14:16:36 +03:00
Gitoido
ab9e73d3ec
fix: add strange ball to poke_balls item tag
2026-10-11 14:16:36 +03:00
Gitoido
d34a0d28aa
refactor: use correct ball name in battle log
2026-10-11 14:16:36 +03:00
Gitoido
d46627d24e
fix: drop correct pokeball stack on wall hit/drop
2026-10-11 14:16:36 +03:00
Gitoido
9f5c76fc0b
refactor: strange ball defaults for EmptyPokeBallEntity
2026-10-11 14:16:36 +03:00
Gitoido
94e12787a2
feat: add possibility to change beam color of poke ball
...
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt i/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
index 8f50077bca..7180368028 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
@@ -8,6 +8,7 @@
package com.cobblemon.mod.common.api.pokeball
+import com.cobblemon.mod.common.Cobblemon
import com.cobblemon.mod.common.api.Priority
import com.cobblemon.mod.common.api.data.JsonDataRegistry
import com.cobblemon.mod.common.api.events.CobblemonEvents
@@ -332,7 +333,9 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
}
override fun reload(data: Map<ResourceLocation, PokeBall>) {
+ data.entries.forEach { it.value.name = it.key }
this.custom.clear()
+
data.forEach { (location, ball) ->
if (defaults.containsKey(location)) {
ball.stack = defaults[location]!!.stack
@@ -342,6 +345,8 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
this.custom[location] = ball
}
+
+ Cobblemon.LOGGER.info("Loaded ${data.size} custom poke balls.")
}
override fun sync(player: ServerPlayer) {
@@ -367,10 +372,11 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
model2d: ResourceLocation = cobblemonResource(name),
model3d: ResourceLocation = cobblemonResource("item/${name}_model"),
throwPower: Float = 1.25f,
- ancient: Boolean = false
+ ancient: Boolean = false,
+ color: String = "#ff1111"
): PokeBall {
val identifier = cobblemonResource(name)
- val pokeball = PokeBall(identifier, modifier, effects, PokeBall.PokeBallProperties(), waterDragValue, model2d, model3d, throwPower, ancient)
+ val pokeball = PokeBall(identifier, modifier, effects, PokeBall.PokeBallProperties(), waterDragValue, model2d, model3d, throwPower, ancient, color)
this.defaults[identifier] = pokeball
return pokeball
}
@@ -380,7 +386,7 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
return this.custom[identifier] ?: this.defaults[identifier]!!
}
- fun isAncient(identifier: ResourceLocation) = this.getPokeBall(identifier)?.ancient ?: false
+ fun isAncient(identifier: ResourceLocation) = this.getPokeBall(identifier).ancient
/**
* Backwards compatibility getters
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt i/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt
index 944dda3995..b8a34288d6 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt
@@ -16,7 +16,9 @@ import com.cobblemon.mod.common.client.render.pokeball.PokeBallPosableState
import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity
import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity.CaptureState
import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity.CaptureState.NOT
+import com.cobblemon.mod.common.util.toRGBA
import net.minecraft.network.syncher.EntityDataAccessor
+import org.joml.Vector4f
class EmptyPokeBallClientDelegate : PokeBallPosableState(), EntitySideDelegate<EmptyPokeBallEntity> {
override val stateEmitter: SettableObservable<CaptureState> = SettableObservable(NOT)
@@ -52,4 +54,8 @@ class EmptyPokeBallClientDelegate : PokeBallPosableState(), EntitySideDelegate<E
EmptyPokeBallEntity.ASPECTS -> currentAspects = currentEntity.aspects
}
}
-}
\ No newline at end of file
+
+ fun getBeamColor(): Vector4f {
+ return Integer.decode(currentEntity.pokeBall.color).toRGBA()
+ }
+}
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt i/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
index d55550f02a..227a03f4e0 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.OrientationControllable
import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
import com.cobblemon.mod.common.client.CobblemonClient
import com.cobblemon.mod.common.client.battle.ClientBallDisplay
+import com.cobblemon.mod.common.client.entity.EmptyPokeBallClientDelegate
import com.cobblemon.mod.common.client.entity.NPCClientDelegate
import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
import com.cobblemon.mod.common.client.entity.PokemonClientDelegate.Companion.BEAM_EXTEND_TIME
@@ -320,6 +321,11 @@ class PokemonRenderer(
val pokemonPosition = entity.position().add(0.0, entity.bbHeight / 2.0 * clientDelegate.activeSendoutScale.toDouble(), 0.0)
val recallBallOrigin = (beamTarget as? Player)?.let { RecallArmAnimationTracker.get(it.uuid)?.beamOrigin }
+ val beamColorVec4f = when(beamTarget) {
+ is EmptyPokeBallEntity -> (beamTarget.delegate as EmptyPokeBallClientDelegate).getBeamColor()
+ else -> recallBeamColour
+ }
+
val beamSourcePosition = when {
// cover the recall ball origin presence
recallBallOrigin != null -> recallBallOrigin
@@ -385,10 +391,10 @@ class PokemonRenderer(
partialTicks = partialTicks,
totalLevelTime = entity.level().gameTime,
height = pokemonPosition.distanceTo(beamSourcePosition.add(offset)).toFloat() * ratio,
- red = recallBeamColour.x,
- green = recallBeamColour.y,
- blue = recallBeamColour.z,
- alpha = recallBeamColour.w,
+ red = beamColorVec4f.x,
+ green = beamColorVec4f.y,
+ blue = beamColorVec4f.z,
+ alpha = beamColorVec4f.w,
beamRadius = 0.03F,
glowRadius = 0.07F,
glowAlpha = 0.4F
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt i/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
index 77c9bc35d4..98168a053e 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
@@ -19,9 +19,9 @@ import com.cobblemon.mod.common.pokemon.Pokemon
import com.cobblemon.mod.common.util.cobblemonResource
import com.cobblemon.mod.common.util.codec.CodecUtils
import com.mojang.serialization.Codec
-import net.minecraft.world.item.ItemStack
import net.minecraft.resources.ResourceLocation
import net.minecraft.world.item.Item
+import net.minecraft.world.item.ItemStack
import net.minecraft.world.item.Rarity
/**
@@ -35,9 +35,11 @@ import net.minecraft.world.item.Rarity
* @property model2d The identifier for the resource this Pokéball will use for the 2d model.
* @property model3d The identifier for the resource this Pokéball will use for the 3d model.
* @property ancient Marks this Pokéball as ancient, which makes it play different animations on catch hops
+ * @property color Defines the beam color of pokeball
*/
class PokeBall(
- val name: ResourceLocation = cobblemonResource("strange_ball"),
+ @Transient // Assigns in PokeBalls.reload
+ var name: ResourceLocation = cobblemonResource("strange_ball"),
val catchRateModifier: CatchRateModifier = CatchRateModifier.DUMMY,
val effects: List<CaptureEffect> = listOf(),
val itemProperties: PokeBallProperties = PokeBallProperties(),
@@ -45,12 +47,15 @@ class PokeBall(
val model2d: ResourceLocation,
val model3d: ResourceLocation,
val throwPower: Float,
- val ancient: Boolean = false
+ val ancient: Boolean = false,
+ val color: String
) {
- data class PokeBallProperties(
- val fireResistant: Boolean = false,
- val rarity: Rarity = Rarity.COMMON
- )
+ init {
+ // color needs to be a hex string
+ if (!"""#[a-zA-Z0-9]{6}""".toRegex().matches(color)) {
+ throw RuntimeException("")
+ }
+ }
@Transient
val struct = QueryStruct(hashMapOf())
@@ -84,7 +89,6 @@ class PokeBall(
if (this.name == PokeBalls.SAFARI_BALL.name) target.maxHealth else target.currentHealth
companion object {
-
@JvmStatic
val BY_IDENTIFIER_CODEC: Codec<PokeBall> = CodecUtils.createByIdentifierCodec(
PokeBalls::getPokeBall,
@@ -92,4 +96,9 @@ class PokeBall(
) { identifier -> "No PokeBall for ID $identifier" }
}
+
+ data class PokeBallProperties(
+ val fireResistant: Boolean = false,
+ val rarity: Rarity = Rarity.COMMON
+ )
}
2026-10-11 14:16:33 +03:00
Gitoido
2cd0686537
fix: default value for pokeball root bone in its posable state
2026-10-11 14:15:18 +03:00
Gitoido
9c539d7aaf
refactor: derive poke ball name from component or lack of thereof
2026-10-11 14:15:18 +03:00
Gitoido
1ee2374923
feat: step 3 - add the Strange Ball, allow reading pokeballs from json, stubs for capture effects
...
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItemComponents.kt i/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItemComponents.kt
index bb3997bf27..bb67ce206f 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItemComponents.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItemComponents.kt
@@ -99,6 +99,12 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
.networkSynchronized(ByteBufCodecs.BOOL)
.build())
+ @JvmField
+ val POKE_BALL: DataComponentType<PokeBallComponent> = create("poke_ball", DataComponentType.builder<PokeBallComponent>()
+ .persistent(PokeBallComponent.CODEC)
+ .networkSynchronized(PokeBallComponent.PACKET_CODEC)
+ .build())
+
fun register() {
Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:pokemon_item"), POKEMON_ITEM)
Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:bait"), BAIT)
@@ -112,9 +118,10 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:food"), FOOD)
Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:mob_effects"), MOB_EFFECTS)
Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:held_item_effect"), HELD_ITEM_EFFECT)
+ Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:poke_ball"), POKE_BALL)
}
override val registry = BuiltInRegistries.DATA_COMPONENT_TYPE
override val resourceKey = Registries.DATA_COMPONENT_TYPE
-}
\ No newline at end of file
+}
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt i/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
index 02d78b1c4d..e6ff6f3bf6 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
@@ -172,6 +172,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
val ANCIENT_GIGATON_BALL = pokeBallItem(PokeBalls.ANCIENT_GIGATON_BALL)
@JvmField
val ANCIENT_ORIGIN_BALL = pokeBallItem(PokeBalls.ANCIENT_ORIGIN_BALL)
+ @JvmField
+ val STRANGE_BALL = pokeBallItem(PokeBalls.STRANGE_BALL)
val pokedexes = mutableListOf<PokedexItem>()
@JvmField
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt i/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
index cc7f986bd8..8f50077bca 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt
@@ -21,14 +21,22 @@ import com.cobblemon.mod.common.api.pokemon.stats.Stats
import com.cobblemon.mod.common.api.pokemon.status.Statuses
import com.cobblemon.mod.common.api.reactive.SimpleObservable
import com.cobblemon.mod.common.api.types.ElementalTypes
+import com.cobblemon.mod.common.item.components.PokeBallComponent
import com.cobblemon.mod.common.pokeball.PokeBall
+import com.cobblemon.mod.common.util.adapters.CobblemonCaptureEffectAdapter
+import com.cobblemon.mod.common.util.adapters.CobblemonCatchRateModifierAdapter
+import com.cobblemon.mod.common.util.adapters.FloatNumberRangeAdapter
+import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
+import com.cobblemon.mod.common.util.adapters.IntRangeAdapter
import com.cobblemon.mod.common.util.cobblemonResource
import com.google.gson.Gson
import com.google.gson.GsonBuilder
import com.google.gson.reflect.TypeToken
+import net.minecraft.advancements.critereon.MinMaxBounds
import net.minecraft.resources.ResourceLocation
import net.minecraft.server.level.ServerPlayer
import net.minecraft.server.packs.PackType
+import net.minecraft.util.LowerCaseEnumTypeAdapterFactory
import kotlin.math.roundToInt
/**
@@ -43,6 +51,12 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
// ToDo once datapack pokeball is implemented add required adapters here
override val gson: Gson = GsonBuilder()
+ .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
+ .registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
+ .registerTypeAdapter(MinMaxBounds.Doubles::class.java, FloatNumberRangeAdapter)
+ .registerTypeAdapter(CatchRateModifier::class.java, CobblemonCatchRateModifierAdapter)
+ .registerTypeAdapter(CaptureEffect::class.java, CobblemonCaptureEffectAdapter)
+ .registerTypeAdapterFactory(LowerCaseEnumTypeAdapterFactory())
.disableHtmlEscaping()
.setPrettyPrinting()
.create()
@@ -50,8 +64,8 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
override val resourcePath = "pokeballs"
private val defaults = hashMapOf<ResourceLocation, PokeBall>()
- // ToDo datapack pokeball type here instead
- private val custom = hashMapOf<ResourceLocation, PokeBall>()
+
+ val custom = hashMapOf<ResourceLocation, PokeBall>()
@JvmStatic
@get:JvmName("getPokeBall")
@@ -245,6 +259,10 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
@get:JvmName("getAncientOriginBall")
val ANCIENT_ORIGIN_BALL
get() = this.byName("ancient_origin_ball")
+ @JvmStatic
+ @get:JvmName("getStrangeBall")
+ val STRANGE_BALL
+ get() = this.byName("strange_ball")
init {
createDefault("poke_ball")
@@ -257,7 +275,7 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
createDefault("ultra_ball", MultiplierModifier(2F))
createDefault("master_ball", GuaranteedModifier())
createDefault("safari_ball", CatchRateModifiers.SAFARI)
- createDefault("fast_ball", BaseStatModifier(Stats.SPEED, { it >= 100 }, 4F))
+ createDefault("fast_ball", BaseStatModifier(Stats.SPEED, 100, BaseStatModifier.Comparator.GTE, 4F))
createDefault("level_ball", CatchRateModifiers.LEVEL)
createDefault("lure_ball", CatchRateModifiers.LURE)
createDefault("heavy_ball", CatchRateModifiers.WEIGHT_BASED)
@@ -295,6 +313,9 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
createDefault("ancient_wing_ball", MultiplierModifier(1.5F), throwPower = 2.5f, ancient = true)
createDefault("ancient_jet_ball", MultiplierModifier(2F), throwPower = 2.5f, ancient = true)
createDefault("ancient_origin_ball", GuaranteedModifier(), ancient = true)
+ // for customs
+ createDefault("strange_ball")
+
// Luxury ball effect, low priority as it must be triggered before soothe bell as of gen 4
CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(priority = Priority.LOW) { event ->
if (!event.earned) {
@@ -312,7 +333,15 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
override fun reload(data: Map<ResourceLocation, PokeBall>) {
this.custom.clear()
- // ToDo once datapack pokeball is implemented load them here, we will want datapacks to be able to override our default pokeballs too, however they will never be able to disable them
+ data.forEach { (location, ball) ->
+ if (defaults.containsKey(location)) {
+ ball.stack = defaults[location]!!.stack
+ } else {
+ ball.stack = PokeBallComponent.createStack(ball)
+ }
+
+ this.custom[location] = ball
+ }
}
override fun sync(player: ServerPlayer) {
@@ -321,10 +350,11 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
/**
* Gets a Pokeball from registry name.
- * @return the pokeball object if found otherwise null.
+ * @return the pokeball object if found otherwise strange ball.
*/
@JvmStatic
- fun getPokeBall(name : ResourceLocation): PokeBall? = this.custom[name] ?: this.defaults[name]
+ fun getPokeBall(name : ResourceLocation): PokeBall =
+ this.custom[name] ?: this.defaults[name] ?: STRANGE_BALL
@JvmStatic
fun all() = this.defaults.filterKeys { !this.custom.containsKey(it) }.values + this.custom.values
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/catching/effects/FriendshipEarningBoostEffect.kt i/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/catching/effects/FriendshipEarningBoostEffect.kt
index 9dffa52c41..1c5f78f4dc 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/catching/effects/FriendshipEarningBoostEffect.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/catching/effects/FriendshipEarningBoostEffect.kt
@@ -18,6 +18,10 @@ import net.minecraft.world.entity.LivingEntity
*
* @property multiplier The multiplier for friendship gains
*/
-class FriendshipEarningBoostEffect(val multiplier: Float) : CaptureEffect {
+data class FriendshipEarningBoostEffect(val multiplier: Float) : CaptureEffect {
+ companion object {
+ const val VARIANT = "friendship_boost"
+ }
+
override fun apply(thrower: LivingEntity, pokemon: Pokemon) {}
-}
\ No newline at end of file
+}
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/item/components/PokeBallComponent.kt i/common/src/main/kotlin/com/cobblemon/mod/common/item/components/PokeBallComponent.kt
new file mode 100644
index 0000000000..12517ee396
--- /dev/null
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/item/components/PokeBallComponent.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/ .
+ */
+
+package com.cobblemon.mod.common.item.components
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.CobblemonItemComponents
+import com.cobblemon.mod.common.CobblemonItems
+import com.cobblemon.mod.common.api.pokeball.PokeBalls
+import com.cobblemon.mod.common.pokeball.PokeBall
+import com.mojang.serialization.Codec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import io.netty.buffer.ByteBuf
+import net.minecraft.network.codec.ByteBufCodecs
+import net.minecraft.network.codec.StreamCodec
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.item.ItemStack
+
+data class PokeBallComponent(val name: ResourceLocation) {
+ companion object {
+ // Codec to serialize/deserialize PokeBall
+ val CODEC: Codec<PokeBallComponent> = RecordCodecBuilder.create { instance ->
+ instance.group(
+ ResourceLocation.CODEC.fieldOf("move").forGetter { it.name } // Serialize the move's name
+ ).apply(instance) { name -> PokeBallComponent(name) }
+ }
+
+ val PACKET_CODEC: StreamCodec<ByteBuf, PokeBallComponent> = ByteBufCodecs.fromCodec(CODEC)
+
+ fun getPokeBall(stack: ItemStack): PokeBall? {
+ return stack.get(CobblemonItemComponents.POKE_BALL)?.name?.let(PokeBalls::getPokeBall)
+ }
+
+ fun setPokeBall(stack: ItemStack, ball: PokeBall): ItemStack {
+ stack.set(CobblemonItemComponents.POKE_BALL, PokeBallComponent(ball.name))
+ return stack
+ }
+
+ fun removePokeBall(stack: ItemStack): ItemStack {
+ stack.remove(CobblemonItemComponents.POKE_BALL)
+ return stack
+ }
+
+ fun createStack(ball: PokeBall?): ItemStack {
+ var result = PokeBalls.STRANGE_BALL
+ if (ball == null) {
+ Cobblemon.LOGGER.error("Attempted to create poke ball stack with null config, falling to strange ball.")
+ } else {
+ result = ball
+ }
+ val stack = ItemStack(CobblemonItems.STRANGE_BALL)
+ return setPokeBall(stack, result)
+ }
+
+ }
+
+ constructor(component: PokeBallComponent): this(component.name)
+
+ val ball: PokeBall
+ get() = PokeBalls.getPokeBall(name)
+}
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt i/common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt
index 23cd696bea..c2990fbb80 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt
@@ -11,10 +11,12 @@ package com.cobblemon.mod.common.item.group
import com.cobblemon.mod.common.Cobblemon
import com.cobblemon.mod.common.CobblemonItemComponents
import com.cobblemon.mod.common.CobblemonItems
+import com.cobblemon.mod.common.api.pokeball.PokeBalls
import com.cobblemon.mod.common.api.riding.stats.RidingStat
import com.cobblemon.mod.common.api.tms.TechnicalMachines
import com.cobblemon.mod.common.block.TypeGemClusterBlock
import com.cobblemon.mod.common.item.AprijuiceItem
+import com.cobblemon.mod.common.item.components.PokeBallComponent
import com.cobblemon.mod.common.item.components.RideBoostsComponent
import com.cobblemon.mod.common.item.components.TMMoveComponent
import com.cobblemon.mod.common.util.cobblemonResource
@@ -943,6 +945,11 @@ object CobblemonItemGroups {
private fun utilityItemEntries(displayContext: ItemDisplayParameters, entries: Output) {
CobblemonItems.pokeBalls.forEach(entries::accept)
+
+ PokeBalls.custom
+ .filter { (_, value) -> CobblemonItems.pokeBalls.none { it.pokeBall.name == value.name } }
+ .forEach { entries.accept(PokeBallComponent.createStack(it.value)) }
+
CobblemonItems.pokeRods.forEach(entries::accept)
CobblemonItems.pokedexes.forEach(entries::accept)
}
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt i/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
index 1644797628..77c9bc35d4 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/PokeBall.kt
@@ -34,9 +34,10 @@ import net.minecraft.world.item.Rarity
* @property waterDragValue The value of the water drag modifier when the entity travels, default is 0.8.
* @property model2d The identifier for the resource this Pokéball will use for the 2d model.
* @property model3d The identifier for the resource this Pokéball will use for the 3d model.
+ * @property ancient Marks this Pokéball as ancient, which makes it play different animations on catch hops
*/
-open class PokeBall(
- val name: ResourceLocation = cobblemonResource("weird_ball"),
+class PokeBall(
+ val name: ResourceLocation = cobblemonResource("strange_ball"),
val catchRateModifier: CatchRateModifier = CatchRateModifier.DUMMY,
val effects: List<CaptureEffect> = listOf(),
val itemProperties: PokeBallProperties = PokeBallProperties(),
@@ -51,6 +52,7 @@ open class PokeBall(
val rarity: Rarity = Rarity.COMMON
)
+ @Transient
val struct = QueryStruct(hashMapOf())
.addFunction("name") { StringValue(name.toString()) }
.addFunction("water_drag_value") { DoubleValue(waterDragValue) }
@@ -59,6 +61,7 @@ open class PokeBall(
// .addFunction("item") { } // requires a registry which is hard
// This gets attached during item registry
+ @Transient
internal lateinit var stack: ItemStack
fun item(): PokeBallItem = this.stack.item as PokeBallItem
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CobblemonCaptureEffectAdapter.kt i/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CobblemonCaptureEffectAdapter.kt
new file mode 100644
index 0000000000..c57d7ed2f0
--- /dev/null
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CobblemonCaptureEffectAdapter.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/ .
+ */
+
+package com.cobblemon.mod.common.util.adapters
+
+import com.cobblemon.mod.common.api.pokeball.catching.CaptureEffect
+import com.cobblemon.mod.common.util.readString
+import com.cobblemon.mod.common.util.writeString
+import com.google.common.collect.HashBiMap
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import net.minecraft.network.FriendlyByteBuf
+import java.lang.reflect.Type
+import kotlin.reflect.KClass
+
+object CobblemonCaptureEffectAdapter : JsonDeserializer<CaptureEffect>, JsonSerializer<CaptureEffect> {
+ private const val VARIANT = "variant"
+
+ private val types = HashBiMap.create<String, KClass<out CaptureEffect>>()
+
+ val gson: Gson by lazy {
+ GsonBuilder()
+ .registerTypeAdapter(CaptureEffect::class.java, CobblemonCaptureEffectAdapter)
+ .setPrettyPrinting()
+ .create()
+ }
+
+ fun <T : CaptureEffect> registerType(id: String, type: KClass<T>) {
+ this.types[id.lowercase()] = type
+ }
+
+ override fun deserialize(
+ json: JsonElement,
+ typeOfT: Type,
+ context: JsonDeserializationContext,
+ ): CaptureEffect {
+ val variant =
+ json.asJsonObject
+ .get(VARIANT)
+ .asString
+ .lowercase()
+ val type = getModifierType(variant)
+ return context.deserialize(json, type.java)
+ }
+
+ override fun serialize(
+ effect: CaptureEffect,
+ typeOfSrc: Type,
+ context: JsonSerializationContext,
+ ): JsonElement {
+ val json = context.serialize(effect, effect::class.java).asJsonObject
+ val variant = getVariant(effect)
+ json.addProperty(VARIANT, variant)
+ return json
+ }
+
+ fun encode(effect: CaptureEffect, buffer: FriendlyByteBuf) {
+ buffer.writeString(gson.toJson(effect, CaptureEffect::class.java))
+ }
+
+ fun decode(buffer: FriendlyByteBuf): CaptureEffect = gson.fromJson(buffer.readString(), CaptureEffect::class.java)
+
+ private fun getVariant(effect: CaptureEffect): String {
+ val variant =
+ this.types.inverse()[effect::class]
+ ?: throw IllegalArgumentException("Cannot resolve pokeball capture effect for type ${effect::class.qualifiedName}")
+
+ return variant
+ }
+
+ private fun getModifierType(variant: String): KClass<out CaptureEffect> {
+ val effectType =
+ this.types[variant] ?: throw IllegalArgumentException("Cannot resolve pokeball capture effect type for variant $variant")
+
+ return effectType
+ }
+}
diff --git c/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CatchRateModifierAdapter.kt i/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CobblemonCatchRateModifierAdapter.kt
similarity index 94%
rename from common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CatchRateModifierAdapter.kt
rename to common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CobblemonCatchRateModifierAdapter.kt
index 52af19e392..d2199cc29e 100644
--- c/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CatchRateModifierAdapter.kt
+++ i/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CobblemonCatchRateModifierAdapter.kt
@@ -30,7 +30,7 @@ import net.minecraft.resources.ResourceLocation
import java.lang.reflect.Type
import kotlin.reflect.KClass
-object CatchRateModifierAdapter : CatchRateModifierAdapter {
+object CobblemonCatchRateModifierAdapter : CatchRateModifierAdapter {
private const val VARIANT = "variant"
private val types = HashBiMap.create<String, KClass<out CatchRateModifier>>()
@@ -45,7 +45,7 @@ object CatchRateModifierAdapter : CatchRateModifierAdapter {
val gson: Gson by lazy {
GsonBuilder()
- .registerTypeAdapter(CatchRateModifier::class.java, CatchRateModifierAdapter)
+ .registerTypeAdapter(CatchRateModifier::class.java, CobblemonCatchRateModifierAdapter)
.registerTypeAdapter(PokemonProperties::class.java, pokemonPropertiesShortAdapter)
.registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
.registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
@@ -91,14 +91,14 @@ object CatchRateModifierAdapter : CatchRateModifierAdapter {
private fun getVariant(modifier: CatchRateModifier): String {
val variant =
this.types.inverse()[modifier::class]
- ?: throw IllegalArgumentException("Cannot resolve evolution requirement for type ${modifier::class.qualifiedName}")
+ ?: throw IllegalArgumentException("Cannot resolve pokeball catchrate modifier for type ${modifier::class.qualifiedName}")
return variant
}
private fun getModifierType(variant: String): KClass<out CatchRateModifier> {
val requirementType =
- this.types[variant] ?: throw IllegalArgumentException("Cannot resolve evolution requirement type for variant $variant")
+ this.types[variant] ?: throw IllegalArgumentException("Cannot resolve pokeball catchrate modifier type for variant $variant")
return requirementType
}
2026-10-11 14:15:14 +03:00
Gitoido
f6f9d1329d
feat+refactor: introduce CatchRateModifierAdapter and update basic modifiers to support serialization
2026-10-11 14:13:52 +03:00
Gitoido
ae2f91a94d
refactor: better way to derive root bone of pokeball model
2026-10-11 14:13:52 +03:00
Gitoido
74ff99c478
fix: mixed up npc and pokeball poser directories
2026-10-11 14:13:51 +03:00
Gitoido
d6367518c6
refactor: step 2 - lets get rid of hardcoded posers
2026-10-11 14:13:51 +03:00
Gitoido
a2aa4bbd7d
refactor: step 1 - use itemStack
2026-10-11 14:13:51 +03:00
Gitoido
d035c08a5c
chore: tidy up imports
2026-10-11 13:43:38 +03:00
Gitoido
fda7b13f50
fix: choice properties must always tab complete
2026-10-11 13:41:21 +03:00
Kiritiop
fb4aaed220
Edit CHANGELOG.md
2026-10-11 08:57:22 +00:00
Kiritiop
c5e1b37ead
Manual rebase
2026-10-11 08:53:30 +00:00
Kiritiop
2be9d303ea
Added tab completion for the alpha property and three missing property aliases
...
Closes #2072
2026-10-11 08:53:30 +00:00
Kiritiop
99ac6d213a
Added tab completion for the alpha property and three missing property aliases
...
Closes #2072
2026-10-11 08:53:30 +00:00
Gitoido
f595724971
fix: q.entity.is_looking_at now returns proper results based on target passed
2026-10-11 10:55:46 +03:00
Gitoido
0511ba147b
fix: use serialized name in q.pokemon.nature molang fn
2026-10-11 10:49:23 +03:00
Polymeta
760f48d850
Merge branch 'evo-tree-fumble' into 'main'
...
Evo tree now throws a warning instead of crashing when failing to build a mon's evo tree
See merge request cable-mc/cobblemon!2481
2026-10-11 06:41:08 +00:00
lion
bf296b4921
Evo tree now throws a warning instead of crashing when failing to build a mon's evo tree
2026-10-11 06:41:08 +00:00
ewwww
6f4aae8b7d
grubbin, charjabug, and vikavolt are marked as implemented
2026-10-10 23:33:06 -04:00
ewwww
01e5e74e64
snover and abomasnow are marked as implemented
2026-10-10 23:32:49 -04:00
ewwww
b6565a5dee
greavard and houndstone are marked as implemented
2026-10-10 23:29:38 -04:00
Hiroku
49886389cf
Fine the snapshot can be true again
2026-10-11 12:57:43 +10:00
Hiroku
643bf9068b
But what if the snapshot was false
2026-10-11 10:54:55 +10:00
Hiroku
53f3258246
Merge remote-tracking branch 'origin/lang-updates'
2026-10-11 10:53:42 +10:00
Hiroku
1e9895ec84
buncha changelog updates [skip-ci]
2026-10-11 10:49:11 +10:00
Polymeta
52dacb03ae
Merge branch 'evo-tree-pls-behave' into 'main'
...
Evo tree small adjustments
See merge request cable-mc/cobblemon!2479
2026-10-10 23:47:53 +00:00
lion
85b0f3f393
Evo tree small adjustments
2026-10-10 23:47:53 +00:00
Polymeta
a04a91bf24
Merge branch 'feature/evolution-mania' into 'main'
...
tweak some evo requirements
See merge request cable-mc/cobblemon!2476
2026-10-10 21:25:13 +00:00
Polymeta
5e814f7ab5
tweak some evo requirements
2026-10-10 21:25:13 +00:00
Polymeta
2780f491d6
Merge branch 'implement_pokemon' into 'main'
...
implement_pokemon
See merge request cable-mc/cobblemon!2478
2026-10-10 19:44:59 +00:00
ewwww
2d3ec7aff1
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2026-10-10 14:51:28 -04:00
ewwww
cb7baf2696
changelog
2026-10-10 14:51:12 -04:00
Polymeta
5cc069df78
Merge branch 'implement_pokemon' into 'main'
...
Dipplin and Hydrapple shiny fixes
See merge request cable-mc/cobblemon!2477
2026-10-10 16:03:26 +00:00
Polymeta
9222476c1f
Merge branch 'fix/qa-bundle' into 'main'
...
fix: an assortment of qa bugs
Closes #2070
See merge request cable-mc/cobblemon!2473
2026-10-10 15:40:51 +00:00
Kenji_64
f220755f99
Dipplin and Hydrapple shiny fixes
2026-10-10 17:31:21 +02:00
Gitoido
d55bbf237c
chore: move scale changes to other place for now
2026-10-10 18:22:31 +03:00
Watuneni iteite
83a9d44c3a
Translated using Weblate (Japanese)
...
Currently translated at 100.0% (9472 of 9472 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ja/
2026-10-10 14:22:54 +00:00
Polymeta
c5a802eaf6
changelog
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-10 15:04:26 +01:00
Polymeta
2e27875460
Merge branch 'lang-updates'
2026-10-10 15:04:06 +01:00
Polymeta
cd66887faa
[skip-ci] tidy up changelog
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-10 14:11:50 +01:00
Polymeta
d665c87c21
more spawn tweaks
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-10 14:02:26 +01:00
Polymeta
044d3102b6
Merge branch 'fix-evo-tree-crash' into 'main'
...
Fix grotle evolution crashing evo tree and species features not synching to the client
See merge request cable-mc/cobblemon!2456
2026-10-10 12:51:04 +00:00
lion
c421a93b06
Fix grotle evolution crashing evo tree and species features not synching to the client
2026-10-10 12:51:03 +00:00
Polymeta
2865aa2272
Merge branch 'implement_pokemon' into 'main'
...
poser tweaks + jellicent placeholders
See merge request cable-mc/cobblemon!2474
2026-10-10 12:15:04 +00:00
Polymeta
7c4aae3e9d
Merge branch '1.8.2-tag-fixes' into 'main'
...
Fixes to regional tags.
See merge request cable-mc/cobblemon!2475
2026-10-10 12:14:09 +00:00
Veraxiel
d9f671f2a8
Fixes to regional tags.
2026-10-10 07:00:14 -04:00
ewwww
69733b530b
poser tweaks + jellicent placeholders
2026-10-10 05:44:57 -04:00
Gitoido
d4471c30bc
fix: use effective scale instead of scale modifier to get a size category for summary/scanner/molang
2026-10-10 09:38:02 +03:00
Gitoido
185f7e03f5
chore: changelog skip-ci
2026-10-10 09:24:24 +03:00
Gitoido
a45eb0eb21
fix: close and open pc gui silently via command
2026-10-10 09:18:30 +03:00
Polymeta
ed67142379
Merge branch '1.8.2-tag-fixes' into 'main'
...
Updates to some tags to fix some errors and add future biome support.
See merge request cable-mc/cobblemon!2472
2026-10-10 05:46:36 +00:00
Gitoido
13169c6848
fix: align oricorio pau form translation keys
2026-10-10 08:35:25 +03:00
Veraxiel
8be134ee2f
More fixes.
2026-10-09 21:13:26 -04:00
Veraxiel
8c3206a413
Updates to some tags to fix some errors and add future biome support.
2026-10-09 20:03:32 -04:00
Watuneni iteite
4d4c071b95
Translated using Weblate (Japanese)
...
Currently translated at 100.0% (9472 of 9472 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ja/
2026-10-09 23:21:40 +00:00
Polymeta
b82c27754f
Merge branch 'fix/minior-random-core-color' into 'main'
...
fix: minior core color should be decided randomly
See merge request cable-mc/cobblemon!2471
2026-10-09 16:57:27 +00:00
Polymeta
63afec184e
Merge branch 'implement_pokemon' into 'main'
...
implement_pokemon
See merge request cable-mc/cobblemon!2463
2026-10-09 16:41:24 +00:00
Gitoido
65699f045e
fix: minior core color should be decided randomly
2026-10-09 19:38:34 +03:00
Polymeta
d02441a273
Merge branch 'fix/mooshtank-checks' into 'main'
...
fix: added checks for mooshtank aspect, denying usage of bowl on common miltanks
See merge request cable-mc/cobblemon!2468
2026-10-09 15:25:11 +00:00
Gitoido
f76ab784b5
fix: item stack must be copied into lastFlowerFed
2026-10-09 18:06:43 +03:00
Polymeta
a566e36754
Merge branch 'fix/tms-consumption-tmm-screen' into 'main'
...
fix: tm stack not consumed on use in tmm screen
See merge request cable-mc/cobblemon!2466
2026-10-09 14:31:51 +00:00
Polymeta
ef1479fde6
Merge branch 'fix/equip-one-not-whole' into 'main'
...
fix: equipping stackable items now equips one item of stack
See merge request cable-mc/cobblemon!2469
2026-10-09 14:31:02 +00:00
Gitoido
d6c7b271e4
chore: flip when condition for readability
2026-10-09 11:11:34 +03:00
Gitoido
df9acfa0d1
fix: equipping stackable items now equips one item of stack
2026-10-09 11:03:06 +03:00
Polymeta
9d7fc8435e
scraped spawns again and pokemon that are part of herd will also get their specific drops
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-09 08:23:40 +01:00
Gitoido
ab4492ac5c
fix: forgor clientside level check
2026-10-09 09:43:38 +03:00
Gitoido
cb78dc8d88
fix: flower should be consumed when feeding brown mooshtank
2026-10-09 09:42:44 +03:00
Gitoido
020adabe26
fix: added checks for mooshtank aspect, denying usage of bowl on common miltanks
2026-10-09 09:33:03 +03:00
Gitoido
08aca7a274
chore: changelog skip-ci
2026-10-09 09:14:02 +03:00
Gitoido
2a9ef2b9fe
fix: increment menu state id on held tm stack click, small code cleanup
2026-10-09 08:39:46 +03:00
Jakotens
90dc489547
Minor poser fixes for Mime Jr. and slight model adjustments to Mime Jr. and Corsola (Johtonian form only).
...
Signed-off-by: Jakotens <jjakobdupuyy@gmail.com >
2026-10-08 13:47:42 -06:00
Polymeta
5ec5cfbc4a
Merge branch 'fix/bees-grow-apricorns-galarica' into 'main'
...
Fixed bees not growing Apricorns or the Galarica Nut Bush
Closes #2095
See merge request cable-mc/cobblemon!2427
2026-10-08 14:59:41 +00:00
Polymeta
1ef65449a8
Merge branch 'fix/addon-species-namespaces' into 'main'
...
Fix crashes with addon-namespace species in evolution, bait and Pokédex lookups
Closes #1353
See merge request cable-mc/cobblemon!2465
2026-10-08 14:56:31 +00:00
Fyre520
c6ff1ea72e
Fix crashes with addon-namespace species in evolution, bait and Pokédex lookups
2026-10-08 18:50:53 +05:30
Polymeta
cbfa8d3e78
Merge branch 'fix/alpha-chance-config-category' into 'main'
...
fix: config category for alpha/shiny chance config fields for fossil machine...
See merge request cable-mc/cobblemon!2464
2026-10-08 09:45:34 +00:00
Gitoido
5098ff3cfd
fix: config category for alpha/shiny chance config fields for fossil machine and honey log slathering should be Spawning
2026-10-08 12:27:35 +03:00
Polymeta
7c32b07d3f
scraped spawns
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-08 08:42:43 +01:00
ewwww
b2142fed1d
frog tweaks
2026-10-08 03:07:03 -04:00
ewwww
fef21516e9
lang
2026-10-08 03:05:45 -04:00
Polymeta
6fba0f55c1
Merge branch 'fix/recall-beam-3rdperson' into 'main'
...
fix: optimize condition checker for recall beam source position
See merge request cable-mc/cobblemon!2462
2026-10-08 06:48:03 +00:00
ewwww
95d43de79f
various minior tweaks
2026-10-08 02:16:38 -04:00
Polymeta
0be617b8ab
Merge branch 'fix/1359-sweep-fire-owned-pokemon' into 'main'
...
Fix sweeping attacks igniting owned Pokémon
Closes #1359
See merge request cable-mc/cobblemon!2460
2026-10-08 06:08:35 +00:00
Polymeta
c02d22f449
Merge branch 'fix/1492-edible-medicinal-leek' into 'main'
...
Fix Medicinal Leek not being edible
Closes #1492
See merge request cable-mc/cobblemon!2459
2026-10-08 06:03:59 +00:00
Polymeta
846b645856
Merge branch 'type-gem-min-growth-fix' into 'main'
...
fix wrong value in CobblemonConfig for type gem min growth
See merge request cable-mc/cobblemon!2461
2026-10-08 06:01:53 +00:00
whatsy
25d93a771c
fix wrong value in CobblemonConfig for type gem min growth
2026-10-08 06:01:53 +00:00
Gitoido
f16c782336
fix: optimize condition checker for recall beam source position
2026-10-08 08:56:53 +03:00
shg
ed0f315e41
Fix sweeping attacks igniting owned Pokémon
...
Closes #1359
2026-10-08 00:42:28 +00:00
shg
d20b03f4c5
Fix Medicinal Leek not being edible
...
Closes #1492
2026-10-08 00:42:25 +00:00
Polymeta
a3920413ac
fix TMM UI not closing when supposed to
2026-10-07 21:48:28 +00:00
ewwww
92bccf620f
Merge branch 'main' into implement_pokemon
2026-10-07 15:40:14 -04:00
ewwww
15f8a9ee71
Merge branch 'main' into implement_pokemon
2026-10-07 15:39:42 -04:00
Polymeta
dfb9ee755e
Merge branch 'Slippy-1.8.2-Fixes' into 'main'
...
Slippy 1.8.2 fixes
See merge request cable-mc/cobblemon!2458
2026-10-07 17:25:48 +00:00
Slippy
68f4117e29
Focus Sash changed to focus band in ruin sus loot
2026-10-07 12:09:05 -05:00
Slippy
f74a24a056
Console Log Spam Fix
2026-10-07 12:06:19 -05:00
ewwww
e5750cbba0
lang fixes for groudon, kyogre, and oricorio
2026-10-07 12:58:20 -04:00
ewwww
c6482c82cd
various minior tweaks
2026-10-07 12:57:06 -04:00
Slippy
b4c23a9132
Alpha Loot Table nerfed
2026-10-07 11:34:35 -05:00
Kenji_64
c470894bd3
Fixed Politoed's hitbox
2026-10-07 15:29:52 +02:00
Kenji_64
a940e32f8d
Fixed a texture error with Shiny Greninja
2026-10-07 15:29:21 +02:00
ewwww
b6b59eccad
vivillon dex tweak
2026-10-07 06:52:25 -04:00
ewwww
b520b94fae
minior lang fixes + tweaks to form & dex data
2026-10-07 06:52:16 -04:00
Polymeta
9af99d16f7
Merge branch 'feature/the-center-of-attention' into 'main'
...
constraining should start from center of spawn area
Closes #2119
See merge request cable-mc/cobblemon!2457
2026-10-07 07:17:30 +00:00
Polymeta
2cc17d3280
constraining should start from center of spawn area
2026-10-07 07:17:30 +00:00
Polymeta
20b2bcaa5a
Merge branch 'implement_pokemon' into 'main'
...
Implement pokemon
See merge request cable-mc/cobblemon!2455
2026-10-06 11:47:36 +00:00
Kenji_64
d1ada605fd
Fixed Alolan Bias Pichu resolver issues (again)
2026-10-06 13:20:30 +02:00
Polymeta
d37f73626d
Merge branch 'type-gem-growth-rework' into 'main'
...
Type gem growth rework
See merge request cable-mc/cobblemon!2451
2026-10-06 07:07:32 +00:00
Polymeta
73a94cb02e
Merge branch 'burmy-cloak-change' into 'implement_pokemon'
...
Burmy Cloak Changing & Battle Ended Event Refinements
See merge request cable-mc/cobblemon!2452
2026-10-06 07:04:32 +00:00
Polymeta
5a48945e50
Merge branch 'fix/particles-respecting-graphics-setting' into 'main'
...
fix: particle density should respect minecraft particle density settings
See merge request cable-mc/cobblemon!2446
2026-10-06 05:49:29 +00:00
Polymeta
476448a2ce
Merge branch 'more-block-noises' into 'main'
...
More more item blocks sounds
See merge request cable-mc/cobblemon!2450
2026-10-06 05:48:55 +00:00
Polymeta
bcba4f7fb7
Merge branch 'implement_pokemon' into 'main'
...
implement_pokemon
See merge request cable-mc/cobblemon!2445
2026-10-06 05:47:25 +00:00
Konoha
20e9608ff3
cleanup: biome tag overlaps and priority
2026-10-05 22:08:49 -04:00
ewwww
3e5733ceaf
GREAVARD EMISSIVES
2026-10-05 19:29:25 -04:00
ewwww
af29c99b03
properly defined vivillon's pattern forms as forms viewable in the pokedex with form names and dex entries
2026-10-05 18:42:09 -04:00
ewwww
60d596a24f
riolu + lucario remodels
2026-10-05 17:14:24 -04:00
Konoha
3f993e0466
feature: Burmy cloak changing (and battle event refinements)
2026-10-05 12:21:18 -04:00
whatsy
9e3d22ee54
default type gem cluster growth type is decoration, so porting doesn't give people an infinite gem block glitch
2026-10-05 11:04:59 -04:00
whatsy
e86cb1981f
Merge remote-tracking branch 'origin/type-gem-growth-rework' into type-gem-growth-rework
2026-10-05 10:55:16 -04:00
jackowes
e94f265adb
Add datafixer for type gems. Also ensure the fix runs even when mc version stays the same
2026-10-05 10:55:00 -04:00
whatsy
b3fc35240a
no i didnt forget the changelog
2026-10-05 10:55:00 -04:00
whatsy
d74618bddb
basically finalized
2026-10-05 10:55:00 -04:00
whatsy
8b54a8d459
moved stuff to config + more adjustments
2026-10-05 10:55:00 -04:00
whatsy
c17104a0fd
Basics for the type gem growth rework
2026-10-05 10:55:00 -04:00
Sterrezo
88ca3ebbf3
Added item block sound sets for glass jars with liquid
2026-10-05 15:14:53 +02:00
ewwww
4003456e5c
slakoth animations + minor model tweaks
2026-10-05 05:41:06 -04:00
ewwww
1d21a52d28
shinx, luxio, and luxray remodels
2026-10-05 05:38:23 -04:00
ewwww
2d49c62f85
froakie, frogadier, greninja, & ash-greninja remodels + greninja animations
2026-10-05 05:38:23 -04:00
Polymeta
20fac724f6
Merge branch 'testing-fixes' into 'main'
...
Small Fixes
See merge request cable-mc/cobblemon!2448
2026-10-05 07:02:45 +00:00
dhi_holo
0807d73646
Small Fixes
2026-10-05 07:02:45 +00:00
Jackson Bowes
3013302f35
Merge branch 'drained' into 'main'
...
Mega Doinked
See merge request cable-mc/cobblemon!2447
2026-10-04 19:22:42 -05:00
dhi_holo
879e7bef21
Mega Doinked
...
Removes Mega Drain as a TM, due to only being learnt by a single line of Pokemon
2026-10-05 10:04:29 +10:00
jackowes
557623dfe2
Add datafixer for type gems. Also ensure the fix runs even when mc version stays the same
2026-10-04 15:01:49 -05:00
Gitoido
a28d1e176d
chore: remove log spam skip-ci
2026-10-04 18:24:18 +03:00
Gitoido
f3c52db70d
chore: changelog + unused imports cleanup skip-ci
2026-10-04 18:22:22 +03:00
Gitoido
525575b0ba
fix: particle density should respect minecraft particle density settings
2026-10-04 18:10:54 +03:00
Sterrezo
a55efeb378
Added metal can item block sounds, fixed missing sound implementation for a bunch of other item block sounds
2026-10-04 15:44:04 +02:00
Kenji_64
da18b082a6
Fixed Alolan Bias Pichu and Pikachu referring to the wrong models and removed the old ones
2026-10-04 12:49:46 +02:00
Polymeta
7511facebc
Merge branch 'decorative-items-for-all' into 'main'
...
More Decorative Items
See merge request cable-mc/cobblemon!2430
2026-10-04 06:58:14 +00:00
dhi_holo
1486f5cfc2
Merge branch 'main' into decorative-items-for-all
2026-10-04 12:43:57 +10:00
ewwww
f8a16e5081
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2026-10-03 22:23:06 -04:00
dhi_holo
558e2d89ff
Mipmap Fix
...
shhhh, I did it the cheap and nasty way rather than tweaking the models, it's for the greater good though
2026-10-04 12:01:29 +10:00
dhi_holo
ea7b688655
Asset Updates
2026-10-04 11:35:22 +10:00
Polymeta
fdafa3435c
Merge branch 'flora-heals-an-aching-soul-' into 'main'
...
Flora Update
See merge request cable-mc/cobblemon!2412
2026-10-04 00:02:50 +00:00
dhi_holo
f17c90f6ea
Changelog
...
(also fixed some issues from the merge conflicts I missed)
2026-10-04 09:14:54 +10:00
dhi_holo
1dc45669bb
Recipe Updates the Third
2026-10-04 09:14:12 +10:00
dhi_holo
f3658614a4
Merge branch 'main' into decorative-items-for-all
2026-10-04 08:35:05 +10:00
Polymeta
cad39d8802
Merge branch 'form-move-fix' into 'implement_pokemon'
...
Form Move Fix
See merge request cable-mc/cobblemon!2420
2026-10-03 22:33:27 +00:00
Polymeta
422f60f587
Merge branch 'feat/tm-creative-tab' into 'main'
...
Add Technical Machines creative tab
See merge request cable-mc/cobblemon!2443
2026-10-03 22:31:41 +00:00
dhi_holo
8190ddf0e9
Merge branch 'main' into flora-heals-an-aching-soul-
2026-10-04 08:31:26 +10:00
dhi_holo
af281d0bde
Pa'uvillea
2026-10-04 07:57:39 +10:00
Kenji_64
00905b8c32
Oops, fixed Pikachu's walk
2026-10-03 21:54:11 +02:00
ewwww
79b3cb8611
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2026-10-03 15:47:45 -04:00
ewwww
797e908621
restored placeholder animations for chespin and quilladin
2026-10-03 15:47:40 -04:00
Kenji_64
3df3c395de
Cap Animations for the entire Pikachu line, updated Raichu animations, added faint to Pikachu and 1 new cosmetic for Pikachu!!!
2026-10-03 21:25:11 +02:00
whatsy
b2f682ebb1
no i didnt forget the changelog
2026-10-03 15:09:15 -04:00
Gitoido
754e9bc158
chore: changelog skip_ci
2026-10-03 20:48:36 +03:00
Gitoido
2df8504139
feat: lore correct sorting
2026-10-03 20:35:44 +03:00
Gitoido
2838f97c56
feat: add Technical Machines dynamic creative tab
2026-10-03 19:55:32 +03:00
Gitoido
68c75deeeb
feat: Technical Machines creative tab i18n
2026-10-03 19:55:04 +03:00
whatsy
3bc2659740
basically finalized
2026-10-02 22:42:57 -04:00
Konoha
89bba8a67a
Quick fix changelog and sneaky Spinda fix
2026-10-02 20:51:52 -04:00
whatsy
cbd5cdaf92
moved stuff to config + more adjustments
2026-10-02 14:01:04 -04:00
Polymeta
5b9d5cbb55
[skip-ci] tidy up changelog
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-02 08:34:22 +01:00
Jerzykv
6d6e13be83
Changelog
2026-10-02 09:29:46 +02:00
Jerzykv
899bec77b6
Implemented Fennekin, Braixen and Delphox remodels
2026-10-02 09:28:58 +02:00
Jerzykv
6dd8325772
Implemented Chespin, Quilladin and Chesnaught remodels
2026-10-02 09:28:39 +02:00
dhi_holo
e9bffd3ad7
Minty Fresh
...
Updated Mint Leaf Litter to use a texture closer to Vanilla to make the tiling nicer
2026-10-02 17:18:54 +10:00
Polymeta
ff890307c2
Merge branch 'feature/change-the-rules' into 'main'
...
change how item interaction evolutions are processed
Closes #1864 and #1874
See merge request cable-mc/cobblemon!2399
2026-10-02 07:07:29 +00:00
Polymeta
dda9d3e790
[skip-ci] tidy up changelog
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-02 08:02:57 +01:00
Polymeta
1acc02a2ec
Merge branch 'more-block-noises' into 'main'
...
Added sounds for liquid bottle, pill bottle and dice blocks
See merge request cable-mc/cobblemon!2441
2026-10-02 06:56:17 +00:00
dhi_holo
460c472c55
Asset Updates
...
Approved assets for all Terrain Plants, Mint Leaf Litter, and three of the nectar flowers (at my own fault). Potted plants already match approval
2026-10-02 16:09:11 +10:00
dhi_holo
69c3b6142d
Merge branch 'main' into flora-heals-an-aching-soul-
2026-10-02 14:56:06 +10:00
Jackson Bowes
9a036a4c01
Merge branch 'implement_pokemon' into 'main'
...
implement_pokemon
See merge request cable-mc/cobblemon!2439
2026-10-01 22:48:51 -05:00
whatsy
0fbe206893
Basics for the type gem growth rework
2026-10-01 23:46:18 -04:00
Sterrezo
3cea6dd175
Forgot powders
2026-10-01 19:03:52 +02:00
Sterrezo
2fa053f833
Update CHANGELOG.md
2026-10-01 18:55:35 +02:00
Sterrezo
ea4f858919
Added sounds for liquid bottle, pill bottle and dice blocks
2026-10-01 18:53:06 +02:00
Sterrezo
2aa4ab4b52
Added sounds to bright powder illuminating signs
2026-10-01 17:40:13 +02:00
Gitoido
113977990e
feat: helper functions to register plants and pots
2026-10-01 17:22:09 +03:00
Polymeta
d86021e2a1
Merge branch 'fix/safari-ball-catchrate' into 'main'
...
fix: change safari ball catchrate modifier
See merge request cable-mc/cobblemon!2440
2026-10-01 05:26:45 +00:00
Jakotens
79faadef59
Slight texture updates to Sudowoodo.
...
Signed-off-by: Jakotens <jjakobdupuyy@gmail.com >
2026-09-30 19:54:48 -06:00
Gitoido
9b6629db7f
chore: update changelog skip-ci
2026-10-01 02:47:45 +03:00
Gitoido
d151a1ce65
fix: change safari ball catchrate modifier
...
Changed safari ball catchrate modifier to properly account for battle status
2026-10-01 02:44:20 +03:00
ewwww
d9ca7b483d
tweaked sudowoodo textures
2026-09-30 19:40:29 -04:00
Instrafe
708f7fc1b8
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2026-09-30 18:59:11 -04:00
Instrafe
621db85845
The evolution knows where it is because it knows where it isn't
2026-09-30 18:59:01 -04:00
Instrafe
b09066c580
Added negate tags to regional and Vivillon evolutions to prevent biome overlap
2026-09-30 18:58:23 -04:00
ewwww
7c45f28827
ekans remodel + animations
2026-09-30 13:39:45 -04:00
ewwww
9c1b2cae22
vikavolt fixed placeholder animations
2026-09-30 08:59:25 -04:00
ewwww
16b2f81bd4
arbok animations
2026-09-30 08:57:47 -04:00
Yasito
1969af65b9
Translated using Weblate (French (Canada))
...
Currently translated at 95.1% (9016 of 9472 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/fr_CA/
2026-09-30 09:25:23 +00:00
dhi_holo
3bd3ce5688
Delete wisteria_root_side.json
2026-09-30 10:58:27 +10:00
Jackson Bowes
108f0e3d88
Merge branch 'pokemon-return-update' into 'main'
...
Pokeball Recall and Capture FX Improvement
See merge request cable-mc/cobblemon!2317
2026-09-29 19:44:15 -05:00
Plastered_Crab
4344c127eb
Pokeball Recall and Capture FX Improvement
2026-09-29 19:44:15 -05:00
dhi_holo
881a87216b
Merge branch 'main' into flora-heals-an-aching-soul-
2026-09-30 10:11:19 +10:00
dhi_holo
1d473b82af
Refactor
...
Renamed Voltconia to Voltaconia, and also fixed the models being in a temp folder for easier file editing because that's not needed anymore
2026-09-30 10:10:55 +10:00
Konoha
6e0c005587
Changelog
2026-09-29 16:25:13 -04:00
Polymeta
5955547c6f
Merge branch 'evolution-tree' into 'main'
...
Evolution tree
See merge request cable-mc/cobblemon!2385
2026-09-29 10:14:09 +00:00
lion
7a3a1cb8de
Evolution tree
2026-09-29 10:14:09 +00:00
Polymeta
1674cb0913
fix typo
...
Closes #2115
2026-09-29 06:44:27 +00:00
Polymeta
152ce4e923
Merge branch 'shoulder-mount-armor-clipping' into 'main'
...
Shoulder Mount Enhancements
See merge request cable-mc/cobblemon!2410
2026-09-29 06:42:36 +00:00
Breezyasha
3a6d024217
Shoulder Mount Enhancements
2026-09-29 06:42:36 +00:00
Fantastic-Fanta
3b722068b0
Fixed bees not growing Apricorns or the Galarica Nut Bush
...
Bonemealable blocks in the bee growables tag are now grown through performBonemeal, with the nectar and particle updates vanilla skips.
Closes #2095
2026-09-29 11:25:59 +08:00
Polymeta
f2fcc5ba79
Merge branch 'implement_pokemon' into 'main'
...
implement_pokemon
Closes #2106
See merge request cable-mc/cobblemon!2428
2026-09-28 20:25:03 +00:00
RedGenesectNinja
db0fb8e287
Added implemented flag to Tympole, Palpitoad and Seismitoad
2026-09-28 15:06:55 -05:00
Jerzykv
dae36a67d1
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2026-09-28 19:11:43 +02:00
Jakotens
6f99862288
Fixed some small texture issues on Pidgeot.
...
Signed-off-by: Jakotens <jjakobdupuyy@gmail.com >
2026-09-28 19:11:27 +02:00
Jerzykv
0377747e1e
implemented flag
2026-09-28 19:11:26 +02:00
Polymeta
6bc974f90f
Merge branch 'keyframe-super-ghostbusters' into 'main'
...
Fix for doubled effect keyframes
Closes #2107
See merge request cable-mc/cobblemon!2436
2026-09-28 13:14:51 +00:00
Sterrezo
aca53de259
Update CHANGELOG.md
2026-09-28 14:50:24 +02:00
Sterrezo
41bde38727
Fixed effect keyframes sometimes getting doubled probably
2026-09-28 14:49:06 +02:00
Polymeta
a4b7ee3b38
follow-up fix from registry change
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-28 09:01:58 +01:00
Jakotens
154b653c57
Fixed some small texture issues on Pidgeot.
...
Signed-off-by: Jakotens <jjakobdupuyy@gmail.com >
2026-09-27 17:33:09 -06:00
Jerzykv
04489bc969
changelog
2026-09-27 12:39:00 +02:00
Jerzykv
25499b3e7a
Fixed #2106
2026-09-27 12:37:49 +02:00
Instrafe
bb6bda54dc
Updated Changelog
2026-09-26 14:17:30 -04:00
Instrafe
9f3dbdc2d8
Implemented remodel for Shroomish
2026-09-26 14:13:33 -04:00
Jakotens
932148338c
Added animations for Treecko and Bonsly. Added remodel and animations for Sudowoodo.
...
Signed-off-by: Jakotens <jjakobdupuyy@gmail.com >
2026-09-25 23:05:21 -06:00
dhi_holo
e0d0c38232
Merge branch 'main' into decorative-items-for-all
2026-09-25 15:02:09 +10:00
Polymeta
a0e732dc6e
Merge branch 'perf/build-speed' into 'main'
...
Speed up the Gradle build
See merge request cable-mc/cobblemon!2429
2026-09-24 14:35:25 +00:00
Jerzykv
309f674853
Implemented Minior
2026-09-24 13:38:30 +02:00
terrainwax
ea20c2aa4c
CI: don't upload dev-shadow jars
2026-09-24 10:43:07 +02:00
terrainwax
da5272c473
Speed up the Gradle build
...
- Exclude assets/data (~250MB) from sources jars
- Limit licenser to .kt/.java so it doesn't scan ~29k resource files
- Enable the Gradle daemon and build cache
- The versioning plugin runs a full JGit status (~28s on this repo) in every project replace by ou own helper that use git local or CI env variable
2026-09-24 10:04:35 +02:00
Jerzykv
dc705c7720
Fixed Alolan Diglett's cry
2026-09-24 09:48:23 +02:00
Polymeta
a785e574e0
Merge branch 'feature/data-registries' into 'main'
...
26.1.2 backport of dataregistry
See merge request cable-mc/cobblemon!2285
2026-09-22 21:08:14 +00:00
Polymeta
4b236b0268
Merge branch 'feature/remember-your-tm' into 'main'
...
load features a lot sooner to avoid form switching
Closes #2085
See merge request cable-mc/cobblemon!2406
2026-09-22 21:07:44 +00:00
Polymeta
1cd86ae5d6
small fixes
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-22 16:43:33 +01:00
Polymeta
b7489a0b14
tidy up changelog
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-22 15:32:25 +01:00
Polymeta
f7554425dc
Merge branch 'tm-shelf-mipmap-correction' into 'main'
...
Fix mip map of TM shelf disc textures to be 16x16
Closes #2081
See merge request cable-mc/cobblemon!2398
2026-09-22 14:26:41 +00:00
ewwww
9bfc577444
oddish, gloom, vileplume, and bellossom remodels + animations
2026-09-22 04:35:07 -04:00
dhi_holo
217d4cda42
Update CHANGELOG.md
2026-09-22 10:44:12 +10:00
dhi_holo
08daa43aae
Update blank_tm.json
2026-09-22 10:41:01 +10:00
dhi_holo
184d889831
TM Boost
2026-09-22 10:36:59 +10:00
dhi_holo
c6e0f431ae
Update never_melt_ice.json
2026-09-22 10:31:59 +10:00
dhi_holo
93daeab840
Merge branch 'main' into decorative-items-for-all
2026-09-22 10:16:29 +10:00
dhi_holo
f132b297c6
Never-Melted
...
Recipe Update
2026-09-22 10:16:17 +10:00
Polymeta
858d2e908a
I tidied up too well
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-21 22:12:18 +01:00
Polymeta
b61e0b0c82
tidy up changelog
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-21 22:11:43 +01:00
Polymeta
4d9a6e71c9
use correct texture for upgrade and dubious disc
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-21 22:07:52 +01:00
Plastered_Crab
a0010de504
Merge remote-tracking branch 'origin/tm-shelf-mipmap-correction' into tm-shelf-mipmap-correction
...
# Conflicts:
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/dubious_disc.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_11.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_13.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_5.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_blocks.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_cat.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_chirp.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_creator.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_creator_music_box.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_far.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_mall.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_mellohi.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_otherside.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_pigstep.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_precipice.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_relic.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_stal.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_strad.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_unknown.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_wait.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_ward.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/technical_machine.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/technical_machine_base.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/technical_machine_overlay.png
# common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/upgrade.png
2026-09-21 10:34:36 -07:00
Plastered_Crab
cb73a30e23
changeloguwu
2026-09-21 10:18:50 -07:00
Sultan
905d63e098
Translated using Weblate (Russian)
...
Currently translated at 85.6% (8110 of 9472 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ru/
2026-09-21 16:38:11 +00:00
Nico Merenq
1ea8ab7dcc
Translated using Weblate (Russian)
...
Currently translated at 85.6% (8110 of 9472 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ru/
2026-09-21 16:38:11 +00:00
geumu
a45d21b279
Translated using Weblate (Korean)
...
Currently translated at 99.6% (9436 of 9472 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ko/
2026-09-21 16:38:10 +00:00
ewwww
3ca6d350fe
these were forgotten
2026-09-21 11:40:14 -04:00
Instrafe
2997ce8457
Updated Changelog
2026-09-21 09:54:23 -04:00
Instrafe
ff279d8310
Poliwag and Politoed now have remodels + Implemented gender differences for Politoed
2026-09-21 09:53:53 -04:00
Polymeta
9a7536b068
you were not supposed to be there
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-21 14:42:23 +01:00
Polymeta
bd973e702e
per type texture for disc shelf tms
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-21 14:40:24 +01:00
Plastered_Crab
ede1851d34
Fix mip map of TM shelf disc textures to be 16x16
2026-09-21 14:28:14 +01:00
Polymeta
cdb8ee0d8e
[skip-ci] tidy up changelog
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-21 12:07:55 +01:00
Polymeta
e7d86a382c
Merge branch 'dex_molang' into 'main'
...
Molang: Individual Dex molang
See merge request cable-mc/cobblemon!2273
2026-09-21 09:16:10 +00:00
Konoha D
eb911df830
Molang: Individual Dex molang
2026-09-21 09:16:10 +00:00
Polymeta
1c30acc53c
Merge branch 'implement_pokemon' into 'main'
...
implement_pokemon
See merge request cable-mc/cobblemon!2417
2026-09-21 09:14:23 +00:00
Polymeta
32b0699235
load features a lot sooner to avoid form switching
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-21 10:13:59 +01:00
Polymeta
e9c6580230
fix merge conflicts
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-21 10:13:27 +01:00
Polymeta
f893eb48fd
fix some errors I forgot about
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-21 09:38:51 +01:00
Polymeta
232e2f18bf
MR feedback
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-21 09:38:51 +01:00
Polymeta
c266c99710
26.1.2 backport of dataregistry
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-21 09:38:49 +01:00
Polymeta
2a0e8f6d47
[skip-ci] tidy up changelog
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-21 09:32:44 +01:00
Polymeta
e6bd8ec529
Merge branch 'neoforge-reload-fix' into 'main'
...
Neoforge resource fix
See merge request cable-mc/cobblemon!2333
2026-09-21 08:30:54 +00:00
Crater
911a95e873
Neoforge resource fix
2026-09-21 08:30:53 +00:00
Polymeta
447cfc2ae5
Merge branch 'useful-misc-functions' into 'main'
...
Smoother ride rotations.
See merge request cable-mc/cobblemon!2407
2026-09-21 08:28:50 +00:00
Polymeta
8dfeb0d260
Merge branch 'no-glass-bottles-in-those' into 'main'
...
Fixed Mochis and Feathers dropping glass bottles when they shouldn't
See merge request cable-mc/cobblemon!2425
2026-09-21 08:24:28 +00:00
Polymeta
caa7b19833
Merge branch 'Snowy-Burrow-Spawns-Fix' into 'main'
...
Fix Snowy burrows spawns and some floating water in one difting iceberg
See merge request cable-mc/cobblemon!2423
2026-09-21 08:23:17 +00:00
Polymeta
91d6fb62ba
dedicated handling for forced evolutions, those take priority and only one at a time
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-21 09:18:06 +01:00
Polymeta
8f4a5b2015
fix typo in changelog
2026-09-21 09:18:06 +01:00
Polymeta
07604c9a3b
change how item interaction evolutions are processed
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-21 09:18:06 +01:00
Polymeta
64dd8ae193
fix license header
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-21 09:17:44 +01:00
Polymeta
156ee6f290
new negate requirement
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-21 08:23:04 +01:00
dhi_holo
c0a524a718
Jars and Generators and a forgotten Pouch
...
6 new items ready to decorate your worlds
2026-09-21 11:58:11 +10:00
Gertimoshka
fe433d1417
Fixed Mochis and Feathers dropping glass bottles when they shouldn't
2026-09-20 20:10:25 +02:00
geumu
efe8f34413
Translated using Weblate (Korean)
...
Currently translated at 99.6% (9436 of 9472 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ko/
2026-09-20 13:11:32 +00:00
Hiroku
0dc662d295
Merge branch 'starter-screen-fixes' into 'main'
...
Fixes minor but annoying starter screen fixes
See merge request cable-mc/cobblemon!2424
2026-09-20 09:33:15 +00:00
Gertimoshka
081e370bfd
User friendlier changelog
2026-09-20 11:13:08 +02:00
Gertimoshka
3ef0567287
simplifications
2026-09-20 11:05:26 +02:00
Gertimoshka
3cad9e5481
Forgor the Changelog
2026-09-20 11:01:52 +02:00
Gertimoshka
dc8b7908be
Fixed impropper rendering culling of entries, and random starter not being part of height calculation of the category
2026-09-20 10:52:15 +02:00
Slippy
85085a1eca
Decaying Crypt tombstones now will generate with TMs in the gidled chest
2026-09-19 22:40:20 -05:00
Slippy
bff59dee6e
Fix Snowy burrows spawns and some floating water in one difting iceberg
2026-09-19 22:01:17 -05:00
Hiroku
bb5828531a
Merge branch 'type-gem-fix' into 'main'
...
Fix typo and update changelog.
See merge request cable-mc/cobblemon!2422
2026-09-20 02:29:36 +00:00
Deltric
cd08e98c28
Fix typo and update changelog.
2026-09-19 21:09:32 -05:00
Nico Merenq
6bb23582c4
Translated using Weblate (Russian)
...
Currently translated at 85.5% (8102 of 9472 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ru/
2026-09-19 04:42:37 +00:00
Sultan
56ccb43997
Translated using Weblate (Russian)
...
Currently translated at 85.5% (8102 of 9472 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ru/
2026-09-19 04:42:36 +00:00
Polymeta
bf7d40c9b5
Merge branch 'small-jvm-fix' into 'main'
...
Added JvmField to Some values in Cobblemon Blocks cause it was forgotten
See merge request cable-mc/cobblemon!2419
2026-09-18 18:30:24 +00:00
Polymeta
5abb3d7f97
Merge branch 'fix/molang-delete-variables-fn' into 'main'
...
fix: reintroduce `delete_variables` general molang fn
See merge request cable-mc/cobblemon!2421
2026-09-18 18:29:23 +00:00
Gitoido
975ad8186a
chore: dangling variable
2026-09-18 18:03:41 +00:00
Gitoido
26b6419f04
fix: reintroduce delete_variables general molang fn
2026-09-18 18:00:44 +00:00
Jerzykv
331f7ca425
Implemented Burmy, Wormadam and Mothim
2026-09-18 07:15:33 +02:00
Konoha
f445c05333
fix: Quick-fix For #updateMovesOnFormChange
2026-09-17 17:38:02 -04:00
RedGenesectNinja
71c9ac0ff0
Updated changelog
2026-09-17 15:15:20 -05:00
GenotypeXD
1404cc0ab5
Sun Lizards Implementation Tags
2026-09-17 15:11:31 -05:00
Konoha
a62485fc1f
Fix Calyrex form moves
2026-09-17 15:14:27 -04:00
Konoha
044f3080ff
Fix Hoopa form moves
2026-09-17 15:09:43 -04:00
Konoha
28b0cab906
Adjust Form Change moves for Kyurem's level-gated ones.
2026-09-17 14:35:15 -04:00
Konoha
82f34d651c
Add Kyurem's form moves
2026-09-17 14:32:47 -04:00
GenotypeXD
6ca908a91d
Implemented Helioptile Line
2026-09-17 13:05:12 -05:00
Jerzykv
0948b8da9a
Fixed Dragonair not using its idle correctly
2026-09-17 19:17:29 +02:00
Jerzykv
22e04a53b3
changelog
2026-09-17 18:39:10 +02:00
Jerzykv
df3217b41b
Fixed Bramblin always sleeping
2026-09-17 18:38:48 +02:00
Jerzykv
9ff15a1913
Flygon poser fix
2026-09-17 06:43:03 +02:00
Aram
89e43945a3
Edit CobblemonBlocks.kt
2026-09-16 14:25:26 +02:00
Aram
bd8dcddf35
Edit CobblemonBlocks.kt
2026-09-16 14:24:31 +02:00
Polymeta
dd372f3160
Merge branch 'recipe-booking' into 'main'
...
Recipe Book Tweaks
Closes #2088
See merge request cable-mc/cobblemon!2418
2026-09-16 10:03:42 +00:00
dhi_holo
c56aab28d4
Recipe Book Tweaks
...
Closes #2088 as well as fixes a lot of similar issues for gameplay consistency
2026-09-16 18:41:05 +10:00
RedGenesectNinja
ca58801794
Implemented Tympole, Palpitoad and Seismitoad
2026-09-15 23:36:40 -05:00
Instrafe
38fa5e2628
Updated Changelog
2026-09-15 16:46:25 -04:00
Instrafe
fae1ae7124
Implemented Absol's remodel
2026-09-15 16:45:59 -04:00
Jerzykv
3ec5f76c73
Implemented Deerling and Sawsbuck remodels
2026-09-15 14:15:37 +02:00
Dmytro Bunnua
5fbbcb5707
Translated using Weblate (Ukrainian)
...
Currently translated at 75.9% (7194 of 9472 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/uk/
2026-09-15 09:37:39 +00:00
ewwww
5bb8aaba55
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2026-09-15 05:05:08 -04:00
ewwww
23ba41e981
wiglett + wugtrio underwater tweaks
2026-09-15 05:04:40 -04:00
Instrafe
29b049452b
Updated Changelog
2026-09-14 19:24:03 -04:00
Instrafe
0b0f665804
Glimmet and Glimmora now have implemented remodels
2026-09-14 19:23:30 -04:00
Polymeta
3cdf28ffdd
Merge branch 'Chorus-Briar-Fix' into 'main'
...
I'm never doing an update where I have to keep track of 650+ structure files again
See merge request cable-mc/cobblemon!2414
2026-09-14 21:18:29 +00:00
Kenji_64
5d53fba2ce
Fixed Rockruff line missing blinks
2026-09-14 20:47:40 +02:00
Slippy
c6fb18ea51
I'm never doing an update hwere I have to keep track of 650+ structure files again
2026-09-14 10:48:01 -05:00
Polymeta
2d851cb134
Merge branch 'tm-crafting-corrections' into 'main'
...
TM Recipes
See merge request cable-mc/cobblemon!2413
2026-09-14 13:03:40 +00:00
dhi_holo
92b0ef84e9
Yeah, I've Got Time
...
This'll hopefully be ready in time for 1.8.2 so I'm making the decision to treat it as if it is now, so it almost certainly will be
2026-09-14 16:37:09 +10:00
dhi_holo
dc8d18384c
Merge branch 'main' into flora-heals-an-aching-soul-
2026-09-14 16:33:26 +10:00
dhi_holo
f685be0aab
TM Recipes
...
Corrected two incorrect TM recieps, both in the jsons and the spreadsheets
2026-09-14 16:30:06 +10:00
dhi_holo
44c056ecd5
Update CHANGELOG-DecorativeWv2.md
...
Fixed that up for cleanup reasons
2026-09-14 11:34:16 +10:00
dhi_holo
dcc707c20d
Model Fix
...
Improved the visuals and log spam of the Wistensu blocks
2026-09-14 10:53:12 +10:00
FrankTheFarmer
14cc851562
Tweaked Mimikyus poser. Hopefully fixes an issue nobody can replicate 😭
2026-09-14 09:46:55 +10:00
FrankTheFarmer
7223d1fd68
Merge branch 'main' into implement_pokemon
2026-09-14 09:21:43 +10:00
Polymeta
6ab5ad52ec
Merge branch 'typegem-advancement-trigger' into 'main'
...
Adds typegem item advancement trigger
Closes #2086
See merge request cable-mc/cobblemon!2411
2026-09-13 20:58:08 +00:00
PieDuck
079b2ae766
Merge branch 'typegem-advancement-trigger' of https://gitlab.com/dmnaru/cobblemon into typegem-advancement-trigger
2026-09-13 21:51:29 +01:00
PieDuck
34eea827e7
changelog
2026-09-13 21:51:09 +01:00
PieDuck
06c6ee5a9c
Merge branch cobblemon:main into typegem-advancement-trigger
2026-09-13 21:37:22 +01:00
PieDuck
54748c20ea
Add type gem item advancement trigger
2026-09-13 21:36:18 +01:00
Instrafe
75f52e4cf4
Updated Changelog
2026-09-13 11:10:48 -04:00
Instrafe
55446dd4b1
Implemented remodels for Binacle and Barbaracle
2026-09-13 11:08:58 -04:00
Polymeta
02e63b6fc8
Merge branch 'gem-block-alert' into 'main'
...
Fixed Missing Recipe Advancements
See merge request cable-mc/cobblemon!2409
2026-09-13 14:41:13 +00:00
Polymeta
3aebcf66ec
rename lang file to match convention
2026-09-13 14:26:44 +00:00
Gustavo Puerari
580a24eac3
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 96.8% (9175 of 9472 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/pt_BR/
2026-09-13 13:18:28 +00:00
Gertimoshka
07b1b22c2c
Wistensu Flower Logic Implementation
2026-09-13 15:08:44 +02:00
dhi_holo
49a5f716b7
Fixed Missing Recipe Advancements
...
Why were the advancements in the recipes..?
2026-09-13 22:05:44 +10:00
dhi_holo
23078eccba
Wistensu Root Models
...
Fixed a tag and added the models for the Wistensu Roots
2026-09-13 21:11:11 +10:00
ewwww
8b825d558f
cacnea & cacturne remodels + animations
2026-09-13 06:28:57 -04:00
dhi_holo
8a82f35edf
Seasonings
2026-09-13 19:59:19 +10:00
dhi_holo
bec664c073
Merge Conflict Fixes
2026-09-13 13:01:20 +10:00
jackowes
9a7f97f11f
changelog
2026-09-12 21:52:56 -05:00
jackowes
95b8d62e4a
Fix issue with quat spring and replace orientation controller tick slerp with quat spring
2026-09-12 21:45:26 -05:00
dhi_holo
3e61424d8f
Merge branch 'main' into flora-heals-an-aching-soul-
2026-09-13 12:28:17 +10:00
Hiroku
0bd7b4dab3
Merge branch 'decorative-items-restored' into 'main'
...
Decorative Items Project Returns
See merge request cable-mc/cobblemon!2343
2026-09-13 02:24:00 +00:00
Hiroku
8cbada0cf5
Fix changelog whackiness [skip-ci]
2026-09-13 12:23:40 +10:00
Hiroku
f0784fec2d
Merge remote-tracking branch 'origin/main' into decorative-items-restored
2026-09-13 12:21:54 +10:00
dhi_holo
c1606c6fc9
Textures!
...
Terrain Plants now have proper textures, finishing them off beyond some data file work waiting on some conversations
2026-09-13 11:42:42 +10:00
Hiroku
cfe0c5e0a5
Snap on
2026-09-13 11:27:40 +10:00
dhi_holo
e0108cc99f
Merge branch 'main' into flora-heals-an-aching-soul-
2026-09-13 10:47:37 +10:00
dhi_holo
c0de8a2591
Update TerrainSeedBlock.kt
...
Actually fixed it this time
2026-09-12 15:19:09 +10:00
dhi_holo
b8733eed52
Revert "Update TerrainSeedBlock.kt"
...
This reverts commit bd0511a9fb .
2026-09-12 14:31:19 +10:00
dhi_holo
4aa30efec7
Merge branch 'main' into flora-heals-an-aching-soul-
2026-09-12 13:04:47 +10:00
Plastered_Crab
4354c3fb03
Fix mip map of TM shelf disc textures to be 16x16
2026-09-10 11:56:30 -07:00
Kenji_64
f25a676bd5
Changelog
2026-09-10 13:26:54 +02:00
Kenji_64
a9906762a0
Fixed head_ai and removed battle condition on Lycanroc (all forms)
2026-09-10 13:23:03 +02:00
Kenji_64
7b5b88eca2
Added head movement to Archaludon and added missing sleep poses to Duraludon line
2026-09-10 13:22:34 +02:00
Kenji_64
291682ba52
Added Diglett line faints (which were in the files, but not implemented)
2026-09-10 12:50:56 +02:00
Kenji_64
546d403b45
Fixed Kingambit waddling its legs around when moving
2026-09-10 12:50:22 +02:00
FrankTheFarmer
c9f40e32a1
Changedog
2026-09-09 20:42:39 +10:00
FrankTheFarmer
d642b8dd07
Candle dog's dad 🪦 🐶
2026-09-09 20:41:42 +10:00
FrankTheFarmer
549a11116e
Candle dog. Dog with the candle. We put candle on him 🕯 🐶
2026-09-09 20:39:45 +10:00
Polymeta
b5468a4a4f
Merge branch 'main' into implement_pokemon
2026-09-09 09:06:51 +01:00
ewwww
c5d278ccb7
spheal.
2026-09-09 03:42:50 -04:00
ewwww
bf5e15de45
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2026-09-09 03:40:21 -04:00
Jerzykv
f4af417267
Fixed Alolan Raticate's cry
2026-09-09 03:40:14 -04:00
FrankTheFarmer
69c04acaeb
⚡ Vikavolt
2026-09-09 03:40:14 -04:00
FrankTheFarmer
83a6bb188f
🚎 Charjabug 💖
2026-09-09 03:40:14 -04:00
FrankTheFarmer
494a8b5e91
🐛 Grubbin
2026-09-09 03:40:14 -04:00
FrankTheFarmer
c8021f2f08
Im putting bugs into cobblemon changelog
2026-09-09 03:40:14 -04:00
Jerzykv
8cdf3af047
Ampharos now has eye locators
2026-09-09 03:40:14 -04:00
ewwww
c90a24e1ab
switcheroo part two
2026-09-09 03:40:14 -04:00
FrankTheFarmer
83e3cfc34e
Placeholder idle animation for snover
2026-09-09 03:40:14 -04:00
FrankTheFarmer
133dd4e5b7
🏔 Added snover line 🌲
2026-09-09 03:40:13 -04:00
FrankTheFarmer
a8cca14b86
Obamasnow
2026-09-09 03:40:13 -04:00
FrankTheFarmer
9b0f356fa4
Donald Snover
2026-09-09 03:40:13 -04:00
FrankTheFarmer
f2b0a102b6
What if we started implementing pokemon rn rn
2026-09-09 03:40:13 -04:00
FrankTheFarmer
a7d01b230a
Merge branch 'main' into implement_pokemon
2026-09-09 16:04:20 +10:00
jackowes
2a7db4b9b8
bring in util functions
2026-09-08 20:15:54 -05:00
Jerzykv
77e5f2501d
Fixed Alolan Raticate's cry
2026-09-08 19:56:35 +02:00
FrankTheFarmer
e6513717bd
⚡ Vikavolt
2026-09-08 21:34:26 +10:00
FrankTheFarmer
0e0c98f693
🚎 Charjabug 💖
2026-09-08 21:32:56 +10:00
FrankTheFarmer
528bfa4e22
🐛 Grubbin
2026-09-08 21:32:09 +10:00
FrankTheFarmer
83c87779d7
Im putting bugs into cobblemon changelog
2026-09-08 21:30:42 +10:00
FrankTheFarmer
dc33235144
Merge branch 'refs/heads/main' into implement_pokemon
2026-09-08 21:29:01 +10:00
FrankTheFarmer
935c658c5f
Merge branch 'main' into implement_pokemon
2026-09-08 17:59:22 +10:00
Jerzykv
0426f4fbf9
Ampharos now has eye locators
2026-09-07 08:31:09 +02:00
dhi_holo
7930ec52fa
Merge branch 'main' into flora-heals-an-aching-soul-
2026-09-07 15:20:47 +10:00
dhi_holo
75bc03fdcb
Merge branch 'main' into decorative-items-restored
2026-09-07 15:19:27 +10:00
dhi_holo
57eb306e4f
Update TODO List - Flora Heals An Aching Soul.md
2026-09-06 21:25:18 +10:00
dhi_holo
bd0511a9fb
Update TerrainSeedBlock.kt
...
Terrain crops now break properly after growing to be 2 blocks tall
2026-09-06 21:24:28 +10:00
dhi_holo
c14f3292aa
Merge branch 'main' into flora-heals-an-aching-soul-
2026-09-06 19:57:15 +10:00
ewwww
46e771a062
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2026-09-05 22:07:28 -04:00
ewwww
4c0095844b
Merge remote-tracking branch 'origin/implement_pokemon_2' into implement_pokemon
2026-09-05 22:06:39 -04:00
ewwww
10a2ef27d6
switcheroo part two
2026-08-24 15:36:02 -04:00
dhi_holo
309ff3da13
Loaded Cleanup
...
Added Loaded Dice, cleaned up some particles
2026-08-12 20:15:52 +10:00
dhi_holo
3af91e2a74
Further Tweaking
2026-08-12 14:26:20 +10:00
dhi_holo
2e027e3db7
Some Visual and Auditory Tweaks
2026-08-12 14:13:21 +10:00
dhi_holo
fc40fb02c0
Next Batch
...
Never-Melt Ice, Wide, Scope, and Zoom Lens, as well as new designs for Upgrade and Dubious Disc
2026-08-12 13:52:13 +10:00
dhi_holo
2c1c0299f9
SPHERICAL!
...
Adds Flame Orb, Life Orb, Toxic Orb, Light Ball, and Smoke Ball blocks
2026-08-12 12:24:21 +10:00
FrankTheFarmer
3c7637515c
Placeholder idle animation for snover
2026-08-10 13:03:00 +10:00
dhi_holo
08cbbaf68c
Merge branch 'main' into decorative-items-restored
2026-08-10 10:21:06 +10:00
Sterrezo
6e911acf01
Sound tweaks
...
Swapped pot sound types from tumblestone to decorated pots and rock sounds from tumblestone to deepslate.
2026-08-09 12:20:13 +02:00
dhi_holo
f6d82a1b28
Changelog
...
and some last second sound tweaks
2026-08-09 19:17:19 +10:00
dhi_holo
702126aeab
Adds Throat Spray and Iron Ball
...
Adds in Throat Spray and Iron Ball blocks, finishes clean up of King's Rock to look a bit more consistent
2026-08-09 19:04:08 +10:00
dhi_holo
df566e8fcb
Wearable Hat Cleanup
...
Fixed King's Rock Blockstate and loot table as well
Wearable "Hat" Items can now be prevented from swapping when trying to open the interaction wheel (sneak right-click), making it not a nightmare to give certain items to Pokemon. Yippee!
2026-08-09 18:53:58 +10:00
dhi_holo
c83e0f33b5
Wearable Items Mostly Working Better
...
Wearable Items now can either be "Blocks" or "Hats"
"Blocks" can be placed as blocks in the world, while "Hats" can be put on the player's head by right clicking them in hand
Need to add some form of override when crouching and looking at a Pokemon though
2026-08-09 17:30:49 +10:00
dhi_holo
f279f936b6
Generified Plaque/Wreath/Magnet Code
...
Moved shared code to a singular class
2026-08-09 16:04:22 +10:00
dhi_holo
f8e20bafd9
Import Cleanup
2026-08-09 12:23:19 +10:00
dhi_holo
a5211ca7ff
Convention Alignment
...
Changed all stackable item blockstates/model files to utilise the convention from vanilla (seen on blocks such as pink petals)
This commit adds no files, and removes no files, it purely renames and swaps out numbers
2026-08-09 12:06:01 +10:00
FrankTheFarmer
0a5abdb331
🏔 Added snover line 🌲
2026-08-09 11:15:45 +10:00
FrankTheFarmer
4ed7413dd2
Obamasnow
2026-08-09 11:13:17 +10:00
FrankTheFarmer
40b66c24fc
Donald Snover
2026-08-09 11:12:56 +10:00
dhi_holo
2f7bedf001
Update scribblenotes - Decorative Items.txt
2026-08-08 18:05:17 +10:00
dhi_holo
44c31a9ddb
Update StackableItemBlock.kt
...
Simplified the way the hitboxes are defined, to allow for future planned hitboxes to actually work as intended
2026-08-08 17:33:34 +10:00
FrankTheFarmer
20a35de3d8
What if we started implementing pokemon rn rn
2026-08-08 14:58:20 +10:00
dhi_holo
cfc8a15db1
Update scribblenotes - Decorative Items.txt
2026-08-06 18:35:29 +10:00
dhi_holo
d5ba22a86c
Removal of Unneeded Lines
...
deprecate deez nuts
2026-08-06 15:01:34 +10:00
dhi_holo
a38505f1c5
Update scribblenotes - Decorative Items.txt
...
Documenting ideas and plans for future me
2026-08-05 19:28:29 +10:00
dhi_holo
3cf1ba1fb3
Tag Tweaks
...
Added stuff to relevant tags, removed unused tag from removed feature
2026-08-05 18:36:38 +10:00
dhi_holo
9f5d595827
Import Cleanup
...
Just removing some imports from reverted changes that snuck into commits
2026-08-05 18:03:06 +10:00
dhi_holo
75673f0204
Mild Polish
2026-08-05 17:09:40 +10:00
dhi_holo
b43a7571ff
Eject Button
...
Now with cleaner code, I hope this is more acceptable
2026-08-05 16:13:24 +10:00
dhi_holo
b071dc04d3
Metronome
...
Reimplemented the Metronome, the code has been genericized to allow for more items to be implemented off the same base, although a little bit more work does need to be done there with the comparator output specifically
2026-08-05 15:34:32 +10:00
dhi_holo
12f9ff1647
Wreath, Magnet, and some tweaks to Plaques
...
Plaques now place the way I had originally set them up, and Galarica Wreaths along with the Magnet are back
2026-08-05 14:34:41 +10:00
dhi_holo
3256a302df
Ring Target
...
Could maybe be polished up, but is good
2026-08-05 13:06:07 +10:00
dhi_holo
edbe447477
Basic Decorations
...
Reimplemented Galarica Cuff, Teapots, Teacups, Weather Rocks, Sachet, Metal Powder, Quick Powder, Bright Powder, Destiny Knot, and Luminous Moss
2026-08-05 12:04:48 +10:00
Gertimoshka
2f43910368
Cleaner Implementation with less duplicate code
2026-08-04 22:21:58 +03:00
dhi_holo
c2e87e4cfa
Placeable Vitamins Experiment A
...
Need coder feedback regarding this
Makes Mochi and Feathers require clicking in the air or directly on a Pokemon, if it thinks it can place as a block it prevents usage
2026-08-04 19:25:13 +10:00
dhi_holo
e40d2ee806
Create scribblenotes - Decorative Items.txt
...
Making this a unique commit so it's easy to reference back to later
2026-08-04 14:53:53 +10:00
dhi_holo
ba74e7603b
Wearables 1
...
Made Sharp Beak, Covert Cloak, and Shell Helmet wearable
2026-08-04 13:51:49 +10:00
dhi_holo
19c3fe6dc4
Update StackableItemBlock.kt
...
Fixed hitbox oversight
2026-08-04 13:35:17 +10:00
dhi_holo
d0778dd124
Missing Stackables 1
...
Reimplemented Metal Coat, PP Up, and PP Max's placeable logic
Began work for other Vitamins to work (incomplete)
Added models, textures, blockstates, and loot tables for most incoming blocks
2026-08-04 13:16:46 +10:00
dhi_holo
8fb2b1cf3d
Merge branch 'main' into flora-heals-an-aching-soul-
2026-07-12 08:20:14 +10:00
dhi_holo
5c7d1cbe10
Fixed Case of the Missing Loot Table
2026-06-04 15:47:55 +10:00
dhi_holo
3348bfc362
Merge branch 'main' into flora-heals-an-aching-soul-
2026-06-04 14:35:35 +10:00
dhi_holo
8db9252434
Potted Berries for All
2026-05-25 18:09:49 +10:00
dhi_holo
d9d4fe15cc
Update TODO List - Flora Heals An Aching Soul.md
2026-05-25 08:40:11 +10:00
dhi_holo
8453e2d514
Milling Integration
...
with Create
2026-05-25 08:15:47 +10:00
dhi_holo
4d3070c0c2
Compost Levels
2026-05-25 08:03:54 +10:00
dhi_holo
15f273a9ef
Bright Powder on Signs
...
It's so wonderful
2026-05-25 07:16:36 +10:00
dhi_holo
007c079cd6
WIP
2026-05-25 05:17:30 +10:00
dhi_holo
9851b1e8ad
Merge branch 'main' into flora-heals-an-aching-soul-
2026-05-25 04:22:38 +10:00
dhi_holo
c65c2610cd
Merge branch 'main' into flora-heals-an-aching-soul-
2026-05-16 21:29:13 +10:00
dhi_holo
2be08a3fcc
terminology corrections
...
also tag additions
2026-05-16 21:26:05 +10:00
dhi_holo
4cdf440eee
More Tagging Work
2026-05-13 09:48:52 +10:00
dhi_holo
1545ee8fc2
Merge branch 'main' into flora-heals-an-aching-soul-
2026-05-13 09:12:37 +10:00
dhi_holo
a009fabfe4
Create TODO List - Flora Heals An Aching Soul.md
2026-05-12 22:51:33 +10:00
dhi_holo
46e4bfdd13
CONSUME
2026-05-12 22:27:07 +10:00
dhi_holo
e24c82860d
No Bone
2026-05-12 22:11:53 +10:00
dhi_holo
1291dee1e1
Data Files
2026-05-12 21:39:03 +10:00
dhi_holo
69732be09b
Mistleaf's Fae Magics
2026-05-12 18:24:23 +10:00
dhi_holo
8ce4ed7dee
Update TerrainFlowerBlock.kt
...
Removed unused imports
2026-05-12 14:59:52 +10:00
dhi_holo
33d3cc0104
Merge branch 'flora-heals-an-aching-soul-' of https://gitlab.com/cable-mc/cobblemon into flora-heals-an-aching-soul-
2026-05-12 14:52:36 +10:00
dhi_holo
33b6b519ed
Merge branch 'flora-heals-an-aching-soul-' of https://gitlab.com/cable-mc/cobblemon into flora-heals-an-aching-soul-
2026-05-12 12:26:39 +10:00
dhi_holo
5ec849f4e3
Merge branch 'main' into flora-heals-an-aching-soul-
2026-05-12 12:26:09 +10:00
Gertimoshka
6f4a2d2cd5
Made the flowers block entities so they can tick and adjust to weather changes
2026-05-11 21:35:48 +03:00
Gertimoshka
0bca89e77d
Lucibell will now properly light up if any part of the block has an entity in it, by designating lower part as the 'driver' who controls the states
2026-05-11 17:21:22 +03:00
dhi_holo
8f9f162011
Merge branch 'main' into flora-heals-an-aching-soul-
2026-05-11 09:56:11 +10:00
dhi_holo
ac3bea3d5e
Update TerrainFlowerBlock.kt
...
Compacted but it STILL DOESN'T WORK
2026-05-10 21:23:17 +10:00
dhi_holo
178d4f199b
Update TerrainFlowerBlock.kt
...
I feel so close, but the weather checks don't work
2026-05-09 23:04:07 +10:00
dhi_holo
933819380d
Merge branch 'main' into flora-heals-an-aching-soul-
2026-05-09 21:15:27 +10:00
dhi_holo
d68131e1b9
Update TerrainFlowerBlock.kt
...
It's starting to get there, probably. Not fully functional yet
2026-05-09 21:15:04 +10:00
dhi_holo
ffbc379c0b
Some More Work
2026-05-08 14:01:31 +10:00
dhi_holo
7053d12508
Update TerrainSeedBlock.kt
...
In theory this makes it grow slower on dry dirt, which would be pretty cool
2026-05-07 20:38:47 +10:00
dhi_holo
d41442200f
Models and Temp Textures and start of some code for glowing
2026-05-07 20:08:15 +10:00
dhi_holo
d2564c343e
Terrain Seed Beginnings
2026-05-04 22:43:54 +10:00
dhi_holo
d1c19e8837
Visual FIxes
2026-05-04 14:30:31 +10:00
dhi_holo
0ec3bfabad
Merge branch 'main' into flora-heals-an-aching-soul-
2026-05-04 11:37:59 +10:00
dhi_holo
43ffb04621
FINALLY FUCKING FIXED IT
2026-05-04 11:34:04 +10:00
dhi_holo
eeaedf76a9
progress
2026-05-04 09:43:59 +10:00
dhi_holo
120fb4829a
Pa'uvillea complete
...
Maash's tweaks to the wall version, plus placement logic working as desired (although may need further tweaks depending on feedback)
2026-05-03 11:10:00 +10:00
dhi_holo
12b93e53a7
Revenge of the Pa'uvillea
2026-05-02 22:43:34 +10:00
dhi_holo
00b17b9764
Update CobblemonBlocks.kt
2026-05-02 18:55:21 +10:00
dhi_holo
06192f809d
Merge branch 'main' into flora-heals-an-aching-soul-
2026-05-02 18:54:04 +10:00
dhi_holo
d09eb0d3ff
Update LobailaFlowerBlock.kt
2026-04-23 08:05:13 +10:00
dhi_holo
416321679c
Updated Textures
2026-04-22 20:29:02 +10:00
dhi_holo
72c4e6e54f
Merge branch 'main' into flora-heals-an-aching-soul-
2026-04-19 16:45:10 +10:00
dhi_holo
d3738e3424
Merge branch 'main' into flora-heals-an-aching-soul-
2025-12-13 18:45:37 +10:00
dhi_holo
2e183db903
Re-rename
...
Lobaila and Pa'uvillea changes
2025-12-02 12:33:55 +10:00
dhi_holo
fa174b88dd
OVERSIGHTS (may need to copy to another branch)
2025-12-01 17:09:00 +10:00
dhi_holo
0b4abe6d16
Texture Updates
2025-12-01 17:08:42 +10:00
dhi_holo
759fb0ecd8
Rename!
...
Lobalia, Pa'uvilla, and Pomohana are here!
2025-12-01 16:37:53 +10:00
dhi_holo
429e927c3f
Potted Berries Part 1
...
All the data/asset stuff needed for Potted Berries.
Need to handle the codeside now, which will be trickier.
2025-11-30 22:27:29 +10:00
dhi_holo
643aed9133
Update HydrangeaFlowerBlock.kt
...
Comment
2025-11-30 12:02:26 +10:00
dhi_holo
e701642de2
Hydrangea loot and tag starts
2025-11-30 12:00:14 +10:00
dhi_holo
a3a03e3da6
Lobelia Polish and Hydrangea
...
Added start of Hydrangea flowers
2025-11-29 20:51:25 +10:00
dhi_holo
5dd3d5b552
Mint Rework
...
Totally reworked the Mint Leaf Litter blocks to not rely on Pink Petals due to the differences in behaviour, finally added Craspedia loot table, updated Craspedia texture, fixed Lobelia being shaded incorrectly
2025-11-29 16:20:45 +10:00
dhi_holo
1bae246e6c
Gestdate
...
Ges updated textures
2025-11-29 14:39:30 +10:00
dhi_holo
c94ef10189
Merge branch 'main' into flora-heals-an-aching-soul-
2025-11-29 14:24:30 +10:00
dhi_holo
dfacf1f9df
Merge branch 'main' into flora-heals-an-aching-soul-
2025-11-27 18:33:35 +10:00
dhi_holo
06c5e34f48
Merge branch 'main' into flora-heals-an-aching-soul-
2025-11-23 20:33:34 +10:00
dhi_holo
1ab8b35e98
Merge branch 'main' into flora-heals-an-aching-soul-
2025-11-23 12:50:52 +10:00
dhi_holo
261b61ee6c
Updated Assets and removed TODO
2025-11-22 15:31:12 +10:00
dhi_holo
5abf8e1bab
Merge branch 'main' into flora-heals-an-aching-soul-
2025-11-22 14:16:33 +10:00
dhi_holo
7c0b463637
Merge branch 'main' into flora-heals-an-aching-soul-
2025-11-21 18:14:42 +10:00
dhi_holo
e156ab2432
Craspedia assets and Lobelia waterlogging
...
Still needs some more work done on both, but it's real nice now
2025-11-21 18:14:29 +10:00
dhi_holo
0b46a7163b
Merge branch 'main' into flora-heals-an-aching-soul-
2025-11-21 13:35:16 +10:00
dhi_holo
21b76c008a
Craspedia start
...
Needs work, but it's fully functional
2025-11-21 13:30:19 +10:00
dhi_holo
b7e9f8248d
Oricorio Start
...
Lobelia (Red) flower partially set up.
Wanna look into letting it be waterlogged, and no dye crafting recipe is set up yet
2025-11-20 19:34:10 +10:00
dhi_holo
8b21e76a36
Merge branch 'main' into flora-heals-an-aching-soul-
2025-11-20 17:06:31 +10:00
dhi_holo
515471185f
Create CHANGELOG-DecorativeWv2.md
2025-11-19 19:54:49 +10:00
dhi_holo
628e8f4e5e
Mint Leaf Litter and Potted Mint
...
"It's not fucking weed you piece of shit stoner" -Kermit the Frog
Needs some cleanup when it comes to how I've stolen the Pink Petals (due to Leaf Litter being a future block), but what we got rn is a good starting point
2025-11-19 19:42:38 +10:00