Compare commits

...
Author SHA1 Message Date
tmetcalfe89 f79b9198d0 nero's existence and goomy evo biome tag 2025-01-31 18:47:25 -08:00
Hiroku 3599dc97cc Merge branch 'reload-cobblemon-config-command' into 'main'
Add '/cobblemonconfig reload' command

Closes #132

See merge request cable-mc/cobblemon!1391
2025-01-31 10:58:08 +00:00
lion 8a5d895f03 Add '/cobblemonconfig reload' command 2025-01-31 10:58:08 +00:00
Hiroku 36169db388 Merge branch 'feature/save-file-juggling' into 'main'
old and temp files for everyone

See merge request cable-mc/cobblemon!1484
2025-01-31 07:46:10 +00:00
Paul 1900999a74 Changelogging [skip-ci] 2025-01-31 17:41:56 +10:00
Hiroku ab16814cd2 Merge branch 'fix-setpageondefaultdialoguepage' into 'main'
fix: calling setPages() when initializing the dialogue so default pages can have their timeout scheduled

Closes #1406

See merge request cable-mc/cobblemon!1504
2025-01-31 07:41:29 +00:00
Hiroku 9f622fcd74 Merge branch 'pc-box-2-fix' into 'main'
Fix PC opening on Box 2

See merge request cable-mc/cobblemon!1505
2025-01-31 07:40:16 +00:00
Hiroku 956e2c43b8 Merge branch 'feat-winners-and-losers' into 'main'
feat: set winners and losers on PokemonBattle end

See merge request cable-mc/cobblemon!1501
2025-01-31 07:37:14 +00:00
Hiroku 130f87c9f7 Merge branch 'strip-stripped-log' into 'main'
remove apricorn_stripped_log and apricorn_stripped_log_top as never used

See merge request cable-mc/cobblemon!1502
2025-01-31 07:27:54 +00:00
gbassinello 22b4e8c75f chore: changelog lines 2025-01-31 01:44:50 -03:00
gbassinello c19a3ca444 feat: set winners and losers on battle end 2025-01-31 01:44:50 -03:00
Polymeta a006eb5dcc revert previous attempt and fix camera mode
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
2025-01-31 01:44:50 -03:00
gbassinello ed419e7e53 fix: removing activeDialogues from the DialogueManager map using the correct key (player uuid) 2025-01-31 01:44:50 -03:00
Hiroku bff2387b4d Merge branch 'feature/particle-fixes' into 'main'
revert previous attempt and fix camera mode

See merge request cable-mc/cobblemon!1506
2025-01-31 04:02:00 +00:00
Polymeta 41544efeba revert previous attempt and fix camera mode
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
2025-01-30 23:15:08 +00:00
Paul e6e6c9f7f6 Merge remote-tracking branch 'origin/main' 2025-01-31 08:31:31 +10:00
Paul 22d8e39db3 back to snapshots 2025-01-31 08:31:17 +10:00
Hiroku bfdf1e9e6c Merge branch 'fix-activedialoguesmapkey' into 'main'
fix: removing activeDialogues from the DialogueManager map using the correct key (player uuid)

Closes #1405

See merge request cable-mc/cobblemon!1503
2025-01-30 22:19:22 +00:00
BuildTools c3fccfde09 Fix PC opening on Box 2 because default value for 'box' in OpenPCPacket was '1' instead of '0' 2025-01-30 21:48:18 +02:00
gbassinello 4bb8d43a6e fix: calling setPages() when initializing the dialogue so default pages can have their timeout scheduled 2025-01-30 13:50:18 -03:00
gbassinello fda4b67776 fix: removing activeDialogues from the DialogueManager map using the correct key (player uuid) 2025-01-30 13:34:52 -03:00
Xander Forrest f1ee9d45de remove apricorn_stripped_log and apricorn_stripped_log_top as never used 2025-01-28 19:39:28 +00:00
Polymeta 01f7d13e3f update tag and preset list [skip-ci]
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
2025-01-26 21:32:32 +00:00
Paul d85e30f3a6 But what if we didn't break the yarn mapping 2025-01-26 22:15:17 +10:00
Polymeta 4074aa50ce refactor storage layer and introduce .old filetype as a stopgap for file corruption during crashes
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
2025-01-21 02:14:35 +00:00
36 changed files with 873 additions and 329 deletions

No files matched your search

+30 -1
View File
@@ -1,4 +1,17 @@
# Changelog
## [1.7.0 (Month xth, 2025)](#1-7-0)
### Fixes
- Fixed Particles sometimes facing the wrong direction (looking at you, Swords Dance)
- Fixed PCs always opening at box 2 instead of box 1.
### Developer
- A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
- Dialogues are correctly removed from memory when they are stopped.
- Dialogues with variably-set initial pages now properly start timeout tracking.
### Additions
- Added `/cobblemonconfig reload` command to reload `main.json` configuration. **Note:** Some settings require a server restart to take effect; use this command cautiously.
## [1.6.1 (January 26th, 2025)](#1-6-1)
### Additions
@@ -12,6 +25,22 @@
- Added config setting `maxPokedexScanningDetectionRange` to control from what distance the player can scan Pokémon using the Pokédex.
- Added config setting `hideUnimplementedPokemonInThePokedex` which hides unimplemented Pokémon from the Pokédex when set to true.
- Added debug renderer for posable entity locators.
- Added crossover paintings from Close Combat, Premonition, Altar, Slumber, and Nomad.
- Added optional box argument to the /pc command
### Changes
- Pokémon will now be dynamically revealed to the Pokédex as they're seen instead of revealing entire parties at the end of battle regardless.
- Unseen wild Pokémon will update their name from '???' to their real name as soon as a battle starts to reflect the battle UI showing the actual species name.
- Pokémon under the illusion effect will reveal their disguise to the Pokédex first and then the base Pokémon once the disguise is broken.
- Added more support for a variety of Fabric/NeoForge Convention tags.
- Reformatted some tags to be more consistent.
- Edited some recipes to utilize tags instead of direct item ids, for greater mod compatibility.
- Berries will drop if broken at age 0
- Improved Fortune drops on Mint Seeds
- New Slowpoke shiny texture.
- Updated drops for many Pokémon.
- Completely resynced Pokémon move and stat data based on later games. Learnsets have changed considerably to maximise available moves.
- Cobblemon save data now saves .old files where applicable as a means to recover from file corruption due to crashes or similar abrupt stops
### Pokémon Added
@@ -175,7 +204,7 @@
- Added `hideNameTag` field and `HideNPCNameTag` nbt tag to `NPCEntity` to allow hiding the name tag of the NPC.
- Added the player to `PokerodReelEvent` so you know who is doing the reeling.
### MoLang & Datapacks
### MoLang & Datapacks
- Added flows for:
- `forme_change`: Triggered when a Pokémon changes form in battle.
- `mega_evolution`: Triggered when a Pokémon mega evolves in battle. (Note: Third-party mods are required for this feature currently)
@@ -125,6 +125,7 @@ import kotlin.reflect.jvm.javaField
import net.minecraft.client.Minecraft
import net.minecraft.commands.synchronization.SingletonArgumentInfo
import net.minecraft.resources.ResourceKey
import net.minecraft.server.level.ServerPlayer
import net.minecraft.server.packs.PackType
import net.minecraft.world.item.NameTagItem
import net.minecraft.world.level.Level
@@ -220,7 +221,7 @@ object Cobblemon {
storage.onPlayerDataSync(it)
playerDataManager.syncAllToPlayer(it)
starterHandler.handleJoin(it)
ServerSettingsPacket(this.config.preventCompletePartyDeposit, this.config.displayEntityLevelLabel, this.config.displayEntityNameLabel, this.config.maxPokemonLevel, this.config.maxPokemonFriendship, this.config.maxDynamaxLevel).sendToPlayer(it)
sendServerSettingsPacketToPlayer(it)
}
PlatformEvents.SERVER_PLAYER_LOGOUT.subscribe {
PCLinkManager.removeLink(it.player.uuid)
@@ -268,8 +269,17 @@ object Cobblemon {
}
HeldItemProvider.register(CobblemonHeldItemManager, Priority.LOWEST)
}
fun sendServerSettingsPacketToPlayer(player: ServerPlayer) {
ServerSettingsPacket(
this.config.preventCompletePartyDeposit,
this.config.displayEntityLevelLabel,
this.config.displayEntityNameLabel,
this.config.maxPokemonLevel,
this.config.maxPokemonFriendship,
this.config.maxDynamaxLevel,
).sendToPlayer(player)
}
fun initialize() {
@@ -429,7 +439,23 @@ object Cobblemon {
}
}
private fun initializeConfig() {
loadCobblemonConfig()
saveConfig()
PokemonSpecies.observable.subscribe { starterConfig = this.loadStarterConfig() }
}
fun loadConfig() {
initializeConfig()
bestSpawner.init()
}
fun reloadConfig() {
initializeConfig()
bestSpawner.reloadConfig()
}
private fun loadCobblemonConfig() {
val configFile = File(CONFIG_PATH)
configFile.parentFile.mkdirs()
@@ -472,12 +498,6 @@ object Cobblemon {
} else {
this.config = CobblemonConfig()
}
config.lastSavedVersion = VERSION
this.saveConfig()
bestSpawner.loadConfig()
PokemonSpecies.observable.subscribe { starterConfig = this.loadStarterConfig() }
}
fun loadStarterConfig(): StarterConfig {
@@ -501,6 +521,8 @@ object Cobblemon {
}
fun saveConfig() {
config.lastSavedVersion = VERSION
try {
val configFile = File(CONFIG_PATH)
val fileWriter = FileWriter(configFile)
@@ -527,4 +549,4 @@ object Cobblemon {
this.implementation.registerCommandArgument(cobblemonResource("npc_class"), NPCClassArgumentType::class, SingletonArgumentInfo.contextFree(NPCClassArgumentType::npcClass))
}
}
}
@@ -57,6 +57,7 @@ object CobblemonCommands {
FreezePokemonCommand.register(dispatcher)
ApplyPlayerTextureCommand.register(dispatcher)
RunMolangScriptCommand.register(dispatcher)
CobblemonConfigCommand.register(dispatcher)
// Possibly lock down registration if and only if under dev environment or running in an environment
// with a certain system environment variable set
@@ -55,6 +55,7 @@ class ActiveDialogue(var playerEntity: ServerPlayer, var dialogueReference: Dial
)
dialogueReference.initializationAction.invoke(this)
setPage(currentPage)
if (!completion.isDone) {
val packet = DialogueOpenedPacket(this, true)
@@ -52,6 +52,6 @@ object DialogueManager {
fun stopDialogue(playerEntity: ServerPlayer) {
val activeDialogue = playerEntity.activeDialogue ?: return
DialogueClosedPacket(activeDialogue.dialogueId).sendToPlayer(playerEntity)
activeDialogues.remove(activeDialogue.dialogueId)
activeDialogues.remove(playerEntity.uuid)
}
}
@@ -8,8 +8,6 @@
package com.cobblemon.mod.common.api.permission
import com.cobblemon.mod.common.command.AbandonMultiTeam
object CobblemonPermissions {
private const val COMMAND_PREFIX = "command."
@@ -84,6 +82,8 @@ object CobblemonPermissions {
val RUN_MOLANG_SCRIPT = this.create("${COMMAND_PREFIX}runmolangscript", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
val COBBLEMON_CONFIG_RELOAD = this.create("${COMMAND_PREFIX}cobblemonconfig.reload", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
fun all(): Iterable<Permission> = this.permissions
private fun create(node: String, level: PermissionLevel): Permission {
@@ -498,7 +498,7 @@ class LookAtDirection : ParticleCameraMode {
rotation.hamiltonProduct(Axis.ZP.rotationDegrees(particleAngle))
// Minecraft in 1.21 or 1.20.4 or something fucked with vertex draw order, and it flipped everything.
rotation.hamiltonProduct(Axis.YP.rotationDegrees(180F))
rotation.hamiltonProduct(Axis.XP.rotationDegrees(180F))
return rotation
}
@@ -83,8 +83,9 @@ object BestSpawner {
var defaultPokemonDespawner: Despawner<PokemonEntity> = CobblemonAgingDespawner(getAgeTicks = { it.ticksLived })
lateinit var fishingSpawner: FishingSpawner
fun loadConfig() {
fun init() {
LOGGER.info("Starting the Best Spawner...")
SpawningCondition.register(BasicSpawningCondition.NAME, BasicSpawningCondition::class.java)
SpawningCondition.register(AreaSpawningCondition.NAME, AreaSpawningCondition::class.java)
SpawningCondition.register(SubmergedSpawningCondition.NAME, SubmergedSpawningCondition::class.java)
@@ -94,6 +95,7 @@ object BestSpawner {
SpawningCondition.register(FishingSpawningCondition.NAME, FishingSpawningCondition::class.java)
LOGGER.info("Loaded ${SpawningCondition.conditionTypes.size} spawning condition types.")
SpawningContextCalculator.register(GroundedSpawningContextCalculator)
SpawningContextCalculator.register(SeafloorSpawningContextCalculator)
SpawningContextCalculator.register(LavafloorSpawningContextCalculator)
@@ -113,14 +115,23 @@ object BestSpawner {
SpawnDetail.registerSpawnType(name = NPCSpawnDetail.TYPE, NPCSpawnDetail::class.java)
LOGGER.info("Loaded ${SpawnDetail.spawnDetailTypes.size} spawn detail types.")
config = BestSpawnerConfig.load()
loadConfig()
SpawnDetailPresets.registerPresetType(BasicSpawnDetailPreset.NAME, BasicSpawnDetailPreset::class.java)
SpawnDetailPresets.registerPresetType(PokemonSpawnDetailPreset.NAME, PokemonSpawnDetailPreset::class.java)
}
fun loadConfig() {
config = BestSpawnerConfig.load()
}
fun reloadConfig() {
loadConfig()
spawnerManagers.forEach(SpawnerManager::onConfigReload)
}
fun onServerStarted() {
spawnerManagers.forEach(SpawnerManager::onServerStarted)
fishingSpawner = FishingSpawner()
}
}
}
@@ -96,4 +96,4 @@ object SpawnDetailPresets : JsonDataRegistry<SpawnDetailPreset> {
this.presets = data.toMutableMap()
Cobblemon.LOGGER.info("Loaded ${presets.size} spawn detail presets.")
}
}
}
@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.api.spawning
import com.cobblemon.mod.common.Cobblemon
import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner
import com.cobblemon.mod.common.api.spawning.spawner.Spawner
import com.cobblemon.mod.common.api.spawning.spawner.TickingSpawner
import com.cobblemon.mod.common.util.server
@@ -58,6 +59,12 @@ open class SpawnerManager {
}
}
open fun onConfigReload() {
spawners.filterIsInstance<PlayerSpawner>().forEach {
it.ticksBetweenSpawns = Cobblemon.config.ticksBetweenSpawnAttempts
}
}
open fun onServerStarted() {
spawners.clear()
}
@@ -161,4 +161,4 @@ abstract class SpawningCondition<T : SpawningContext> {
return false
return true
}
}
}
@@ -221,4 +221,4 @@ abstract class SpawningContext {
}
return false
}
}
}
@@ -64,4 +64,4 @@ open class SpawningContextInput(
val cause: SpawnCause,
/** The [Level] the spawning context exists in. */
val world: ServerLevel
)
)
@@ -103,4 +103,4 @@ abstract class SpawnDetail : ModDependant {
}
abstract fun doSpawn(ctx: SpawningContext): SpawnAction<*>
}
}
@@ -46,16 +46,16 @@ open class JSONStoreAdapter(
override fun <E, T : PokemonStore<E>> load(file: File, storeClass: Class<out T>, uuid: UUID, registryAccess: RegistryAccess): T? {
return try {
val br = BufferedReader(FileReader(file))
val json = gson.fromJson<JsonObject>(br)
br.close()
val store = try {
storeClass.getConstructor(UUID::class.java, UUID::class.java).newInstance(uuid, uuid)
} catch (exception: NoSuchMethodException) {
storeClass.getConstructor(UUID::class.java).newInstance(uuid)
file.reader().use {
val json = gson.fromJson<JsonObject>(it)
val store = try {
storeClass.getConstructor(UUID::class.java, UUID::class.java).newInstance(uuid, uuid)
} catch (exception: NoSuchMethodException) {
storeClass.getConstructor(UUID::class.java).newInstance(uuid)
}
store.loadFromJSON(json, registryAccess)
store
}
store.loadFromJSON(json, registryAccess)
store
} catch (e: Exception) {
null
}
@@ -42,6 +42,7 @@ abstract class OneToOneFileStoreAdapter<S>(
) : FileStoreAdapter<S>, CobblemonAdapterParent<S>() {
abstract fun save(file: File, serialized: S)
abstract fun <E, T : PokemonStore<E>> load(file: File, storeClass: Class<out T>, uuid: UUID, registryAccess: RegistryAccess): T?
fun getFile(storeClass: Class<out PokemonStore<*>>, uuid: UUID): File {
val className = storeClass.simpleName.lowercase()
val subfolder1 = if (folderPerClass) "$className/" else ""
@@ -56,34 +57,54 @@ abstract class OneToOneFileStoreAdapter<S>(
override fun save(storeClass: Class<out PokemonStore<*>>, uuid: UUID, serialized: S) {
val file = getFile(storeClass, uuid)
val tempFile = File(file.absolutePath + ".temp")
val oldFile = File(file.absolutePath + ".old")
tempFile.createNewFile()
save(tempFile, serialized)
if (file.exists()) {
file.copyTo(oldFile, overwrite = true)
}
tempFile.copyTo(file, overwrite = true)
tempFile.delete()
}
override fun <E : StorePosition, T : PokemonStore<E>> provide(storeClass: Class<T>, uuid: UUID, registryAccess: RegistryAccess): T? {
val file = getFile(storeClass, uuid)
val tempFile = File(file.absolutePath + ".temp")
if (tempFile.exists()) {
try {
val tempLoaded = load(tempFile, storeClass, uuid, registryAccess)
if (tempLoaded != null) {
save(file, serialize(tempLoaded, registryAccess))
return tempLoaded
}
} finally {
tempFile.delete()
}
}
val oldFile = File(file.absolutePath + ".old")
return if (file.exists()) {
return if (file.exists() && file.length() > 0L) {
load(file, storeClass, uuid, registryAccess)
?: let {
LOGGER.error("Pokémon save file for ${storeClass.simpleName} ($uuid) was corrupted. A fresh file will be created.")
storeClass.getConstructor(UUID::class.java).newInstance(uuid)
file.delete()
if (oldFile.exists() && oldFile.length() > 0L) {
var result = load(oldFile, storeClass, uuid, registryAccess) ?: let {
LOGGER.error("Pokémon save file for ${storeClass.simpleName} ($uuid) was corrupted. A fresh file will be created.")
var result = storeClass.getConstructor(UUID::class.java).newInstance(uuid)
save(storeClass, uuid, serialize(result, registryAccess))
oldFile.delete()
return result
}
LOGGER.warn("Loading old Pokémon save file for ${storeClass.simpleName} ($uuid) due to corruption of current file.")
oldFile.copyTo(file, overwrite = true)
result
}
else {
storeClass.getConstructor(UUID::class.java).newInstance(uuid)
var result = storeClass.getConstructor(UUID::class.java).newInstance(uuid)
save(storeClass, uuid, serialize(result, registryAccess))
oldFile.delete()
result
}
}
} else {
file.delete()
if (oldFile.exists() && oldFile.length() > 0L) {
var result = load(oldFile, storeClass, uuid, registryAccess) ?: let {
oldFile.delete()
return null
}
oldFile.copyTo(file, overwrite = true)
result
}
null
}
}
@@ -8,10 +8,12 @@
package com.cobblemon.mod.common.api.storage.player.adapter
import com.cobblemon.mod.common.Cobblemon
import com.cobblemon.mod.common.api.storage.player.InstancedPlayerData
import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreType
import net.minecraft.server.MinecraftServer
import net.minecraft.world.level.storage.LevelResource
import java.io.File
import java.nio.file.Path
import java.util.UUID
@@ -35,15 +37,70 @@ abstract class FileBasedPlayerDataStoreBackend<T : InstancedPlayerData>(
savePath = server.getWorldPath(LevelResource.PLAYER_DATA_DIR).parent
}
//TODO: Set file extension to be a field
fun getSubFile(uuid: UUID): String {
return if (useNestedStructure) {
"${uuid.toString().substring(0, 2)}/$uuid.$fileExt"
protected fun postSaveFileMoving(playerData: T) {
val tempFile = filePath(playerData.uuid, TEMPORARY_FILE_EXTENSION)
val oldFile = filePath(playerData.uuid, OLD_FILE_EXTENSION)
val file = filePath(playerData.uuid)
if (file.exists()) {
file.copyTo(oldFile, overwrite = true)
}
tempFile.copyTo(file, overwrite = true)
tempFile.delete()
}
protected fun loadWithFallback(uuid: UUID, loadFunction: (File) -> T): T {
val playerFile = filePath(uuid)
val playerFileOld = filePath(uuid, OLD_FILE_EXTENSION)
playerFile.parentFile.mkdirs()
val loadFallback: () -> T = {
playerFile.delete()
if (playerFileOld.exists() && playerFileOld.length() > 0L) {
try {
var result = loadFunction(playerFileOld)
playerFileOld.copyTo(playerFile)
Cobblemon.LOGGER.debug("Loaded .old {} for {}", subfolder, uuid)
result
} catch (e: Exception) {
Cobblemon.LOGGER.error("Failed to load .old $subfolder for $uuid due to ${e.message}. Data is lost")
Cobblemon.LOGGER.error(e)
playerFileOld.delete()
defaultData.invoke(uuid).also(::save)
}
}
else {
Cobblemon.LOGGER.error(".old File $subfolder for $uuid is corrupt or missing. Data is lost")
playerFileOld.delete()
defaultData.invoke(uuid).also(::save)
}
}
return if (playerFile.exists() && playerFile.length() > 0L) {
try {
loadFunction(playerFile)
}
catch (e: Exception) {
Cobblemon.LOGGER.warn("Failed to load $subfolder for $uuid due to ${e.message}")
Cobblemon.LOGGER.warn(e)
loadFallback()
}
} else {
"$uuid.$fileExt"
loadFallback()
}.also { it.initialize() }
}
@JvmOverloads
fun getSubFile(uuid: UUID, extension: String? = null): String {
return if (useNestedStructure) {
"${uuid.toString().substring(0, 2)}/$uuid.$fileExt${if (extension != null) ".$extension" else ""}"
} else {
"$uuid.$fileExt.${if (extension != null) ".$extension" else ""}"
}
}
fun filePath(uuid: UUID) = savePath.resolve("$subfolder/${getSubFile(uuid)}").toFile()
@JvmOverloads
fun filePath(uuid: UUID, extension: String? = null): File = savePath.resolve("$subfolder/${getSubFile(uuid, extension)}").toFile()
companion object {
const val OLD_FILE_EXTENSION = "old"
const val TEMPORARY_FILE_EXTENSION = "tmp"
}
}
@@ -28,29 +28,26 @@ abstract class JsonBackedPlayerDataStoreBackend<T : InstancedPlayerData>(
abstract val classToken: TypeToken<T>
override fun save(playerData: T) {
val file = filePath(playerData.uuid)
file.parentFile.mkdirs()
val pw = PrintWriter(filePath(playerData.uuid))
pw.write(gson.toJson(playerData))
pw.flush()
pw.close()
val fileTmp = filePath(playerData.uuid, TEMPORARY_FILE_EXTENSION)
fileTmp.parentFile.mkdirs()
fileTmp.printWriter().use { pw ->
pw.write(gson.toJson(playerData))
}
postSaveFileMoving(playerData)
}
override fun load(uuid: UUID): T {
val playerFile = filePath(uuid)
playerFile.parentFile.mkdirs()
return if (playerFile.exists() && playerFile.length() > 0L) {
gson.fromJson(BufferedReader(FileReader(playerFile)), classToken).also {
// Resolves old data that's missing new properties
val newProps = it::class.memberProperties.filterIsInstance<KMutableProperty<*>>().filter { member -> member.getter.call(it) == null }
if (newProps.isNotEmpty()) {
val defaultData = defaultData(uuid)
newProps.forEach { member -> member.setter.call(it, member.getter.call(defaultData)) }
return loadWithFallback(uuid) {
it.reader().use { reader ->
gson.fromJson(reader, classToken).also {
// Resolves old data that's missing new properties
val newProps = it::class.memberProperties.filterIsInstance<KMutableProperty<*>>().filter { member -> member.getter.call(it) == null }
if (newProps.isNotEmpty()) {
val defaultData = defaultData(uuid)
newProps.forEach { member -> member.setter.call(it, member.getter.call(defaultData)) }
}
}
}
} else {
defaultData.invoke(uuid).also(::save)
}.also { it.initialize() }
}
}
}
@@ -24,29 +24,24 @@ abstract class NbtBackedPlayerData<T : InstancedPlayerData>(
type: PlayerInstancedDataStoreType
) : FileBasedPlayerDataStoreBackend<T>(subfolder, type, "nbt") {
abstract val codec: Codec<T>
override fun save(playerData: T) {
val file = filePath(playerData.uuid)
file.parentFile.mkdirs()
val os = DataOutputStream(FileOutputStream(filePath(playerData.uuid)))
val encodeResult = NbtOps.INSTANCE.withEncoder(codec).apply(playerData)
NbtIo.write(encodeResult.result().get() as CompoundTag, os)
os.flush()
os.close()
val fileTmp = filePath(playerData.uuid, TEMPORARY_FILE_EXTENSION)
fileTmp.parentFile.mkdirs()
val encodeResult = codec.encodeStart(NbtOps.INSTANCE, playerData)
NbtIo.write(encodeResult.result().get() as CompoundTag, fileTmp.toPath())
postSaveFileMoving(playerData)
}
override fun load(uuid: UUID): T {
val playerFile = filePath(uuid)
playerFile.parentFile.mkdirs()
return if (playerFile.exists() && playerFile.length() > 0L) {
val input = NbtIo.read(playerFile.toPath())
val decodeResult = NbtOps.INSTANCE.withDecoder(codec).apply(input)
decodeResult.getPartialOrThrow {
return loadWithFallback(uuid) {
val input = NbtIo.read(it.toPath())
val decodeResult = codec.decode(NbtOps.INSTANCE, input)
decodeResult.getOrThrow {
Cobblemon.LOGGER.error("Error decoding $subfolder for player uuid $uuid")
Cobblemon.LOGGER.error(it)
throw UnsupportedOperationException()
}.first
} else {
defaultData.invoke(uuid).also(::save)
}.also { it.initialize() }
}
}
}
@@ -68,6 +68,8 @@ class WinInstruction(val message: BattleMessage): InterpreterInstruction {
}
}
battle.dispatchGo {
battle.winners = winners
battle.losers = losers
battle.end()
CobblemonEvents.BATTLE_VICTORY.post(BattleVictoryEvent(battle, winners, losers, wasCaught))
ShowdownInterpreter.lastCauser.remove(battle.battleId)
@@ -18,7 +18,7 @@ class GrabbedStorageSlot(
) : StorageSlot(x, y, parent, {}) {
init {
isSelected = true
isSlotSelected = true
}
override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
@@ -46,7 +46,7 @@ open class StorageSlot(
private val slotOverlayMoveIconResource = cobblemonResource("textures/gui/pasture/pc_slot_icon_move.png")
}
protected var isSelected = false;
protected var isSlotSelected = false;
override fun playDownSound(soundManager: SoundManager) {
}
@@ -84,7 +84,7 @@ open class StorageSlot(
context.disableScissor()
if (!isSelected) {
if (!isSlotSelected) {
// Ensure elements are not hidden behind Pokémon render
matrices.pushPose()
matrices.translate(0.0, 0.0, 100.0)
@@ -129,7 +129,7 @@ open class StorageSlot(
matrices.translate(0.0, 0.0, 500.0)
val config = parent.pcGui.configuration
if (pokemon.tetheringId != null && !isSelected) {
if (pokemon.tetheringId != null && !isSlotSelected) {
if (isStationary()) {
blitk(
matrixStack = matrices,
@@ -204,8 +204,8 @@ class SnowstormParticle(
val spriteURange = sprite.u1 - sprite.u0
val spriteVRange = sprite.v1 - sprite.v0
val maxU = uvs.startU * spriteURange + sprite.u0
val minU = uvs.endU * spriteURange + sprite.u0
val minU = uvs.startU * spriteURange + sprite.u0
val maxU = uvs.endU * spriteURange + sprite.u0
val minV = uvs.startV * spriteVRange + sprite.v0
val maxV = uvs.endV * spriteVRange + sprite.v0
@@ -0,0 +1,42 @@
/*
* 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.command
import com.cobblemon.mod.common.Cobblemon
import com.cobblemon.mod.common.api.permission.CobblemonPermissions
import com.cobblemon.mod.common.util.commandLang
import com.cobblemon.mod.common.util.permission
import com.mojang.brigadier.Command
import com.mojang.brigadier.CommandDispatcher
import net.minecraft.commands.CommandSourceStack
import net.minecraft.commands.Commands
import net.minecraft.server.level.ServerPlayer
object CobblemonConfigCommand {
fun register(dispatcher: CommandDispatcher<CommandSourceStack>) {
dispatcher.register(
Commands.literal("cobblemonconfig")
.then(
Commands.literal("reload")
.permission(CobblemonPermissions.COBBLEMON_CONFIG_RELOAD)
.executes {
Cobblemon.reloadConfig()
it.source.server.playerList.players.forEach { player ->
if (player is ServerPlayer) {
Cobblemon.sendServerSettingsPacketToPlayer(player)
}
}
it.source.sendSuccess({ commandLang("cobblemon_config.reload") }, true)
Command.SINGLE_SUCCESS
}
)
)
}
}
@@ -26,7 +26,7 @@ import net.minecraft.network.RegistryFriendlyByteBuf
* @author Hiroku
* @since June 20th, 2022
*/
class OpenPCPacket(val storeID: UUID, val box: Int = 1) : NetworkPacket<OpenPCPacket> {
class OpenPCPacket(val storeID: UUID, val box: Int = 0) : NetworkPacket<OpenPCPacket> {
override val id = ID
@@ -1528,6 +1528,7 @@
"cobblemon.command.pokemonrestart": "Cleared %1$s's party and PC.",
"cobblemon.command.freezepokemon.non_pokemon": "You are not looking at a Pokémon.",
"cobblemon.command.npcedit.non_npc": "You are not looking at a NPC.",
"cobblemon.command.cobblemon_config.reload": "Reloading Cobblemon settings.",
"advancements.cobblemon.root": "The World of Cobblemon!",
"advancements.cobblemon.root.description": "Choose a starter Pokémon and set out on a new adventure",
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

@@ -6,9 +6,7 @@
{
"id": "whiscash-1",
"pokemon": "whiscash",
"presets": [
"water"
],
"presets": ["water"],
"type": "pokemon",
"context": "submerged",
"bucket": "common",
@@ -16,17 +14,13 @@
"weight": 1.0,
"condition": {
"canSeeSky": true,
"biomes": [
"#cobblemon:is_swamp"
]
"biomes": ["#cobblemon:is_swamp"]
}
},
{
"id": "whiscash-2",
"pokemon": "whiscash",
"presets": [
"water"
],
"presets": ["water"],
"type": "pokemon",
"context": "submerged",
"bucket": "uncommon",
@@ -35,9 +29,7 @@
"condition": {
"minSkyLight": 0,
"maxSkyLight": 7,
"biomes": [
"#cobblemon:is_overworld"
]
"biomes": ["#cobblemon:is_overworld"]
}
},
{
@@ -60,9 +52,7 @@
]
},
"anticondition": {
"biomes": [
"#cobblemon:is_freezing"
]
"biomes": ["#cobblemon:is_freezing"]
}
},
{
@@ -76,14 +66,12 @@
"condition": {
"minSkyLight": 0,
"maxSkyLight": 7,
"biomes": [
"#cobblemon:is_overworld"
]
"biomes": ["#cobblemon:is_overworld"]
}
},
{
"id": "whiscash-5",
"pokemon": "whiscash",
"pokemon": "whiscash whiscash_nero",
"type": "pokemon",
"context": "fishing",
"bucket": "rare",
@@ -102,34 +90,13 @@
"bobber": "cobblemon:master_ball"
},
"anticondition": {
"biomes": [
"#cobblemon:is_freezing"
]
}
},
{
"id": "whiscash-6",
"pokemon": "whiscash",
"type": "pokemon",
"context": "fishing",
"bucket": "rare",
"level": "30-47",
"weight": 10.0,
"condition": {
"minSkyLight": 0,
"maxSkyLight": 7,
"biomes": [
"#cobblemon:is_overworld"
],
"bobber": "cobblemon:master_ball"
"biomes": ["#cobblemon:is_freezing"]
}
},
{
"id": "whiscash-7",
"pokemon": "whiscash",
"presets": [
"water"
],
"presets": ["water"],
"type": "pokemon",
"context": "submerged",
"bucket": "common",
@@ -139,9 +106,7 @@
"canSeeSky": false,
"minSkyLight": 8,
"maxSkyLight": 15,
"biomes": [
"#cobblemon:is_swamp"
]
"biomes": ["#cobblemon:is_swamp"]
}
},
{
@@ -166,38 +131,8 @@
]
},
"anticondition": {
"biomes": [
"#cobblemon:is_freezing"
]
}
},
{
"id": "whiscash-9",
"pokemon": "whiscash",
"type": "pokemon",
"context": "fishing",
"bucket": "rare",
"level": "30-47",
"weight": 10.0,
"condition": {
"canSeeSky": false,
"minSkyLight": 8,
"maxSkyLight": 15,
"biomes": [
"#cobblemon:is_arid",
"#cobblemon:is_freshwater",
"#cobblemon:is_hills",
"#cobblemon:is_jungle",
"#cobblemon:is_mushroom",
"#cobblemon:is_temperate"
],
"bobber": "cobblemon:master_ball"
},
"anticondition": {
"biomes": [
"#cobblemon:is_freezing"
]
"biomes": ["#cobblemon:is_freezing"]
}
}
]
}
}
@@ -1,7 +1,6 @@
{
"replace": false,
"values": [
"#cobblemon:is_swamp",
"#cobblemon:is_overworld"
"#cobblemon:is_swamp"
]
}
@@ -7,7 +7,8 @@ This file contains tags related to different biomes in cobblemon, as well as som
<details>
<summary><b>Tag:</b> #biome:is_arid</summary>
- #cobblemon:is_sandy
- #cobblemon:is_badlands
- #cobblemon:is_desert
- #cobblemon:is_savanna
</details>
@@ -1039,15 +1040,164 @@ This file contains tags related to different biomes in cobblemon, as well as som
</details>
<details>
<summary><b>Tag:</b> #evolution:alolan</summary>
<summary><b>Tag:</b> #regional:bergmite_hisuibiome</summary>
- #cobblemon:is_tropical_island
- #minecraft:is_beach
- #cobblemon:is_freezing
- #cobblemon:is_hills
</details>
<details>
<summary><b>Tag:</b> #evolution:cyndaquil_quilava_hisui_bias</summary>
<summary><b>Tag:</b> #regional:bergmite_kalosbiome</summary>
- #cobblemon:is_frozen_ocean
</details>
<details>
<summary><b>Tag:</b> #regional:cubone_alolabiome</summary>
- #cobblemon:is_beach
- #cobblemon:is_volcanic
</details>
<details>
<summary><b>Tag:</b> #regional:cubone_kantobiome</summary>
- #cobblemon:is_arid
</details>
<details>
<summary><b>Tag:</b> #regional:dartrix_alolabiome</summary>
- #cobblemon:is_beach
- #cobblemon:is_ocean
- #cobblemon:is_tropical_island
</details>
<details>
<summary><b>Tag:</b> #regional:dartrix_hisuibiome</summary>
- #cobblemon:is_freezing
- #cobblemon:is_hills
</details>
<details>
<summary><b>Tag:</b> #regional:dewott_hisuibiome</summary>
- #cobblemon:is_coast
- #cobblemon:is_cold_ocean
- minecraft:snowy_beach
</details>
<details>
<summary><b>Tag:</b> #regional:dewott_unovabiome</summary>
- #cobblemon:is_beach
- #cobblemon:is_ocean
- #cobblemon:is_tropical_island
</details>
<details>
<summary><b>Tag:</b> #regional:exeggcute_alolabiome</summary>
- #cobblemon:is_beach
- #cobblemon:is_tropical_island
</details>
<details>
<summary><b>Tag:</b> #regional:exeggcute_kantobiome</summary>
- #cobblemon:is_jungle
- #cobblemon:is_savanna
</details>
<details>
<summary><b>Tag:</b> #regional:goomy_hisuibiome</summary>
- #cobblemon:is_dripstone
- #cobblemon:is_lush
</details>
<details>
<summary><b>Tag:</b> #regional:goomy_kalosbiome</summary>
- #cobblemon:is_overworld
- #cobblemon:is_swamp
</details>
<details>
<summary><b>Tag:</b> #regional:koffing_galarbiome</summary>
- #cobblemon:is_mushroom
</details>
<details>
<summary><b>Tag:</b> #regional:koffing_kantobiome</summary>
- #cobblemon:nether/is_toxic
</details>
<details>
<summary><b>Tag:</b> #regional:mimejr_galarbiome</summary>
- #cobblemon:is_freezing
</details>
<details>
<summary><b>Tag:</b> #regional:mimejr_sinnohbiome</summary>
- #cobblemon:is_temperate
</details>
<details>
<summary><b>Tag:</b> #regional:petilil_hisuibiome</summary>
- #cobblemon:is_freezing
- #cobblemon:is_hills
</details>
<details>
<summary><b>Tag:</b> #regional:petilil_unovabiome</summary>
- #cobblemon:is_floral
- #cobblemon:is_forest
- #cobblemon:is_tropical_island
</details>
<details>
<summary><b>Tag:</b> #regional:pikachu_alolabiome</summary>
- #cobblemon:is_beach
- #cobblemon:is_tropical_island
</details>
<details>
<summary><b>Tag:</b> #regional:pikachu_kantobiome</summary>
- #cobblemon:is_forest
</details>
<details>
<summary><b>Tag:</b> #regional:quilava_hisuibiome</summary>
- #cobblemon:is_taiga
- #cobblemon:nether/is_crimson
@@ -1057,60 +1207,62 @@ This file contains tags related to different biomes in cobblemon, as well as som
</details>
<details>
<summary><b>Tag:</b> #evolution:lilligant_unovan</summary>
<summary><b>Tag:</b> #regional:quilava_johtobiome</summary>
- #cobblemon:is_temperate
</details>
<details>
<summary><b>Tag:</b> #regional:rufflet_hisuibiome</summary>
- #cobblemon:is_freezing
- #cobblemon:is_hills
</details>
<details>
<summary><b>Tag:</b> #regional:rufflet_unovabiome</summary>
- #cobblemon:is_temperate
</details>
<details>
<summary><b>Tag:</b> #vivillon:archipelago</summary>
- #cobblemon:is_mushroom
</details>
<details>
<summary><b>Tag:</b> #vivillon:archipelago_anti</summary>
- #cobblemon:is_magical
- #cobblemon:is_spooky
- #cobblemon:is_swamp
</details>
<details>
<summary><b>Tag:</b> #vivillon:continental</summary>
- #cobblemon:is_plains
</details>
<details>
<summary><b>Tag:</b> #vivillon:continental_anti</summary>
- #cobblemon:is_floral
- #cobblemon:is_forest
- #cobblemon:is_tropical_island
- #cobblemon:is_mushroom
- #cobblemon:is_savanna
- minecraft:sunflower_plains
</details>
<details>
<summary><b>Tag:</b> #evolution:oshawott_dewott_hisui_bias</summary>
- #c:stony_shores
- minecraft:snowy_beach
- minecraft:stony_shore
- terralith:basalt_cliffs
- terralith:granite_cliffs
- terralith:white_cliffs
- wythers:calcite_coast
- wythers:cold_island
- wythers:cold_stony_shore
- wythers:deepslate_shore
- wythers:frigid_island
- wythers:frozen_island
- wythers:gravelly_beach
- wythers:icy_shore
</details>
<details>
<summary><b>Tag:</b> #evolution:rowlet_dartrix_alolan</summary>
- #cobblemon:is_forest
- #cobblemon:is_taiga
</details>
<details>
<summary><b>Tag:</b> #evolution:rowlet_dartrix_hisui_bias</summary>
- #cobblemon:is_snowy_forest
- #cobblemon:is_snowy_taiga
</details>
<details>
<summary><b>Tag:</b> #evolution:sliggoo_hisuian</summary>
- #cobblemon:is_dripstone
- #cobblemon:is_lush
</details>
<details>
<summary><b>Tag:</b> #evolution:vivillon_elegant</summary>
<summary><b>Tag:</b> #vivillon:elegant</summary>
- #cobblemon:is_magical
- #cobblemon:is_spooky
@@ -1118,7 +1270,123 @@ This file contains tags related to different biomes in cobblemon, as well as som
</details>
<details>
<summary><b>Tag:</b> #evolution:vivillon_monsoon</summary>
<summary><b>Tag:</b> #vivillon:elegant_anti</summary>
- #cobblemon:is_mountain
</details>
<details>
<summary><b>Tag:</b> #vivillon:fancy</summary>
- #cobblemon:is_cherry_blossom
</details>
<details>
<summary><b>Tag:</b> #vivillon:forsaken</summary>
- #cobblemon:is_deep_dark
</details>
<details>
<summary><b>Tag:</b> #vivillon:garden</summary>
- #cobblemon:is_forest
</details>
<details>
<summary><b>Tag:</b> #vivillon:garden_anti</summary>
- #cobblemon:is_cherry_blossom
- #cobblemon:is_floral
- #cobblemon:is_jungle
- #cobblemon:is_magical
- #cobblemon:is_mountain
- #cobblemon:is_mushroom
- #cobblemon:is_plains
- #cobblemon:is_spooky
- #cobblemon:is_swamp
</details>
<details>
<summary><b>Tag:</b> #vivillon:high_plains</summary>
- #cobblemon:is_badlands
</details>
<details>
<summary><b>Tag:</b> #vivillon:icy_snow</summary>
- #cobblemon:is_taiga
</details>
<details>
<summary><b>Tag:</b> #vivillon:icy_snow_anti</summary>
- #cobblemon:is_mountain
</details>
<details>
<summary><b>Tag:</b> #vivillon:inferno</summary>
- #minecraft:is_nether
</details>
<details>
<summary><b>Tag:</b> #vivillon:jungle</summary>
- #cobblemon:is_jungle
</details>
<details>
<summary><b>Tag:</b> #vivillon:jungle_anti</summary>
- #cobblemon:is_mountain
</details>
<details>
<summary><b>Tag:</b> #vivillon:marine</summary>
- #cobblemon:is_ocean
</details>
<details>
<summary><b>Tag:</b> #vivillon:marine_anti</summary>
- #cobblemon:is_frozen_ocean
- #cobblemon:is_warm_ocean
</details>
<details>
<summary><b>Tag:</b> #vivillon:meadow</summary>
- #cobblemon:is_floral
</details>
<details>
<summary><b>Tag:</b> #vivillon:meadow_anti</summary>
- #cobblemon:is_cherry_blossom
- #cobblemon:is_magical
- minecraft:sunflower_plains
</details>
<details>
<summary><b>Tag:</b> #vivillon:monsoon</summary>
- #cobblemon:is_mountain
- #cobblemon:is_peak
@@ -1126,7 +1394,18 @@ This file contains tags related to different biomes in cobblemon, as well as som
</details>
<details>
<summary><b>Tag:</b> #evolution:vivillon_ocean</summary>
<summary><b>Tag:</b> #vivillon:monsoon_anti</summary>
- #cobblemon:is_badlands
- #cobblemon:is_desert
- #cobblemon:is_floral
- #cobblemon:is_mushroom
- #cobblemon:is_tropical_island
</details>
<details>
<summary><b>Tag:</b> #vivillon:ocean</summary>
- #cobblemon:is_coast
- #cobblemon:is_warm_ocean
@@ -1134,7 +1413,24 @@ This file contains tags related to different biomes in cobblemon, as well as som
</details>
<details>
<summary><b>Tag:</b> #evolution:vivillon_river</summary>
<summary><b>Tag:</b> #vivillon:ocean_anti</summary>
- #cobblemon:is_cold_ocean
- #cobblemon:is_frozen_ocean
- #cobblemon:is_lukewarm_ocean
- #cobblemon:is_temperate_ocean
</details>
<details>
<summary><b>Tag:</b> #vivillon:polar</summary>
- #cobblemon:is_frozen_ocean
</details>
<details>
<summary><b>Tag:</b> #vivillon:river</summary>
- #cobblemon:is_river
- #cobblemon:is_swamp
@@ -1142,7 +1438,48 @@ This file contains tags related to different biomes in cobblemon, as well as som
</details>
<details>
<summary><b>Tag:</b> #evolution:vivillon_sun</summary>
<summary><b>Tag:</b> #vivillon:river_anti</summary>
- #cobblemon:is_forest
- #cobblemon:is_jungle
- #cobblemon:is_magical
- #cobblemon:is_spooky
</details>
<details>
<summary><b>Tag:</b> #vivillon:sandstorm</summary>
- #cobblemon:is_desert
</details>
<details>
<summary><b>Tag:</b> #vivillon:sandstorm_anti</summary>
- #cobblemon:is_badlands
</details>
<details>
<summary><b>Tag:</b> #vivillon:savanna</summary>
- #cobblemon:is_savanna
</details>
<details>
<summary><b>Tag:</b> #vivillon:savanna_anti</summary>
- #cobblemon:is_badlands
- #cobblemon:is_desert
- #cobblemon:is_floral
- #cobblemon:is_mountain
</details>
<details>
<summary><b>Tag:</b> #vivillon:sun</summary>
- #cobblemon:is_sky
- #cobblemon:is_volcanic
@@ -1151,7 +1488,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
</details>
<details>
<summary><b>Tag:</b> #evolution:vivillon_tundra</summary>
<summary><b>Tag:</b> #vivillon:tundra</summary>
- #cobblemon:is_glacial
- #cobblemon:is_snowy_forest
@@ -1159,6 +1496,20 @@ This file contains tags related to different biomes in cobblemon, as well as som
</details>
<details>
<summary><b>Tag:</b> #vivillon:tundra_anti</summary>
- #cobblemon:is_mountain
</details>
<details>
<summary><b>Tag:</b> #vivillon:void</summary>
- #minecraft:is_end
</details>
<details>
<summary><b>Tag:</b> #has_density:dense</summary>
@@ -1439,6 +1790,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
<details>
<summary><b>Tag:</b> #has_season:spring</summary>
- #aether:is_aether
- #cobblemon:is_floral
- #cobblemon:is_lukewarm_ocean
- #cobblemon:is_magical
@@ -1666,60 +2018,109 @@ This file contains tags related to different biomes in cobblemon, as well as som
</details>
<details>
<summary><b>Tag:</b> #regional_bias_evolutions:alolan</summary>
<summary><b>Tag:</b> #space:is_fiery</summary>
- #cobblemon:is_tropical_island
- #minecraft:is_beach
- #stellaris:mercury_biomes
- space:mercury_hotspot
- space:mercury_plains
- space:venus_highlands
- space:venus_lava_caves
- space:venus_lowlands
- space:venus_midlands
- space:venus_volcanic_plains
- stellaris:infernal_venus_barrens
</details>
<details>
<summary><b>Tag:</b> #regional_bias_evolutions:cyndaquil_quilava_hisui_bias</summary>
<summary><b>Tag:</b> #space:is_icy</summary>
- #cobblemon:is_taiga
- #cobblemon:nether/is_crimson
- #cobblemon:nether/is_forest
- #cobblemon:nether/is_overgrowth
- #space:ice_craters
- stellaris:mars_ice_spikes
</details>
<details>
<summary><b>Tag:</b> #regional_bias_evolutions:oshawott_dewott_hisui_bias</summary>
<summary><b>Tag:</b> #space:is_mars</summary>
- #c:stony_shores
- minecraft:snowy_beach
- minecraft:stony_shore
- terralith:basalt_cliffs
- terralith:granite_cliffs
- terralith:white_cliffs
- wythers:calcite_coast
- wythers:coastal_mangroves
- wythers:cold_island
- wythers:cold_stony_shore
- wythers:deepslate_shore
- wythers:frigid_island
- wythers:frozen_island
- wythers:gravelly_beach
- wythers:icy_shore
- wythers:mediterranean_island
- wythers:temperate_island
- wythers:tropical_island
- wythers:warm_stony_shore
- #stellaris:mars_biomes
- #stellaris:mars_biomes
- #stellaris:mars_biomes
- space:mars_dripstone
- space:mars_highlands
- space:mars_ice
- space:mars_lowlands
- space:mars_lush_caves
- space:mars_midlands
</details>
<details>
<summary><b>Tag:</b> #regional_bias_evolutions:rowlet_dartrix_alolan</summary>
<summary><b>Tag:</b> #space:is_mercury</summary>
- #cobblemon:is_forest
- #cobblemon:is_taiga
- #stellaris:mercury_biomes
- space:mercury_hotspot
- space:mercury_ice
- space:mercury_plains
</details>
<details>
<summary><b>Tag:</b> #regional_bias_evolutions:rowlet_dartrix_hisui_bias</summary>
<summary><b>Tag:</b> #space:is_moon</summary>
- #cobblemon:is_snowy_forest
- #cobblemon:is_snowy_taiga
- #stellaris:moon_biomes
- space:moon_highlands
- space:moon_ice
- space:moon_lowlands
- space:moon_midlands
- space:moon_rocks
- swe:moon
</details>
<details>
<summary><b>Tag:</b> #space:is_space</summary>
- #stellaris:mars_biomes
- #stellaris:mercury_biomes
- #stellaris:moon_biomes
- #stellaris:venus_biomes
- space:mars_dripstone
- space:mars_highlands
- space:mars_ice
- space:mars_lowlands
- space:mars_lush_caves
- space:mars_midlands
- space:mercury_hotspot
- space:mercury_ice
- space:mercury_plains
- space:moon_highlands
- space:moon_ice
- space:moon_lowlands
- space:moon_midlands
- space:moon_rocks
- space:space
- space:venus_highlands
- space:venus_lava_caves
- space:venus_lowlands
- space:venus_midlands
- space:venus_plankton_bloom
- space:venus_sky
- space:venus_volcanic_plains
- swe:moon
</details>
<details>
<summary><b>Tag:</b> #space:is_venus</summary>
- #stellaris:venus_biomes
- space:venus_highlands
- space:venus_lava_caves
- space:venus_lowlands
- space:venus_midlands
- space:venus_plankton_bloom
- space:venus_sky
- space:venus_volcanic_plains
</details>
@@ -186,6 +186,7 @@ This file contains tags related to block in cobblemon.
- #c:farmland
- #c:farmlands
- aether:aether_farmland
- minecraft:farmland
</details>
@@ -465,6 +466,19 @@ This file contains tags related to block in cobblemon.
</details>
<details>
<summary><b>Tag:</b> #block:gilded_chests</summary>
- cobblemon:black_gilded_chest
- cobblemon:blue_gilded_chest
- cobblemon:gilded_chest
- cobblemon:green_gilded_chest
- cobblemon:pink_gilded_chest
- cobblemon:white_gilded_chest
- cobblemon:yellow_gilded_chest
</details>
<details>
<summary><b>Tag:</b> #block:glazed_terracotta_blocks</summary>
@@ -1172,6 +1186,7 @@ This file contains tags related to block in cobblemon.
- botania:white_floating_flower
- botania:white_mystical_flower
- botania:white_shiny_flower
- cobblemon:pep_up_flower
- deep_aether:enchanted_blossom
- farmersdelight:wild_carrots
- minecraft:azure_bluet
@@ -1863,10 +1878,7 @@ This file contains tags related to block in cobblemon.
<details>
<summary><b>Tag:</b> #block:logs</summary>
- cobblemon:apricorn_log
- cobblemon:apricorn_wood
- cobblemon:stripped_apricorn_log
- cobblemon:stripped_apricorn_wood
- #cobblemon:apricorn_logs
</details>
@@ -229,14 +229,6 @@ This file contains tags related to items in cobblemon.
</details>
<details>
<summary><b>Tag:</b> #item:cobblemon_seeds</summary>
- #cobblemon:mint_seeds
- cobblemon:vivichoke_seeds
</details>
<details>
<summary><b>Tag:</b> #item:cooked_meat</summary>
@@ -329,6 +321,7 @@ This file contains tags related to items in cobblemon.
- cobblemon:reaper_cloth
- cobblemon:ribbon_sweet
- cobblemon:sachet
- cobblemon:shell_helmet
- cobblemon:star_sweet
- cobblemon:strawberry_sweet
- cobblemon:sweet_apple
@@ -433,6 +426,19 @@ This file contains tags related to items in cobblemon.
</details>
<details>
<summary><b>Tag:</b> #item:gilded_chests</summary>
- cobblemon:black_gilded_chest
- cobblemon:blue_gilded_chest
- cobblemon:gilded_chest
- cobblemon:green_gilded_chest
- cobblemon:pink_gilded_chest
- cobblemon:white_gilded_chest
- cobblemon:yellow_gilded_chest
</details>
<details>
<summary><b>Tag:</b> #item:hanging_signs</summary>
@@ -590,9 +596,9 @@ This file contains tags related to items in cobblemon.
- #cobblemon:apricorn_sprouts
- #cobblemon:apricorns
- #cobblemon:berries
- #cobblemon:cobblemon_seeds
- #cobblemon:herbs
- #cobblemon:mint_leaf
- #cobblemon:seeds
- cobblemon:big_root
- cobblemon:energy_root
- cobblemon:medicinal_leek
@@ -820,12 +826,9 @@ This file contains tags related to items in cobblemon.
<details>
<summary><b>Tag:</b> #item:seeds</summary>
- #cobblemon:cobblemon_seeds
- minecraft:beetroot_seeds
- minecraft:melon_seeds
- minecraft:pumpkin_seeds
- minecraft:torchflower_seeds
- minecraft:wheat_seeds
- #cobblemon:held/terrain_seeds
- #cobblemon:mint_seeds
- cobblemon:vivichoke_seeds
</details>
@@ -882,6 +885,7 @@ This file contains tags related to items in cobblemon.
- cobblemon:deepslate_sun_stone_ore
- cobblemon:sun_stone_ore
- cobblemon:terracotta_sun_stone_ore
</details>
@@ -949,7 +953,7 @@ This file contains tags related to items in cobblemon.
<details>
<summary><b>Tag:</b> #item:tier_1_poke_ball_materials</summary>
- minecraft:copper_ingot
- #c:ingots/copper
</details>
@@ -977,7 +981,7 @@ This file contains tags related to items in cobblemon.
<details>
<summary><b>Tag:</b> #item:tier_2_poke_ball_materials</summary>
- minecraft:iron_ingot
- #c:ingots/iron
</details>
@@ -1000,7 +1004,7 @@ This file contains tags related to items in cobblemon.
<details>
<summary><b>Tag:</b> #item:tier_3_poke_ball_materials</summary>
- minecraft:gold_ingot
- #c:ingots/gold
</details>
@@ -1015,7 +1019,7 @@ This file contains tags related to items in cobblemon.
<details>
<summary><b>Tag:</b> #item:tier_4_poke_ball_materials</summary>
- minecraft:diamond
- #c:gems/diamond
</details>
@@ -1345,6 +1349,13 @@ This file contains tags related to items in cobblemon.
</details>
<details>
<summary><b>Tag:</b> #item:bookshelf_books</summary>
- #cobblemon:pokedex
</details>
<details>
<summary><b>Tag:</b> #item:chest_boats</summary>
@@ -1397,26 +1408,28 @@ This file contains tags related to items in cobblemon.
<details>
<summary><b>Tag:</b> #item:logs</summary>
- cobblemon:apricorn_log
- cobblemon:apricorn_wood
- cobblemon:stripped_apricorn_log
- cobblemon:stripped_apricorn_wood
- #cobblemon:apricorn_logs
</details>
<details>
<summary><b>Tag:</b> #item:logs_that_burn</summary>
- cobblemon:apricorn_log
- cobblemon:apricorn_wood
- cobblemon:stripped_apricorn_log
- cobblemon:stripped_apricorn_wood
- #cobblemon:apricorn_logs
</details>
<details>
<summary><b>Tag:</b> #item:parrot_food</summary>
- #cobblemon:seeds
</details>
<details>
<summary><b>Tag:</b> #item:piglin_loved</summary>
- #cobblemon:gilded_chests
- cobblemon:relic_coin
- cobblemon:relic_coin_pouch
- cobblemon:relic_coin_sack
@@ -37,15 +37,15 @@ This file contains all current spawn presets of cobblemon.
| **structures** | `minecraft:end_city` | |
## foliage
| Key | Conditions | Anticonditions |
| --- | ---------- | -------------- |
| **neededNearbyBlocks** | `#minecraft:leaves`; `#c:leaves` | |
| Key | Conditions | Anticonditions |
|------------------------|----------------------------------|----------------|
| **neededNearbyBlocks** | `#minecraft:leaves`; `#c:leaves` | |
## illager_structures
| Key | Conditions | Anticonditions |
| --- | ---------- | -------------- |
| **minY** | `62` | |
| **structures** | `minecraft:pillager_outpost`; `minecraft:swamp_hut`; `minecraft:mansion` | |
| Key | Conditions | Anticonditions |
|----------------|--------------------------------------------------------------------------|----------------|
| **minY** | `62` | |
| **structures** | `minecraft:pillager_outpost`; `minecraft:swamp_hut`; `minecraft:mansion` | |
## jungle_pyramid
| Key | Conditions | Anticonditions |
@@ -54,12 +54,11 @@ This file contains all current spawn presets of cobblemon.
| **neededBaseBlocks** | `minecraft:cobblestone`; `#minecraft:mossy_cobblestone` | |
| **neededNearbyBlocks** | `#cobblemon:jungle_pyramid_blocks` | |
| **structures** | `minecraft:jungle_pyramid` | |
## lava
| Key | Conditions | Anticonditions |
| --- | ---------- | -------------- |
| **fluid** | `#minecraft:lava` | |
| Key | Conditions | Anticonditions |
|-----------|-------------------|----------------|
| **fluid** | `#minecraft:lava` | |
## mansion
| Key | Conditions | Anticonditions |
@@ -75,10 +74,10 @@ This file contains all current spawn presets of cobblemon.
| **neededBaseBlocks** | `#cobblemon:natural` | `minecraft:farmland` |
## nether_fossil
| Key | Conditions | Anticonditions |
| --- | ---------- | -------------- |
| **neededNearbyBlocks** | `minecraft:bone_block` | |
| **structures** | `minecraft:nether_fossil` | |
| Key | Conditions | Anticonditions |
|------------------------|---------------------------|----------------|
| **neededNearbyBlocks** | `minecraft:bone_block` | |
| **structures** | `minecraft:nether_fossil` | |
## nether_structures
| Key | Conditions | Anticonditions |
@@ -120,17 +119,17 @@ This file contains all current spawn presets of cobblemon.
| **structures** | `#minecraft:ruined_portal` | |
## salt
| Key | Conditions | Anticonditions |
| --- | ---------- | -------------- |
| **biomes** | `biomesoplenty:hot_springs`; `biomesoplenty:wasteland`; `biomesoplenty:wasteland_steppe`; `terralith:amethyst_canyon`; `terralith:amethyst_rainforest`; `terralith:skylands_winter`; `terralith:yellowstone`; `wythers:calcite_caverns`; `wythers:calcite_coast`; `wythers:mediterranean_island_thermal_spring`; `wythers:salt_lakes_pink`; `wythers:salt_lakes_turquoise`; `wythers:salt_lakes_white`; `wythers:thermal_taiga` | |
| Key | Conditions | Anticonditions |
|------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------|
| **biomes** | `biomesoplenty:hot_springs`; `biomesoplenty:wasteland`; `biomesoplenty:wasteland_steppe`; `terralith:amethyst_canyon`; `terralith:amethyst_rainforest`; `terralith:skylands_winter`; `terralith:yellowstone`; `wythers:calcite_caverns`; `wythers:calcite_coast`; `wythers:mediterranean_island_thermal_spring`; `wythers:salt_lakes_pink`; `wythers:salt_lakes_turquoise`; `wythers:salt_lakes_white`; `wythers:thermal_taiga` | |
## stronghold
| Key | Conditions | Anticonditions |
| --- | ---------- | -------------- |
| **maxY** | `62` | |
| **neededBaseBlocks** | `#minecraft:stone_bricks` | |
| **neededNearbyBlocks** | `minecraft:cracked_stone_bricks`; `minecraft:mossy_stone_bricks` | |
| **structures** | `minecraft:stronghold` | |
| Key | Conditions | Anticonditions |
|------------------------|------------------------------------------------------------------|----------------|
| **maxY** | `62` | |
| **neededBaseBlocks** | `#minecraft:stone_bricks` | |
| **neededNearbyBlocks** | `minecraft:cracked_stone_bricks`; `minecraft:mossy_stone_bricks` | |
| **structures** | `minecraft:stronghold` | |
## trail_ruins
| Key | Conditions | Anticonditions |
@@ -150,17 +149,16 @@ This file contains all current spawn presets of cobblemon.
|------------------------|------------------------------|-----------------------------------------------|
| **neededNearbyBlocks** | `#cobblemon:concrete_blocks` | |
| **structures** | | `#minecraft:village`; `minecraft:trail_ruins` |
## water
| Key | Conditions | Anticonditions |
| --- | ---------- | -------------- |
| **fluid** | `#minecraft:water` | |
| Key | Conditions | Anticonditions |
|-----------|--------------------|----------------|
| **fluid** | `#minecraft:water` | |
## webs
| Key | Conditions | Anticonditions |
| --- | ---------- | -------------- |
| **biomes** | `biomesoplenty:spider_nest`; `terralith:cave/infested_caves`; `wythers:forbidden_forest`; `wythers:phantasmal_forest`; `wythers:phantasmal_swamp` | |
| Key | Conditions | Anticonditions |
|------------|---------------------------------------------------------------------------------------------------------------------------------------------------|----------------|
| **biomes** | `biomesoplenty:spider_nest`; `terralith:cave/infested_caves`; `wythers:forbidden_forest`; `wythers:phantasmal_forest`; `wythers:phantasmal_swamp` | |
## wild
| Key | Conditions | Anticonditions |
+2 -2
View File
@@ -11,7 +11,7 @@ mc_version = 1.21.1
parchment_version = 2024.07.28@zip
mod_id=cobblemon
mod_version=1.6.1
snapshot=false
mod_version=1.7.0
snapshot=true
fabric.loom.multiProjectOptimisation=false