Compare commits
11
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5362995fbb | ||
|
|
98a7240191 | ||
|
|
84adc0e1cb | ||
|
|
3ab2dfa0b3 | ||
|
|
86e8238230 | ||
|
|
bdc7b5a504 | ||
|
|
f3c165d282 | ||
|
|
9caf8376bc | ||
|
|
9f998d92e6 | ||
|
|
a91bf60ff8 | ||
|
|
2d4c419216 |
No files matched your search
@@ -24,6 +24,7 @@ eclipse
|
||||
run
|
||||
runClient
|
||||
runServer
|
||||
utilityscripts/implementation/*.txt
|
||||
|
||||
# Files from Forge MDK
|
||||
forge*changelog.txt
|
||||
|
||||
@@ -335,6 +335,8 @@
|
||||
- Fixed Exploit where you could take out the bait or drop your Pokérod with bait to avoid consuming bait, now the bobber will just disappear if you do so
|
||||
- Fixed Apricorn and Saccharine boats incorrectly using chest boat models
|
||||
- Fixed wild and trainer battle AI refusing to select moves with the `adjacentAlly` target type, even when it's their only option
|
||||
- Fixed Guilded chests being more accessible than intended
|
||||
- Fixed fished up Pokémon not being added as "seen" to the Pokedex
|
||||
|
||||
### Developer
|
||||
- Added `PokeSnackSpawnerFactory` which allows influence registration on PokeSnack encounters
|
||||
|
||||
@@ -103,8 +103,6 @@ class GildedChestBlockEntity(pos: BlockPos, state: BlockState, val type: Type =
|
||||
return dir == Direction.DOWN
|
||||
}
|
||||
|
||||
override fun stillValid(player: Player) = !player.isSpectator
|
||||
|
||||
override fun setItems(inventory: NonNullList<ItemStack>) {
|
||||
inventoryContents = inventory
|
||||
}
|
||||
|
||||
+5
-1
@@ -16,6 +16,7 @@ import com.cobblemon.mod.common.advancement.CobblemonCriteria
|
||||
import com.cobblemon.mod.common.advancement.criterion.ReelInPokemonContext
|
||||
import com.cobblemon.mod.common.api.events.CobblemonEvents
|
||||
import com.cobblemon.mod.common.api.events.fishing.BobberSpawnPokemonEvent
|
||||
import com.cobblemon.mod.common.api.events.pokemon.PokemonSeenEvent
|
||||
import com.cobblemon.mod.common.api.fishing.SpawnBait
|
||||
import com.cobblemon.mod.common.api.fishing.SpawnBaitEffects
|
||||
import com.cobblemon.mod.common.api.scheduling.afterOnServer
|
||||
@@ -875,7 +876,10 @@ class PokeRodFishingBobberEntity(type: EntityType<out PokeRodFishingBobberEntity
|
||||
if (player !in player.level().players()) {
|
||||
return@afterOnServer
|
||||
}
|
||||
spawnedPokemon?.forceBattle(player)
|
||||
spawnedPokemon?.let {
|
||||
it.forceBattle(player)
|
||||
CobblemonEvents.POKEMON_SEEN.post(PokemonSeenEvent(uuid, it.pokemon))
|
||||
}
|
||||
}
|
||||
|
||||
return true
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
Hello!
|
||||
This is a script for checking asset implementation.
|
||||
|
||||
You will need Python. If you don't have it already, install it from here: https://www.python.org/downloads/
|
||||
|
||||
Then you will need external libraries, open the terminal (search for `cmd` on Windows) and type in the following: `pip install pandas soundfile`
|
||||
If the terminal says "Requirement already satisfied," but the script doesn't work, try this instead:
|
||||
- Type in `py -0p`, this will show installed versions and highlight your default with `*`
|
||||
- Type in `py -3.14 -m pip install pandas soundfile`, replace `-3.14` with your default version
|
||||
|
||||
The script assumes `cobblemon-assets` is in the same directory as `cobblemon`, the main mod where you're running this script from.
|
||||
If not, create "assets_directory.txt" and paste in the path to where your assets repository is cloned.
|
||||
For example `D:\Dev\Cobblemon\Repository\cobblemon-assets`
|
||||
This text file will be ignored by Git.
|
||||
|
||||
If there are any issues, or you need help with anything, poke Sterr on Discord.
|
||||
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user