mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-20 07:08:53 -05:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
78dfb30759 |
No files matched your search
+1
-2
@@ -12,8 +12,7 @@ out
|
|||||||
*.ipr
|
*.ipr
|
||||||
*.iws
|
*.iws
|
||||||
*.iml
|
*.iml
|
||||||
.idea/*
|
.idea
|
||||||
!.idea/icon.png
|
|
||||||
|
|
||||||
# gradle
|
# gradle
|
||||||
build
|
build
|
||||||
|
|||||||
Generated
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB |
@@ -12,14 +12,6 @@
|
|||||||
- SpawningContext is now SpawnablePosition
|
- SpawningContext is now SpawnablePosition
|
||||||
- WorldSlice is SpawningZone
|
- WorldSlice is SpawningZone
|
||||||
- SpawningProspector is now SpawningZoneGenerator
|
- SpawningProspector is now SpawningZoneGenerator
|
||||||
- Majorly refactored the hierarchy of Spawner
|
|
||||||
- The base Spawner interface provides more functions to allow single-point and area spawning given appropriate inputs.
|
|
||||||
- TickingSpawner is removed in favour of outside code handling ticking logic.
|
|
||||||
- AreaSpawner is removed.
|
|
||||||
- BasicSpawner is the first implementation of Spawner which can be used for any purpose.
|
|
||||||
- PlayerSpawners are now mixin'd into ServerPlayer and ticked from ServerPlayer#tick.
|
|
||||||
- A hierarchy diagram can be found at `./docs/spawner-hierarchy.png` in the mod repository.
|
|
||||||
- The SpawnerManager class has been removed as its functionality is all now handled elsewhere.
|
|
||||||
- Renamed things in Spawn Rules to go with the other renames:
|
- Renamed things in Spawn Rules to go with the other renames:
|
||||||
- contextSelector is now spawnablePositionSelector
|
- contextSelector is now spawnablePositionSelector
|
||||||
- context is now spawnable_position
|
- context is now spawnable_position
|
||||||
+1
-34
@@ -34,7 +34,6 @@
|
|||||||
- Added Hyper Training items (IV Modification) as well as some additional candy items to do so (Health Candy, Sickly Candy)
|
- Added Hyper Training items (IV Modification) as well as some additional candy items to do so (Health Candy, Sickly Candy)
|
||||||
- Added Galarica Nut Bushes
|
- Added Galarica Nut Bushes
|
||||||
- Many Pokémon (mostly cats) are now feared by phantoms
|
- Many Pokémon (mostly cats) are now feared by phantoms
|
||||||
- Combees are now capable of gathering nectar from flowers and delivering it to either Saccharine leaves or hives. (Hive interactions are restricted to wild Combees)
|
|
||||||
- Lightning is now affected by a Pokemon's ability/typing
|
- Lightning is now affected by a Pokemon's ability/typing
|
||||||
- Pokémon with the ability Lightning Rod draw in lightning similar to a lightning rod block albeit with a lower priority and range, gain immunity to lightning damage, and receive a temporary damage buff.
|
- Pokémon with the ability Lightning Rod draw in lightning similar to a lightning rod block albeit with a lower priority and range, gain immunity to lightning damage, and receive a temporary damage buff.
|
||||||
- Pokémon with the ability Motor Drive are immune to lightning damage and receive a temporary speed buff when struck by lightning
|
- Pokémon with the ability Motor Drive are immune to lightning damage and receive a temporary speed buff when struck by lightning
|
||||||
@@ -54,8 +53,6 @@
|
|||||||
- `PokemonRecallEvent`
|
- `PokemonRecallEvent`
|
||||||
- `TradeEvent`
|
- `TradeEvent`
|
||||||
- Added a new gamerule, 'healerHealsPC', when set to true a successful use of a healer will also heal all of the Pokemon in that player's PC.
|
- Added a new gamerule, 'healerHealsPC', when set to true a successful use of a healer will also heal all of the Pokemon in that player's PC.
|
||||||
- Mooshtanks will switch between their red and brown variant when hit by lightning
|
|
||||||
- Smeargle spawns with differing tail colour depending on its [Characteristic](https://bulbapedia.bulbagarden.net/wiki/Characteristic) stat
|
|
||||||
|
|
||||||
### Pokémon Added
|
### Pokémon Added
|
||||||
|
|
||||||
@@ -296,7 +293,6 @@
|
|||||||
- Tauros - Paldea Blaze
|
- Tauros - Paldea Blaze
|
||||||
- Tauros - Paldea Combat
|
- Tauros - Paldea Combat
|
||||||
- Dewgong
|
- Dewgong
|
||||||
- Exeggutor - Kanto
|
|
||||||
|
|
||||||
### Model updates for the following Pokémon
|
### Model updates for the following Pokémon
|
||||||
- Cleffa
|
- Cleffa
|
||||||
@@ -407,9 +403,6 @@
|
|||||||
- Revavroom
|
- Revavroom
|
||||||
- Nickit
|
- Nickit
|
||||||
- Thievul
|
- Thievul
|
||||||
- Litwick
|
|
||||||
- Lampent
|
|
||||||
- Chandelure
|
|
||||||
|
|
||||||
### Changes
|
### Changes
|
||||||
- Changed pokemon caught and seen count to update based on the current pokedex being looked
|
- Changed pokemon caught and seen count to update based on the current pokedex being looked
|
||||||
@@ -423,8 +416,6 @@
|
|||||||
- Updated some item tags to better integrate behaviours between Cobblemon, Vanilla Minecraft, and other mods
|
- Updated some item tags to better integrate behaviours between Cobblemon, Vanilla Minecraft, and other mods
|
||||||
- Removed Cooked Meat, Raw Meat, Protein Ingredients, and Zinc Ingredients, the first two are now using `c` namespace tags, the latter have better integrated use of tags within their recipes which removes need for custom tags.
|
- Removed Cooked Meat, Raw Meat, Protein Ingredients, and Zinc Ingredients, the first two are now using `c` namespace tags, the latter have better integrated use of tags within their recipes which removes need for custom tags.
|
||||||
- Added our seeds tag into `#c:seeds`, which is now made use of for the Miracle Seed recipe.
|
- Added our seeds tag into `#c:seeds`, which is now made use of for the Miracle Seed recipe.
|
||||||
- Updated the `#cobblemon:berries` tag to use subtags located in `data/cobblemon/tags/item/berries`, such as `#cobblemon:berries/hp_recovery` for sorting purposes
|
|
||||||
- Moved the tag `#cobblemon:mutated_berries` to `#cobblemon:berries/mutation_result`
|
|
||||||
- Added herbs and snowballs to the consumable in PvE and Wild battle tags
|
- Added herbs and snowballs to the consumable in PvE and Wild battle tags
|
||||||
- Tweaked the Natural Materials Vanilla file to fit with the changes to tags
|
- Tweaked the Natural Materials Vanilla file to fit with the changes to tags
|
||||||
- Substantially optimised spawning checks mainly by front-loading biome filtering.
|
- Substantially optimised spawning checks mainly by front-loading biome filtering.
|
||||||
@@ -476,8 +467,6 @@
|
|||||||
- Updated `HatchEggEvent.Post` to include the Pokemon that hatched.
|
- Updated `HatchEggEvent.Post` to include the Pokemon that hatched.
|
||||||
- Roseli Berry Trees now naturally generate in their preferred biomes.
|
- Roseli Berry Trees now naturally generate in their preferred biomes.
|
||||||
- Refactored dynamic lights compat to be more future proof. The dynamic light support is only tested with LambDynamicLights, on NeoForged use that mod in combination with Sinytra Connector
|
- Refactored dynamic lights compat to be more future proof. The dynamic light support is only tested with LambDynamicLights, on NeoForged use that mod in combination with Sinytra Connector
|
||||||
- Shulker Boxes and Traveler's Backpacks AND Packed Up backpacks can no longer be held by Pokémon. Thanks Monocle ;) You could re-enable this with our datapack (but you'd be crazy).
|
|
||||||
- Moomoo Milk now clears Pokémon stat changes when used in battle.
|
|
||||||
|
|
||||||
### Fixes
|
### Fixes
|
||||||
- Fixed game crashing when removing national pokedex using datapacks
|
- Fixed game crashing when removing national pokedex using datapacks
|
||||||
@@ -562,8 +551,6 @@
|
|||||||
- Fixed singular Pokémon corruption causing entire storage corruption. Storages will now skip corrupted Pokémon and print an error to console.
|
- Fixed singular Pokémon corruption causing entire storage corruption. Storages will now skip corrupted Pokémon and print an error to console.
|
||||||
- Fixed species additions not being able to properly mark a species as implemented.
|
- Fixed species additions not being able to properly mark a species as implemented.
|
||||||
- Fixed Pokémon item models not showing a glint when enchanted.
|
- Fixed Pokémon item models not showing a glint when enchanted.
|
||||||
- Fixed some specific bag items not being dropped when used in battle.
|
|
||||||
- Fixed the "use all berry bait" achievement not being progressed
|
|
||||||
|
|
||||||
### Developer
|
### Developer
|
||||||
- A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
|
- A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
|
||||||
@@ -601,25 +588,10 @@
|
|||||||
- Added a `hoverText` option to PartySelectCallback, to display a tooltip on hovering over a Pokémon in the selection screen.
|
- Added a `hoverText` option to PartySelectCallback, to display a tooltip on hovering over a Pokémon in the selection screen.
|
||||||
- `PokemonEntity` instances spawned into the world now appropriately finalize the spawn for mod compatibility.
|
- `PokemonEntity` instances spawned into the world now appropriately finalize the spawn for mod compatibility.
|
||||||
- Added PokedexManager.obtain as a replacement for .catch which is not a friendly function name in Java.
|
- Added PokedexManager.obtain as a replacement for .catch which is not a friendly function name in Java.
|
||||||
|
|
||||||
- Added `Pokemon#hyperTrainIV()` and `IVs#setHyperTrainedIV(Stat, Int)`
|
- Added `Pokemon#hyperTrainIV()` and `IVs#setHyperTrainedIV(Stat, Int)`
|
||||||
- `ElementalType` now implements `ShowdownIdentifiable` to ensure the communcation with showdown stays consistent (also in regards to TeraTypes)
|
- `ElementalType` now implements `ShowdownIdentifiable` to ensure the communcation with showdown stays consistent (also in regards to TeraTypes)
|
||||||
- Pokemon no longer have a change observable
|
- Pokemon no longer have a change observable
|
||||||
- Pokémon can now have a behaviour changing the value of a species feature on lightning hit:
|
|
||||||
```JSON
|
|
||||||
{
|
|
||||||
"behaviour": {
|
|
||||||
"lightningHit": {
|
|
||||||
"rotateFeatures": [
|
|
||||||
{
|
|
||||||
"key": "mooshtank",
|
|
||||||
"chain": ["red", "brown"]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
This will change the value of `mooshtank` from `red` to `brown` and vice versa when a lightning strikes this Pokémon. Only chains of which a value is the current value will be considered, so multiple entries for the same key with different chains can be added.
|
|
||||||
|
|
||||||
### MoLang & Datapacks
|
### MoLang & Datapacks
|
||||||
- The following usages for item predicates can now use item conditions like advancements do, you can learn about them in the [Minecraft wiki](https://minecraft.wiki/w/Advancement_definition#minecraft:filled_bucket)
|
- The following usages for item predicates can now use item conditions like advancements do, you can learn about them in the [Minecraft wiki](https://minecraft.wiki/w/Advancement_definition#minecraft:filled_bucket)
|
||||||
@@ -723,10 +695,6 @@
|
|||||||
- Mechanics
|
- Mechanics
|
||||||
- Unlockable Wallpapers
|
- Unlockable Wallpapers
|
||||||
- Starter Data
|
- Starter Data
|
||||||
- Fixed `cobblemon:reel_in_pokemon` criteria not working when used together with a `baitId`
|
|
||||||
- Also changed the default from `cobblemon:empty_bait` to `any`
|
|
||||||
- The previous default is still available by using the above as baitId
|
|
||||||
- Added support for species-specific move action effects, using the format `{move_id}_{species}.json`.
|
|
||||||
|
|
||||||
### Particles
|
### Particles
|
||||||
Added new/updated particles for the following moves:
|
Added new/updated particles for the following moves:
|
||||||
@@ -1022,7 +990,6 @@ Added new/updated particles for the following moves:
|
|||||||
- Parametric particle motion now works.
|
- Parametric particle motion now works.
|
||||||
- Event-spawned particles now work.
|
- Event-spawned particles now work.
|
||||||
- Particles can now have independent coordinate spaces.
|
- Particles can now have independent coordinate spaces.
|
||||||
- Fixed suffocation of Pokémon when a pokeball breaks near a wall
|
|
||||||
|
|
||||||
### Developer
|
### Developer
|
||||||
- Updated the Pokédex data updated events to always include a `Pokemon` instance, and optionally a `DisguiseData` instance.
|
- Updated the Pokédex data updated events to always include a `Pokemon` instance, and optionally a `DisguiseData` instance.
|
||||||
|
|||||||
@@ -1,23 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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;
|
|
||||||
|
|
||||||
import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Used for mixin shenanigans. ServerPlayers now store their Cobblemon spawner
|
|
||||||
* inside, so this interface helps execute that.
|
|
||||||
*
|
|
||||||
* @author Hiroku
|
|
||||||
* @since October 27th, 2025
|
|
||||||
*/
|
|
||||||
public interface PlayerSpawnerAccessor {
|
|
||||||
PlayerSpawner getPlayerSpawner();
|
|
||||||
void setPlayerSpawner(PlayerSpawner spawner);
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.duck;
|
|
||||||
|
|
||||||
import net.minecraft.world.phys.Vec3;
|
|
||||||
|
|
||||||
public interface RidePassenger {
|
|
||||||
void cobblemon$setRideXRot(float rideXRot);
|
|
||||||
float cobblemon$getRideXRot();
|
|
||||||
void cobblemon$setRideYRot(float rideYRot);
|
|
||||||
float cobblemon$getRideYRot();
|
|
||||||
void cobblemon$setRideEyePos(Vec3 rideEyePos);
|
|
||||||
Vec3 cobblemon$getRideEyePos();
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.mixin;
|
|
||||||
|
|
||||||
import com.cobblemon.mod.common.OrientationControllable;
|
|
||||||
import com.cobblemon.mod.common.duck.RidePassenger;
|
|
||||||
import net.minecraft.world.entity.EntityType;
|
|
||||||
import net.minecraft.world.entity.LivingEntity;
|
|
||||||
import net.minecraft.world.entity.projectile.AbstractArrow;
|
|
||||||
import net.minecraft.world.item.ItemStack;
|
|
||||||
import net.minecraft.world.level.Level;
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
@Mixin(AbstractArrow.class)
|
|
||||||
public abstract class AbstractArrowMixin {
|
|
||||||
|
|
||||||
// Target the constructor that takes a LivingEntity owner
|
|
||||||
@Inject(
|
|
||||||
method = "<init>(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)V",
|
|
||||||
at = @At("TAIL") // Inject at the very end of the constructor
|
|
||||||
)
|
|
||||||
private void cobblemon$adjustSpawnPosition(
|
|
||||||
EntityType<? extends AbstractArrow> entityType,
|
|
||||||
LivingEntity owner,
|
|
||||||
Level level,
|
|
||||||
ItemStack pickupItemStack,
|
|
||||||
@Nullable ItemStack firedFromWeapon,
|
|
||||||
CallbackInfo ci
|
|
||||||
) {
|
|
||||||
AbstractArrow arrow = (AbstractArrow)(Object)this;
|
|
||||||
if(!(owner.getVehicle() instanceof OrientationControllable vehicle)) return;
|
|
||||||
var vehicleController = vehicle.getOrientationController();
|
|
||||||
|
|
||||||
// If this is a rolling ride passenger then use the rider eye position to set the arrow spawn position.
|
|
||||||
if (owner instanceof RidePassenger ridePassenger && vehicleController != null && vehicleController.getActive()) {
|
|
||||||
var eyePos = ridePassenger.cobblemon$getRideEyePos().add(0.0, -2.0, 0.0);
|
|
||||||
arrow.setPos(eyePos);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,100 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.mixin;
|
|
||||||
|
|
||||||
|
|
||||||
import com.cobblemon.mod.common.CobblemonMemories;
|
|
||||||
import com.cobblemon.mod.common.api.ai.config.task.PathToBeeHiveTaskConfig;
|
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
|
||||||
import net.minecraft.core.BlockPos;
|
|
||||||
import net.minecraft.nbt.CompoundTag;
|
|
||||||
import net.minecraft.tags.BlockTags;
|
|
||||||
import net.minecraft.world.entity.Entity;
|
|
||||||
import net.minecraft.world.entity.EntityType;
|
|
||||||
import net.minecraft.world.item.component.CustomData;
|
|
||||||
import net.minecraft.world.level.Level;
|
|
||||||
import net.minecraft.world.level.block.BeehiveBlock;
|
|
||||||
import net.minecraft.world.level.block.HorizontalDirectionalBlock;
|
|
||||||
import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
|
|
||||||
import net.minecraft.world.phys.Vec3;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|
||||||
|
|
||||||
@Mixin(BeehiveBlockEntity.Occupant.class)
|
|
||||||
public abstract class BeeOccupantMixin {
|
|
||||||
|
|
||||||
@Inject(method = "createEntity", at = @At("RETURN"), cancellable = true)
|
|
||||||
private void cobblemon$createEntity(Level level, BlockPos pos, CallbackInfoReturnable<Entity> cir) {
|
|
||||||
// Needing to replicate all the post op stuff on the hive isn't great
|
|
||||||
if (cir.getReturnValue() == null) {
|
|
||||||
final BeehiveBlockEntity.Occupant occupant = (BeehiveBlockEntity.Occupant) (Object) this;
|
|
||||||
CompoundTag compoundTag = occupant.entityData().copyTag();
|
|
||||||
Entity entity = EntityType.loadEntityRecursive(compoundTag, level, (entityx) -> entityx);
|
|
||||||
if (entity instanceof PokemonEntity pokemonEntity) {
|
|
||||||
var state = level.getBlockState(pos);
|
|
||||||
var newPos = Vec3.ZERO;
|
|
||||||
var newYaw = 0f;
|
|
||||||
var brain = pokemonEntity.getBrain();
|
|
||||||
if (state.is(BlockTags.BEEHIVES)) {
|
|
||||||
// position in front of the entrance, face away from the block
|
|
||||||
var facing = state.getValue(HorizontalDirectionalBlock.FACING);
|
|
||||||
newPos = pos.relative(facing).getCenter();
|
|
||||||
newYaw = facing.toYRot();
|
|
||||||
brain.setMemory(CobblemonMemories.INSTANCE.getHIVE_LOCATION(), pos); // This needs to be set in the case that the hive was picked up and moved.
|
|
||||||
} else {
|
|
||||||
// Block has likely been destroyed
|
|
||||||
var center = pos.getCenter();
|
|
||||||
newPos = new Vec3(
|
|
||||||
center.x + level.random.nextFloat() * 0.6 - 0.3,
|
|
||||||
center.y + level.random.nextFloat() * 0.6 - 0.3,
|
|
||||||
center.z + level.random.nextFloat() * 0.6 - 0.3
|
|
||||||
);
|
|
||||||
newYaw = level.random.nextFloat() * 360F;
|
|
||||||
brain.eraseMemory(CobblemonMemories.INSTANCE.getHIVE_LOCATION());
|
|
||||||
}
|
|
||||||
entity.yRotO = newYaw;
|
|
||||||
entity.setPos(newPos);
|
|
||||||
// Do honey logic
|
|
||||||
var hasNectar = brain.getMemory(CobblemonMemories.INSTANCE.getHAS_NECTAR()).orElse(false);
|
|
||||||
if (hasNectar) {
|
|
||||||
// Remove nectar and reset got to hive cooldown
|
|
||||||
brain.eraseMemory(CobblemonMemories.INSTANCE.getHAS_NECTAR());
|
|
||||||
brain.setMemoryWithExpiry(CobblemonMemories.INSTANCE.getHIVE_COOLDOWN(), true, PathToBeeHiveTaskConfig.STAY_OUT_OF_HIVE_COOLDOWN);
|
|
||||||
// Increment honey level of the hive
|
|
||||||
if (state.is(BlockTags.BEEHIVES, (blockStateBase) -> blockStateBase.hasProperty(BeehiveBlock.HONEY_LEVEL))) {
|
|
||||||
int i = state.getValue(BeehiveBlock.HONEY_LEVEL);
|
|
||||||
if (i < 5) {
|
|
||||||
int j = level.random.nextInt(100) == 0 ? 2 : 1;
|
|
||||||
if (i + j > 5) {
|
|
||||||
--j;
|
|
||||||
}
|
|
||||||
level.setBlockAndUpdate(pos, state.setValue(BeehiveBlock.HONEY_LEVEL, i + j));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
cir.setReturnValue(entity);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "of", at = @At("HEAD"), cancellable = true)
|
|
||||||
private static void cobblemon$of(Entity entity, CallbackInfoReturnable<BeehiveBlockEntity.Occupant> cir) {
|
|
||||||
if (entity instanceof PokemonEntity pokemonEntity) {
|
|
||||||
CompoundTag compoundTag = new CompoundTag();
|
|
||||||
entity.save(compoundTag);
|
|
||||||
Boolean hasNectar = pokemonEntity.getBrain().getMemory(CobblemonMemories.INSTANCE.getHAS_NECTAR()).orElse(false);
|
|
||||||
cir.setReturnValue(new BeehiveBlockEntity.Occupant(CustomData.of(compoundTag), 0, hasNectar ? 2400 : 600));
|
|
||||||
cir.cancel();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.mixin;
|
|
||||||
|
|
||||||
|
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
|
||||||
import com.cobblemon.mod.common.mixin.accessor.BeeDataAccessor;
|
|
||||||
import com.cobblemon.mod.common.mixin.accessor.BeehiveBlockEntityAccessor;
|
|
||||||
import com.cobblemon.mod.common.mixin.accessor.BlockEntityAccessor;
|
|
||||||
import com.google.common.collect.Lists;
|
|
||||||
import net.minecraft.core.BlockPos;
|
|
||||||
import net.minecraft.world.entity.Entity;
|
|
||||||
import net.minecraft.world.entity.ai.memory.MemoryModuleType;
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
|
||||||
import net.minecraft.world.level.Level;
|
|
||||||
import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
|
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Mixin(BeehiveBlockEntity.class)
|
|
||||||
public abstract class BeehiveBlockEntityMixin {
|
|
||||||
|
|
||||||
|
|
||||||
// Accessor for the private 'stored' field in BeehiveBlockEntity
|
|
||||||
@Accessor("stored")
|
|
||||||
public abstract List<BeeDataAccessor> getStored();
|
|
||||||
|
|
||||||
@Inject(method = "emptyAllLivingFromHive", at = @At("HEAD"))
|
|
||||||
private void cobblemon$emptyAllLivingFromHive(@Nullable Player player, BlockState state, BeehiveBlockEntity.BeeReleaseStatus releaseStatus, CallbackInfo ci) {
|
|
||||||
if (player != null) {
|
|
||||||
final BeehiveBlockEntity blockEntity = (BeehiveBlockEntity) (Object) this;
|
|
||||||
// if the block is sedated or the player is too far away, no aggro should be applied
|
|
||||||
if (blockEntity.isSedated() || player.position().distanceToSqr(blockEntity.getBlockPos().getCenter()) > 16.0)
|
|
||||||
return;
|
|
||||||
// from this point need to access private members of the block entity
|
|
||||||
final BeehiveBlockEntityAccessor blockEntityAccessor = (BeehiveBlockEntityAccessor) this;
|
|
||||||
List<Object> storedList = blockEntityAccessor.getStored();
|
|
||||||
|
|
||||||
List<Entity> list = Lists.newArrayList();
|
|
||||||
storedList.removeIf((beeData) -> {
|
|
||||||
BeehiveBlockEntity.Occupant occupant = ((BeeDataAccessor) beeData).invokeToOccupant();
|
|
||||||
// Checking the for the tag allows us to make sure it's one of our pokemon before trying to rehydrate it into an entity
|
|
||||||
boolean isPokemon = false;
|
|
||||||
if (occupant.entityData().contains("id")) {
|
|
||||||
isPokemon = "cobblemon:pokemon".equals(occupant.entityData().getUnsafe().getString("id"));
|
|
||||||
}
|
|
||||||
if (isPokemon) {
|
|
||||||
return BeehiveBlockEntityAccessor.releaseOccupant(
|
|
||||||
((BlockEntityAccessor) blockEntityAccessor).getLevel(),
|
|
||||||
((BlockEntityAccessor) blockEntityAccessor).getWorldPosition(),
|
|
||||||
state,
|
|
||||||
occupant,
|
|
||||||
list,
|
|
||||||
releaseStatus,
|
|
||||||
blockEntityAccessor.savedFlowerPos());
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
for (Entity entity : list) {
|
|
||||||
if (entity instanceof PokemonEntity) {
|
|
||||||
((PokemonEntity) entity).getBrain().setMemory(MemoryModuleType.ATTACK_TARGET, player);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Redirect(
|
|
||||||
method = "releaseOccupant",
|
|
||||||
at = @At(
|
|
||||||
value = "INVOKE",
|
|
||||||
target = "Lnet/minecraft/world/level/Level;addFreshEntity(Lnet/minecraft/world/entity/Entity;)Z"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
private static boolean cobblemon$captureReleasedEntity(
|
|
||||||
Level level, Entity entity,
|
|
||||||
Level lvl, BlockPos pos, BlockState state,
|
|
||||||
BeehiveBlockEntity.Occupant occupant, @Nullable List<Entity> bees,
|
|
||||||
BeehiveBlockEntity.BeeReleaseStatus releaseStatus, @Nullable BlockPos flowerPos) {
|
|
||||||
|
|
||||||
if (bees != null && !bees.contains(entity)) {
|
|
||||||
// Avoid duplicates if vanilla also adds bees to the list on your version
|
|
||||||
bees.add(entity);
|
|
||||||
}
|
|
||||||
return level.addFreshEntity(entity);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -7,7 +7,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
package com.cobblemon.mod.common.mixin;
|
package com.cobblemon.mod.common.mixin;
|
||||||
|
|
||||||
import com.cobblemon.mod.common.duck.ChannelDuck;
|
import com.cobblemon.mod.common.duck.ChannelDuck;
|
||||||
import com.mojang.blaze3d.audio.Channel;
|
import com.mojang.blaze3d.audio.Channel;
|
||||||
import org.lwjgl.openal.AL10;
|
import org.lwjgl.openal.AL10;
|
||||||
|
|||||||
@@ -8,23 +8,18 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.mixin;
|
package com.cobblemon.mod.common.mixin;
|
||||||
|
|
||||||
import com.cobblemon.mod.common.CobblemonNetwork;
|
|
||||||
import com.cobblemon.mod.common.OrientationControllable;
|
import com.cobblemon.mod.common.OrientationControllable;
|
||||||
import com.cobblemon.mod.common.api.orientation.OrientationController;
|
import com.cobblemon.mod.common.api.orientation.OrientationController;
|
||||||
import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffectRegistry;
|
import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffectRegistry;
|
||||||
import com.cobblemon.mod.common.api.riding.RidingStyle;
|
|
||||||
import com.cobblemon.mod.common.api.riding.Seat;
|
import com.cobblemon.mod.common.api.riding.Seat;
|
||||||
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.SubmarineBehaviour;
|
|
||||||
import com.cobblemon.mod.common.client.entity.PokemonClientDelegate;
|
import com.cobblemon.mod.common.client.entity.PokemonClientDelegate;
|
||||||
import com.cobblemon.mod.common.client.render.MatrixWrapper;
|
import com.cobblemon.mod.common.client.render.MatrixWrapper;
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
||||||
import com.cobblemon.mod.common.net.messages.server.orientation.ServerboundUpdateOrientationPacket;
|
|
||||||
import net.minecraft.server.level.ServerPlayer;
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
import net.minecraft.world.effect.MobEffectInstance;
|
import net.minecraft.world.effect.MobEffectInstance;
|
||||||
import net.minecraft.world.entity.Entity;
|
import net.minecraft.world.entity.Entity;
|
||||||
import net.minecraft.world.entity.EntityType;
|
import net.minecraft.world.entity.EntityType;
|
||||||
import net.minecraft.world.entity.LivingEntity;
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
import net.minecraft.world.entity.player.Player;
|
|
||||||
import net.minecraft.world.level.ClipContext;
|
import net.minecraft.world.level.ClipContext;
|
||||||
import net.minecraft.world.level.Level;
|
import net.minecraft.world.level.Level;
|
||||||
import net.minecraft.world.phys.HitResult;
|
import net.minecraft.world.phys.HitResult;
|
||||||
@@ -37,7 +32,6 @@ import org.spongepowered.asm.mixin.Unique;
|
|||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|
||||||
|
|
||||||
@Mixin(LivingEntity.class)
|
@Mixin(LivingEntity.class)
|
||||||
public abstract class LivingEntityMixin extends Entity implements OrientationControllable {
|
public abstract class LivingEntityMixin extends Entity implements OrientationControllable {
|
||||||
@@ -105,7 +99,7 @@ public abstract class LivingEntityMixin extends Entity implements OrientationCon
|
|||||||
|
|
||||||
@Inject(method = "tick", at = @At("HEAD"))
|
@Inject(method = "tick", at = @At("HEAD"))
|
||||||
private void cobblemon$updateRenderOrientation(CallbackInfo ci) {
|
private void cobblemon$updateRenderOrientation(CallbackInfo ci) {
|
||||||
//this.cobblemon$orientationController.tick();
|
this.cobblemon$orientationController.tick();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -122,31 +116,4 @@ public abstract class LivingEntityMixin extends Entity implements OrientationCon
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "decreaseAirSupply", at = @At("HEAD"), cancellable = true)
|
|
||||||
private void cobblemon$conditionalWaterBreathing(
|
|
||||||
int currentAir,
|
|
||||||
CallbackInfoReturnable<Integer> cir
|
|
||||||
) {
|
|
||||||
var entity = (LivingEntity) (Object) this;
|
|
||||||
if (!(entity instanceof Player player)) return;
|
|
||||||
if (!(player.getVehicle() instanceof PokemonEntity vehicle)) return;
|
|
||||||
|
|
||||||
var ridingController = vehicle.getRidingController();
|
|
||||||
if (ridingController == null) return;
|
|
||||||
|
|
||||||
var activeContext = ridingController.getContext();
|
|
||||||
if (activeContext == null) return;
|
|
||||||
|
|
||||||
// If the rider is currently on a submarine and the ride still has stamina.
|
|
||||||
var stamina = activeContext.getState().getStamina().get();
|
|
||||||
if (
|
|
||||||
activeContext.getStyle() == RidingStyle.LIQUID &&
|
|
||||||
activeContext.getBehaviour().equals(SubmarineBehaviour.Companion.getKEY()) &&
|
|
||||||
stamina > 0.0f
|
|
||||||
) {
|
|
||||||
cir.setReturnValue(currentAir);
|
|
||||||
cir.cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -19,7 +19,6 @@ import com.cobblemon.mod.common.api.storage.party.PartyStore;
|
|||||||
import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore;
|
import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore;
|
||||||
import com.cobblemon.mod.common.api.tags.CobblemonItemTags;
|
import com.cobblemon.mod.common.api.tags.CobblemonItemTags;
|
||||||
import com.cobblemon.mod.common.duck.PlayerDuck;
|
import com.cobblemon.mod.common.duck.PlayerDuck;
|
||||||
import com.cobblemon.mod.common.duck.RidePassenger;
|
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
||||||
import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData;
|
import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData;
|
||||||
import com.cobblemon.mod.common.pokedex.scanner.ScannableEntity;
|
import com.cobblemon.mod.common.pokedex.scanner.ScannableEntity;
|
||||||
@@ -48,7 +47,6 @@ import net.minecraft.world.entity.player.Player;
|
|||||||
import net.minecraft.world.food.FoodProperties;
|
import net.minecraft.world.food.FoodProperties;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import net.minecraft.world.level.Level;
|
import net.minecraft.world.level.Level;
|
||||||
import net.minecraft.world.phys.Vec3;
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.joml.Vector3f;
|
import org.joml.Vector3f;
|
||||||
import org.objectweb.asm.Opcodes;
|
import org.objectweb.asm.Opcodes;
|
||||||
@@ -65,7 +63,7 @@ import java.util.*;
|
|||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Mixin(Player.class)
|
@Mixin(Player.class)
|
||||||
public abstract class PlayerMixin extends LivingEntity implements ScannableEntity, OrientationControllable, PlayerDuck, RidePassenger {
|
public abstract class PlayerMixin extends LivingEntity implements ScannableEntity, OrientationControllable, PlayerDuck {
|
||||||
|
|
||||||
@Unique
|
@Unique
|
||||||
private Vector3f cobblemon$driverInput;
|
private Vector3f cobblemon$driverInput;
|
||||||
@@ -93,12 +91,6 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
|
|||||||
@Shadow protected int jumpTriggerTime;
|
@Shadow protected int jumpTriggerTime;
|
||||||
@Unique private final OrientationController cobblemon$orientationController = new OrientationController(this);
|
@Unique private final OrientationController cobblemon$orientationController = new OrientationController(this);
|
||||||
|
|
||||||
@Unique private float cobblemon$rideXRot = 0.0f;
|
|
||||||
|
|
||||||
@Unique private float cobblemon$rideYRot = 0.0f;
|
|
||||||
|
|
||||||
@Unique private Vec3 cobblemon$rideEyePos = Vec3.ZERO;
|
|
||||||
|
|
||||||
protected PlayerMixin(EntityType<? extends LivingEntity> p_20966_, Level p_20967_) {
|
protected PlayerMixin(EntityType<? extends LivingEntity> p_20966_, Level p_20967_) {
|
||||||
super(p_20966_, p_20967_);
|
super(p_20966_, p_20967_);
|
||||||
}
|
}
|
||||||
@@ -125,6 +117,11 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Inject(method = "tick", at = @At("HEAD"))
|
||||||
|
private void cobblemon$updateRenderOrientation(CallbackInfo ci) {
|
||||||
|
this.cobblemon$orientationController.tick();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EntityDimensions getDefaultDimensions(Pose pose) {
|
public EntityDimensions getDefaultDimensions(Pose pose) {
|
||||||
if (this.getVehicle() instanceof PokemonEntity) {
|
if (this.getVehicle() instanceof PokemonEntity) {
|
||||||
@@ -310,34 +307,4 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
|
|||||||
return cobblemon$lastSentDriverInput;
|
return cobblemon$lastSentDriverInput;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public float cobblemon$getRideXRot() {
|
|
||||||
return this.cobblemon$rideXRot;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void cobblemon$setRideXRot(float rideXRot) {
|
|
||||||
this.cobblemon$rideXRot = rideXRot;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public float cobblemon$getRideYRot() {
|
|
||||||
return this.cobblemon$rideYRot;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void cobblemon$setRideYRot(float rideYRot) {
|
|
||||||
this.cobblemon$rideYRot = rideYRot;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Vec3 cobblemon$getRideEyePos() {
|
|
||||||
return this.cobblemon$rideEyePos;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void cobblemon$setRideEyePos(Vec3 rideEyePos) {
|
|
||||||
this.cobblemon$rideEyePos = rideEyePos;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -8,70 +8,33 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.mixin;
|
package com.cobblemon.mod.common.mixin;
|
||||||
|
|
||||||
import com.cobblemon.mod.common.Cobblemon;
|
|
||||||
import com.cobblemon.mod.common.OrientationControllable;
|
import com.cobblemon.mod.common.OrientationControllable;
|
||||||
import com.cobblemon.mod.common.PlayerSpawnerAccessor;
|
|
||||||
import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner;
|
|
||||||
import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory;
|
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
||||||
import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules;
|
|
||||||
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
|
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
|
||||||
import com.llamalad7.mixinextras.sugar.Local;
|
import com.llamalad7.mixinextras.sugar.Local;
|
||||||
import net.minecraft.server.level.ServerLevel;
|
|
||||||
import net.minecraft.server.level.ServerPlayer;
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
import net.minecraft.world.entity.Entity;
|
import net.minecraft.world.entity.Entity;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
|
||||||
import org.spongepowered.asm.mixin.Unique;
|
import org.spongepowered.asm.mixin.Unique;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
@Mixin(ServerPlayer.class)
|
@Mixin(ServerPlayer.class)
|
||||||
public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
|
public abstract class ServerPlayerMixin {
|
||||||
@Shadow
|
|
||||||
public abstract ServerLevel serverLevel();
|
|
||||||
|
|
||||||
@Unique
|
|
||||||
public PlayerSpawner cobblemon$spawner;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public PlayerSpawner getPlayerSpawner() {
|
|
||||||
ServerPlayer player = (ServerPlayer)(Object)this;
|
|
||||||
if (cobblemon$spawner == null) {
|
|
||||||
cobblemon$spawner = PlayerSpawnerFactory.INSTANCE.create(player);
|
|
||||||
}
|
|
||||||
return cobblemon$spawner;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerSpawner(PlayerSpawner spawner) {
|
|
||||||
this.cobblemon$spawner = spawner;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "tick", at = @At("TAIL"))
|
|
||||||
private void cobblemon$tickSpawner(CallbackInfo ci) {
|
|
||||||
if (!Cobblemon.config.getEnableSpawning()) {
|
|
||||||
return;
|
|
||||||
} else if (!serverLevel().getGameRules().getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
getPlayerSpawner().tick();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "rideTick", at = @At("HEAD"))
|
@Inject(method = "rideTick", at = @At("HEAD"))
|
||||||
private void cobblemon$updateOrientationControllerRideTick(CallbackInfo ci) {
|
private void cobblemon$updateOrientationControllerRideTick(CallbackInfo ci) {
|
||||||
ServerPlayer player = (ServerPlayer)(Object)this;
|
if (!(this instanceof OrientationControllable controllable)) return;
|
||||||
Entity vehicle = player.getVehicle();
|
var shouldUseCustomOrientation = cobblemon$shouldUseCustomOrientation((ServerPlayer)(Object)this);
|
||||||
if (!(vehicle instanceof OrientationControllable controllableVehicle)) return;
|
controllable.getOrientationController().setActive(shouldUseCustomOrientation);
|
||||||
var shouldUseCustomOrientation = cobblemon$shouldUseCustomOrientation(vehicle);
|
|
||||||
controllableVehicle.getOrientationController().setActive(shouldUseCustomOrientation);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Unique
|
@Unique
|
||||||
private boolean cobblemon$shouldUseCustomOrientation(Entity entity) {
|
private boolean cobblemon$shouldUseCustomOrientation(ServerPlayer player) {
|
||||||
if (entity == null) return false;
|
var playerVehicle = player.getVehicle();
|
||||||
if (!(entity instanceof PokemonEntity pokemonEntity)) return false;
|
if (playerVehicle == null) return false;
|
||||||
|
if (!(playerVehicle instanceof PokemonEntity pokemonEntity)) return false;
|
||||||
return pokemonEntity.ifRidingAvailableSupply(false, (behaviour, settings, state) -> {
|
return pokemonEntity.ifRidingAvailableSupply(false, (behaviour, settings, state) -> {
|
||||||
return behaviour.shouldRoll(settings, state, pokemonEntity);
|
return behaviour.shouldRoll(settings, state, pokemonEntity);
|
||||||
});
|
});
|
||||||
@@ -79,9 +42,8 @@ public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
|
|||||||
|
|
||||||
@Inject(method = "stopRiding", at = @At("HEAD"))
|
@Inject(method = "stopRiding", at = @At("HEAD"))
|
||||||
public void cobblemon$resetOrientationOnDismount(CallbackInfo ci) {
|
public void cobblemon$resetOrientationOnDismount(CallbackInfo ci) {
|
||||||
ServerPlayer player = (ServerPlayer)(Object)this;
|
if (!(this instanceof OrientationControllable controllable)) return;
|
||||||
if (!(player.getVehicle() instanceof OrientationControllable controllableVehicle)) return;
|
controllable.getOrientationController().setActive(false);
|
||||||
controllableVehicle.getOrientationController().setActive(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO: Switch to sending out on load instead of preventing saving
|
//TODO: Switch to sending out on load instead of preventing saving
|
||||||
@@ -89,4 +51,5 @@ public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
|
|||||||
private boolean cobblemon$cancelSavingPokemonMounts(boolean original, @Local(ordinal=0) Entity entity) {
|
private boolean cobblemon$cancelSavingPokemonMounts(boolean original, @Local(ordinal=0) Entity entity) {
|
||||||
return original && !(entity instanceof PokemonEntity);
|
return original && !(entity instanceof PokemonEntity);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.mixin.accessor;
|
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.gen.Invoker;
|
|
||||||
|
|
||||||
@Mixin(targets = "net.minecraft.world.level.block.entity.BeehiveBlockEntity$BeeData")
|
|
||||||
public interface BeeDataAccessor {
|
|
||||||
@Invoker("toOccupant")
|
|
||||||
BeehiveBlockEntity.Occupant invokeToOccupant();
|
|
||||||
}
|
|
||||||
|
|
||||||
-40
@@ -1,40 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.mixin.accessor;
|
|
||||||
|
|
||||||
import net.minecraft.core.BlockPos;
|
|
||||||
import net.minecraft.world.entity.Entity;
|
|
||||||
import net.minecraft.world.level.Level;
|
|
||||||
import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
|
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
|
||||||
import org.spongepowered.asm.mixin.gen.Invoker;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Mixin(BeehiveBlockEntity.class)
|
|
||||||
public interface BeehiveBlockEntityAccessor {
|
|
||||||
@Accessor("stored")
|
|
||||||
List<Object> getStored();
|
|
||||||
@Accessor("savedFlowerPos")
|
|
||||||
BlockPos savedFlowerPos();
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Access the private static method:
|
|
||||||
* private static void releaseOccupant(Level level, BlockPos pos, BeeData beeData, ...)
|
|
||||||
*/
|
|
||||||
@Invoker("releaseOccupant")
|
|
||||||
static boolean releaseOccupant(Level level, BlockPos pos, BlockState state, BeehiveBlockEntity.Occupant occupant, @Nullable List<Entity> storedInHives, BeehiveBlockEntity.BeeReleaseStatus releaseStatus, @Nullable BlockPos storedFlowerPos) {
|
|
||||||
throw new AssertionError(); // Mixin will overwrite
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.mixin.accessor;
|
|
||||||
|
|
||||||
import net.minecraft.core.BlockPos;
|
|
||||||
import net.minecraft.world.level.Level;
|
|
||||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
|
||||||
|
|
||||||
@Mixin(BlockEntity.class)
|
|
||||||
public interface BlockEntityAccessor {
|
|
||||||
@Accessor("level") Level getLevel();
|
|
||||||
@Accessor("worldPosition") BlockPos getWorldPosition();
|
|
||||||
}
|
|
||||||
+1
-2
@@ -34,8 +34,7 @@ public class AbstractClientPlayerMixin {
|
|||||||
} else {
|
} else {
|
||||||
// Only modify fov through riding if the pokedex is not open
|
// Only modify fov through riding if the pokedex is not open
|
||||||
LocalPlayer player = (LocalPlayer) (Object) this;
|
LocalPlayer player = (LocalPlayer) (Object) this;
|
||||||
// Only modify fov for the driver and not the passengers
|
if (player != null && player.isPassenger() && player.getVehicle() instanceof PokemonEntity) {
|
||||||
if (player != null && player.isPassenger() && player.getVehicle() instanceof PokemonEntity && player.getVehicle().getControllingPassenger() == player) {
|
|
||||||
PokemonEntity ride = (PokemonEntity) player.getVehicle();
|
PokemonEntity ride = (PokemonEntity) player.getVehicle();
|
||||||
|
|
||||||
// Return custom fov mult for riding
|
// Return custom fov mult for riding
|
||||||
|
|||||||
@@ -14,15 +14,12 @@ import com.cobblemon.mod.common.api.orientation.OrientationController;
|
|||||||
import com.cobblemon.mod.common.api.riding.Rideable;
|
import com.cobblemon.mod.common.api.riding.Rideable;
|
||||||
import com.cobblemon.mod.common.client.MountedPokemonAnimationRenderController;
|
import com.cobblemon.mod.common.client.MountedPokemonAnimationRenderController;
|
||||||
import com.cobblemon.mod.common.client.render.camera.MountedCameraRenderer;
|
import com.cobblemon.mod.common.client.render.camera.MountedCameraRenderer;
|
||||||
import com.cobblemon.mod.common.duck.RidePassenger;
|
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
||||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||||
import com.llamalad7.mixinextras.sugar.Local;
|
import com.llamalad7.mixinextras.sugar.Local;
|
||||||
import com.mojang.blaze3d.Blaze3D;
|
|
||||||
import net.minecraft.client.Camera;
|
import net.minecraft.client.Camera;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.util.Mth;
|
|
||||||
import net.minecraft.world.entity.Entity;
|
import net.minecraft.world.entity.Entity;
|
||||||
import net.minecraft.world.phys.Vec3;
|
import net.minecraft.world.phys.Vec3;
|
||||||
import org.joml.Matrix3f;
|
import org.joml.Matrix3f;
|
||||||
@@ -51,44 +48,45 @@ public abstract class CameraMixin {
|
|||||||
|
|
||||||
@Shadow protected abstract void setPosition(Vec3 pos);
|
@Shadow protected abstract void setPosition(Vec3 pos);
|
||||||
|
|
||||||
@Shadow private float partialTickTime;
|
@Unique private float returnTimer = 0;
|
||||||
|
@Unique private float rollAngleStart = 0;
|
||||||
// Used to help in camera rotation rendering when transitioning
|
@Unique Minecraft minecraft = Minecraft.getInstance();
|
||||||
// from rolled to unrolled.
|
|
||||||
@Unique private float cobblemon$returnTimer = 0;
|
|
||||||
@Unique private float cobblemon$rollAngleStart = 0;
|
|
||||||
|
|
||||||
@Unique private double cobblemon$lastHandledRotationTime = Double.MIN_VALUE;
|
|
||||||
@Unique private double cobblemon$frameTime = 0.0;
|
|
||||||
|
|
||||||
@Inject(method = "setRotation", at = @At("HEAD"), cancellable = true)
|
@Inject(method = "setRotation", at = @At("HEAD"), cancellable = true)
|
||||||
|
|
||||||
public void cobblemon$setRotation(float f, float g, CallbackInfo ci) {
|
public void cobblemon$setRotation(float f, float g, CallbackInfo ci) {
|
||||||
// Calculate the current frametime
|
if (!(this.entity instanceof OrientationControllable controllable)) return;
|
||||||
double d = Blaze3D.getTime();
|
var controller = controllable.getOrientationController();
|
||||||
this.cobblemon$frameTime = (this.cobblemon$lastHandledRotationTime != Double.MIN_VALUE) ? d - this.cobblemon$lastHandledRotationTime : 0.0;
|
if (!controller.isActive() && controller.getOrientation() != null) {
|
||||||
this.cobblemon$lastHandledRotationTime = d;
|
if(this.returnTimer < 1) {
|
||||||
|
//Rotation is taken from entity since we no longer handle mouse ourselves
|
||||||
// Don't assume the camera to be attached to an entity. Ponder Scenes from create et.al. for example aren't.
|
//Stops a period of time when you can't input anything.
|
||||||
if (this.entity == null) return;
|
controller.getOrientation().set(
|
||||||
var vehicle = this.entity.getVehicle();
|
new Matrix3f()
|
||||||
if (!(vehicle instanceof OrientationControllable controllableVehicle)) return;
|
.rotateY((float) Math.toRadians(180 - this.entity.getYRot()))
|
||||||
var instance = (Camera)(Object)this;
|
.rotateX((float) Math.toRadians(-this.entity.getXRot()))
|
||||||
|
);
|
||||||
// If the current vehicle has no orientation then return and perform
|
if(rollAngleStart == 0){
|
||||||
// vanilla camera rotations
|
this.returnTimer = 1;
|
||||||
var vehicleController = controllableVehicle.getOrientationController();
|
controller.reset();
|
||||||
if (vehicleController.getOrientation() == null) return;
|
return;
|
||||||
|
}
|
||||||
// If the controller has been deactivated but the orientation isn't null yet
|
controller.getOrientation().rotateZ((float) Math.toRadians(-rollAngleStart*(1-returnTimer)));
|
||||||
// then perform transition from rolled ride/camera to vanilla
|
cobblemon$applyRotation();
|
||||||
if (!vehicleController.isActive() && vehicleController.getOrientation() != null) {
|
this.returnTimer += .05F;
|
||||||
cobblemon$applyTransitionRotation(vehicleController, ci);
|
ci.cancel();
|
||||||
} else { // Otherwise perform cobblemon specific camera rotation and set transition helper variables
|
} else {
|
||||||
cobblemon$applyRotation();
|
this.returnTimer = 1;
|
||||||
this.cobblemon$returnTimer = 0;
|
controller.reset();
|
||||||
this.cobblemon$rollAngleStart = instance.rotation().getEulerAnglesYXZ(new Vector3f()).z();
|
}
|
||||||
ci.cancel();
|
return;
|
||||||
}
|
}
|
||||||
|
if (controller.getOrientation() == null) return;
|
||||||
|
cobblemon$applyRotation();
|
||||||
|
|
||||||
|
this.returnTimer = 0;
|
||||||
|
this.rollAngleStart = controller.getRoll();
|
||||||
|
ci.cancel();
|
||||||
}
|
}
|
||||||
|
|
||||||
@WrapOperation(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;setPosition(DDD)V"))
|
@WrapOperation(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;setPosition(DDD)V"))
|
||||||
@@ -121,128 +119,20 @@ public abstract class CameraMixin {
|
|||||||
|
|
||||||
@Unique
|
@Unique
|
||||||
private void cobblemon$applyRotation(){
|
private void cobblemon$applyRotation(){
|
||||||
var driver = this.entity;
|
if (!(this.entity instanceof OrientationControllable controllable) || controllable.getOrientationController().getOrientation() == null) return;
|
||||||
if (!(driver.getVehicle() instanceof OrientationControllable controllableVehicle) ||
|
var controller = controllable.getOrientationController();
|
||||||
controllableVehicle.getOrientationController().getOrientation() == null ||
|
var newRotation = controller.getOrientation().normal(new Matrix3f()).getNormalizedRotation(new Quaternionf());
|
||||||
!controllableVehicle.getOrientationController().getActive()
|
if (this.minecraft.options.getCameraType().isMirrored()) {
|
||||||
) return;
|
|
||||||
|
|
||||||
// Grab the driver and vehicle orientation controllers.
|
|
||||||
var vehicleController = controllableVehicle.getOrientationController();
|
|
||||||
|
|
||||||
var isDriving = driver.getControlledVehicle() != null;
|
|
||||||
|
|
||||||
// Grab the ride orientation
|
|
||||||
var newRotation = new Quaternionf();
|
|
||||||
|
|
||||||
// If the player is driving then use the current orientation since the driver sets it.
|
|
||||||
// If not then use the smoothed render orientation for passengers otherwise the vehicle rotation will be jerky
|
|
||||||
if (isDriving) {
|
|
||||||
newRotation = vehicleController.getOrientation().normal(new Matrix3f()).getNormalizedRotation(new Quaternionf());
|
|
||||||
} else {
|
|
||||||
newRotation = vehicleController.getRenderOrientation(this.partialTickTime);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unroll the current rotation if no roll is requested
|
|
||||||
if (Cobblemon.config.getDisableRoll()) {
|
|
||||||
var eulerAngs = newRotation.getEulerAnglesYXZ(new Vector3f());
|
|
||||||
var currAngs = this.rotation.getEulerAnglesYXZ(new Vector3f());
|
|
||||||
var vehicle = (PokemonEntity)driver.getVehicle();
|
|
||||||
var vel = vehicle.getRidingAnimationData().getVelocitySpring().getInterpolated(this.partialTickTime, 0);
|
|
||||||
|
|
||||||
// lerp the new rotation towards this y rot at a rate proportional to the horizontal movement speed?
|
|
||||||
var yaw = Mth.wrapDegrees(Math.toDegrees(Mth.atan2(vel.x(), vel.z())) + 180.0f);
|
|
||||||
|
|
||||||
var degDiff = Mth.degreesDifference((float)Math.toDegrees(currAngs.y()), (float)yaw);
|
|
||||||
var pitchDeadzoneDeg = 15.0; // x degrees of deadzone about +-90 degrees of pitch.
|
|
||||||
var pitchDeg = vehicleController.getPitch();
|
|
||||||
// ConsiderPitch to be already 90 if within the deadzone around it.
|
|
||||||
var cutoffPitch = Math.min(1.0,(Mth.abs(pitchDeg) / (90.0f - pitchDeadzoneDeg))) * 90.0f * Math.signum(pitchDeg);
|
|
||||||
var lerpRateMod = Mth.cos((float)Math.toRadians(cutoffPitch));
|
|
||||||
|
|
||||||
// Apply smoothing from the cameras current yaw to the yaw of the velocity vector of the ride.
|
|
||||||
var k = 5.0f; // Some smoothing constant k
|
|
||||||
var smoothingFactor = lerpRateMod * cobblemon$frameTime * k;
|
|
||||||
var newYaw = currAngs.y() + (Math.toRadians(degDiff) * smoothingFactor);
|
|
||||||
|
|
||||||
newRotation.set(new Quaternionf().rotateYXZ((float)newYaw, eulerAngs.x(), 0.0f));
|
|
||||||
}
|
|
||||||
|
|
||||||
var rotationOffset = 0;
|
|
||||||
if (Minecraft.getInstance().options.getCameraType().isMirrored()) {
|
|
||||||
newRotation.rotateY((float)Math.toRadians(180));
|
newRotation.rotateY((float)Math.toRadians(180));
|
||||||
rotationOffset = 180;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get the drivers local look angle in relation to the ride and apply it.
|
|
||||||
if (vehicleController.getActive()) {
|
|
||||||
var vehicleMatrix = new Matrix3f().set(newRotation);
|
|
||||||
var driverMatrix = new Matrix3f();// Base the driver
|
|
||||||
var playerRotater = (RidePassenger)driver;
|
|
||||||
newRotation = vehicleMatrix.mul(
|
|
||||||
driverMatrix.rotateYXZ(
|
|
||||||
-Mth.DEG_TO_RAD * (playerRotater.cobblemon$getRideYRot()),
|
|
||||||
-Mth.DEG_TO_RAD * playerRotater.cobblemon$getRideXRot(),
|
|
||||||
0.0f)
|
|
||||||
).normal(new Matrix3f()).getNormalizedRotation(new Quaternionf());
|
|
||||||
}
|
}
|
||||||
this.rotation.set(newRotation);
|
this.rotation.set(newRotation);
|
||||||
var eulerAngs = newRotation.getEulerAnglesXYZ(new Vector3f());
|
this.xRot = controller.getPitch();
|
||||||
this.xRot = eulerAngs.x() * Mth.RAD_TO_DEG;
|
this.yRot = controller.getYaw();
|
||||||
this.yRot = eulerAngs.y() * Mth.RAD_TO_DEG;
|
|
||||||
// Set the drivers rotations to match
|
|
||||||
var driverEulerAngs = new Quaternionf(this.rotation).getEulerAnglesYXZ(new Vector3f());
|
|
||||||
driver.setXRot(-driverEulerAngs.x() * Mth.RAD_TO_DEG + rotationOffset);
|
|
||||||
driver.setYRot(180.0f - (driverEulerAngs.y() * Mth.RAD_TO_DEG));
|
|
||||||
|
|
||||||
OrientationController.Companion.getFORWARDS().rotate(this.rotation, this.forwards);
|
OrientationController.Companion.getFORWARDS().rotate(this.rotation, this.forwards);
|
||||||
OrientationController.Companion.getUP().rotate(this.rotation, this.up);
|
OrientationController.Companion.getUP().rotate(this.rotation, this.up);
|
||||||
OrientationController.Companion.getLEFT().rotate(this.rotation, this.left);
|
OrientationController.Companion.getLEFT().rotate(this.rotation, this.left);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Unique
|
|
||||||
private void cobblemon$applyTransitionRotation(
|
|
||||||
OrientationController vehicleController,
|
|
||||||
CallbackInfo ci
|
|
||||||
) {
|
|
||||||
// If the transition has just started then
|
|
||||||
if (this.cobblemon$returnTimer == 0.0) {
|
|
||||||
MountedCameraRenderer.INSTANCE.resetDriverRotations((Camera)(Object)this, this.entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(this.cobblemon$returnTimer < 1) {
|
|
||||||
//Rotation is taken from entity since we no longer handle mouse ourselves
|
|
||||||
//Stops a period of time when you can't input anything.
|
|
||||||
float interpolatedRoll = Mth.lerp(this.cobblemon$returnTimer, this.cobblemon$rollAngleStart, 0.0f);
|
|
||||||
float pitch = (float) Math.toRadians(-this.entity.getXRot());
|
|
||||||
float yaw = (float) Math.toRadians(180 - this.entity.getYRot());
|
|
||||||
|
|
||||||
Quaternionf interRot = new Quaternionf();
|
|
||||||
interRot.rotationYXZ(yaw, pitch, interpolatedRoll);
|
|
||||||
|
|
||||||
this.rotation.set(interRot);
|
|
||||||
var eulerAngs = interRot.getEulerAnglesXYZ(new Vector3f());
|
|
||||||
this.xRot = eulerAngs.x() * Mth.RAD_TO_DEG;
|
|
||||||
this.yRot = eulerAngs.y() * Mth.RAD_TO_DEG;
|
|
||||||
OrientationController.Companion.getFORWARDS().rotate(this.rotation, this.forwards);
|
|
||||||
OrientationController.Companion.getUP().rotate(this.rotation, this.up);
|
|
||||||
OrientationController.Companion.getLEFT().rotate(this.rotation, this.left);
|
|
||||||
|
|
||||||
if(cobblemon$rollAngleStart == 0){
|
|
||||||
this.cobblemon$returnTimer = 1;
|
|
||||||
vehicleController.reset();
|
|
||||||
MountedCameraRenderer.INSTANCE.resetDriverRotations((Camera)(Object)this, this.entity);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this.cobblemon$returnTimer += (partialTickTime * (1.0f/20.0f));
|
|
||||||
ci.cancel();
|
|
||||||
} else {
|
|
||||||
this.cobblemon$returnTimer = 1;
|
|
||||||
vehicleController.reset();
|
|
||||||
MountedCameraRenderer.INSTANCE.resetDriverRotations((Camera)(Object)this, this.entity);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@WrapOperation(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;move(FFF)V", ordinal = 0))
|
@WrapOperation(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;move(FFF)V", ordinal = 0))
|
||||||
public void stopMoveIfRolling(Camera instance, float zoom, float dy, float dx, Operation<Void> original) {
|
public void stopMoveIfRolling(Camera instance, float zoom, float dy, float dx, Operation<Void> original) {
|
||||||
Entity entity = instance.getEntity();
|
Entity entity = instance.getEntity();
|
||||||
|
|||||||
@@ -9,21 +9,15 @@
|
|||||||
package com.cobblemon.mod.common.mixin.client;
|
package com.cobblemon.mod.common.mixin.client;
|
||||||
|
|
||||||
import com.cobblemon.mod.common.api.scheduling.ClientTaskTracker;
|
import com.cobblemon.mod.common.api.scheduling.ClientTaskTracker;
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
|
||||||
import com.llamalad7.mixinextras.sugar.Local;
|
|
||||||
import net.minecraft.client.DeltaTracker;
|
import net.minecraft.client.DeltaTracker;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.renderer.GameRenderer;
|
import net.minecraft.client.renderer.GameRenderer;
|
||||||
import net.minecraft.world.entity.Entity;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Unique;
|
import org.spongepowered.asm.mixin.Unique;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.ModifyArg;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
import java.util.function.Predicate;
|
|
||||||
|
|
||||||
@Mixin(GameRenderer.class)
|
@Mixin(GameRenderer.class)
|
||||||
public class GameRendererMixin {
|
public class GameRendererMixin {
|
||||||
@Unique
|
@Unique
|
||||||
@@ -48,16 +42,4 @@ public class GameRendererMixin {
|
|||||||
lastTime = newTime;
|
lastTime = newTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ModifyArg(
|
|
||||||
method = "pick(Lnet/minecraft/world/entity/Entity;DDF)Lnet/minecraft/world/phys/HitResult;",
|
|
||||||
at = @At(
|
|
||||||
value = "INVOKE",
|
|
||||||
target = "Lnet/minecraft/world/entity/projectile/ProjectileUtil;getEntityHitResult(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/AABB;Ljava/util/function/Predicate;D)Lnet/minecraft/world/phys/EntityHitResult;"
|
|
||||||
),
|
|
||||||
index = 4
|
|
||||||
)
|
|
||||||
private Predicate<Entity> filterPokemonVehicle(Predicate<Entity> original, @Local(ordinal = 0, argsOnly = true) Entity entity) {
|
|
||||||
return (entityX) -> !(entity.getVehicle() == entityX && entityX instanceof PokemonEntity) && original.test(entityX);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -19,11 +19,9 @@ import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState;
|
|||||||
import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel;
|
import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel;
|
||||||
import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository;
|
import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository;
|
||||||
import com.cobblemon.mod.common.duck.PlayerDuck;
|
import com.cobblemon.mod.common.duck.PlayerDuck;
|
||||||
import com.cobblemon.mod.common.duck.RidePassenger;
|
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
||||||
import com.cobblemon.mod.common.net.messages.server.orientation.ServerboundUpdateOrientationPacket;
|
import com.cobblemon.mod.common.net.messages.server.orientation.ServerboundUpdateOrientationPacket;
|
||||||
import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateDriverInputPacket;
|
import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateDriverInputPacket;
|
||||||
import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateRiderRotationPacket;
|
|
||||||
import com.mojang.authlib.GameProfile;
|
import com.mojang.authlib.GameProfile;
|
||||||
import net.minecraft.client.CameraType;
|
import net.minecraft.client.CameraType;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
@@ -31,10 +29,12 @@ import net.minecraft.client.multiplayer.ClientLevel;
|
|||||||
import net.minecraft.client.player.AbstractClientPlayer;
|
import net.minecraft.client.player.AbstractClientPlayer;
|
||||||
import net.minecraft.client.player.Input;
|
import net.minecraft.client.player.Input;
|
||||||
import net.minecraft.client.player.LocalPlayer;
|
import net.minecraft.client.player.LocalPlayer;
|
||||||
import net.minecraft.util.Mth;
|
|
||||||
import net.minecraft.world.entity.Entity;
|
import net.minecraft.world.entity.Entity;
|
||||||
|
import net.minecraft.world.entity.EntityType;
|
||||||
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.world.level.ClipContext;
|
import net.minecraft.world.level.ClipContext;
|
||||||
|
import net.minecraft.world.level.Level;
|
||||||
import net.minecraft.world.phys.HitResult;
|
import net.minecraft.world.phys.HitResult;
|
||||||
import net.minecraft.world.phys.Vec3;
|
import net.minecraft.world.phys.Vec3;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
@@ -55,10 +55,6 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
|
|||||||
|
|
||||||
@Unique Matrix3f cobblemon$lastOrientation;
|
@Unique Matrix3f cobblemon$lastOrientation;
|
||||||
|
|
||||||
@Unique float cobblemon$lastRideXRot;
|
|
||||||
@Unique float cobblemon$lastRideYRot;
|
|
||||||
@Unique Vec3 cobblemon$lastRideEyePos;
|
|
||||||
|
|
||||||
@Unique boolean cobblemon$isDoubleJumping = false;
|
@Unique boolean cobblemon$isDoubleJumping = false;
|
||||||
|
|
||||||
@Shadow
|
@Shadow
|
||||||
@@ -76,35 +72,30 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
|
|||||||
super(clientLevel, gameProfile);
|
super(clientLevel, gameProfile);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Inject(method = "sendPosition", at = @At("TAIL"))
|
||||||
|
// private void cobblemon$updateRotationMatrix(CallbackInfo ci) {
|
||||||
|
// if (!(this instanceof OrientationControllable controllable)) return;
|
||||||
|
// var controller = controllable.getOrientationController();
|
||||||
|
// if (!controller.isActive() || controller.getOrientation() == cobblemon$lastOrientation) return;
|
||||||
|
// cobblemon$lastOrientation = controller.getOrientation() != null ? new Matrix3f(controller.getOrientation()) : null;
|
||||||
|
// CobblemonNetwork.INSTANCE.sendToServer(new ServerboundUpdateOrientationPacket(controller.getOrientation()));
|
||||||
|
// }
|
||||||
|
|
||||||
@Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientPacketListener;send(Lnet/minecraft/network/protocol/Packet;)V"))
|
@Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientPacketListener;send(Lnet/minecraft/network/protocol/Packet;)V"))
|
||||||
private void cobblemon$updateRotationMatrixPassenger(CallbackInfo ci) {
|
private void cobblemon$updateRotationMatrixPassenger(CallbackInfo ci) {
|
||||||
if (!(this.getVehicle() instanceof OrientationControllable controllableVehicle)) return;
|
if (!(this instanceof OrientationControllable controllable)) return;
|
||||||
var vehicleController = controllableVehicle.getOrientationController();
|
var controller = controllable.getOrientationController();
|
||||||
if (!vehicleController.isActive() || vehicleController.getOrientation() == cobblemon$lastOrientation) return;
|
if (!controller.isActive() || controller.getOrientation() == cobblemon$lastOrientation) return;
|
||||||
cobblemon$lastOrientation = vehicleController.getOrientation() != null ? new Matrix3f(vehicleController.getOrientation()) : null;
|
cobblemon$lastOrientation = controller.getOrientation() != null ? new Matrix3f(controller.getOrientation()) : null;
|
||||||
CobblemonNetwork.INSTANCE.sendToServer(new ServerboundUpdateOrientationPacket(this.getVehicle().getId(), vehicleController.getOrientation()));
|
CobblemonNetwork.INSTANCE.sendToServer(new ServerboundUpdateOrientationPacket(controller.getOrientation()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "rideTick", at = @At("HEAD"))
|
@Inject(method = "rideTick", at = @At("HEAD"))
|
||||||
private void cobblemon$updateOrientationControllerRideTick(CallbackInfo ci) {
|
private void cobblemon$updateOrientationControllerRideTick(CallbackInfo ci) {
|
||||||
if (Minecraft.getInstance().player != (Object)this) return;
|
if (Minecraft.getInstance().player != (Object)this) return;
|
||||||
var driver = (LocalPlayer)(Object)this;
|
if (!(this instanceof OrientationControllable controllable)) return;
|
||||||
var vehicle = driver.getVehicle();
|
|
||||||
if (!(this.getVehicle() instanceof OrientationControllable controllableVehicle)) return;
|
|
||||||
var shouldUseCustomOrientation = cobblemon$shouldUseCustomOrientation((LocalPlayer)(Object)this);
|
var shouldUseCustomOrientation = cobblemon$shouldUseCustomOrientation((LocalPlayer)(Object)this);
|
||||||
var vehicleController = controllableVehicle.getOrientationController();
|
controllable.getOrientationController().setActive(shouldUseCustomOrientation);
|
||||||
|
|
||||||
// If the player has just switched to riding a custom orientation ride then set their
|
|
||||||
// x and y rots local to the vehicle rots(if the controller wasn't active and will now be active)
|
|
||||||
// This ensures that on transition your camera stays in the same spot
|
|
||||||
if (!vehicleController.isActive() && shouldUseCustomOrientation) {
|
|
||||||
// Set local to the vehicle x and yrot so
|
|
||||||
var playerRotater = (RidePassenger)driver;
|
|
||||||
playerRotater.cobblemon$setRideXRot(Mth.wrapDegrees(driver.getXRot() - vehicle.getXRot()));
|
|
||||||
playerRotater.cobblemon$setRideYRot(Mth.wrapDegrees(driver.getYRot() - vehicle.getYRot()));
|
|
||||||
}
|
|
||||||
|
|
||||||
vehicleController.setActive(shouldUseCustomOrientation);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "rideTick", at = @At("HEAD"))
|
@Inject(method = "rideTick", at = @At("HEAD"))
|
||||||
@@ -124,40 +115,6 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
|
|||||||
CobblemonNetwork.INSTANCE.sendToServer(new ServerboundUpdateDriverInputPacket(driverInput));
|
CobblemonNetwork.INSTANCE.sendToServer(new ServerboundUpdateDriverInputPacket(driverInput));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "rideTick", at = @At("HEAD"))
|
|
||||||
private void cobblemon$updateRiderRotationsRideTick(CallbackInfo ci) {
|
|
||||||
if (Minecraft.getInstance().player != (Object)this) return;
|
|
||||||
if (!(this.getVehicle() instanceof PokemonEntity pokemonEntity)) return;
|
|
||||||
|
|
||||||
// Only send rotation updates if the player is riding a vehicle that is currently rollable
|
|
||||||
if (!(this.getVehicle() instanceof OrientationControllable controllableVehicle)) return;
|
|
||||||
if (!controllableVehicle.getOrientationController().getActive()) return;
|
|
||||||
|
|
||||||
var passenger = (LocalPlayer)(Object)this;
|
|
||||||
var playerRotater = (RidePassenger)passenger;
|
|
||||||
|
|
||||||
// Gather Rider Rotation info
|
|
||||||
var rideXRot = playerRotater.cobblemon$getRideXRot();
|
|
||||||
var rideYRot = playerRotater.cobblemon$getRideYRot();
|
|
||||||
var rideEyePos = playerRotater.cobblemon$getRideEyePos();
|
|
||||||
|
|
||||||
// Check for a change in the values before sending them.
|
|
||||||
if (cobblemon$lastRideXRot != rideXRot ||
|
|
||||||
cobblemon$lastRideYRot != rideYRot ||
|
|
||||||
cobblemon$lastRideEyePos != rideEyePos
|
|
||||||
) {
|
|
||||||
|
|
||||||
// Update 'last' values
|
|
||||||
cobblemon$lastRideXRot = rideXRot;
|
|
||||||
cobblemon$lastRideYRot = rideYRot;
|
|
||||||
cobblemon$lastRideEyePos = rideEyePos;
|
|
||||||
|
|
||||||
CobblemonNetwork.INSTANCE.sendToServer(new ServerboundUpdateRiderRotationPacket(rideXRot, rideYRot, rideEyePos));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Unique
|
@Unique
|
||||||
private boolean cobblemon$shouldUseCustomOrientation(LocalPlayer player) {
|
private boolean cobblemon$shouldUseCustomOrientation(LocalPlayer player) {
|
||||||
var playerVehicle = player.getVehicle();
|
var playerVehicle = player.getVehicle();
|
||||||
@@ -172,8 +129,8 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
|
|||||||
public void stopRiding() {
|
public void stopRiding() {
|
||||||
super.stopRiding();
|
super.stopRiding();
|
||||||
if (Minecraft.getInstance().player != (Object)this) return;
|
if (Minecraft.getInstance().player != (Object)this) return;
|
||||||
if (!(this instanceof OrientationControllable controllableVehicle)) return;
|
if (!(this instanceof OrientationControllable controllable)) return;
|
||||||
controllableVehicle.getOrientationController().setActive(false);
|
controllable.getOrientationController().setActive(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "getJumpRidingScale", at = @At("HEAD"), cancellable = true)
|
@Inject(method = "getJumpRidingScale", at = @At("HEAD"), cancellable = true)
|
||||||
|
|||||||
@@ -10,16 +10,13 @@ package com.cobblemon.mod.common.mixin.client;
|
|||||||
|
|
||||||
import com.cobblemon.mod.common.Cobblemon;
|
import com.cobblemon.mod.common.Cobblemon;
|
||||||
import com.cobblemon.mod.common.OrientationControllable;
|
import com.cobblemon.mod.common.OrientationControllable;
|
||||||
import com.cobblemon.mod.common.api.orientation.OrientationController;
|
|
||||||
import com.cobblemon.mod.common.client.CobblemonClient;
|
import com.cobblemon.mod.common.client.CobblemonClient;
|
||||||
import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding;
|
import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding;
|
||||||
import com.cobblemon.mod.common.duck.RidePassenger;
|
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
||||||
import com.cobblemon.mod.common.pokedex.scanner.PokedexUsageContext;
|
import com.cobblemon.mod.common.pokedex.scanner.PokedexUsageContext;
|
||||||
import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
|
import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
|
||||||
import com.llamalad7.mixinextras.sugar.Local;
|
import com.llamalad7.mixinextras.sugar.Local;
|
||||||
import com.mojang.blaze3d.Blaze3D;
|
import com.mojang.blaze3d.Blaze3D;
|
||||||
import kotlin.Pair;
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.MouseHandler;
|
import net.minecraft.client.MouseHandler;
|
||||||
import net.minecraft.client.player.LocalPlayer;
|
import net.minecraft.client.player.LocalPlayer;
|
||||||
@@ -35,9 +32,6 @@ import org.spongepowered.asm.mixin.injection.At;
|
|||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
import static com.google.common.primitives.Floats.min;
|
|
||||||
import static net.minecraft.util.Mth.lerp;
|
|
||||||
|
|
||||||
@Mixin(MouseHandler.class)
|
@Mixin(MouseHandler.class)
|
||||||
public abstract class MouseHandlerMixin {
|
public abstract class MouseHandlerMixin {
|
||||||
@Shadow private double accumulatedScrollY;
|
@Shadow private double accumulatedScrollY;
|
||||||
@@ -123,6 +117,8 @@ public abstract class MouseHandlerMixin {
|
|||||||
@Local(argsOnly = true) double d,
|
@Local(argsOnly = true) double d,
|
||||||
@Local(argsOnly = true) double movementTime
|
@Local(argsOnly = true) double movementTime
|
||||||
) {
|
) {
|
||||||
|
boolean returnValue = true;
|
||||||
|
|
||||||
PokedexUsageContext usageContext = CobblemonClient.INSTANCE.getPokedexUsageContext();
|
PokedexUsageContext usageContext = CobblemonClient.INSTANCE.getPokedexUsageContext();
|
||||||
if (usageContext.getScanningGuiOpen()) {
|
if (usageContext.getScanningGuiOpen()) {
|
||||||
this.smoothTurnY.reset();
|
this.smoothTurnY.reset();
|
||||||
@@ -130,78 +126,34 @@ public abstract class MouseHandlerMixin {
|
|||||||
var defaultSensitivity = this.minecraft.options.sensitivity().get() * 0.6 + 0.2;
|
var defaultSensitivity = this.minecraft.options.sensitivity().get() * 0.6 + 0.2;
|
||||||
var spyglassSensitivity = Math.pow(defaultSensitivity, 3);
|
var spyglassSensitivity = Math.pow(defaultSensitivity, 3);
|
||||||
var lookSensitivity = spyglassSensitivity * 8.0;
|
var lookSensitivity = spyglassSensitivity * 8.0;
|
||||||
var sensitivity = lerp(usageContext.getFovMultiplier(), spyglassSensitivity, lookSensitivity);
|
var sensitivity = Mth.lerp(usageContext.getFovMultiplier(), spyglassSensitivity, lookSensitivity);
|
||||||
var yRotationFlip = this.minecraft.options.invertYMouse().get() ? -1 : 1;
|
var yRotationFlip = this.minecraft.options.invertYMouse().get() ? -1 : 1;
|
||||||
player.turn(this.accumulatedDX * sensitivity, (this.accumulatedDY * sensitivity * yRotationFlip));
|
player.turn(this.accumulatedDX * sensitivity, (this.accumulatedDY * sensitivity * yRotationFlip));
|
||||||
|
returnValue = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
var vehicle = player.getVehicle();
|
|
||||||
if (!(vehicle instanceof PokemonEntity)) return true;
|
|
||||||
|
|
||||||
// Clamp player rotation if riding and the vehicle demands it
|
// Clamp player rotation if riding and the vehicle demands it
|
||||||
if (player.isPassenger() && vehicle instanceof PokemonEntity pokeVehicle) {
|
if (player.isPassenger() && player.getVehicle() instanceof PokemonEntity vehicle) {
|
||||||
pokeVehicle.clampPassengerRotation(player);
|
vehicle.clampPassengerRotation(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the ride is not orientation controllable then return and perform the normal turnPlayer logic
|
if (!(player instanceof OrientationControllable controllable)) return true;
|
||||||
if (!(vehicle instanceof OrientationControllable controllableVehicle) || !controllableVehicle.getOrientationController().isActive()) {
|
|
||||||
|
if (!controllable.getOrientationController().isActive()) {
|
||||||
xMouseSmoother.reset();
|
xMouseSmoother.reset();
|
||||||
yMouseSmoother.reset();
|
yMouseSmoother.reset();
|
||||||
pitchSmoother.reset();
|
pitchSmoother.reset();
|
||||||
rollSmoother.reset();
|
rollSmoother.reset();
|
||||||
yawSmoother.reset();
|
yawSmoother.reset();
|
||||||
return true;
|
return returnValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
var vehicleController = controllableVehicle.getOrientationController();
|
// Send mouse input to be interpreted into rotation
|
||||||
var lookaroundButtonPressed = Minecraft.getInstance().mouseHandler.isMiddlePressed();
|
// deltas by the ride controller
|
||||||
Pair<Boolean, Boolean> mouseShouldModifyDriver = ((PokemonEntity) vehicle).ifRidingAvailableSupply(new Pair(false, false), (behaviour, settings, state) -> {
|
|
||||||
return behaviour.mouseModifiesDriverRotation(
|
|
||||||
settings,
|
|
||||||
state,
|
|
||||||
(PokemonEntity) vehicle
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------
|
|
||||||
// If looking around then modify the players orientation instead and zero the mouse deltas so the mouse doesn't
|
|
||||||
// affect the vehicle orientation when looking around.
|
|
||||||
// If the client is a passenger it will modify these rotations and return
|
|
||||||
//-------------------------------------------------------------------------
|
|
||||||
if (lookaroundButtonPressed || player.getControlledVehicle() == null) {
|
|
||||||
// Modify driver rotations
|
|
||||||
cobblemon$setDriverRotations(player, cursorDeltaX, cursorDeltaY);
|
|
||||||
|
|
||||||
// If the player/passenger is not the driver then return and ignore all vehicle rotation logic
|
|
||||||
if (player.getControlledVehicle() == null) return false;
|
|
||||||
|
|
||||||
// Set to zero so that vehicle rotations don't also get affected by movement.
|
|
||||||
cursorDeltaX = 0.0;
|
|
||||||
cursorDeltaY = 0.0;
|
|
||||||
} else if (mouseShouldModifyDriver.getFirst()) { // If not freelooking then check modification per mouse input dimension
|
|
||||||
cobblemon$setDriverRotations(player, cursorDeltaX, 0.0);
|
|
||||||
cursorDeltaX = 0.0;
|
|
||||||
} else if (mouseShouldModifyDriver.getSecond()) {
|
|
||||||
cobblemon$setDriverRotations(player, 0.0, cursorDeltaY);
|
|
||||||
cursorDeltaY = 0.0;
|
|
||||||
}
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------
|
|
||||||
// Smoothly return driver rotations to zero when needed
|
|
||||||
//-------------------------------------------------------------------------
|
|
||||||
var playerRotater = (RidePassenger)player;
|
|
||||||
if( !lookaroundButtonPressed && !mouseShouldModifyDriver.getFirst()){
|
|
||||||
playerRotater.cobblemon$setRideYRot(lerp(min(5.0f * (float)movementTime, 1.0f), Mth.wrapDegrees(playerRotater.cobblemon$getRideYRot()), 0.0f));
|
|
||||||
}
|
|
||||||
if( !lookaroundButtonPressed && !mouseShouldModifyDriver.getSecond()) {
|
|
||||||
playerRotater.cobblemon$setRideXRot(lerp(min(5.0f * (float)movementTime, 1.0f), Mth.wrapDegrees(playerRotater.cobblemon$getRideXRot()), 0.0f));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send mouse input to be interpreted into rotation deltas by the ride controller
|
|
||||||
Vec3 angVecMouse = cobblemon$getRideMouseRotation(cursorDeltaX, cursorDeltaY, movementTime);
|
Vec3 angVecMouse = cobblemon$getRideMouseRotation(cursorDeltaX, cursorDeltaY, movementTime);
|
||||||
|
|
||||||
// Perform Rotation using mouse influenced rotation deltas.
|
// Perform Rotation using mouse influenced rotation deltas.
|
||||||
vehicleController.rotate(
|
controllable.getOrientationController().rotate(
|
||||||
(float) angVecMouse.x,
|
(float) angVecMouse.x,
|
||||||
(float) angVecMouse.y,
|
(float) angVecMouse.y,
|
||||||
(float) angVecMouse.z
|
(float) angVecMouse.z
|
||||||
@@ -211,16 +163,17 @@ public abstract class MouseHandlerMixin {
|
|||||||
var angRot = cobblemon$getAngularVelocity(movementTime);
|
var angRot = cobblemon$getAngularVelocity(movementTime);
|
||||||
|
|
||||||
// Apply smoothing if requested by the controller.
|
// Apply smoothing if requested by the controller.
|
||||||
|
// This Might be best if done by the controller itself?
|
||||||
if(cobblemon$shouldUseAngVelSmoothing()) {
|
if(cobblemon$shouldUseAngVelSmoothing()) {
|
||||||
var yaw = yawSmoother.getNewDeltaValue(angRot.x * 0.5f, d);
|
var yaw = yawSmoother.getNewDeltaValue(angRot.x * 0.5f, d);
|
||||||
var pitch = pitchSmoother.getNewDeltaValue(angRot.y * 0.5f, d);
|
var pitch = pitchSmoother.getNewDeltaValue(angRot.y * 0.5f, d);
|
||||||
var roll = rollSmoother.getNewDeltaValue(angRot.z * 0.5f, d);
|
var roll = rollSmoother.getNewDeltaValue(angRot.z * 0.5f, d);
|
||||||
vehicleController.rotate((float) yaw, (float) pitch, (float) roll);
|
controllable.getOrientationController().rotate((float) yaw, (float) pitch, (float) roll);
|
||||||
}
|
}
|
||||||
|
// Otherwise simply apply the smoothing
|
||||||
else {
|
else {
|
||||||
vehicleController.rotate((float) (angRot.x * 10 * d), (float) (angRot.y * 10 * d), (float) (angRot.z * 10 * d));
|
controllable.getOrientationController().rotate((float) (angRot.x * 10 * d), (float) (angRot.y * 10 * d), (float) (angRot.z * 10 * d));
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -233,11 +186,10 @@ public abstract class MouseHandlerMixin {
|
|||||||
@Inject(method = "handleAccumulatedMovement", at = @At("TAIL"))
|
@Inject(method = "handleAccumulatedMovement", at = @At("TAIL"))
|
||||||
private void cobblemon$maintainMovementWhenInScreens(CallbackInfo ci) {
|
private void cobblemon$maintainMovementWhenInScreens(CallbackInfo ci) {
|
||||||
if (minecraft.player == null) return;
|
if (minecraft.player == null) return;
|
||||||
if (!(minecraft.player.getVehicle() instanceof OrientationControllable vehicleControllable)) return;
|
if (!(minecraft.player instanceof OrientationControllable controllable)) return;
|
||||||
if (!(vehicleControllable.getOrientationController() instanceof OrientationController vehicleController)) return;
|
if (!controllable.getOrientationController().isActive()) return;
|
||||||
if (vehicleController.getOrientation() == null) return;
|
|
||||||
if (minecraft.isPaused()) return;
|
if (minecraft.isPaused()) return;
|
||||||
if (this.isMouseGrabbed()) return; // return if turnPlayer() has already run this pass
|
if (isMouseGrabbed()) return;
|
||||||
|
|
||||||
this.turnPlayer(cobblemon$timeDelta);
|
this.turnPlayer(cobblemon$timeDelta);
|
||||||
}
|
}
|
||||||
@@ -299,20 +251,6 @@ public abstract class MouseHandlerMixin {
|
|||||||
return Math.pow(sensitivity, 3);
|
return Math.pow(sensitivity, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Unique
|
|
||||||
private void cobblemon$setDriverRotations(LocalPlayer player, double cursorDeltaX, double cursorDeltaY) {
|
|
||||||
// the vanilla turn() method redone so that it uses rideRotations.
|
|
||||||
float f = (float)cursorDeltaY * 0.15F; // Note: turn() uses xRot for pitch (up/down)
|
|
||||||
float g = (float)cursorDeltaX * 0.15F; // Note: turn() uses yRot for yaw (left/right)
|
|
||||||
var playerRotater = (RidePassenger)player;
|
|
||||||
playerRotater.cobblemon$setRideXRot(playerRotater.cobblemon$getRideXRot() + f);
|
|
||||||
playerRotater.cobblemon$setRideYRot(playerRotater.cobblemon$getRideYRot() + g);
|
|
||||||
playerRotater.cobblemon$setRideXRot(Mth.clamp(playerRotater.cobblemon$getRideXRot(), -90.0F, 90.0F));
|
|
||||||
if (player.getVehicle() != null) {
|
|
||||||
player.getVehicle().onPassengerTurned(player);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Unique
|
@Unique
|
||||||
private boolean cobblemon$shouldUseAngVelSmoothing() {
|
private boolean cobblemon$shouldUseAngVelSmoothing() {
|
||||||
var player = minecraft.player;
|
var player = minecraft.player;
|
||||||
|
|||||||
@@ -8,24 +8,20 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.mixin.entity;
|
package com.cobblemon.mod.common.mixin.entity;
|
||||||
|
|
||||||
import com.cobblemon.mod.common.OrientationControllable;
|
|
||||||
import com.cobblemon.mod.common.duck.RidePassenger;
|
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
||||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.core.Direction;
|
import net.minecraft.core.Direction;
|
||||||
import net.minecraft.world.entity.Entity;
|
import net.minecraft.world.entity.Entity;
|
||||||
import net.minecraft.world.entity.player.Player;
|
|
||||||
import net.minecraft.world.level.Level;
|
import net.minecraft.world.level.Level;
|
||||||
import net.minecraft.world.phys.Vec3;
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|
||||||
|
|
||||||
@Mixin(Entity.class)
|
@Mixin(Entity.class)
|
||||||
public abstract class EntityMixin {
|
public abstract class EntityMixin {
|
||||||
@@ -61,46 +57,5 @@ public abstract class EntityMixin {
|
|||||||
return original.call(entity);
|
return original.call(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(
|
|
||||||
method = "getEyePosition(F)Lnet/minecraft/world/phys/Vec3;",
|
|
||||||
at = @At("HEAD"),
|
|
||||||
cancellable = true
|
|
||||||
)
|
|
||||||
private void cobblemon$modifyEyePosition_partial(float partialTicks, CallbackInfoReturnable<Vec3> cir) {
|
|
||||||
var entity = (Entity)(Object)this;
|
|
||||||
if (!(entity instanceof Player player)) return;
|
|
||||||
if (!(player instanceof RidePassenger ridePassenger)) return;
|
|
||||||
if (!(player.getVehicle() instanceof OrientationControllable vehicle)) return;
|
|
||||||
var vehicleController = vehicle.getOrientationController();
|
|
||||||
if (vehicleController == null) return;
|
|
||||||
|
|
||||||
// If Orientation is currently being controlled then use the stored eye position from camera positioning.
|
|
||||||
if (vehicleController.getActive() && vehicleController.getOrientation() != null) {
|
|
||||||
// TODO: Determine if it needs partialtick involved.
|
|
||||||
Vec3 customEyePos = ridePassenger.cobblemon$getRideEyePos();
|
|
||||||
cir.setReturnValue(customEyePos);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(
|
|
||||||
method = "getEyePosition()Lnet/minecraft/world/phys/Vec3;",
|
|
||||||
at = @At("HEAD"),
|
|
||||||
cancellable = true
|
|
||||||
)
|
|
||||||
private void cobblemon$modifyEyePosition_noPartial(CallbackInfoReturnable<Vec3> cir) {
|
|
||||||
var entity = (Entity)(Object)this;
|
|
||||||
if (!(entity instanceof Player player)) return;
|
|
||||||
if (!(player instanceof RidePassenger ridePassenger)) return;
|
|
||||||
if (!(player.getVehicle() instanceof OrientationControllable vehicle)) return;
|
|
||||||
var vehicleController = vehicle.getOrientationController();
|
|
||||||
if (vehicleController == null) return;
|
|
||||||
|
|
||||||
// If Orientation is currently being controlled then use the stored eye position from camera positioning.
|
|
||||||
if (vehicleController.getActive() && vehicleController.getOrientation() != null) {
|
|
||||||
// TODO: Determine if it needs partialtick involved.
|
|
||||||
Vec3 customEyePos = ridePassenger.cobblemon$getRideEyePos();
|
|
||||||
cir.setReturnValue(customEyePos);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -83,7 +83,6 @@ import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacke
|
|||||||
import com.cobblemon.mod.common.permission.LaxPermissionValidator
|
import com.cobblemon.mod.common.permission.LaxPermissionValidator
|
||||||
import com.cobblemon.mod.common.platform.events.PlatformEvents
|
import com.cobblemon.mod.common.platform.events.PlatformEvents
|
||||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
import com.cobblemon.mod.common.pokemon.Pokemon
|
||||||
import com.cobblemon.mod.common.pokemon.aspects.CHARACTERISTIC_RAINBOW_ASPECT
|
|
||||||
import com.cobblemon.mod.common.pokemon.aspects.COSMETIC_SLOT_ASPECT
|
import com.cobblemon.mod.common.pokemon.aspects.COSMETIC_SLOT_ASPECT
|
||||||
import com.cobblemon.mod.common.pokemon.aspects.GENDER_ASPECT
|
import com.cobblemon.mod.common.pokemon.aspects.GENDER_ASPECT
|
||||||
import com.cobblemon.mod.common.pokemon.aspects.SHINY_ASPECT
|
import com.cobblemon.mod.common.pokemon.aspects.SHINY_ASPECT
|
||||||
@@ -294,7 +293,6 @@ object Cobblemon {
|
|||||||
SHINY_ASPECT.register()
|
SHINY_ASPECT.register()
|
||||||
GENDER_ASPECT.register()
|
GENDER_ASPECT.register()
|
||||||
COSMETIC_SLOT_ASPECT.register()
|
COSMETIC_SLOT_ASPECT.register()
|
||||||
CHARACTERISTIC_RAINBOW_ASPECT.register()
|
|
||||||
|
|
||||||
SpeciesFeatures.types["choice"] = ChoiceSpeciesFeatureProvider::class.java
|
SpeciesFeatures.types["choice"] = ChoiceSpeciesFeatureProvider::class.java
|
||||||
SpeciesFeatures.types["flag"] = FlagSpeciesFeatureProvider::class.java
|
SpeciesFeatures.types["flag"] = FlagSpeciesFeatureProvider::class.java
|
||||||
|
|||||||
@@ -696,7 +696,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
|
|||||||
@JvmField
|
@JvmField
|
||||||
val SUPERB_REMEDY = compostableItem("superb_remedy", RemedyItem(RemedyItem.SUPERB), 0.85f)
|
val SUPERB_REMEDY = compostableItem("superb_remedy", RemedyItem(RemedyItem.SUPERB), 0.85f)
|
||||||
@JvmField
|
@JvmField
|
||||||
val MOOMOO_MILK = create("moomoo_milk", MoomooMilk(Item.Properties().craftRemainder(Items.GLASS_BOTTLE).stacksTo((16))))
|
val MOOMOO_MILK = create("moomoo_milk", CobblemonItem(Item.Properties().craftRemainder(Items.GLASS_BOTTLE).stacksTo((16))))
|
||||||
|
|
||||||
@JvmField
|
@JvmField
|
||||||
val POTION = create("potion", PotionItem(PotionType.POTION))
|
val POTION = create("potion", PotionItem(PotionType.POTION))
|
||||||
|
|||||||
@@ -15,12 +15,12 @@ import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
|
|||||||
import com.mojang.serialization.Codec
|
import com.mojang.serialization.Codec
|
||||||
import com.mojang.serialization.codecs.ListCodec
|
import com.mojang.serialization.codecs.ListCodec
|
||||||
import com.mojang.serialization.codecs.PrimitiveCodec
|
import com.mojang.serialization.codecs.PrimitiveCodec
|
||||||
import net.minecraft.core.BlockPos
|
|
||||||
import net.minecraft.core.GlobalPos
|
|
||||||
import net.minecraft.core.UUIDUtil
|
import net.minecraft.core.UUIDUtil
|
||||||
import net.minecraft.world.entity.LivingEntity
|
|
||||||
import net.minecraft.world.entity.ai.memory.MemoryModuleType
|
import net.minecraft.world.entity.ai.memory.MemoryModuleType
|
||||||
import java.util.*
|
import java.util.Optional
|
||||||
|
import java.util.UUID
|
||||||
|
import net.minecraft.core.BlockPos
|
||||||
|
import net.minecraft.world.entity.LivingEntity
|
||||||
|
|
||||||
object CobblemonMemories {
|
object CobblemonMemories {
|
||||||
val memories = mutableMapOf<String, MemoryModuleType<*>>()
|
val memories = mutableMapOf<String, MemoryModuleType<*>>()
|
||||||
@@ -48,13 +48,10 @@ object CobblemonMemories {
|
|||||||
val TIME_TRYING_TO_REACH_BERRY_BUSH = register<Int>("time_trying_to_reach_berry_bush")
|
val TIME_TRYING_TO_REACH_BERRY_BUSH = register<Int>("time_trying_to_reach_berry_bush")
|
||||||
val IS_CONSUMING_ITEM = register<Boolean>("is_consuming_item")
|
val IS_CONSUMING_ITEM = register<Boolean>("is_consuming_item")
|
||||||
val RECENTLY_ATE_GRASS = register<Boolean>("recently_ate_grass")
|
val RECENTLY_ATE_GRASS = register<Boolean>("recently_ate_grass")
|
||||||
val HIVE_LOCATION = register<BlockPos>("hive_location", BlockPos.CODEC)
|
val HIVE_LOCATION = register<BlockPos>("hive_location")
|
||||||
val HIVE_BLACKLIST = register<List<BlockPos>>("hive_blacklist")
|
|
||||||
val HIVE_COOLDOWN = register<Boolean>("hive_cooldown")
|
val HIVE_COOLDOWN = register<Boolean>("hive_cooldown")
|
||||||
val NEARBY_FLOWER = register<BlockPos>("nearby_flower", BlockPos.CODEC)
|
val NEARBY_FLOWERS = register<List<BlockPos>>("nearby_flower")
|
||||||
val PATH_TO_NEARBY_FLOWER_COOLDOWN = register<Boolean>("path_to_nearby_flower_cooldown")
|
val POLLINATED = register<Boolean>("pollinated", PrimitiveCodec.BOOL)
|
||||||
val HAS_NECTAR = register<Boolean>("has_nectar", PrimitiveCodec.BOOL)
|
|
||||||
val NEARBY_SACC_LEAVES = register<BlockPos>("nearby_sacc_leaves", BlockPos.CODEC)
|
|
||||||
/** who am i following rn? */
|
/** who am i following rn? */
|
||||||
val HERD_LEADER = register<String>("herd_leader", PrimitiveCodec.STRING)
|
val HERD_LEADER = register<String>("herd_leader", PrimitiveCodec.STRING)
|
||||||
/** how many are following me rn? */
|
/** how many are following me rn? */
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ import com.cobblemon.mod.common.client.net.gui.PokedexUIPacketHandler
|
|||||||
import com.cobblemon.mod.common.client.net.gui.SummaryUIPacketHandler
|
import com.cobblemon.mod.common.client.net.gui.SummaryUIPacketHandler
|
||||||
import com.cobblemon.mod.common.client.net.npc.CloseNPCEditorHandler
|
import com.cobblemon.mod.common.client.net.npc.CloseNPCEditorHandler
|
||||||
import com.cobblemon.mod.common.client.net.npc.OpenNPCEditorHandler
|
import com.cobblemon.mod.common.client.net.npc.OpenNPCEditorHandler
|
||||||
import com.cobblemon.mod.common.client.net.orientation.ClientboundUpdateOrientationHandler
|
import com.cobblemon.mod.common.client.net.orientation.S2CUpdateOrientationHandler
|
||||||
import com.cobblemon.mod.common.client.net.pasture.ClosePastureHandler
|
import com.cobblemon.mod.common.client.net.pasture.ClosePastureHandler
|
||||||
import com.cobblemon.mod.common.client.net.pasture.OpenPastureHandler
|
import com.cobblemon.mod.common.client.net.pasture.OpenPastureHandler
|
||||||
import com.cobblemon.mod.common.client.net.pasture.PokemonPasturedHandler
|
import com.cobblemon.mod.common.client.net.pasture.PokemonPasturedHandler
|
||||||
@@ -179,7 +179,6 @@ import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetNicknamePa
|
|||||||
import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket
|
import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket
|
||||||
import com.cobblemon.mod.common.net.messages.server.riding.DismountPokemonPacket
|
import com.cobblemon.mod.common.net.messages.server.riding.DismountPokemonPacket
|
||||||
import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateDriverInputPacket
|
import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateDriverInputPacket
|
||||||
import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateRiderRotationPacket
|
|
||||||
import com.cobblemon.mod.common.net.messages.server.starter.RequestStarterScreenPacket
|
import com.cobblemon.mod.common.net.messages.server.starter.RequestStarterScreenPacket
|
||||||
import com.cobblemon.mod.common.net.messages.server.storage.SwapPCPartyPokemonPacket
|
import com.cobblemon.mod.common.net.messages.server.storage.SwapPCPartyPokemonPacket
|
||||||
import com.cobblemon.mod.common.net.messages.server.storage.party.MovePartyPokemonPacket
|
import com.cobblemon.mod.common.net.messages.server.storage.party.MovePartyPokemonPacket
|
||||||
@@ -217,7 +216,7 @@ import com.cobblemon.mod.common.net.serverhandling.dialogue.EscapeDialogueHandle
|
|||||||
import com.cobblemon.mod.common.net.serverhandling.dialogue.InputToDialogueHandler
|
import com.cobblemon.mod.common.net.serverhandling.dialogue.InputToDialogueHandler
|
||||||
import com.cobblemon.mod.common.net.serverhandling.evolution.AcceptEvolutionHandler
|
import com.cobblemon.mod.common.net.serverhandling.evolution.AcceptEvolutionHandler
|
||||||
import com.cobblemon.mod.common.net.serverhandling.npc.SaveNPCHandler
|
import com.cobblemon.mod.common.net.serverhandling.npc.SaveNPCHandler
|
||||||
import com.cobblemon.mod.common.net.serverhandling.orientation.ServerboundUpdateOrientationHandler
|
import com.cobblemon.mod.common.net.serverhandling.orientation.OrientationPacketHandler
|
||||||
import com.cobblemon.mod.common.net.serverhandling.pasture.PasturePokemonHandler
|
import com.cobblemon.mod.common.net.serverhandling.pasture.PasturePokemonHandler
|
||||||
import com.cobblemon.mod.common.net.serverhandling.pasture.SetPastureConflictHandler
|
import com.cobblemon.mod.common.net.serverhandling.pasture.SetPastureConflictHandler
|
||||||
import com.cobblemon.mod.common.net.serverhandling.pasture.UnpastureAllPokemonHandler
|
import com.cobblemon.mod.common.net.serverhandling.pasture.UnpastureAllPokemonHandler
|
||||||
@@ -232,7 +231,6 @@ import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetMarkingsHan
|
|||||||
import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetNicknameHandler
|
import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetNicknameHandler
|
||||||
import com.cobblemon.mod.common.net.serverhandling.riding.DismountPokemonPacketHandler
|
import com.cobblemon.mod.common.net.serverhandling.riding.DismountPokemonPacketHandler
|
||||||
import com.cobblemon.mod.common.net.serverhandling.riding.DriverInputPacketHandler
|
import com.cobblemon.mod.common.net.serverhandling.riding.DriverInputPacketHandler
|
||||||
import com.cobblemon.mod.common.net.serverhandling.riding.ServerboundUpdateRiderRotationHandler
|
|
||||||
import com.cobblemon.mod.common.net.serverhandling.starter.RequestStarterScreenHandler
|
import com.cobblemon.mod.common.net.serverhandling.starter.RequestStarterScreenHandler
|
||||||
import com.cobblemon.mod.common.net.serverhandling.starter.SelectStarterPacketHandler
|
import com.cobblemon.mod.common.net.serverhandling.starter.SelectStarterPacketHandler
|
||||||
import com.cobblemon.mod.common.net.serverhandling.storage.BenchMoveHandler
|
import com.cobblemon.mod.common.net.serverhandling.storage.BenchMoveHandler
|
||||||
@@ -444,7 +442,7 @@ object CobblemonNetwork {
|
|||||||
list.add(PacketRegisterInfo(UpdatePastureConflictFlagPacket.ID, UpdatePastureConflictFlagPacket::decode, UpdatePastureConflictFlagHandler))
|
list.add(PacketRegisterInfo(UpdatePastureConflictFlagPacket.ID, UpdatePastureConflictFlagPacket::decode, UpdatePastureConflictFlagHandler))
|
||||||
|
|
||||||
// Orientation
|
// Orientation
|
||||||
list.add(PacketRegisterInfo(ClientboundUpdateOrientationPacket.ID, ClientboundUpdateOrientationPacket::decode, ClientboundUpdateOrientationHandler))
|
list.add(PacketRegisterInfo(ClientboundUpdateOrientationPacket.ID, ClientboundUpdateOrientationPacket::decode, S2CUpdateOrientationHandler))
|
||||||
|
|
||||||
// Behaviours
|
// Behaviours
|
||||||
list.add(PacketRegisterInfo(PlayPosableAnimationPacket.ID, PlayPosableAnimationPacket::decode, PlayPosableAnimationHandler))
|
list.add(PacketRegisterInfo(PlayPosableAnimationPacket.ID, PlayPosableAnimationPacket::decode, PlayPosableAnimationHandler))
|
||||||
@@ -579,14 +577,13 @@ object CobblemonNetwork {
|
|||||||
list.add(PacketRegisterInfo(SaveNPCPacket.ID, SaveNPCPacket::decode, SaveNPCHandler))
|
list.add(PacketRegisterInfo(SaveNPCPacket.ID, SaveNPCPacket::decode, SaveNPCHandler))
|
||||||
|
|
||||||
// Riding packet(s)
|
// Riding packet(s)
|
||||||
list.add(PacketRegisterInfo(ServerboundUpdateOrientationPacket.ID, ServerboundUpdateOrientationPacket::decode, ServerboundUpdateOrientationHandler))
|
list.add(PacketRegisterInfo(ServerboundUpdateOrientationPacket.ID, ServerboundUpdateOrientationPacket::decode, OrientationPacketHandler))
|
||||||
list.add(PacketRegisterInfo(ServerboundUpdateRidingStatePacket.ID, ServerboundUpdateRidingStatePacket::decode, ServerboundUpdateRidingStateHandler))
|
list.add(PacketRegisterInfo(ServerboundUpdateRidingStatePacket.ID, ServerboundUpdateRidingStatePacket::decode, ServerboundUpdateRidingStateHandler))
|
||||||
list.add(PacketRegisterInfo(ServerboundUpdateRidingStatsPacket.ID, ServerboundUpdateRidingStatsPacket::decode, ServerboundUpdateRidingStatsHandler))
|
list.add(PacketRegisterInfo(ServerboundUpdateRidingStatsPacket.ID, ServerboundUpdateRidingStatsPacket::decode, ServerboundUpdateRidingStatsHandler))
|
||||||
list.add(PacketRegisterInfo(ServerboundUpdateRidingStatRangePacket.ID, ServerboundUpdateRidingStatRangePacket::decode, ServerboundUpdateRidingStatRangeHandler))
|
list.add(PacketRegisterInfo(ServerboundUpdateRidingStatRangePacket.ID, ServerboundUpdateRidingStatRangePacket::decode, ServerboundUpdateRidingStatRangeHandler))
|
||||||
list.add(PacketRegisterInfo(ServerboundUpdateRidingSettingsPacket.ID, ServerboundUpdateRidingSettingsPacket::decode, ServerboundUpdateRidingSettingsHandler))
|
list.add(PacketRegisterInfo(ServerboundUpdateRidingSettingsPacket.ID, ServerboundUpdateRidingSettingsPacket::decode, ServerboundUpdateRidingSettingsHandler))
|
||||||
list.add(PacketRegisterInfo(DismountPokemonPacket.ID, DismountPokemonPacket::decode, DismountPokemonPacketHandler))
|
list.add(PacketRegisterInfo(DismountPokemonPacket.ID, DismountPokemonPacket::decode, DismountPokemonPacketHandler))
|
||||||
list.add(PacketRegisterInfo(ServerboundUpdateDriverInputPacket.ID, ServerboundUpdateDriverInputPacket::decode, DriverInputPacketHandler))
|
list.add(PacketRegisterInfo(ServerboundUpdateDriverInputPacket.ID, ServerboundUpdateDriverInputPacket::decode, DriverInputPacketHandler))
|
||||||
list.add(PacketRegisterInfo(ServerboundUpdateRiderRotationPacket.ID, ServerboundUpdateRiderRotationPacket::decode, ServerboundUpdateRiderRotationHandler))
|
|
||||||
|
|
||||||
// Cooking
|
// Cooking
|
||||||
list.add(PacketRegisterInfo(ToggleCookingPotLidPacket.ID, ToggleCookingPotLidPacket::decode, ToggleCookingPotLidHandler))
|
list.add(PacketRegisterInfo(ToggleCookingPotLidPacket.ID, ToggleCookingPotLidPacket::decode, ToggleCookingPotLidHandler))
|
||||||
|
|||||||
@@ -26,6 +26,8 @@ object CobblemonPoiTypes: PlatformRegistry<Registry<PoiType>, ResourceKey<Regist
|
|||||||
@JvmField
|
@JvmField
|
||||||
val NURSE_KEY = createKey("nurse", CobblemonBlocks.HEALING_MACHINE, 1, 1)
|
val NURSE_KEY = createKey("nurse", CobblemonBlocks.HEALING_MACHINE, 1, 1)
|
||||||
@JvmField
|
@JvmField
|
||||||
|
val POKE_SNACK_KEY = createKey("poke_snack", CobblemonBlocks.POKE_SNACK, 0, 1)
|
||||||
|
@JvmField
|
||||||
val SACCHARINE_LOG_SLATHERED_KEY = createKey("saccharine_log_slathered", CobblemonBlocks.SACCHARINE_LOG_SLATHERED, 0, 1)
|
val SACCHARINE_LOG_SLATHERED_KEY = createKey("saccharine_log_slathered", CobblemonBlocks.SACCHARINE_LOG_SLATHERED, 0, 1)
|
||||||
// TODO after 1.7
|
// TODO after 1.7
|
||||||
// @JvmField
|
// @JvmField
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ import com.cobblemon.mod.common.api.riding.behaviour.types.land.VehicleSettings
|
|||||||
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.BoatSettings
|
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.BoatSettings
|
||||||
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.BurstSettings
|
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.BurstSettings
|
||||||
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.DolphinSettings
|
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.DolphinSettings
|
||||||
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.SubmarineSettings
|
|
||||||
import com.cobblemon.mod.common.net.messages.client.data.RideSettingsSyncPacket
|
import com.cobblemon.mod.common.net.messages.client.data.RideSettingsSyncPacket
|
||||||
import com.cobblemon.mod.common.util.adapters.ExpressionAdapter
|
import com.cobblemon.mod.common.util.adapters.ExpressionAdapter
|
||||||
import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
|
import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
|
||||||
@@ -64,7 +63,6 @@ object CobblemonRideSettings : DataRegistry {
|
|||||||
var boat = BoatSettings()
|
var boat = BoatSettings()
|
||||||
var burst = BurstSettings()
|
var burst = BurstSettings()
|
||||||
var dolphin = DolphinSettings()
|
var dolphin = DolphinSettings()
|
||||||
var submarine = SubmarineSettings()
|
|
||||||
|
|
||||||
override fun sync(player: ServerPlayer) {
|
override fun sync(player: ServerPlayer) {
|
||||||
player.sendPacket(
|
player.sendPacket(
|
||||||
@@ -80,8 +78,7 @@ object CobblemonRideSettings : DataRegistry {
|
|||||||
vehicle = vehicle,
|
vehicle = vehicle,
|
||||||
boat = boat,
|
boat = boat,
|
||||||
burst = burst,
|
burst = burst,
|
||||||
dolphin = dolphin,
|
dolphin = dolphin
|
||||||
submarine = submarine
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -99,7 +96,6 @@ object CobblemonRideSettings : DataRegistry {
|
|||||||
boat = loadStyle(manager, "boat", BoatSettings::class.java)
|
boat = loadStyle(manager, "boat", BoatSettings::class.java)
|
||||||
burst = loadStyle(manager, "burst", BurstSettings::class.java)
|
burst = loadStyle(manager, "burst", BurstSettings::class.java)
|
||||||
dolphin = loadStyle(manager, "dolphin", DolphinSettings::class.java)
|
dolphin = loadStyle(manager, "dolphin", DolphinSettings::class.java)
|
||||||
submarine = loadStyle(manager, "submarine", SubmarineSettings::class.java)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun <T : RidingBehaviourSettings> loadStyle(manager: ResourceManager, name: String, clazz: Class<T>): T {
|
private fun <T : RidingBehaviourSettings> loadStyle(manager: ResourceManager, name: String, clazz: Class<T>): T {
|
||||||
|
|||||||
@@ -41,8 +41,6 @@ object CobblemonSensors {
|
|||||||
|
|
||||||
val POKEMON_NEARBY_WANTED_ITEM = register("pokemon_nearby_wanted_item", ::PokemonItemSensor)
|
val POKEMON_NEARBY_WANTED_ITEM = register("pokemon_nearby_wanted_item", ::PokemonItemSensor)
|
||||||
|
|
||||||
val NEARBY_SACC_LEAVES = register("nearby_sacc_leaves", ::SacLeavesSensor)
|
|
||||||
|
|
||||||
fun <E : Entity, U : Sensor<E>> register(id: String, supplier: Supplier<U>): SensorType<U> {
|
fun <E : Entity, U : Sensor<E>> register(id: String, supplier: Supplier<U>): SensorType<U> {
|
||||||
val sensor = SensorType(supplier)
|
val sensor = SensorType(supplier)
|
||||||
sensors[id] = sensor
|
sensors[id] = sensor
|
||||||
|
|||||||
+4
-5
@@ -22,19 +22,18 @@ class ReelInPokemonContext(val species : ResourceLocation, val baitId: ResourceL
|
|||||||
class ReelInPokemonCriterionCondition(
|
class ReelInPokemonCriterionCondition(
|
||||||
playerCtx: Optional<ContextAwarePredicate>,
|
playerCtx: Optional<ContextAwarePredicate>,
|
||||||
val species: String,
|
val species: String,
|
||||||
val baitId: String // also allows "cobblemon:empty_bait" to indicate that no bait is allowed for this criterion to match
|
val baitId: String
|
||||||
) : SimpleCriterionCondition<ReelInPokemonContext>(playerCtx) {
|
) : SimpleCriterionCondition<ReelInPokemonContext>(playerCtx) {
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
val CODEC: Codec<ReelInPokemonCriterionCondition> = RecordCodecBuilder.create { it.group(
|
val CODEC: Codec<ReelInPokemonCriterionCondition> = RecordCodecBuilder.create { it.group(
|
||||||
EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter { it.playerCtx },
|
EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter { it.playerCtx },
|
||||||
Codec.STRING.optionalFieldOf("species", "any").forGetter { it.species },
|
Codec.STRING.optionalFieldOf("species", "any").forGetter { it.species },
|
||||||
Codec.STRING.optionalFieldOf("baitId", "any").forGetter { it.baitId }
|
Codec.STRING.optionalFieldOf("baitId", "empty_bait").forGetter { it.baitId }
|
||||||
).apply(it, { playerCtx, pokemonId, baitId -> ReelInPokemonCriterionCondition(playerCtx, pokemonId, baitId) }) }
|
).apply(it, { playerCtx, pokemonId, baitId -> ReelInPokemonCriterionCondition(playerCtx, pokemonId, baitId.ifEmpty { "empty_bait" }) }) }
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun matches(player: ServerPlayer, context: ReelInPokemonContext): Boolean {
|
override fun matches(player: ServerPlayer, context: ReelInPokemonContext): Boolean {
|
||||||
return (context.species == this.species.asIdentifierDefaultingNamespace() || this.species == "any")
|
return (context.species == this.species.asIdentifierDefaultingNamespace() || this.species == "any") && (context.baitId == this.baitId.asIdentifierDefaultingNamespace() || this.baitId == "empty_bait")
|
||||||
&& (context.baitId == this.baitId.asIdentifierDefaultingNamespace() || this.baitId == "any")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.api.ai
|
|
||||||
|
|
||||||
import net.minecraft.server.level.ServerLevel
|
|
||||||
import net.minecraft.world.entity.LivingEntity
|
|
||||||
import net.minecraft.world.entity.ai.behavior.Behavior
|
|
||||||
import net.minecraft.world.entity.ai.memory.MemoryModuleType
|
|
||||||
import net.minecraft.world.entity.ai.memory.MemoryStatus
|
|
||||||
import net.minecraft.world.entity.schedule.Activity
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A [Behavior] subclass that represents tasks that check that the entity is still in one
|
|
||||||
* of the activities that this task is part of. If the entity is no longer doing any of those
|
|
||||||
* activities, the task will be interrupted and you can handle any cleanup in [onInterrupted].
|
|
||||||
*
|
|
||||||
* @author Hiroku
|
|
||||||
* @since October 17th, 2025
|
|
||||||
*/
|
|
||||||
abstract class ActivityAwareBehavior<E : LivingEntity> : Behavior<E> {
|
|
||||||
constructor(entryCondition: Map<MemoryModuleType<*>, MemoryStatus>) : super(entryCondition)
|
|
||||||
constructor(entryCondition: Map<MemoryModuleType<*>, MemoryStatus>, duration: Int) : super(entryCondition, duration)
|
|
||||||
constructor(entryCondition: Map<MemoryModuleType<*>, MemoryStatus>, minDuration: Int, maxDuration: Int) : super(entryCondition, minDuration, maxDuration)
|
|
||||||
|
|
||||||
val activities: MutableSet<Activity> = mutableSetOf()
|
|
||||||
|
|
||||||
fun isStillDoingActivity(entity: E): Boolean {
|
|
||||||
return activities.any(entity.brain::isActive)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun canStillUse(level: ServerLevel, entity: E, gameTime: Long) = isStillDoingActivity(entity)
|
|
||||||
|
|
||||||
open fun onInterrupted(level: ServerLevel, entity: E, gameTime: Long) {
|
|
||||||
// No-op
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun stop(level: ServerLevel, entity: E, gameTime: Long) {
|
|
||||||
super.stop(level, entity, gameTime)
|
|
||||||
if (!isStillDoingActivity(entity)) {
|
|
||||||
onInterrupted(level, entity, gameTime)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+1
-7
@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.api.ai
|
|||||||
import com.google.common.collect.ImmutableList
|
import com.google.common.collect.ImmutableList
|
||||||
import com.mojang.datafixers.util.Pair
|
import com.mojang.datafixers.util.Pair
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
|
import net.minecraft.world.entity.Mob
|
||||||
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
||||||
import net.minecraft.world.entity.schedule.Activity
|
import net.minecraft.world.entity.schedule.Activity
|
||||||
|
|
||||||
@@ -22,13 +23,6 @@ class ActivityConfigurationContext(val activity: Activity) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun apply(entity: LivingEntity) {
|
fun apply(entity: LivingEntity) {
|
||||||
tasks.forEach {
|
|
||||||
val activityAwareBehavior = it.second as? ActivityAwareBehavior<*>
|
|
||||||
?: (it.second as? WrapperLivingEntityTask<*>)?.task as? ActivityAwareBehavior
|
|
||||||
?: return@forEach
|
|
||||||
activityAwareBehavior.activities += activity
|
|
||||||
}
|
|
||||||
|
|
||||||
entity.brain.addActivity(activity, ImmutableList.copyOf(tasks))
|
entity.brain.addActivity(activity, ImmutableList.copyOf(tasks))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -23,7 +23,7 @@ import net.minecraft.world.entity.schedule.Activity
|
|||||||
|
|
||||||
class ActivityChangeTaskConfig : SingleTaskConfig {
|
class ActivityChangeTaskConfig : SingleTaskConfig {
|
||||||
val activity: Activity = Activity.IDLE
|
val activity: Activity = Activity.IDLE
|
||||||
val condition: ExpressionLike = "true".asExpressionLike()
|
val condition: ExpressionLike = "false".asExpressionLike()
|
||||||
|
|
||||||
override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext): List<MoLangConfigVariable> = emptyList()
|
override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext): List<MoLangConfigVariable> = emptyList()
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -17,7 +17,6 @@ import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
|
|||||||
import com.cobblemon.mod.common.api.ai.asVariables
|
import com.cobblemon.mod.common.api.ai.asVariables
|
||||||
import com.cobblemon.mod.common.entity.npc.NPCEntity
|
import com.cobblemon.mod.common.entity.npc.NPCEntity
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||||
import com.cobblemon.mod.common.util.getMemorySafely
|
|
||||||
import com.cobblemon.mod.common.util.resolveString
|
import com.cobblemon.mod.common.util.resolveString
|
||||||
import com.mojang.datafixers.util.Either
|
import com.mojang.datafixers.util.Either
|
||||||
import net.minecraft.server.level.ServerLevel
|
import net.minecraft.server.level.ServerLevel
|
||||||
@@ -63,7 +62,7 @@ class MemoryAspectTaskConfig : SingleTaskConfig {
|
|||||||
override fun canStillUse(level: ServerLevel, entity: LivingEntity, gameTime: Long) = true
|
override fun canStillUse(level: ServerLevel, entity: LivingEntity, gameTime: Long) = true
|
||||||
|
|
||||||
override fun tick(level: ServerLevel, owner: LivingEntity, gameTime: Long) {
|
override fun tick(level: ServerLevel, owner: LivingEntity, gameTime: Long) {
|
||||||
val hasMemory = owner.brain.hasMemoryValue(memory)
|
val hasMemory = !owner.brain.hasMemoryValue(memory)
|
||||||
if (owner is PokemonEntity) {
|
if (owner is PokemonEntity) {
|
||||||
if (!hasMemory && aspect in owner.pokemon.forcedAspects) {
|
if (!hasMemory && aspect in owner.pokemon.forcedAspects) {
|
||||||
owner.pokemon.forcedAspects -= aspect
|
owner.pokemon.forcedAspects -= aspect
|
||||||
|
|||||||
+1
-1
@@ -38,7 +38,7 @@ class MoveToOwnerTaskConfig : SingleTaskConfig {
|
|||||||
override fun createTask(
|
override fun createTask(
|
||||||
entity: LivingEntity,
|
entity: LivingEntity,
|
||||||
behaviourConfigurationContext: BehaviourConfigurationContext
|
behaviourConfigurationContext: BehaviourConfigurationContext
|
||||||
): BehaviorControl<in LivingEntity> {
|
): BehaviorControl<in LivingEntity>? {
|
||||||
behaviourConfigurationContext.addMemories(
|
behaviourConfigurationContext.addMemories(
|
||||||
MemoryModuleType.WALK_TARGET,
|
MemoryModuleType.WALK_TARGET,
|
||||||
MemoryModuleType.LOOK_TARGET
|
MemoryModuleType.LOOK_TARGET
|
||||||
|
|||||||
+2
-118
@@ -8,31 +8,16 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.api.ai.config.task
|
package com.cobblemon.mod.common.api.ai.config.task
|
||||||
|
|
||||||
import com.cobblemon.mod.common.CobblemonMemories
|
|
||||||
import com.cobblemon.mod.common.CobblemonSensors
|
|
||||||
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
||||||
import com.cobblemon.mod.common.api.ai.asVariables
|
import com.cobblemon.mod.common.api.ai.asVariables
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||||
import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PlaceHoneyInHiveTask
|
import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToBeeHiveTask
|
||||||
import com.cobblemon.mod.common.util.distanceTo
|
|
||||||
import com.cobblemon.mod.common.util.getMemorySafely
|
|
||||||
import net.minecraft.core.BlockPos
|
|
||||||
import net.minecraft.server.level.ServerLevel
|
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
import net.minecraft.world.entity.PathfinderMob
|
|
||||||
import net.minecraft.world.entity.ai.behavior.Behavior
|
|
||||||
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
||||||
import net.minecraft.world.entity.ai.behavior.BlockPosTracker
|
|
||||||
import net.minecraft.world.entity.ai.memory.MemoryModuleType
|
|
||||||
import net.minecraft.world.entity.ai.memory.MemoryStatus
|
|
||||||
import net.minecraft.world.entity.ai.memory.WalkTarget
|
|
||||||
import net.minecraft.world.phys.Vec3
|
|
||||||
|
|
||||||
class PathToBeeHiveTaskConfig : SingleTaskConfig {
|
class PathToBeeHiveTaskConfig : SingleTaskConfig {
|
||||||
companion object {
|
companion object {
|
||||||
const val HONEY = "honey"
|
const val HONEY = "honey"
|
||||||
const val STAY_OUT_OF_HIVE_COOLDOWN = 400
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val condition = booleanVariable(HONEY, "can_add_honey", true).asExpressible()
|
val condition = booleanVariable(HONEY, "can_add_honey", true).asExpressible()
|
||||||
@@ -51,107 +36,6 @@ class PathToBeeHiveTaskConfig : SingleTaskConfig {
|
|||||||
if (!checkCondition(behaviourConfigurationContext.runtime, condition)) {
|
if (!checkCondition(behaviourConfigurationContext.runtime, condition)) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
behaviourConfigurationContext.addSensors(CobblemonSensors.NEARBY_BEE_HIVE)
|
return PathToBeeHiveTask.create()
|
||||||
return object : Behavior<LivingEntity>(
|
|
||||||
mapOf(
|
|
||||||
MemoryModuleType.LOOK_TARGET to MemoryStatus.REGISTERED,
|
|
||||||
MemoryModuleType.WALK_TARGET to MemoryStatus.VALUE_ABSENT,
|
|
||||||
CobblemonMemories.HAS_NECTAR to MemoryStatus.REGISTERED,
|
|
||||||
CobblemonMemories.HIVE_LOCATION to MemoryStatus.VALUE_PRESENT,
|
|
||||||
CobblemonMemories.HIVE_COOLDOWN to MemoryStatus.VALUE_ABSENT,
|
|
||||||
CobblemonMemories.HIVE_BLACKLIST to MemoryStatus.REGISTERED,
|
|
||||||
),
|
|
||||||
400,
|
|
||||||
400
|
|
||||||
) {
|
|
||||||
|
|
||||||
val maxTicks = 400
|
|
||||||
var traveledTicks = 0
|
|
||||||
|
|
||||||
override fun checkExtraStartConditions(level: ServerLevel, owner: LivingEntity): Boolean {
|
|
||||||
return (owner is PathfinderMob && owner.isAlive && (owner is PokemonEntity && PlaceHoneyInHiveTask.wantsToEnterHive(owner))) && owner.brain.checkMemory(
|
|
||||||
MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun canStillUse(level: ServerLevel, entity: LivingEntity, gameTime: Long): Boolean {
|
|
||||||
if (maxTicks >= traveledTicks) return false
|
|
||||||
val pos = entity.brain.getMemory(CobblemonMemories.HIVE_LOCATION)
|
|
||||||
return !pos.isEmpty && entity.distanceTo(pos.get()) > 1.0
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun start(level: ServerLevel, entity: LivingEntity, gameTime: Long) {
|
|
||||||
super.start(level, entity, gameTime)
|
|
||||||
val hiveLocation = entity.brain.getMemorySafely(CobblemonMemories.HIVE_LOCATION).orElse(null)
|
|
||||||
val world = entity.level()
|
|
||||||
val sidesByClosest = listOf(
|
|
||||||
hiveLocation.north(),
|
|
||||||
hiveLocation.south(),
|
|
||||||
hiveLocation.east(),
|
|
||||||
hiveLocation.west()
|
|
||||||
).sortedBy { it.distSqr(entity.blockPosition()) }
|
|
||||||
|
|
||||||
var openSide = BlockPos.ZERO
|
|
||||||
for (side in sidesByClosest) {
|
|
||||||
if (world.getBlockState(side).isAir) {
|
|
||||||
openSide = side
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (openSide == BlockPos.ZERO) {
|
|
||||||
if (world.getBlockState(hiveLocation.above()).isAir) {
|
|
||||||
// If the above position is also air, we can use it
|
|
||||||
openSide = hiveLocation.above() // Fallback to above if no open sides found
|
|
||||||
} else if (world.getBlockState(hiveLocation.below()).isAir) {
|
|
||||||
// If the below position is also air, we can use it
|
|
||||||
openSide = hiveLocation.below() // Fallback to below if no open sides found
|
|
||||||
} else {
|
|
||||||
// If no open sides or above/below positions are found, we cannot proceed
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
val targetVec = Vec3.atCenterOf(openSide)
|
|
||||||
|
|
||||||
// Set path target toward hive
|
|
||||||
if (pathfindDirectlyTowards(openSide, entity)) {
|
|
||||||
entity.brain.setMemory(MemoryModuleType.WALK_TARGET,WalkTarget(targetVec, 0.35F, 0))
|
|
||||||
entity.brain.setMemory(MemoryModuleType.LOOK_TARGET,BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
|
|
||||||
traveledTicks = 0
|
|
||||||
} else {
|
|
||||||
dropAndBlackListHive(entity)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun tick(level: ServerLevel, owner: LivingEntity, gameTime: Long) {
|
|
||||||
traveledTicks++
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun stop(level: ServerLevel, entity: LivingEntity, gameTime: Long) {
|
|
||||||
if (maxTicks < traveledTicks) {
|
|
||||||
dropAndBlackListHive(entity)
|
|
||||||
entity.brain.setMemoryWithExpiry(CobblemonMemories.HIVE_COOLDOWN, true, 100)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun dropAndBlackListHive(entity: LivingEntity) {
|
|
||||||
val hivePos = entity.brain.getMemorySafely(CobblemonMemories.HIVE_LOCATION).orElse(null)
|
|
||||||
if (hivePos == null) return
|
|
||||||
val blackList = entity.brain.getMemorySafely(CobblemonMemories.HIVE_BLACKLIST).orElse(emptyList()).toMutableList()
|
|
||||||
|
|
||||||
blackList.add(hivePos)
|
|
||||||
if (blackList.count() > 3) {
|
|
||||||
blackList.removeFirst()
|
|
||||||
}
|
|
||||||
entity.brain.eraseMemory(CobblemonMemories.HIVE_LOCATION)
|
|
||||||
entity.brain.setMemory(CobblemonMemories.HIVE_BLACKLIST, blackList)
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun pathfindDirectlyTowards(pos: BlockPos, entity: LivingEntity): Boolean {
|
|
||||||
if (entity !is PathfinderMob) return false
|
|
||||||
val nav = entity.navigation
|
|
||||||
val path = nav. createPath(pos, 0)
|
|
||||||
return path != null && path.canReach()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+4
-5
@@ -8,6 +8,7 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.api.ai.config.task
|
package com.cobblemon.mod.common.api.ai.config.task
|
||||||
|
|
||||||
|
import com.bedrockk.molang.runtime.MoLangRuntime
|
||||||
import com.cobblemon.mod.common.CobblemonMemories
|
import com.cobblemon.mod.common.CobblemonMemories
|
||||||
import com.cobblemon.mod.common.CobblemonSensors
|
import com.cobblemon.mod.common.CobblemonSensors
|
||||||
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
||||||
@@ -40,14 +41,12 @@ class PathToFlowerTaskConfig : SingleTaskConfig {
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
behaviourConfigurationContext.addMemories(
|
behaviourConfigurationContext.addMemories(
|
||||||
CobblemonMemories.NEARBY_FLOWER,
|
CobblemonMemories.NEARBY_FLOWERS,
|
||||||
CobblemonMemories.PATH_TO_NEARBY_FLOWER_COOLDOWN,
|
|
||||||
CobblemonMemories.HIVE_COOLDOWN,
|
CobblemonMemories.HIVE_COOLDOWN,
|
||||||
CobblemonMemories.HIVE_LOCATION,
|
CobblemonMemories.HIVE_LOCATION,
|
||||||
CobblemonMemories.HIVE_BLACKLIST,
|
CobblemonMemories.POLLINATED
|
||||||
CobblemonMemories.HAS_NECTAR,
|
|
||||||
)
|
)
|
||||||
behaviourConfigurationContext.addSensors(CobblemonSensors.NEARBY_FLOWER)
|
behaviourConfigurationContext.addSensors(CobblemonSensors.NEARBY_BEE_HIVE, CobblemonSensors.NEARBY_FLOWER)
|
||||||
return PathToFlowerTask.create()
|
return PathToFlowerTask.create()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-49
@@ -1,49 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.api.ai.config.task
|
|
||||||
|
|
||||||
import com.cobblemon.mod.common.CobblemonMemories
|
|
||||||
import com.cobblemon.mod.common.CobblemonSensors
|
|
||||||
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
|
||||||
import com.cobblemon.mod.common.api.ai.asVariables
|
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
|
||||||
import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToSacLeafTask
|
|
||||||
import net.minecraft.world.entity.LivingEntity
|
|
||||||
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
|
||||||
|
|
||||||
class PathToSaccLeavesTaskConfig : SingleTaskConfig {
|
|
||||||
companion object {
|
|
||||||
const val POLLINATE = "pollinate"
|
|
||||||
}
|
|
||||||
|
|
||||||
val condition = booleanVariable(POLLINATE, "can_pollinate", true).asExpressible()
|
|
||||||
|
|
||||||
override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) = listOf(
|
|
||||||
condition
|
|
||||||
).asVariables()
|
|
||||||
|
|
||||||
override fun createTask(
|
|
||||||
entity: LivingEntity,
|
|
||||||
behaviourConfigurationContext: BehaviourConfigurationContext
|
|
||||||
): BehaviorControl<in LivingEntity>? {
|
|
||||||
if (entity !is PokemonEntity) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!checkCondition(behaviourConfigurationContext.runtime, condition)) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
behaviourConfigurationContext.addMemories(
|
|
||||||
CobblemonMemories.NEARBY_SACC_LEAVES,
|
|
||||||
CobblemonMemories.HAS_NECTAR
|
|
||||||
)
|
|
||||||
behaviourConfigurationContext.addSensors(CobblemonSensors.NEARBY_SACC_LEAVES, CobblemonSensors.NEARBY_FLOWER)
|
|
||||||
return PathToSacLeafTask.create()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+2
-5
@@ -8,8 +8,8 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.api.ai.config.task
|
package com.cobblemon.mod.common.api.ai.config.task
|
||||||
|
|
||||||
|
import com.bedrockk.molang.runtime.MoLangRuntime
|
||||||
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
||||||
import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
|
|
||||||
import com.cobblemon.mod.common.api.ai.asVariables
|
import com.cobblemon.mod.common.api.ai.asVariables
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||||
import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PlaceHoneyInHiveTask
|
import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PlaceHoneyInHiveTask
|
||||||
@@ -37,9 +37,6 @@ class PlaceHoneyInHiveTaskConfig : SingleTaskConfig {
|
|||||||
if (!checkCondition(behaviourConfigurationContext.runtime, condition)) {
|
if (!checkCondition(behaviourConfigurationContext.runtime, condition)) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
return WrapperLivingEntityTask(
|
return PlaceHoneyInHiveTask.create()
|
||||||
PlaceHoneyInHiveTask.create(),
|
|
||||||
PokemonEntity::class.java
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-130
@@ -1,130 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.api.ai.config.task
|
|
||||||
|
|
||||||
import com.cobblemon.mod.common.CobblemonActivities
|
|
||||||
import com.cobblemon.mod.common.CobblemonBlocks
|
|
||||||
import com.cobblemon.mod.common.CobblemonMemories
|
|
||||||
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
|
||||||
import com.cobblemon.mod.common.api.ai.asVariables
|
|
||||||
import com.cobblemon.mod.common.block.SaccharineLeafBlock
|
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
|
||||||
import com.cobblemon.mod.common.util.getMemorySafely
|
|
||||||
import net.minecraft.server.level.ServerLevel
|
|
||||||
import net.minecraft.sounds.SoundEvents
|
|
||||||
import net.minecraft.world.entity.LivingEntity
|
|
||||||
import net.minecraft.world.entity.ai.behavior.Behavior
|
|
||||||
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
|
||||||
import net.minecraft.world.entity.ai.memory.MemoryModuleType
|
|
||||||
import net.minecraft.world.entity.ai.memory.MemoryStatus
|
|
||||||
import net.minecraft.world.phys.Vec3
|
|
||||||
|
|
||||||
class PlaceHoneyInSaccLeavesTaskConfig : SingleTaskConfig {
|
|
||||||
companion object {
|
|
||||||
const val POLLINATE = "pollinate"
|
|
||||||
const val MIN_DURATION : Int = 300
|
|
||||||
const val MAX_DURATION : Int = 400
|
|
||||||
const val REQUIRED_SUCCESSFUL_POLLINATION_TICKS = 250
|
|
||||||
}
|
|
||||||
|
|
||||||
val condition = booleanVariable(POLLINATE, "can_pollinate", true).asExpressible()
|
|
||||||
|
|
||||||
override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) = listOf(
|
|
||||||
condition
|
|
||||||
).asVariables()
|
|
||||||
|
|
||||||
override fun createTask(
|
|
||||||
entity: LivingEntity,
|
|
||||||
behaviourConfigurationContext: BehaviourConfigurationContext
|
|
||||||
): BehaviorControl<in LivingEntity>? {
|
|
||||||
if (entity !is PokemonEntity) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
if (!checkCondition(behaviourConfigurationContext.runtime, condition)) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
return object : Behavior<LivingEntity>(
|
|
||||||
mapOf(
|
|
||||||
CobblemonMemories.NEARBY_SACC_LEAVES to MemoryStatus.VALUE_PRESENT,
|
|
||||||
MemoryModuleType.WALK_TARGET to MemoryStatus.VALUE_ABSENT,
|
|
||||||
CobblemonMemories.HAS_NECTAR to MemoryStatus.VALUE_PRESENT,
|
|
||||||
),
|
|
||||||
MIN_DURATION,
|
|
||||||
MAX_DURATION
|
|
||||||
) {
|
|
||||||
var successfulPollinationTicks = 0
|
|
||||||
var lastSoundPlayedTick = 0
|
|
||||||
var hoverPos: Vec3? = null
|
|
||||||
|
|
||||||
override fun checkExtraStartConditions(level: ServerLevel, owner: LivingEntity): Boolean {
|
|
||||||
if (level.isNight || level.isRaining || !(entity.brain.getMemorySafely(CobblemonMemories.HAS_NECTAR).orElse(false))) return false
|
|
||||||
val optionalBlockPos = entity.brain.getMemorySafely(CobblemonMemories.NEARBY_SACC_LEAVES)
|
|
||||||
if (!optionalBlockPos.isPresent || level.getBlockState(optionalBlockPos.get()).block != CobblemonBlocks.SACCHARINE_LEAVES) return false
|
|
||||||
return Vec3.atCenterOf(optionalBlockPos.get()).distanceTo(entity.position()) <= 0.6
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun canStillUse(level: ServerLevel, entity: LivingEntity, gameTime: Long): Boolean {
|
|
||||||
return checkExtraStartConditions(level, entity) && entity.brain.activeActivities.indexOf(
|
|
||||||
CobblemonActivities.POKEMON_POLLINATION) != -1
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun start(level: ServerLevel, entity: LivingEntity, gameTime: Long) {
|
|
||||||
super.start(level, entity, gameTime)
|
|
||||||
hoverPos = null
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun tick(level: ServerLevel, owner: LivingEntity, gameTime: Long) {
|
|
||||||
++successfulPollinationTicks
|
|
||||||
if (entity.random.nextFloat() < 0.05f && successfulPollinationTicks > this.lastSoundPlayedTick + 60) {
|
|
||||||
this.lastSoundPlayedTick = successfulPollinationTicks
|
|
||||||
entity.playSound(SoundEvents.BEEHIVE_DRIP, 1.0f, 1.0f)
|
|
||||||
}
|
|
||||||
val leavesPos = entity.brain.getMemorySafely(CobblemonMemories.NEARBY_SACC_LEAVES).orElse(null)
|
|
||||||
|
|
||||||
val bl = hoverPos == null || entity.position().distanceTo(hoverPos!!) <= 0.1
|
|
||||||
val bl3 = entity.random.nextInt(40) == 0
|
|
||||||
if (bl && bl3) {
|
|
||||||
// mimics the wriggling over a flower the vanilla bees do
|
|
||||||
if (hoverPos == null) {
|
|
||||||
hoverPos = leavesPos.bottomCenter.add(0.0, 0.4, 0.0)
|
|
||||||
}
|
|
||||||
if (leavesPos != null) {
|
|
||||||
hoverPos = leavesPos.bottomCenter.add(Vec3((entity.random.nextDouble() * 2.0 - 1.0) * (1.0/5.0), 0.3 + (entity.random.nextDouble() * 2.0 - 1.0) * (1.0/7.0), (entity.random.nextDouble() * 2.0 - 1.0) * (1.0/5.0)))
|
|
||||||
entity.getMoveControl()
|
|
||||||
.setWantedPosition(hoverPos!!.x(), hoverPos!!.y(), hoverPos!!.z(), 0.35)
|
|
||||||
entity.lookControl.setLookAt(leavesPos.bottomCenter.add(0.0,0.5,0.0))
|
|
||||||
}
|
|
||||||
} else if (!bl) {
|
|
||||||
entity.getMoveControl()
|
|
||||||
.setWantedPosition(hoverPos!!.x(), hoverPos!!.y(), hoverPos!!.z(), 0.35)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun stop(level: ServerLevel, entity: LivingEntity, gameTime: Long) {
|
|
||||||
if (successfulPollinationTicks > REQUIRED_SUCCESSFUL_POLLINATION_TICKS) {
|
|
||||||
val blockPos = entity.brain.getMemorySafely(CobblemonMemories.NEARBY_SACC_LEAVES).orElse(null)
|
|
||||||
blockPos?.let {
|
|
||||||
val blockState = level.getBlockState(blockPos)
|
|
||||||
if (blockState.block == CobblemonBlocks.SACCHARINE_LEAVES) {
|
|
||||||
val saccAge = blockState.getValue( SaccharineLeafBlock.AGE)
|
|
||||||
if (saccAge < SaccharineLeafBlock.MAX_AGE) {
|
|
||||||
entity.brain.eraseMemory(CobblemonMemories.HAS_NECTAR)
|
|
||||||
val newBlockState = blockState.setValue(SaccharineLeafBlock.AGE, saccAge + 1)
|
|
||||||
level.setBlock(blockPos, newBlockState, 3)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
successfulPollinationTicks = 0
|
|
||||||
entity.brain.eraseMemory(MemoryModuleType.WALK_TARGET)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+24
-52
@@ -8,14 +8,17 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.api.ai.config.task
|
package com.cobblemon.mod.common.api.ai.config.task
|
||||||
|
|
||||||
import com.cobblemon.mod.common.CobblemonActivities
|
|
||||||
import com.cobblemon.mod.common.CobblemonMemories
|
import com.cobblemon.mod.common.CobblemonMemories
|
||||||
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
|
||||||
|
import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
|
||||||
import com.cobblemon.mod.common.api.ai.asVariables
|
import com.cobblemon.mod.common.api.ai.asVariables
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||||
|
import com.cobblemon.mod.common.util.asExpression
|
||||||
import com.cobblemon.mod.common.util.getMemorySafely
|
import com.cobblemon.mod.common.util.getMemorySafely
|
||||||
|
import com.cobblemon.mod.common.util.sendParticlesServer
|
||||||
|
import com.mojang.datafixers.util.Either
|
||||||
|
import net.minecraft.core.particles.ParticleTypes
|
||||||
import net.minecraft.server.level.ServerLevel
|
import net.minecraft.server.level.ServerLevel
|
||||||
import net.minecraft.sounds.SoundEvents
|
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
import net.minecraft.world.entity.ai.behavior.Behavior
|
import net.minecraft.world.entity.ai.behavior.Behavior
|
||||||
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
import net.minecraft.world.entity.ai.behavior.BehaviorControl
|
||||||
@@ -26,11 +29,10 @@ import net.minecraft.world.phys.Vec3
|
|||||||
class PollinateFlowerTaskConfig : SingleTaskConfig {
|
class PollinateFlowerTaskConfig : SingleTaskConfig {
|
||||||
companion object {
|
companion object {
|
||||||
const val POLLINATE = "pollinate"
|
const val POLLINATE = "pollinate"
|
||||||
const val PATH_TO_FLOWER_COOLDOWN_TICKS : Long = 200
|
|
||||||
const val HAS_NECTAR_ASPECT = "has_nectar"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val condition = booleanVariable(POLLINATE, "can_pollinate", true).asExpressible()
|
val condition = booleanVariable(POLLINATE, "can_pollinate", true).asExpressible()
|
||||||
|
val durationTicks: ExpressionOrEntityVariable = Either.left("30".asExpression())
|
||||||
|
|
||||||
override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) = listOf(
|
override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) = listOf(
|
||||||
condition
|
condition
|
||||||
@@ -49,28 +51,22 @@ class PollinateFlowerTaskConfig : SingleTaskConfig {
|
|||||||
|
|
||||||
return object : Behavior<LivingEntity>(
|
return object : Behavior<LivingEntity>(
|
||||||
mapOf(
|
mapOf(
|
||||||
CobblemonMemories.NEARBY_FLOWER to MemoryStatus.VALUE_PRESENT,
|
CobblemonMemories.NEARBY_FLOWERS to MemoryStatus.VALUE_PRESENT,
|
||||||
MemoryModuleType.WALK_TARGET to MemoryStatus.VALUE_ABSENT,
|
MemoryModuleType.WALK_TARGET to MemoryStatus.VALUE_ABSENT,
|
||||||
CobblemonMemories.HAS_NECTAR to MemoryStatus.REGISTERED,
|
CobblemonMemories.POLLINATED to MemoryStatus.VALUE_ABSENT,
|
||||||
CobblemonMemories.HIVE_COOLDOWN to MemoryStatus.VALUE_ABSENT,
|
CobblemonMemories.HIVE_COOLDOWN to MemoryStatus.VALUE_ABSENT,
|
||||||
),
|
),
|
||||||
600,
|
15,
|
||||||
625
|
45
|
||||||
) {
|
) {
|
||||||
val REQUIRED_SUCCESSFUL_POLLINATION_TICKS = 400
|
|
||||||
var successfulPollinationTicks = 0
|
|
||||||
var lastSoundPlayedTick = 0
|
|
||||||
var hoverPos: Vec3? = null
|
|
||||||
|
|
||||||
override fun checkExtraStartConditions(level: ServerLevel, owner: LivingEntity): Boolean {
|
override fun checkExtraStartConditions(level: ServerLevel, owner: LivingEntity): Boolean {
|
||||||
if (level.isNight || level.isRaining || entity.brain.getMemorySafely(CobblemonMemories.HAS_NECTAR).orElse(false)) return false
|
return entity.brain.getMemorySafely(CobblemonMemories.NEARBY_FLOWERS).orElse(emptyList()).any {
|
||||||
val optionalBlockPos = entity.brain.getMemorySafely(CobblemonMemories.NEARBY_FLOWER)
|
Vec3.atCenterOf(it).distanceTo(entity.position()) <= 1.0
|
||||||
return optionalBlockPos.isPresent && Vec3.atCenterOf(optionalBlockPos.get()).distanceTo(entity.position()) <= 1.0
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun canStillUse(level: ServerLevel, entity: LivingEntity, gameTime: Long): Boolean {
|
override fun canStillUse(level: ServerLevel, entity: LivingEntity, gameTime: Long): Boolean {
|
||||||
return checkExtraStartConditions(level, entity) && entity.brain.activeActivities.indexOf(
|
return checkExtraStartConditions(level, entity)
|
||||||
CobblemonActivities.POKEMON_POLLINATION) != -1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun start(level: ServerLevel, entity: LivingEntity, gameTime: Long) {
|
override fun start(level: ServerLevel, entity: LivingEntity, gameTime: Long) {
|
||||||
@@ -78,44 +74,20 @@ class PollinateFlowerTaskConfig : SingleTaskConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun tick(level: ServerLevel, owner: LivingEntity, gameTime: Long) {
|
override fun tick(level: ServerLevel, owner: LivingEntity, gameTime: Long) {
|
||||||
++successfulPollinationTicks
|
level.sendParticlesServer(
|
||||||
if (entity.random.nextFloat() < 0.05f && successfulPollinationTicks > this.lastSoundPlayedTick + 60) {
|
particleType = ParticleTypes.DRIPPING_HONEY,
|
||||||
this.lastSoundPlayedTick = successfulPollinationTicks
|
position = owner.eyePosition,
|
||||||
entity.playSound(SoundEvents.BEE_POLLINATE, 1.0f, 1.0f)
|
particles = 3,
|
||||||
}
|
offset = Vec3.ZERO,
|
||||||
val flowerPos = entity.brain.getMemorySafely(CobblemonMemories.NEARBY_FLOWER).orElse(null)
|
speed = 0.0
|
||||||
|
)
|
||||||
|
|
||||||
val bl = hoverPos == null || entity.position().distanceTo(hoverPos!!) <= 0.1
|
|
||||||
val bl3 = entity.random.nextInt(40) == 0
|
|
||||||
if (bl && bl3) {
|
|
||||||
// mimics the wriggling over a flower the vanilla bees do
|
|
||||||
if (hoverPos == null) {
|
|
||||||
hoverPos = flowerPos.bottomCenter.add(0.0, 0.4, 0.0)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flowerPos != null) {
|
|
||||||
hoverPos = flowerPos.bottomCenter.add(Vec3((entity.random.nextDouble() * 2.0 - 1.0) * (1.0/5.0), 0.3 + (entity.random.nextDouble() * 2.0 - 1.0) * (1.0/7.0), (entity.random.nextDouble() * 2.0 - 1.0) * (1.0/5.0)))
|
|
||||||
entity.getMoveControl()
|
|
||||||
.setWantedPosition(hoverPos!!.x(), hoverPos!!.y(), hoverPos!!.z(), 0.35)
|
|
||||||
entity.lookControl.setLookAt(flowerPos.bottomCenter.add(0.0,0.5,0.0))
|
|
||||||
}
|
|
||||||
} else if (!bl) {
|
|
||||||
entity.getMoveControl()
|
|
||||||
.setWantedPosition(hoverPos!!.x(), hoverPos!!.y(), hoverPos!!.z(), 0.35)
|
|
||||||
}
|
|
||||||
entity.lookControl.setLookAt(flowerPos.bottomCenter.add(0.0,0.5,0.0))
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun stop(level: ServerLevel, entity: LivingEntity, gameTime: Long) {
|
override fun stop(level: ServerLevel, entity: LivingEntity, gameTime: Long) {
|
||||||
|
val flowerStillThere = canStillUse(level, entity, gameTime)
|
||||||
if (successfulPollinationTicks > REQUIRED_SUCCESSFUL_POLLINATION_TICKS) {
|
if (flowerStillThere) {
|
||||||
entity.brain.setMemory(CobblemonMemories.HAS_NECTAR, true)
|
entity.brain.setMemory(CobblemonMemories.POLLINATED, true)
|
||||||
}
|
}
|
||||||
successfulPollinationTicks = 0
|
|
||||||
entity.brain.setMemoryWithExpiry(CobblemonMemories.PATH_TO_NEARBY_FLOWER_COOLDOWN, true, PATH_TO_FLOWER_COOLDOWN_TICKS)
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -97,9 +97,7 @@ interface TaskConfig {
|
|||||||
cobblemonResource("go_to_land") to GoToLandTaskConfig::class.java,
|
cobblemonResource("go_to_land") to GoToLandTaskConfig::class.java,
|
||||||
cobblemonResource("path_to_hive") to PathToBeeHiveTaskConfig::class.java,
|
cobblemonResource("path_to_hive") to PathToBeeHiveTaskConfig::class.java,
|
||||||
cobblemonResource("place_honey_in_hive") to PlaceHoneyInHiveTaskConfig::class.java,
|
cobblemonResource("place_honey_in_hive") to PlaceHoneyInHiveTaskConfig::class.java,
|
||||||
cobblemonResource("place_honey_in_sacc_leaves") to PlaceHoneyInSaccLeavesTaskConfig::class.java,
|
|
||||||
cobblemonResource("path_to_flower") to PathToFlowerTaskConfig::class.java,
|
cobblemonResource("path_to_flower") to PathToFlowerTaskConfig::class.java,
|
||||||
cobblemonResource("path_to_sacc_leaves") to PathToSaccLeavesTaskConfig::class.java,
|
|
||||||
cobblemonResource("pollinate_flower") to PollinateFlowerTaskConfig::class.java,
|
cobblemonResource("pollinate_flower") to PollinateFlowerTaskConfig::class.java,
|
||||||
cobblemonResource("go_to_land") to GoToLandTaskConfig::class.java,
|
cobblemonResource("go_to_land") to GoToLandTaskConfig::class.java,
|
||||||
cobblemonResource("manage_flight_in_battle") to ManageFlightInBattleTaskConfig::class.java,
|
cobblemonResource("manage_flight_in_battle") to ManageFlightInBattleTaskConfig::class.java,
|
||||||
|
|||||||
-29
@@ -1,29 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.api.berry.spawncondition
|
|
||||||
|
|
||||||
import com.cobblemon.mod.common.api.berry.Berry
|
|
||||||
import com.cobblemon.mod.common.util.cobblemonResource
|
|
||||||
import net.minecraft.core.Holder
|
|
||||||
import net.minecraft.tags.TagKey
|
|
||||||
import net.minecraft.util.RandomSource
|
|
||||||
import net.minecraft.world.level.biome.Biome
|
|
||||||
|
|
||||||
class SpecificBiomeCondition : BerrySpawnCondition {
|
|
||||||
lateinit var biome: TagKey<Biome>
|
|
||||||
val minGroveSize: Int = 1
|
|
||||||
val maxGroveSize: Int = 1
|
|
||||||
|
|
||||||
override fun canSpawn(berry: Berry, biome: Holder<Biome>) = biome.`is`(this.biome)
|
|
||||||
override fun getGroveSize(random: RandomSource) = random.nextIntBetweenInclusive(minGroveSize, maxGroveSize)
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
val ID = cobblemonResource("specific_biome")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -22,7 +22,6 @@ interface PokemonSideDelegate : EntitySideDelegate<PokemonEntity> {
|
|||||||
fun handleStatus(status: Byte) {}
|
fun handleStatus(status: Byte) {}
|
||||||
fun spawnShinyParticle(player: Player) {}
|
fun spawnShinyParticle(player: Player) {}
|
||||||
fun spawnAspectParticle() {}
|
fun spawnAspectParticle() {}
|
||||||
fun applyRenderRotation(partialTick: Float) {}
|
|
||||||
fun positionRider(passenger: Entity, positionUpdater: MoveFunction)
|
fun positionRider(passenger: Entity, positionUpdater: MoveFunction)
|
||||||
fun updateAge(age: Int) {}
|
fun updateAge(age: Int) {}
|
||||||
}
|
}
|
||||||
@@ -17,11 +17,18 @@ object SpawnBaitUtils {
|
|||||||
return grouped.map { (key, groupEffects) ->
|
return grouped.map { (key, groupEffects) ->
|
||||||
val (type, subcategory) = key
|
val (type, subcategory) = key
|
||||||
|
|
||||||
|
val count = groupEffects.size
|
||||||
val totalChance = groupEffects.sumOf { it.chance }
|
val totalChance = groupEffects.sumOf { it.chance }
|
||||||
val totalValue = groupEffects.sumOf { it.value }
|
val totalValue = groupEffects.sumOf { it.value }
|
||||||
|
|
||||||
val adjustedChance = totalChance.coerceAtMost(1.0)
|
val multiplier = when (count) {
|
||||||
val adjustedValue = ceil(totalValue)
|
2 -> 0.8
|
||||||
|
3 -> 0.6
|
||||||
|
else -> 1.0
|
||||||
|
}
|
||||||
|
|
||||||
|
val adjustedChance = (totalChance * multiplier).coerceAtMost(1.0)
|
||||||
|
val adjustedValue = ceil(totalValue * multiplier)
|
||||||
|
|
||||||
SpawnBait.Effect(type, subcategory, adjustedChance, adjustedValue)
|
SpawnBait.Effect(type, subcategory, adjustedChance, adjustedValue)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import com.bedrockk.molang.runtime.MoLangEnvironment
|
|||||||
import com.bedrockk.molang.runtime.MoLangRuntime
|
import com.bedrockk.molang.runtime.MoLangRuntime
|
||||||
import com.bedrockk.molang.runtime.MoParams
|
import com.bedrockk.molang.runtime.MoParams
|
||||||
import com.bedrockk.molang.runtime.struct.ArrayStruct
|
import com.bedrockk.molang.runtime.struct.ArrayStruct
|
||||||
|
import com.bedrockk.molang.runtime.struct.MoStruct
|
||||||
import com.bedrockk.molang.runtime.struct.QueryStruct
|
import com.bedrockk.molang.runtime.struct.QueryStruct
|
||||||
import com.bedrockk.molang.runtime.struct.VariableStruct
|
import com.bedrockk.molang.runtime.struct.VariableStruct
|
||||||
import com.bedrockk.molang.runtime.value.DoubleValue
|
import com.bedrockk.molang.runtime.value.DoubleValue
|
||||||
@@ -39,6 +40,7 @@ import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
|
|||||||
import com.cobblemon.mod.common.api.moves.animations.ActionEffects
|
import com.cobblemon.mod.common.api.moves.animations.ActionEffects
|
||||||
import com.cobblemon.mod.common.api.moves.animations.NPCProvider
|
import com.cobblemon.mod.common.api.moves.animations.NPCProvider
|
||||||
import com.cobblemon.mod.common.api.moves.animations.TargetsProvider
|
import com.cobblemon.mod.common.api.moves.animations.TargetsProvider
|
||||||
|
import com.cobblemon.mod.common.api.npc.NPCClass
|
||||||
import com.cobblemon.mod.common.api.npc.NPCClasses
|
import com.cobblemon.mod.common.api.npc.NPCClasses
|
||||||
import com.cobblemon.mod.common.api.npc.configuration.interaction.DialogueNPCInteractionConfiguration
|
import com.cobblemon.mod.common.api.npc.configuration.interaction.DialogueNPCInteractionConfiguration
|
||||||
import com.cobblemon.mod.common.api.npc.configuration.interaction.ScriptNPCInteractionConfiguration
|
import com.cobblemon.mod.common.api.npc.configuration.interaction.ScriptNPCInteractionConfiguration
|
||||||
@@ -55,6 +57,7 @@ import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
|
|||||||
import com.cobblemon.mod.common.api.pokemon.experience.SidemodExperienceSource
|
import com.cobblemon.mod.common.api.pokemon.experience.SidemodExperienceSource
|
||||||
import com.cobblemon.mod.common.api.pokemon.moves.LearnsetQuery
|
import com.cobblemon.mod.common.api.pokemon.moves.LearnsetQuery
|
||||||
import com.cobblemon.mod.common.api.pokemon.stats.Stats
|
import com.cobblemon.mod.common.api.pokemon.stats.Stats
|
||||||
|
import com.cobblemon.mod.common.api.riding.Rideable
|
||||||
import com.cobblemon.mod.common.api.riding.stats.RidingStat
|
import com.cobblemon.mod.common.api.riding.stats.RidingStat
|
||||||
import com.cobblemon.mod.common.api.scheduling.ClientTaskTracker
|
import com.cobblemon.mod.common.api.scheduling.ClientTaskTracker
|
||||||
import com.cobblemon.mod.common.api.scheduling.Schedulable
|
import com.cobblemon.mod.common.api.scheduling.Schedulable
|
||||||
@@ -134,6 +137,7 @@ import net.minecraft.world.entity.LightningBolt
|
|||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
import net.minecraft.world.entity.Mob
|
import net.minecraft.world.entity.Mob
|
||||||
import net.minecraft.world.entity.PathfinderMob
|
import net.minecraft.world.entity.PathfinderMob
|
||||||
|
import net.minecraft.world.entity.PlayerRideable
|
||||||
import net.minecraft.world.entity.TamableAnimal
|
import net.minecraft.world.entity.TamableAnimal
|
||||||
import net.minecraft.world.entity.ai.behavior.BlockPosTracker
|
import net.minecraft.world.entity.ai.behavior.BlockPosTracker
|
||||||
import net.minecraft.world.entity.ai.memory.MemoryModuleType
|
import net.minecraft.world.entity.ai.memory.MemoryModuleType
|
||||||
@@ -141,6 +145,7 @@ import net.minecraft.world.entity.ai.memory.MemoryStatus
|
|||||||
import net.minecraft.world.entity.ai.memory.WalkTarget
|
import net.minecraft.world.entity.ai.memory.WalkTarget
|
||||||
import net.minecraft.world.entity.animal.Animal
|
import net.minecraft.world.entity.animal.Animal
|
||||||
import net.minecraft.world.entity.item.ItemEntity
|
import net.minecraft.world.entity.item.ItemEntity
|
||||||
|
import net.minecraft.world.entity.monster.Enemy
|
||||||
import net.minecraft.world.entity.monster.Monster
|
import net.minecraft.world.entity.monster.Monster
|
||||||
import net.minecraft.world.entity.player.Player
|
import net.minecraft.world.entity.player.Player
|
||||||
import net.minecraft.world.item.ItemStack
|
import net.minecraft.world.item.ItemStack
|
||||||
@@ -155,6 +160,9 @@ import net.minecraft.world.level.levelgen.Heightmap
|
|||||||
import net.minecraft.world.level.pathfinder.PathType
|
import net.minecraft.world.level.pathfinder.PathType
|
||||||
import net.minecraft.world.phys.AABB
|
import net.minecraft.world.phys.AABB
|
||||||
import net.minecraft.world.phys.Vec3
|
import net.minecraft.world.phys.Vec3
|
||||||
|
import kotlin.text.get
|
||||||
|
import kotlin.text.toInt
|
||||||
|
import kotlin.toString
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds a bunch of useful MoLang trickery that can be used or extended in API
|
* Holds a bunch of useful MoLang trickery that can be used or extended in API
|
||||||
@@ -1177,28 +1185,16 @@ object MoLangFunctions {
|
|||||||
return@put DoubleValue.ONE
|
return@put DoubleValue.ONE
|
||||||
}
|
}
|
||||||
map.put("has_memory_value") { params ->
|
map.put("has_memory_value") { params ->
|
||||||
for (param in params.params) {
|
val memoryTypes = params.params.map {
|
||||||
if (!entity.hasMemoryFromString(param.asString())) {
|
it.asString().asIdentifierDefaultingNamespace()
|
||||||
return@put DoubleValue.ZERO
|
}.map(BuiltInRegistries.MEMORY_MODULE_TYPE::get)
|
||||||
}
|
return@put DoubleValue(memoryTypes.all { entity.brain.checkMemory(it, MemoryStatus.VALUE_PRESENT) })
|
||||||
}
|
|
||||||
return@put DoubleValue.ONE
|
|
||||||
}
|
}
|
||||||
map.put("lacks_memory_value") { params ->
|
map.put("lacks_memory_value") { params ->
|
||||||
for (param in params.params) {
|
val memoryTypes = params.params.map {
|
||||||
if (entity.hasMemoryFromString(param.asString())) {
|
it.asString().asIdentifierDefaultingNamespace()
|
||||||
return@put DoubleValue.ZERO
|
}.map(BuiltInRegistries.MEMORY_MODULE_TYPE::get)
|
||||||
}
|
return@put DoubleValue(memoryTypes.none { entity.brain.checkMemory(it, MemoryStatus.VALUE_PRESENT) })
|
||||||
}
|
|
||||||
return@put DoubleValue.ONE
|
|
||||||
}
|
|
||||||
map.put("is_doing_activity") { params ->
|
|
||||||
for (param in params.params) {
|
|
||||||
if (entity.isDoingActivityFromString(param.asString())) {
|
|
||||||
return@put DoubleValue.ONE
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return@put DoubleValue.ZERO
|
|
||||||
}
|
}
|
||||||
map.put("can_see") { params ->
|
map.put("can_see") { params ->
|
||||||
val target = params.get<MoValue>(0)
|
val target = params.get<MoValue>(0)
|
||||||
@@ -1256,6 +1252,15 @@ object MoLangFunctions {
|
|||||||
map.put("in_battle") { DoubleValue(npc.isInBattle()) }
|
map.put("in_battle") { DoubleValue(npc.isInBattle()) }
|
||||||
map.put("battles") { ArrayStruct(npc.battleIds.mapNotNull { BattleRegistry.getBattle(it)?.struct }.mapIndexed { index, value -> "$index" to value }.toMap()) }
|
map.put("battles") { ArrayStruct(npc.battleIds.mapNotNull { BattleRegistry.getBattle(it)?.struct }.mapIndexed { index, value -> "$index" to value }.toMap()) }
|
||||||
map.put("stop_battles") { _ -> npc.battleIds.forEach { BattleRegistry.getBattle(it)?.stop() } }
|
map.put("stop_battles") { _ -> npc.battleIds.forEach { BattleRegistry.getBattle(it)?.stop() } }
|
||||||
|
map.put("is_doing_activity") { params ->
|
||||||
|
val identifiers = params.params.map { it.asString().asIdentifierDefaultingNamespace(namespace = "minecraft") }
|
||||||
|
val activities = identifiers.mapNotNull { identifier -> BuiltInRegistries.ACTIVITY.get(identifier) }
|
||||||
|
if (activities.isNotEmpty()) {
|
||||||
|
return@put DoubleValue(activities.any { activity -> npc.brain.isActive(activity) })
|
||||||
|
} else {
|
||||||
|
return@put DoubleValue.ZERO
|
||||||
|
}
|
||||||
|
}
|
||||||
map.put("run_script_on_client") { params ->
|
map.put("run_script_on_client") { params ->
|
||||||
val world = npc.level()
|
val world = npc.level()
|
||||||
if (world is ServerLevel) {
|
if (world is ServerLevel) {
|
||||||
@@ -1900,9 +1905,6 @@ object MoLangFunctions {
|
|||||||
map.put("is_holding_item") { DoubleValue(!pokemonEntity.entityData.get(PokemonEntity.SHOWN_HELD_ITEM).let {
|
map.put("is_holding_item") { DoubleValue(!pokemonEntity.entityData.get(PokemonEntity.SHOWN_HELD_ITEM).let {
|
||||||
it.isEmpty || it.`is`(CobblemonItemTags.WEARABLE_HAT_ITEMS) || it.`is`(CobblemonItemTags.WEARABLE_FACE_ITEMS)
|
it.isEmpty || it.`is`(CobblemonItemTags.WEARABLE_HAT_ITEMS) || it.`is`(CobblemonItemTags.WEARABLE_FACE_ITEMS)
|
||||||
}) }
|
}) }
|
||||||
map.put("riding_style") {
|
|
||||||
StringValue(pokemonEntity.ifRidingAvailableSupply("") { behaviour, settings, state -> behaviour.getRidingStyle(settings, state).name })
|
|
||||||
}
|
|
||||||
map.put("is_wearing_hat") { DoubleValue(pokemonEntity.entityData.get(PokemonEntity.SHOWN_HELD_ITEM).`is`(CobblemonItemTags.WEARABLE_HAT_ITEMS)) }
|
map.put("is_wearing_hat") { DoubleValue(pokemonEntity.entityData.get(PokemonEntity.SHOWN_HELD_ITEM).`is`(CobblemonItemTags.WEARABLE_HAT_ITEMS)) }
|
||||||
map.put("is_wearing_face") { DoubleValue(pokemonEntity.entityData.get(PokemonEntity.SHOWN_HELD_ITEM).`is`(CobblemonItemTags.WEARABLE_FACE_ITEMS)) }
|
map.put("is_wearing_face") { DoubleValue(pokemonEntity.entityData.get(PokemonEntity.SHOWN_HELD_ITEM).`is`(CobblemonItemTags.WEARABLE_FACE_ITEMS)) }
|
||||||
map.put("is_pastured") {
|
map.put("is_pastured") {
|
||||||
|
|||||||
@@ -53,7 +53,8 @@ open class MoveTemplate(
|
|||||||
val pp: Int,
|
val pp: Int,
|
||||||
val priority: Int,
|
val priority: Int,
|
||||||
val critRatio: Double,
|
val critRatio: Double,
|
||||||
val effectChances: Array<Double>
|
val effectChances: Array<Double>,
|
||||||
|
val actionEffect: ActionEffectTimeline?
|
||||||
) {
|
) {
|
||||||
val struct: MoStruct by lazy {
|
val struct: MoStruct by lazy {
|
||||||
QueryStruct(hashMapOf())
|
QueryStruct(hashMapOf())
|
||||||
@@ -86,7 +87,8 @@ open class MoveTemplate(
|
|||||||
pp = 5,
|
pp = 5,
|
||||||
priority = 0,
|
priority = 0,
|
||||||
critRatio = 0.0,
|
critRatio = 0.0,
|
||||||
effectChances = emptyArray()
|
effectChances = emptyArray(),
|
||||||
|
actionEffect = null
|
||||||
)
|
)
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
|||||||
@@ -92,7 +92,18 @@ object Moves : DataRegistry {
|
|||||||
effectChances += secondaryMember.get("chance").asDouble
|
effectChances += secondaryMember.get("chance").asDouble
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val move = MoveTemplate(id, num, elementalType, damageCategory, power, target, accuracy, pp, priority, critRatio, effectChances.toTypedArray())
|
val actionEffect = ActionEffects.actionEffects[id.asIdentifierDefaultingNamespace()]
|
||||||
|
?: run {
|
||||||
|
ActionEffects.actionEffects["generic_move".asIdentifierDefaultingNamespace()]
|
||||||
|
// if (damageCategory == DamageCategories.STATUS) {
|
||||||
|
// ActionEffects.actionEffects[cobblemonResource("status")]
|
||||||
|
// } else {
|
||||||
|
// val type = elementalType.name.lowercase()
|
||||||
|
// val category = damageCategory.name.lowercase()
|
||||||
|
// ActionEffects.actionEffects["${category}_$type".asIdentifierDefaultingNamespace()]
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
val move = MoveTemplate(id, num, elementalType, damageCategory, power, target, accuracy, pp, priority, critRatio, effectChances.toTypedArray(), actionEffect)
|
||||||
this.register(move)
|
this.register(move)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
Cobblemon.LOGGER.error("Caught exception trying to resolve the move '{}'", id, e)
|
Cobblemon.LOGGER.error("Caught exception trying to resolve the move '{}'", id, e)
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.api.molang.ExpressionLike
|
|||||||
import com.cobblemon.mod.common.api.moves.animations.keyframes.*
|
import com.cobblemon.mod.common.api.moves.animations.keyframes.*
|
||||||
import com.cobblemon.mod.common.api.pokemon.stats.Stat
|
import com.cobblemon.mod.common.api.pokemon.stats.Stat
|
||||||
import com.cobblemon.mod.common.api.reactive.SimpleObservable
|
import com.cobblemon.mod.common.api.reactive.SimpleObservable
|
||||||
import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
|
|
||||||
import com.cobblemon.mod.common.pokemon.adapters.CobblemonStatTypeAdapter
|
import com.cobblemon.mod.common.pokemon.adapters.CobblemonStatTypeAdapter
|
||||||
import com.cobblemon.mod.common.util.adapters.*
|
import com.cobblemon.mod.common.util.adapters.*
|
||||||
import com.cobblemon.mod.common.util.cobblemonResource
|
import com.cobblemon.mod.common.util.cobblemonResource
|
||||||
@@ -92,11 +91,5 @@ object ActionEffects : JsonDataRegistry<ActionEffectTimeline> {
|
|||||||
observable.emit(this)
|
observable.emit(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getEffectWithBattleContext(id: ResourceLocation, pokemon: BattlePokemon): ActionEffectTimeline? {
|
|
||||||
val species = pokemon.entity?.exposedSpecies ?: pokemon.effectedPokemon.species
|
|
||||||
val contextedEffect = actionEffects[ResourceLocation.fromNamespaceAndPath(id.namespace, id.path + "_" + species)]
|
|
||||||
return contextedEffect ?: actionEffects[id]
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun sync(player: ServerPlayer) {}
|
override fun sync(player: ServerPlayer) {}
|
||||||
}
|
}
|
||||||
+9
-93
@@ -10,17 +10,13 @@ package com.cobblemon.mod.common.api.orientation
|
|||||||
|
|
||||||
import com.cobblemon.mod.common.util.math.geometry.toDegrees
|
import com.cobblemon.mod.common.util.math.geometry.toDegrees
|
||||||
import com.cobblemon.mod.common.util.math.geometry.toRadians
|
import com.cobblemon.mod.common.util.math.geometry.toRadians
|
||||||
import com.mojang.blaze3d.Blaze3D
|
|
||||||
import net.minecraft.util.Mth
|
import net.minecraft.util.Mth
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
import org.joml.AxisAngle4f
|
|
||||||
import org.joml.Matrix3f
|
import org.joml.Matrix3f
|
||||||
import org.joml.Quaternionf
|
import org.joml.Quaternionf
|
||||||
import org.joml.Vector3f
|
import org.joml.Vector3f
|
||||||
import kotlin.math.abs
|
import kotlin.math.abs
|
||||||
import kotlin.math.asin
|
import kotlin.math.asin
|
||||||
import kotlin.math.max
|
|
||||||
import kotlin.math.min
|
|
||||||
import kotlin.math.sign
|
import kotlin.math.sign
|
||||||
|
|
||||||
open class OrientationController(val entity: LivingEntity) {
|
open class OrientationController(val entity: LivingEntity) {
|
||||||
@@ -39,11 +35,6 @@ open class OrientationController(val entity: LivingEntity) {
|
|||||||
private var renderOrientationO: Matrix3f? = null
|
private var renderOrientationO: Matrix3f? = null
|
||||||
private var renderOrientation: Matrix3f? = null
|
private var renderOrientation: Matrix3f? = null
|
||||||
|
|
||||||
|
|
||||||
private var angularVelocity: Vector3f = Vector3f(0.0f, 0.0f, 0.0f)
|
|
||||||
private var lastHandledRotationTime = Double.MIN_VALUE
|
|
||||||
private var frameTime = 0.0
|
|
||||||
|
|
||||||
/** Adding this simply because it irritates me seeing `getActive` when most of this is Java. */
|
/** Adding this simply because it irritates me seeing `getActive` when most of this is Java. */
|
||||||
fun isActive() = active
|
fun isActive() = active
|
||||||
|
|
||||||
@@ -72,7 +63,7 @@ open class OrientationController(val entity: LivingEntity) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun getRenderOrientation(delta: Float): Quaternionf {
|
fun getRenderOrientation(delta: Float): Quaternionf {
|
||||||
val old = renderOrientationO ?: renderOrientation ?: orientation ?: Matrix3f()
|
val old = renderOrientationO ?: renderOrientation ?: orientation
|
||||||
val new = renderOrientation ?: old
|
val new = renderOrientation ?: old
|
||||||
val oldQuat = Quaternionf().setFromUnnormalized(old)
|
val oldQuat = Quaternionf().setFromUnnormalized(old)
|
||||||
val newQuat = Quaternionf().setFromUnnormalized(new)
|
val newQuat = Quaternionf().setFromUnnormalized(new)
|
||||||
@@ -81,93 +72,18 @@ open class OrientationController(val entity: LivingEntity) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun tick() {
|
fun tick() {
|
||||||
// val d = Blaze3D.getTime();
|
|
||||||
// this.frameTime =
|
|
||||||
// if (this.lastHandledRotationTime != Double.MIN_VALUE) d - this.lastHandledRotationTime else 0.0;
|
|
||||||
// this.lastHandledRotationTime = d;
|
|
||||||
//
|
|
||||||
// if (!active || orientation == null) return
|
|
||||||
//
|
|
||||||
// // Find the desired angular velocity
|
|
||||||
// // lerp the current ang vel towards the desired at a set rate (does this need to take into account frametime?
|
|
||||||
// val current = orientation
|
|
||||||
// val renderMatrix = this.renderOrientation ?: Matrix3f()
|
|
||||||
// val renderQuat = Quaternionf().setFromUnnormalized(renderMatrix)
|
|
||||||
// val targetQuat = Quaternionf().setFromUnnormalized(current)
|
|
||||||
//
|
|
||||||
// // Max rate of angular change in radians per second
|
|
||||||
// val maxAngVel = Math.toRadians(180.0).toFloat()
|
|
||||||
//
|
|
||||||
// // Find the difference between the current render orientation and the target orientation
|
|
||||||
// val qDiff: Quaternionf = targetQuat.mul(renderQuat.invert())
|
|
||||||
//
|
|
||||||
// // Construct the target rate of change from the difference quat
|
|
||||||
// val axAng = qDiff.get(AxisAngle4f())
|
|
||||||
// val capdRate = axAng.angle.coerceIn(-maxAngVel, maxAngVel)
|
|
||||||
// val targetAngVel = Vector3f(
|
|
||||||
// axAng.x,
|
|
||||||
// axAng.y,
|
|
||||||
// axAng.z
|
|
||||||
// ).mul(capdRate)
|
|
||||||
//
|
|
||||||
// // lerp the current angular velocity towards the target
|
|
||||||
// val k = 10.0f // Some smoothing constant k
|
|
||||||
// val smoothingFactor = Math.min(1.0f, this.frameTime.toFloat() * k)
|
|
||||||
// angularVelocity = angularVelocity.lerp(targetAngVel, smoothingFactor)
|
|
||||||
//
|
|
||||||
// // Use the angular velocity to slerp the renderQuat toward the targetQuat
|
|
||||||
// val frameDisplacement =
|
|
||||||
// angularVelocity.mul(this.frameTime.toFloat()) // Angular displacement happening on this frame
|
|
||||||
//
|
|
||||||
// val fAng = frameDisplacement.length() // Angle of displacement for this given pass/frame
|
|
||||||
// if (fAng > 0.0001f) { // Ensure that the angle is significant enough that its worth normalizing and carrying out rotation
|
|
||||||
// val fAx = frameDisplacement.normalize()
|
|
||||||
// // Construct a rotation quat from the
|
|
||||||
// val rotQuat = Quaternionf().fromAxisAngleRad(fAx, fAng)
|
|
||||||
//
|
|
||||||
// // Set the new orientation post frame stepped rotation.
|
|
||||||
// renderOrientation = Matrix3f().set(renderQuat.mul(rotQuat))
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
//// this.renderOrientation = orientation
|
|
||||||
//
|
|
||||||
// // apply the new current angular velocity to the current render orientation
|
|
||||||
// // construct a quat out of the angular velocity
|
|
||||||
// // slerp the quat with a value of frametime
|
|
||||||
|
|
||||||
val d = Blaze3D.getTime();
|
|
||||||
this.frameTime = if (this.lastHandledRotationTime != Double.MIN_VALUE) d - this.lastHandledRotationTime else 0.0;
|
|
||||||
this.lastHandledRotationTime = d;
|
|
||||||
|
|
||||||
if (!active || orientation == null) return
|
if (!active || orientation == null) return
|
||||||
|
renderOrientationO = renderOrientation
|
||||||
val current = orientation
|
val current = orientation
|
||||||
val renderMatrix = this.renderOrientation ?: Matrix3f()
|
val renderMatrix = this.renderOrientation ?: current
|
||||||
|
|
||||||
// Create mutable copies for manipulation
|
|
||||||
val renderQuat = Quaternionf().setFromUnnormalized(renderMatrix)
|
val renderQuat = Quaternionf().setFromUnnormalized(renderMatrix)
|
||||||
var targetQuat = Quaternionf().setFromUnnormalized(current)
|
val targetQuat = Quaternionf().setFromUnnormalized(current)
|
||||||
|
val dampingFactor = 0.66f // We can change this factor for faster transitions
|
||||||
|
renderQuat.slerp(targetQuat, dampingFactor)
|
||||||
|
|
||||||
// --- Shortest Path Check (Still mandatory for Slerp) ---
|
val newRenderOrientation = Matrix3f()
|
||||||
if (renderQuat.dot(targetQuat) < 0) {
|
renderQuat.get(newRenderOrientation)
|
||||||
targetQuat = targetQuat.invert()
|
renderOrientation = newRenderOrientation
|
||||||
}
|
|
||||||
// --------------------------------------------------------
|
|
||||||
|
|
||||||
// K is the speed (rad/s) we want to close the gap at.
|
|
||||||
val k_rate = 10.0f // E.g., target 10 units/second closing rate.
|
|
||||||
|
|
||||||
// Calculate the frame-rate independent alpha (t) for Slerp.
|
|
||||||
// This makes the smoothing constant 'k_rate' a rate of change, not an arbitrary alpha value.
|
|
||||||
val slerpAlpha = 1.0f - Math.exp(-(k_rate * this.frameTime)).toFloat()
|
|
||||||
|
|
||||||
// Use Slerp to interpolate the renderQuat towards the targetQuat
|
|
||||||
val newRenderQuat = renderQuat.slerp(targetQuat, slerpAlpha, Quaternionf())
|
|
||||||
|
|
||||||
// Set the new orientation
|
|
||||||
renderOrientation = Matrix3f().set(newRenderQuat)
|
|
||||||
|
|
||||||
// Angular velocity is now redundant for rendering, but could be used for particle effects, etc.
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val forwardVector: Vector3f
|
val forwardVector: Vector3f
|
||||||
|
|||||||
@@ -170,8 +170,11 @@ object Natures {
|
|||||||
* Utility method to get a nature by string
|
* Utility method to get a nature by string
|
||||||
* @return a nature type or null
|
* @return a nature type or null
|
||||||
*/
|
*/
|
||||||
fun getNature(identifier: String) = getNature(cobblemonResource(identifier))
|
fun getNature(identifier: String): Nature? {
|
||||||
?: getNature(ResourceLocation.parse(identifier))
|
val nature = getNature(cobblemonResource(identifier))
|
||||||
|
if(nature != null) return nature
|
||||||
|
return getNature(ResourceLocation.parse(identifier))
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Helper function for a random Nature
|
* Helper function for a random Nature
|
||||||
|
|||||||
@@ -806,8 +806,8 @@ open class PokemonProperties {
|
|||||||
return PokemonProperties().loadFromJSON(this.saveToJSON())
|
return PokemonProperties().loadFromJSON(this.saveToJSON())
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the config value is at least 0, then do 1/x and use that as the property chance
|
// If the config value is at least 1, then do 1/x and use that as the property chance
|
||||||
private fun Float.checkRate(): Boolean = this > 0 && (Random.nextFloat() < 1 / this)
|
private fun Float.checkRate(): Boolean = if (this >= 1) (Random.Default.nextFloat() < 1 / this) else Random.Default.nextFloat() < this
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Attempts to find an ability by ID and resolve if it should be forced or if it's legal for the given form.
|
* Attempts to find an ability by ID and resolve if it should be forced or if it's legal for the given form.
|
||||||
|
|||||||
+2
-4
@@ -9,9 +9,8 @@
|
|||||||
package com.cobblemon.mod.common.api.pokemon.aspect
|
package com.cobblemon.mod.common.api.pokemon.aspect
|
||||||
|
|
||||||
import com.cobblemon.mod.common.CobblemonBlocks
|
import com.cobblemon.mod.common.CobblemonBlocks
|
||||||
import com.cobblemon.mod.common.api.ai.config.task.PollinateFlowerTaskConfig
|
|
||||||
import com.cobblemon.mod.common.api.spawning.influence.SaccharineLogSlatheredInfluence
|
import com.cobblemon.mod.common.api.spawning.influence.SaccharineLogSlatheredInfluence
|
||||||
import com.cobblemon.mod.common.block.entity.PokeSnackBlockEntity
|
import com.cobblemon.mod.common.api.spawning.prospecting.LurePokeSnackDetector
|
||||||
import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
|
import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
|
||||||
import net.minecraft.core.particles.BlockParticleOption
|
import net.minecraft.core.particles.BlockParticleOption
|
||||||
import net.minecraft.core.particles.ParticleOptions
|
import net.minecraft.core.particles.ParticleOptions
|
||||||
@@ -23,12 +22,11 @@ import net.minecraft.resources.ResourceLocation
|
|||||||
*/
|
*/
|
||||||
val aspectParticleMap: Map<String, ParticleData> = mapOf(
|
val aspectParticleMap: Map<String, ParticleData> = mapOf(
|
||||||
SaccharineLogSlatheredInfluence.HONEY_DRENCHED_ASPECT to ParticleData.MinecraftParticle(ParticleTypes.FALLING_HONEY, 0.075, 1),
|
SaccharineLogSlatheredInfluence.HONEY_DRENCHED_ASPECT to ParticleData.MinecraftParticle(ParticleTypes.FALLING_HONEY, 0.075, 1),
|
||||||
PokeSnackBlockEntity.POKE_SNACK_CRUMBED_ASPECT to ParticleData.MinecraftParticle(
|
LurePokeSnackDetector.POKE_SNACK_CRUMBED_ASPECT to ParticleData.MinecraftParticle(
|
||||||
BlockParticleOption(
|
BlockParticleOption(
|
||||||
ParticleTypes.BLOCK,
|
ParticleTypes.BLOCK,
|
||||||
CobblemonBlocks.POKE_SNACK.defaultBlockState()
|
CobblemonBlocks.POKE_SNACK.defaultBlockState()
|
||||||
), 0.05, 3),
|
), 0.05, 3),
|
||||||
PollinateFlowerTaskConfig.HAS_NECTAR_ASPECT to ParticleData.MinecraftParticle(ParticleTypes.FALLING_NECTAR, 0.075, 1)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
sealed class ParticleData {
|
sealed class ParticleData {
|
||||||
|
|||||||
-12
@@ -103,18 +103,6 @@ interface RidingBehaviour<Settings : RidingBehaviourSettings, State : RidingBeha
|
|||||||
*/
|
*/
|
||||||
fun damageOnCollision(settings: Settings, state: State, vehicle: PokemonEntity, impactVec: Vec3): Boolean = false
|
fun damageOnCollision(settings: Settings, state: State, vehicle: PokemonEntity, impactVec: Vec3): Boolean = false
|
||||||
|
|
||||||
/**
|
|
||||||
* Called in [com.cobblemon.mod.common.client.render.pokemon.PokemonRenderer] to allow the controller to set rotations
|
|
||||||
* through code using partialTicks and right before rendering.
|
|
||||||
* //TODO: This needs to be further refined. Maybe only the orientationController needs affected? Maybe the rotations set here don't need to be applied to the controller/camera
|
|
||||||
*/
|
|
||||||
fun applyRenderRotation(settings: Settings, state: State, vehicle: PokemonEntity, partialTicks: Float) {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determines if the pair of mouse inputs Pair(mouseX, mouseY) get used to modify the driverRotations or the vehicle rotations themselves.
|
|
||||||
* Driver rotations are the rotations used by passengers or a driver that is freelooking. This does not override the freelook button.
|
|
||||||
*/
|
|
||||||
fun mouseModifiesDriverRotation(settings: Settings, state: State, vehicle: PokemonEntity): Pair<Boolean, Boolean> = Pair(false, false)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Internal helpers to help behaviour specific calculations
|
* Internal helpers to help behaviour specific calculations
|
||||||
|
|||||||
+1
-1
@@ -30,6 +30,6 @@ interface RidingBehaviourSettings: Encodable, Decodable {
|
|||||||
|
|
||||||
fun calculate(stat: RidingStat, boostAmount: Float): Float {
|
fun calculate(stat: RidingStat, boostAmount: Float): Float {
|
||||||
val range = stats[stat] ?: return 0F
|
val range = stats[stat] ?: return 0F
|
||||||
return (range.first + boostAmount).coerceAtMost(range.endInclusive.toFloat())
|
return range.first + boostAmount
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-2
@@ -16,7 +16,6 @@ import com.cobblemon.mod.common.api.riding.behaviour.types.land.MinekartBehaviou
|
|||||||
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.BoatBehaviour
|
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.BoatBehaviour
|
||||||
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.BurstBehaviour
|
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.BurstBehaviour
|
||||||
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.DolphinBehaviour
|
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.DolphinBehaviour
|
||||||
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.SubmarineBehaviour
|
|
||||||
import net.minecraft.resources.ResourceLocation
|
import net.minecraft.resources.ResourceLocation
|
||||||
|
|
||||||
object RidingBehaviours {
|
object RidingBehaviours {
|
||||||
@@ -35,7 +34,6 @@ object RidingBehaviours {
|
|||||||
register(MinekartBehaviour.KEY, MinekartBehaviour())
|
register(MinekartBehaviour.KEY, MinekartBehaviour())
|
||||||
register(HoverBehaviour.KEY, HoverBehaviour())
|
register(HoverBehaviour.KEY, HoverBehaviour())
|
||||||
register(RocketBehaviour.KEY, RocketBehaviour())
|
register(RocketBehaviour.KEY, RocketBehaviour())
|
||||||
register(SubmarineBehaviour.KEY, SubmarineBehaviour())
|
|
||||||
register(CompositeBehaviour.KEY, CompositeBehaviour())
|
register(CompositeBehaviour.KEY, CompositeBehaviour())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-14
@@ -19,7 +19,6 @@ import net.minecraft.world.entity.LivingEntity
|
|||||||
import kotlin.collections.get
|
import kotlin.collections.get
|
||||||
import net.minecraft.server.level.ServerPlayer
|
import net.minecraft.server.level.ServerPlayer
|
||||||
import net.minecraft.world.entity.player.Player
|
import net.minecraft.world.entity.player.Player
|
||||||
import kotlin.collections.get
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Small wrapper around a RidingBehaviour to provide sane defaults in the event that the behaviour is not active.
|
* Small wrapper around a RidingBehaviour to provide sane defaults in the event that the behaviour is not active.
|
||||||
@@ -59,7 +58,7 @@ class RidingController(
|
|||||||
val newKey = behaviourSettings.key
|
val newKey = behaviourSettings.key
|
||||||
for (passenger in entity.passengers) {
|
for (passenger in entity.passengers) {
|
||||||
if (passenger is Player && passenger !is ServerPlayer) {
|
if (passenger is Player && passenger !is ServerPlayer) {
|
||||||
MountedCameraTypeHandler.handleTransition(passenger, previousKey ?: continue, newKey)
|
MountedCameraTypeHandler.handleTransition(previousKey ?: continue, newKey)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -110,22 +109,12 @@ class RidingController(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun canTransitionToLand(): Boolean {
|
private fun canTransitionToLand(): Boolean {
|
||||||
val hasLandController = entity.pokemon.riding.behaviours?.get(RidingStyle.LAND) != null
|
if (entity.isInLiquid || entity.isUnderWater) return false
|
||||||
if (hasLandController && (entity.isInLiquid || entity.isUnderWater)) return false
|
|
||||||
if (!hasLandController && (entity.isEyeInFluid(FluidTags.WATER) || entity.isEyeInFluid(FluidTags.LAVA))) return false
|
|
||||||
return entity.onGround()
|
return entity.onGround()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun canTransitionToLiquid(): Boolean {
|
private fun canTransitionToLiquid(): Boolean {
|
||||||
// If it has a liquid controller to transition to and it isn't currently an air controller then transition on
|
return entity.isInLiquid || entity.isUnderWater
|
||||||
// touching water. If not then check for eyes in water. This allows fliers to fly closely above water and
|
|
||||||
// for walkers that don't have a liquid controller to be able to walk in not deep water
|
|
||||||
return if (entity.pokemon.riding.behaviours?.get(RidingStyle.LIQUID) != null && context?.style != RidingStyle.AIR) {
|
|
||||||
entity.isInLiquid || entity.isUnderWater
|
|
||||||
} else {
|
|
||||||
entity.isEyeInFluid(FluidTags.WATER) || entity.isEyeInFluid(FluidTags.LAVA)
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun canTransitionToAir(driver: LivingEntity?): Boolean {
|
private fun canTransitionToAir(driver: LivingEntity?): Boolean {
|
||||||
|
|||||||
+166
-136
@@ -34,7 +34,6 @@ import net.minecraft.world.entity.player.Player
|
|||||||
import net.minecraft.world.phys.Vec2
|
import net.minecraft.world.phys.Vec2
|
||||||
import net.minecraft.world.phys.Vec3
|
import net.minecraft.world.phys.Vec3
|
||||||
import net.minecraft.world.phys.shapes.Shapes
|
import net.minecraft.world.phys.shapes.Shapes
|
||||||
import org.joml.Vector3f
|
|
||||||
import kotlin.math.*
|
import kotlin.math.*
|
||||||
|
|
||||||
class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
||||||
@@ -55,7 +54,18 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
|||||||
get() = CobblemonRideSettings.bird
|
get() = CobblemonRideSettings.bird
|
||||||
|
|
||||||
override fun isActive(settings: BirdSettings, state: BirdState, vehicle: PokemonEntity): Boolean {
|
override fun isActive(settings: BirdSettings, state: BirdState, vehicle: PokemonEntity): Boolean {
|
||||||
return !(vehicle.isInWater || vehicle.isUnderWater)
|
return Shapes.create(vehicle.boundingBox).blockPositionsAsListRounded().any {
|
||||||
|
//Need to check other fluids
|
||||||
|
if (vehicle.isInWater || vehicle.isUnderWater) {
|
||||||
|
return@any false
|
||||||
|
}
|
||||||
|
//This might not actually work, depending on what the yPos actually is. yPos of the middle of the entity? the feet?
|
||||||
|
if (it.y.toDouble() == (vehicle.position().y)) {
|
||||||
|
val blockState = vehicle.level().getBlockState(it.below())
|
||||||
|
return@any !(!blockState.isAir && blockState.fluidState.isEmpty)
|
||||||
|
}
|
||||||
|
true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun pose(settings: BirdSettings, state: BirdState, vehicle: PokemonEntity): PoseType {
|
override fun pose(settings: BirdSettings, state: BirdState, vehicle: PokemonEntity): PoseType {
|
||||||
@@ -89,8 +99,7 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
|||||||
vehicle: PokemonEntity,
|
vehicle: PokemonEntity,
|
||||||
driver: Player,
|
driver: Player,
|
||||||
) {
|
) {
|
||||||
// Also checks stamina
|
val controller = (driver as OrientationControllable).orientationController
|
||||||
val controller = (vehicle as OrientationControllable).orientationController
|
|
||||||
if (cos(controller.roll.toRadians()) < 0.0) {
|
if (cos(controller.roll.toRadians()) < 0.0) {
|
||||||
val upsideDownRate = 1.0 / (2.0 * 20.0) // 2 seconds to max out upsideDown force
|
val upsideDownRate = 1.0 / (2.0 * 20.0) // 2 seconds to max out upsideDown force
|
||||||
state.currUpsideDownForce.set( min(1.0, state.currUpsideDownForce.get() + upsideDownRate * abs(cos(controller.roll.toRadians()))))
|
state.currUpsideDownForce.set( min(1.0, state.currUpsideDownForce.get() + upsideDownRate * abs(cos(controller.roll.toRadians()))))
|
||||||
@@ -109,28 +118,16 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
|||||||
driver: Player
|
driver: Player
|
||||||
) {
|
) {
|
||||||
val stam = state.stamina.get()
|
val stam = state.stamina.get()
|
||||||
val controller = (driver as OrientationControllable).orientationController
|
|
||||||
|
|
||||||
if (vehicle.runtime.resolveBoolean(settings.infiniteStamina ?: globalBird.infiniteStamina!!)) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Grab the boost time in seconds and convert to ticks. Then calculate the drain rate as inversely
|
// Grab the boost time in seconds and convert to ticks. Then calculate the drain rate as inversely
|
||||||
// proportional to the number of ticks of boost thus making a full boost take x ticks
|
// proportional to the number of ticks of boost thus making a full boost take x ticks
|
||||||
// in short: "Stamina drains slower at higher values and also replenishes slower"
|
// in short: "Stamina drains slower at higher values and also replenishes slower"
|
||||||
val totalStam = vehicle.runtime.resolveDouble(settings.staminaExpr ?: globalBird.staminaExpr!!) * 20.0f
|
val totalStam = vehicle.runtime.resolveDouble(settings.staminaExpr ?: globalBird.staminaExpr!!) * 20.0f
|
||||||
val horzMod = vehicle.runtime.resolveDouble(settings.stamDrainHorzMod ?: globalBird.stamDrainHorzMod!!)
|
val stamDrainRate = (1.0f / totalStam).toFloat()
|
||||||
val glideMod = vehicle.runtime.resolveFloat(settings.stamDrainPercRateGlide ?: globalBird.stamDrainPercRateGlide!!)
|
|
||||||
val stamDrainPerRateDive = vehicle.runtime.resolveDouble(settings.stamDrainPerRateDive ?: globalBird.stamDrainPerRateDive!!).coerceIn(0.0, 1.0) // Ensure its between 1 and 0 or things get weird
|
|
||||||
|
|
||||||
val stamDrainHorz = if(vehicle.deltaMovement.horizontalDistance() < 1e-6) horzMod else max(1.0 + ((horzMod - 1.0) * atan( vehicle.deltaMovement.y / vehicle.deltaMovement.horizontalDistance())), 1.0)
|
val newStam = if (driver.zza > 0.0) max(0.0f,stam - stamDrainRate)
|
||||||
val diveAmount = sin(controller.pitch.toRadians()).coerceIn(0.0f, 1.0f)// from 0.0 -> 1.0 how steep is the current dive angle
|
else if (!state.gliding.get()) max(0.0f,stam - stamDrainRate * 0.5f) // if hovering half the stam drain
|
||||||
val diveMod = ((1.0 - diveAmount) * ( 1.0 - stamDrainPerRateDive ) + stamDrainPerRateDive).toFloat() // smooth between 1.0 and the dive drain mod depending upon how dived the ride is
|
else min(1.0f,stam + stamDrainRate * 0.2f)
|
||||||
val stamDrainRate = (1.0f / totalStam).toFloat() * stamDrainHorz.toFloat()
|
|
||||||
|
|
||||||
val newStam = if (driver.deltaMovement.length() > 0.1) max(0.0f,stam - stamDrainRate) // Drain at normal fly rate
|
|
||||||
else if (state.gliding.get()) min(1.0f,stam - stamDrainRate * glideMod * diveMod) // Gliding drain logic
|
|
||||||
else max(0.0f,stam - stamDrainRate * 0.5f) // if hovering half the stam drain
|
|
||||||
|
|
||||||
state.stamina.set(newStam)
|
state.stamina.set(newStam)
|
||||||
}
|
}
|
||||||
@@ -141,7 +138,7 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
|||||||
vehicle: PokemonEntity,
|
vehicle: PokemonEntity,
|
||||||
driver: LivingEntity
|
driver: LivingEntity
|
||||||
): Vec2 {
|
): Vec2 {
|
||||||
return Vec2.ZERO//Vec2(driver.xRot * 0.5f, driver.yRot)
|
return Vec2(driver.xRot * 0.5f, driver.yRot)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun velocity(
|
override fun velocity(
|
||||||
@@ -151,26 +148,29 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
|||||||
driver: Player,
|
driver: Player,
|
||||||
input: Vec3
|
input: Vec3
|
||||||
): Vec3 {
|
): Vec3 {
|
||||||
val controller = (vehicle as? OrientationControllable)?.orientationController
|
var upForce = 0.0
|
||||||
if (controller == null || controller.orientation == null) return Vec3.ZERO
|
var forwardForce = 0.0
|
||||||
|
|
||||||
//Perform ride velocity update
|
//Perform ride velocity update
|
||||||
calculateRideSpaceVel(settings, state, vehicle, driver)
|
calculateRideSpaceVel(settings, state, vehicle, driver)
|
||||||
|
|
||||||
|
//Translate ride space velocity to world space velocity.
|
||||||
|
val controller = (driver as? OrientationControllable)?.orientationController
|
||||||
|
if (controller != null) {
|
||||||
|
//Need to deadzone this when straight up or down
|
||||||
|
|
||||||
|
upForce += -1.0 * sin(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().z
|
||||||
|
forwardForce += cos(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().z
|
||||||
|
|
||||||
|
upForce += cos(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().y
|
||||||
|
forwardForce += sin(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().y
|
||||||
|
}
|
||||||
|
|
||||||
// The downward force used to encourage players to stop flying upside down.
|
// The downward force used to encourage players to stop flying upside down.
|
||||||
val extraDownwardForce = state.currUpsideDownForce.get().pow(2) * -0.3 // 6 blocks a second downward
|
val extraDownwardForce = state.currUpsideDownForce.get().pow(2) * -0.3 // 6 blocks a second downward
|
||||||
|
|
||||||
// Convert the local velocity vector into a world vector
|
val velocity = Vec3(state.rideVelocity.get().x , upForce + extraDownwardForce, forwardForce)
|
||||||
val localVelVec = Vector3f(
|
return velocity
|
||||||
state.rideVelocity.get().x.toFloat(),
|
|
||||||
(state.rideVelocity.get().y).toFloat(),
|
|
||||||
state.rideVelocity.get().z.toFloat() * -1.0f // Flip the z axis to make this left handed
|
|
||||||
)
|
|
||||||
// Unrotate preemptively as this vector gets rotatee later down the line in MC logic.
|
|
||||||
var worldVelVec = localVelVec.mul(controller.orientation).toVec3d().yRot(vehicle.yRot.toRadians())
|
|
||||||
worldVelVec = worldVelVec.add(0.0, extraDownwardForce, 0.0) // Add the stamina depletion force to bring the ride down.
|
|
||||||
|
|
||||||
return worldVelVec
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -191,8 +191,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
|||||||
newVelocity = newVelocity.normalize().scale(vehicle.deltaMovement.length())
|
newVelocity = newVelocity.normalize().scale(vehicle.deltaMovement.length())
|
||||||
}
|
}
|
||||||
|
|
||||||
// speed up and slow down based on input
|
//speed up and slow down based on input
|
||||||
if (driver.zza != 0.0f && state.stamina.get() > 0.0 && newVelocity.length() < glideTopSpeed) {
|
if (driver.zza != 0.0f && state.stamina.get() > 0.0) {
|
||||||
//make sure it can't exceed top speed
|
//make sure it can't exceed top speed
|
||||||
val forwardInput = when {
|
val forwardInput = when {
|
||||||
state.stamina.get() == 0.0f -> 0.0
|
state.stamina.get() == 0.0f -> 0.0
|
||||||
@@ -209,7 +209,7 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
|||||||
activeInput = true
|
activeInput = true
|
||||||
}
|
}
|
||||||
|
|
||||||
val controller = (vehicle as? OrientationControllable)?.orientationController
|
val controller = (driver as? OrientationControllable)?.orientationController
|
||||||
if (controller != null) {
|
if (controller != null) {
|
||||||
//Base glide speed change on current pitch of the ride.
|
//Base glide speed change on current pitch of the ride.
|
||||||
glideSpeedChange = sin(Math.toRadians(controller.pitch.toDouble()))
|
glideSpeedChange = sin(Math.toRadians(controller.pitch.toDouble()))
|
||||||
@@ -285,13 +285,15 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
|||||||
driver: Player,
|
driver: Player,
|
||||||
deltaTime: Double
|
deltaTime: Double
|
||||||
): Vec3 {
|
): Vec3 {
|
||||||
if (vehicle !is OrientationControllable) return Vec3.ZERO
|
if (Cobblemon.config.disableRoll) return Vec3.ZERO
|
||||||
val controller = (vehicle as OrientationControllable).orientationController
|
if (driver !is OrientationControllable) return Vec3.ZERO
|
||||||
|
val controller = (driver as OrientationControllable).orientationController
|
||||||
|
|
||||||
val handling = vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalBird.handlingExpr!!)
|
val handling = vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalBird.handlingExpr!!)
|
||||||
|
val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalBird.speedExpr!!) / 20.0
|
||||||
|
|
||||||
val yawDeltaDeg = deltaTime * handling * sin(Math.toRadians(controller.roll.toDouble()))
|
val yawDeltaDeg = deltaTime * handling * sin(Math.toRadians(controller.roll.toDouble())) //* sin(Math.toRadians(controller.roll.toDouble())).sign
|
||||||
val trueYawDelt = yawDeltaDeg * abs(cos(Math.toRadians(controller.pitch.toDouble()))*2).coerceIn(-1.0, 1.0)
|
val trueYawDelt = yawDeltaDeg * abs(cos(Math.toRadians(controller.pitch.toDouble())))// * sqrt(RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), 0.0, topSpeed))
|
||||||
|
|
||||||
// Dampen yaw when upside down
|
// Dampen yaw when upside down
|
||||||
val yawDampen = (1 - abs(min(cos(controller.roll.toRadians()),0.0f)).pow(2))
|
val yawDampen = (1 - abs(min(cos(controller.roll.toRadians()),0.0f)).pow(2))
|
||||||
@@ -300,13 +302,10 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
|||||||
// Correct orientation when at low speeds
|
// Correct orientation when at low speeds
|
||||||
correctOrientation(settings, state, vehicle, controller, deltaTime)
|
correctOrientation(settings, state, vehicle, controller, deltaTime)
|
||||||
|
|
||||||
val pCorr = (state.currPitchCorrectionForce.get() * deltaTime).toFloat()
|
controller.applyGlobalPitch(state.currPitchCorrectionForce.get().toRadians())
|
||||||
val rCorr = (state.currRollCorrectionForce.get() * deltaTime).toFloat()
|
|
||||||
controller.applyGlobalPitch(pCorr)
|
|
||||||
controller.rotateRoll(rCorr)
|
|
||||||
|
|
||||||
//yaw, pitch, roll
|
//yaw, pitch, roll
|
||||||
return Vec3(0.0, 0.0, 0.0)
|
return Vec3(0.0, 0.0, state.currRollCorrectionForce.get())
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun correctOrientation(
|
private fun correctOrientation(
|
||||||
@@ -317,48 +316,45 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
|||||||
deltaTime: Double
|
deltaTime: Double
|
||||||
) {
|
) {
|
||||||
// Calculate correcting roll force.
|
// Calculate correcting roll force.
|
||||||
|
// Mult by cos(pitch) to ensure that it doesn't roll correct at when diving or climbing
|
||||||
val rollCorrectionTimer = vehicle.runtime.resolveDouble(settings.timeToRollCorrect ?: globalBird.timeToRollCorrect!!)
|
val rollCorrectionTimer = vehicle.runtime.resolveDouble(settings.timeToRollCorrect ?: globalBird.timeToRollCorrect!!)
|
||||||
// If the ride is moving then have the correction rate be an equal proportion of:
|
val maxRollCorrectionRate = if (state.rideVelocity.get().length() < 0.1) 15.0f else 8.0f * (cos(controller.pitch.toRadians())).pow(2) * ((state.noInputTimeRoll.get() - rollCorrectionTimer)).coerceIn(0.0, 1.0).toFloat()
|
||||||
// - how rolled are you
|
val maxRollForce = maxRollCorrectionRate / 40.0
|
||||||
// - how long has it been since last mouse input (higher is stronger correction)
|
val rollArrivalDeg = 90.0
|
||||||
// Also the correction is proportional as a whole to how NOT pitched are you so you don't spin endlessly when looking up or down
|
if(state.rideVelocity.get().length() < 0.1 || state.noInputTimeRoll.get() > rollCorrectionTimer) {
|
||||||
val howRolledAmI = sqrt(abs((cos(controller.roll.toRadians()) - 1.0f) * 0.5f)) // sqrt so it trends towards one pretty quickly
|
val arrivalInfluence = (min(rollArrivalDeg,abs(controller.roll).toDouble()) / rollArrivalDeg)
|
||||||
val maxRollCorrectionRate =
|
val desiredRollForce = (0 - controller.roll).sign * maxRollCorrectionRate * arrivalInfluence
|
||||||
if (state.rideVelocity.get().length() < 0.2) 45.0f
|
var steeredRollForce = desiredRollForce - state.currRollCorrectionForce.get()
|
||||||
else 45.0f * cos(controller.pitch.toRadians()).pow(2) * (
|
|
||||||
howRolledAmI*1.0f +
|
|
||||||
(state.noInputTimeRoll.get() - rollCorrectionTimer).coerceIn(0.0, 1.0).pow(2).toFloat()*0.5f
|
|
||||||
)
|
|
||||||
val maxRollForce = maxRollCorrectionRate / 40.0f
|
|
||||||
val rollArrivalDeg = 35.0f
|
|
||||||
val desiredRoll = 0.0f
|
|
||||||
|
|
||||||
// Calculate the signed error (how far and in what direction)
|
// Ensure the 'steering' correction force doesn't exceed our maxForce
|
||||||
val rollError = Mth.wrapDegrees(desiredRoll.angleDifference(controller.roll))
|
if (abs(steeredRollForce) > maxRollForce) {
|
||||||
// Use the absolute error to calculate the magnitude of the influence
|
steeredRollForce = steeredRollForce.sign * maxRollForce
|
||||||
val influenceMagnitude = (min(rollArrivalDeg, abs(rollError)) / rollArrivalDeg)
|
}
|
||||||
val desiredRollForce = maxRollCorrectionRate * influenceMagnitude * -rollError.sign
|
|
||||||
var steeredRollForce = desiredRollForce - state.currRollCorrectionForce.get()
|
// Apply the 'steered' force (its really not a steering force I need a better name)
|
||||||
// Ensure the 'steering' correction force doesn't exceed our maxForce
|
state.currRollCorrectionForce.set(
|
||||||
if (abs(steeredRollForce) > maxRollForce) {
|
state.currRollCorrectionForce.get() + steeredRollForce
|
||||||
steeredRollForce = steeredRollForce.sign * maxRollForce
|
)
|
||||||
|
} else {
|
||||||
|
state.currRollCorrectionForce.set(
|
||||||
|
//reduce rollCorrection gradually
|
||||||
|
lerp(state.currRollCorrectionForce.get(), 0.0, deltaTime * 0.96)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
// Apply the 'steered' force (its really not a steering force I need a better name)
|
|
||||||
state.currRollCorrectionForce.set(
|
|
||||||
state.currRollCorrectionForce.get() + steeredRollForce
|
|
||||||
)
|
|
||||||
|
|
||||||
//Calculate correcting pitch force.
|
//Calculate correcting pitch force.
|
||||||
val maxPitchCorrectionRate = if (state.currUpsideDownForce.get() != 0.0) 15.0f * state.currUpsideDownForce.get().toFloat() else 30.0f
|
val maxPitchCorrectionRate = if (state.currUpsideDownForce.get() != 0.0) 8f * state.currUpsideDownForce.get() else 15f
|
||||||
val maxPitchForce = maxPitchCorrectionRate / 40.0f
|
val maxPitchForce = maxPitchCorrectionRate.toFloat() / 40.0f
|
||||||
val pitchArrivalDeg = 35.0f
|
val pitchArrivalDeg = 45.0f
|
||||||
val desiredPitch = if (state.currUpsideDownForce.get() != 0.0) 90.0f else 0.0f
|
var desiredPitch = if (state.currUpsideDownForce.get() != 0.0) 90.0 else 0.0
|
||||||
|
// if (cos(controller.roll.toRadians()) < 0.0) {
|
||||||
|
// desiredPitch *= -1 // If not rolled over then flip the pitch force. There are better ways to do this :(
|
||||||
|
// }
|
||||||
|
|
||||||
if((state.rideVelocity.get().length() < 0.1) || state.currUpsideDownForce.get() != 0.0) {
|
if((state.rideVelocity.get().length() < 0.1 && controller.pitch < 0.0) || state.currUpsideDownForce.get() != 0.0) {
|
||||||
val pitchErrror = Mth.wrapDegrees(desiredPitch.angleDifference(controller.pitch))
|
val arrivalInfluence = (min(pitchArrivalDeg,abs(Mth.wrapDegrees(desiredPitch.toFloat().angleDifference(controller.pitch)))) / pitchArrivalDeg)
|
||||||
val arrivalInfluence = (min(pitchArrivalDeg,abs(pitchErrror)) / pitchArrivalDeg)
|
val desiredPitchForce = maxPitchCorrectionRate.toFloat() * arrivalInfluence
|
||||||
val desiredPitchForce = maxPitchCorrectionRate * arrivalInfluence * -pitchErrror.sign
|
var steeredPitchForce = (desiredPitchForce - state.currPitchCorrectionForce.get())
|
||||||
var steeredPitchForce = desiredPitchForce - state.currPitchCorrectionForce.get()
|
|
||||||
|
|
||||||
// Ensure the 'steering' correction force doesn't exceed our maxForce
|
// Ensure the 'steering' correction force doesn't exceed our maxForce
|
||||||
if (abs(steeredPitchForce) > maxPitchForce) {
|
if (abs(steeredPitchForce) > maxPitchForce) {
|
||||||
@@ -408,18 +404,80 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
|||||||
state.noInputTimePitch.set(0.0)
|
state.noInputTimePitch.set(0.0)
|
||||||
}
|
}
|
||||||
|
|
||||||
return rollRotation(
|
return when {
|
||||||
settings,
|
Cobblemon.config.disableRoll -> noRollRotation(
|
||||||
state,
|
settings,
|
||||||
vehicle,
|
state,
|
||||||
driver,
|
vehicle,
|
||||||
mouseY,
|
driver,
|
||||||
mouseX,
|
mouseY,
|
||||||
mouseYSmoother,
|
mouseX,
|
||||||
mouseXSmoother,
|
mouseYSmoother,
|
||||||
sensitivity,
|
mouseXSmoother,
|
||||||
deltaTime
|
sensitivity,
|
||||||
|
deltaTime
|
||||||
)
|
)
|
||||||
|
else -> rollRotation(
|
||||||
|
settings,
|
||||||
|
state,
|
||||||
|
vehicle,
|
||||||
|
driver,
|
||||||
|
mouseY,
|
||||||
|
mouseX,
|
||||||
|
mouseYSmoother,
|
||||||
|
mouseXSmoother,
|
||||||
|
sensitivity,
|
||||||
|
deltaTime
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun noRollRotation(
|
||||||
|
settings: BirdSettings,
|
||||||
|
state: BirdState,
|
||||||
|
vehicle: PokemonEntity,
|
||||||
|
driver: Player,
|
||||||
|
mouseY: Double,
|
||||||
|
mouseX: Double,
|
||||||
|
mouseYSmoother: SmoothDouble,
|
||||||
|
mouseXSmoother: SmoothDouble,
|
||||||
|
sensitivity: Double,
|
||||||
|
deltaTime: Double
|
||||||
|
): Vec3 {
|
||||||
|
if (driver !is OrientationControllable) return Vec3.ZERO
|
||||||
|
val controller = (driver as OrientationControllable).orientationController
|
||||||
|
|
||||||
|
// Set roll to zero if transitioning to noroll config
|
||||||
|
controller.rotateRoll(controller.roll * -1.0f)
|
||||||
|
|
||||||
|
val handling = vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalBird.handlingExpr!!)
|
||||||
|
val mouseInputMult = vehicle.runtime.resolveDouble(settings.mouseInputMult ?: globalBird.mouseInputMult!!)
|
||||||
|
|
||||||
|
//Smooth out mouse input.
|
||||||
|
val smoothingSpeed = 4.0
|
||||||
|
val mouseXc = ((mouseX).coerceIn(-60.0, 60.0) / 60.0) * mouseInputMult
|
||||||
|
val mouseYc = ((mouseY).coerceIn(-60.0, 60.0) / 60.0) * mouseInputMult
|
||||||
|
val xInput = mouseXSmoother.getNewDeltaValue(mouseXc * 0.1, deltaTime * smoothingSpeed);
|
||||||
|
val yInput = mouseYSmoother.getNewDeltaValue(mouseYc * 0.1, deltaTime * smoothingSpeed);
|
||||||
|
|
||||||
|
//Give the ability to yaw with x mouse input when at low speeds.
|
||||||
|
val yawForce = xInput * handling //* ( 1.0 - min(sqrt(RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), 0.0, topSpeed)), 0.5))
|
||||||
|
|
||||||
|
//Apply yaw globally as we don't want roll or pitch changes due to local yaw when looking up or down.
|
||||||
|
controller.applyGlobalYaw(yawForce.toFloat() * abs(cos(controller.pitch.toRadians())).pow(2))
|
||||||
|
|
||||||
|
var pitchRot = yInput * handling
|
||||||
|
|
||||||
|
// Pitch up globally
|
||||||
|
if (abs(controller.pitch + pitchRot) >= 89.5 ) {
|
||||||
|
pitchRot = 0.0
|
||||||
|
mouseYSmoother.reset()
|
||||||
|
} else {
|
||||||
|
controller.applyGlobalPitch(pitchRot.toFloat() * -1.0f)
|
||||||
|
}
|
||||||
|
|
||||||
|
//yaw, pitch, roll
|
||||||
|
return Vec3.ZERO
|
||||||
}
|
}
|
||||||
|
|
||||||
fun rollRotation(
|
fun rollRotation(
|
||||||
@@ -434,31 +492,29 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
|||||||
sensitivity: Double,
|
sensitivity: Double,
|
||||||
deltaTime: Double
|
deltaTime: Double
|
||||||
): Vec3 {
|
): Vec3 {
|
||||||
if (vehicle !is OrientationControllable) return Vec3.ZERO
|
if (driver !is OrientationControllable) return Vec3.ZERO
|
||||||
val controller = (vehicle as OrientationControllable).orientationController
|
val controller = (driver as OrientationControllable).orientationController
|
||||||
|
|
||||||
val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalBird.speedExpr!!) / 20.0
|
val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalBird.speedExpr!!) / 20.0
|
||||||
val mouseInputMult = vehicle.runtime.resolveDouble(settings.mouseInputMult ?: globalBird.mouseInputMult!!)
|
val mouseInputMult = vehicle.runtime.resolveDouble(settings.mouseInputMult ?: globalBird.mouseInputMult!!)
|
||||||
// Applied to mouseX to prevent turning upside down when trying to roll hard.
|
|
||||||
val rollDegreeDebuff = if(mouseX.sign.toFloat() == controller.roll.sign) 1 - 0.9f*sqrt(abs(sin(controller.roll.toRadians())))*sqrt(abs(cos(controller.pitch))) else 1.0f
|
|
||||||
|
|
||||||
//Smooth out mouse input.
|
//Smooth out mouse input.
|
||||||
val smoothingSpeed = 2.0
|
val smoothingSpeed = 2.0
|
||||||
val mouseXc = (mouseX).coerceIn(-45.0, 45.0) * mouseInputMult * rollDegreeDebuff
|
val mouseXc = (mouseX).coerceIn(-45.0, 45.0) * mouseInputMult
|
||||||
// When upside down apply a pitching force to nudge the player towards a dive. This reduces the 'weirdness'
|
// When upside down apply a pitching force to nudge the player towards a dive. This reduces the 'weirdness'
|
||||||
// of being upside down
|
// of being upside down
|
||||||
val rolledOverPitchCorrection = -8*sqrt(abs(min(cos(controller.roll.toRadians()),0.0f))) * (cos(controller.pitch.toRadians())).pow(2)
|
val rolledOverPitchCorrection = -8*sqrt(abs(min(cos(controller.roll.toRadians()),0.0f))) * (cos(controller.pitch.toRadians())).pow(2)
|
||||||
val mouseYc = ((mouseY).coerceIn(-45.0, 45.0) * mouseInputMult) + rolledOverPitchCorrection
|
val mouseYc = ((mouseY).coerceIn(-45.0, 45.0) * mouseInputMult) + rolledOverPitchCorrection
|
||||||
val xInput = mouseXSmoother.getNewDeltaValue(mouseXc * 0.1, deltaTime * smoothingSpeed)
|
val xInput = mouseXSmoother.getNewDeltaValue(mouseXc * 0.1, deltaTime * smoothingSpeed);
|
||||||
val yInput = mouseYSmoother.getNewDeltaValue(mouseYc * 0.1, deltaTime * smoothingSpeed)
|
val yInput = mouseYSmoother.getNewDeltaValue(mouseYc * 0.1, deltaTime * smoothingSpeed);
|
||||||
val currSpeed = state.rideVelocity.get().length()
|
val currSpeed = state.rideVelocity.get().length()
|
||||||
val currHorzSpeed = state.rideVelocity.get().horizontalDistance()
|
val currHorzSpeed = state.rideVelocity.get().horizontalDistance()
|
||||||
val hoverSpeed = 0.1
|
val hoverSpeed = 0.1
|
||||||
val pitchDamping = abs(cos(controller.pitch.toRadians())).pow(2) // Helper value used when wanting to discard the influence of another value at steep pitches
|
|
||||||
|
|
||||||
// Yaw locally when at or below hoverSpeed but not when pitched up or rolled over
|
// Yaw locally when at or below hoverSpeed but not when pitched up or rolled over
|
||||||
val globalYaw = xInput * (1 - sqrt(RidingBehaviour.scaleToRange(currHorzSpeed, hoverSpeed, topSpeed))).coerceIn(0.0, 1.0)
|
val yawDampen = abs(cos(controller.pitch.toRadians())).pow(2) * abs(cos(controller.roll.toRadians())).pow(2)
|
||||||
controller.applyGlobalYaw(globalYaw.toFloat())
|
val localYaw = if (currHorzSpeed < hoverSpeed) xInput * (1 - sqrt(RidingBehaviour.scaleToRange(currHorzSpeed, hoverSpeed, topSpeed))).coerceIn(0.0, 1.0)
|
||||||
|
else 0.0 //xInput * 0.4 * cos(controller.roll.toRadians()).coerceIn(0.0f, 1.0f) * yawDampen
|
||||||
|
|
||||||
// Pitch locally up or down depending upon a number of factors:
|
// Pitch locally up or down depending upon a number of factors:
|
||||||
// - Reduce pitch substantially when rolled and in a steep yaw. This prevents the player from ignoring a slow handling stat
|
// - Reduce pitch substantially when rolled and in a steep yaw. This prevents the player from ignoring a slow handling stat
|
||||||
@@ -473,18 +529,14 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
|||||||
// Apply a roll righting force when trying to pitch hard while rolled sideways. This nudges the player towards
|
// Apply a roll righting force when trying to pitch hard while rolled sideways. This nudges the player towards
|
||||||
// pitching globally
|
// pitching globally
|
||||||
val pitchInfluencedRollCorrection = 0.0
|
val pitchInfluencedRollCorrection = 0.0
|
||||||
val howRolledAmI = (( cos(controller.roll.toRadians()) - 1).coerceIn(-1.0f, 0.0f) * -2) //Coerce into how much roll you want to let in in the deadzone
|
val howRolledAmI = (( cos(controller.roll.toRadians()) - 1).coerceIn(-1.0f, 0.0f) * -2).coerceIn(0.0f, 0.7f) //Coerce into how much roll you want to let in in the deadzone
|
||||||
val isInputtingTowardsRoll = if ( xInput.sign == controller.roll.sign.toDouble()) 1.0 else 0.0
|
val inputInRolledDir = if (xInput.sign.toFloat() == controller.roll.sign) 1.0 else -cos(controller.roll.toRadians()).coerceIn(-1.0f, 0.0f).toDouble()
|
||||||
val inputInRolledDir = if (isInputtingTowardsRoll == 1.0) 1.0 else -cos(controller.roll.toRadians()).coerceIn(-1.0f, 0.0f).toDouble()
|
val rollDampen = (1 - howRolledAmI * abs(cos(controller.pitch.toRadians())).pow(2) * inputInRolledDir)
|
||||||
val rollDampen = (1 - howRolledAmI.coerceIn(0.0f, 0.7f) * pitchDamping * inputInRolledDir)
|
|
||||||
val rollForce = if (currHorzSpeed > hoverSpeed) xInput * sqrt(abs(RidingBehaviour.scaleToRange(currHorzSpeed, hoverSpeed, topSpeed)).coerceIn(0.0,1.0)) * rollDampen + pitchInfluencedRollCorrection
|
val rollForce = if (currHorzSpeed > hoverSpeed) xInput * sqrt(abs(RidingBehaviour.scaleToRange(currHorzSpeed, hoverSpeed, topSpeed)).coerceIn(0.0,1.0)) * rollDampen + pitchInfluencedRollCorrection
|
||||||
else 0.0
|
else 0.0
|
||||||
|
|
||||||
// When already rolled significantly part of the roll force should turn to local yaw force
|
|
||||||
val localYawForce = rollForce * abs(sin(controller.roll.toRadians())).pow(2) * pitchDamping * isInputtingTowardsRoll
|
|
||||||
|
|
||||||
//yaw, pitch, roll
|
//yaw, pitch, roll
|
||||||
return Vec3(localYawForce, localPitch, rollForce)
|
return Vec3(localYaw, localPitch, rollForce)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -532,11 +584,11 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
|||||||
driver: Player
|
driver: Player
|
||||||
): Float {
|
): Float {
|
||||||
val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalBird.speedExpr!!) / 20.0
|
val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalBird.speedExpr!!) / 20.0
|
||||||
|
val glideTopSpeed = topSpeed * vehicle.runtime.resolveDouble(settings.glideSpeedExpr ?: globalBird.glideSpeedExpr!!)
|
||||||
val currSpeed = state.rideVelocity.get().length()
|
val currSpeed = state.rideVelocity.get().length()
|
||||||
|
|
||||||
val speedOverTopSpeed = max( 0.0, currSpeed - topSpeed)
|
// Must I ensure that topspeed is greater than minimum?
|
||||||
|
val normalizedGlideSpeed = RidingBehaviour.scaleToRange(currSpeed, topSpeed, glideTopSpeed)
|
||||||
val normalizedGlideSpeed = RidingBehaviour.scaleToRange(speedOverTopSpeed, 0.0, 0.3)
|
|
||||||
|
|
||||||
// Only ever want the fov change to be a max of 0.2 and for it to have non linear scaling.
|
// Only ever want the fov change to be a max of 0.2 and for it to have non linear scaling.
|
||||||
return 1.0f + normalizedGlideSpeed.pow(2).toFloat() * 0.2f
|
return 1.0f + normalizedGlideSpeed.pow(2).toFloat() * 0.2f
|
||||||
@@ -640,22 +692,6 @@ class BirdSettings : RidingBehaviourSettings {
|
|||||||
var glideSpeedExpr: Expression? = null
|
var glideSpeedExpr: Expression? = null
|
||||||
private set
|
private set
|
||||||
|
|
||||||
// debuff to stamina drain (increases stamina drain?) depending on how horizontal you're looking (so just drain more when climbing in altitude)
|
|
||||||
// So for the base 1.5: If looking straight up and holding forward you drain at 150 percent the rate you would if
|
|
||||||
// you were horizontal.
|
|
||||||
var stamDrainHorzMod: Expression? = null
|
|
||||||
private set
|
|
||||||
|
|
||||||
// long ass variable name
|
|
||||||
// Percent of stamina drain during glide (percent of normal drain rate) So base is 25 percent. (change to 0 if you want no drain or negative if you want regen)
|
|
||||||
var stamDrainPercRateGlide: Expression? = null
|
|
||||||
private set
|
|
||||||
|
|
||||||
// Percent of stamina drain as a factor of how hard you're diving. So if its zero then at full dive you drain no stam.
|
|
||||||
// This stacks with `stamDrainPercRateGlide`
|
|
||||||
// This is coerced between 1 and 0 or things would get weird.
|
|
||||||
var stamDrainPerRateDive: Expression? = null
|
|
||||||
private set
|
|
||||||
var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
|
var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
|
||||||
|
|
||||||
override fun encode(buffer: RegistryFriendlyByteBuf) {
|
override fun encode(buffer: RegistryFriendlyByteBuf) {
|
||||||
@@ -670,9 +706,6 @@ class BirdSettings : RidingBehaviourSettings {
|
|||||||
buffer.writeNullableExpression(speedExpr)
|
buffer.writeNullableExpression(speedExpr)
|
||||||
buffer.writeNullableExpression(accelerationExpr)
|
buffer.writeNullableExpression(accelerationExpr)
|
||||||
buffer.writeNullableExpression(staminaExpr)
|
buffer.writeNullableExpression(staminaExpr)
|
||||||
buffer.writeNullableExpression(stamDrainHorzMod)
|
|
||||||
buffer.writeNullableExpression(stamDrainPercRateGlide)
|
|
||||||
buffer.writeNullableExpression(stamDrainPerRateDive)
|
|
||||||
buffer.writeNullableExpression(timeToRollCorrect)
|
buffer.writeNullableExpression(timeToRollCorrect)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -688,9 +721,6 @@ class BirdSettings : RidingBehaviourSettings {
|
|||||||
speedExpr = buffer.readNullableExpression()
|
speedExpr = buffer.readNullableExpression()
|
||||||
accelerationExpr = buffer.readNullableExpression()
|
accelerationExpr = buffer.readNullableExpression()
|
||||||
staminaExpr = buffer.readNullableExpression()
|
staminaExpr = buffer.readNullableExpression()
|
||||||
stamDrainHorzMod = buffer.readNullableExpression()
|
|
||||||
stamDrainPercRateGlide = buffer.readNullableExpression()
|
|
||||||
stamDrainPerRateDive = buffer.readNullableExpression()
|
|
||||||
timeToRollCorrect = buffer.readNullableExpression()
|
timeToRollCorrect = buffer.readNullableExpression()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -51,7 +51,7 @@ class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
|
|||||||
|
|
||||||
val poseProvider = PoseProvider<HoverSettings, HoverState>(PoseType.STAND)
|
val poseProvider = PoseProvider<HoverSettings, HoverState>(PoseType.STAND)
|
||||||
.with(PoseOption(PoseType.WALK) { _, state, _ ->
|
.with(PoseOption(PoseType.WALK) { _, state, _ ->
|
||||||
return@PoseOption abs(state.rideVelocity.get().length()) > 0.01
|
return@PoseOption abs(state.rideVelocity.get().z) > 0.2
|
||||||
})
|
})
|
||||||
|
|
||||||
override fun isActive(
|
override fun isActive(
|
||||||
|
|||||||
+113
-4
@@ -161,7 +161,7 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
|||||||
driver: Player,
|
driver: Player,
|
||||||
input: Vec3
|
input: Vec3
|
||||||
): Vec3 {
|
): Vec3 {
|
||||||
val controller = (vehicle as? OrientationControllable)?.orientationController
|
val controller = (driver as? OrientationControllable)?.orientationController
|
||||||
if (controller == null || controller.orientation == null) return Vec3.ZERO
|
if (controller == null || controller.orientation == null) return Vec3.ZERO
|
||||||
|
|
||||||
//Calculate ride space velocity
|
//Calculate ride space velocity
|
||||||
@@ -265,6 +265,8 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
|||||||
driver: Player,
|
driver: Player,
|
||||||
deltaTime: Double
|
deltaTime: Double
|
||||||
): Vec3 {
|
): Vec3 {
|
||||||
|
//don't yaw this way if
|
||||||
|
if (Cobblemon.config.disableRoll) return Vec3.ZERO
|
||||||
|
|
||||||
//Cap at a rate of 5fps so frame skips dont lead to huge jumps
|
//Cap at a rate of 5fps so frame skips dont lead to huge jumps
|
||||||
val cappedDeltaTime = min(deltaTime, 0.2)
|
val cappedDeltaTime = min(deltaTime, 0.2)
|
||||||
@@ -296,8 +298,107 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
|||||||
sensitivity: Double,
|
sensitivity: Double,
|
||||||
deltaTime: Double
|
deltaTime: Double
|
||||||
): Vec3 {
|
): Vec3 {
|
||||||
if (vehicle !is OrientationControllable) return Vec3.ZERO
|
return when {
|
||||||
|
Cobblemon.config.disableRoll -> noRollRotation(
|
||||||
|
settings,
|
||||||
|
state,
|
||||||
|
vehicle,
|
||||||
|
driver,
|
||||||
|
mouseY,
|
||||||
|
mouseX,
|
||||||
|
mouseYSmoother,
|
||||||
|
mouseXSmoother,
|
||||||
|
sensitivity,
|
||||||
|
deltaTime
|
||||||
|
)
|
||||||
|
else -> rollRotation(
|
||||||
|
settings,
|
||||||
|
state,
|
||||||
|
vehicle,
|
||||||
|
driver,
|
||||||
|
mouseY,
|
||||||
|
mouseX,
|
||||||
|
mouseYSmoother,
|
||||||
|
mouseXSmoother,
|
||||||
|
sensitivity,
|
||||||
|
deltaTime
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun noRollRotation(
|
||||||
|
settings: JetSettings,
|
||||||
|
state: JetState,
|
||||||
|
vehicle: PokemonEntity,
|
||||||
|
driver: Player,
|
||||||
|
mouseY: Double,
|
||||||
|
mouseX: Double,
|
||||||
|
mouseYSmoother: SmoothDouble,
|
||||||
|
mouseXSmoother: SmoothDouble,
|
||||||
|
sensitivity: Double,
|
||||||
|
deltaTime: Double
|
||||||
|
): Vec3 {
|
||||||
|
if (driver !is OrientationControllable) return Vec3.ZERO
|
||||||
|
val controller = (driver as OrientationControllable).orientationController
|
||||||
|
|
||||||
|
// Set roll to zero if transitioning to noroll config
|
||||||
|
controller.rotateRoll(controller.roll * -1.0f)
|
||||||
|
|
||||||
|
//Cap at a rate of 5fps so frame skips dont lead to huge jumps
|
||||||
|
val cappedDeltaTime = min(deltaTime, 0.2)
|
||||||
|
|
||||||
|
// Accumulate the mouse input
|
||||||
|
state.currMouseXForce.set((state.currMouseXForce.get() + (0.0015 * mouseX)).coerceIn(-1.0, 1.0))
|
||||||
|
state.currMouseYForce.set((state.currMouseYForce.get() + (0.0015 * mouseY)).coerceIn(-1.0, 1.0))
|
||||||
|
|
||||||
|
//Get handling in degrees per second
|
||||||
|
val handlingDebuff = if(state.stamina.get() == 0.0f) 0.5 else 1.0
|
||||||
|
var handling = vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalJet.handlingExpr!!) * handlingDebuff
|
||||||
|
//convert it to delta time
|
||||||
|
handling *= (cappedDeltaTime)
|
||||||
|
|
||||||
|
var pitchRot = handling * state.currMouseYForce.get()
|
||||||
|
|
||||||
|
// Yaw
|
||||||
|
val yawRot = handling * 0.5 * state.currMouseXForce.get()
|
||||||
|
controller.applyGlobalYaw(yawRot.toFloat())
|
||||||
|
|
||||||
|
if (abs(controller.pitch + pitchRot) >= 89.5 ) {
|
||||||
|
pitchRot = 0.0
|
||||||
|
state.currMouseYForce.set(0.0)
|
||||||
|
mouseYSmoother.reset()
|
||||||
|
} else {
|
||||||
|
controller.applyGlobalPitch(pitchRot.toFloat() * -1.0f)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Have accumulated input begin decay when no input detected
|
||||||
|
if (abs(mouseX) == 0.0) {
|
||||||
|
// Have decay on roll be much stronger.
|
||||||
|
state.currMouseXForce.set(lerp(state.currMouseXForce.get(), 0.0, 0.02))
|
||||||
|
}
|
||||||
|
if (mouseY == 0.0) {
|
||||||
|
state.currMouseYForce.set(lerp(state.currMouseYForce.get(), 0.0, 0.005))
|
||||||
|
}
|
||||||
|
|
||||||
|
//yaw, pitch, roll
|
||||||
|
return Vec3.ZERO
|
||||||
|
}
|
||||||
|
|
||||||
|
fun rollRotation(
|
||||||
|
settings: JetSettings,
|
||||||
|
state: JetState,
|
||||||
|
vehicle: PokemonEntity,
|
||||||
|
driver: Player,
|
||||||
|
mouseY: Double,
|
||||||
|
mouseX: Double,
|
||||||
|
mouseYSmoother: SmoothDouble,
|
||||||
|
mouseXSmoother: SmoothDouble,
|
||||||
|
sensitivity: Double,
|
||||||
|
deltaTime: Double
|
||||||
|
): Vec3 {
|
||||||
|
if (driver !is OrientationControllable) return Vec3.ZERO
|
||||||
|
//TODO: figure out a cleaner solution to this issue of large jumps when skipping frames or lagging
|
||||||
|
//Cap at a rate of 5fps so frame skips dont lead to huge jumps
|
||||||
val cappedDeltaTime = min(deltaTime, 0.2)
|
val cappedDeltaTime = min(deltaTime, 0.2)
|
||||||
|
|
||||||
// Accumulate the mouse input
|
// Accumulate the mouse input
|
||||||
@@ -311,6 +412,14 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
|||||||
//convert it to delta time
|
//convert it to delta time
|
||||||
handling *= (cappedDeltaTime)
|
handling *= (cappedDeltaTime)
|
||||||
|
|
||||||
|
|
||||||
|
val poke = driver.vehicle as? PokemonEntity
|
||||||
|
|
||||||
|
//TODO: reevaluate if deadzones are needed and if they are still causing issues.
|
||||||
|
//create deadzones for the constant input values.
|
||||||
|
//val xInput = remapWithDeadzone(state.currMouseXForce, 0.025, 1.0)
|
||||||
|
//val yInput = remapWithDeadzone(state.currMouseYForce, 0.025, 1.0)
|
||||||
|
|
||||||
val pitchRot = handling * state.currMouseYForce.get()
|
val pitchRot = handling * state.currMouseYForce.get()
|
||||||
|
|
||||||
// Roll
|
// Roll
|
||||||
@@ -321,10 +430,10 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
|||||||
// Have accumulated input begin decay when no input detected
|
// Have accumulated input begin decay when no input detected
|
||||||
if (abs(mouseX) == 0.0) {
|
if (abs(mouseX) == 0.0) {
|
||||||
// Have decay on roll be much stronger.
|
// Have decay on roll be much stronger.
|
||||||
state.currMouseXForce.set(lerp(state.currMouseXForce.get(), 0.0, 0.08))
|
state.currMouseXForce.set(lerp(state.currMouseXForce.get(), 0.0, 0.02))
|
||||||
}
|
}
|
||||||
if (mouseY == 0.0) {
|
if (mouseY == 0.0) {
|
||||||
state.currMouseYForce.set(lerp(state.currMouseYForce.get(), 0.0, 0.02))
|
state.currMouseYForce.set(lerp(state.currMouseYForce.get(), 0.0, 0.005))
|
||||||
}
|
}
|
||||||
|
|
||||||
//yaw, pitch, roll
|
//yaw, pitch, roll
|
||||||
|
|||||||
+13
-18
@@ -103,12 +103,12 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
|
|||||||
|
|
||||||
if (!state.isVehicleSprinting.get()) {
|
if (!state.isVehicleSprinting.get()) {
|
||||||
if (state.staminaBuffer.get() >= 20) {
|
if (state.staminaBuffer.get() >= 20) {
|
||||||
val staminaIncrease = (1.0f / vehicle.runtime.resolveDouble(settings.stamReplenishTimeSeconds ?: globalBoat.stamReplenishTimeSeconds!!) ).toFloat() / 20.0f
|
val staminaIncrease = vehicle.runtime.resolveDouble(settings.staminaIncreaseExpr ?: globalBoat.staminaIncreaseExpr!!)
|
||||||
state.stamina.set(min(1.0f, state.stamina.get() + staminaIncrease))
|
state.stamina.set(min(1.0f, state.stamina.get() + 0.01f * staminaIncrease.toFloat()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (abs(state.rideVelocity.get().z) > 0.1 && state.isVehicleSprinting.get()) {
|
else if (abs(state.rideVelocity.get().z) > 0.1 && state.isVehicleSprinting.get()) {
|
||||||
consumeStamina(vehicle, driver, settings, state)
|
consumeStamina(vehicle, driver, settings, state, 0.01f)
|
||||||
}
|
}
|
||||||
state.staminaBuffer.set(state.staminaBuffer.get() + 1)
|
state.staminaBuffer.set(state.staminaBuffer.get() + 1)
|
||||||
super.tick(settings, state, vehicle, driver, input)
|
super.tick(settings, state, vehicle, driver, input)
|
||||||
@@ -219,12 +219,12 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
|
|||||||
return state.stamina.get() != 0f
|
return state.stamina.get() != 0f
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun consumeStamina(vehicle: PokemonEntity, driver: Player, settings: BoatSettings, state: BoatState) {
|
private fun consumeStamina(vehicle: PokemonEntity, driver: Player, settings: BoatSettings, state: BoatState, drain: Float) {
|
||||||
if (vehicle.runtime.resolveBoolean(settings.infiniteStamina ?: globalBoat.infiniteStamina!!)) {
|
val staminaModifier = vehicle.runtime.resolveFloat(settings.staminaDecreaseExpr ?: globalBoat.staminaDecreaseExpr!!)
|
||||||
|
if (staminaModifier == 0F) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
val stamDrainRate = (1.0f / vehicle.runtime.resolveDouble(settings.staminaExpr ?: globalBoat.staminaExpr!!)).toFloat() / 20.0f
|
state.stamina.set(max(0f, state.stamina.get() - drain / staminaModifier))
|
||||||
state.stamina.set(max(0f, state.stamina.get() - stamDrainRate))
|
|
||||||
if (state.stamina.get() == 0f) {
|
if (state.stamina.get() == 0f) {
|
||||||
state.isVehicleSprinting.set(false)
|
state.isVehicleSprinting.set(false)
|
||||||
driver.isSprinting = false
|
driver.isSprinting = false
|
||||||
@@ -404,19 +404,16 @@ class BoatSettings : RidingBehaviourSettings {
|
|||||||
override val stats = mutableMapOf<RidingStat, IntRange>()
|
override val stats = mutableMapOf<RidingStat, IntRange>()
|
||||||
var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
|
var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
|
||||||
|
|
||||||
var infiniteStamina: Expression? = null
|
|
||||||
private set
|
|
||||||
|
|
||||||
var terminalVelocity: Expression? = null
|
var terminalVelocity: Expression? = null
|
||||||
private set
|
private set
|
||||||
|
|
||||||
var rotatePokemonHead: Expression? = null
|
var rotatePokemonHead: Expression? = null
|
||||||
private set
|
private set
|
||||||
|
|
||||||
var stamReplenishTimeSeconds: Expression? = null
|
var staminaIncreaseExpr: Expression? = null
|
||||||
private set
|
private set
|
||||||
|
|
||||||
var staminaExpr: Expression? = null
|
var staminaDecreaseExpr: Expression? = null
|
||||||
private set
|
private set
|
||||||
|
|
||||||
var rotationSpeedModifierExpr: Expression? = null
|
var rotationSpeedModifierExpr: Expression? = null
|
||||||
@@ -441,11 +438,10 @@ class BoatSettings : RidingBehaviourSettings {
|
|||||||
override fun encode(buffer: RegistryFriendlyByteBuf) {
|
override fun encode(buffer: RegistryFriendlyByteBuf) {
|
||||||
buffer.writeRidingStats(stats)
|
buffer.writeRidingStats(stats)
|
||||||
rideSounds.encode(buffer)
|
rideSounds.encode(buffer)
|
||||||
buffer.writeNullableExpression(infiniteStamina)
|
|
||||||
buffer.writeNullableExpression(terminalVelocity)
|
buffer.writeNullableExpression(terminalVelocity)
|
||||||
buffer.writeNullableExpression(rotatePokemonHead)
|
buffer.writeNullableExpression(rotatePokemonHead)
|
||||||
buffer.writeNullableExpression(stamReplenishTimeSeconds)
|
buffer.writeNullableExpression(staminaIncreaseExpr)
|
||||||
buffer.writeNullableExpression(staminaExpr)
|
buffer.writeNullableExpression(staminaDecreaseExpr)
|
||||||
buffer.writeNullableExpression(rotationSpeedModifierExpr)
|
buffer.writeNullableExpression(rotationSpeedModifierExpr)
|
||||||
buffer.writeNullableExpression(jumpStrengthExpr)
|
buffer.writeNullableExpression(jumpStrengthExpr)
|
||||||
buffer.writeNullableExpression(speedExpr)
|
buffer.writeNullableExpression(speedExpr)
|
||||||
@@ -458,11 +454,10 @@ class BoatSettings : RidingBehaviourSettings {
|
|||||||
override fun decode(buffer: RegistryFriendlyByteBuf) {
|
override fun decode(buffer: RegistryFriendlyByteBuf) {
|
||||||
stats.putAll(buffer.readRidingStats())
|
stats.putAll(buffer.readRidingStats())
|
||||||
rideSounds = RideSoundSettingsList.decode(buffer)
|
rideSounds = RideSoundSettingsList.decode(buffer)
|
||||||
infiniteStamina = buffer.readNullableExpression()
|
|
||||||
terminalVelocity = buffer.readNullableExpression()
|
terminalVelocity = buffer.readNullableExpression()
|
||||||
rotatePokemonHead = buffer.readNullableExpression()
|
rotatePokemonHead = buffer.readNullableExpression()
|
||||||
stamReplenishTimeSeconds = buffer.readNullableExpression()
|
staminaIncreaseExpr = buffer.readNullableExpression()
|
||||||
staminaExpr = buffer.readNullableExpression()
|
staminaDecreaseExpr = buffer.readNullableExpression()
|
||||||
rotationSpeedModifierExpr = buffer.readNullableExpression()
|
rotationSpeedModifierExpr = buffer.readNullableExpression()
|
||||||
jumpStrengthExpr = buffer.readNullableExpression()
|
jumpStrengthExpr = buffer.readNullableExpression()
|
||||||
speedExpr = buffer.readNullableExpression()
|
speedExpr = buffer.readNullableExpression()
|
||||||
|
|||||||
+173
-145
@@ -20,7 +20,6 @@ import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
|
|||||||
import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
|
import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
|
||||||
import com.cobblemon.mod.common.api.riding.behaviour.Side
|
import com.cobblemon.mod.common.api.riding.behaviour.Side
|
||||||
import com.cobblemon.mod.common.api.riding.behaviour.ridingState
|
import com.cobblemon.mod.common.api.riding.behaviour.ridingState
|
||||||
import com.cobblemon.mod.common.api.riding.behaviour.types.air.angleDifference
|
|
||||||
import com.cobblemon.mod.common.api.riding.posing.PoseOption
|
import com.cobblemon.mod.common.api.riding.posing.PoseOption
|
||||||
import com.cobblemon.mod.common.api.riding.posing.PoseProvider
|
import com.cobblemon.mod.common.api.riding.posing.PoseProvider
|
||||||
import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
|
import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
|
||||||
@@ -48,7 +47,6 @@ import net.minecraft.world.entity.LivingEntity
|
|||||||
import net.minecraft.world.entity.player.Player
|
import net.minecraft.world.entity.player.Player
|
||||||
import net.minecraft.world.phys.Vec2
|
import net.minecraft.world.phys.Vec2
|
||||||
import net.minecraft.world.phys.Vec3
|
import net.minecraft.world.phys.Vec3
|
||||||
import org.joml.Vector3f
|
|
||||||
|
|
||||||
class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
|
class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
|
||||||
companion object {
|
companion object {
|
||||||
@@ -64,7 +62,7 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
val poseProvider = PoseProvider<DolphinSettings, DolphinState>(PoseType.FLOAT)
|
val poseProvider = PoseProvider<DolphinSettings, DolphinState>(PoseType.FLOAT)
|
||||||
.with(PoseOption(PoseType.SWIM) { _, state, entity -> abs(state.rideVelocity.get().length()) > 0.05 })
|
.with(PoseOption(PoseType.SWIM) { _, _, entity -> entity.deltaMovement.length() > 0.1 })
|
||||||
|
|
||||||
override fun isActive(settings: DolphinSettings, state: DolphinState, vehicle: PokemonEntity): Boolean {
|
override fun isActive(settings: DolphinSettings, state: DolphinState, vehicle: PokemonEntity): Boolean {
|
||||||
return vehicle.isInWater || !vehicle.onGround()
|
return vehicle.isInWater || !vehicle.onGround()
|
||||||
@@ -153,46 +151,37 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
|
|||||||
driver: Player,
|
driver: Player,
|
||||||
input: Vec3
|
input: Vec3
|
||||||
): Vec3 {
|
): Vec3 {
|
||||||
if (vehicle !is OrientationControllable) return Vec3.ZERO
|
if (driver !is OrientationControllable) return Vec3.ZERO
|
||||||
val controller = (vehicle as OrientationControllable).orientationController
|
val controller = (driver as OrientationControllable).orientationController
|
||||||
val orientation = controller.orientation ?: return Vec3.ZERO
|
|
||||||
|
|
||||||
val runtime = vehicle.runtime
|
val runtime = vehicle.runtime
|
||||||
val boostMod = if (state.boosting.get()) runtime.resolveDouble(settings.jumpExpr ?: globalDolphin.jumpExpr!!) else 1.0
|
val boostMod = if (state.boosting.get()) runtime.resolveDouble(settings.jumpExpr ?: globalDolphin.jumpExpr!!) else 1.0
|
||||||
val topSpeed = (vehicle.runtime.resolveDouble(settings.speedExpr ?: globalDolphin.speedExpr!!) / 20.0) * boostMod
|
val topSpeed = (vehicle.runtime.resolveDouble(settings.speedExpr ?: globalDolphin.speedExpr!!) / 20.0) * boostMod
|
||||||
val accel = (topSpeed / (vehicle.runtime.resolveDouble(settings.accelerationExpr ?: globalDolphin.accelerationExpr!!) * 20.0)) * boostMod
|
val accel = (topSpeed / (vehicle.runtime.resolveDouble(settings.accelerationExpr ?: globalDolphin.accelerationExpr!!) * 20.0)) * boostMod
|
||||||
val strafeFactor = runtime.resolveDouble(settings.strafeFactor ?: globalDolphin.strafeFactor!!)
|
|
||||||
val reverseDriveFactor = runtime.resolveDouble(settings.reverseDriveFactor ?: globalDolphin.reverseDriveFactor!!)
|
|
||||||
var currVel = state.rideVelocity.get()
|
|
||||||
|
|
||||||
/*********************************************
|
/*********************************************
|
||||||
* Breaching logic
|
* Breaching logic
|
||||||
*********************************************/
|
*********************************************/
|
||||||
if (!vehicle.isInWater && !vehicle.isUnderWater)
|
if (!vehicle.isInWater && !vehicle.isUnderWater)
|
||||||
{
|
{
|
||||||
var prevVel = state.lastVelocity.get()
|
val currVel = state.lastVelocity.get()
|
||||||
val breachBoost = 0.3
|
val breachBoost = 1.5
|
||||||
state.clearMouseSmoothers.set(false)
|
|
||||||
if (!state.hasBreached.get()) {
|
if (!state.hasBreached.get()) {
|
||||||
// Apply an upwards breaching force if boosting. This will enhance jumping out of water to feel more fun
|
// Apply an upwards breaching force if boosting. This will enhance jumping out of water to feel more
|
||||||
|
// fun
|
||||||
if (state.boosting.get()) {
|
if (state.boosting.get()) {
|
||||||
prevVel = Vec3(prevVel.x, prevVel.y + breachBoost*(sin(-controller.pitch.toRadians()).coerceIn(0.0f,0.5f)*2.0).pow(2), prevVel.z)
|
state.lastVelocity.set(Vec3(currVel.x, currVel.y + breachBoost*sin(-controller.pitch.toRadians()).coerceIn(0.0f,0.5f), currVel.z))
|
||||||
}
|
}
|
||||||
state.hasBreached.set(true)
|
state.hasBreached.set(true)
|
||||||
} else {
|
} else {
|
||||||
val gravity = (9.8 / ( 20.0)) * 0.2 * 0.4
|
val gravity = (9.8 / ( 20.0)) * 0.2 * 0.4
|
||||||
val terminalVel = 2.0
|
val terminalVel = 2.0
|
||||||
prevVel = Vec3(prevVel.x, max(-terminalVel, prevVel.y - gravity), prevVel.z)
|
state.lastVelocity.set(Vec3(currVel.x, max(-terminalVel, currVel.y - gravity), currVel.z)) //.yRot(vehicle.yRot.toRadians()))
|
||||||
}
|
}
|
||||||
|
return state.lastVelocity.get()
|
||||||
state.lastVelocity.set(prevVel)
|
|
||||||
return state.lastVelocity.get().yRot(vehicle.yRot.toRadians())
|
|
||||||
} else {
|
} else {
|
||||||
if(state.hasBreached.get()) {
|
state.lastVelocity.set(vehicle.deltaMovement.yRot(vehicle.yRot.toRadians()))
|
||||||
state.clearMouseSmoothers.set(true)
|
|
||||||
}
|
|
||||||
state.hasBreached.set(false)
|
state.hasBreached.set(false)
|
||||||
currVel = Vec3(currVel.x, 0.0, currVel.z) // Reset y velocity to account for y vel persistance edgecase
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*********************************************
|
/*********************************************
|
||||||
@@ -201,30 +190,32 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
|
|||||||
if (vehicle.horizontalCollision || vehicle.verticalCollision) {
|
if (vehicle.horizontalCollision || vehicle.verticalCollision) {
|
||||||
// not actually friction
|
// not actually friction
|
||||||
val frictionLimit = 0.1
|
val frictionLimit = 0.1
|
||||||
val postColSpeed = min(max(state.rideVelocity.get().length(), frictionLimit), state.speed.get())
|
val postColSpeed = min(max(vehicle.deltaMovement.length(), frictionLimit), state.speed.get())
|
||||||
state.speed.set(postColSpeed)
|
state.speed.set(postColSpeed)
|
||||||
}
|
}
|
||||||
|
|
||||||
val currZVel = state.rideVelocity.get().z
|
val currSpeed = state.speed.get()
|
||||||
val newZVel = when {
|
val strafeFactor = runtime.resolveDouble(settings.strafeFactor ?: globalDolphin.strafeFactor!!)
|
||||||
driver.zza > 0.0 -> min(topSpeed, currZVel + accel)
|
val reverseDriveFactor = runtime.resolveDouble(settings.reverseDriveFactor ?: globalDolphin.reverseDriveFactor!!)
|
||||||
driver.zza < 0.0 -> max( -topSpeed * reverseDriveFactor, currZVel - accel)
|
val f = -driver.xxa * strafeFactor
|
||||||
else -> lerp(currZVel, 0.0, 0.05)
|
when {
|
||||||
|
driver.zza > 0.0 -> state.speed.set(min(topSpeed, currSpeed + accel))
|
||||||
|
driver.zza < 0.0 -> state.speed.set(max( -topSpeed * reverseDriveFactor, currSpeed - accel))
|
||||||
|
else -> state.speed.set( lerp(currSpeed, 0.0, 0.05))
|
||||||
}
|
}
|
||||||
state.rideVelocity.set(Vec3(currVel.x, currVel.y, newZVel))
|
val vertInput = when {
|
||||||
|
driver.jumping && state.stamina.get() != 0.0f -> 1.0
|
||||||
|
driver.isShiftKeyDown -> -1.0
|
||||||
|
else -> 0.0
|
||||||
|
} * strafeFactor
|
||||||
|
|
||||||
// Convert the local velocity vector into a world vector
|
var newVelocity = Vec3(f, vertInput,-state.speed.get())
|
||||||
val localVelVec = Vector3f(
|
|
||||||
state.rideVelocity.get().x.toFloat(),
|
|
||||||
(state.rideVelocity.get().y).toFloat(),
|
|
||||||
state.rideVelocity.get().z.toFloat() * -1.0f // Flip the z axis to make this left handed
|
|
||||||
)
|
|
||||||
|
|
||||||
val worldVelVec = localVelVec.mul(orientation).toVec3d()
|
// Align to the ride
|
||||||
state.lastVelocity.set(worldVelVec) // Set last velocity to be used during breaching
|
newVelocity = controller.orientation?.transform(newVelocity.toVector3f())?.toVec3d() ?: Vec3.ZERO
|
||||||
|
newVelocity = newVelocity.yRot(vehicle.yRot.toRadians())
|
||||||
// Unrotate preemptively as this vector gets rotated later down the line in MC logic.
|
val desiredVec = newVelocity.subtract(vehicle.deltaMovement)
|
||||||
return worldVelVec.yRot(vehicle.yRot.toRadians())
|
return vehicle.deltaMovement.add(desiredVec)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun angRollVel(
|
override fun angRollVel(
|
||||||
@@ -234,8 +225,9 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
|
|||||||
driver: Player,
|
driver: Player,
|
||||||
deltaTime: Double
|
deltaTime: Double
|
||||||
): Vec3 {
|
): Vec3 {
|
||||||
if (vehicle !is OrientationControllable) return Vec3.ZERO
|
if (Cobblemon.config.disableRoll) return Vec3.ZERO
|
||||||
val controller = (vehicle as OrientationControllable).orientationController
|
if (driver !is OrientationControllable) return Vec3.ZERO
|
||||||
|
val controller = (driver as OrientationControllable).orientationController
|
||||||
|
|
||||||
val currSpeed = vehicle.deltaMovement.length()
|
val currSpeed = vehicle.deltaMovement.length()
|
||||||
|
|
||||||
@@ -243,7 +235,7 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
|
|||||||
val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalDolphin.speedExpr!!) / 20.0
|
val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalDolphin.speedExpr!!) / 20.0
|
||||||
|
|
||||||
val yawDeltaDeg = deltaTime * handling * sin(Math.toRadians(controller.roll.toDouble())).pow(2) * sin(Math.toRadians(controller.roll.toDouble())).sign
|
val yawDeltaDeg = deltaTime * handling * sin(Math.toRadians(controller.roll.toDouble())).pow(2) * sin(Math.toRadians(controller.roll.toDouble())).sign
|
||||||
val trueYawDelt = yawDeltaDeg * abs(cos(Math.toRadians(controller.pitch.toDouble()))*2).coerceIn(-1.0, 1.0) * sqrt(RidingBehaviour.scaleToRange(currSpeed, 0.0, topSpeed))
|
val trueYawDelt = yawDeltaDeg * abs(cos(Math.toRadians(controller.pitch.toDouble()))) * sqrt(RidingBehaviour.scaleToRange(currSpeed, 0.0, topSpeed))
|
||||||
|
|
||||||
// Dampen yaw when upside down
|
// Dampen yaw when upside down
|
||||||
val yawDampen = (1 - abs(min(cos(controller.roll.toRadians()),0.0f)))
|
val yawDampen = (1 - abs(min(cos(controller.roll.toRadians()),0.0f)))
|
||||||
@@ -264,62 +256,45 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
|
|||||||
driver: Player,
|
driver: Player,
|
||||||
deltaTime: Double
|
deltaTime: Double
|
||||||
) {
|
) {
|
||||||
// Stop roll and pitch correction when breached
|
|
||||||
if (state.hasBreached.get()) {
|
|
||||||
state.currRollCorrectionForce.set(
|
|
||||||
lerp(state.currRollCorrectionForce.get(), 0.0, deltaTime * 0.98)
|
|
||||||
)
|
|
||||||
state.currPitchCorrectionForce.set(
|
|
||||||
lerp(state.currPitchCorrectionForce.get(), 0.0, deltaTime * 0.98)
|
|
||||||
)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Calculate correcting roll force.
|
// Calculate correcting roll force.
|
||||||
|
// Mult by cos(pitch) to ensure that it doesn't roll correct at when diving or climbing
|
||||||
|
val currSpeed = vehicle.deltaMovement.length()
|
||||||
val rollCorrectionTimer = vehicle.runtime.resolveDouble(settings.timeToRollCorrect ?: globalDolphin.timeToRollCorrect!!)
|
val rollCorrectionTimer = vehicle.runtime.resolveDouble(settings.timeToRollCorrect ?: globalDolphin.timeToRollCorrect!!)
|
||||||
// If the ride is moving then have the correction rate be an equal proportion of:
|
val maxRollCorrectionRate = if (!(vehicle.isInWater || vehicle.isUnderWater)) 15.0f
|
||||||
// - how rolled are you
|
else 10.0f * (cos(controller.pitch.toRadians())).pow(2) * ((state.noInputTime.get() - rollCorrectionTimer) * 2).coerceIn(0.0, 1.0).toFloat()
|
||||||
// - how long has it been since last mouse input (higher is stronger correction)
|
val maxRollForce = maxRollCorrectionRate / 40.0
|
||||||
// Also the correction is proportional as a whole to how NOT pitched are you so you don't spin endlessly when looking up or down
|
val rollArrivalDeg = 90.0
|
||||||
val howRolledAmI = sqrt(abs((cos(controller.roll.toRadians()) - 1.0f) * 0.5f)) // sqrt so it trends towards one pretty quickly
|
|
||||||
val maxRollCorrectionRate =
|
|
||||||
if (state.rideVelocity.get().length() < 0.2) 10.0f * abs(cos(controller.pitch.toRadians()))
|
|
||||||
else 10.0f * cos(controller.pitch.toRadians()).pow(2) * (
|
|
||||||
howRolledAmI*1.0f +
|
|
||||||
(state.noInputTime.get() - rollCorrectionTimer).coerceIn(0.0, 1.0).pow(2).toFloat()*0.5f
|
|
||||||
)
|
|
||||||
val maxRollForce = maxRollCorrectionRate / 40.0f
|
|
||||||
val rollArrivalDeg = 60.0f
|
|
||||||
val desiredRoll = 0.0f
|
|
||||||
|
|
||||||
// Calculate the signed error (how far and in what direction)
|
if((state.speed.get() < 0.1 && driver.zza.toDouble() == 0.0) || state.noInputTime.get() > rollCorrectionTimer || !(vehicle.isInWater || vehicle.isUnderWater)) {
|
||||||
val rollError = Mth.wrapDegrees(desiredRoll.angleDifference(controller.roll))
|
val arrivalInfluence = (min(rollArrivalDeg,abs(controller.roll).toDouble()) / rollArrivalDeg)
|
||||||
|
val desiredRollForce = (0 - controller.roll).sign * maxRollCorrectionRate * arrivalInfluence
|
||||||
|
var steeredRollForce = desiredRollForce - state.currRollCorrectionForce.get()
|
||||||
|
|
||||||
// Use the absolute error to calculate the magnitude of the influence
|
// Ensure the 'steering' correction force doesn't exceed our maxForce
|
||||||
val influenceMagnitude = (min(rollArrivalDeg, abs(rollError)) / rollArrivalDeg)
|
if (abs(steeredRollForce) > maxRollForce) {
|
||||||
val desiredRollForce = maxRollCorrectionRate * influenceMagnitude * -rollError.sign
|
steeredRollForce = steeredRollForce.sign * maxRollForce
|
||||||
var steeredRollForce = desiredRollForce - state.currRollCorrectionForce.get()
|
}
|
||||||
|
|
||||||
// Ensure the 'steering' correction force doesn't exceed our maxForce
|
// Apply the 'steered' force (its really not a steering force I need a better name)
|
||||||
if (abs(steeredRollForce) > maxRollForce) {
|
state.currRollCorrectionForce.set(
|
||||||
steeredRollForce = steeredRollForce.sign * maxRollForce
|
state.currRollCorrectionForce.get() + steeredRollForce
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
state.currRollCorrectionForce.set(
|
||||||
|
//reduce rollCorrection gradually
|
||||||
|
lerp(state.currRollCorrectionForce.get(), 0.0, deltaTime * 0.96)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Apply the 'steered' force (its really not a steering force I need a better name)
|
|
||||||
state.currRollCorrectionForce.set(
|
|
||||||
state.currRollCorrectionForce.get() + steeredRollForce
|
|
||||||
)
|
|
||||||
|
|
||||||
//Calculate correcting pitch force.
|
//Calculate correcting pitch force.
|
||||||
val maxPitchCorrectionRate = 5.0f * (state.noInputTime.get() - rollCorrectionTimer).coerceIn(0.0, 1.0).pow(2).toFloat()*0.5f
|
val maxPitchCorrectionRate = if (!(vehicle.isInWater || vehicle.isUnderWater)) 15.0 else 5.0f * ((state.noInputTime.get() - rollCorrectionTimer) * 2).coerceIn(0.0, 1.0).toFloat() * (1 - (currSpeed * 0.5).coerceIn(0.0, 1.0))
|
||||||
val maxPitchForce = maxPitchCorrectionRate / 40.0f
|
val maxPitchForce = maxPitchCorrectionRate / 40.0
|
||||||
val pitchArrivalDeg = 45.0f
|
val pitchArrivalDeg = 45.0
|
||||||
val desiredPitch = 0.0f
|
val targetPitch = if ((vehicle.isInWater || vehicle.isUnderWater)) 0.0f else (-asin(vehicle.deltaMovement.y / vehicle.deltaMovement.length()).toDegrees()).coerceIn(-45.0f, 45.0f)
|
||||||
|
|
||||||
if(state.rideVelocity.get().length() < 0.1 && state.noInputTime.get() > rollCorrectionTimer) {
|
if((state.noInputTime.get() > rollCorrectionTimer && driver.zza.toDouble() == 0.0) || !(vehicle.isInWater || vehicle.isUnderWater)) {
|
||||||
val pitchErrror = Mth.wrapDegrees(desiredPitch.angleDifference(controller.pitch))
|
val arrivalInfluence = min(rollArrivalDeg, abs(Mth.wrapDegrees(targetPitch - controller.pitch.toDouble()))) / pitchArrivalDeg
|
||||||
val arrivalInfluence = (min(pitchArrivalDeg,abs(pitchErrror)) / pitchArrivalDeg)
|
val desiredPitchForce = (targetPitch - controller.pitch).sign * maxPitchCorrectionRate * arrivalInfluence
|
||||||
val desiredPitchForce = maxPitchCorrectionRate * arrivalInfluence * -pitchErrror.sign
|
|
||||||
var steeredPitchForce = desiredPitchForce - state.currPitchCorrectionForce.get()
|
var steeredPitchForce = desiredPitchForce - state.currPitchCorrectionForce.get()
|
||||||
|
|
||||||
// Ensure the 'steering' correction force doesn't exceed our maxForce
|
// Ensure the 'steering' correction force doesn't exceed our maxForce
|
||||||
@@ -358,72 +333,130 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
|
|||||||
} else {
|
} else {
|
||||||
state.noInputTime.set(0.0)
|
state.noInputTime.set(0.0)
|
||||||
}
|
}
|
||||||
|
return when {
|
||||||
|
Cobblemon.config.disableRoll -> noRollRotation(
|
||||||
|
settings,
|
||||||
|
state,
|
||||||
|
vehicle,
|
||||||
|
driver,
|
||||||
|
mouseY,
|
||||||
|
mouseX,
|
||||||
|
mouseYSmoother,
|
||||||
|
mouseXSmoother,
|
||||||
|
sensitivity,
|
||||||
|
deltaTime
|
||||||
|
)
|
||||||
|
else -> rollRotation(
|
||||||
|
settings,
|
||||||
|
state,
|
||||||
|
vehicle,
|
||||||
|
driver,
|
||||||
|
mouseY,
|
||||||
|
mouseX,
|
||||||
|
mouseYSmoother,
|
||||||
|
mouseXSmoother,
|
||||||
|
sensitivity,
|
||||||
|
deltaTime
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (vehicle !is OrientationControllable) return Vec3.ZERO
|
fun noRollRotation(
|
||||||
val controller = (vehicle as OrientationControllable).orientationController
|
settings: DolphinSettings,
|
||||||
val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalDolphin.speedExpr!!) / 20.0
|
state: DolphinState,
|
||||||
val boostingHandleDebuff = if (state.boosting.get()) 0.5 else 1.0
|
vehicle: PokemonEntity,
|
||||||
val mouseInputMult = vehicle.runtime.resolveDouble(settings.mouseInputMult ?: globalDolphin.mouseInputMult!!) * boostingHandleDebuff
|
driver: Player,
|
||||||
// Applied to mouseX to prevent turning upside down when trying to roll hard.
|
mouseY: Double,
|
||||||
val rollDegreeDebuff = if(mouseX.sign.toFloat() == controller.roll.sign) 1 - 0.9f*sqrt(abs(sin(controller.roll.toRadians())))*sqrt(abs(cos(controller.pitch))) else 1.0f
|
mouseX: Double,
|
||||||
|
mouseYSmoother: SmoothDouble,
|
||||||
|
mouseXSmoother: SmoothDouble,
|
||||||
|
sensitivity: Double,
|
||||||
|
deltaTime: Double
|
||||||
|
): Vec3 {
|
||||||
|
if (driver !is OrientationControllable) return Vec3.ZERO
|
||||||
|
val controller = (driver as OrientationControllable).orientationController
|
||||||
|
|
||||||
|
// Set roll to zero if transitioning to noroll config
|
||||||
|
controller.rotateRoll(controller.roll * -1.0f)
|
||||||
|
|
||||||
|
val boostingHandleDebuff = if (state.boosting.get()) 0.2 else 1.0
|
||||||
|
val handling = vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalDolphin.handlingExpr!!) * boostingHandleDebuff
|
||||||
|
val mouseInputMult = vehicle.runtime.resolveDouble(settings.mouseInputMult ?: globalDolphin.mouseInputMult!!)
|
||||||
|
|
||||||
//Smooth out mouse input.
|
//Smooth out mouse input.
|
||||||
val smoothingSpeed = if(state.hasBreached.get()) 1.0f else 2.0f
|
val smoothingSpeed = 4.0
|
||||||
// When upside down apply a pitching force to nudge the player towards a dive. This reduces the 'weirdness'
|
val mouseXc = ((mouseX).coerceIn(-60.0, 60.0) / 60.0) * mouseInputMult
|
||||||
// of being upside down
|
val mouseYc = ((mouseY).coerceIn(-60.0, 60.0) / 60.0) * mouseInputMult
|
||||||
val rolledOverPitchCorrection = -8*sqrt(abs(min(cos(controller.roll.toRadians()),0.0f))) * (cos(controller.pitch.toRadians())).pow(2)
|
val xInput = mouseXSmoother.getNewDeltaValue(mouseXc * 0.1, deltaTime * smoothingSpeed);
|
||||||
val mouseXc = (mouseX).coerceIn(-45.0, 45.0) * mouseInputMult * rollDegreeDebuff
|
val yInput = mouseYSmoother.getNewDeltaValue(mouseYc * 0.1, deltaTime * smoothingSpeed);
|
||||||
val mouseYc = (mouseY).coerceIn(-45.0, 45.0) * mouseInputMult + rolledOverPitchCorrection
|
|
||||||
val mouseModForce = if (state.hasBreached.get()) 0.15 else 0.1 // Used to effect more spin momentum during breaching
|
|
||||||
|
|
||||||
if (state.clearMouseSmoothers.get()) {
|
//Give the ability to yaw with x mouse input when at low speeds.
|
||||||
mouseXSmoother.reset()
|
val yawForce = xInput * handling
|
||||||
|
|
||||||
|
//Apply yaw globally as we don't want roll or pitch changes due to local yaw when looking up or down.
|
||||||
|
controller.applyGlobalYaw(yawForce.toFloat() * abs(cos(controller.pitch.toRadians())).pow(2))
|
||||||
|
|
||||||
|
var pitchRot = yInput * handling
|
||||||
|
|
||||||
|
// Pitch up globally
|
||||||
|
if (abs(controller.pitch + pitchRot) >= 89.5 ) {
|
||||||
|
pitchRot = 0.0
|
||||||
mouseYSmoother.reset()
|
mouseYSmoother.reset()
|
||||||
state.clearMouseSmoothers.set(false)
|
} else {
|
||||||
|
controller.applyGlobalPitch(pitchRot.toFloat() * -1.0f)
|
||||||
}
|
}
|
||||||
val xInput = mouseXSmoother.getNewDeltaValue(mouseXc * mouseModForce, deltaTime * smoothingSpeed);
|
|
||||||
val yInput = mouseYSmoother.getNewDeltaValue(mouseYc * mouseModForce, deltaTime * smoothingSpeed);
|
|
||||||
val currSpeed = state.rideVelocity.get().length()
|
|
||||||
val currHorzSpeed = state.rideVelocity.get().horizontalDistance()
|
|
||||||
val hoverSpeed = 0.2
|
|
||||||
val pitchDamping = abs(cos(controller.pitch.toRadians())).pow(2) // Helper value used when wanting to discard the influence of another value at steep pitches
|
|
||||||
|
|
||||||
// Yaw locally when at or below hoverSpeed but not when pitched up or rolled over
|
//yaw, pitch, roll
|
||||||
val globalYaw = xInput * (1 - sqrt(RidingBehaviour.scaleToRange(currSpeed, 0.0, hoverSpeed))).coerceIn(0.0, 1.0)
|
return Vec3.ZERO
|
||||||
controller.rotateYaw(pitchDamping*globalYaw.toFloat())
|
}
|
||||||
controller.rotateRoll((1-pitchDamping)*globalYaw.toFloat())
|
|
||||||
|
fun rollRotation(
|
||||||
|
settings: DolphinSettings,
|
||||||
|
state: DolphinState,
|
||||||
|
vehicle: PokemonEntity,
|
||||||
|
driver: Player,
|
||||||
|
mouseY: Double,
|
||||||
|
mouseX: Double,
|
||||||
|
mouseYSmoother: SmoothDouble,
|
||||||
|
mouseXSmoother: SmoothDouble,
|
||||||
|
sensitivity: Double,
|
||||||
|
deltaTime: Double
|
||||||
|
): Vec3 {
|
||||||
|
if (driver !is OrientationControllable) return Vec3.ZERO
|
||||||
|
val controller = (driver as OrientationControllable).orientationController
|
||||||
|
val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalDolphin.speedExpr!!) / 20.0
|
||||||
|
val boostingHandleDebuff = if (state.boosting.get()) 0.2 else 1.0
|
||||||
|
val mouseInputMult = vehicle.runtime.resolveDouble(settings.mouseInputMult ?: globalDolphin.mouseInputMult!!) * boostingHandleDebuff
|
||||||
|
|
||||||
|
//Smooth out mouse input.
|
||||||
|
val smoothingSpeed = 4.0
|
||||||
|
val mouseXc = (mouseX).coerceIn(-45.0, 45.0) * mouseInputMult
|
||||||
|
val mouseYc = (mouseY).coerceIn(-45.0, 45.0) * mouseInputMult
|
||||||
|
val xInput = mouseXSmoother.getNewDeltaValue(mouseXc * 0.1, deltaTime * smoothingSpeed);
|
||||||
|
val yInput = mouseYSmoother.getNewDeltaValue(mouseYc * 0.1, deltaTime * smoothingSpeed);
|
||||||
|
val currSpeed = vehicle.deltaMovement.length()
|
||||||
|
|
||||||
|
// Yaw locally
|
||||||
|
// Dampen yaw when rolled or pitched substantially
|
||||||
|
val yawDampen = abs(cos(controller.pitch.toRadians())).pow(2) * abs(cos(controller.roll.toRadians())).pow(2)
|
||||||
|
val localYaw = xInput * (1 - (RidingBehaviour.scaleToRange(currSpeed, 0.0, topSpeed))).coerceIn(0.4, 1.0) * yawDampen
|
||||||
|
|
||||||
// Pitch locally up or down depending upon a number of factors:
|
// Pitch locally up or down depending upon a number of factors:
|
||||||
// - Reduce pitch substantially when rolled and in a steep yaw. This prevents the player from ignoring a slow handling stat
|
// - Reduce pitch substantially when rolled and in a steep yaw. This prevents the player from ignoring a slow handling stat
|
||||||
// - Do not pitch at all when at or below hover speed
|
// - Do not pitch at all when at or below hover speed
|
||||||
// - pitch faster at higher speeds
|
// - pitch faster at higher speeds
|
||||||
val p = 1.0 - vehicle.runtime.resolveDouble(settings.horizontalPitchExpr ?: globalDolphin.horizontalPitchExpr!!)
|
val p = 1.0 - vehicle.runtime.resolveDouble(settings.horizontalPitchExpr ?: globalDolphin.horizontalPitchExpr!!)
|
||||||
val localPitch = yInput * (1 - abs(sin(controller.roll.toRadians())).pow(2) * p * hypot(controller.forwardVector.x.toDouble(), controller.forwardVector.z.toDouble()).toFloat())
|
val localPitch = yInput * (1 - abs(sin(controller.roll.toRadians())) * p * hypot(controller.forwardVector.x.toDouble(), controller.forwardVector.z.toDouble()).toFloat())
|
||||||
|
// localPitch *= if (currSpeed > hoverSpeed) RidingBehaviour.scaleToRange(currSpeed, hoverSpeed, topSpeed)
|
||||||
var localYawForce = 0.0
|
// else 0.0
|
||||||
var rollForce = 0.0
|
|
||||||
|
|
||||||
// If it has breached then turn the yaw into roll
|
|
||||||
if (state.hasBreached.get()) {
|
|
||||||
localYawForce = xInput
|
|
||||||
} else {
|
|
||||||
// Roll less when slow and not at all when at hoverSpeed or lower.
|
|
||||||
// Apply a roll righting force when trying to pitch hard while rolled sideways. This nudges the player towards
|
|
||||||
// pitching globally
|
|
||||||
val pitchInfluencedRollCorrection = 0.0
|
|
||||||
val howRolledAmI = (( cos(controller.roll.toRadians()) - 1).coerceIn(-1.0f, 0.0f) * -2) //Coerce into how much roll you want to let in in the deadzone
|
|
||||||
val isInputtingTowardsRoll = if ( xInput.sign == controller.roll.sign.toDouble()) 1.0 else 0.0
|
|
||||||
val inputInRolledDir = if (isInputtingTowardsRoll == 1.0) 1.0 else -cos(controller.roll.toRadians()).coerceIn(-1.0f, 0.0f).toDouble()
|
|
||||||
val rollDampen = (1 - howRolledAmI.coerceIn(0.0f, 0.5f) * pitchDamping * inputInRolledDir)
|
|
||||||
rollForce = xInput * sqrt(abs(RidingBehaviour.scaleToRange(currHorzSpeed, 0.0, topSpeed)).coerceIn(0.0,1.0)) * rollDampen + pitchInfluencedRollCorrection
|
|
||||||
|
|
||||||
// When already rolled significantly part of the roll force should turn to local yaw force
|
|
||||||
localYawForce = rollForce * abs(sin(controller.roll.toRadians())).pow(2) * pitchDamping * isInputtingTowardsRoll
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// Roll less when slow and not at all when at hoverSpeed or lower.
|
||||||
|
// Apply a roll righting force when trying to pitch hard while rolled sideways. This nudges the player towards
|
||||||
|
// pitching globally
|
||||||
|
val rollForce = xInput * ((RidingBehaviour.scaleToRange(currSpeed, 0.0, topSpeed))).coerceIn(0.2, 1.0) //+ pitchInfluencedRollCorrection
|
||||||
|
|
||||||
//yaw, pitch, roll
|
//yaw, pitch, roll
|
||||||
return Vec3(localYawForce, localPitch, rollForce)
|
return Vec3(localYaw, localPitch, rollForce)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun canJump(
|
override fun canJump(
|
||||||
@@ -570,7 +603,6 @@ class DolphinSettings : RidingBehaviourSettings {
|
|||||||
buffer.writeNullableExpression(canJump)
|
buffer.writeNullableExpression(canJump)
|
||||||
buffer.writeNullableExpression(reverseDriveFactor)
|
buffer.writeNullableExpression(reverseDriveFactor)
|
||||||
buffer.writeNullableExpression(strafeFactor)
|
buffer.writeNullableExpression(strafeFactor)
|
||||||
buffer.writeNullableExpression(timeToRollCorrect)
|
|
||||||
buffer.writeNullableExpression(jumpExpr)
|
buffer.writeNullableExpression(jumpExpr)
|
||||||
buffer.writeNullableExpression(handlingExpr)
|
buffer.writeNullableExpression(handlingExpr)
|
||||||
buffer.writeNullableExpression(horizontalPitchExpr)
|
buffer.writeNullableExpression(horizontalPitchExpr)
|
||||||
@@ -587,7 +619,6 @@ class DolphinSettings : RidingBehaviourSettings {
|
|||||||
canJump = buffer.readNullableExpression()
|
canJump = buffer.readNullableExpression()
|
||||||
reverseDriveFactor = buffer.readNullableExpression()
|
reverseDriveFactor = buffer.readNullableExpression()
|
||||||
strafeFactor = buffer.readNullableExpression()
|
strafeFactor = buffer.readNullableExpression()
|
||||||
timeToRollCorrect = buffer.readNullableExpression()
|
|
||||||
jumpExpr = buffer.readNullableExpression()
|
jumpExpr = buffer.readNullableExpression()
|
||||||
handlingExpr = buffer.readNullableExpression()
|
handlingExpr = buffer.readNullableExpression()
|
||||||
horizontalPitchExpr = buffer.readNullableExpression()
|
horizontalPitchExpr = buffer.readNullableExpression()
|
||||||
@@ -607,7 +638,6 @@ class DolphinState : RidingBehaviourState() {
|
|||||||
var boostIsToggleable = ridingState(false, Side.CLIENT)
|
var boostIsToggleable = ridingState(false, Side.CLIENT)
|
||||||
var speed = ridingState(0.0, Side.CLIENT)
|
var speed = ridingState(0.0, Side.CLIENT)
|
||||||
var hasBreached = ridingState(false, Side.CLIENT)
|
var hasBreached = ridingState(false, Side.CLIENT)
|
||||||
var clearMouseSmoothers = ridingState(false, Side.CLIENT)
|
|
||||||
|
|
||||||
override fun encode(buffer: FriendlyByteBuf) {
|
override fun encode(buffer: FriendlyByteBuf) {
|
||||||
super.encode(buffer)
|
super.encode(buffer)
|
||||||
@@ -629,7 +659,6 @@ class DolphinState : RidingBehaviourState() {
|
|||||||
boostIsToggleable.set(true, forced = true)
|
boostIsToggleable.set(true, forced = true)
|
||||||
speed.set(0.0, forced = true)
|
speed.set(0.0, forced = true)
|
||||||
hasBreached.set(false, forced = true)
|
hasBreached.set(false, forced = true)
|
||||||
clearMouseSmoothers.set(false, forced = true)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun toString(): String {
|
override fun toString(): String {
|
||||||
@@ -647,7 +676,6 @@ class DolphinState : RidingBehaviourState() {
|
|||||||
it.boostIsToggleable.set(this.boosting.get(), forced = true)
|
it.boostIsToggleable.set(this.boosting.get(), forced = true)
|
||||||
it.speed.set(this.speed.get(), forced = true)
|
it.speed.set(this.speed.get(), forced = true)
|
||||||
it.hasBreached.set(this.hasBreached.get(), forced = true)
|
it.hasBreached.set(this.hasBreached.get(), forced = true)
|
||||||
it.clearMouseSmoothers.set(this.clearMouseSmoothers.get(), forced = true)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun shouldSync(previous: RidingBehaviourState): Boolean {
|
override fun shouldSync(previous: RidingBehaviourState): Boolean {
|
||||||
|
|||||||
-647
@@ -1,647 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.api.riding.behaviour.types.liquid
|
|
||||||
|
|
||||||
import com.bedrockk.molang.Expression
|
|
||||||
import com.bedrockk.molang.runtime.MoLangMath.lerp
|
|
||||||
import com.cobblemon.mod.common.CobblemonRideSettings
|
|
||||||
import com.cobblemon.mod.common.OrientationControllable
|
|
||||||
import com.cobblemon.mod.common.api.orientation.OrientationController
|
|
||||||
import com.cobblemon.mod.common.api.riding.RidingStyle
|
|
||||||
import com.cobblemon.mod.common.api.riding.behaviour.*
|
|
||||||
import com.cobblemon.mod.common.api.riding.posing.PoseOption
|
|
||||||
import com.cobblemon.mod.common.api.riding.posing.PoseProvider
|
|
||||||
import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
|
|
||||||
import com.cobblemon.mod.common.api.riding.stats.RidingStat
|
|
||||||
import com.cobblemon.mod.common.entity.PoseType
|
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
|
||||||
import com.cobblemon.mod.common.util.cobblemonResource
|
|
||||||
import com.cobblemon.mod.common.util.math.geometry.toRadians
|
|
||||||
import com.cobblemon.mod.common.util.readNullableExpression
|
|
||||||
import com.cobblemon.mod.common.util.readRidingStats
|
|
||||||
import com.cobblemon.mod.common.util.resolveBoolean
|
|
||||||
import com.cobblemon.mod.common.util.resolveDouble
|
|
||||||
import com.cobblemon.mod.common.util.toVec3d
|
|
||||||
import com.cobblemon.mod.common.util.writeNullableExpression
|
|
||||||
import com.cobblemon.mod.common.util.writeRidingStats
|
|
||||||
import net.minecraft.core.BlockPos
|
|
||||||
import net.minecraft.network.FriendlyByteBuf
|
|
||||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
|
||||||
import net.minecraft.resources.ResourceLocation
|
|
||||||
import net.minecraft.tags.FluidTags
|
|
||||||
import net.minecraft.util.SmoothDouble
|
|
||||||
import net.minecraft.world.entity.LivingEntity
|
|
||||||
import net.minecraft.world.entity.player.Player
|
|
||||||
import net.minecraft.world.phys.Vec2
|
|
||||||
import net.minecraft.world.phys.Vec3
|
|
||||||
import org.joml.Vector3f
|
|
||||||
import kotlin.math.*
|
|
||||||
|
|
||||||
class SubmarineBehaviour : RidingBehaviour<SubmarineSettings, SubmarineState> {
|
|
||||||
companion object {
|
|
||||||
val KEY = cobblemonResource("liquid/submarine")
|
|
||||||
}
|
|
||||||
|
|
||||||
override val key = KEY
|
|
||||||
val globalSubmarine: SubmarineSettings
|
|
||||||
get() = CobblemonRideSettings.submarine
|
|
||||||
|
|
||||||
override fun getRidingStyle(settings: SubmarineSettings, state: SubmarineState): RidingStyle {
|
|
||||||
return RidingStyle.LIQUID
|
|
||||||
}
|
|
||||||
|
|
||||||
val poseProvider = PoseProvider<SubmarineSettings, SubmarineState>(PoseType.FLOAT)
|
|
||||||
.with(PoseOption(PoseType.SWIM) { _, state, entity -> abs(state.rideVelocity.get().z) > 0.05 && !state.onSurface.get()})
|
|
||||||
.with(PoseOption(PoseType.STAND) { _, state, entity -> abs(state.rideVelocity.get().z) <= 0.05 && state.onSurface.get()})
|
|
||||||
.with(PoseOption(PoseType.STAND) { _, state, entity -> abs(state.rideVelocity.get().z) > 0.05 && state.onSurface.get()})
|
|
||||||
|
|
||||||
override fun isActive(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity): Boolean {
|
|
||||||
return vehicle.isInWater || !vehicle.onGround()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun pose(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity): PoseType {
|
|
||||||
return poseProvider.select(settings, state, vehicle)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun speed(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity, driver: Player): Float {
|
|
||||||
return state.speed.get().toFloat()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun tick(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity,
|
|
||||||
driver: Player,
|
|
||||||
input: Vec3
|
|
||||||
) {
|
|
||||||
if(vehicle.level().isClientSide) {
|
|
||||||
tickStamina(settings, state, vehicle)
|
|
||||||
surfaceCheck(settings, state, vehicle, driver)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun tickStamina(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity
|
|
||||||
) {
|
|
||||||
val stam = state.stamina.get()
|
|
||||||
|
|
||||||
if (vehicle.runtime.resolveBoolean(settings.infiniteStamina ?: globalSubmarine.infiniteStamina!!)) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Grab the boost time in seconds and convert to ticks. Then calculate the drain rate as inversely
|
|
||||||
// proportional to the number of ticks of boost thus making a full boost take x ticks
|
|
||||||
// in short: "Stamina drains slower at higher values and also replenishes slower"
|
|
||||||
val breathTime = vehicle.runtime.resolveDouble(settings.staminaExpr ?: globalSubmarine.staminaExpr!!) * 20.0f
|
|
||||||
val stamRegenRate = 1.0f / (vehicle.runtime.resolveDouble(settings.staminaRegenTime ?: globalSubmarine.staminaRegenTime!!).toFloat() * 20.0f)
|
|
||||||
val stamDrainRate = (1.0f / breathTime).toFloat()
|
|
||||||
val driver = vehicle.controllingPassenger
|
|
||||||
val newStam = if (driver?.isEyeInFluid(FluidTags.WATER) ?: false) max(0.0f,stam - stamDrainRate)
|
|
||||||
else min(1.0f,stam + stamRegenRate)
|
|
||||||
|
|
||||||
state.stamina.set(newStam)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun surfaceCheck(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity,
|
|
||||||
driver: Player,
|
|
||||||
) {
|
|
||||||
// determine if the vehicle is in water.
|
|
||||||
// if it isn't then set surface flag to false and return
|
|
||||||
if (!vehicle.isInWater) {
|
|
||||||
state.onSurface.set(false)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
val hitboxBreachPercentage = vehicle.runtime.resolveDouble(settings.hitboxBreachPercentage ?: globalSubmarine.hitboxBreachPercentage!!)
|
|
||||||
|
|
||||||
// Grab the position of the vehicle that when out of the water is considered breached
|
|
||||||
val vehicleBreachPoint = vehicle.position().add(0.0, vehicle.bbHeight * hitboxBreachPercentage, 0.0)
|
|
||||||
|
|
||||||
// If the block above the center is not fluid but this one is then move the center
|
|
||||||
val centerBlockPos = BlockPos.containing(vehicleBreachPoint)
|
|
||||||
val centerInWater = !vehicle.level().getFluidState(centerBlockPos).isEmpty
|
|
||||||
|
|
||||||
val abovePos = centerBlockPos.above()
|
|
||||||
val aboveInWater = !vehicle.level().getFluidState(abovePos).isEmpty
|
|
||||||
|
|
||||||
if (!centerInWater && !aboveInWater) {
|
|
||||||
state.onSurface.set(true)
|
|
||||||
} else {
|
|
||||||
state.onSurface.set(false)
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
// Function for if x mouse and y mouse "get through" to affecting the mounts rotation. Return a Pair<Boolean, Boolean>
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun rotation(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity,
|
|
||||||
driver: LivingEntity
|
|
||||||
): Vec2 {
|
|
||||||
return Vec2(driver.xRot * 0.5f, driver.yRot)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun velocity(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity,
|
|
||||||
driver: Player,
|
|
||||||
input: Vec3
|
|
||||||
): Vec3 {
|
|
||||||
if (vehicle !is OrientationControllable) return Vec3.ZERO
|
|
||||||
val controller = (vehicle as OrientationControllable).orientationController
|
|
||||||
val orientation = controller.orientation ?: return Vec3.ZERO
|
|
||||||
|
|
||||||
val runtime = vehicle.runtime
|
|
||||||
val topSpeed = (vehicle.runtime.resolveDouble(settings.speedExpr ?: globalSubmarine.speedExpr!!) / 20.0)
|
|
||||||
val accel = (topSpeed / (vehicle.runtime.resolveDouble(settings.accelerationExpr ?: globalSubmarine.accelerationExpr!!) * 20.0))
|
|
||||||
val strafeSpeed = (runtime.resolveDouble(settings.jumpExpr ?: globalSubmarine.jumpExpr!!) / 20.0)
|
|
||||||
val strafeAccel = (strafeSpeed / (vehicle.runtime.resolveDouble(settings.accelerationExpr ?: globalSubmarine.accelerationExpr!!) * 20.0))
|
|
||||||
var currVel = state.rideVelocity.get()
|
|
||||||
|
|
||||||
/*********************************************
|
|
||||||
* Handle collisions
|
|
||||||
*********************************************/
|
|
||||||
if (vehicle.horizontalCollision || vehicle.verticalCollision) {
|
|
||||||
// not actually friction
|
|
||||||
val frictionLimit = 0.1
|
|
||||||
val postColSpeed = min(max(state.rideVelocity.get().length(), frictionLimit), state.speed.get())
|
|
||||||
state.speed.set(postColSpeed)
|
|
||||||
}
|
|
||||||
if (vehicle.verticalCollision) {
|
|
||||||
state.rideVelocity.set(Vec3(state.rideVelocity.get().x, 0.0, state.rideVelocity.get().z))
|
|
||||||
}
|
|
||||||
|
|
||||||
/*********************************************
|
|
||||||
* Calculate Forward Velocity
|
|
||||||
*********************************************/
|
|
||||||
val currZVel = state.rideVelocity.get().z
|
|
||||||
val newZVel = when {
|
|
||||||
driver.zza > 0.0 -> min(topSpeed, currZVel + accel)
|
|
||||||
driver.zza < 0.0 -> max( -strafeSpeed, currZVel - strafeAccel) //TODO: Might need to be applied in addition to the normal braking force?
|
|
||||||
else -> lerp(currZVel, 0.0, 0.05)
|
|
||||||
}
|
|
||||||
currVel = Vec3(currVel.x, currVel.y, newZVel)
|
|
||||||
|
|
||||||
/*********************************************
|
|
||||||
* Calculate up/down Velocity and gravity
|
|
||||||
*********************************************/
|
|
||||||
val vertTopSpeed = strafeSpeed
|
|
||||||
val currYVel = state.rideVelocity.get().y
|
|
||||||
val gravity = (9.8 / ( 20.0)) * 0.2 * 0.4
|
|
||||||
val terminalYVel = 2.0
|
|
||||||
val driverYInput = if(driver.jumping) 1.0 else if (driver.isShiftKeyDown) -1.0 else 0.0
|
|
||||||
val newYVel = when {
|
|
||||||
(!vehicle.isInWater) -> max(-terminalYVel, currYVel - gravity)
|
|
||||||
//(vehicle.isInWater && !vehicle.isUnderWater && currYVel > 0.001) -> lerp(currYVel, 0.0, 0.1) // Make sure that yVel is above a threshold before doing this otherwise it'll block submerging.
|
|
||||||
//driverYInput != 0.0 && currYVel > 0.001 && driverYInput.sign != currYVel.sign -> lerp(currYVel, 0.0, 0.05)
|
|
||||||
driverYInput > 0.0 -> min(vertTopSpeed, currYVel + strafeAccel)
|
|
||||||
driverYInput < 0.0 -> max(-vertTopSpeed, currYVel - strafeAccel)
|
|
||||||
else -> lerp(currYVel, 0.0, 0.05)
|
|
||||||
}
|
|
||||||
currVel = Vec3(currVel.x, newYVel, currVel.z)
|
|
||||||
|
|
||||||
/*********************************************
|
|
||||||
* Calculate left/right strafing Velocity
|
|
||||||
*********************************************/
|
|
||||||
val currXVel = state.rideVelocity.get().x
|
|
||||||
val horzTopSpeed = strafeSpeed
|
|
||||||
val newXVel = when {
|
|
||||||
driver.xxa > 0.0 -> min(horzTopSpeed, currXVel + strafeAccel)
|
|
||||||
driver.xxa < 0.0 -> max( -horzTopSpeed, currXVel - strafeAccel)
|
|
||||||
else -> lerp(currXVel, 0.0, 0.01)
|
|
||||||
}
|
|
||||||
currVel = Vec3(newXVel, currVel.y, currVel.z)
|
|
||||||
|
|
||||||
// Set the new velocity
|
|
||||||
state.rideVelocity.set(currVel)
|
|
||||||
|
|
||||||
/*********************************************
|
|
||||||
* Separate and apply velocities
|
|
||||||
*********************************************/
|
|
||||||
// If the driver and vehicles eyes are out of the water but the vehicle is still in it then move only horizontally or downwards as you have surfaced
|
|
||||||
if (state.onSurface.get()) {
|
|
||||||
val worldVelVec = Vec3(currVel.x, min(0.0, currVel.y), currVel.z)
|
|
||||||
return worldVelVec
|
|
||||||
} else {
|
|
||||||
val vertVec = Vec3(0.0, currVel.y, 0.0)
|
|
||||||
val horzVec = Vec3(currVel.x, 0.0, 0.0)
|
|
||||||
val localZVelVec = Vector3f(0.0f, 0.0f, currVel.z.toFloat() * -1.0f) // Flip the z axis to make this left handed
|
|
||||||
// Unrotate preemptively as this vector gets rotated later down the line in MC logic.
|
|
||||||
val worldVelVec = localZVelVec.mul(orientation).toVec3d().yRot(vehicle.yRot.toRadians())
|
|
||||||
// Add back the horizontal and vertical components.
|
|
||||||
return worldVelVec.add(vertVec).add(horzVec)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun angRollVel(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity,
|
|
||||||
driver: Player,
|
|
||||||
deltaTime: Double
|
|
||||||
): Vec3 {
|
|
||||||
return Vec3.ZERO
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun applyRenderRotation(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity,
|
|
||||||
partialTicks: Float
|
|
||||||
) {
|
|
||||||
if (vehicle !is OrientationControllable) return
|
|
||||||
val controller = (vehicle as OrientationControllable).orientationController
|
|
||||||
|
|
||||||
var handling = vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalSubmarine.handlingExpr!!)
|
|
||||||
val surfaceHandlingBoost = if(state.onSurface.get()) 3.0 else 1.0
|
|
||||||
handling *= surfaceHandlingBoost
|
|
||||||
|
|
||||||
val strafeSpeed = (vehicle.runtime.resolveDouble(settings.jumpExpr ?: globalSubmarine.jumpExpr!!) / 20.0)
|
|
||||||
|
|
||||||
// Grab the roll and see if its hit the limit yet. If it hasn't then trend it towards its desired roll
|
|
||||||
val maxRollDeg = if (state.onSurface.get()) 5 else 15
|
|
||||||
val maxPitchDeg = 15
|
|
||||||
var rollAmount = 0.0
|
|
||||||
var pitchAmount = 0.0
|
|
||||||
|
|
||||||
// Do horizontal speed based rolling
|
|
||||||
val maxHorzSpeed = strafeSpeed
|
|
||||||
val currHorzSpeed = state.rideVelocity.get().x
|
|
||||||
var desiredRoll = -(currHorzSpeed / maxHorzSpeed).coerceIn(-1.0, 1.0) * maxRollDeg
|
|
||||||
rollAmount += lerp(controller.roll.toDouble(), desiredRoll, partialTicks.toDouble()) - controller.roll
|
|
||||||
//val rotAmount //Maybe use some lerp?
|
|
||||||
controller.rotateRoll(rollAmount.toFloat())
|
|
||||||
|
|
||||||
// Do yawRate based rolling
|
|
||||||
val maxYawRate = handling
|
|
||||||
val currYawRate = vehicle.ridingAnimationData.rotDeltaSpring.getInterpolated(partialTicks.toDouble(), 2).y()
|
|
||||||
desiredRoll = -(currYawRate / maxYawRate).coerceIn(-1.0, 1.0) * maxRollDeg
|
|
||||||
rollAmount += desiredRoll - controller.roll
|
|
||||||
controller.rotateRoll(rollAmount.toFloat())
|
|
||||||
|
|
||||||
//TODO: why does this affect the actual controller but rolling doesn't??
|
|
||||||
// Do upwards movement based pitching
|
|
||||||
// val maxVertSpeed = 0.25 //TODO: CONNECT UP TO JUMP
|
|
||||||
// val currVertSpeed = state.rideVelocity.get().y
|
|
||||||
// var desiredPitch = -(currVertSpeed / maxVertSpeed) * maxPitchDeg
|
|
||||||
// pitchAmount += lerp(controller.pitch.toDouble(), desiredPitch, partialTicks.toDouble()) - controller.pitch
|
|
||||||
// controller.rotatePitch(pitchAmount.toFloat())
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun correctOrientation(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity,
|
|
||||||
controller: OrientationController,
|
|
||||||
driver: Player,
|
|
||||||
deltaTime: Double
|
|
||||||
) {
|
|
||||||
|
|
||||||
// TODO: remove if not needed
|
|
||||||
|
|
||||||
// // Calculate correcting roll force.
|
|
||||||
// // If the ride is moving then have the correction rate be an equal proportion of:
|
|
||||||
// // - how rolled are you
|
|
||||||
// // - how long has it been since last mouse input (higher is stronger correction)
|
|
||||||
// // Also the correction is proportional as a whole to how NOT pitched are you so you don't spin endlessly when looking up or down
|
|
||||||
// val howRolledAmI = sqrt(abs((cos(controller.roll.toRadians()) - 1.0f) * 0.5f)) // sqrt so it trends towards one pretty quickly
|
|
||||||
// val maxRollCorrectionRate =
|
|
||||||
// if (state.rideVelocity.get().length() < 0.2) 10.0f * abs(cos(controller.pitch.toRadians()))
|
|
||||||
// else 10.0f * cos(controller.pitch.toRadians()).pow(2) * (
|
|
||||||
// howRolledAmI*1.0f +
|
|
||||||
// (state.noInputTime.get() - rollCorrectionTimer).coerceIn(0.0, 1.0).pow(2).toFloat()*0.5f
|
|
||||||
// )
|
|
||||||
// val maxRollForce = maxRollCorrectionRate / 40.0f
|
|
||||||
// val rollArrivalDeg = 60.0f
|
|
||||||
// val desiredRoll = 0.0f
|
|
||||||
//
|
|
||||||
// // Calculate the signed error (how far and in what direction)
|
|
||||||
// val rollError = Mth.wrapDegrees(desiredRoll.angleDifference(controller.roll))
|
|
||||||
//
|
|
||||||
// // Use the absolute error to calculate the magnitude of the influence
|
|
||||||
// val influenceMagnitude = (min(rollArrivalDeg, abs(rollError)) / rollArrivalDeg)
|
|
||||||
// val desiredRollForce = maxRollCorrectionRate * influenceMagnitude * -rollError.sign
|
|
||||||
// var steeredRollForce = desiredRollForce - state.currRollCorrectionForce.get()
|
|
||||||
//
|
|
||||||
// // Ensure the 'steering' correction force doesn't exceed our maxForce
|
|
||||||
// if (abs(steeredRollForce) > maxRollForce) {
|
|
||||||
// steeredRollForce = steeredRollForce.sign * maxRollForce
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// // Apply the 'steered' force (its really not a steering force I need a better name)
|
|
||||||
// state.currRollCorrectionForce.set(
|
|
||||||
// state.currRollCorrectionForce.get() + steeredRollForce
|
|
||||||
// )
|
|
||||||
|
|
||||||
//Calculate correcting pitch force.
|
|
||||||
// val rollCorrectionTimer = vehicle.runtime.resolveDouble(settings.timeToRollCorrect ?: globalSubmarine.timeToRollCorrect!!)
|
|
||||||
// val maxPitchCorrectionRate = 5.0f * (state.noInputTime.get() - rollCorrectionTimer).coerceIn(0.0, 1.0).pow(2).toFloat()*0.5f
|
|
||||||
// val maxPitchForce = maxPitchCorrectionRate / 40.0f
|
|
||||||
// val pitchArrivalDeg = 45.0f
|
|
||||||
// val desiredPitch = 0.0f
|
|
||||||
//
|
|
||||||
// if(state.rideVelocity.get().length() < 0.1 && state.noInputTime.get() > rollCorrectionTimer) {
|
|
||||||
// val pitchErrror = Mth.wrapDegrees(desiredPitch.angleDifference(controller.pitch))
|
|
||||||
// val arrivalInfluence = (min(pitchArrivalDeg,abs(pitchErrror)) / pitchArrivalDeg)
|
|
||||||
// val desiredPitchForce = maxPitchCorrectionRate * arrivalInfluence * -pitchErrror.sign
|
|
||||||
// var steeredPitchForce = desiredPitchForce - state.currPitchCorrectionForce.get()
|
|
||||||
//
|
|
||||||
// // Ensure the 'steering' correction force doesn't exceed our maxForce
|
|
||||||
// if (abs(steeredPitchForce) > maxPitchForce) {
|
|
||||||
// steeredPitchForce = steeredPitchForce.sign * maxPitchForce
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// // Apply the 'steered' force (its really not a steering force I need a better name)
|
|
||||||
// state.currPitchCorrectionForce.set(
|
|
||||||
// state.currPitchCorrectionForce.get() + steeredPitchForce
|
|
||||||
// )
|
|
||||||
// } else {
|
|
||||||
// state.currPitchCorrectionForce.set(
|
|
||||||
// //reduce rollCorrection gradually
|
|
||||||
// lerp(state.currPitchCorrectionForce.get(), 0.0, deltaTime * 0.98)
|
|
||||||
// )
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun rotationOnMouseXY(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity,
|
|
||||||
driver: Player,
|
|
||||||
mouseY: Double,
|
|
||||||
mouseX: Double,
|
|
||||||
mouseYSmoother: SmoothDouble,
|
|
||||||
mouseXSmoother: SmoothDouble,
|
|
||||||
sensitivity: Double,
|
|
||||||
deltaTime: Double
|
|
||||||
): Vec3 {
|
|
||||||
if (vehicle !is OrientationControllable) return Vec3.ZERO
|
|
||||||
val controller = (vehicle as OrientationControllable).orientationController
|
|
||||||
|
|
||||||
// Set roll to zero if transitioning to noroll config
|
|
||||||
controller.rotateRoll(controller.roll * -1.0f)
|
|
||||||
|
|
||||||
val handling = vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalSubmarine.handlingExpr!!)
|
|
||||||
val surfaceHandlingBoost = if(state.onSurface.get()) 3.0 else 1.0
|
|
||||||
val effHandling = if(state.onSurface.get()) 1000 * deltaTime else handling * deltaTime
|
|
||||||
//Smooth out mouse input.
|
|
||||||
val smoothingSpeed = if(state.onSurface.get()) 10.0 else 2.0
|
|
||||||
val mouseXc = (mouseX * 0.1).coerceIn(-effHandling, effHandling)
|
|
||||||
val mouseYc = (mouseY * 0.1).coerceIn(-effHandling, effHandling)
|
|
||||||
val xInput = mouseXSmoother.getNewDeltaValue(mouseXc, deltaTime * smoothingSpeed);
|
|
||||||
val yInput = mouseYSmoother.getNewDeltaValue(mouseYc, deltaTime * smoothingSpeed);
|
|
||||||
|
|
||||||
// Give the ability to yaw with x mouse input when at low speeds.
|
|
||||||
val yawForce = xInput
|
|
||||||
|
|
||||||
// Apply yaw globally as we don't want roll or pitch changes due to local yaw when looking up or down.
|
|
||||||
controller.applyGlobalYaw(yawForce.toFloat())
|
|
||||||
|
|
||||||
var pitchRot = yInput
|
|
||||||
// Pitch up globally
|
|
||||||
val pitchLimit = 45.0
|
|
||||||
if (abs(controller.pitch + pitchRot) >= pitchLimit ) {
|
|
||||||
pitchRot = 0.0
|
|
||||||
mouseYSmoother.reset()
|
|
||||||
} else {
|
|
||||||
controller.applyGlobalPitch(pitchRot.toFloat())
|
|
||||||
}
|
|
||||||
|
|
||||||
// If on the surface then conditionally bring the pitch to 0 degrees.
|
|
||||||
if (state.onSurface.get()) {
|
|
||||||
//move back at max 30 degrees per second.
|
|
||||||
val maxCorrectionSpeed = 30.0
|
|
||||||
val arrivalDegreeWidth = 30.0
|
|
||||||
val currentPitch = controller.pitch
|
|
||||||
val correctionDegrees = (-currentPitch / arrivalDegreeWidth).coerceIn(-1.0, 1.0) * maxCorrectionSpeed * deltaTime
|
|
||||||
|
|
||||||
controller.applyGlobalPitch(correctionDegrees.toFloat())
|
|
||||||
|
|
||||||
// Compensate player ride rotations
|
|
||||||
// val playerRotater = driver as RideRotation
|
|
||||||
// playerRotater.`cobblemon$setRideXRot`(playerRotater.`cobblemon$getRideXRot`() - correctionDegrees.toFloat() )
|
|
||||||
}
|
|
||||||
|
|
||||||
//yaw, pitch, roll
|
|
||||||
return Vec3.ZERO
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun canJump(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity,
|
|
||||||
driver: Player
|
|
||||||
): Boolean {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun setRideBar(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity,
|
|
||||||
driver: Player
|
|
||||||
): Float {
|
|
||||||
return (state.stamina.get() / 1.0f)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun jumpForce(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity,
|
|
||||||
driver: Player,
|
|
||||||
jumpStrength: Int
|
|
||||||
): Vec3 {
|
|
||||||
return Vec3.ZERO
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun gravity(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity,
|
|
||||||
regularGravity: Double
|
|
||||||
): Double {
|
|
||||||
return 0.0
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun rideFovMultiplier(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity,
|
|
||||||
driver: Player
|
|
||||||
): Float {
|
|
||||||
return 1.0f
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun useAngVelSmoothing(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity): Boolean {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun useRidingAltPose(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity,
|
|
||||||
driver: Player
|
|
||||||
): ResourceLocation {
|
|
||||||
return cobblemonResource("no_pose")
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun inertia(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity): Double {
|
|
||||||
return if (!vehicle.isUnderWater) 1.0 else 0.1
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun shouldRoll(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity): Boolean {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun turnOffOnGround(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity): Boolean {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun dismountOnShift(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity): Boolean {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun mouseModifiesDriverRotation(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity): Pair<Boolean, Boolean> {
|
|
||||||
return Pair(false, state.onSurface.get())
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun shouldRotatePokemonHead(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity
|
|
||||||
): Boolean {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun shouldRotateRiderHead(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity
|
|
||||||
): Boolean {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getRideSounds(
|
|
||||||
settings: SubmarineSettings,
|
|
||||||
state: SubmarineState,
|
|
||||||
vehicle: PokemonEntity
|
|
||||||
): RideSoundSettingsList {
|
|
||||||
return settings.rideSounds
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun createDefaultState(settings: SubmarineSettings) = SubmarineState()
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
class SubmarineSettings : RidingBehaviourSettings {
|
|
||||||
override val key = SubmarineBehaviour.KEY
|
|
||||||
override val stats = mutableMapOf<RidingStat, IntRange>()
|
|
||||||
|
|
||||||
var infiniteStamina: Expression? = null
|
|
||||||
private set
|
|
||||||
|
|
||||||
var staminaRegenTime: Expression? = null
|
|
||||||
private set
|
|
||||||
|
|
||||||
// Percentage (0.0->1.0) of ride needing to be breached out of the water to be considered surfaced.
|
|
||||||
var hitboxBreachPercentage: Expression? = null
|
|
||||||
private set
|
|
||||||
|
|
||||||
// Tope strafe speed in Bl/s
|
|
||||||
var jumpExpr: Expression? = null
|
|
||||||
// Yaw rate in degrees per second
|
|
||||||
var handlingExpr: Expression? = null
|
|
||||||
// Top speed in Bl/s
|
|
||||||
var speedExpr: Expression? = null
|
|
||||||
// Seconds to get to top speed
|
|
||||||
var accelerationExpr: Expression? = null
|
|
||||||
// Seconds of air provided by mount
|
|
||||||
var staminaExpr: Expression? = null
|
|
||||||
|
|
||||||
var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
|
|
||||||
|
|
||||||
override fun encode(buffer: RegistryFriendlyByteBuf) {
|
|
||||||
buffer.writeRidingStats(stats)
|
|
||||||
rideSounds.encode(buffer)
|
|
||||||
buffer.writeNullableExpression(infiniteStamina)
|
|
||||||
buffer.writeNullableExpression(staminaRegenTime)
|
|
||||||
buffer.writeNullableExpression(hitboxBreachPercentage)
|
|
||||||
buffer.writeNullableExpression(jumpExpr)
|
|
||||||
buffer.writeNullableExpression(handlingExpr)
|
|
||||||
buffer.writeNullableExpression(speedExpr)
|
|
||||||
buffer.writeNullableExpression(accelerationExpr)
|
|
||||||
buffer.writeNullableExpression(staminaExpr)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun decode(buffer: RegistryFriendlyByteBuf) {
|
|
||||||
stats.putAll(buffer.readRidingStats())
|
|
||||||
rideSounds = RideSoundSettingsList.decode(buffer)
|
|
||||||
infiniteStamina = buffer.readNullableExpression()
|
|
||||||
staminaRegenTime = buffer.readNullableExpression()
|
|
||||||
hitboxBreachPercentage = buffer.readNullableExpression()
|
|
||||||
jumpExpr = buffer.readNullableExpression()
|
|
||||||
handlingExpr = buffer.readNullableExpression()
|
|
||||||
speedExpr = buffer.readNullableExpression()
|
|
||||||
accelerationExpr = buffer.readNullableExpression()
|
|
||||||
staminaExpr = buffer.readNullableExpression()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class SubmarineState : RidingBehaviourState() {
|
|
||||||
var speed = ridingState(0.0, Side.CLIENT)
|
|
||||||
var currRollCorrectionForce = ridingState(0.0, Side.CLIENT)
|
|
||||||
var currPitchCorrectionForce = ridingState(0.0, Side.CLIENT)
|
|
||||||
var noInputTime = ridingState(0.0, Side.CLIENT)
|
|
||||||
var onSurface = ridingState(false, Side.BOTH)
|
|
||||||
|
|
||||||
override fun encode(buffer: FriendlyByteBuf) {
|
|
||||||
super.encode(buffer)
|
|
||||||
buffer.writeBoolean(onSurface.get())
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun decode(buffer: FriendlyByteBuf) {
|
|
||||||
super.decode(buffer)
|
|
||||||
onSurface.set(buffer.readBoolean(), forced = true)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun reset() {
|
|
||||||
super.reset()
|
|
||||||
speed.set(0.0, forced = true)
|
|
||||||
currRollCorrectionForce.set(0.0, forced = true)
|
|
||||||
currPitchCorrectionForce.set(0.0, forced = true)
|
|
||||||
noInputTime.set(0.0, forced = true)
|
|
||||||
onSurface.set(false, forced = true)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun copy() = SubmarineState().also {
|
|
||||||
it.stamina.set(stamina.get(), forced = true)
|
|
||||||
it.speed.set(speed.get(), forced = true)
|
|
||||||
it.rideVelocity.set(rideVelocity.get(), forced = true)
|
|
||||||
it.currRollCorrectionForce.set(this.currRollCorrectionForce.get(), forced = true)
|
|
||||||
it.currPitchCorrectionForce.set(this.currPitchCorrectionForce.get(), forced = true)
|
|
||||||
it.noInputTime.set(this.noInputTime.get(), forced = true)
|
|
||||||
it.onSurface.set(this.onSurface.get(), forced = true)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun shouldSync(previous: RidingBehaviourState): Boolean {
|
|
||||||
if (previous !is SubmarineState) return false
|
|
||||||
if (previous.onSurface.get() != onSurface.get()) return true
|
|
||||||
return super.shouldSync(previous)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+1
-1
@@ -74,7 +74,7 @@ class RidingAnimationData(val ride: PokemonEntity)
|
|||||||
}
|
}
|
||||||
if( r ) {
|
if( r ) {
|
||||||
//TODO: should this return?
|
//TODO: should this return?
|
||||||
val controller = (ride as? OrientationControllable)?.orientationController ?: return
|
val controller = (ride.firstPassenger as? OrientationControllable)?.orientationController ?: return
|
||||||
val orientation = controller.orientation ?: Matrix3f()
|
val orientation = controller.orientation ?: Matrix3f()
|
||||||
|
|
||||||
val currPitch = controller.pitch
|
val currPitch = controller.pitch
|
||||||
|
|||||||
@@ -18,11 +18,18 @@ import com.cobblemon.mod.common.api.spawning.condition.SeafloorSpawningCondition
|
|||||||
import com.cobblemon.mod.common.api.spawning.condition.SpawningCondition
|
import com.cobblemon.mod.common.api.spawning.condition.SpawningCondition
|
||||||
import com.cobblemon.mod.common.api.spawning.condition.SubmergedSpawningCondition
|
import com.cobblemon.mod.common.api.spawning.condition.SubmergedSpawningCondition
|
||||||
import com.cobblemon.mod.common.api.spawning.condition.SurfaceSpawningCondition
|
import com.cobblemon.mod.common.api.spawning.condition.SurfaceSpawningCondition
|
||||||
|
import com.cobblemon.mod.common.api.spawning.position.calculators.GroundedSpawnablePositionCalculator
|
||||||
|
import com.cobblemon.mod.common.api.spawning.position.calculators.LavafloorSpawnablePositionCalculator
|
||||||
|
import com.cobblemon.mod.common.api.spawning.position.calculators.SeafloorSpawnablePositionCalculator
|
||||||
|
import com.cobblemon.mod.common.api.spawning.position.calculators.SpawnablePositionCalculator
|
||||||
|
import com.cobblemon.mod.common.api.spawning.position.calculators.SubmergedSpawnablePositionCalculator
|
||||||
|
import com.cobblemon.mod.common.api.spawning.position.calculators.SurfaceSpawnablePositionCalculator
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.NPCSpawnDetail
|
import com.cobblemon.mod.common.api.spawning.detail.NPCSpawnDetail
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.PokemonHerdSpawnDetail
|
import com.cobblemon.mod.common.api.spawning.detail.PokemonHerdSpawnDetail
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.PokemonSpawnDetail
|
import com.cobblemon.mod.common.api.spawning.detail.PokemonSpawnDetail
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
|
||||||
|
import com.cobblemon.mod.common.api.spawning.fishing.FishingSpawner
|
||||||
import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
|
import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
|
||||||
import com.cobblemon.mod.common.api.spawning.position.AreaSpawnablePositionResolver
|
import com.cobblemon.mod.common.api.spawning.position.AreaSpawnablePositionResolver
|
||||||
import com.cobblemon.mod.common.api.spawning.position.FishingSpawnablePosition
|
import com.cobblemon.mod.common.api.spawning.position.FishingSpawnablePosition
|
||||||
@@ -32,21 +39,16 @@ import com.cobblemon.mod.common.api.spawning.position.SeafloorSpawnablePosition
|
|||||||
import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
|
import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
|
||||||
import com.cobblemon.mod.common.api.spawning.position.SubmergedSpawnablePosition
|
import com.cobblemon.mod.common.api.spawning.position.SubmergedSpawnablePosition
|
||||||
import com.cobblemon.mod.common.api.spawning.position.SurfaceSpawnablePosition
|
import com.cobblemon.mod.common.api.spawning.position.SurfaceSpawnablePosition
|
||||||
import com.cobblemon.mod.common.api.spawning.position.calculators.GroundedSpawnablePositionCalculator
|
|
||||||
import com.cobblemon.mod.common.api.spawning.position.calculators.LavafloorSpawnablePositionCalculator
|
|
||||||
import com.cobblemon.mod.common.api.spawning.position.calculators.SeafloorSpawnablePositionCalculator
|
|
||||||
import com.cobblemon.mod.common.api.spawning.position.calculators.SpawnablePositionCalculator
|
|
||||||
import com.cobblemon.mod.common.api.spawning.position.calculators.SubmergedSpawnablePositionCalculator
|
|
||||||
import com.cobblemon.mod.common.api.spawning.position.calculators.SurfaceSpawnablePositionCalculator
|
|
||||||
import com.cobblemon.mod.common.api.spawning.preset.BasicSpawnDetailPreset
|
import com.cobblemon.mod.common.api.spawning.preset.BasicSpawnDetailPreset
|
||||||
import com.cobblemon.mod.common.api.spawning.preset.BestSpawnerConfig
|
import com.cobblemon.mod.common.api.spawning.preset.BestSpawnerConfig
|
||||||
import com.cobblemon.mod.common.api.spawning.preset.PokemonSpawnDetailPreset
|
import com.cobblemon.mod.common.api.spawning.preset.PokemonSpawnDetailPreset
|
||||||
import com.cobblemon.mod.common.api.spawning.selection.SpawningSelector
|
import com.cobblemon.mod.common.api.spawning.selection.SpawningSelector
|
||||||
import com.cobblemon.mod.common.api.spawning.spawner.BasicSpawner
|
import com.cobblemon.mod.common.api.spawning.spawner.AreaSpawner
|
||||||
import com.cobblemon.mod.common.api.spawning.spawner.FixedAreaSpawner
|
import com.cobblemon.mod.common.api.spawning.spawner.FixedAreaSpawner
|
||||||
import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner
|
import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner
|
||||||
import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory
|
import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory
|
||||||
import com.cobblemon.mod.common.api.spawning.spawner.Spawner
|
import com.cobblemon.mod.common.api.spawning.spawner.Spawner
|
||||||
|
import com.cobblemon.mod.common.api.spawning.spawner.TickingSpawner
|
||||||
import com.cobblemon.mod.common.entity.pokemon.CobblemonAgingDespawner
|
import com.cobblemon.mod.common.entity.pokemon.CobblemonAgingDespawner
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||||
import net.minecraft.server.MinecraftServer
|
import net.minecraft.server.MinecraftServer
|
||||||
@@ -64,13 +66,14 @@ import net.minecraft.server.MinecraftServer
|
|||||||
* In the case of more specialized use, the creation of a [SpawnablePosition] that motivates most of the spawn
|
* In the case of more specialized use, the creation of a [SpawnablePosition] that motivates most of the spawn
|
||||||
* process can be created manually, skipping the first two steps.
|
* process can be created manually, skipping the first two steps.
|
||||||
*
|
*
|
||||||
* An individually spawnable thing is defined as a [SpawnDetail]. A processor handling this process is a [Spawner].
|
* An individually spawnable entity is defined as a [SpawnDetail]. A processor handling this process is a [Spawner].
|
||||||
* Some subclasses exist for more specialized cases. If you are spawning in a fixed area and the spawner controlling
|
* Various subclasses exist for more specialized cases. A spawner that is constantly ticking and will spawn things
|
||||||
|
* without prompts is a [TickingSpawner], and one of those which occurs within a defined area is a [AreaSpawner]. If
|
||||||
* that area is unmoving then it is a [FixedAreaSpawner] whereas if it is actively following the player it is a
|
* that area is unmoving then it is a [FixedAreaSpawner] whereas if it is actively following the player it is a
|
||||||
* [PlayerSpawner]. You can also use a [BasicSpawner] for more general-purpose spawning without any issue.
|
* [PlayerSpawner].
|
||||||
*
|
*
|
||||||
* PlayerSpawners are stored inside ServerPlayers using a mixin and tick at the end of a player's tick. The [PlayerSpawnerFactory]
|
* Spawning is coordinated and ticked using a [SpawnerManager], and all the current managers are accessible from
|
||||||
* is used to build those. An extension function exists for getting the spawner for a player.
|
* [BestSpawner.spawnerManagers].
|
||||||
*
|
*
|
||||||
* Spawners and spawnable positions are often put under the effects of [SpawningInfluence]s which can be used to make
|
* Spawners and spawnable positions are often put under the effects of [SpawningInfluence]s which can be used to make
|
||||||
* temporary or lasting changes to spawning for whatever component they are attached to (whether that is a spawner or a
|
* temporary or lasting changes to spawning for whatever component they are attached to (whether that is a spawner or a
|
||||||
@@ -84,9 +87,9 @@ import net.minecraft.server.MinecraftServer
|
|||||||
*/
|
*/
|
||||||
object BestSpawner {
|
object BestSpawner {
|
||||||
var config = BestSpawnerConfig()
|
var config = BestSpawnerConfig()
|
||||||
|
val spawnerManagers = mutableListOf<SpawnerManager>(CobblemonWorldSpawnerManager)
|
||||||
lateinit var defaultPokemonDespawner: Despawner<PokemonEntity>
|
lateinit var defaultPokemonDespawner: Despawner<PokemonEntity>
|
||||||
lateinit var fishingSpawner: BasicSpawner
|
lateinit var fishingSpawner: FishingSpawner
|
||||||
|
|
||||||
fun init() {
|
fun init() {
|
||||||
LOGGER.info("Starting the Best Spawner...")
|
LOGGER.info("Starting the Best Spawner...")
|
||||||
@@ -134,13 +137,12 @@ object BestSpawner {
|
|||||||
|
|
||||||
fun reloadConfig() {
|
fun reloadConfig() {
|
||||||
loadConfig()
|
loadConfig()
|
||||||
|
spawnerManagers.forEach(SpawnerManager::onConfigReload)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun onServerStarted(server: MinecraftServer) {
|
fun onServerStarted(server: MinecraftServer) {
|
||||||
CobblemonSpawnPools.onServerLoad(server)
|
CobblemonSpawnPools.onServerLoad(server)
|
||||||
fishingSpawner = BasicSpawner(
|
spawnerManagers.forEach(SpawnerManager::onServerStarted)
|
||||||
name = "fishing",
|
fishingSpawner = FishingSpawner()
|
||||||
spawnPool = CobblemonSpawnPools.WORLD_SPAWN_POOL
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -40,6 +40,7 @@ object CobblemonSpawnPools {
|
|||||||
|
|
||||||
fun onServerLoad(server: MinecraftServer) {
|
fun onServerLoad(server: MinecraftServer) {
|
||||||
Cobblemon.LOGGER.info("Optimizing spawn pools...")
|
Cobblemon.LOGGER.info("Optimizing spawn pools...")
|
||||||
WORLD_SPAWN_POOL.onServerLoad(server)
|
WORLD_SPAWN_POOL.forEach { it.onServerLoad(server) }
|
||||||
|
WORLD_SPAWN_POOL.precalculate()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+76
@@ -0,0 +1,76 @@
|
|||||||
|
/*
|
||||||
|
* 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.api.spawning
|
||||||
|
|
||||||
|
import com.cobblemon.mod.common.Cobblemon
|
||||||
|
import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner
|
||||||
|
import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory
|
||||||
|
import com.cobblemon.mod.common.platform.events.PlatformEvents
|
||||||
|
import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
|
||||||
|
import net.minecraft.server.level.ServerLevel
|
||||||
|
import java.util.UUID
|
||||||
|
import net.minecraft.server.level.ServerPlayer
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The [SpawnerManager] that handles Cobblemon's world spawner, which is made up
|
||||||
|
* of [PlayerSpawner] instances. This manager listens for login and logout and
|
||||||
|
* cleans up where relevant.
|
||||||
|
*
|
||||||
|
* @author Hiroku
|
||||||
|
* @since February 14th, 2022
|
||||||
|
*/
|
||||||
|
object CobblemonWorldSpawnerManager : SpawnerManager() {
|
||||||
|
|
||||||
|
var spawnersForPlayers = mutableMapOf<UUID, PlayerSpawner>()
|
||||||
|
|
||||||
|
init {
|
||||||
|
PlatformEvents.SERVER_PLAYER_LOGIN.subscribe { this.onPlayerLogin(it.player) }
|
||||||
|
PlatformEvents.SERVER_PLAYER_LOGOUT.subscribe { this.onPlayerLogout(it.player) }
|
||||||
|
PlatformEvents.CHANGE_DIMENSION.subscribe { this.onDimensionChange(it.player, it.origin, it.destination) }
|
||||||
|
}
|
||||||
|
|
||||||
|
fun onPlayerLogin(player: ServerPlayer) {
|
||||||
|
// Disables spawning
|
||||||
|
if (!Cobblemon.config.enableSpawning || player.level().gameRules.getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING) == false) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
registerPlayerSpawner(player)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun onPlayerLogout(player: ServerPlayer) {
|
||||||
|
unregisterPlayerSpawner(player)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun onDimensionChange(player: ServerPlayer, origin: ServerLevel?, destination: ServerLevel?) {
|
||||||
|
fun getSpawnRule(level: ServerLevel?) = level?.gameRules?.getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING)
|
||||||
|
|
||||||
|
if (!Cobblemon.config.enableSpawning || getSpawnRule(origin) == getSpawnRule(destination)) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val spawnerAction = if (destination?.gameRules?.getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING) == false) {
|
||||||
|
::unregisterPlayerSpawner
|
||||||
|
} else {
|
||||||
|
::registerPlayerSpawner
|
||||||
|
}
|
||||||
|
spawnerAction(player)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun unregisterPlayerSpawner(player: ServerPlayer) {
|
||||||
|
spawnersForPlayers.remove(player.uuid)?.let { unregisterSpawner(it) }
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun registerPlayerSpawner(player: ServerPlayer) {
|
||||||
|
PlayerSpawnerFactory.create(this, player).also {
|
||||||
|
spawnersForPlayers[player.uuid] = it
|
||||||
|
registerSpawner(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,21 +17,16 @@ import net.minecraft.world.entity.EntityType
|
|||||||
open class SpawnCause(
|
open class SpawnCause(
|
||||||
val spawner: Spawner,
|
val spawner: Spawner,
|
||||||
entity: Entity? = null
|
entity: Entity? = null
|
||||||
) : SpawningInfluence {
|
): SpawningInfluence {
|
||||||
val entityWorldId = entity?.level()?.dimension()
|
val entityWorldId = entity?.level()?.dimension()
|
||||||
val entityId = entity?.id
|
val entityId = entity?.id
|
||||||
val entityUUID = entity?.uuid
|
val entityUUID = entity?.uuid
|
||||||
val entityType = entity?.type
|
val entityType = entity?.type
|
||||||
|
|
||||||
val entity: Entity?
|
val entity: Entity?
|
||||||
get() =
|
get() = if (entityType == EntityType.PLAYER) {
|
||||||
if (entityType == EntityType.PLAYER) {
|
server()?.playerList?.getPlayer(entityUUID!!)
|
||||||
entityUUID?.let {
|
} else {
|
||||||
server()?.playerList?.getPlayer(it)
|
server()?.getLevel(entityWorldId!!)?.getEntity(entityId!!)
|
||||||
}
|
}
|
||||||
} else if (entityWorldId != null && entityId != null) {
|
|
||||||
server()?.getLevel(entityWorldId)?.getEntity(entityId)
|
|
||||||
} else {
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
/*
|
||||||
|
* 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.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
|
||||||
|
import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules.DO_POKEMON_SPAWNING
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A manager of various spawners. This is a class in which you should register
|
||||||
|
* ticking spawners so that they can be automatically ticked by the server.
|
||||||
|
* This also supports registering [SpawningInfluence]s to apply to each spawner
|
||||||
|
* that is registered.
|
||||||
|
*
|
||||||
|
* @author Hiroku
|
||||||
|
* @since February 5th, 2022
|
||||||
|
*/
|
||||||
|
open class SpawnerManager {
|
||||||
|
val spawners = mutableListOf<Spawner>()
|
||||||
|
get() {
|
||||||
|
if (server()?.isSameThread == false) {
|
||||||
|
Cobblemon.LOGGER.error("Illegal access to spawners list from non-server thread!")
|
||||||
|
Exception().printStackTrace()
|
||||||
|
}
|
||||||
|
return field
|
||||||
|
}
|
||||||
|
val influences = mutableListOf<SpawningInfluence>()
|
||||||
|
get() {
|
||||||
|
if (server()?.isSameThread == false) {
|
||||||
|
Cobblemon.LOGGER.error("Illegal access to influences from non-server thread!")
|
||||||
|
Exception().printStackTrace()
|
||||||
|
}
|
||||||
|
return field
|
||||||
|
}
|
||||||
|
inline fun <reified T : Spawner> getSpawnersOfType() = spawners.filterIsInstance<T>()
|
||||||
|
open fun getSpawnerByName(name: String) = spawners.find { it.name == name }
|
||||||
|
|
||||||
|
open fun registerSpawner(spawner: Spawner) {
|
||||||
|
spawners.add(spawner)
|
||||||
|
if (spawner !is TickingSpawner) {
|
||||||
|
spawner.influences.addAll(influences)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
open fun unregisterSpawner(spawner: Spawner) {
|
||||||
|
spawners.remove(spawner)
|
||||||
|
if (spawner !is TickingSpawner) {
|
||||||
|
spawner.influences.removeAll(influences)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
open fun onConfigReload() {
|
||||||
|
spawners.filterIsInstance<PlayerSpawner>().forEach {
|
||||||
|
it.ticksBetweenSpawns = Cobblemon.config.ticksBetweenSpawnAttempts
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
open fun onServerStarted() {
|
||||||
|
spawners.clear()
|
||||||
|
}
|
||||||
|
|
||||||
|
open fun onServerTick() {
|
||||||
|
// Disables spawning
|
||||||
|
if (!Cobblemon.config.enableSpawning) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
influences.removeIf { it.isExpired() }
|
||||||
|
getSpawnersOfType<TickingSpawner>().forEach {
|
||||||
|
if (it.getCauseEntity()?.level()?.gameRules?.getBoolean(DO_POKEMON_SPAWNING) == false) {
|
||||||
|
return@forEach
|
||||||
|
}
|
||||||
|
it.tick()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -33,15 +33,15 @@ class TimeRange : IntRanges {
|
|||||||
"any" to TimeRange(0..23999),
|
"any" to TimeRange(0..23999),
|
||||||
"day" to TimeRange(23460..23999, 0..12541),
|
"day" to TimeRange(23460..23999, 0..12541),
|
||||||
"night" to TimeRange(12542..23459),
|
"night" to TimeRange(12542..23459),
|
||||||
"morning" to TimeRange(23000..23999, 0..4999),
|
|
||||||
"noon" to TimeRange(5000..6999),
|
"noon" to TimeRange(5000..6999),
|
||||||
"afternoon" to TimeRange(7000..12999),
|
|
||||||
"evening" to TimeRange(13000..16999),
|
|
||||||
"midnight" to TimeRange(17000..18999),
|
"midnight" to TimeRange(17000..18999),
|
||||||
"predawn" to TimeRange(19000..22999),
|
"dawn" to TimeRange(22300..23999, 0..999),
|
||||||
"dawn" to TimeRange(22300..23999, 0..166),
|
|
||||||
"dusk" to TimeRange(11834..13701),
|
"dusk" to TimeRange(11834..13701),
|
||||||
"twilight" to TimeRange(11834..13701, 22300..23999, 0..166)
|
"twilight" to TimeRange(11834..13701, 22300..23999, 0..166),
|
||||||
|
"morning" to TimeRange(23000..23999, 0..4999),
|
||||||
|
"afternoon" to TimeRange(7000..12999),
|
||||||
|
"predawn" to TimeRange(19000..22999),
|
||||||
|
"evening" to TimeRange(13000..16999)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -39,13 +39,9 @@ import net.minecraft.server.MinecraftServer
|
|||||||
*/
|
*/
|
||||||
abstract class SpawnDetail : ModDependant {
|
abstract class SpawnDetail : ModDependant {
|
||||||
companion object {
|
companion object {
|
||||||
val pokemonTypes = mutableListOf<String>()
|
|
||||||
val spawnDetailTypes = mutableMapOf<String, RegisteredSpawnDetail<*>>()
|
val spawnDetailTypes = mutableMapOf<String, RegisteredSpawnDetail<*>>()
|
||||||
fun <T : SpawnDetail> registerSpawnType(name: String, detailClass: Class<T>) {
|
fun <T : SpawnDetail> registerSpawnType(name: String, detailClass: Class<T>) {
|
||||||
spawnDetailTypes[name] = RegisteredSpawnDetail(detailClass)
|
spawnDetailTypes[name] = RegisteredSpawnDetail(detailClass)
|
||||||
if (detailClass == PokemonSpawnDetail::class.java || detailClass == PokemonHerdSpawnDetail::class.java) {
|
|
||||||
pokemonTypes.add(name)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ import com.cobblemon.mod.common.util.server
|
|||||||
import com.google.gson.Gson
|
import com.google.gson.Gson
|
||||||
import com.google.gson.reflect.TypeToken
|
import com.google.gson.reflect.TypeToken
|
||||||
import net.minecraft.resources.ResourceLocation
|
import net.minecraft.resources.ResourceLocation
|
||||||
import net.minecraft.server.MinecraftServer
|
|
||||||
import net.minecraft.server.level.ServerPlayer
|
import net.minecraft.server.level.ServerPlayer
|
||||||
import net.minecraft.server.packs.PackType
|
import net.minecraft.server.packs.PackType
|
||||||
|
|
||||||
@@ -73,13 +72,6 @@ class SpawnPool(val name: String) : JsonDataRegistry<SpawnSet>, Iterable<SpawnDe
|
|||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
|
||||||
fun onServerLoad(server: MinecraftServer) {
|
|
||||||
for (detail in details) {
|
|
||||||
detail.onServerLoad(server)
|
|
||||||
}
|
|
||||||
precalculate()
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Precalculates spawns into hash mappings using the [precalculators] included
|
* Precalculates spawns into hash mappings using the [precalculators] included
|
||||||
* in this pool as well as the range of spawnable positions mentioned in the pool.
|
* in this pool as well as the range of spawnable positions mentioned in the pool.
|
||||||
|
|||||||
+3
-2
@@ -12,15 +12,16 @@ import com.cobblemon.mod.common.Cobblemon
|
|||||||
import com.cobblemon.mod.common.Cobblemon.LOGGER
|
import com.cobblemon.mod.common.Cobblemon.LOGGER
|
||||||
import com.cobblemon.mod.common.api.events.CobblemonEvents
|
import com.cobblemon.mod.common.api.events.CobblemonEvents
|
||||||
import com.cobblemon.mod.common.api.events.fishing.BobberSpawnPokemonEvent
|
import com.cobblemon.mod.common.api.events.fishing.BobberSpawnPokemonEvent
|
||||||
import com.cobblemon.mod.common.api.fishing.SpawnBait
|
|
||||||
import com.cobblemon.mod.common.api.fishing.SpawnBaitEffects
|
import com.cobblemon.mod.common.api.fishing.SpawnBaitEffects
|
||||||
|
import com.cobblemon.mod.common.api.fishing.SpawnBait
|
||||||
import com.cobblemon.mod.common.api.pokemon.Natures
|
import com.cobblemon.mod.common.api.pokemon.Natures
|
||||||
import com.cobblemon.mod.common.api.pokemon.stats.Stats
|
import com.cobblemon.mod.common.api.pokemon.stats.Stats
|
||||||
|
import com.cobblemon.mod.common.api.spawning.SpawnBucket
|
||||||
import com.cobblemon.mod.common.api.spawning.SpawnCause
|
import com.cobblemon.mod.common.api.spawning.SpawnCause
|
||||||
|
import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
|
||||||
import com.cobblemon.mod.common.api.spawning.influence.SpawnBaitInfluence
|
import com.cobblemon.mod.common.api.spawning.influence.SpawnBaitInfluence
|
||||||
import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
|
|
||||||
import com.cobblemon.mod.common.api.spawning.spawner.Spawner
|
import com.cobblemon.mod.common.api.spawning.spawner.Spawner
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||||
import com.cobblemon.mod.common.item.interactive.PokerodItem
|
import com.cobblemon.mod.common.item.interactive.PokerodItem
|
||||||
|
|||||||
+38
@@ -0,0 +1,38 @@
|
|||||||
|
/*
|
||||||
|
* 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.api.spawning.fishing
|
||||||
|
|
||||||
|
import com.cobblemon.mod.common.api.spawning.CobblemonSpawnPools
|
||||||
|
import com.cobblemon.mod.common.api.spawning.position.FishingSpawnablePosition
|
||||||
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
|
||||||
|
import com.cobblemon.mod.common.api.spawning.spawner.TriggerSpawner
|
||||||
|
import net.minecraft.server.level.ServerLevel
|
||||||
|
import net.minecraft.core.BlockPos
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A spawner that takes in a [FishingSpawnCause] and spawns things.
|
||||||
|
*
|
||||||
|
* @author Hiroku
|
||||||
|
* @since February 3rd, 2024
|
||||||
|
*/
|
||||||
|
open class FishingSpawner(
|
||||||
|
override val name: String = "fishing",
|
||||||
|
pool: SpawnPool = CobblemonSpawnPools.WORLD_SPAWN_POOL
|
||||||
|
) : TriggerSpawner<FishingSpawnCause>(name, pool) {
|
||||||
|
override fun parseSpawnablePosition(cause: FishingSpawnCause, world: ServerLevel, pos: BlockPos): FishingSpawnablePosition? {
|
||||||
|
// Maybe confirm that it's water we're fishing in?
|
||||||
|
val spawnablePosition = FishingSpawnablePosition(
|
||||||
|
cause = cause,
|
||||||
|
world = world,
|
||||||
|
pos = pos,
|
||||||
|
influences = influences
|
||||||
|
)
|
||||||
|
return spawnablePosition
|
||||||
|
}
|
||||||
|
}
|
||||||
-35
@@ -1,35 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.api.spawning.influence
|
|
||||||
|
|
||||||
import com.cobblemon.mod.common.api.spawning.SpawnBucket
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A [SpawningInfluence] that multiplies bucket weights by the provided values
|
|
||||||
* and then normalizes the resulting weights so that their total adds up to 100.
|
|
||||||
*/
|
|
||||||
class BucketMultiplyingInfluence(
|
|
||||||
val multipliers: Map<String, Float>,
|
|
||||||
) : SpawningInfluence {
|
|
||||||
override fun affectBucketWeights(bucketWeights: MutableMap<SpawnBucket, Float>) {
|
|
||||||
val updates = mutableMapOf<SpawnBucket, Float>()
|
|
||||||
for ((bucket, weight) in bucketWeights) {
|
|
||||||
val multiplier = multipliers[bucket.name]
|
|
||||||
if (multiplier != null) {
|
|
||||||
updates[bucket] = weight * multiplier
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for ((bucket, newWeight) in updates) {
|
|
||||||
bucketWeights[bucket] = newWeight
|
|
||||||
}
|
|
||||||
|
|
||||||
normalizeBucketWeights(bucketWeights)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+6
-1
@@ -44,6 +44,11 @@ open class BucketNormalizingInfluence(
|
|||||||
bucketWeights[it] = weight.toDouble().pow(1 / normalizationFactor).toFloat()
|
bucketWeights[it] = weight.toDouble().pow(1 / normalizationFactor).toFloat()
|
||||||
}
|
}
|
||||||
|
|
||||||
normalizeBucketWeights(bucketWeights)
|
val sum = bucketWeights.values.sum()
|
||||||
|
val to100 = 100F / sum
|
||||||
|
bucketWeights.keys.toList().forEach {
|
||||||
|
val weight = bucketWeights[it] ?: return@forEach
|
||||||
|
bucketWeights[it] = weight * to100
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-5
@@ -9,7 +9,6 @@
|
|||||||
package com.cobblemon.mod.common.api.spawning.influence
|
package com.cobblemon.mod.common.api.spawning.influence
|
||||||
|
|
||||||
import com.cobblemon.mod.common.CobblemonBlocks
|
import com.cobblemon.mod.common.CobblemonBlocks
|
||||||
import com.cobblemon.mod.common.api.Priority
|
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
|
||||||
import com.cobblemon.mod.common.api.spawning.fishing.FishingSpawnCause
|
import com.cobblemon.mod.common.api.spawning.fishing.FishingSpawnCause
|
||||||
import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
|
import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
|
||||||
@@ -44,10 +43,6 @@ class SaccharineLogSlatheredInfluence(val pos: BlockPos? = null) : SpawningInflu
|
|||||||
|
|
||||||
override fun affectSpawn(action: SpawnAction<*>, entity: Entity) {
|
override fun affectSpawn(action: SpawnAction<*>, entity: Entity) {
|
||||||
if (entity is PokemonEntity) {
|
if (entity is PokemonEntity) {
|
||||||
// avoid double application or applying to a pokemon that already has a hidden ability
|
|
||||||
if (entity.pokemon.forcedAspects.contains(HONEY_DRENCHED_ASPECT)
|
|
||||||
|| entity.pokemon.ability.priority !== Priority.LOWEST) return
|
|
||||||
|
|
||||||
if (Math.random() <= HIDDEN_ABILITY_CHANCE) {
|
if (Math.random() <= HIDDEN_ABILITY_CHANCE) {
|
||||||
FishingSpawnCause.alterHAAttempt(entity)
|
FishingSpawnCause.alterHAAttempt(entity)
|
||||||
}
|
}
|
||||||
|
|||||||
-9
@@ -40,15 +40,6 @@ interface SpawningInfluence {
|
|||||||
fun affectSpawn(action: SpawnAction<*>, entity: Entity) {}
|
fun affectSpawn(action: SpawnAction<*>, entity: Entity) {}
|
||||||
/** Applies some influence over the weight of spawn buckets. */
|
/** Applies some influence over the weight of spawn buckets. */
|
||||||
fun affectBucketWeights(bucketWeights: MutableMap<SpawnBucket, Float>) {}
|
fun affectBucketWeights(bucketWeights: MutableMap<SpawnBucket, Float>) {}
|
||||||
/** Normalizes all bucket weights to add up to 100 */
|
|
||||||
fun normalizeBucketWeights(bucketWeights: MutableMap<SpawnBucket, Float>) {
|
|
||||||
val sum = bucketWeights.values.sum()
|
|
||||||
val to100 = 100F / sum
|
|
||||||
bucketWeights.keys.toList().forEach {
|
|
||||||
val weight = bucketWeights[it] ?: return@forEach
|
|
||||||
bucketWeights[it] = weight * to100
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/** Filters positions that could be usable for a spawnable position calculator */
|
/** Filters positions that could be usable for a spawnable position calculator */
|
||||||
fun isAllowedPosition(world: ServerLevel, pos: BlockPos, spawnablePositionCalculator: SpawnablePositionCalculator<*, *>): Boolean = true
|
fun isAllowedPosition(world: ServerLevel, pos: BlockPos, spawnablePositionCalculator: SpawnablePositionCalculator<*, *>): Boolean = true
|
||||||
/**
|
/**
|
||||||
|
|||||||
+5
-3
@@ -9,15 +9,16 @@
|
|||||||
package com.cobblemon.mod.common.api.spawning.influence.detector
|
package com.cobblemon.mod.common.api.spawning.influence.detector
|
||||||
|
|
||||||
import com.cobblemon.mod.common.api.spawning.SpawningZone
|
import com.cobblemon.mod.common.api.spawning.SpawningZone
|
||||||
import com.cobblemon.mod.common.api.spawning.SpawningZoneGenerator
|
|
||||||
import com.cobblemon.mod.common.api.spawning.influence.SpawningZoneInfluence
|
import com.cobblemon.mod.common.api.spawning.influence.SpawningZoneInfluence
|
||||||
import com.cobblemon.mod.common.api.spawning.prospecting.IncenseSweetDetector
|
|
||||||
import com.cobblemon.mod.common.api.spawning.prospecting.SaccharineLogSlatheredDetector
|
|
||||||
import com.cobblemon.mod.common.api.spawning.spawner.Spawner
|
import com.cobblemon.mod.common.api.spawning.spawner.Spawner
|
||||||
import com.cobblemon.mod.common.api.spawning.spawner.SpawningZoneInput
|
import com.cobblemon.mod.common.api.spawning.spawner.SpawningZoneInput
|
||||||
import net.minecraft.core.BlockPos
|
import net.minecraft.core.BlockPos
|
||||||
import net.minecraft.server.level.ServerLevel
|
import net.minecraft.server.level.ServerLevel
|
||||||
import net.minecraft.world.level.block.state.BlockState
|
import net.minecraft.world.level.block.state.BlockState
|
||||||
|
import com.cobblemon.mod.common.api.spawning.SpawningZoneGenerator
|
||||||
|
import com.cobblemon.mod.common.api.spawning.prospecting.IncenseSweetDetector
|
||||||
|
import com.cobblemon.mod.common.api.spawning.prospecting.LurePokeSnackDetector
|
||||||
|
import com.cobblemon.mod.common.api.spawning.prospecting.SaccharineLogSlatheredDetector
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Prospects for [SpawningZoneInfluence] in a world at a given position. Occurs as part of a
|
* Prospects for [SpawningZoneInfluence] in a world at a given position. Occurs as part of a
|
||||||
@@ -30,6 +31,7 @@ interface SpawningInfluenceDetector {
|
|||||||
companion object {
|
companion object {
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
val detectors = mutableSetOf<SpawningInfluenceDetector>(
|
val detectors = mutableSetOf<SpawningInfluenceDetector>(
|
||||||
|
LurePokeSnackDetector,
|
||||||
SaccharineLogSlatheredDetector,
|
SaccharineLogSlatheredDetector,
|
||||||
IncenseSweetDetector
|
IncenseSweetDetector
|
||||||
)
|
)
|
||||||
|
|||||||
+1
-1
@@ -28,7 +28,7 @@ class FishingSpawnablePosition(
|
|||||||
world: ServerLevel,
|
world: ServerLevel,
|
||||||
pos: BlockPos,
|
pos: BlockPos,
|
||||||
influences: MutableList<SpawningInfluence>
|
influences: MutableList<SpawningInfluence>
|
||||||
) : BasicSpawnablePosition(
|
) : TriggerSpawnablePosition(
|
||||||
cause = cause,
|
cause = cause,
|
||||||
world = world,
|
world = world,
|
||||||
position = pos,
|
position = pos,
|
||||||
|
|||||||
+5
-7
@@ -14,15 +14,13 @@ import net.minecraft.server.level.ServerLevel
|
|||||||
import net.minecraft.core.BlockPos
|
import net.minecraft.core.BlockPos
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A spawnable position relating to single-point spawning. Uses a single-point structure cache which is
|
* A spawnable position relating to triggered spawning. Uses a single-point structure cache which is
|
||||||
* the only contribution of this implementation really. By contrast, the area spawnable position provides
|
* the only contribution of this implementation.
|
||||||
* a structure cache that's shared across the entire zone that was used for spawning, which is great for
|
|
||||||
* performance. That kind of optimization shouldn't be necessary for single-point spawning.
|
|
||||||
*
|
*
|
||||||
* @author Hiroku
|
* @author Hiroku
|
||||||
* @since February 3rd, 2024
|
* @since February 3rd, 2024
|
||||||
*/
|
*/
|
||||||
open class BasicSpawnablePosition(
|
open class TriggerSpawnablePosition(
|
||||||
override val cause: SpawnCause,
|
override val cause: SpawnCause,
|
||||||
override val world: ServerLevel,
|
override val world: ServerLevel,
|
||||||
override val position: BlockPos,
|
override val position: BlockPos,
|
||||||
@@ -31,6 +29,6 @@ open class BasicSpawnablePosition(
|
|||||||
override val canSeeSky: Boolean,
|
override val canSeeSky: Boolean,
|
||||||
override val influences: MutableList<SpawningInfluence>
|
override val influences: MutableList<SpawningInfluence>
|
||||||
) : SpawnablePosition() {
|
) : SpawnablePosition() {
|
||||||
val singlePointStructureCache = StructureChunkCache()
|
val triggerStructureCache = StructureChunkCache()
|
||||||
override fun getStructureCache(pos: BlockPos) = singlePointStructureCache
|
override fun getStructureCache(pos: BlockPos) = triggerStructureCache
|
||||||
}
|
}
|
||||||
-1
@@ -36,7 +36,6 @@ interface SpawnablePositionCalculator<I : SpawnablePositionInput, O : SpawnableP
|
|||||||
val isLavaCondition: (BlockState) -> Boolean = { it.fluidState.`is`(FluidTags.LAVA) && it.fluidState.isSource }
|
val isLavaCondition: (BlockState) -> Boolean = { it.fluidState.`is`(FluidTags.LAVA) && it.fluidState.isSource }
|
||||||
|
|
||||||
private val calculators = PrioritizedList<SpawnablePositionCalculator<*, *>>()
|
private val calculators = PrioritizedList<SpawnablePositionCalculator<*, *>>()
|
||||||
|
|
||||||
val prioritizedAreaCalculators: List<AreaSpawnablePositionCalculator<*>>
|
val prioritizedAreaCalculators: List<AreaSpawnablePositionCalculator<*>>
|
||||||
get() = calculators.filterIsInstance<AreaSpawnablePositionCalculator<*>>()
|
get() = calculators.filterIsInstance<AreaSpawnablePositionCalculator<*>>()
|
||||||
|
|
||||||
|
|||||||
+189
@@ -0,0 +1,189 @@
|
|||||||
|
/*
|
||||||
|
* 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.api.spawning.prospecting
|
||||||
|
|
||||||
|
import com.cobblemon.mod.common.CobblemonPoiTypes
|
||||||
|
import com.cobblemon.mod.common.api.fishing.SpawnBait
|
||||||
|
import com.cobblemon.mod.common.api.spawning.influence.BucketNormalizingInfluence
|
||||||
|
import com.cobblemon.mod.common.api.spawning.influence.SpatialSpawningZoneInfluence
|
||||||
|
import com.cobblemon.mod.common.api.spawning.influence.SpawnBaitInfluence
|
||||||
|
import com.cobblemon.mod.common.api.spawning.influence.SpawningZoneInfluence
|
||||||
|
import com.cobblemon.mod.common.api.spawning.influence.UnconditionalSpawningZoneInfluence
|
||||||
|
import com.cobblemon.mod.common.api.spawning.influence.detector.SpawningInfluenceDetector
|
||||||
|
import com.cobblemon.mod.common.api.spawning.spawner.Spawner
|
||||||
|
import com.cobblemon.mod.common.api.spawning.spawner.SpawningZoneInput
|
||||||
|
import com.cobblemon.mod.common.block.PokeSnackBlock
|
||||||
|
import com.cobblemon.mod.common.block.entity.PokeSnackBlockEntity
|
||||||
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||||
|
import com.cobblemon.mod.common.net.messages.client.effect.PokeSnackBlockParticlesPacket
|
||||||
|
import com.cobblemon.mod.common.util.math.pow
|
||||||
|
import com.cobblemon.mod.common.util.toBlockPos
|
||||||
|
import kotlin.math.ceil
|
||||||
|
import kotlin.math.sqrt
|
||||||
|
import net.minecraft.core.BlockPos
|
||||||
|
import net.minecraft.core.Direction
|
||||||
|
import net.minecraft.core.Holder
|
||||||
|
import net.minecraft.server.level.ServerLevel
|
||||||
|
import net.minecraft.world.entity.ai.village.poi.PoiManager
|
||||||
|
import net.minecraft.world.entity.ai.village.poi.PoiType
|
||||||
|
import net.minecraft.world.level.block.Blocks
|
||||||
|
import net.minecraft.world.level.block.state.BlockState
|
||||||
|
import net.minecraft.world.phys.Vec3
|
||||||
|
import kotlin.math.abs
|
||||||
|
|
||||||
|
object LurePokeSnackDetector : SpawningInfluenceDetector {
|
||||||
|
|
||||||
|
@JvmField
|
||||||
|
val RANGE: Int = 48
|
||||||
|
|
||||||
|
@JvmField
|
||||||
|
val POKE_SNACK_CRUMBED_ASPECT = "poke_snack_crumbed"
|
||||||
|
|
||||||
|
override fun detectFromInput(spawner: Spawner, input: SpawningZoneInput): MutableList<SpawningZoneInfluence> {
|
||||||
|
val world = input.world
|
||||||
|
val listOfInfluences = mutableListOf<SpawningZoneInfluence>()
|
||||||
|
|
||||||
|
val searchRange = RANGE + ceil(sqrt(((input.length pow 2) + (input.width pow 2)).toDouble())).toInt()
|
||||||
|
val lurePokeSnackPositions = world.poiManager.findAll(
|
||||||
|
{ holder: Holder<PoiType> -> holder.`is`(CobblemonPoiTypes.POKE_SNACK_KEY) },
|
||||||
|
{ true },
|
||||||
|
input.getCenter().toBlockPos(),
|
||||||
|
searchRange,
|
||||||
|
PoiManager.Occupancy.ANY
|
||||||
|
).toList()
|
||||||
|
|
||||||
|
var highestLureTier = 0
|
||||||
|
|
||||||
|
for (lurePokeSnackPos in lurePokeSnackPositions) {
|
||||||
|
val blockState = world.getBlockState(lurePokeSnackPos)
|
||||||
|
if (blockState.block !is PokeSnackBlock) continue
|
||||||
|
|
||||||
|
val blockEntity = world.getBlockEntity(lurePokeSnackPos) as? PokeSnackBlockEntity ?: continue
|
||||||
|
val baitEffects = blockEntity.getBaitEffects()
|
||||||
|
|
||||||
|
highestLureTier = maxOf(highestLureTier, baitEffects.filter { it.type == SpawnBait.Effects.RARITY_BUCKET }.maxOfOrNull { it.value }?.toInt() ?: 0)
|
||||||
|
|
||||||
|
listOfInfluences.add(
|
||||||
|
SpatialSpawningZoneInfluence(
|
||||||
|
pos = lurePokeSnackPos,
|
||||||
|
radius = RANGE.toFloat(),
|
||||||
|
influence = SpawnBaitInfluence(
|
||||||
|
effects = baitEffects,
|
||||||
|
onUsed = { usedAmount, entity ->
|
||||||
|
entity?.let {
|
||||||
|
// Prevent triggering twice on same entity
|
||||||
|
if (usedAmount % 2 == 0) {
|
||||||
|
tryBite(world, lurePokeSnackPos)
|
||||||
|
moveAndApplyAspect(world, lurePokeSnackPos, entity)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (highestLureTier > 0) {
|
||||||
|
listOfInfluences.add(UnconditionalSpawningZoneInfluence(influence = BucketNormalizingInfluence(tier = highestLureTier)))
|
||||||
|
}
|
||||||
|
|
||||||
|
return listOfInfluences
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun tryBite(level: ServerLevel, blockPos: BlockPos) {
|
||||||
|
if (level.isLoaded(blockPos)) {
|
||||||
|
val blockState = level.getBlockState(blockPos)
|
||||||
|
val block = blockState.block as? PokeSnackBlock ?: return
|
||||||
|
|
||||||
|
block.eat(level, blockPos, blockState, null)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun moveAndApplyAspect(level: ServerLevel, blockPos: BlockPos, entity: PokemonEntity?) {
|
||||||
|
entity?.let {
|
||||||
|
entity.pokemon.forcedAspects += POKE_SNACK_CRUMBED_ASPECT
|
||||||
|
attemptSafeMove(level, blockPos, entity)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun attemptSafeMove(level: ServerLevel, startPos: BlockPos, entity: PokemonEntity) {
|
||||||
|
val inWater = entity.isInWater
|
||||||
|
val maxDistance = 10 // maximum search radius
|
||||||
|
val maxPositions = 10 // maximum number of positions at the closest distance
|
||||||
|
|
||||||
|
var foundPositions: List<BlockPos> = emptyList()
|
||||||
|
|
||||||
|
// Search layer by layer, starting from the closest
|
||||||
|
for (distance in 1..maxDistance) {
|
||||||
|
val positionsAtThisDistance = mutableListOf<BlockPos>()
|
||||||
|
|
||||||
|
for (dx in -distance..distance) {
|
||||||
|
for (dy in -distance..distance) {
|
||||||
|
for (dz in -distance..distance) {
|
||||||
|
// Consider only positions on the surface of the cube at current distance
|
||||||
|
if (listOf(dx, dy, dz).count { abs(it) != 0 } == distance) {
|
||||||
|
val candidatePos = startPos.offset(dx, dy, dz)
|
||||||
|
if (!candidatePos.equals(startPos.relative(Direction.UP))) {
|
||||||
|
// Check collision
|
||||||
|
val currentBox = entity.boundingBox.move(
|
||||||
|
candidatePos.x - entity.x,
|
||||||
|
candidatePos.y - entity.y,
|
||||||
|
candidatePos.z - entity.z
|
||||||
|
)
|
||||||
|
|
||||||
|
if (level.noCollision(entity, currentBox)) {
|
||||||
|
val blockBelowPos = candidatePos.below()
|
||||||
|
val blockState = level.getBlockState(blockBelowPos)
|
||||||
|
|
||||||
|
val isWater = blockState.block == Blocks.WATER
|
||||||
|
if (inWater) {
|
||||||
|
if (isWater) {
|
||||||
|
positionsAtThisDistance.add(candidatePos)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (!blockState.isAir) {
|
||||||
|
positionsAtThisDistance.add(candidatePos)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (positionsAtThisDistance.isNotEmpty()) {
|
||||||
|
// Limit to 10 nearest positions (all at this distance)
|
||||||
|
foundPositions = if (positionsAtThisDistance.size > maxPositions) {
|
||||||
|
positionsAtThisDistance.shuffled().take(maxPositions)
|
||||||
|
} else {
|
||||||
|
positionsAtThisDistance
|
||||||
|
}
|
||||||
|
break // Found the nearest layer with safe positions, stop expanding
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (foundPositions.isNotEmpty()) {
|
||||||
|
val chosenPos = foundPositions.random()
|
||||||
|
val centerX = chosenPos.x + 0.5
|
||||||
|
val centerZ = chosenPos.z + 0.5
|
||||||
|
entity.moveTo(Vec3(centerX, chosenPos.y.toDouble(), centerZ))
|
||||||
|
|
||||||
|
PokeSnackBlockParticlesPacket(startPos, chosenPos).sendToPlayersAround(
|
||||||
|
startPos.x.toDouble(),
|
||||||
|
startPos.y.toDouble(),
|
||||||
|
startPos.z.toDouble(),
|
||||||
|
64.0,
|
||||||
|
level.dimension()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun detectFromBlock(level: ServerLevel, pos: BlockPos, blockState: BlockState) = emptyList<SpawningZoneInfluence>()
|
||||||
|
}
|
||||||
+2
-7
@@ -24,11 +24,6 @@ import com.cobblemon.mod.common.api.spawning.spawner.Spawner
|
|||||||
* @since January 31st, 2022
|
* @since January 31st, 2022
|
||||||
*/
|
*/
|
||||||
interface SpawningSelector<T : SpawnSelectionData> {
|
interface SpawningSelector<T : SpawnSelectionData> {
|
||||||
companion object {
|
|
||||||
@JvmField
|
|
||||||
val DEFAULT = FlatSpawnablePositionWeightedSelector()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getSelectionData(spawner: Spawner, bucket: SpawnBucket, spawnablePositions: List<SpawnablePosition>): T
|
fun getSelectionData(spawner: Spawner, bucket: SpawnBucket, spawnablePositions: List<SpawnablePosition>): T
|
||||||
|
|
||||||
fun selectSpawnAction(
|
fun selectSpawnAction(
|
||||||
@@ -37,12 +32,12 @@ interface SpawningSelector<T : SpawnSelectionData> {
|
|||||||
selectionData: T
|
selectionData: T
|
||||||
): SpawnAction<*>?
|
): SpawnAction<*>?
|
||||||
|
|
||||||
fun select(spawner: Spawner, bucket: SpawnBucket, spawnablePositions: List<SpawnablePosition>, maxSpawns: Int): List<SpawnAction<*>> {
|
fun select(spawner: Spawner, bucket: SpawnBucket, spawnablePositions: List<SpawnablePosition>, max: Int): List<SpawnAction<*>> {
|
||||||
val selectionData = getSelectionData(spawner, bucket, spawnablePositions)
|
val selectionData = getSelectionData(spawner, bucket, spawnablePositions)
|
||||||
|
|
||||||
val spawnActions = selectionData.spawnActions
|
val spawnActions = selectionData.spawnActions
|
||||||
|
|
||||||
while (spawnActions.size < maxSpawns) {
|
while (spawnActions.size < max) {
|
||||||
val spawnAction = selectSpawnAction(
|
val spawnAction = selectSpawnAction(
|
||||||
spawner = spawner,
|
spawner = spawner,
|
||||||
bucket = bucket,
|
bucket = bucket,
|
||||||
|
|||||||
@@ -0,0 +1,180 @@
|
|||||||
|
/*
|
||||||
|
* 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.api.spawning.spawner
|
||||||
|
|
||||||
|
import com.cobblemon.mod.common.Cobblemon
|
||||||
|
import com.cobblemon.mod.common.api.spawning.SpawnCause
|
||||||
|
import com.cobblemon.mod.common.api.spawning.SpawnerManager
|
||||||
|
import com.cobblemon.mod.common.api.spawning.position.AreaSpawnablePositionResolver
|
||||||
|
import com.cobblemon.mod.common.api.spawning.position.calculators.AreaSpawnablePositionCalculator
|
||||||
|
import com.cobblemon.mod.common.api.spawning.position.calculators.SpawnablePositionCalculator.Companion.prioritizedAreaCalculators
|
||||||
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
|
||||||
|
import com.cobblemon.mod.common.api.spawning.SpawningZoneGenerator
|
||||||
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
|
||||||
|
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||||
|
import com.cobblemon.mod.common.util.isBoxLoaded
|
||||||
|
import com.cobblemon.mod.common.util.squeezeWithinBounds
|
||||||
|
import com.cobblemon.mod.common.util.toVec3f
|
||||||
|
import net.minecraft.core.BlockPos
|
||||||
|
import net.minecraft.core.SectionPos
|
||||||
|
import net.minecraft.world.level.ChunkPos
|
||||||
|
import net.minecraft.world.level.Level
|
||||||
|
import net.minecraft.world.level.chunk.ChunkAccess
|
||||||
|
import net.minecraft.world.level.chunk.status.ChunkStatus
|
||||||
|
import net.minecraft.world.level.pathfinder.PathComputationType
|
||||||
|
import net.minecraft.world.phys.AABB
|
||||||
|
import net.minecraft.world.phys.Vec3
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A type of [TickingSpawner] that operates within some area. When this spawner type
|
||||||
|
* is told to do a spawning action, the subclass can provide a [SpawningZoneInput] to use.
|
||||||
|
* If a non-null value is returned, the [spawningZoneGenerator] and [spawnablePositionResolver] will be used to
|
||||||
|
* select a spawn and action it.
|
||||||
|
*
|
||||||
|
* Subclasses must implement the function retrieving what area to do the spawning in,
|
||||||
|
* but otherwise this class is feature-complete.
|
||||||
|
*
|
||||||
|
* @author Hiroku
|
||||||
|
* @since February 5th, 2022
|
||||||
|
*/
|
||||||
|
abstract class AreaSpawner(
|
||||||
|
name: String,
|
||||||
|
spawns: SpawnPool,
|
||||||
|
manager: SpawnerManager
|
||||||
|
) : TickingSpawner(name, spawns, manager) {
|
||||||
|
abstract fun getZoneInput(cause: SpawnCause): SpawningZoneInput?
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val CHUNK_REACH = 3
|
||||||
|
}
|
||||||
|
|
||||||
|
var spawningZoneGenerator: SpawningZoneGenerator = Cobblemon.spawningZoneGenerator
|
||||||
|
var spawnablePositionResolver: AreaSpawnablePositionResolver = Cobblemon.areaSpawnablePositionResolver
|
||||||
|
var spawnablePositionCalculators: List<AreaSpawnablePositionCalculator<*>> = prioritizedAreaCalculators
|
||||||
|
|
||||||
|
var spawnsPerPass: Int? = null
|
||||||
|
|
||||||
|
override fun run(cause: SpawnCause): List<SpawnAction<*>> {
|
||||||
|
val areaInput = getZoneInput(cause)
|
||||||
|
val constrainedArea = if (areaInput != null) constrainArea(areaInput) else null
|
||||||
|
if (constrainedArea != null) {
|
||||||
|
|
||||||
|
val areaBox = AABB.ofSize(
|
||||||
|
Vec3(constrainedArea.getCenter().toVec3f()),
|
||||||
|
CHUNK_REACH * 16.0 * 2,
|
||||||
|
1000.0,
|
||||||
|
CHUNK_REACH * 16.0 * 2
|
||||||
|
)
|
||||||
|
|
||||||
|
if (!constrainedArea.world.isBoxLoaded(areaBox)) {
|
||||||
|
return emptyList()
|
||||||
|
}
|
||||||
|
|
||||||
|
val numberNearby = constrainedArea.world.getEntitiesOfClass(
|
||||||
|
PokemonEntity::class.java,
|
||||||
|
areaBox,
|
||||||
|
PokemonEntity::countsTowardsSpawnCap
|
||||||
|
).size
|
||||||
|
|
||||||
|
val chunksCovered = CHUNK_REACH * CHUNK_REACH
|
||||||
|
if (numberNearby.toFloat() / chunksCovered >= Cobblemon.config.pokemonPerChunk) {
|
||||||
|
return emptyList()
|
||||||
|
}
|
||||||
|
|
||||||
|
//val prospectStart = System.currentTimeMillis()
|
||||||
|
val zone = spawningZoneGenerator.generate(this, constrainedArea)
|
||||||
|
//val prospectEnd = System.currentTimeMillis()
|
||||||
|
val spawnablePositions = spawnablePositionResolver.resolve(this, spawnablePositionCalculators, zone)
|
||||||
|
|
||||||
|
val influences = this.getAllInfluences() + zone.unconditionalInfluences
|
||||||
|
|
||||||
|
val bucket = chooseBucket(cause, influences)
|
||||||
|
//val resolveEnd = System.currentTimeMillis()
|
||||||
|
//val prospectDuration = prospectEnd - prospectStart
|
||||||
|
//val resolveDuration = resolveEnd - prospectEnd
|
||||||
|
//println("Prospecting took: $prospectDuration ms. Resolution took: $resolveDuration ms")
|
||||||
|
// Takes about 3ms on my laptop to prospect, similar to spawnable position resolve - not very good, needs some thought
|
||||||
|
return getSpawningSelector().select(spawner = this, bucket = bucket, spawnablePositions = spawnablePositions, max = spawnsPerPass ?: Cobblemon.config.maximumSpawnsPerPass)
|
||||||
|
}
|
||||||
|
|
||||||
|
return emptyList()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun isValidStartPoint(world: Level, chunk: ChunkAccess, startPos: BlockPos.MutableBlockPos): Boolean {
|
||||||
|
val y = startPos.y
|
||||||
|
if (!world.isLoaded(startPos) || !world.isLoaded(startPos.setY(y + 1))) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
val mid = chunk.getBlockState(startPos.setY(y))
|
||||||
|
val above = chunk.getBlockState(startPos.setY(y + 1))
|
||||||
|
|
||||||
|
// Above must be non-solid
|
||||||
|
if (!above.isPathfindable(PathComputationType.AIR)) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
// Position must be non-air
|
||||||
|
if (mid.isAir) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
fun constrainArea(area: SpawningZoneInput): SpawningZoneInput? {
|
||||||
|
val basePos = BlockPos.MutableBlockPos(area.baseX, area.baseY, area.baseZ)
|
||||||
|
val originalY = area.baseY
|
||||||
|
|
||||||
|
val (chunkX, chunkZ) = Pair(SectionPos.blockToSectionCoord(area.baseX), SectionPos.blockToSectionCoord(area.baseZ))
|
||||||
|
|
||||||
|
// if the chunk isn't loaded, we don't want to go further & we don't want the getChunk function below to load/create the chunk.
|
||||||
|
if (!area.world.areEntitiesLoaded(ChunkPos.asLong(chunkX, chunkZ))) return null
|
||||||
|
|
||||||
|
val chunk = area.world.getChunk(chunkX, chunkZ, ChunkStatus.FULL) ?: return null
|
||||||
|
|
||||||
|
var valid = isValidStartPoint(area.world, chunk, basePos)
|
||||||
|
|
||||||
|
if (!valid) {
|
||||||
|
var offset = 1
|
||||||
|
do {
|
||||||
|
if (isValidStartPoint(area.world, chunk, basePos.setY(originalY + offset))) {
|
||||||
|
valid = true
|
||||||
|
basePos.y = originalY + offset
|
||||||
|
break
|
||||||
|
} else if (isValidStartPoint(area.world, chunk, basePos.setY(originalY - offset))) {
|
||||||
|
valid = true
|
||||||
|
basePos.y = originalY - offset
|
||||||
|
break
|
||||||
|
}
|
||||||
|
offset++
|
||||||
|
} while (offset <= Cobblemon.config.maxVerticalCorrectionBlocks)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (valid) {
|
||||||
|
val min = area.world.squeezeWithinBounds(basePos)
|
||||||
|
val max = area.world.squeezeWithinBounds(basePos.move(area.length, area.height, area.width))
|
||||||
|
if (area.world.isLoaded(min) && area.world.isLoaded(max) &&
|
||||||
|
min.x < max.x && min.y < max.y && min.z < max.z
|
||||||
|
) {
|
||||||
|
return SpawningZoneInput(
|
||||||
|
cause = area.cause,
|
||||||
|
world = area.world,
|
||||||
|
baseX = min.x,
|
||||||
|
baseY = min.y,
|
||||||
|
baseZ = min.z,
|
||||||
|
length = max.x - min.x,
|
||||||
|
height = max.y - min.y,
|
||||||
|
width = max.z - min.z
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.api.spawning.spawner
|
|
||||||
|
|
||||||
import com.cobblemon.mod.common.Cobblemon
|
|
||||||
import com.cobblemon.mod.common.api.spawning.SpawningZoneGenerator
|
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
|
|
||||||
import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
|
|
||||||
import com.cobblemon.mod.common.api.spawning.position.AreaSpawnablePositionResolver
|
|
||||||
import com.cobblemon.mod.common.api.spawning.selection.SpawningSelector
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A basic spawner implementation that uses Cobblemon's default algorithms for zone generation,
|
|
||||||
* position resolving, and spawn selection.
|
|
||||||
*
|
|
||||||
* @author Hiroku
|
|
||||||
* @since October 27th, 2025
|
|
||||||
*/
|
|
||||||
open class BasicSpawner(
|
|
||||||
override val name: String,
|
|
||||||
override var spawnPool: SpawnPool,
|
|
||||||
override var maxPokemonPerChunk: Float = Cobblemon.config.pokemonPerChunk
|
|
||||||
) : Spawner {
|
|
||||||
override var selector: SpawningSelector<*> = SpawningSelector.DEFAULT
|
|
||||||
override var generator: SpawningZoneGenerator = Cobblemon.spawningZoneGenerator
|
|
||||||
override var resolver: AreaSpawnablePositionResolver = Cobblemon.areaSpawnablePositionResolver
|
|
||||||
override val influences = mutableListOf<SpawningInfluence>()
|
|
||||||
}
|
|
||||||
+10
-14
@@ -8,37 +8,33 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.api.spawning.spawner
|
package com.cobblemon.mod.common.api.spawning.spawner
|
||||||
|
|
||||||
import com.cobblemon.mod.common.Cobblemon
|
|
||||||
import com.cobblemon.mod.common.api.spawning.SpawnCause
|
import com.cobblemon.mod.common.api.spawning.SpawnCause
|
||||||
|
import com.cobblemon.mod.common.api.spawning.SpawnerManager
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
|
||||||
import net.minecraft.server.level.ServerLevel
|
import net.minecraft.server.level.ServerLevel
|
||||||
import net.minecraft.core.BlockPos
|
import net.minecraft.core.BlockPos
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A spawner that works within a fixed area. Instances provide the center point and the radii and then the spawner
|
* A spawner that works within a fixed area, and ticks on its own. The location
|
||||||
* can be told to [run] and it will spawn Pokémon within that area.
|
* and size of the area is necessary for construction, but after that this spawner
|
||||||
|
* can be registered in a [SpawnerManager] and left to its own devices.
|
||||||
*
|
*
|
||||||
* @author Hiroku
|
* @author Hiroku
|
||||||
* @since February 5th, 2022
|
* @since February 5th, 2022
|
||||||
*/
|
*/
|
||||||
open class FixedAreaSpawner(
|
open class FixedAreaSpawner(
|
||||||
name: String,
|
name: String,
|
||||||
spawnPool: SpawnPool,
|
spawns: SpawnPool,
|
||||||
|
manager: SpawnerManager,
|
||||||
val world: ServerLevel,
|
val world: ServerLevel,
|
||||||
val position: BlockPos,
|
val position: BlockPos,
|
||||||
val horizontalRadius: Int,
|
val horizontalRadius: Int,
|
||||||
val verticalRadius: Int,
|
val verticalRadius: Int,
|
||||||
maxPokemonPerChunk: Float = Cobblemon.config.pokemonPerChunk
|
override var ticksBetweenSpawns: Float = 20F
|
||||||
) : BasicSpawner(name, spawnPool, maxPokemonPerChunk) {
|
) : AreaSpawner(name, spawns, manager) {
|
||||||
fun run(cause: SpawnCause, maxSpawns: Int? = null): List<Any> {
|
override fun getZoneInput(cause: SpawnCause): SpawningZoneInput? {
|
||||||
return runForArea(
|
|
||||||
zoneInput = getZoneInput(cause),
|
|
||||||
maxSpawns = maxSpawns
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getZoneInput(cause: SpawnCause): SpawningZoneInput {
|
|
||||||
val basePos = position.offset(-horizontalRadius, -verticalRadius, -horizontalRadius)
|
val basePos = position.offset(-horizontalRadius, -verticalRadius, -horizontalRadius)
|
||||||
|
|
||||||
return SpawningZoneInput(
|
return SpawningZoneInput(
|
||||||
cause = cause,
|
cause = cause,
|
||||||
world = world,
|
world = world,
|
||||||
|
|||||||
+5
-28
@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.api.spawning.spawner
|
|||||||
|
|
||||||
import com.cobblemon.mod.common.Cobblemon.config
|
import com.cobblemon.mod.common.Cobblemon.config
|
||||||
import com.cobblemon.mod.common.api.spawning.SpawnCause
|
import com.cobblemon.mod.common.api.spawning.SpawnCause
|
||||||
|
import com.cobblemon.mod.common.api.spawning.SpawnerManager
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
|
||||||
import com.cobblemon.mod.common.util.getPlayer
|
import com.cobblemon.mod.common.util.getPlayer
|
||||||
import com.cobblemon.mod.common.util.nextBetween
|
import com.cobblemon.mod.common.util.nextBetween
|
||||||
@@ -30,16 +31,11 @@ import kotlin.random.Random
|
|||||||
* @author Hiroku
|
* @author Hiroku
|
||||||
* @since February 14th, 2022
|
* @since February 14th, 2022
|
||||||
*/
|
*/
|
||||||
open class PlayerSpawner(
|
class PlayerSpawner(player: ServerPlayer, spawns: SpawnPool, manager: SpawnerManager) : AreaSpawner(player.name.string, spawns, manager) {
|
||||||
player: ServerPlayer,
|
|
||||||
spawnPool: SpawnPool
|
|
||||||
) : BasicSpawner(
|
|
||||||
name = player.name.string,
|
|
||||||
spawnPool = spawnPool
|
|
||||||
) {
|
|
||||||
val uuid: UUID = player.uuid
|
val uuid: UUID = player.uuid
|
||||||
|
override var ticksBetweenSpawns = config.ticksBetweenSpawnAttempts
|
||||||
fun getZoneInput(cause: SpawnCause): SpawningZoneInput? {
|
override fun getCauseEntity() = uuid.getPlayer()
|
||||||
|
override fun getZoneInput(cause: SpawnCause): SpawningZoneInput? {
|
||||||
val player = uuid.getPlayer() ?: return null
|
val player = uuid.getPlayer() ?: return null
|
||||||
val zoneDiameter = config.spawningZoneDiameter
|
val zoneDiameter = config.spawningZoneDiameter
|
||||||
val zoneHeight = config.spawningZoneHeight
|
val zoneHeight = config.spawningZoneHeight
|
||||||
@@ -57,7 +53,6 @@ open class PlayerSpawner(
|
|||||||
} else {
|
} else {
|
||||||
thetatemp
|
thetatemp
|
||||||
}
|
}
|
||||||
|
|
||||||
val x = center.x + r * cos(theta)
|
val x = center.x + r * cos(theta)
|
||||||
val z = center.z + r * sin(theta)
|
val z = center.z + r * sin(theta)
|
||||||
|
|
||||||
@@ -72,22 +67,4 @@ open class PlayerSpawner(
|
|||||||
width = zoneDiameter
|
width = zoneDiameter
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
var active = true
|
|
||||||
var ticksUntilNextSpawn = 100F
|
|
||||||
var ticksBetweenSpawns: Float = config.ticksBetweenSpawnAttempts
|
|
||||||
var tickTimerMultiplier = 1F
|
|
||||||
|
|
||||||
fun tick() {
|
|
||||||
if (!active) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
ticksUntilNextSpawn -= tickTimerMultiplier
|
|
||||||
if (ticksUntilNextSpawn <= 0) {
|
|
||||||
val zoneInput = getZoneInput(cause = SpawnCause(spawner = this, entity = uuid.getPlayer()))
|
|
||||||
zoneInput?.let(::runForArea)
|
|
||||||
ticksUntilNextSpawn = ticksBetweenSpawns
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+4
-3
@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.api.spawning.spawner
|
|||||||
|
|
||||||
import com.cobblemon.mod.common.api.spawning.CobblemonSpawnPools
|
import com.cobblemon.mod.common.api.spawning.CobblemonSpawnPools
|
||||||
import com.cobblemon.mod.common.api.spawning.CobblemonSpawnRules
|
import com.cobblemon.mod.common.api.spawning.CobblemonSpawnRules
|
||||||
|
import com.cobblemon.mod.common.api.spawning.SpawnerManager
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
|
||||||
import com.cobblemon.mod.common.api.spawning.influence.PlayerLevelRangeInfluence
|
import com.cobblemon.mod.common.api.spawning.influence.PlayerLevelRangeInfluence
|
||||||
import com.cobblemon.mod.common.api.spawning.influence.PlayerLevelRangeInfluence.Companion.TYPICAL_VARIATION
|
import com.cobblemon.mod.common.api.spawning.influence.PlayerLevelRangeInfluence.Companion.TYPICAL_VARIATION
|
||||||
@@ -27,7 +28,7 @@ import net.minecraft.server.level.ServerPlayer
|
|||||||
* @since February 14th, 2022
|
* @since February 14th, 2022
|
||||||
*/
|
*/
|
||||||
object PlayerSpawnerFactory {
|
object PlayerSpawnerFactory {
|
||||||
var spawnPool: SpawnPool by mutableLazy {
|
var spawns: SpawnPool by mutableLazy {
|
||||||
CobblemonSpawnPools.WORLD_SPAWN_POOL
|
CobblemonSpawnPools.WORLD_SPAWN_POOL
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,9 +46,9 @@ object PlayerSpawnerFactory {
|
|||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
fun create(player: ServerPlayer): PlayerSpawner {
|
fun create(spawnerManager: SpawnerManager, player: ServerPlayer): PlayerSpawner {
|
||||||
val influences = influenceBuilders.mapNotNull { it(player) }
|
val influences = influenceBuilders.mapNotNull { it(player) }
|
||||||
return PlayerSpawner(player, spawnPool).also {
|
return PlayerSpawner(player, spawns, spawnerManager).also {
|
||||||
it.influences.addAll(influences)
|
it.influences.addAll(influences)
|
||||||
it.influences.addAll(
|
it.influences.addAll(
|
||||||
CobblemonSpawnRules.rules.values.filter(SpawnRule::enabled).flatMap(SpawnRule::components)
|
CobblemonSpawnRules.rules.values.filter(SpawnRule::enabled).flatMap(SpawnRule::components)
|
||||||
|
|||||||
@@ -14,67 +14,33 @@ import com.cobblemon.mod.common.api.events.entity.SpawnBucketChosenEvent
|
|||||||
import com.cobblemon.mod.common.api.spawning.BestSpawner
|
import com.cobblemon.mod.common.api.spawning.BestSpawner
|
||||||
import com.cobblemon.mod.common.api.spawning.SpawnBucket
|
import com.cobblemon.mod.common.api.spawning.SpawnBucket
|
||||||
import com.cobblemon.mod.common.api.spawning.SpawnCause
|
import com.cobblemon.mod.common.api.spawning.SpawnCause
|
||||||
import com.cobblemon.mod.common.api.spawning.SpawningZoneGenerator
|
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.EntitySpawnResult
|
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
|
||||||
import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
|
import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
|
||||||
import com.cobblemon.mod.common.api.spawning.position.AreaSpawnablePositionResolver
|
|
||||||
import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
|
import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
|
||||||
import com.cobblemon.mod.common.api.spawning.position.calculators.SpawnablePositionCalculator.Companion.prioritizedAreaCalculators
|
|
||||||
import com.cobblemon.mod.common.api.spawning.selection.SpawningSelector
|
import com.cobblemon.mod.common.api.spawning.selection.SpawningSelector
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
|
||||||
import com.cobblemon.mod.common.util.isBoxLoaded
|
|
||||||
import com.cobblemon.mod.common.util.squeezeWithinBounds
|
|
||||||
import com.cobblemon.mod.common.util.toVec3f
|
|
||||||
import com.cobblemon.mod.common.util.weightedSelection
|
import com.cobblemon.mod.common.util.weightedSelection
|
||||||
import kotlin.Any
|
|
||||||
import kotlin.Boolean
|
|
||||||
import kotlin.Float
|
|
||||||
import kotlin.Int
|
|
||||||
import kotlin.Pair
|
|
||||||
import kotlin.String
|
|
||||||
import kotlin.collections.plus
|
|
||||||
import kotlin.math.max
|
|
||||||
import net.minecraft.core.BlockPos
|
|
||||||
import net.minecraft.core.SectionPos
|
|
||||||
import net.minecraft.world.level.ChunkPos
|
|
||||||
import net.minecraft.world.level.Level
|
|
||||||
import net.minecraft.world.level.chunk.ChunkAccess
|
|
||||||
import net.minecraft.world.level.chunk.status.ChunkStatus
|
|
||||||
import net.minecraft.world.level.pathfinder.PathComputationType
|
|
||||||
import net.minecraft.world.phys.AABB
|
|
||||||
import net.minecraft.world.phys.Vec3
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Interface representing something that performs the action of spawning. Various functions
|
* Interface representing something that performs the action of spawning. Various functions
|
||||||
* exist to streamline the process of using the [BestSpawner].
|
* exist to streamline the process of using the [BestSpawner].
|
||||||
*
|
*
|
||||||
* The simplest implementation is a [BasicSpawner]
|
|
||||||
*
|
|
||||||
* @author Hiroku
|
* @author Hiroku
|
||||||
* @since January 24th, 2022
|
* @since January 24th, 2022
|
||||||
*/
|
*/
|
||||||
interface Spawner {
|
interface Spawner {
|
||||||
val name: String
|
val name: String
|
||||||
val influences: MutableList<SpawningInfluence>
|
val influences: MutableList<SpawningInfluence>
|
||||||
var spawnPool: SpawnPool
|
fun getSpawningSelector(): SpawningSelector<*>
|
||||||
var selector: SpawningSelector<*>
|
fun setSpawningSelector(selector: SpawningSelector<*>)
|
||||||
var generator: SpawningZoneGenerator
|
fun getSpawnPool(): SpawnPool
|
||||||
var resolver: AreaSpawnablePositionResolver
|
fun setSpawnPool(spawnPool: SpawnPool)
|
||||||
var maxPokemonPerChunk: Float
|
|
||||||
|
|
||||||
fun <R> afterSpawn(action: SpawnAction<R>, result: R) {}
|
fun <R> afterSpawn(action: SpawnAction<R>, result: R) {}
|
||||||
|
|
||||||
companion object {
|
|
||||||
/** The chunk range radius over which spawning will roughly keep the entity density under control. */
|
|
||||||
const val ENTITY_LIMIT_CHUNK_RANGE = 3
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getMatchingSpawns(bucket: SpawnBucket, spawnablePosition: SpawnablePosition): List<SpawnDetail> {
|
fun getMatchingSpawns(bucket: SpawnBucket, spawnablePosition: SpawnablePosition): List<SpawnDetail> {
|
||||||
val spawns = mutableListOf<SpawnDetail>()
|
val spawns = mutableListOf<SpawnDetail>()
|
||||||
spawns.addAll(spawnPool.retrieve(bucket, spawnablePosition).filter { it.isSatisfiedBy(spawnablePosition) })
|
spawns.addAll(getSpawnPool().retrieve(bucket, spawnablePosition).filter { it.isSatisfiedBy(spawnablePosition) })
|
||||||
spawnablePosition.influences.forEach { influence ->
|
spawnablePosition.influences.forEach { influence ->
|
||||||
val influencedSpawns = influence.injectSpawns(bucket, spawnablePosition)
|
val influencedSpawns = influence.injectSpawns(bucket, spawnablePosition)
|
||||||
if (influencedSpawns != null) {
|
if (influencedSpawns != null) {
|
||||||
@@ -84,101 +50,6 @@ interface Spawner {
|
|||||||
return spawns
|
return spawns
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Runs the spawner for a specific [SpawnablePosition] and calculates a [SpawnAction] that could spawn there.
|
|
||||||
* This does not trigger the resulting spawn. You can trigger the spawn in the same action by running
|
|
||||||
* [runForPosition] instead or manually complete the [SpawnAction] it returns using [SpawnAction.complete].
|
|
||||||
*/
|
|
||||||
fun calculateSpawnActionForPosition(
|
|
||||||
cause: SpawnCause,
|
|
||||||
spawnablePosition: SpawnablePosition,
|
|
||||||
): SpawnAction<*>? {
|
|
||||||
influences.removeIf { it.isExpired() }
|
|
||||||
spawnablePosition.influences.addAll(influences)
|
|
||||||
val bucket = chooseBucket(cause, spawnablePosition.influences)
|
|
||||||
return selector.select(
|
|
||||||
spawner = this,
|
|
||||||
bucket = bucket,
|
|
||||||
spawnablePositions = listOf(spawnablePosition),
|
|
||||||
maxSpawns = 1
|
|
||||||
).firstOrNull()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun calculateSpawnActionsForArea(
|
|
||||||
zoneInput: SpawningZoneInput,
|
|
||||||
maxSpawns: Int?
|
|
||||||
): List<SpawnAction<*>> {
|
|
||||||
val maxSpawns = maxSpawns ?: Cobblemon.config.maximumSpawnsPerPass
|
|
||||||
influences.removeIf { it.isExpired() }
|
|
||||||
|
|
||||||
val constrainedArea = constrainArea(zoneInput)
|
|
||||||
?: return emptyList()
|
|
||||||
|
|
||||||
val areaBox = AABB.ofSize(
|
|
||||||
Vec3(constrainedArea.getCenter().toVec3f()),
|
|
||||||
ENTITY_LIMIT_CHUNK_RANGE * 16.0 * 2,
|
|
||||||
1000.0,
|
|
||||||
ENTITY_LIMIT_CHUNK_RANGE * 16.0 * 2
|
|
||||||
)
|
|
||||||
|
|
||||||
if (!constrainedArea.world.isBoxLoaded(areaBox)) {
|
|
||||||
return emptyList()
|
|
||||||
}
|
|
||||||
|
|
||||||
val numberNearby = constrainedArea.world.getEntitiesOfClass(
|
|
||||||
PokemonEntity::class.java,
|
|
||||||
areaBox,
|
|
||||||
PokemonEntity::countsTowardsSpawnCap
|
|
||||||
).size
|
|
||||||
|
|
||||||
val chunksCovered = ENTITY_LIMIT_CHUNK_RANGE * ENTITY_LIMIT_CHUNK_RANGE
|
|
||||||
val maxPokemonPerChunk = max(Cobblemon.config.pokemonPerChunk, zoneInput.cause.spawner.maxPokemonPerChunk)
|
|
||||||
if (numberNearby.toFloat() / chunksCovered >= maxPokemonPerChunk) {
|
|
||||||
return emptyList()
|
|
||||||
}
|
|
||||||
|
|
||||||
val zone = generator.generate(this, constrainedArea)
|
|
||||||
val spawnablePositions = resolver.resolve(this, prioritizedAreaCalculators, zone)
|
|
||||||
val influences = influences + zone.unconditionalInfluences
|
|
||||||
val bucket = chooseBucket(zoneInput.cause, influences)
|
|
||||||
|
|
||||||
return selector.select(
|
|
||||||
spawner = this,
|
|
||||||
bucket = bucket,
|
|
||||||
spawnablePositions = spawnablePositions,
|
|
||||||
maxSpawns = maxSpawns
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Runs the spawner at the given [SpawnablePosition] and returns whatever the calculated [SpawnAction] produces,
|
|
||||||
* if any spawn occurred. For most implementations of [SpawnAction], the resulting type is
|
|
||||||
* [EntitySpawnResult]. Technically you can make spawns for anything though.
|
|
||||||
*/
|
|
||||||
fun runForPosition(
|
|
||||||
cause: SpawnCause,
|
|
||||||
spawnablePosition: SpawnablePosition
|
|
||||||
): Any? {
|
|
||||||
val action = calculateSpawnActionForPosition(
|
|
||||||
cause = cause,
|
|
||||||
spawnablePosition = spawnablePosition
|
|
||||||
) ?: return null
|
|
||||||
|
|
||||||
return action.complete()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun runForArea(
|
|
||||||
zoneInput: SpawningZoneInput,
|
|
||||||
maxSpawns: Int? = null
|
|
||||||
): List<Any> {
|
|
||||||
val spawnActions = calculateSpawnActionsForArea(zoneInput = zoneInput, maxSpawns = maxSpawns)
|
|
||||||
val results = mutableListOf<Any>()
|
|
||||||
for (spawnAction in spawnActions) {
|
|
||||||
spawnAction.complete()?.let(results::add)
|
|
||||||
}
|
|
||||||
return results
|
|
||||||
}
|
|
||||||
|
|
||||||
fun copyInfluences() = influences.filter { !it.isExpired() }.toMutableList()
|
fun copyInfluences() = influences.filter { !it.isExpired() }.toMutableList()
|
||||||
|
|
||||||
fun chooseBucket(cause: SpawnCause, influences: List<SpawningInfluence>): SpawnBucket {
|
fun chooseBucket(cause: SpawnCause, influences: List<SpawningInfluence>): SpawnBucket {
|
||||||
@@ -195,77 +66,4 @@ interface Spawner {
|
|||||||
CobblemonEvents.SPAWN_BUCKET_CHOSEN.post(event)
|
CobblemonEvents.SPAWN_BUCKET_CHOSEN.post(event)
|
||||||
return event.bucket
|
return event.bucket
|
||||||
}
|
}
|
||||||
|
|
||||||
fun isValidStartPoint(world: Level, chunk: ChunkAccess, startPos: BlockPos.MutableBlockPos): Boolean {
|
|
||||||
val y = startPos.y
|
|
||||||
if (!world.isLoaded(startPos) || !world.isLoaded(startPos.setY(y + 1))) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
val mid = chunk.getBlockState(startPos.setY(y))
|
|
||||||
val above = chunk.getBlockState(startPos.setY(y + 1))
|
|
||||||
|
|
||||||
// Above must be non-solid
|
|
||||||
if (!above.isPathfindable(PathComputationType.AIR)) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
// Position must be non-air
|
|
||||||
if (mid.isAir) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
fun constrainArea(area: SpawningZoneInput): SpawningZoneInput? {
|
|
||||||
val basePos = BlockPos.MutableBlockPos(area.baseX, area.baseY, area.baseZ)
|
|
||||||
val originalY = area.baseY
|
|
||||||
|
|
||||||
val (chunkX, chunkZ) = Pair(SectionPos.blockToSectionCoord(area.baseX), SectionPos.blockToSectionCoord(area.baseZ))
|
|
||||||
|
|
||||||
// if the chunk isn't loaded, we don't want to go further & we don't want the getChunk function below to load/create the chunk.
|
|
||||||
if (!area.world.areEntitiesLoaded(ChunkPos.asLong(chunkX, chunkZ))) return null
|
|
||||||
|
|
||||||
val chunk = area.world.getChunk(chunkX, chunkZ, ChunkStatus.FULL) ?: return null
|
|
||||||
|
|
||||||
var valid = isValidStartPoint(area.world, chunk, basePos)
|
|
||||||
|
|
||||||
if (!valid) {
|
|
||||||
var offset = 1
|
|
||||||
do {
|
|
||||||
if (isValidStartPoint(area.world, chunk, basePos.setY(originalY + offset))) {
|
|
||||||
valid = true
|
|
||||||
basePos.y = originalY + offset
|
|
||||||
break
|
|
||||||
} else if (isValidStartPoint(area.world, chunk, basePos.setY(originalY - offset))) {
|
|
||||||
valid = true
|
|
||||||
basePos.y = originalY - offset
|
|
||||||
break
|
|
||||||
}
|
|
||||||
offset++
|
|
||||||
} while (offset <= Cobblemon.config.maxVerticalCorrectionBlocks)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (valid) {
|
|
||||||
val min = area.world.squeezeWithinBounds(basePos)
|
|
||||||
val max = area.world.squeezeWithinBounds(basePos.move(area.length, area.height, area.width))
|
|
||||||
if (area.world.isLoaded(min) && area.world.isLoaded(max) &&
|
|
||||||
min.x < max.x && min.y < max.y && min.z < max.z
|
|
||||||
) {
|
|
||||||
return SpawningZoneInput(
|
|
||||||
cause = area.cause,
|
|
||||||
world = area.world,
|
|
||||||
baseX = min.x,
|
|
||||||
baseY = min.y,
|
|
||||||
baseZ = min.z,
|
|
||||||
length = max.x - min.x,
|
|
||||||
height = max.y - min.y,
|
|
||||||
width = max.z - min.z
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+89
@@ -0,0 +1,89 @@
|
|||||||
|
/*
|
||||||
|
* 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.api.spawning.spawner
|
||||||
|
|
||||||
|
import com.cobblemon.mod.common.api.spawning.SpawnCause
|
||||||
|
import com.cobblemon.mod.common.api.spawning.SpawnerManager
|
||||||
|
import com.cobblemon.mod.common.api.spawning.detail.EntitySpawnResult
|
||||||
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
|
||||||
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
|
||||||
|
import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
|
||||||
|
import com.cobblemon.mod.common.api.spawning.selection.FlatSpawnablePositionWeightedSelector
|
||||||
|
import com.cobblemon.mod.common.api.spawning.selection.SpawningSelector
|
||||||
|
import net.minecraft.world.entity.Entity
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A spawner that regularly attempts spawning entities. It has timing utilities,
|
||||||
|
* and subclasses must provide the logic for generating a spawn which is called
|
||||||
|
* periodically by the server.
|
||||||
|
*
|
||||||
|
* @author Hiroku
|
||||||
|
* @since February 5th, 2022
|
||||||
|
*/
|
||||||
|
abstract class TickingSpawner(
|
||||||
|
override val name: String,
|
||||||
|
var spawns: SpawnPool,
|
||||||
|
val manager: SpawnerManager
|
||||||
|
) : Spawner {
|
||||||
|
private var selector: SpawningSelector<*> = FlatSpawnablePositionWeightedSelector()
|
||||||
|
override val influences = mutableListOf<SpawningInfluence>()
|
||||||
|
|
||||||
|
override fun getSpawningSelector() = selector
|
||||||
|
override fun setSpawningSelector(selector: SpawningSelector<*>) { this.selector = selector }
|
||||||
|
override fun getSpawnPool() = spawns
|
||||||
|
override fun setSpawnPool(spawnPool: SpawnPool) { spawns = spawnPool }
|
||||||
|
|
||||||
|
abstract fun run(cause: SpawnCause): List<SpawnAction<*>>
|
||||||
|
|
||||||
|
var active = true
|
||||||
|
val spawnedEntities = mutableListOf<Entity>()
|
||||||
|
|
||||||
|
var lastSpawnTime = 0L
|
||||||
|
var ticksUntilNextSpawn = 100F
|
||||||
|
abstract var ticksBetweenSpawns: Float
|
||||||
|
var tickTimerMultiplier = 1F
|
||||||
|
|
||||||
|
var removalCheckTicks = 0
|
||||||
|
|
||||||
|
open fun tick() {
|
||||||
|
removalCheckTicks++
|
||||||
|
influences.removeIf { it.isExpired() }
|
||||||
|
if (removalCheckTicks == 60) {
|
||||||
|
spawnedEntities.removeIf { it.isRemoved }
|
||||||
|
removalCheckTicks = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!active) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ticksUntilNextSpawn -= tickTimerMultiplier
|
||||||
|
if (ticksUntilNextSpawn <= 0) {
|
||||||
|
val spawnActions = run(cause = SpawnCause(spawner = this, entity = getCauseEntity()))
|
||||||
|
ticksUntilNextSpawn = ticksBetweenSpawns
|
||||||
|
for (spawnAction in spawnActions) {
|
||||||
|
spawnAction.complete()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun <R> afterSpawn(action: SpawnAction<R>, result: R) {
|
||||||
|
super.afterSpawn(action, result)
|
||||||
|
if (result is EntitySpawnResult) {
|
||||||
|
spawnedEntities.addAll(result.entities)
|
||||||
|
}
|
||||||
|
lastSpawnTime = System.currentTimeMillis()
|
||||||
|
}
|
||||||
|
|
||||||
|
open fun getCauseEntity(): Entity? = null
|
||||||
|
|
||||||
|
fun getAllInfluences() = this.influences + manager.influences
|
||||||
|
|
||||||
|
override fun copyInfluences() = this.getAllInfluences().toMutableList()
|
||||||
|
}
|
||||||
+52
@@ -0,0 +1,52 @@
|
|||||||
|
/*
|
||||||
|
* 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.api.spawning.spawner
|
||||||
|
|
||||||
|
import com.cobblemon.mod.common.api.spawning.SpawnCause
|
||||||
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
|
||||||
|
import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
|
||||||
|
import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
|
||||||
|
import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
|
||||||
|
import com.cobblemon.mod.common.api.spawning.selection.FlatSpawnablePositionWeightedSelector
|
||||||
|
import com.cobblemon.mod.common.api.spawning.selection.SpawningSelector
|
||||||
|
import net.minecraft.core.BlockPos
|
||||||
|
import net.minecraft.server.level.ServerLevel
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A type of spawner that occurs at a single point and provides its own means of generating a
|
||||||
|
* spawnable position from a particular cause and position. The trigger spawner must be directly called to
|
||||||
|
* spawn things (almost as if it was being triggered!!!) as opposed to being scheduled on a ticker.
|
||||||
|
*
|
||||||
|
* @author Hiroku
|
||||||
|
* @since February 3rd, 2024
|
||||||
|
*/
|
||||||
|
abstract class TriggerSpawner<T : SpawnCause>(override val name: String, var spawns: SpawnPool) : Spawner {
|
||||||
|
private var selector: SpawningSelector<*> = FlatSpawnablePositionWeightedSelector()
|
||||||
|
override val influences = mutableListOf<SpawningInfluence>()
|
||||||
|
|
||||||
|
open fun getSpawnAction(
|
||||||
|
cause: T,
|
||||||
|
world: ServerLevel,
|
||||||
|
pos: BlockPos,
|
||||||
|
influences: List<SpawningInfluence> = emptyList()
|
||||||
|
): SpawnAction<*>? {
|
||||||
|
val spawnablePosition = parseSpawnablePosition(cause, world, pos) ?: return null
|
||||||
|
spawnablePosition.influences.addAll(influences)
|
||||||
|
val bucket = chooseBucket(cause, spawnablePosition.influences)
|
||||||
|
return selector.select(this, bucket, listOf(spawnablePosition), max = 1).firstOrNull()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Parses a spawnable position, if possible, from the given cause and position. */
|
||||||
|
abstract fun parseSpawnablePosition(cause: T, world: ServerLevel, pos: BlockPos): SpawnablePosition?
|
||||||
|
|
||||||
|
override fun getSpawningSelector() = selector
|
||||||
|
override fun setSpawningSelector(selector: SpawningSelector<*>) { this.selector = selector }
|
||||||
|
override fun getSpawnPool() = spawns
|
||||||
|
override fun setSpawnPool(spawnPool: SpawnPool) { spawns = spawnPool }
|
||||||
|
}
|
||||||
@@ -137,9 +137,6 @@ object CobblemonItemTags {
|
|||||||
@JvmField val WEARABLE_HAT_ITEMS = create("held/visibility/hat")
|
@JvmField val WEARABLE_HAT_ITEMS = create("held/visibility/hat")
|
||||||
@JvmField val HIDDEN_ITEMS = create("held/visibility/hidden")
|
@JvmField val HIDDEN_ITEMS = create("held/visibility/hidden")
|
||||||
|
|
||||||
//Empty Tag
|
|
||||||
@JvmField val EMPTY = create("empty")
|
|
||||||
|
|
||||||
|
|
||||||
private fun create(path: String) = TagKey.create(Registries.ITEM, cobblemonResource(path))
|
private fun create(path: String) = TagKey.create(Registries.ITEM, cobblemonResource(path))
|
||||||
|
|
||||||
|
|||||||
+1
-6
@@ -20,8 +20,6 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions
|
|||||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
|
import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
|
||||||
import com.cobblemon.mod.common.api.moves.Moves
|
import com.cobblemon.mod.common.api.moves.Moves
|
||||||
import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
|
import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
|
||||||
import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
|
|
||||||
import com.cobblemon.mod.common.api.moves.animations.ActionEffects
|
|
||||||
import com.cobblemon.mod.common.api.moves.animations.TargetsProvider
|
import com.cobblemon.mod.common.api.moves.animations.TargetsProvider
|
||||||
import com.cobblemon.mod.common.api.moves.animations.UsersProvider
|
import com.cobblemon.mod.common.api.moves.animations.UsersProvider
|
||||||
import com.cobblemon.mod.common.battles.ShowdownInterpreter
|
import com.cobblemon.mod.common.battles.ShowdownInterpreter
|
||||||
@@ -33,7 +31,6 @@ import com.cobblemon.mod.common.battles.dispatch.UntilDispatch
|
|||||||
import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
|
import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
|
||||||
import com.cobblemon.mod.common.pokemon.evolution.progress.UseMoveEvolutionProgress
|
import com.cobblemon.mod.common.pokemon.evolution.progress.UseMoveEvolutionProgress
|
||||||
import com.cobblemon.mod.common.util.asArrayValue
|
import com.cobblemon.mod.common.util.asArrayValue
|
||||||
import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
|
|
||||||
import com.cobblemon.mod.common.util.battleLang
|
import com.cobblemon.mod.common.util.battleLang
|
||||||
import com.cobblemon.mod.common.util.cobblemonResource
|
import com.cobblemon.mod.common.util.cobblemonResource
|
||||||
import java.util.concurrent.CompletableFuture
|
import java.util.concurrent.CompletableFuture
|
||||||
@@ -52,7 +49,7 @@ class MoveInstruction(
|
|||||||
) : InterpreterInstruction, CauserInstruction {
|
) : InterpreterInstruction, CauserInstruction {
|
||||||
val effect = message.effectAt(1) ?: Effect.pure("", "")
|
val effect = message.effectAt(1) ?: Effect.pure("", "")
|
||||||
val move = Moves.getByNameOrDummy(effect.id)
|
val move = Moves.getByNameOrDummy(effect.id)
|
||||||
val actionEffect: ActionEffectTimeline? by lazy { ActionEffects.getEffectWithBattleContext(cobblemonResource(move.name), userPokemon) }
|
val actionEffect = move.actionEffect
|
||||||
val spreadTargets = message.optionalArgument("spread")?.split(",") ?: emptyList()
|
val spreadTargets = message.optionalArgument("spread")?.split(",") ?: emptyList()
|
||||||
|
|
||||||
var future = CompletableFuture.completedFuture(Unit)
|
var future = CompletableFuture.completedFuture(Unit)
|
||||||
@@ -64,8 +61,6 @@ class MoveInstruction(
|
|||||||
override fun invoke(battle: PokemonBattle) {
|
override fun invoke(battle: PokemonBattle) {
|
||||||
userPokemon = message.battlePokemon(0, battle)!!
|
userPokemon = message.battlePokemon(0, battle)!!
|
||||||
targetPokemon = message.battlePokemon(2, battle)
|
targetPokemon = message.battlePokemon(2, battle)
|
||||||
|
|
||||||
val actionEffect = actionEffect ?: ActionEffects.actionEffects["generic_move".asIdentifierDefaultingNamespace()]
|
|
||||||
val targetPokemon = targetPokemon // So smart non-null casts can happen
|
val targetPokemon = targetPokemon // So smart non-null casts can happen
|
||||||
|
|
||||||
val optionalEffect = message.effect()
|
val optionalEffect = message.effect()
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ import net.minecraft.core.BlockPos
|
|||||||
import net.minecraft.core.particles.BlockParticleOption
|
import net.minecraft.core.particles.BlockParticleOption
|
||||||
import net.minecraft.core.particles.ColorParticleOption
|
import net.minecraft.core.particles.ColorParticleOption
|
||||||
import net.minecraft.core.particles.ParticleTypes
|
import net.minecraft.core.particles.ParticleTypes
|
||||||
import net.minecraft.server.level.ServerLevel
|
|
||||||
import net.minecraft.sounds.SoundEvents
|
import net.minecraft.sounds.SoundEvents
|
||||||
import net.minecraft.sounds.SoundSource
|
import net.minecraft.sounds.SoundSource
|
||||||
import net.minecraft.stats.Stats
|
import net.minecraft.stats.Stats
|
||||||
@@ -52,13 +51,12 @@ import net.minecraft.world.phys.Vec3
|
|||||||
import net.minecraft.world.phys.shapes.CollisionContext
|
import net.minecraft.world.phys.shapes.CollisionContext
|
||||||
import net.minecraft.world.phys.shapes.Shapes
|
import net.minecraft.world.phys.shapes.Shapes
|
||||||
import net.minecraft.world.phys.shapes.VoxelShape
|
import net.minecraft.world.phys.shapes.VoxelShape
|
||||||
import kotlin.math.floor
|
|
||||||
import kotlin.random.Random
|
import kotlin.random.Random
|
||||||
|
|
||||||
class PokeSnackBlock(settings: Properties, val isLure: Boolean): BaseEntityBlock(settings) {
|
class PokeSnackBlock(settings: Properties, val isLure: Boolean): BaseEntityBlock(settings) {
|
||||||
companion object {
|
companion object {
|
||||||
const val MAX_BITES = 8
|
val MAX_BITES = 8
|
||||||
const val CAKE_HEIGHT = 0.4375
|
val CAKE_HEIGHT = 0.4375
|
||||||
|
|
||||||
val CANDLE_PARTICLE_POSITION = Vec3(0.5, CAKE_HEIGHT + 0.5, 0.5)
|
val CANDLE_PARTICLE_POSITION = Vec3(0.5, CAKE_HEIGHT + 0.5, 0.5)
|
||||||
|
|
||||||
@@ -137,18 +135,16 @@ class PokeSnackBlock(settings: Properties, val isLure: Boolean): BaseEntityBlock
|
|||||||
if (hasCandle(state)) {
|
if (hasCandle(state)) {
|
||||||
return Shapes.or(SHAPES[state.getValue(BITES)], CANDLE_SHAPE)
|
return Shapes.or(SHAPES[state.getValue(BITES)], CANDLE_SHAPE)
|
||||||
}
|
}
|
||||||
|
|
||||||
return SHAPES[state.getValue(BITES)]
|
return SHAPES[state.getValue(BITES)]
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getRenderShape(blockState: BlockState) = RenderShape.MODEL
|
override fun getRenderShape(blockState: BlockState?) = RenderShape.MODEL
|
||||||
|
|
||||||
override fun setPlacedBy(level: Level, pos: BlockPos, state: BlockState, placer: LivingEntity?, stack: ItemStack) {
|
override fun setPlacedBy(level: Level, pos: BlockPos, state: BlockState, placer: LivingEntity?, stack: ItemStack) {
|
||||||
super.setPlacedBy(level, pos, state, placer, stack)
|
super.setPlacedBy(level, pos, state, placer, stack)
|
||||||
|
|
||||||
val blockEntity = level.getBlockEntity(pos) as? PokeSnackBlockEntity ?: return
|
val blockEntity = level.getBlockEntity(pos) as? PokeSnackBlockEntity
|
||||||
blockEntity.initializeFromItemStack(stack)
|
blockEntity?.initializeFromItemStack(stack)
|
||||||
blockEntity.placedBy = placer?.uuid
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getCloneItemStack(level: LevelReader, pos: BlockPos, state: BlockState): ItemStack {
|
override fun getCloneItemStack(level: LevelReader, pos: BlockPos, state: BlockState): ItemStack {
|
||||||
@@ -298,28 +294,15 @@ class PokeSnackBlock(settings: Properties, val isLure: Boolean): BaseEntityBlock
|
|||||||
|
|
||||||
fun eat(level: Level, pos: BlockPos, state: BlockState, player: Player?) {
|
fun eat(level: Level, pos: BlockPos, state: BlockState, player: Player?) {
|
||||||
val bites = state.getValue(BITES) as Int
|
val bites = state.getValue(BITES) as Int
|
||||||
val newBites =
|
if (bites < MAX_BITES) {
|
||||||
if (isLure) {
|
level.setBlock(pos, state.setValue(BITES, bites + 1) as BlockState, UPDATE_ALL)
|
||||||
val pokeSnackBlockEntity = level.getBlockEntity(pos) as PokeSnackBlockEntity? ?: return
|
} else {
|
||||||
pokeSnackBlockEntity.amountSpawned += 1
|
|
||||||
|
|
||||||
floor(pokeSnackBlockEntity.amountSpawned / PokeSnackBlockEntity.SPAWNS_PER_BITE.toDouble()).toInt()
|
|
||||||
} else {
|
|
||||||
bites + 1
|
|
||||||
}
|
|
||||||
|
|
||||||
if (newBites > MAX_BITES) {
|
|
||||||
dropCandle(level, pos, state, player)
|
dropCandle(level, pos, state, player)
|
||||||
|
|
||||||
level.removeBlock(pos, false)
|
level.removeBlock(pos, false)
|
||||||
level.removeBlockEntity(pos)
|
level.removeBlockEntity(pos)
|
||||||
} else {
|
|
||||||
level.setBlock(pos, state.setValue(BITES, newBites) as BlockState, UPDATE_ALL)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
level.playSound(null, player?.blockPosition() ?: pos, SoundEvents.GENERIC_EAT, if (player != null) SoundSource.PLAYERS else SoundSource.NEUTRAL)
|
level.playSound(null, player?.blockPosition() ?: pos, SoundEvents.GENERIC_EAT, if (player != null) SoundSource.PLAYERS else SoundSource.NEUTRAL)
|
||||||
spawnEatParticles(level, pos)
|
spawnEatParticles(level, pos)
|
||||||
|
|
||||||
player?.let {
|
player?.let {
|
||||||
level.gameEvent(it, GameEvent.BLOCK_DESTROY, pos)
|
level.gameEvent(it, GameEvent.BLOCK_DESTROY, pos)
|
||||||
}
|
}
|
||||||
@@ -369,19 +352,8 @@ class PokeSnackBlock(settings: Properties, val isLure: Boolean): BaseEntityBlock
|
|||||||
0.0,
|
0.0,
|
||||||
0.0,
|
0.0,
|
||||||
0.0
|
0.0
|
||||||
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun isRandomlyTicking(state: BlockState) = isLure
|
|
||||||
|
|
||||||
override fun randomTick(
|
|
||||||
state: BlockState,
|
|
||||||
level: ServerLevel,
|
|
||||||
pos: BlockPos,
|
|
||||||
random: RandomSource
|
|
||||||
) {
|
|
||||||
if (level.isClientSide) return
|
|
||||||
(level.getBlockEntity(pos) as? PokeSnackBlockEntity)?.randomTick()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -8,8 +8,6 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.block
|
package com.cobblemon.mod.common.block
|
||||||
|
|
||||||
import com.bedrockk.molang.runtime.value.DoubleValue
|
|
||||||
import com.cobblemon.mod.common.entity.MoLangScriptingEntity
|
|
||||||
import net.minecraft.core.BlockPos
|
import net.minecraft.core.BlockPos
|
||||||
import net.minecraft.core.Direction
|
import net.minecraft.core.Direction
|
||||||
import net.minecraft.core.dispenser.DispenseItemBehavior
|
import net.minecraft.core.dispenser.DispenseItemBehavior
|
||||||
@@ -27,7 +25,6 @@ import net.minecraft.world.entity.player.Player
|
|||||||
import net.minecraft.world.item.Item
|
import net.minecraft.world.item.Item
|
||||||
import net.minecraft.world.item.ItemStack
|
import net.minecraft.world.item.ItemStack
|
||||||
import net.minecraft.world.item.Items
|
import net.minecraft.world.item.Items
|
||||||
import net.minecraft.world.level.BlockGetter
|
|
||||||
import net.minecraft.world.level.Level
|
import net.minecraft.world.level.Level
|
||||||
import net.minecraft.world.level.LevelAccessor
|
import net.minecraft.world.level.LevelAccessor
|
||||||
import net.minecraft.world.level.block.Block
|
import net.minecraft.world.level.block.Block
|
||||||
@@ -43,9 +40,6 @@ import net.minecraft.world.level.material.FluidState
|
|||||||
import net.minecraft.world.level.material.Fluids
|
import net.minecraft.world.level.material.Fluids
|
||||||
import net.minecraft.world.level.pathfinder.PathComputationType
|
import net.minecraft.world.level.pathfinder.PathComputationType
|
||||||
import net.minecraft.world.phys.BlockHitResult
|
import net.minecraft.world.phys.BlockHitResult
|
||||||
import net.minecraft.world.phys.shapes.CollisionContext
|
|
||||||
import net.minecraft.world.phys.shapes.EntityCollisionContext
|
|
||||||
import net.minecraft.world.phys.shapes.Shapes
|
|
||||||
import net.minecraft.world.phys.shapes.VoxelShape
|
import net.minecraft.world.phys.shapes.VoxelShape
|
||||||
|
|
||||||
class SaccharineLeafBlock(settings: Properties) : LeavesBlock(settings) {
|
class SaccharineLeafBlock(settings: Properties) : LeavesBlock(settings) {
|
||||||
@@ -96,13 +90,7 @@ class SaccharineLeafBlock(settings: Properties) : LeavesBlock(settings) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!added) Containers.dropItemStack(
|
if (!added) Containers.dropItemStack(level, source.pos.x.toDouble(), source.pos.y.toDouble(), source.pos.z.toDouble(), outputStack)
|
||||||
level,
|
|
||||||
source.pos.x.toDouble(),
|
|
||||||
source.pos.y.toDouble(),
|
|
||||||
source.pos.z.toDouble(),
|
|
||||||
outputStack
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stack
|
stack
|
||||||
@@ -120,27 +108,7 @@ class SaccharineLeafBlock(settings: Properties) : LeavesBlock(settings) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getCollisionShape(
|
override fun isRandomlyTicking(state: BlockState): Boolean = !state.getValue(PERSISTENT) && state.getValue(DISTANCE) > 6
|
||||||
state: BlockState,
|
|
||||||
level: BlockGetter,
|
|
||||||
pos: BlockPos,
|
|
||||||
context: CollisionContext
|
|
||||||
): VoxelShape? {
|
|
||||||
|
|
||||||
if (context is EntityCollisionContext) {
|
|
||||||
val entity = context.entity
|
|
||||||
if (entity != null
|
|
||||||
&& entity is MoLangScriptingEntity
|
|
||||||
&& entity.config.map.getOrDefault("can_path_through_sacc_leaves", DoubleValue.ZERO).asDouble() == 1.0
|
|
||||||
) {
|
|
||||||
return Shapes.empty()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return super.getCollisionShape(state, level, pos, context)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun isRandomlyTicking(state: BlockState): Boolean =
|
|
||||||
true //!state.getValue(PERSISTENT) && state.getValue(DISTANCE) > 6
|
|
||||||
|
|
||||||
override fun randomTick(state: BlockState, world: ServerLevel, pos: BlockPos, random: RandomSource) {
|
override fun randomTick(state: BlockState, world: ServerLevel, pos: BlockPos, random: RandomSource) {
|
||||||
val currentAge = state.getValue(AGE)
|
val currentAge = state.getValue(AGE)
|
||||||
@@ -155,8 +123,8 @@ class SaccharineLeafBlock(settings: Properties) : LeavesBlock(settings) {
|
|||||||
} else if (belowState.block is SaccharineLeafBlock) {
|
} else if (belowState.block is SaccharineLeafBlock) {
|
||||||
val belowAge = belowState.getValue(AGE)
|
val belowAge = belowState.getValue(AGE)
|
||||||
if (belowAge < MAX_AGE) {
|
if (belowAge < MAX_AGE) {
|
||||||
world.setBlock(pos, changeAge(state, -1), UPDATE_CLIENTS)
|
changeAge(state, -1)
|
||||||
world.setBlock(belowPos, changeAge(belowState, 1), UPDATE_CLIENTS)
|
changeAge(belowState, 1)
|
||||||
}
|
}
|
||||||
break
|
break
|
||||||
} else {
|
} else {
|
||||||
@@ -249,15 +217,7 @@ class SaccharineLeafBlock(settings: Properties) : LeavesBlock(settings) {
|
|||||||
|
|
||||||
override fun isPathfindable(state: BlockState, type: PathComputationType): Boolean = false
|
override fun isPathfindable(state: BlockState, type: PathComputationType): Boolean = false
|
||||||
|
|
||||||
override fun useItemOn(
|
override fun useItemOn(stack: ItemStack, state: BlockState, level: Level, pos: BlockPos, player: Player, hand: InteractionHand, hit: BlockHitResult): ItemInteractionResult {
|
||||||
stack: ItemStack,
|
|
||||||
state: BlockState,
|
|
||||||
level: Level,
|
|
||||||
pos: BlockPos,
|
|
||||||
player: Player,
|
|
||||||
hand: InteractionHand,
|
|
||||||
hit: BlockHitResult
|
|
||||||
): ItemInteractionResult {
|
|
||||||
if (!state.getValue(WATERLOGGED)) {
|
if (!state.getValue(WATERLOGGED)) {
|
||||||
val itemStack = player.getItemInHand(hand)
|
val itemStack = player.getItemInHand(hand)
|
||||||
val isGlassBottle = itemStack.`is`(Items.GLASS_BOTTLE)
|
val isGlassBottle = itemStack.`is`(Items.GLASS_BOTTLE)
|
||||||
|
|||||||
+25
-27
@@ -52,8 +52,8 @@ class CookingPotMenu : RecipeBookMenu<CraftingInput, CookingPotRecipeBase>, Cont
|
|||||||
constructor(containerId: Int, playerInventory: Inventory) : super(CobblemonMenuType.COOKING_POT, containerId) {
|
constructor(containerId: Int, playerInventory: Inventory) : super(CobblemonMenuType.COOKING_POT, containerId) {
|
||||||
this.playerInventory = playerInventory
|
this.playerInventory = playerInventory
|
||||||
this.container = CookingPotContainer(this,
|
this.container = CookingPotContainer(this,
|
||||||
CampfireBlockEntity.CRAFTING_GRID_WIDTH,
|
CampfireBlockEntity.Companion.CRAFTING_GRID_WIDTH,
|
||||||
CampfireBlockEntity.CRAFTING_GRID_WIDTH
|
CampfireBlockEntity.Companion.CRAFTING_GRID_WIDTH
|
||||||
)
|
)
|
||||||
this.resultContainer = ResultContainer()
|
this.resultContainer = ResultContainer()
|
||||||
this.containerData = SimpleContainerData(4)
|
this.containerData = SimpleContainerData(4)
|
||||||
@@ -82,25 +82,25 @@ class CookingPotMenu : RecipeBookMenu<CraftingInput, CookingPotRecipeBase>, Cont
|
|||||||
val resultSlotX = 128
|
val resultSlotX = 128
|
||||||
val resultSlotY = 55
|
val resultSlotY = 55
|
||||||
|
|
||||||
addSlot(CookingPotResultSlot(this.container, CampfireBlockEntity.RESULT_SLOT, resultSlotX, resultSlotY))
|
addSlot(CookingPotResultSlot(this.container, CampfireBlockEntity.Companion.RESULT_SLOT, resultSlotX, resultSlotY))
|
||||||
|
|
||||||
for ((index, slotIndex) in CampfireBlockEntity.CRAFTING_GRID_SLOTS.withIndex()) {
|
for ((index, slotIndex) in CampfireBlockEntity.Companion.CRAFTING_GRID_SLOTS.withIndex()) {
|
||||||
val i = index / CampfireBlockEntity.CRAFTING_GRID_WIDTH
|
val i = index / CampfireBlockEntity.Companion.CRAFTING_GRID_WIDTH
|
||||||
val j = index % CampfireBlockEntity.CRAFTING_GRID_WIDTH
|
val j = index % CampfireBlockEntity.Companion.CRAFTING_GRID_WIDTH
|
||||||
addSlot(Slot(this.container, slotIndex, 33 + j * 18, 18 + i * 18))
|
addSlot(Slot(this.container, slotIndex, 33 + j * 18, 18 + i * 18))
|
||||||
}
|
}
|
||||||
|
|
||||||
for ((index, slotIndex) in CampfireBlockEntity.SEASONING_SLOTS.withIndex()) {
|
for ((index, slotIndex) in CampfireBlockEntity.Companion.SEASONING_SLOTS.withIndex()) {
|
||||||
addSlot(SeasoningSlot(this, this.container, slotIndex, 110 + index * 18, 18))
|
addSlot(SeasoningSlot(this.container, slotIndex, 110 + index * 18, 18))
|
||||||
}
|
}
|
||||||
|
|
||||||
for ((index, _) in CampfireBlockEntity.PLAYER_INVENTORY_SLOTS.withIndex()) {
|
for ((index, _) in CampfireBlockEntity.Companion.PLAYER_INVENTORY_SLOTS.withIndex()) {
|
||||||
val i = index / CampfireBlockEntity.PLAYER_INVENTORY_WIDTH
|
val i = index / CampfireBlockEntity.Companion.PLAYER_INVENTORY_WIDTH
|
||||||
val j = index % CampfireBlockEntity.PLAYER_INVENTORY_WIDTH
|
val j = index % CampfireBlockEntity.Companion.PLAYER_INVENTORY_WIDTH
|
||||||
addSlot(Slot(playerInventory, index + 9, 8 + j * 18, 84 + i * 18))
|
addSlot(Slot(playerInventory, index + 9, 8 + j * 18, 84 + i * 18))
|
||||||
}
|
}
|
||||||
|
|
||||||
for ((index, _) in CampfireBlockEntity.PLAYER_HOTBAR_SLOTS.withIndex()) {
|
for ((index, _) in CampfireBlockEntity.Companion.PLAYER_HOTBAR_SLOTS.withIndex()) {
|
||||||
addSlot(Slot(playerInventory, index, 8 + index * 18, 142))
|
addSlot(Slot(playerInventory, index, 8 + index * 18, 142))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -173,31 +173,29 @@ class CookingPotMenu : RecipeBookMenu<CraftingInput, CookingPotRecipeBase>, Cont
|
|||||||
currentActiveRecipe = recipe
|
currentActiveRecipe = recipe
|
||||||
if (recipe != null) {
|
if (recipe != null) {
|
||||||
previewItem = recipe.value.assemble(craftInput, level.registryAccess())
|
previewItem = recipe.value.assemble(craftInput, level.registryAccess())
|
||||||
// Apply seasoning to the preview item
|
|
||||||
recipe.value.applySeasoning(
|
recipe.value.applySeasoning(
|
||||||
previewItem,
|
previewItem,
|
||||||
container.items.subList(CampfireBlockEntity.SEASONING_SLOTS.first,
|
container.items.subList(CampfireBlockEntity.SEASONING_SLOTS.first,
|
||||||
CampfireBlockEntity.SEASONING_SLOTS.last + 1)
|
CampfireBlockEntity.SEASONING_SLOTS.last + 1)
|
||||||
.filterNotNull()
|
.filterNotNull()
|
||||||
.filter { !it.isEmpty && it.`is`(recipe.value.seasoningTag) })
|
.filter { !it.isEmpty })
|
||||||
|
|
||||||
} else previewItem = ItemStack.EMPTY
|
} else previewItem = ItemStack.EMPTY
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getResultSlotIndex(): Int {
|
override fun getResultSlotIndex(): Int {
|
||||||
return CampfireBlockEntity.RESULT_SLOT
|
return CampfireBlockEntity.Companion.RESULT_SLOT
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getGridWidth(): Int {
|
override fun getGridWidth(): Int {
|
||||||
return CampfireBlockEntity.CRAFTING_GRID_WIDTH
|
return CampfireBlockEntity.Companion.CRAFTING_GRID_WIDTH
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getGridHeight(): Int {
|
override fun getGridHeight(): Int {
|
||||||
return CampfireBlockEntity.CRAFTING_GRID_WIDTH
|
return CampfireBlockEntity.Companion.CRAFTING_GRID_WIDTH
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getSize(): Int {
|
override fun getSize(): Int {
|
||||||
return CampfireBlockEntity.ITEMS_SIZE
|
return CampfireBlockEntity.Companion.ITEMS_SIZE
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getBurnProgress(): Float {
|
fun getBurnProgress(): Float {
|
||||||
@@ -229,24 +227,24 @@ class CookingPotMenu : RecipeBookMenu<CraftingInput, CookingPotRecipeBase>, Cont
|
|||||||
val slotItemStack = slot.item
|
val slotItemStack = slot.item
|
||||||
itemStack = slotItemStack.copy()
|
itemStack = slotItemStack.copy()
|
||||||
|
|
||||||
if (index == CampfireBlockEntity.RESULT_SLOT) {
|
if (index == CampfireBlockEntity.Companion.RESULT_SLOT) {
|
||||||
if (!this.moveItemStackTo(slotItemStack, CampfireBlockEntity.PLAYER_INVENTORY_SLOTS.first, CampfireBlockEntity.PLAYER_HOTBAR_SLOTS.last + 1, false)) {
|
if (!this.moveItemStackTo(slotItemStack, CampfireBlockEntity.Companion.PLAYER_INVENTORY_SLOTS.first, CampfireBlockEntity.Companion.PLAYER_HOTBAR_SLOTS.last + 1, false)) {
|
||||||
return ItemStack.EMPTY
|
return ItemStack.EMPTY
|
||||||
}
|
}
|
||||||
|
|
||||||
slot.onQuickCraft(slotItemStack, itemStack);
|
slot.onQuickCraft(slotItemStack, itemStack);
|
||||||
} else if (index in CampfireBlockEntity.PLAYER_INVENTORY_SLOTS || index in CampfireBlockEntity.PLAYER_HOTBAR_SLOTS) {
|
} else if (index in CampfireBlockEntity.Companion.PLAYER_INVENTORY_SLOTS || index in CampfireBlockEntity.Companion.PLAYER_HOTBAR_SLOTS) {
|
||||||
if (Seasonings.isSeasoning(slotItemStack)) {
|
if (Seasonings.isSeasoning(slotItemStack)) {
|
||||||
if (!this.moveItemStackTo(slotItemStack, CampfireBlockEntity.CRAFTING_GRID_SLOTS.first, CampfireBlockEntity.CRAFTING_GRID_SLOTS.last + 1, false) &&
|
if (!this.moveItemStackTo(slotItemStack, CampfireBlockEntity.Companion.CRAFTING_GRID_SLOTS.first, CampfireBlockEntity.Companion.CRAFTING_GRID_SLOTS.last + 1, false) &&
|
||||||
!this.moveItemStackTo(slotItemStack, CampfireBlockEntity.SEASONING_SLOTS.first, CampfireBlockEntity.SEASONING_SLOTS.last + 1, false)
|
!this.moveItemStackTo(slotItemStack, CampfireBlockEntity.Companion.SEASONING_SLOTS.first, CampfireBlockEntity.Companion.SEASONING_SLOTS.last + 1, false)
|
||||||
) {
|
) {
|
||||||
return ItemStack.EMPTY
|
return ItemStack.EMPTY
|
||||||
}
|
}
|
||||||
} else if (!this.moveItemStackTo(slotItemStack, CampfireBlockEntity.CRAFTING_GRID_SLOTS.first, CampfireBlockEntity.CRAFTING_GRID_SLOTS.last + 1, false)) {
|
} else if (!this.moveItemStackTo(slotItemStack, CampfireBlockEntity.Companion.CRAFTING_GRID_SLOTS.first, CampfireBlockEntity.Companion.CRAFTING_GRID_SLOTS.last + 1, false)) {
|
||||||
return ItemStack.EMPTY
|
return ItemStack.EMPTY
|
||||||
}
|
}
|
||||||
} else if (index in CampfireBlockEntity.CRAFTING_GRID_SLOTS || index in CampfireBlockEntity.SEASONING_SLOTS) {
|
} else if (index in CampfireBlockEntity.Companion.CRAFTING_GRID_SLOTS || index in CampfireBlockEntity.Companion.SEASONING_SLOTS) {
|
||||||
if (!this.moveItemStackTo(slotItemStack, CampfireBlockEntity.PLAYER_INVENTORY_SLOTS.first, CampfireBlockEntity.PLAYER_HOTBAR_SLOTS.last + 1, false)) {
|
if (!this.moveItemStackTo(slotItemStack, CampfireBlockEntity.Companion.PLAYER_INVENTORY_SLOTS.first, CampfireBlockEntity.Companion.PLAYER_HOTBAR_SLOTS.last + 1, false)) {
|
||||||
return ItemStack.EMPTY
|
return ItemStack.EMPTY
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,13 +8,13 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.block.campfirepot
|
package com.cobblemon.mod.common.block.campfirepot
|
||||||
|
|
||||||
|
import com.cobblemon.mod.common.api.cooking.Seasonings
|
||||||
import net.minecraft.world.Container
|
import net.minecraft.world.Container
|
||||||
import net.minecraft.world.inventory.Slot
|
import net.minecraft.world.inventory.Slot
|
||||||
import net.minecraft.world.item.ItemStack
|
import net.minecraft.world.item.ItemStack
|
||||||
|
|
||||||
class SeasoningSlot(val menu: CookingPotMenu, container: Container, slot: Int, x: Int, y: Int) : Slot(container, slot, x, y) {
|
class SeasoningSlot(container: Container, slot: Int, x: Int, y: Int) : Slot(container, slot, x, y) {
|
||||||
override fun mayPlace(stack: ItemStack): Boolean {
|
override fun mayPlace(stack: ItemStack): Boolean {
|
||||||
val recipe = menu.currentActiveRecipe?.value() ?: return false
|
return Seasonings.isSeasoning(stack) && super.mayPlace(stack)
|
||||||
return stack.`is`(recipe.seasoningTag) && super.mayPlace(stack)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -134,8 +134,6 @@ class CampfireBlockEntity(pos: BlockPos, state: BlockState) : BaseContainerBlock
|
|||||||
|
|
||||||
campfireBlockEntity.particleCooldown = 20
|
campfireBlockEntity.particleCooldown = 20
|
||||||
}
|
}
|
||||||
|
|
||||||
campfireBlockEntity.time++
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun serverTick(level: Level, pos: BlockPos, state: BlockState, campfireBlockEntity: CampfireBlockEntity) {
|
fun serverTick(level: Level, pos: BlockPos, state: BlockState, campfireBlockEntity: CampfireBlockEntity) {
|
||||||
@@ -168,7 +166,7 @@ class CampfireBlockEntity(pos: BlockPos, state: BlockState) : BaseContainerBlock
|
|||||||
val cookedItem = recipe.assemble(craftingInput, level.registryAccess())
|
val cookedItem = recipe.assemble(craftingInput, level.registryAccess())
|
||||||
val resultSlotItem = campfireBlockEntity.getItem(0)
|
val resultSlotItem = campfireBlockEntity.getItem(0)
|
||||||
|
|
||||||
recipe.applySeasoning(cookedItem, campfireBlockEntity.getSeasonings().filter { it.`is`(recipe.seasoningTag) })
|
recipe.applySeasoning(cookedItem, campfireBlockEntity.getSeasonings())
|
||||||
|
|
||||||
if (!campfireBlockEntity.blockState.getValue(CampfireBlock.LID)) {
|
if (!campfireBlockEntity.blockState.getValue(CampfireBlock.LID)) {
|
||||||
campfireBlockEntity.cookingProgress = 0
|
campfireBlockEntity.cookingProgress = 0
|
||||||
@@ -239,7 +237,6 @@ class CampfireBlockEntity(pos: BlockPos, state: BlockState) : BaseContainerBlock
|
|||||||
private var particleCooldown: Int = 0
|
private var particleCooldown: Int = 0
|
||||||
var brothColor: Int = BASE_BROTH_COLOR
|
var brothColor: Int = BASE_BROTH_COLOR
|
||||||
var bubbleColor: Int = BASE_BROTH_BUBBLE_COLOR
|
var bubbleColor: Int = BASE_BROTH_BUBBLE_COLOR
|
||||||
var time: Int = 0
|
|
||||||
|
|
||||||
var dataAccess: ContainerData = object : ContainerData {
|
var dataAccess: ContainerData = object : ContainerData {
|
||||||
override fun get(index: Int): Int {
|
override fun get(index: Int): Int {
|
||||||
@@ -314,7 +311,7 @@ class CampfireBlockEntity(pos: BlockPos, state: BlockState) : BaseContainerBlock
|
|||||||
consumeItem(i)
|
consumeItem(i)
|
||||||
}
|
}
|
||||||
for (i in SEASONING_SLOTS.first..SEASONING_SLOTS.last) {
|
for (i in SEASONING_SLOTS.first..SEASONING_SLOTS.last) {
|
||||||
if (getItem(i).`is`(recipe.seasoningTag) && recipe.seasoningProcessors.any { it.consumesItem(getItem(i)) }) consumeItem(i)
|
if (recipe.seasoningProcessors.any { it.consumesItem(getItem(i)) }) consumeItem(i)
|
||||||
}
|
}
|
||||||
|
|
||||||
val direction = state.getValue(CampfireBlock.ITEM_DIRECTION)
|
val direction = state.getValue(CampfireBlock.ITEM_DIRECTION)
|
||||||
|
|||||||
+7
-165
@@ -8,121 +8,29 @@
|
|||||||
|
|
||||||
package com.cobblemon.mod.common.block.entity
|
package com.cobblemon.mod.common.block.entity
|
||||||
|
|
||||||
import com.cobblemon.mod.common.Cobblemon
|
|
||||||
import com.cobblemon.mod.common.CobblemonBlockEntities
|
import com.cobblemon.mod.common.CobblemonBlockEntities
|
||||||
import com.cobblemon.mod.common.CobblemonItemComponents
|
import com.cobblemon.mod.common.CobblemonItemComponents
|
||||||
import com.cobblemon.mod.common.api.cooking.getColourMixFromFlavours
|
import com.cobblemon.mod.common.api.cooking.getColourMixFromFlavours
|
||||||
import com.cobblemon.mod.common.api.fishing.SpawnBait
|
import com.cobblemon.mod.common.api.fishing.SpawnBait
|
||||||
import com.cobblemon.mod.common.api.fishing.SpawnBait.Effect
|
import com.cobblemon.mod.common.api.fishing.SpawnBait.Effect
|
||||||
import com.cobblemon.mod.common.api.fishing.SpawnBaitEffects
|
import com.cobblemon.mod.common.api.fishing.SpawnBaitEffects
|
||||||
import com.cobblemon.mod.common.api.spawning.CobblemonSpawnPools
|
|
||||||
import com.cobblemon.mod.common.api.spawning.SpawnCause
|
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.PokemonHerdSpawnDetail
|
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
|
|
||||||
import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
|
|
||||||
import com.cobblemon.mod.common.api.spawning.influence.BucketMultiplyingInfluence
|
|
||||||
import com.cobblemon.mod.common.api.spawning.influence.BucketNormalizingInfluence
|
|
||||||
import com.cobblemon.mod.common.api.spawning.influence.SpawnBaitInfluence
|
|
||||||
import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
|
|
||||||
import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
|
|
||||||
import com.cobblemon.mod.common.api.spawning.spawner.FixedAreaSpawner
|
|
||||||
import com.cobblemon.mod.common.block.PokeSnackBlock
|
import com.cobblemon.mod.common.block.PokeSnackBlock
|
||||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
|
||||||
import com.cobblemon.mod.common.item.components.BaitEffectsComponent
|
import com.cobblemon.mod.common.item.components.BaitEffectsComponent
|
||||||
import com.cobblemon.mod.common.item.components.FlavourComponent
|
import com.cobblemon.mod.common.item.components.FlavourComponent
|
||||||
import com.cobblemon.mod.common.item.components.IngredientComponent
|
import com.cobblemon.mod.common.item.components.IngredientComponent
|
||||||
import com.cobblemon.mod.common.net.messages.client.effect.PokeSnackBlockParticlesPacket
|
|
||||||
import com.cobblemon.mod.common.util.DataKeys
|
import com.cobblemon.mod.common.util.DataKeys
|
||||||
import java.util.UUID
|
|
||||||
import net.minecraft.core.BlockPos
|
import net.minecraft.core.BlockPos
|
||||||
import net.minecraft.core.HolderLookup
|
import net.minecraft.core.HolderLookup
|
||||||
import net.minecraft.nbt.CompoundTag
|
import net.minecraft.nbt.*
|
||||||
import net.minecraft.nbt.NbtOps
|
|
||||||
import net.minecraft.server.level.ServerLevel
|
|
||||||
import net.minecraft.world.entity.Entity
|
|
||||||
import net.minecraft.world.entity.player.Player
|
|
||||||
import net.minecraft.world.item.ItemStack
|
import net.minecraft.world.item.ItemStack
|
||||||
import net.minecraft.world.level.block.state.BlockState
|
import net.minecraft.world.level.block.state.BlockState
|
||||||
|
import kotlin.collections.orEmpty
|
||||||
|
|
||||||
open class PokeSnackBlockEntity(pos: BlockPos, state: BlockState) :
|
open class PokeSnackBlockEntity(pos: BlockPos, state: BlockState) : TintBlockEntity(CobblemonBlockEntities.POKE_SNACK, pos, state) {
|
||||||
TintBlockEntity(CobblemonBlockEntities.POKE_SNACK, pos, state),
|
|
||||||
SpawningInfluence {
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
const val SPAWNS_PER_BITE = 1
|
|
||||||
const val RADIUS = 8
|
|
||||||
const val RANDOM_TICKS_BETWEEN_SPAWNS = 4
|
|
||||||
const val POKE_SNACK_CRUMBED_ASPECT = "poke_snack_crumbed"
|
|
||||||
}
|
|
||||||
|
|
||||||
val spawner: FixedAreaSpawner by lazy {
|
|
||||||
FixedAreaSpawner(
|
|
||||||
name = "poke_snack_spawner_${level?.dimension()?.location()}}_$blockPos",
|
|
||||||
spawnPool = CobblemonSpawnPools.WORLD_SPAWN_POOL,
|
|
||||||
world = level as ServerLevel,
|
|
||||||
position = blockPos,
|
|
||||||
horizontalRadius = RADIUS,
|
|
||||||
verticalRadius = RADIUS,
|
|
||||||
maxPokemonPerChunk = Cobblemon.config.pokeSnackPokemonPerChunk
|
|
||||||
).also {
|
|
||||||
it.influences.add(this)
|
|
||||||
|
|
||||||
val baitEffects = getBaitEffects()
|
|
||||||
|
|
||||||
val stackedLureTier = baitEffects
|
|
||||||
.filter { it.type == SpawnBait.Effects.RARITY_BUCKET }
|
|
||||||
.sumOf { it.value }
|
|
||||||
.toInt()
|
|
||||||
|
|
||||||
if (stackedLureTier > 0) {
|
|
||||||
it.influences += BucketNormalizingInfluence(
|
|
||||||
tier = stackedLureTier,
|
|
||||||
gradient = 0.2F,
|
|
||||||
firstTier = 1.2F
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
it.influences += BucketMultiplyingInfluence(
|
|
||||||
mapOf(
|
|
||||||
"uncommon" to 2.25f,
|
|
||||||
"rare" to 5.5f,
|
|
||||||
"ultra-rare" to 5.5f,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
it.influences += SpawnBaitInfluence(effects = baitEffects)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only non-herd Pokémon can be spawned from a Poké Snack
|
|
||||||
override fun affectSpawnable(detail: SpawnDetail, spawnablePosition: SpawnablePosition) = detail.type in SpawnDetail.pokemonTypes && detail !is PokemonHerdSpawnDetail
|
|
||||||
|
|
||||||
// When a Pokémon spawns, apply the crumbed aspect and play the eating effects. Eat part of the cake, too.
|
|
||||||
override fun affectSpawn(action: SpawnAction<*>, entity: Entity) {
|
|
||||||
if (entity is PokemonEntity) {
|
|
||||||
entity.pokemon.forcedAspects += POKE_SNACK_CRUMBED_ASPECT
|
|
||||||
val block = blockState.block as? PokeSnackBlock ?: return
|
|
||||||
val level = level ?: return
|
|
||||||
val entityPos = entity.blockPosition()
|
|
||||||
|
|
||||||
PokeSnackBlockParticlesPacket(blockPos, entityPos).sendToPlayersAround(
|
|
||||||
blockPos.x.toDouble(),
|
|
||||||
blockPos.y.toDouble(),
|
|
||||||
blockPos.z.toDouble(),
|
|
||||||
64.0,
|
|
||||||
level.dimension(),
|
|
||||||
)
|
|
||||||
|
|
||||||
block.eat(level, blockPos, blockState, action.spawnablePosition.cause.entity as? Player)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var placedBy: UUID? = null
|
|
||||||
var amountSpawned: Int = 0
|
|
||||||
var flavourComponent: FlavourComponent? = null
|
var flavourComponent: FlavourComponent? = null
|
||||||
var baitEffectsComponent: BaitEffectsComponent? = null
|
var baitEffectsComponent: BaitEffectsComponent? = null
|
||||||
var ingredientComponent: IngredientComponent? = null
|
var ingredientComponent: IngredientComponent? = null
|
||||||
var randomTicksUntilNextSpawn: Float = getRandomTicksBetweenSpawns()
|
|
||||||
|
|
||||||
fun initializeFromItemStack(itemStack: ItemStack) {
|
fun initializeFromItemStack(itemStack: ItemStack) {
|
||||||
flavourComponent = itemStack.get(CobblemonItemComponents.FLAVOUR)
|
flavourComponent = itemStack.get(CobblemonItemComponents.FLAVOUR)
|
||||||
@@ -130,7 +38,9 @@ open class PokeSnackBlockEntity(pos: BlockPos, state: BlockState) :
|
|||||||
if (isLure()) baitEffectsComponent = itemStack.get(CobblemonItemComponents.BAIT_EFFECTS)
|
if (isLure()) baitEffectsComponent = itemStack.get(CobblemonItemComponents.BAIT_EFFECTS)
|
||||||
|
|
||||||
flavourComponent?.let {
|
flavourComponent?.let {
|
||||||
getColourMixFromFlavours(it.getDominantFlavours())?.let(::setTint)
|
getColourMixFromFlavours(it.getDominantFlavours())?.let {
|
||||||
|
setTint(it)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -142,60 +52,14 @@ open class PokeSnackBlockEntity(pos: BlockPos, state: BlockState) :
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
fun randomTick() {
|
|
||||||
randomTicksUntilNextSpawn--
|
|
||||||
if (randomTicksUntilNextSpawn <= 0) {
|
|
||||||
val nearestPlayer = level?.getNearestPlayer(
|
|
||||||
blockPos.x.toDouble(),
|
|
||||||
blockPos.y.toDouble(),
|
|
||||||
blockPos.z.toDouble(),
|
|
||||||
Cobblemon.config.maximumSpawningZoneDistanceFromPlayer.toDouble(),
|
|
||||||
false, // true here makes it so creative players aren't considered
|
|
||||||
)
|
|
||||||
// High simulation distances may cause the player to be null here, we don't want to spawn without a player nearby.
|
|
||||||
if (nearestPlayer != null) {
|
|
||||||
spawner.run(
|
|
||||||
cause = SpawnCause(spawner = spawner, entity = nearestPlayer),
|
|
||||||
maxSpawns = 1
|
|
||||||
)
|
|
||||||
}
|
|
||||||
randomTicksUntilNextSpawn = getRandomTicksBetweenSpawns()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getRandomTicksBetweenSpawns(): Float {
|
|
||||||
val biteTimeMultiplier = getBiteTimeMultiplier()
|
|
||||||
return (RANDOM_TICKS_BETWEEN_SPAWNS * biteTimeMultiplier).coerceAtLeast(1F)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getBiteTimeMultiplier(): Float {
|
|
||||||
val baitEffects = getBaitEffects()
|
|
||||||
val biteTimeEffects = baitEffects.filter { it.type == SpawnBait.Effects.BITE_TIME }
|
|
||||||
if (biteTimeEffects.isEmpty()) return 1F
|
|
||||||
|
|
||||||
val biteTimeEffect = biteTimeEffects.random()
|
|
||||||
if (Math.random() > biteTimeEffect.chance) {
|
|
||||||
return 1F
|
|
||||||
}
|
|
||||||
|
|
||||||
return 1F - biteTimeEffect.value.toFloat()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun toItemStack(): ItemStack {
|
fun toItemStack(): ItemStack {
|
||||||
val stack = ItemStack(this.blockState.block)
|
val stack = ItemStack(this.blockState.block)
|
||||||
|
|
||||||
if (isLure() && baitEffectsComponent != null) {
|
if (isLure() && baitEffectsComponent != null) {
|
||||||
stack.set(CobblemonItemComponents.BAIT_EFFECTS, baitEffectsComponent)
|
stack.set(CobblemonItemComponents.BAIT_EFFECTS, baitEffectsComponent)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flavourComponent != null) {
|
if (flavourComponent != null) {
|
||||||
stack.set(CobblemonItemComponents.FLAVOUR, flavourComponent)
|
stack.set(CobblemonItemComponents.FLAVOUR, flavourComponent)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ingredientComponent != null) {
|
|
||||||
stack.set(CobblemonItemComponents.INGREDIENT, ingredientComponent)
|
|
||||||
}
|
|
||||||
|
|
||||||
return stack
|
return stack
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -203,18 +67,12 @@ open class PokeSnackBlockEntity(pos: BlockPos, state: BlockState) :
|
|||||||
* Combine all the [SpawnBait.Effect] values from the [baitEffectsComponent] data.
|
* Combine all the [SpawnBait.Effect] values from the [baitEffectsComponent] data.
|
||||||
*/
|
*/
|
||||||
fun getBaitEffects(): List<Effect> {
|
fun getBaitEffects(): List<Effect> {
|
||||||
return baitEffectsComponent
|
return baitEffectsComponent?.effects?.mapNotNull(SpawnBaitEffects::getFromIdentifier)?.flatMap { it.effects }.orEmpty()
|
||||||
?.effects
|
|
||||||
?.mapNotNull(SpawnBaitEffects::getFromIdentifier)
|
|
||||||
?.flatMap { it.effects }
|
|
||||||
.orEmpty()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun saveAdditional(tag: CompoundTag, registries: HolderLookup.Provider) {
|
override fun saveAdditional(tag: CompoundTag, registries: HolderLookup.Provider) {
|
||||||
super.saveAdditional(tag, registries)
|
super.saveAdditional(tag, registries)
|
||||||
|
|
||||||
tag.putInt(DataKeys.AMOUNT_SPAWNED, amountSpawned)
|
|
||||||
|
|
||||||
flavourComponent?.let { component ->
|
flavourComponent?.let { component ->
|
||||||
CobblemonItemComponents.FLAVOUR.codec()!!
|
CobblemonItemComponents.FLAVOUR.codec()!!
|
||||||
.encodeStart(NbtOps.INSTANCE, component)
|
.encodeStart(NbtOps.INSTANCE, component)
|
||||||
@@ -241,19 +99,11 @@ open class PokeSnackBlockEntity(pos: BlockPos, state: BlockState) :
|
|||||||
tag.put(DataKeys.INGREDIENTS, encodedTag)
|
tag.put(DataKeys.INGREDIENTS, encodedTag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tag.putFloat(DataKeys.TICKS_UNTIL_NEXT_SPAWN, randomTicksUntilNextSpawn)
|
|
||||||
|
|
||||||
placedBy?.let {
|
|
||||||
tag.putUUID(DataKeys.PLACED_BY, it)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun loadAdditional(tag: CompoundTag, registries: HolderLookup.Provider) {
|
override fun loadAdditional(tag: CompoundTag, registries: HolderLookup.Provider) {
|
||||||
super.loadAdditional(tag, registries)
|
super.loadAdditional(tag, registries)
|
||||||
|
|
||||||
amountSpawned = tag.getInt(DataKeys.AMOUNT_SPAWNED)
|
|
||||||
|
|
||||||
if (tag.contains(DataKeys.FLAVOUR)) {
|
if (tag.contains(DataKeys.FLAVOUR)) {
|
||||||
CobblemonItemComponents.FLAVOUR.codec()
|
CobblemonItemComponents.FLAVOUR.codec()
|
||||||
?.parse(NbtOps.INSTANCE, tag.get(DataKeys.FLAVOUR))
|
?.parse(NbtOps.INSTANCE, tag.get(DataKeys.FLAVOUR))
|
||||||
@@ -280,13 +130,5 @@ open class PokeSnackBlockEntity(pos: BlockPos, state: BlockState) :
|
|||||||
ingredientComponent = component
|
ingredientComponent = component
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tag.contains(DataKeys.TICKS_UNTIL_NEXT_SPAWN)) {
|
|
||||||
randomTicksUntilNextSpawn = tag.getFloat(DataKeys.TICKS_UNTIL_NEXT_SPAWN)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tag.contains(DataKeys.PLACED_BY)) {
|
|
||||||
placedBy = tag.getUUID(DataKeys.PLACED_BY)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loaded 100 of 979 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user