Compare commits
50
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0af70a1433 | ||
|
|
268e7c4afc | ||
|
|
070d6f9529 | ||
|
|
8420dd6fe3 | ||
|
|
24ee96a85d | ||
|
|
32ff4ee609 | ||
|
|
7a61ce1a94 | ||
|
|
46f43345f2 | ||
|
|
ad438bfbcd | ||
|
|
5bc056d28e | ||
|
|
3033adcc2f | ||
|
|
252634bfde | ||
|
|
0f38c6b00e | ||
|
|
f711f748a8 | ||
|
|
c2fb914e08 | ||
|
|
7947e19337 | ||
|
|
5bde172731 | ||
|
|
496e04a779 | ||
|
|
ff4192b43c | ||
|
|
415591a443 | ||
|
|
efb1eaf3e1 | ||
|
|
7ebd2bdb94 | ||
|
|
e07579bf0a | ||
|
|
0695117549 | ||
|
|
d6cd04e2a4 | ||
|
|
8240cd10e2 | ||
|
|
2a1e749787 | ||
|
|
6d9daf692d | ||
|
|
1f7df20e77 | ||
|
|
02a4b91778 | ||
|
|
a37da4d4f2 | ||
|
|
66817b5e9b | ||
|
|
fd54e3a7e0 | ||
|
|
79f2b67bf9 | ||
|
|
2352dae6e0 | ||
|
|
9ec100f9ea | ||
|
|
17c524ab9e | ||
|
|
86d48df9fe | ||
|
|
3401ba9cbb | ||
|
|
dac9ccb461 | ||
|
|
191a62f693 | ||
|
|
d8d410e539 | ||
|
|
b7c6e1ea77 | ||
|
|
186812d6fd | ||
|
|
1c0bdc766a | ||
|
|
c697bcd2e9 | ||
|
|
9d6ff01d80 | ||
|
|
1691853a19 | ||
|
|
4e9a4e1e5a | ||
|
|
6450255a0b |
No files matched your search
@@ -6,7 +6,6 @@
|
||||
- Added filter functionality in PC UI, which supports `PokemonProperties` (e.g. `shiny=yes` shows all shiny Pokémon).
|
||||
- Added `/changewallpaper <player> <boxNumber> <wallpaper>` command to change a box wallpaper through commands.
|
||||
- Added `/renamebox <player> <boxNumber> <name>` command to rename a PC box through commands.
|
||||
- Added IVs and EVs stat displays in PC.
|
||||
|
||||
### Developer
|
||||
- Added `RenamePCBoxEvent.Pre` and `RenamePCBoxEvent.Post` events to prevent players from renaming a box or changing their input.
|
||||
|
||||
@@ -127,10 +127,6 @@
|
||||
- Shulker shell Forretress is now a cosmetic rather than a special evo and thus all shulker Forretress will revert back to normal until a shulker shell is put in their cosmetic slot.
|
||||
- Updated `doPokemonSpawning` gamerule to support per-dimension configurations.
|
||||
- The Pokedex now displays a form name of a "normal" Pokémon for when the base form is still a named form.
|
||||
- Improved the zoom functionality of the Pokédex Scanner by giving the levels logarithmic scaling.
|
||||
- Added a subtle rotation effect to the Pokédex Scanner's wheel when zooming.
|
||||
- Improved parity with vanilla mobs' drop behavior; loot and XP drop on death instead of after the entire death sequence finishes.
|
||||
- Quirk animations no longer play in the battle GUI since they were pretty distracting.
|
||||
|
||||
### Fixes
|
||||
- Fixed Particles sometimes facing the wrong direction (looking at you, Swords Dance)
|
||||
@@ -160,8 +156,6 @@
|
||||
- Fixed an issue with newer versions of Fabric API where underground Pokémon were spawning in The End.
|
||||
- Fixed spawning not working well when you're at high points surrounded by lower altitude spawning areas, such as flying.
|
||||
- Fixed certain Pokémon with forms not having appropriate stock Pokédex entries.
|
||||
- Fixed issue with Pokédex Scanner that caused the open/close overlay to have the wrong opacity values
|
||||
- Fixed dragon's breath not being usable on the restoration tank when it should be
|
||||
|
||||
### Developer
|
||||
- A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
|
||||
|
||||
@@ -151,12 +151,7 @@ public abstract class CameraMixin {
|
||||
Vec3 position = locatorOffset.add(entityPos).add(new Vec3(rotatedEyeHeight));
|
||||
setPosition(position);
|
||||
} else {
|
||||
var playerPos = new Vec3(
|
||||
Mth.lerp(instance.getPartialTickTime(), entity.xOld, entity.getX()),
|
||||
Mth.lerp(instance.getPartialTickTime(), entity.yOld, entity.getY()),
|
||||
Mth.lerp(instance.getPartialTickTime(), entity.zOld, entity.getZ())
|
||||
);
|
||||
Vector3f pos = playerPos.toVector3f();
|
||||
Vector3f pos = entityPos.add(new Vec3(0, pokemon.getBbHeight() / 2, 0)).toVector3f();
|
||||
|
||||
PosableModel model = VaryingModelRepository.INSTANCE.getPoser(pokemon.getPokemon().getSpecies().getResourceIdentifier(), new FloatingState());
|
||||
Map<String, Vec3> cameraOffsets = model.getSeatToCameraOffset();
|
||||
@@ -176,11 +171,7 @@ public abstract class CameraMixin {
|
||||
float xRot = (float) (-1 * Math.toRadians(instance.getXRot()));
|
||||
|
||||
Matrix3f orientation = controller.isActive() && controller.getOrientation() != null ? controller.getOrientation() : new Matrix3f().rotateY((float) Math.toRadians(180f - instance.getYRot())).rotateX(xRot);
|
||||
Vector3f rotatedOffset = orientation.transform(new Vector3f(
|
||||
offset.x,
|
||||
offset.y,
|
||||
offset.z + 4.0f
|
||||
));
|
||||
Vector3f rotatedOffset = orientation.transform(offset);
|
||||
float offsetDistance = rotatedOffset.length();
|
||||
Vector3f offsetDirection = rotatedOffset.mul(1 / offsetDistance);
|
||||
|
||||
|
||||
@@ -8,11 +8,24 @@
|
||||
|
||||
package com.cobblemon.mod.common.mixin.client;
|
||||
|
||||
import com.cobblemon.mod.common.api.orientation.OrientationController;
|
||||
import com.cobblemon.mod.common.api.scheduling.ClientTaskTracker;
|
||||
import com.cobblemon.mod.common.stadium.StadiumClientManager;
|
||||
import com.cobblemon.mod.common.util.CameraExtensionsKt;
|
||||
import net.minecraft.client.Camera;
|
||||
import net.minecraft.client.DeltaTracker;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GameRenderer;
|
||||
import net.minecraft.client.renderer.LightTexture;
|
||||
import net.minecraft.util.Mth;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import org.joml.Matrix4f;
|
||||
import org.joml.Quaternionf;
|
||||
import org.joml.Vector3f;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
@@ -20,6 +33,17 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(GameRenderer.class)
|
||||
public class GameRendererMixin {
|
||||
@Shadow @Final Minecraft minecraft;
|
||||
@Shadow float renderDistance;
|
||||
@Shadow @Final private LightTexture lightTexture;
|
||||
@Shadow private boolean renderHand;
|
||||
|
||||
@Shadow private double getFov(Camera activeRenderInfo, float partialTicks, boolean useFOVSetting) { return 0.0; }
|
||||
@Shadow public void resetProjectionMatrix(Matrix4f matrix) {}
|
||||
@Shadow public Matrix4f getProjectionMatrix(double fov) { return new Matrix4f(); }
|
||||
@Shadow private void renderItemInHand(Camera camera, float partialTick, Matrix4f projectionMatrix) {}
|
||||
@Shadow public void pick(float partialTicks) {}
|
||||
|
||||
@Unique
|
||||
long lastTime = -1;
|
||||
|
||||
@@ -42,4 +66,54 @@ public class GameRendererMixin {
|
||||
lastTime = newTime;
|
||||
}
|
||||
|
||||
@Inject(method = "renderLevel", at = @At(value = "HEAD"), cancellable = true)
|
||||
public void renderLevel(DeltaTracker deltaTracker, CallbackInfo ci) {
|
||||
if (StadiumClientManager.INSTANCE.shouldUseStadiumCamera()) {
|
||||
float f = deltaTracker.getGameTimeDeltaPartialTick(true);
|
||||
this.lightTexture.updateLightTexture(f);
|
||||
if (this.minecraft.getCameraEntity() == null) {
|
||||
this.minecraft.setCameraEntity(this.minecraft.player);
|
||||
}
|
||||
|
||||
this.minecraft.getProfiler().push("camera");
|
||||
Camera stadiumCamera = new Camera();
|
||||
Entity entity = (Entity) this.minecraft.player;
|
||||
stadiumCamera.setup(this.minecraft.level, entity, false, false, 1.0F);
|
||||
|
||||
//adjust camera
|
||||
StadiumClientManager.INSTANCE.updateCameraData(f);
|
||||
var position = StadiumClientManager.INSTANCE.getCameraPosition();
|
||||
stadiumCamera.setPosition(position);
|
||||
|
||||
Quaternionf rotation = StadiumClientManager.INSTANCE.getCameraRotation();
|
||||
var forwardVector = rotation.transform(Camera.FORWARDS, new Vector3f());
|
||||
var upVector = rotation.transform(Camera.UP, new Vector3f());
|
||||
var leftVector = rotation.transform(Camera.LEFT, new Vector3f());
|
||||
stadiumCamera.rotation.set(rotation);
|
||||
stadiumCamera.xRot = (float)Mth.wrapDegrees(-Math.toDegrees(Math.asin(forwardVector.y)));
|
||||
stadiumCamera.yRot = Mth.wrapDegrees((float)-Math.toDegrees(Camera.FORWARDS.angleSigned(forwardVector, Camera.UP)) + 180);
|
||||
stadiumCamera.forwards.set(forwardVector);
|
||||
stadiumCamera.up.set(upVector);
|
||||
stadiumCamera.left.set(leftVector);
|
||||
|
||||
this.renderDistance = (float)(this.minecraft.options.getEffectiveRenderDistance() * 16);
|
||||
double d = this.getFov(stadiumCamera, f, true);
|
||||
Matrix4f matrix4f = this.getProjectionMatrix(d);
|
||||
|
||||
this.resetProjectionMatrix(matrix4f);
|
||||
Quaternionf quaternionf = stadiumCamera.rotation().conjugate(new Quaternionf());
|
||||
Matrix4f matrix4f2 = (new Matrix4f()).rotation(quaternionf);
|
||||
this.minecraft.levelRenderer.prepareCullFrustum(stadiumCamera.getPosition(), matrix4f2, this.getProjectionMatrix(Math.max(d, (double)(Integer)this.minecraft.options.fov().get())));
|
||||
this.minecraft.levelRenderer.renderLevel(deltaTracker, false, stadiumCamera, (GameRenderer) (Object) this, this.lightTexture, matrix4f2, matrix4f);
|
||||
|
||||
this.minecraft.getProfiler().pop();
|
||||
|
||||
ci.cancel();
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "tick", at = @At(value = "TAIL"))
|
||||
public void tick(CallbackInfo ci) {
|
||||
// StadiumClientManager.INSTANCE.tickCameraManager();
|
||||
}
|
||||
}
|
||||
@@ -36,6 +36,9 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
|
||||
@JvmField
|
||||
val PC: BlockEntityType<PCBlockEntity> = this.create("pc", BlockEntityType.Builder.of(::PCBlockEntity, CobblemonBlocks.PC).build(null))
|
||||
|
||||
@JvmField
|
||||
val STADIUM: BlockEntityType<StadiumBlockEntity> = this.create("stadium_terminal", BlockEntityType.Builder.of(::StadiumBlockEntity, CobblemonBlocks.STADIUM).build(null))
|
||||
|
||||
@JvmField
|
||||
val LECTERN: BlockEntityType<LecternBlockEntity> = this.create("lectern", BlockEntityType.Builder.of(::LecternBlockEntity, CobblemonBlocks.LECTERN).build(null))
|
||||
|
||||
|
||||
@@ -354,6 +354,9 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
|
||||
@JvmField
|
||||
val PC = create("pc", PCBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).strength(2F).noOcclusion().lightLevel { if ((it.getValue(PCBlock.ON) as Boolean) && (it.getValue(PCBlock.PART) == PCBlock.PCPart.TOP)) 10 else 0 }))
|
||||
|
||||
@JvmField
|
||||
val STADIUM = create("stadium_terminal", StadiumBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).strength(2F)))
|
||||
|
||||
@JvmField
|
||||
val LECTERN = create("lectern", LecternBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).sound(SoundType.WOOD).strength(2.5F).ignitedByLava()))
|
||||
|
||||
|
||||
@@ -272,6 +272,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
|
||||
@JvmField
|
||||
val PC = blockItem("pc", CobblemonBlocks.PC)
|
||||
@JvmField
|
||||
val STADIUM = blockItem("stadium_terminal", CobblemonBlocks.STADIUM)
|
||||
@JvmField
|
||||
val PASTURE = blockItem("pasture", CobblemonBlocks.PASTURE)
|
||||
@JvmField
|
||||
val DISPLAY_CASE = blockItem("display_case", CobblemonBlocks.DISPLAY_CASE)
|
||||
|
||||
@@ -142,8 +142,6 @@ import com.cobblemon.mod.common.net.messages.server.callback.party.PartyPokemonS
|
||||
import com.cobblemon.mod.common.net.messages.server.callback.party.PartySelectCancelledPacket
|
||||
import com.cobblemon.mod.common.net.messages.server.callback.partymove.PartyMoveSelectCancelledPacket
|
||||
import com.cobblemon.mod.common.net.messages.server.callback.partymove.PartyPokemonMoveSelectedPacket
|
||||
import com.cobblemon.mod.common.net.messages.server.debug.ServerboundUpdateRidingStatRangePacket
|
||||
import com.cobblemon.mod.common.net.messages.server.debug.ServerboundUpdateRidingStatsPacket
|
||||
import com.cobblemon.mod.common.net.messages.server.dialogue.EscapeDialoguePacket
|
||||
import com.cobblemon.mod.common.net.messages.server.dialogue.InputToDialoguePacket
|
||||
import com.cobblemon.mod.common.net.messages.server.npc.SaveNPCPacket
|
||||
@@ -188,8 +186,6 @@ import com.cobblemon.mod.common.net.serverhandling.callback.party.PartyPokemonSe
|
||||
import com.cobblemon.mod.common.net.serverhandling.callback.party.PartySelectCancelledHandler
|
||||
import com.cobblemon.mod.common.net.serverhandling.callback.partymove.PartyMoveSelectCancelledHandler
|
||||
import com.cobblemon.mod.common.net.serverhandling.callback.partymove.PartyPokemonMoveSelectedHandler
|
||||
import com.cobblemon.mod.common.net.serverhandling.debug.ServerboundUpdateRidingStatRangeHandler
|
||||
import com.cobblemon.mod.common.net.serverhandling.debug.ServerboundUpdateRidingStatsHandler
|
||||
import com.cobblemon.mod.common.net.serverhandling.dialogue.EscapeDialogueHandler
|
||||
import com.cobblemon.mod.common.net.serverhandling.dialogue.InputToDialogueHandler
|
||||
import com.cobblemon.mod.common.net.serverhandling.evolution.AcceptEvolutionHandler
|
||||
@@ -222,6 +218,10 @@ import com.cobblemon.mod.common.net.serverhandling.trade.ChangeTradeAcceptanceHa
|
||||
import com.cobblemon.mod.common.net.serverhandling.trade.OfferTradeHandler
|
||||
import com.cobblemon.mod.common.net.serverhandling.trade.PerformTradeHandler
|
||||
import com.cobblemon.mod.common.net.serverhandling.trade.UpdateTradeOfferHandler
|
||||
import com.cobblemon.mod.common.stadium.StadiumCamerasSyncPacket
|
||||
import com.cobblemon.mod.common.stadium.StadiumJoinHandler
|
||||
import com.cobblemon.mod.common.stadium.StadiumJoinPacket
|
||||
import com.cobblemon.mod.common.stadium.StadiumCameraManagersSyncPacket
|
||||
import com.cobblemon.mod.common.util.server
|
||||
import net.minecraft.server.level.ServerPlayer
|
||||
|
||||
@@ -378,6 +378,8 @@ object CobblemonNetwork {
|
||||
list.add(PacketRegisterInfo(FlowRegistrySyncPacket.ID, FlowRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
|
||||
list.add(PacketRegisterInfo(CosmeticItemAssignmentSyncPacket.ID, CosmeticItemAssignmentSyncPacket::decode, DataRegistrySyncPacketHandler()))
|
||||
list.add(PacketRegisterInfo(MarkRegistrySyncPacket.ID, MarkRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
|
||||
list.add(PacketRegisterInfo(StadiumCamerasSyncPacket.ID, StadiumCamerasSyncPacket::decode, DataRegistrySyncPacketHandler()))
|
||||
list.add(PacketRegisterInfo(StadiumCameraManagersSyncPacket.ID, StadiumCameraManagersSyncPacket::decode, DataRegistrySyncPacketHandler()))
|
||||
|
||||
// Effects
|
||||
list.add(PacketRegisterInfo(SpawnSnowstormParticlePacket.ID, SpawnSnowstormParticlePacket::decode, SpawnSnowstormParticleHandler))
|
||||
@@ -440,6 +442,9 @@ object CobblemonNetwork {
|
||||
// Riding
|
||||
list.add(PacketRegisterInfo(ClientboundUpdateRidingStatePacket.ID, ClientboundUpdateRidingStatePacket::decode, ClientboundUpdateRidingStateHandler))
|
||||
|
||||
// Stadium packets
|
||||
list.add(PacketRegisterInfo(StadiumJoinPacket.ID, StadiumJoinPacket::decode, StadiumJoinHandler))
|
||||
|
||||
return list
|
||||
}
|
||||
|
||||
@@ -540,8 +545,6 @@ object CobblemonNetwork {
|
||||
// Riding packet(s)
|
||||
list.add(PacketRegisterInfo(ServerboundUpdateOrientationPacket.ID, ServerboundUpdateOrientationPacket::decode, OrientationPacketHandler))
|
||||
list.add(PacketRegisterInfo(ServerboundUpdateRidingStatePacket.ID, ServerboundUpdateRidingStatePacket::decode, ServerboundUpdateRidingStateHandler))
|
||||
list.add(PacketRegisterInfo(ServerboundUpdateRidingStatsPacket.ID, ServerboundUpdateRidingStatsPacket::decode, ServerboundUpdateRidingStatsHandler))
|
||||
list.add(PacketRegisterInfo(ServerboundUpdateRidingStatRangePacket.ID, ServerboundUpdateRidingStatRangePacket::decode, ServerboundUpdateRidingStatRangeHandler))
|
||||
|
||||
return list
|
||||
}
|
||||
|
||||
@@ -215,7 +215,6 @@ fun drawPosablePortrait(
|
||||
ageInTicks: Float = 0F,
|
||||
headYaw: Float = 0F,
|
||||
headPitch: Float = 0F,
|
||||
doQuirks: Boolean = true,
|
||||
r: Float = 1F,
|
||||
g: Float = 1F,
|
||||
b: Float = 1F,
|
||||
@@ -241,7 +240,6 @@ fun drawPosablePortrait(
|
||||
context.put(RenderContext.SPECIES, identifier)
|
||||
context.put(RenderContext.ASPECTS, state.currentAspects)
|
||||
context.put(RenderContext.POSABLE_STATE, state)
|
||||
context.put(RenderContext.DO_QUIRKS, doQuirks)
|
||||
|
||||
val renderType = RenderType.entityCutout(texture)
|
||||
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
package com.cobblemon.mod.common.api.riding
|
||||
|
||||
import com.bedrockk.molang.Expression
|
||||
import com.cobblemon.mod.common.Cobblemon
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
|
||||
import com.cobblemon.mod.common.api.riding.stats.RidingStat
|
||||
import com.cobblemon.mod.common.api.riding.stats.RidingStatDefinition
|
||||
@@ -18,18 +17,17 @@ import com.cobblemon.mod.common.util.adapters.RidingBehaviourSettingsAdapter
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
|
||||
class RidingProperties(
|
||||
val stats: MutableMap<RidingStat, RidingStatDefinition> = mutableMapOf(),
|
||||
val stats: Map<RidingStat, RidingStatDefinition> = mapOf(),
|
||||
val seats: List<Seat> = listOf(),
|
||||
val conditions: List<Expression> = listOf(),
|
||||
val behaviour: RidingBehaviourSettings? = null
|
||||
) {
|
||||
|
||||
companion object {
|
||||
fun decode(buffer: RegistryFriendlyByteBuf): RidingProperties {
|
||||
val stats: MutableMap<RidingStat, RidingStatDefinition> = buffer.readMap(
|
||||
val stats: Map<RidingStat, RidingStatDefinition> = buffer.readMap(
|
||||
{ buffer.readEnum(RidingStat::class.java) },
|
||||
{ RidingStatDefinition.decode(buffer) }
|
||||
).toMutableMap()
|
||||
)
|
||||
val seats: List<Seat> = buffer.readList { _ -> Seat.decode(buffer) }
|
||||
val conditions = buffer.readList { buffer.readString().asExpression() }
|
||||
val behaviour = buffer.readNullable { _ ->
|
||||
@@ -43,14 +41,6 @@ class RidingProperties(
|
||||
}
|
||||
}
|
||||
|
||||
internal fun updateStatRange(stat: RidingStat, style: RidingStyle, min: Int, max: Int) {
|
||||
if (!Cobblemon.config.enableDebugKeys) return
|
||||
if (stats[stat] == null) {
|
||||
stats[stat] = RidingStatDefinition()
|
||||
}
|
||||
stats[stat]!!.ranges[style] = min..max
|
||||
}
|
||||
|
||||
fun encode(buffer: RegistryFriendlyByteBuf) {
|
||||
buffer.writeMap(
|
||||
stats,
|
||||
|
||||
@@ -18,5 +18,6 @@ package com.cobblemon.mod.common.api.riding
|
||||
enum class RidingStyle {
|
||||
LAND,
|
||||
LIQUID,
|
||||
AIR
|
||||
AIR,
|
||||
COMPOSITE
|
||||
}
|
||||
+3
-6
@@ -28,8 +28,7 @@ import net.minecraft.world.phys.Vec3
|
||||
*/
|
||||
interface RidingBehaviour<Settings : RidingBehaviourSettings, State : RidingBehaviourState> {
|
||||
val key: ResourceLocation
|
||||
|
||||
fun getRidingStyle(settings: Settings, state: State): RidingStyle
|
||||
val style: RidingStyle
|
||||
|
||||
fun isActive(settings: Settings, state: State, vehicle: PokemonEntity): Boolean
|
||||
|
||||
@@ -39,9 +38,9 @@ interface RidingBehaviour<Settings : RidingBehaviourSettings, State : RidingBeha
|
||||
|
||||
fun speed(settings: Settings, state: State, vehicle: PokemonEntity, driver: Player): Float
|
||||
|
||||
fun clampPassengerRotation(settings: Settings, state: State, vehicle: PokemonEntity, driver: LivingEntity) {}
|
||||
fun clampPassengerRotation(settings: Settings, state: State, entity: PokemonEntity, driver: LivingEntity) {}
|
||||
|
||||
fun updatePassengerRotation(settings: Settings, state: State, vehicle: PokemonEntity, driver: LivingEntity) {}
|
||||
fun updatePassengerRotation(settings: Settings, state: State, entity: PokemonEntity, driver: LivingEntity) {}
|
||||
|
||||
fun rotation(settings: Settings, state: State, vehicle: PokemonEntity, driver: LivingEntity): Vec2
|
||||
|
||||
@@ -88,8 +87,6 @@ interface RidingBehaviour<Settings : RidingBehaviourSettings, State : RidingBeha
|
||||
|
||||
fun shouldRotatePlayerHead(settings: Settings, state: State, vehicle: PokemonEntity): Boolean
|
||||
|
||||
fun maxUpStep(settings: Settings, state: State, vehicle: PokemonEntity): Float? = null
|
||||
|
||||
fun createDefaultState(settings: Settings): State
|
||||
|
||||
}
|
||||
+2
-2
@@ -23,8 +23,8 @@ import net.minecraft.world.phys.Vec3
|
||||
* @author landonjw
|
||||
*/
|
||||
open class RidingBehaviourState {
|
||||
open val rideVelocity: SidedRidingState<Vec3> = ridingState(Vec3.ZERO, Side.CLIENT)
|
||||
open val stamina: SidedRidingState<Float> = ridingState(1.0F, Side.CLIENT)
|
||||
open val rideVelocity: SidedRidingState<Vec3> = ridingState(Vec3.ZERO, Side.BOTH)
|
||||
open val stamina: SidedRidingState<Float> = ridingState(1.0F, Side.BOTH)
|
||||
|
||||
open fun reset() {
|
||||
rideVelocity.set(Vec3.ZERO, true)
|
||||
|
||||
+8
-15
@@ -8,30 +8,23 @@
|
||||
|
||||
package com.cobblemon.mod.common.api.riding.behaviour
|
||||
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.air.*
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.*
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeBehaviour
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.land.HorseBehaviour
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.land.VehicleBehaviour
|
||||
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.DolphinBehaviour
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.SubmarineBehaviour
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
|
||||
object RidingBehaviours {
|
||||
val behaviours = mutableMapOf<ResourceLocation, RidingBehaviour<RidingBehaviourSettings, RidingBehaviourState>>()
|
||||
|
||||
init {
|
||||
register(BirdBehaviour.KEY, BirdBehaviour())
|
||||
register(BirdAirBehaviour.KEY, BirdAirBehaviour())
|
||||
register(DolphinBehaviour.KEY, DolphinBehaviour())
|
||||
register(HorseBehaviour.KEY, HorseBehaviour())
|
||||
register(BoatBehaviour.KEY, BoatBehaviour())
|
||||
register(SubmarineBehaviour.KEY, SubmarineBehaviour())
|
||||
register(GliderBehaviour.KEY, GliderBehaviour())
|
||||
register(GenericLandBehaviour.KEY, GenericLandBehaviour())
|
||||
register(GenericSwimBehaviour.KEY, GenericSwimBehaviour())
|
||||
register(GliderAirBehaviour.KEY, GliderAirBehaviour())
|
||||
register(HelicopterBehaviour.KEY, HelicopterBehaviour())
|
||||
register(JetBehaviour.KEY, JetBehaviour())
|
||||
register(BurstBehaviour.KEY, BurstBehaviour())
|
||||
register(VehicleBehaviour.KEY, VehicleBehaviour())
|
||||
register(JetAirBehaviour.KEY, JetAirBehaviour())
|
||||
register(SwimDashBehaviour.KEY, SwimDashBehaviour())
|
||||
register(VehicleLandBehaviour.KEY, VehicleLandBehaviour())
|
||||
register(HoverBehaviour.KEY, HoverBehaviour())
|
||||
register(CompositeBehaviour.KEY, CompositeBehaviour())
|
||||
}
|
||||
|
||||
+1
-21
@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.riding.behaviour
|
||||
import com.cobblemon.mod.common.api.riding.RidingStyle
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
import net.minecraft.server.level.ServerPlayer
|
||||
import net.minecraft.util.SmoothDouble
|
||||
import net.minecraft.world.entity.LivingEntity
|
||||
import net.minecraft.world.entity.player.Player
|
||||
@@ -26,10 +25,7 @@ import net.minecraft.world.phys.Vec3
|
||||
class RidingController<Settings : RidingBehaviourSettings, State : RidingBehaviourState>(val behaviour: RidingBehaviour<Settings, State>) : RidingBehaviour<Settings, State> {
|
||||
|
||||
override val key = behaviour.key
|
||||
|
||||
override fun getRidingStyle(settings: Settings, state: State): RidingStyle {
|
||||
return behaviour.getRidingStyle(settings, state)
|
||||
}
|
||||
override val style = behaviour.style
|
||||
|
||||
override fun isActive(settings: Settings, state: State, vehicle: PokemonEntity) =
|
||||
behaviour.isActive(settings, state, vehicle)
|
||||
@@ -45,16 +41,6 @@ class RidingController<Settings : RidingBehaviourSettings, State : RidingBehavio
|
||||
return behaviour.speed(settings, state, vehicle, driver)
|
||||
}
|
||||
|
||||
override fun updatePassengerRotation(
|
||||
settings: Settings,
|
||||
state: State,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
) {
|
||||
if (!isActive(settings, state, vehicle)) return
|
||||
return behaviour.updatePassengerRotation(settings, state, vehicle, driver)
|
||||
}
|
||||
|
||||
override fun clampPassengerRotation(settings: Settings, state: State, vehicle: PokemonEntity, driver: LivingEntity) {
|
||||
if (!isActive(settings, state, vehicle)) return
|
||||
return behaviour.clampPassengerRotation(settings, state, vehicle, driver)
|
||||
@@ -185,14 +171,8 @@ class RidingController<Settings : RidingBehaviourSettings, State : RidingBehavio
|
||||
return behaviour.setRideBar(settings, state, vehicle, driver)
|
||||
}
|
||||
|
||||
override fun maxUpStep(settings: Settings, state: State, vehicle: PokemonEntity): Float? {
|
||||
if (!isActive(settings, state, vehicle)) return null
|
||||
return behaviour.maxUpStep(settings, state, vehicle)
|
||||
}
|
||||
|
||||
override fun createDefaultState(settings: Settings): State {
|
||||
return behaviour.createDefaultState(settings)
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
+49
-49
@@ -6,7 +6,7 @@
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types.air
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types
|
||||
|
||||
import com.bedrockk.molang.Expression
|
||||
import com.bedrockk.molang.runtime.MoLangMath.lerp
|
||||
@@ -27,33 +27,33 @@ 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.Matrix3f
|
||||
import org.joml.Quaternionf
|
||||
import org.joml.Vector3f
|
||||
import kotlin.math.*
|
||||
|
||||
class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
||||
class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
|
||||
companion object {
|
||||
val KEY = cobblemonResource("air/bird")
|
||||
}
|
||||
|
||||
override val key: ResourceLocation = KEY
|
||||
override val style = RidingStyle.AIR
|
||||
|
||||
override fun getRidingStyle(settings: BirdSettings, state: BirdState): RidingStyle {
|
||||
return RidingStyle.AIR
|
||||
}
|
||||
|
||||
val poseProvider = PoseProvider<BirdSettings, BirdState>(PoseType.HOVER)
|
||||
val poseProvider = PoseProvider<BirdAirSettings, BirdAirState>(PoseType.HOVER)
|
||||
.with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVelocity.get().z > 0.2 })
|
||||
|
||||
override fun isActive(settings: BirdSettings, state: BirdState, vehicle: PokemonEntity): Boolean {
|
||||
override fun isActive(settings: BirdAirSettings, state: BirdAirState, vehicle: PokemonEntity): Boolean {
|
||||
return true
|
||||
}
|
||||
|
||||
override fun pose(settings: BirdSettings, state: BirdState, vehicle: PokemonEntity): PoseType {
|
||||
override fun pose(settings: BirdAirSettings, state: BirdAirState, vehicle: PokemonEntity): PoseType {
|
||||
return poseProvider.select(settings, state, vehicle)
|
||||
}
|
||||
|
||||
override fun speed(
|
||||
settings: BirdSettings,
|
||||
state: BirdState,
|
||||
settings: BirdAirSettings,
|
||||
state: BirdAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
@@ -61,8 +61,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
||||
}
|
||||
|
||||
override fun rotation(
|
||||
settings: BirdSettings,
|
||||
state: BirdState,
|
||||
settings: BirdAirSettings,
|
||||
state: BirdAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
): Vec2 {
|
||||
@@ -70,8 +70,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
||||
}
|
||||
|
||||
override fun velocity(
|
||||
settings: BirdSettings,
|
||||
state: BirdState,
|
||||
settings: BirdAirSettings,
|
||||
state: BirdAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
input: Vec3
|
||||
@@ -117,7 +117,7 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
||||
/*
|
||||
* Calculates the change in the ride space vector due to player input and ride state
|
||||
*/
|
||||
fun calculateRideSpaceVel(settings: BirdSettings, state: BirdState, vehicle: PokemonEntity, driver: Player) {
|
||||
fun calculateRideSpaceVel(settings: BirdAirSettings, state: BirdAirState, vehicle: PokemonEntity, driver: Player) {
|
||||
//retrieve stats
|
||||
val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
|
||||
val glideTopSpeed = vehicle.runtime.resolveDouble(settings.glidespeedExpr)
|
||||
@@ -251,8 +251,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
||||
}
|
||||
|
||||
override fun angRollVel(
|
||||
settings: BirdSettings,
|
||||
state: BirdState,
|
||||
settings: BirdAirSettings,
|
||||
state: BirdAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
deltaTime: Double
|
||||
@@ -305,8 +305,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
||||
}
|
||||
|
||||
override fun rotationOnMouseXY(
|
||||
settings: BirdSettings,
|
||||
state: BirdState,
|
||||
settings: BirdAirSettings,
|
||||
state: BirdAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
mouseY: Double,
|
||||
@@ -376,8 +376,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
||||
}
|
||||
|
||||
override fun canJump(
|
||||
settings: BirdSettings,
|
||||
state: BirdState,
|
||||
settings: BirdAirSettings,
|
||||
state: BirdAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
@@ -385,8 +385,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
||||
}
|
||||
|
||||
override fun setRideBar(
|
||||
settings: BirdSettings,
|
||||
state: BirdState,
|
||||
settings: BirdAirSettings,
|
||||
state: BirdAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
@@ -394,8 +394,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
||||
}
|
||||
|
||||
override fun jumpForce(
|
||||
settings: BirdSettings,
|
||||
state: BirdState,
|
||||
settings: BirdAirSettings,
|
||||
state: BirdAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
jumpStrength: Int
|
||||
@@ -404,8 +404,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
||||
}
|
||||
|
||||
override fun gravity(
|
||||
settings: BirdSettings,
|
||||
state: BirdState,
|
||||
settings: BirdAirSettings,
|
||||
state: BirdAirState,
|
||||
vehicle: PokemonEntity,
|
||||
regularGravity: Double
|
||||
): Double {
|
||||
@@ -413,8 +413,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
||||
}
|
||||
|
||||
override fun rideFovMultiplier(
|
||||
settings: BirdSettings,
|
||||
state: BirdState,
|
||||
settings: BirdAirSettings,
|
||||
state: BirdAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
@@ -429,60 +429,60 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
|
||||
}
|
||||
|
||||
override fun useAngVelSmoothing(
|
||||
settings: BirdSettings,
|
||||
state: BirdState,
|
||||
settings: BirdAirSettings,
|
||||
state: BirdAirState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun useRidingAltPose(
|
||||
settings: BirdSettings,
|
||||
state: BirdState,
|
||||
settings: BirdAirSettings,
|
||||
state: BirdAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
return state.gliding.get()
|
||||
}
|
||||
|
||||
override fun inertia(settings: BirdSettings, state: BirdState, vehicle: PokemonEntity): Double {
|
||||
override fun inertia(settings: BirdAirSettings, state: BirdAirState, vehicle: PokemonEntity): Double {
|
||||
return 0.5
|
||||
}
|
||||
|
||||
override fun shouldRoll(settings: BirdSettings, state: BirdState, vehicle: PokemonEntity): Boolean {
|
||||
override fun shouldRoll(settings: BirdAirSettings, state: BirdAirState, vehicle: PokemonEntity): Boolean {
|
||||
return true
|
||||
}
|
||||
|
||||
override fun turnOffOnGround(settings: BirdSettings, state: BirdState, vehicle: PokemonEntity): Boolean {
|
||||
override fun turnOffOnGround(settings: BirdAirSettings, state: BirdAirState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun dismountOnShift(settings: BirdSettings, state: BirdState, vehicle: PokemonEntity): Boolean {
|
||||
override fun dismountOnShift(settings: BirdAirSettings, state: BirdAirState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun shouldRotatePokemonHead(
|
||||
settings: BirdSettings,
|
||||
state: BirdState,
|
||||
settings: BirdAirSettings,
|
||||
state: BirdAirState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun shouldRotatePlayerHead(
|
||||
settings: BirdSettings,
|
||||
state: BirdState,
|
||||
settings: BirdAirSettings,
|
||||
state: BirdAirState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun createDefaultState(settings: BirdSettings) = BirdState()
|
||||
override fun createDefaultState(settings: BirdAirSettings) = BirdAirState()
|
||||
|
||||
}
|
||||
|
||||
class BirdSettings : RidingBehaviourSettings {
|
||||
override val key = BirdBehaviour.KEY
|
||||
class BirdAirSettings : RidingBehaviourSettings {
|
||||
override val key = BirdAirBehaviour.KEY
|
||||
|
||||
var infiniteAltitude: Expression = "false".asExpression()
|
||||
private set
|
||||
@@ -524,7 +524,7 @@ class BirdSettings : RidingBehaviourSettings {
|
||||
}
|
||||
}
|
||||
|
||||
class BirdState : RidingBehaviourState() {
|
||||
class BirdAirState : RidingBehaviourState() {
|
||||
var gliding = ridingState(false, Side.CLIENT)
|
||||
var lastGlide = ridingState(-100L, Side.CLIENT)
|
||||
var currRollCorrectionForce = ridingState(0.0, Side.CLIENT)
|
||||
@@ -548,10 +548,10 @@ class BirdState : RidingBehaviourState() {
|
||||
}
|
||||
|
||||
override fun toString(): String {
|
||||
return "BirdState(rideVelocity=${rideVelocity.get()}, stamina=${stamina.get()}, gliding=${gliding.get()})"
|
||||
return "BirdAirState(rideVelocity=${rideVelocity.get()}, stamina=${stamina.get()}, gliding=${gliding.get()})"
|
||||
}
|
||||
|
||||
override fun copy() = BirdState().also {
|
||||
override fun copy() = BirdAirState().also {
|
||||
it.rideVelocity.set(this.rideVelocity.get(), forced = true)
|
||||
it.stamina.set(this.stamina.get(), forced = true)
|
||||
it.gliding.set(this.gliding.get(), forced = true)
|
||||
@@ -560,7 +560,7 @@ class BirdState : RidingBehaviourState() {
|
||||
}
|
||||
|
||||
override fun shouldSync(previous: RidingBehaviourState): Boolean {
|
||||
if (previous !is BirdState) return false
|
||||
if (previous !is BirdAirState) return false
|
||||
if (previous.gliding.get() != gliding.get()) return true
|
||||
return super.shouldSync(previous)
|
||||
}
|
||||
+3
-6
@@ -6,7 +6,7 @@
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types.liquid
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types
|
||||
|
||||
import com.bedrockk.molang.runtime.value.DoubleValue
|
||||
import com.cobblemon.mod.common.Cobblemon
|
||||
@@ -31,14 +31,11 @@ import kotlin.math.sin
|
||||
|
||||
class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
|
||||
companion object {
|
||||
val KEY = cobblemonResource("liquid/dolphin")
|
||||
val KEY = cobblemonResource("swim/dolphin")
|
||||
}
|
||||
|
||||
override val key = KEY
|
||||
|
||||
override fun getRidingStyle(settings: DolphinSettings, state: DolphinState): RidingStyle {
|
||||
return RidingStyle.LIQUID
|
||||
}
|
||||
override val style = RidingStyle.LIQUID
|
||||
|
||||
val poseProvider = PoseProvider<DolphinSettings, DolphinState>(PoseType.FLOAT)
|
||||
.with(PoseOption(PoseType.SWIM) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })
|
||||
+60
-62
@@ -6,9 +6,10 @@
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types.land
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types
|
||||
|
||||
import com.bedrockk.molang.Expression
|
||||
import com.bedrockk.molang.runtime.MoLangMath.lerp
|
||||
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
|
||||
@@ -26,25 +27,22 @@ import net.minecraft.world.phys.Vec3
|
||||
import net.minecraft.world.phys.shapes.Shapes
|
||||
import kotlin.math.*
|
||||
|
||||
class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandState> {
|
||||
companion object {
|
||||
val KEY = cobblemonResource("land/horse")
|
||||
val KEY = cobblemonResource("land/generic")
|
||||
}
|
||||
|
||||
override val key = KEY
|
||||
override val style = RidingStyle.LAND
|
||||
|
||||
override fun getRidingStyle(settings: HorseSettings, state: HorseState): RidingStyle {
|
||||
return RidingStyle.LAND
|
||||
}
|
||||
|
||||
val poseProvider = PoseProvider<HorseSettings, HorseState>(PoseType.STAND)
|
||||
val poseProvider = PoseProvider<GenericLandSettings, GenericLandState>(PoseType.STAND)
|
||||
.with(PoseOption(PoseType.WALK) { _, state, _ ->
|
||||
return@PoseOption abs(state.rideVelocity.get().z) > 0.2
|
||||
})
|
||||
|
||||
override fun isActive(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return Shapes.create(vehicle.boundingBox).blockPositionsAsListRounded().any {
|
||||
@@ -62,16 +60,16 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
}
|
||||
|
||||
override fun pose(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity
|
||||
): PoseType {
|
||||
return this.poseProvider.select(settings, state, vehicle)
|
||||
}
|
||||
|
||||
override fun speed(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
@@ -79,8 +77,8 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
}
|
||||
|
||||
override fun updatePassengerRotation(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
) {
|
||||
@@ -105,8 +103,8 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
}
|
||||
|
||||
override fun clampPassengerRotation(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
) {
|
||||
@@ -120,8 +118,8 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
|
||||
|
||||
override fun rotation(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
): Vec2 {
|
||||
@@ -138,8 +136,8 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
* without it being instant.
|
||||
*/
|
||||
fun calcRotAmount(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
): Float {
|
||||
@@ -172,8 +170,8 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
|
||||
|
||||
override fun velocity(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
input: Vec3
|
||||
@@ -201,8 +199,8 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
}
|
||||
|
||||
private fun calculateRideSpaceVel(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Vec3 {
|
||||
@@ -272,8 +270,8 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
}
|
||||
|
||||
override fun angRollVel(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
deltaTime: Double
|
||||
@@ -282,8 +280,8 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
}
|
||||
|
||||
override fun rotationOnMouseXY(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
mouseY: Double,
|
||||
@@ -303,8 +301,8 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
}
|
||||
|
||||
override fun canJump(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
@@ -312,8 +310,8 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
}
|
||||
|
||||
override fun setRideBar(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
@@ -322,8 +320,8 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
}
|
||||
|
||||
override fun jumpForce(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
jumpStrength: Int
|
||||
@@ -332,8 +330,8 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
}
|
||||
|
||||
override fun gravity(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity,
|
||||
regularGravity: Double
|
||||
): Double {
|
||||
@@ -341,8 +339,8 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
}
|
||||
|
||||
override fun rideFovMultiplier(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
@@ -350,16 +348,16 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
}
|
||||
|
||||
override fun useAngVelSmoothing(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun useRidingAltPose(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
@@ -367,58 +365,58 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
|
||||
}
|
||||
|
||||
override fun inertia(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity
|
||||
): Double {
|
||||
return 0.5
|
||||
}
|
||||
|
||||
override fun shouldRoll(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun turnOffOnGround(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun dismountOnShift(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun shouldRotatePokemonHead(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun shouldRotatePlayerHead(
|
||||
settings: HorseSettings,
|
||||
state: HorseState,
|
||||
settings: GenericLandSettings,
|
||||
state: GenericLandState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun createDefaultState(settings: HorseSettings) = HorseState()
|
||||
override fun createDefaultState(settings: GenericLandSettings) = GenericLandState()
|
||||
}
|
||||
|
||||
class HorseSettings : RidingBehaviourSettings {
|
||||
override val key = HorseBehaviour.KEY
|
||||
class GenericLandSettings : RidingBehaviourSettings {
|
||||
override val key = GenericLandBehaviour.KEY
|
||||
|
||||
var canJump = "true".asExpression()
|
||||
private set
|
||||
@@ -461,16 +459,16 @@ class HorseSettings : RidingBehaviourSettings {
|
||||
|
||||
}
|
||||
|
||||
class HorseState : RidingBehaviourState() {
|
||||
class GenericLandState : RidingBehaviourState() {
|
||||
var currSpeed = ridingState(0.0, Side.BOTH)
|
||||
|
||||
override fun copy() = HorseState().also {
|
||||
override fun copy() = GenericLandState().also {
|
||||
it.rideVelocity.set(this.rideVelocity.get(), forced = true)
|
||||
it.stamina.set(this.stamina.get(), forced = true)
|
||||
}
|
||||
|
||||
override fun shouldSync(previous: RidingBehaviourState): Boolean {
|
||||
if (previous !is HorseState) return false
|
||||
if (previous !is GenericLandState) return false
|
||||
return super.shouldSync(previous)
|
||||
}
|
||||
}
|
||||
+264
@@ -0,0 +1,264 @@
|
||||
/*
|
||||
* 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
|
||||
|
||||
import com.bedrockk.molang.runtime.value.DoubleValue
|
||||
import com.cobblemon.mod.common.Cobblemon
|
||||
import com.cobblemon.mod.common.OrientationControllable
|
||||
import com.cobblemon.mod.common.api.riding.RidingStyle
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
|
||||
import com.cobblemon.mod.common.api.riding.posing.PoseOption
|
||||
import com.cobblemon.mod.common.api.riding.posing.PoseProvider
|
||||
import com.cobblemon.mod.common.entity.PoseType
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.cobblemon.mod.common.util.*
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
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 net.minecraft.world.phys.shapes.Shapes
|
||||
|
||||
class GenericSwimBehaviour : RidingBehaviour<GenericSwimSettings, RidingBehaviourState> {
|
||||
companion object {
|
||||
val KEY = cobblemonResource("swim/generic")
|
||||
}
|
||||
|
||||
override val key = KEY
|
||||
override val style = RidingStyle.LIQUID
|
||||
|
||||
val poseProvider = PoseProvider<GenericSwimSettings, RidingBehaviourState>(PoseType.FLOAT)
|
||||
.with(PoseOption(PoseType.SWIM) { _, _, entity -> entity.isSwimming && entity.entityData.get(PokemonEntity.MOVING) })
|
||||
|
||||
override fun isActive(settings: GenericSwimSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
return Shapes.create(vehicle.boundingBox).blockPositionsAsListRounded().any {
|
||||
if (vehicle.isInWater || vehicle.isUnderWater) {
|
||||
return@any true
|
||||
}
|
||||
val blockState = vehicle.level().getBlockState(it)
|
||||
return@any !blockState.fluidState.isEmpty
|
||||
}
|
||||
}
|
||||
|
||||
override fun pose(settings: GenericSwimSettings, state: RidingBehaviourState, vehicle: PokemonEntity): PoseType {
|
||||
return poseProvider.select(settings, state, vehicle)
|
||||
}
|
||||
|
||||
override fun speed(settings: GenericSwimSettings, state: RidingBehaviourState, vehicle: PokemonEntity, driver: Player): Float {
|
||||
return vehicle.runtime.resolveFloat(settings.speed)
|
||||
}
|
||||
|
||||
override fun rotation(
|
||||
settings: GenericSwimSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
): Vec2 {
|
||||
return Vec2(driver.xRot * 0.5f, driver.yRot)
|
||||
}
|
||||
|
||||
override fun velocity(
|
||||
settings: GenericSwimSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
input: Vec3
|
||||
): Vec3 {
|
||||
val runtime = vehicle.runtime
|
||||
val driveFactor = runtime.resolveFloat(settings.driveFactor)
|
||||
val strafeFactor = runtime.resolveFloat(settings.strafeFactor)
|
||||
val f = driver.xxa * strafeFactor
|
||||
var g = driver.zza * driveFactor
|
||||
if (g <= 0.0f) {
|
||||
g *= runtime.resolveFloat(settings.reverseDriveFactor)
|
||||
}
|
||||
|
||||
val velocity = Vec3(f.toDouble(), 0.0, g.toDouble())
|
||||
|
||||
return velocity
|
||||
}
|
||||
|
||||
override fun angRollVel(
|
||||
settings: GenericSwimSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
deltaTime: Double
|
||||
): Vec3 {
|
||||
return Vec3.ZERO
|
||||
}
|
||||
|
||||
override fun rotationOnMouseXY(
|
||||
settings: GenericSwimSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
mouseY: Double,
|
||||
mouseX: Double,
|
||||
mouseYSmoother: SmoothDouble,
|
||||
mouseXSmoother: SmoothDouble,
|
||||
sensitivity: Double,
|
||||
deltaTime: Double
|
||||
): Vec3 {
|
||||
if (driver !is OrientationControllable) return Vec3.ZERO
|
||||
|
||||
//Might need to add the smoothing here for default.
|
||||
val invertRoll = if (Cobblemon.config.invertRoll) -1 else 1
|
||||
val invertPitch = if (Cobblemon.config.invertPitch) -1 else 1
|
||||
return Vec3(0.0, mouseY * invertPitch, mouseX * invertRoll)
|
||||
}
|
||||
|
||||
override fun canJump(
|
||||
settings: GenericSwimSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
return vehicle.runtime.resolveBoolean(settings.canJump)
|
||||
}
|
||||
|
||||
override fun setRideBar(
|
||||
settings: GenericSwimSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
return 0.0f
|
||||
}
|
||||
|
||||
override fun jumpForce(
|
||||
settings: GenericSwimSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
jumpStrength: Int
|
||||
): Vec3 {
|
||||
val runtime = vehicle.runtime
|
||||
runtime.environment.query.addFunction("jump_strength") { DoubleValue(jumpStrength.toDouble()) }
|
||||
val jumpVector = settings.jumpVector.map { runtime.resolveFloat(it) }
|
||||
return Vec3(jumpVector[0].toDouble(), jumpVector[1].toDouble(), jumpVector[2].toDouble())
|
||||
}
|
||||
|
||||
override fun gravity(
|
||||
settings: GenericSwimSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
regularGravity: Double
|
||||
): Double {
|
||||
return regularGravity
|
||||
}
|
||||
|
||||
override fun rideFovMultiplier(
|
||||
settings: GenericSwimSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
return 1.0f
|
||||
}
|
||||
|
||||
override fun useAngVelSmoothing(settings: GenericSwimSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun useRidingAltPose(
|
||||
settings: GenericSwimSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun inertia(settings: GenericSwimSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Double {
|
||||
return 0.5
|
||||
}
|
||||
|
||||
override fun shouldRoll(settings: GenericSwimSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun turnOffOnGround(settings: GenericSwimSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun dismountOnShift(settings: GenericSwimSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun shouldRotatePokemonHead(
|
||||
settings: GenericSwimSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun shouldRotatePlayerHead(
|
||||
settings: GenericSwimSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun createDefaultState(settings: GenericSwimSettings) = RidingBehaviourState()
|
||||
|
||||
}
|
||||
|
||||
class GenericSwimSettings : RidingBehaviourSettings {
|
||||
override val key = GenericSwimBehaviour.KEY
|
||||
|
||||
var canJump = "true".asExpression()
|
||||
private set
|
||||
|
||||
var jumpVector = listOf("0".asExpression(), "0.3".asExpression(), "0".asExpression())
|
||||
private set
|
||||
|
||||
var speed = "1.0".asExpression()
|
||||
private set
|
||||
|
||||
var driveFactor = "1.0".asExpression()
|
||||
private set
|
||||
|
||||
var reverseDriveFactor = "0.25".asExpression()
|
||||
private set
|
||||
|
||||
var strafeFactor = "0.2".asExpression()
|
||||
private set
|
||||
|
||||
override fun encode(buffer: RegistryFriendlyByteBuf) {
|
||||
buffer.writeResourceLocation(key)
|
||||
buffer.writeExpression(canJump)
|
||||
buffer.writeExpression(jumpVector[0])
|
||||
buffer.writeExpression(jumpVector[1])
|
||||
buffer.writeExpression(jumpVector[2])
|
||||
buffer.writeExpression(speed)
|
||||
buffer.writeExpression(driveFactor)
|
||||
buffer.writeExpression(reverseDriveFactor)
|
||||
buffer.writeExpression(strafeFactor)
|
||||
}
|
||||
|
||||
override fun decode(buffer: RegistryFriendlyByteBuf) {
|
||||
canJump = buffer.readExpression()
|
||||
jumpVector = listOf(
|
||||
buffer.readExpression(),
|
||||
buffer.readExpression(),
|
||||
buffer.readExpression()
|
||||
)
|
||||
speed = buffer.readExpression()
|
||||
driveFactor = buffer.readExpression()
|
||||
reverseDriveFactor = buffer.readExpression()
|
||||
strafeFactor = buffer.readExpression()
|
||||
}
|
||||
}
|
||||
+28
-30
@@ -6,7 +6,7 @@
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types.air
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types
|
||||
|
||||
import com.bedrockk.molang.Expression
|
||||
import com.cobblemon.mod.common.Cobblemon
|
||||
@@ -22,40 +22,38 @@ import com.cobblemon.mod.common.entity.PoseType
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.cobblemon.mod.common.util.*
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
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
|
||||
|
||||
class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
|
||||
class GliderAirBehaviour : RidingBehaviour<GliderAirSettings, RidingBehaviourState> {
|
||||
companion object {
|
||||
val KEY = cobblemonResource("air/glider")
|
||||
}
|
||||
|
||||
override val key = KEY
|
||||
override val style = RidingStyle.AIR
|
||||
|
||||
override fun getRidingStyle(settings: GliderSettings, state: RidingBehaviourState): RidingStyle {
|
||||
return RidingStyle.AIR
|
||||
}
|
||||
|
||||
val poseProvider = PoseProvider<GliderSettings, RidingBehaviourState>(PoseType.HOVER)
|
||||
val poseProvider = PoseProvider<GliderAirSettings, RidingBehaviourState>(PoseType.HOVER)
|
||||
.with(PoseOption(PoseType.FLY) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })
|
||||
|
||||
override fun isActive(settings: GliderSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
override fun isActive(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
return true
|
||||
}
|
||||
|
||||
override fun pose(settings: GliderSettings, state: RidingBehaviourState, vehicle: PokemonEntity): PoseType {
|
||||
override fun pose(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): PoseType {
|
||||
return poseProvider.select(settings, state, vehicle)
|
||||
}
|
||||
|
||||
override fun speed(settings: GliderSettings, state: RidingBehaviourState, vehicle: PokemonEntity, driver: Player): Float {
|
||||
override fun speed(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity, driver: Player): Float {
|
||||
return vehicle.runtime.resolveFloat(settings.speed)
|
||||
}
|
||||
|
||||
override fun rotation(
|
||||
settings: GliderSettings,
|
||||
settings: GliderAirSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
@@ -64,7 +62,7 @@ class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
|
||||
}
|
||||
|
||||
override fun velocity(
|
||||
settings: GliderSettings,
|
||||
settings: GliderAirSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
@@ -79,7 +77,7 @@ class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
|
||||
}
|
||||
|
||||
override fun angRollVel(
|
||||
settings: GliderSettings,
|
||||
settings: GliderAirSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
@@ -89,7 +87,7 @@ class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
|
||||
}
|
||||
|
||||
override fun rotationOnMouseXY(
|
||||
settings: GliderSettings,
|
||||
settings: GliderAirSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
@@ -108,12 +106,12 @@ class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
|
||||
return Vec3(0.0, mouseY * invertPitch, mouseX * invertRoll)
|
||||
}
|
||||
|
||||
override fun canJump(settings: GliderSettings, state: RidingBehaviourState, vehicle: PokemonEntity, driver: Player): Boolean {
|
||||
override fun canJump(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity, driver: Player): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun setRideBar(
|
||||
settings: GliderSettings,
|
||||
settings: GliderAirSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
@@ -122,7 +120,7 @@ class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
|
||||
}
|
||||
|
||||
override fun jumpForce(
|
||||
settings: GliderSettings,
|
||||
settings: GliderAirSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
@@ -132,7 +130,7 @@ class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
|
||||
}
|
||||
|
||||
override fun gravity(
|
||||
settings: GliderSettings,
|
||||
settings: GliderAirSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
regularGravity: Double
|
||||
@@ -141,7 +139,7 @@ class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
|
||||
}
|
||||
|
||||
override fun rideFovMultiplier(
|
||||
settings: GliderSettings,
|
||||
settings: GliderAirSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
@@ -149,12 +147,12 @@ class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
|
||||
return 1.0f
|
||||
}
|
||||
|
||||
override fun useAngVelSmoothing(settings: GliderSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
override fun useAngVelSmoothing(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun useRidingAltPose(
|
||||
settings: GliderSettings,
|
||||
settings: GliderAirSettings,
|
||||
state: RidingBehaviourState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
@@ -162,35 +160,35 @@ class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun inertia(settings: GliderSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Double {
|
||||
override fun inertia(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Double {
|
||||
return 0.5
|
||||
}
|
||||
|
||||
override fun shouldRoll(settings: GliderSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
override fun shouldRoll(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun turnOffOnGround(settings: GliderSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
override fun turnOffOnGround(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun dismountOnShift(settings: GliderSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
override fun dismountOnShift(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun shouldRotatePokemonHead(settings: GliderSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
override fun shouldRotatePokemonHead(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun shouldRotatePlayerHead(settings: GliderSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
override fun shouldRotatePlayerHead(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun createDefaultState(settings: GliderSettings) = RidingBehaviourState()
|
||||
override fun createDefaultState(settings: GliderAirSettings) = RidingBehaviourState()
|
||||
}
|
||||
|
||||
class GliderSettings : RidingBehaviourSettings {
|
||||
override val key = GliderBehaviour.KEY
|
||||
class GliderAirSettings : RidingBehaviourSettings {
|
||||
override val key = GliderAirBehaviour.KEY
|
||||
|
||||
var glideSpeed: Expression = "0.1".asExpression()
|
||||
private set
|
||||
+3
-5
@@ -6,7 +6,7 @@
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types.air
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types
|
||||
|
||||
import com.bedrockk.molang.Expression
|
||||
import com.cobblemon.mod.common.Cobblemon
|
||||
@@ -21,6 +21,7 @@ import com.cobblemon.mod.common.entity.PoseType
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.cobblemon.mod.common.util.*
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
import net.minecraft.util.SmoothDouble
|
||||
import net.minecraft.world.entity.LivingEntity
|
||||
import net.minecraft.world.entity.player.Player
|
||||
@@ -38,10 +39,7 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS
|
||||
}
|
||||
|
||||
override val key = KEY
|
||||
|
||||
override fun getRidingStyle(settings: HelicopterSettings, state: RidingBehaviourState): RidingStyle {
|
||||
return RidingStyle.AIR
|
||||
}
|
||||
override val style = RidingStyle.AIR
|
||||
|
||||
val poseProvider = PoseProvider<HelicopterSettings, RidingBehaviourState>(PoseType.HOVER)
|
||||
.with(PoseOption(PoseType.FLY) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })
|
||||
+3
-5
@@ -6,9 +6,10 @@
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types.air
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types
|
||||
|
||||
import com.bedrockk.molang.Expression
|
||||
import com.bedrockk.molang.runtime.MoLangMath.lerp
|
||||
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
|
||||
@@ -32,10 +33,7 @@ class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
|
||||
}
|
||||
|
||||
override val key = KEY
|
||||
|
||||
override fun getRidingStyle(settings: HoverSettings, state: HoverState): RidingStyle {
|
||||
return RidingStyle.AIR
|
||||
}
|
||||
override val style = RidingStyle.AIR
|
||||
|
||||
val poseProvider = PoseProvider<HoverSettings, HoverState>(PoseType.STAND)
|
||||
.with(PoseOption(PoseType.WALK) { _, state, _ ->
|
||||
+44
-46
@@ -6,7 +6,7 @@
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types.air
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types
|
||||
|
||||
import com.bedrockk.molang.Expression
|
||||
import com.cobblemon.mod.common.Cobblemon
|
||||
@@ -20,6 +20,7 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.cobblemon.mod.common.util.*
|
||||
import net.minecraft.network.FriendlyByteBuf
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
import net.minecraft.util.SmoothDouble
|
||||
import net.minecraft.world.entity.LivingEntity
|
||||
import net.minecraft.world.entity.player.Player
|
||||
@@ -28,21 +29,18 @@ import net.minecraft.world.phys.Vec3
|
||||
import net.minecraft.world.phys.shapes.Shapes
|
||||
import kotlin.math.*
|
||||
|
||||
class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
||||
class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {
|
||||
companion object {
|
||||
val KEY = cobblemonResource("air/jet")
|
||||
}
|
||||
|
||||
override val key = KEY
|
||||
override val style = RidingStyle.AIR
|
||||
|
||||
override fun getRidingStyle(settings: JetSettings, state: JetState): RidingStyle {
|
||||
return RidingStyle.AIR
|
||||
}
|
||||
|
||||
val poseProvider = PoseProvider<JetSettings, JetState>(PoseType.HOVER)
|
||||
val poseProvider = PoseProvider<JetAirSettings, JetAirState>(PoseType.HOVER)
|
||||
.with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVelocity.get().z > 0.1 })
|
||||
|
||||
override fun isActive(settings: JetSettings, state: JetState, vehicle: PokemonEntity): Boolean {
|
||||
override fun isActive(settings: JetAirSettings, state: JetAirState, vehicle: PokemonEntity): Boolean {
|
||||
return Shapes.create(vehicle.boundingBox).blockPositionsAsListRounded().any {
|
||||
//Need to check other fluids
|
||||
if (vehicle.isInWater || vehicle.isUnderWater) {
|
||||
@@ -57,11 +55,11 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
||||
}
|
||||
}
|
||||
|
||||
override fun pose(settings: JetSettings, state: JetState, vehicle: PokemonEntity): PoseType {
|
||||
override fun pose(settings: JetAirSettings, state: JetAirState, vehicle: PokemonEntity): PoseType {
|
||||
return poseProvider.select(settings, state, vehicle)
|
||||
}
|
||||
|
||||
override fun speed(settings: JetSettings, state: JetState, vehicle: PokemonEntity, driver: Player): Float {
|
||||
override fun speed(settings: JetAirSettings, state: JetAirState, vehicle: PokemonEntity, driver: Player): Float {
|
||||
//retrieve stats
|
||||
val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
|
||||
val staminaStat = vehicle.runtime.resolveDouble(settings.staminaExpr)
|
||||
@@ -102,8 +100,8 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
||||
}
|
||||
|
||||
override fun rotation(
|
||||
settings: JetSettings,
|
||||
state: JetState,
|
||||
settings: JetAirSettings,
|
||||
state: JetAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
): Vec2 {
|
||||
@@ -111,8 +109,8 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
||||
}
|
||||
|
||||
override fun velocity(
|
||||
settings: JetSettings,
|
||||
state: JetState,
|
||||
settings: JetAirSettings,
|
||||
state: JetAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
input: Vec3
|
||||
@@ -151,8 +149,8 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
||||
* Calculates the change in the ride space vector due to player input and ride state
|
||||
*/
|
||||
private fun calculateRideSpaceVel(
|
||||
settings: JetSettings,
|
||||
state: JetState,
|
||||
settings: JetAirSettings,
|
||||
state: JetAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
) {
|
||||
@@ -184,8 +182,8 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
||||
}
|
||||
|
||||
override fun angRollVel(
|
||||
settings: JetSettings,
|
||||
state: JetState,
|
||||
settings: JetAirSettings,
|
||||
state: JetAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
deltaTime: Double
|
||||
@@ -209,8 +207,8 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
||||
}
|
||||
|
||||
override fun rotationOnMouseXY(
|
||||
settings: JetSettings,
|
||||
state: JetState,
|
||||
settings: JetAirSettings,
|
||||
state: JetAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
mouseY: Double,
|
||||
@@ -264,8 +262,8 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
||||
}
|
||||
|
||||
override fun canJump(
|
||||
settings: JetSettings,
|
||||
state: JetState,
|
||||
settings: JetAirSettings,
|
||||
state: JetAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
@@ -273,8 +271,8 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
||||
}
|
||||
|
||||
override fun setRideBar(
|
||||
settings: JetSettings,
|
||||
state: JetState,
|
||||
settings: JetAirSettings,
|
||||
state: JetAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
@@ -282,8 +280,8 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
||||
}
|
||||
|
||||
override fun jumpForce(
|
||||
settings: JetSettings,
|
||||
state: JetState,
|
||||
settings: JetAirSettings,
|
||||
state: JetAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
jumpStrength: Int
|
||||
@@ -292,8 +290,8 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
||||
}
|
||||
|
||||
override fun gravity(
|
||||
settings: JetSettings,
|
||||
state: JetState,
|
||||
settings: JetAirSettings,
|
||||
state: JetAirState,
|
||||
vehicle: PokemonEntity,
|
||||
regularGravity: Double
|
||||
): Double {
|
||||
@@ -301,8 +299,8 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
||||
}
|
||||
|
||||
override fun rideFovMultiplier(
|
||||
settings: JetSettings,
|
||||
state: JetState,
|
||||
settings: JetAirSettings,
|
||||
state: JetAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
@@ -317,52 +315,52 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
|
||||
return 1.0f + normalizedSpeed.pow(2).toFloat() * 0.2f
|
||||
}
|
||||
|
||||
override fun useAngVelSmoothing(settings: JetSettings, state: JetState, vehicle: PokemonEntity): Boolean {
|
||||
override fun useAngVelSmoothing(settings: JetAirSettings, state: JetAirState, vehicle: PokemonEntity): Boolean {
|
||||
return true
|
||||
}
|
||||
|
||||
override fun useRidingAltPose(
|
||||
settings: JetSettings,
|
||||
state: JetState,
|
||||
settings: JetAirSettings,
|
||||
state: JetAirState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun inertia(settings: JetSettings, state: JetState, vehicle: PokemonEntity): Double {
|
||||
override fun inertia(settings: JetAirSettings, state: JetAirState, vehicle: PokemonEntity): Double {
|
||||
return 0.5
|
||||
}
|
||||
|
||||
override fun shouldRoll(settings: JetSettings, state: JetState, vehicle: PokemonEntity): Boolean {
|
||||
override fun shouldRoll(settings: JetAirSettings, state: JetAirState, vehicle: PokemonEntity): Boolean {
|
||||
return true
|
||||
}
|
||||
|
||||
override fun turnOffOnGround(settings: JetSettings, state: JetState, vehicle: PokemonEntity): Boolean {
|
||||
override fun turnOffOnGround(settings: JetAirSettings, state: JetAirState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun dismountOnShift(settings: JetSettings, state: JetState, vehicle: PokemonEntity): Boolean {
|
||||
override fun dismountOnShift(settings: JetAirSettings, state: JetAirState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun shouldRotatePokemonHead(
|
||||
settings: JetSettings,
|
||||
state: JetState,
|
||||
settings: JetAirSettings,
|
||||
state: JetAirState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun shouldRotatePlayerHead(settings: JetSettings, state: JetState, vehicle: PokemonEntity): Boolean {
|
||||
override fun shouldRotatePlayerHead(settings: JetAirSettings, state: JetAirState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun createDefaultState(settings: JetSettings) = JetState()
|
||||
override fun createDefaultState(settings: JetAirSettings) = JetAirState()
|
||||
}
|
||||
|
||||
class JetSettings : RidingBehaviourSettings {
|
||||
override val key = JetBehaviour.KEY
|
||||
class JetAirSettings : RidingBehaviourSettings {
|
||||
override val key = JetAirBehaviour.KEY
|
||||
|
||||
var gravity: Expression = "0".asExpression()
|
||||
private set
|
||||
@@ -419,7 +417,7 @@ class JetSettings : RidingBehaviourSettings {
|
||||
}
|
||||
}
|
||||
|
||||
class JetState : RidingBehaviourState() {
|
||||
class JetAirState : RidingBehaviourState() {
|
||||
var currSpeed = ridingState(0.0, Side.CLIENT)
|
||||
var currMouseXForce = ridingState(0.0, Side.CLIENT)
|
||||
var currMouseYForce = ridingState(0.0, Side.CLIENT)
|
||||
@@ -442,7 +440,7 @@ class JetState : RidingBehaviourState() {
|
||||
currMouseYForce.set(0.0, forced = true)
|
||||
}
|
||||
|
||||
override fun copy() = JetState().also {
|
||||
override fun copy() = JetAirState().also {
|
||||
it.currSpeed.set(currSpeed.get(), forced = true)
|
||||
it.stamina.set(stamina.get(), forced = true)
|
||||
it.rideVelocity.set(rideVelocity.get(), forced = true)
|
||||
@@ -451,7 +449,7 @@ class JetState : RidingBehaviourState() {
|
||||
}
|
||||
|
||||
override fun shouldSync(previous: RidingBehaviourState): Boolean {
|
||||
if (previous !is JetState) return false
|
||||
if (previous !is JetAirState) return false
|
||||
if (previous.currSpeed != currSpeed) return true
|
||||
return super.shouldSync(previous)
|
||||
}
|
||||
+45
-47
@@ -6,7 +6,7 @@
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types.liquid
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types
|
||||
|
||||
import com.cobblemon.mod.common.Cobblemon
|
||||
import com.cobblemon.mod.common.OrientationControllable
|
||||
@@ -19,6 +19,7 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.cobblemon.mod.common.util.blockPositionsAsListRounded
|
||||
import com.cobblemon.mod.common.util.cobblemonResource
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
import net.minecraft.util.SmoothDouble
|
||||
import net.minecraft.world.entity.LivingEntity
|
||||
import net.minecraft.world.entity.player.Player
|
||||
@@ -26,22 +27,19 @@ import net.minecraft.world.phys.Vec2
|
||||
import net.minecraft.world.phys.Vec3
|
||||
import net.minecraft.world.phys.shapes.Shapes
|
||||
|
||||
class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
|
||||
class SwimDashBehaviour : RidingBehaviour<SwimDashSettings, SwimDashState> {
|
||||
companion object {
|
||||
val KEY = cobblemonResource("liquid/burst")
|
||||
val KEY = cobblemonResource("swim/dash")
|
||||
const val DASH_TICKS: Int = 60
|
||||
}
|
||||
|
||||
override val key = KEY
|
||||
override val style = RidingStyle.LIQUID
|
||||
|
||||
override fun getRidingStyle(settings: BurstSettings, state: BurstState): RidingStyle {
|
||||
return RidingStyle.LIQUID
|
||||
}
|
||||
|
||||
val poseProvider = PoseProvider<BurstSettings, BurstState>(PoseType.FLOAT)
|
||||
val poseProvider = PoseProvider<SwimDashSettings, SwimDashState>(PoseType.FLOAT)
|
||||
.with(PoseOption(PoseType.SWIM) { _, _, entity -> entity.isSwimming && entity.entityData.get(PokemonEntity.MOVING) })
|
||||
|
||||
override fun isActive(settings: BurstSettings, state: BurstState, vehicle: PokemonEntity): Boolean {
|
||||
override fun isActive(settings: SwimDashSettings, state: SwimDashState, vehicle: PokemonEntity): Boolean {
|
||||
//This could be kinda weird... what if the top of the mon is in a fluid but the bottom isnt?
|
||||
return Shapes.create(vehicle.boundingBox).blockPositionsAsListRounded().any {
|
||||
if (vehicle.isInWater || vehicle.isUnderWater) {
|
||||
@@ -52,13 +50,13 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
|
||||
}
|
||||
}
|
||||
|
||||
override fun pose(settings: BurstSettings, state: BurstState, vehicle: PokemonEntity): PoseType {
|
||||
override fun pose(settings: SwimDashSettings, state: SwimDashState, vehicle: PokemonEntity): PoseType {
|
||||
return poseProvider.select(settings, state, vehicle)
|
||||
}
|
||||
|
||||
override fun speed(
|
||||
settings: BurstSettings,
|
||||
state: BurstState,
|
||||
settings: SwimDashSettings,
|
||||
state: SwimDashState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
@@ -76,8 +74,8 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
|
||||
}
|
||||
|
||||
override fun rotation(
|
||||
settings: BurstSettings,
|
||||
state: BurstState,
|
||||
settings: SwimDashSettings,
|
||||
state: SwimDashState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
): Vec2 {
|
||||
@@ -85,8 +83,8 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
|
||||
}
|
||||
|
||||
override fun velocity(
|
||||
settings: BurstSettings,
|
||||
state: BurstState,
|
||||
settings: SwimDashSettings,
|
||||
state: SwimDashState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
input: Vec3
|
||||
@@ -101,8 +99,8 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
|
||||
}
|
||||
|
||||
override fun angRollVel(
|
||||
settings: BurstSettings,
|
||||
state: BurstState,
|
||||
settings: SwimDashSettings,
|
||||
state: SwimDashState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
deltaTime: Double
|
||||
@@ -111,8 +109,8 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
|
||||
}
|
||||
|
||||
override fun rotationOnMouseXY(
|
||||
settings: BurstSettings,
|
||||
state: BurstState,
|
||||
settings: SwimDashSettings,
|
||||
state: SwimDashState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
mouseY: Double,
|
||||
@@ -131,8 +129,8 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
|
||||
}
|
||||
|
||||
override fun canJump(
|
||||
settings: BurstSettings,
|
||||
state: BurstState,
|
||||
settings: SwimDashSettings,
|
||||
state: SwimDashState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
@@ -140,8 +138,8 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
|
||||
}
|
||||
|
||||
override fun setRideBar(
|
||||
settings: BurstSettings,
|
||||
state: BurstState,
|
||||
settings: SwimDashSettings,
|
||||
state: SwimDashState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
@@ -149,8 +147,8 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
|
||||
}
|
||||
|
||||
override fun jumpForce(
|
||||
settings: BurstSettings,
|
||||
state: BurstState,
|
||||
settings: SwimDashSettings,
|
||||
state: SwimDashState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
jumpStrength: Int
|
||||
@@ -159,8 +157,8 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
|
||||
}
|
||||
|
||||
override fun gravity(
|
||||
settings: BurstSettings,
|
||||
state: BurstState,
|
||||
settings: SwimDashSettings,
|
||||
state: SwimDashState,
|
||||
vehicle: PokemonEntity,
|
||||
regularGravity: Double
|
||||
): Double {
|
||||
@@ -168,64 +166,64 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
|
||||
}
|
||||
|
||||
override fun rideFovMultiplier(
|
||||
settings: BurstSettings,
|
||||
state: BurstState,
|
||||
settings: SwimDashSettings,
|
||||
state: SwimDashState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
return 1.0f
|
||||
}
|
||||
|
||||
override fun useAngVelSmoothing(settings: BurstSettings, state: BurstState, vehicle: PokemonEntity): Boolean {
|
||||
override fun useAngVelSmoothing(settings: SwimDashSettings, state: SwimDashState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun useRidingAltPose(
|
||||
settings: BurstSettings,
|
||||
state: BurstState,
|
||||
settings: SwimDashSettings,
|
||||
state: SwimDashState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun inertia(settings: BurstSettings, state: BurstState, vehicle: PokemonEntity): Double {
|
||||
override fun inertia(settings: SwimDashSettings, state: SwimDashState, vehicle: PokemonEntity): Double {
|
||||
return 0.5
|
||||
}
|
||||
|
||||
override fun shouldRoll(settings: BurstSettings, state: BurstState, vehicle: PokemonEntity): Boolean {
|
||||
override fun shouldRoll(settings: SwimDashSettings, state: SwimDashState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun turnOffOnGround(settings: BurstSettings, state: BurstState, vehicle: PokemonEntity): Boolean {
|
||||
override fun turnOffOnGround(settings: SwimDashSettings, state: SwimDashState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun dismountOnShift(settings: BurstSettings, state: BurstState, vehicle: PokemonEntity): Boolean {
|
||||
override fun dismountOnShift(settings: SwimDashSettings, state: SwimDashState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun shouldRotatePokemonHead(
|
||||
settings: BurstSettings,
|
||||
state: BurstState,
|
||||
settings: SwimDashSettings,
|
||||
state: SwimDashState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun shouldRotatePlayerHead(
|
||||
settings: BurstSettings,
|
||||
state: BurstState,
|
||||
settings: SwimDashSettings,
|
||||
state: SwimDashState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun createDefaultState(settings: BurstSettings) = BurstState()
|
||||
override fun createDefaultState(settings: SwimDashSettings) = SwimDashState()
|
||||
}
|
||||
|
||||
class BurstSettings : RidingBehaviourSettings {
|
||||
override val key = BurstBehaviour.KEY
|
||||
class SwimDashSettings : RidingBehaviourSettings {
|
||||
override val key = SwimDashBehaviour.KEY
|
||||
|
||||
var dashSpeed = 1F
|
||||
private set
|
||||
@@ -240,7 +238,7 @@ class BurstSettings : RidingBehaviourSettings {
|
||||
}
|
||||
}
|
||||
|
||||
class BurstState : RidingBehaviourState() {
|
||||
class SwimDashState : RidingBehaviourState() {
|
||||
var dashing = ridingState(false, Side.BOTH)
|
||||
var ticks = ridingState(0, Side.BOTH)
|
||||
|
||||
@@ -251,10 +249,10 @@ class BurstState : RidingBehaviourState() {
|
||||
}
|
||||
|
||||
override fun toString(): String {
|
||||
return "BurstState(dashing=${dashing.get()}, ticks=${ticks.get()})"
|
||||
return "SwimDashState(dashing=${dashing.get()}, ticks=${ticks.get()})"
|
||||
}
|
||||
|
||||
override fun copy() = BurstState().also {
|
||||
override fun copy() = SwimDashState().also {
|
||||
it.rideVelocity.set(rideVelocity.get(), forced = true)
|
||||
it.stamina.set(stamina.get(), forced = true)
|
||||
it.dashing.set(dashing.get(), forced = true)
|
||||
+47
-49
@@ -6,7 +6,7 @@
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types.land
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types
|
||||
|
||||
import com.bedrockk.molang.runtime.value.DoubleValue
|
||||
import com.cobblemon.mod.common.Cobblemon
|
||||
@@ -20,6 +20,7 @@ import com.cobblemon.mod.common.entity.PoseType
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.cobblemon.mod.common.util.*
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
import net.minecraft.util.SmoothDouble
|
||||
import net.minecraft.world.entity.LivingEntity
|
||||
import net.minecraft.world.entity.player.Player
|
||||
@@ -30,7 +31,7 @@ import kotlin.math.absoluteValue
|
||||
import kotlin.math.max
|
||||
import kotlin.math.min
|
||||
|
||||
class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
|
||||
class VehicleLandBehaviour : RidingBehaviour<VehicleLandSettings, VehicleLandState> {
|
||||
companion object {
|
||||
val KEY = cobblemonResource("land/vehicle")
|
||||
|
||||
@@ -52,15 +53,12 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
|
||||
}
|
||||
|
||||
override val key = KEY
|
||||
override val style = RidingStyle.LAND
|
||||
|
||||
override fun getRidingStyle(settings: VehicleSettings, state: VehicleState): RidingStyle {
|
||||
return RidingStyle.LAND
|
||||
}
|
||||
|
||||
val poseProvider = PoseProvider<VehicleSettings, VehicleState>(PoseType.STAND)
|
||||
val poseProvider = PoseProvider<VehicleLandSettings, VehicleLandState>(PoseType.STAND)
|
||||
.with(PoseOption(PoseType.WALK) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })
|
||||
|
||||
override fun isActive(settings: VehicleSettings, state: VehicleState, vehicle: PokemonEntity): Boolean {
|
||||
override fun isActive(settings: VehicleLandSettings, state: VehicleLandState, vehicle: PokemonEntity): Boolean {
|
||||
return Shapes.create(vehicle.boundingBox).blockPositionsAsListRounded().any {
|
||||
//Need to check other fluids
|
||||
if (vehicle.isInWater || vehicle.isUnderWater) {
|
||||
@@ -75,13 +73,13 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
|
||||
}
|
||||
}
|
||||
|
||||
override fun pose(settings: VehicleSettings, state: VehicleState, vehicle: PokemonEntity): PoseType {
|
||||
override fun pose(settings: VehicleLandSettings, state: VehicleLandState, vehicle: PokemonEntity): PoseType {
|
||||
return poseProvider.select(settings, state, vehicle)
|
||||
}
|
||||
|
||||
override fun speed(
|
||||
settings: VehicleSettings,
|
||||
state: VehicleState,
|
||||
settings: VehicleLandSettings,
|
||||
state: VehicleLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
@@ -100,8 +98,8 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
|
||||
}
|
||||
|
||||
override fun rotation(
|
||||
settings: VehicleSettings,
|
||||
state: VehicleState,
|
||||
settings: VehicleLandSettings,
|
||||
state: VehicleLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
): Vec2 {
|
||||
@@ -112,8 +110,8 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
|
||||
}
|
||||
|
||||
override fun velocity(
|
||||
settings: VehicleSettings,
|
||||
state: VehicleState,
|
||||
settings: VehicleLandSettings,
|
||||
state: VehicleLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
input: Vec3
|
||||
@@ -133,8 +131,8 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
|
||||
}
|
||||
|
||||
override fun angRollVel(
|
||||
settings: VehicleSettings,
|
||||
state: VehicleState,
|
||||
settings: VehicleLandSettings,
|
||||
state: VehicleLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
deltaTime: Double
|
||||
@@ -143,8 +141,8 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
|
||||
}
|
||||
|
||||
override fun rotationOnMouseXY(
|
||||
settings: VehicleSettings,
|
||||
state: VehicleState,
|
||||
settings: VehicleLandSettings,
|
||||
state: VehicleLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
mouseY: Double,
|
||||
@@ -163,8 +161,8 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
|
||||
}
|
||||
|
||||
override fun canJump(
|
||||
settings: VehicleSettings,
|
||||
state: VehicleState,
|
||||
settings: VehicleLandSettings,
|
||||
state: VehicleLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
@@ -172,8 +170,8 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
|
||||
}
|
||||
|
||||
override fun setRideBar(
|
||||
settings: VehicleSettings,
|
||||
state: VehicleState,
|
||||
settings: VehicleLandSettings,
|
||||
state: VehicleLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
@@ -181,8 +179,8 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
|
||||
}
|
||||
|
||||
override fun jumpForce(
|
||||
settings: VehicleSettings,
|
||||
state: VehicleState,
|
||||
settings: VehicleLandSettings,
|
||||
state: VehicleLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
jumpStrength: Int
|
||||
@@ -194,8 +192,8 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
|
||||
}
|
||||
|
||||
override fun gravity(
|
||||
settings: VehicleSettings,
|
||||
state: VehicleState,
|
||||
settings: VehicleLandSettings,
|
||||
state: VehicleLandState,
|
||||
vehicle: PokemonEntity,
|
||||
regularGravity: Double
|
||||
): Double {
|
||||
@@ -203,8 +201,8 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
|
||||
}
|
||||
|
||||
override fun rideFovMultiplier(
|
||||
settings: VehicleSettings,
|
||||
state: VehicleState,
|
||||
settings: VehicleLandSettings,
|
||||
state: VehicleLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
@@ -212,67 +210,67 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
|
||||
}
|
||||
|
||||
override fun useAngVelSmoothing(
|
||||
settings: VehicleSettings,
|
||||
state: VehicleState,
|
||||
settings: VehicleLandSettings,
|
||||
state: VehicleLandState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun useRidingAltPose(
|
||||
settings: VehicleSettings,
|
||||
state: VehicleState,
|
||||
settings: VehicleLandSettings,
|
||||
state: VehicleLandState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun inertia(settings: VehicleSettings, state: VehicleState, vehicle: PokemonEntity): Double {
|
||||
override fun inertia(settings: VehicleLandSettings, state: VehicleLandState, vehicle: PokemonEntity): Double {
|
||||
return 0.5
|
||||
}
|
||||
|
||||
override fun shouldRoll(settings: VehicleSettings, state: VehicleState, vehicle: PokemonEntity): Boolean {
|
||||
override fun shouldRoll(settings: VehicleLandSettings, state: VehicleLandState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun turnOffOnGround(
|
||||
settings: VehicleSettings,
|
||||
state: VehicleState,
|
||||
settings: VehicleLandSettings,
|
||||
state: VehicleLandState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun dismountOnShift(
|
||||
settings: VehicleSettings,
|
||||
state: VehicleState,
|
||||
settings: VehicleLandSettings,
|
||||
state: VehicleLandState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun shouldRotatePokemonHead(
|
||||
settings: VehicleSettings,
|
||||
state: VehicleState,
|
||||
settings: VehicleLandSettings,
|
||||
state: VehicleLandState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun shouldRotatePlayerHead(
|
||||
settings: VehicleSettings,
|
||||
state: VehicleState,
|
||||
settings: VehicleLandSettings,
|
||||
state: VehicleLandState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun createDefaultState(settings: VehicleSettings) = VehicleState()
|
||||
override fun createDefaultState(settings: VehicleLandSettings) = VehicleLandState()
|
||||
}
|
||||
|
||||
class VehicleSettings : RidingBehaviourSettings {
|
||||
override val key = VehicleBehaviour.KEY
|
||||
class VehicleLandSettings : RidingBehaviourSettings {
|
||||
override val key = VehicleLandBehaviour.KEY
|
||||
|
||||
var canJump = "true".asExpression()
|
||||
private set
|
||||
@@ -328,7 +326,7 @@ class VehicleSettings : RidingBehaviourSettings {
|
||||
}
|
||||
}
|
||||
|
||||
class VehicleState : RidingBehaviourState() {
|
||||
class VehicleLandState : RidingBehaviourState() {
|
||||
var currSpeed = ridingState(0.0, Side.BOTH)
|
||||
var deltaRotation = ridingState(Vec2.ZERO, Side.BOTH)
|
||||
|
||||
@@ -339,10 +337,10 @@ class VehicleState : RidingBehaviourState() {
|
||||
}
|
||||
|
||||
override fun toString(): String {
|
||||
return "VehicleState(currSpeed=${currSpeed.get()}, deltaRotation=${deltaRotation.get()})"
|
||||
return "VehicleLandState(currSpeed=${currSpeed.get()}, deltaRotation=${deltaRotation.get()})"
|
||||
}
|
||||
|
||||
override fun copy() = VehicleState().also {
|
||||
override fun copy() = VehicleLandState().also {
|
||||
it.rideVelocity.set(rideVelocity.get(), forced = true)
|
||||
it.stamina.set(stamina.get(), forced = true)
|
||||
it.currSpeed.set(currSpeed.get(), forced = true)
|
||||
+12
-18
@@ -30,14 +30,8 @@ class CompositeBehaviour : RidingBehaviour<CompositeSettings, CompositeState> {
|
||||
}
|
||||
|
||||
override val key = KEY
|
||||
override val style = RidingStyle.COMPOSITE
|
||||
|
||||
override fun getRidingStyle(settings: CompositeSettings, state: CompositeState): RidingStyle {
|
||||
return chooseBehaviour(settings, state) {
|
||||
behaviour, behaviourSettings, behaviourState ->
|
||||
behaviour.getRidingStyle(behaviourSettings, behaviourState)
|
||||
}
|
||||
}
|
||||
|
||||
override fun createDefaultState(settings: CompositeSettings): CompositeState {
|
||||
val defaultBehaviour = RidingBehaviours.get(settings.defaultBehaviour.key)
|
||||
val defaultState = defaultBehaviour.createDefaultState(settings.defaultBehaviour)
|
||||
@@ -57,7 +51,7 @@ class CompositeBehaviour : RidingBehaviour<CompositeSettings, CompositeState> {
|
||||
): T {
|
||||
val defaultBehaviour = RidingBehaviours.get(settings.defaultBehaviour.key)
|
||||
val alternativeBehaviour = RidingBehaviours.get(settings.alternateBehaviour.key)
|
||||
return when (state.activeBehaviour.get()) {
|
||||
return when (state.activeController.get()) {
|
||||
settings.defaultBehaviour.key -> action(
|
||||
defaultBehaviour,
|
||||
settings.defaultBehaviour,
|
||||
@@ -69,7 +63,7 @@ class CompositeBehaviour : RidingBehaviour<CompositeSettings, CompositeState> {
|
||||
state.alternateBehaviourState
|
||||
)
|
||||
|
||||
else -> error("Invalid controller: ${state.activeBehaviour.get()}")
|
||||
else -> error("Invalid controller: ${state.activeController.get()}")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -370,28 +364,28 @@ open class CompositeSettings : RidingBehaviourSettings {
|
||||
}
|
||||
|
||||
class CompositeState(
|
||||
val defaultBehaviour: ResourceLocation,
|
||||
private val defaultBehaviour: ResourceLocation,
|
||||
val defaultBehaviourState: RidingBehaviourState,
|
||||
val alternateBehaviourState: RidingBehaviourState
|
||||
) : RidingBehaviourState() {
|
||||
var activeBehaviour = ridingState(defaultBehaviour, Side.CLIENT)
|
||||
var activeController = ridingState(defaultBehaviour, Side.CLIENT)
|
||||
var lastTransition = ridingState(-100L, Side.BOTH)
|
||||
|
||||
override val rideVelocity: SidedRidingState<Vec3>
|
||||
get() = when (activeBehaviour.get()) {
|
||||
get() = when (activeController.get()) {
|
||||
defaultBehaviour -> defaultBehaviourState.rideVelocity
|
||||
else -> alternateBehaviourState.rideVelocity
|
||||
}
|
||||
|
||||
override val stamina: SidedRidingState<Float>
|
||||
get() = when (activeBehaviour.get()) {
|
||||
get() = when (activeController.get()) {
|
||||
defaultBehaviour -> defaultBehaviourState.stamina
|
||||
else -> alternateBehaviourState.stamina
|
||||
}
|
||||
|
||||
override fun reset() {
|
||||
super.reset()
|
||||
activeBehaviour.set(defaultBehaviour, forced = true)
|
||||
activeController.set(defaultBehaviour, forced = true)
|
||||
lastTransition.set(-100L, forced = true)
|
||||
defaultBehaviourState.reset()
|
||||
alternateBehaviourState.reset()
|
||||
@@ -400,7 +394,7 @@ class CompositeState(
|
||||
override fun copy(): CompositeState {
|
||||
val state =
|
||||
CompositeState(defaultBehaviour, defaultBehaviourState.copy(), alternateBehaviourState.copy())
|
||||
state.activeBehaviour.set(activeBehaviour.get(), forced = true)
|
||||
state.activeController.set(activeController.get(), forced = true)
|
||||
state.lastTransition.set(lastTransition.get(), forced = true)
|
||||
state.rideVelocity.set(rideVelocity.get(), forced = true)
|
||||
state.stamina.set(stamina.get(), forced = true)
|
||||
@@ -409,7 +403,7 @@ class CompositeState(
|
||||
|
||||
override fun shouldSync(previous: RidingBehaviourState): Boolean {
|
||||
if (previous !is CompositeState) return false
|
||||
if (previous.activeBehaviour.get() != activeBehaviour.get()) return true
|
||||
if (previous.activeController.get() != activeController.get()) return true
|
||||
if (defaultBehaviourState.shouldSync(previous.defaultBehaviourState)) return true
|
||||
if (alternateBehaviourState.shouldSync(previous.alternateBehaviourState)) return true
|
||||
return super.shouldSync(previous)
|
||||
@@ -417,14 +411,14 @@ class CompositeState(
|
||||
|
||||
override fun encode(buffer: FriendlyByteBuf) {
|
||||
super.encode(buffer)
|
||||
buffer.writeResourceLocation(activeBehaviour.get())
|
||||
buffer.writeResourceLocation(activeController.get())
|
||||
defaultBehaviourState.encode(buffer)
|
||||
alternateBehaviourState.encode(buffer)
|
||||
}
|
||||
|
||||
override fun decode(buffer: FriendlyByteBuf) {
|
||||
super.decode(buffer)
|
||||
activeBehaviour.set(buffer.readResourceLocation(), forced = true)
|
||||
activeController.set(buffer.readResourceLocation(), forced = true)
|
||||
defaultBehaviourState.decode(buffer)
|
||||
alternateBehaviourState.decode(buffer)
|
||||
}
|
||||
|
||||
+2
-2
@@ -44,10 +44,10 @@ interface CompositeRidingStrategy<T : CompositeSettings> {
|
||||
toState.stamina.set(fromState.stamina.get())
|
||||
toState.rideVelocity.set(fromState.rideVelocity.get())
|
||||
fromState.reset()
|
||||
state.activeBehaviour.set(toSettings.key)
|
||||
state.activeController.set(toSettings.key)
|
||||
state.lastTransition.set(vehicle.level().gameTime)
|
||||
val behaviour = RidingBehaviours.get(toSettings.key)
|
||||
vehicle.setBehaviourFlag(PokemonBehaviourFlag.FLYING, behaviour.getRidingStyle(toSettings, toState) == RidingStyle.AIR)
|
||||
vehicle.setBehaviourFlag(PokemonBehaviourFlag.FLYING, behaviour.style == RidingStyle.AIR)
|
||||
}
|
||||
|
||||
}
|
||||
+4
-2
@@ -9,11 +9,13 @@
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies
|
||||
|
||||
import com.bedrockk.molang.Expression
|
||||
import com.cobblemon.mod.common.api.riding.RidingStyle
|
||||
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.RidingBehaviours
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeSettings
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeState
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonBehaviourFlag
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.cobblemon.mod.common.util.*
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
@@ -45,7 +47,7 @@ object FallStrategy : CompositeRidingStrategy<FallCompositeSettings> {
|
||||
defaultSettings: RidingBehaviourSettings,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
if (state.activeBehaviour.get() == defaultSettings.key) return false
|
||||
if (state.activeController.get() == defaultSettings.key) return false
|
||||
if (state.lastTransition.get() + 20 >= vehicle.level().gameTime) return false
|
||||
if (!vehicle.onGround()) return false
|
||||
val defaultBehaviour = RidingBehaviours.get(defaultSettings.key)
|
||||
@@ -59,7 +61,7 @@ object FallStrategy : CompositeRidingStrategy<FallCompositeSettings> {
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
if (state.activeBehaviour.get() == alternateSettings.key) return false
|
||||
if (state.activeController.get() == alternateSettings.key) return false
|
||||
if (!driver.jumping) return false
|
||||
if (state.lastTransition.get() + 20 >= vehicle.level().gameTime) return false
|
||||
|
||||
|
||||
+4
-2
@@ -8,11 +8,13 @@
|
||||
|
||||
package com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies
|
||||
|
||||
import com.cobblemon.mod.common.api.riding.RidingStyle
|
||||
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.RidingBehaviours
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeSettings
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeState
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonBehaviourFlag
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.cobblemon.mod.common.util.cobblemonResource
|
||||
import net.minecraft.world.entity.player.Player
|
||||
@@ -43,7 +45,7 @@ object JumpStrategy : CompositeRidingStrategy<CompositeSettings> {
|
||||
defaultSettings: RidingBehaviourSettings,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
if (state.activeBehaviour.get() == defaultSettings.key) return false
|
||||
if (state.activeController.get() == defaultSettings.key) return false
|
||||
if (!vehicle.onGround()) return false
|
||||
if (state.lastTransition.get() + 20 >= vehicle.level().gameTime) return false
|
||||
val defaultBehaviour = RidingBehaviours.get(defaultSettings.key)
|
||||
@@ -56,7 +58,7 @@ object JumpStrategy : CompositeRidingStrategy<CompositeSettings> {
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
if (state.activeBehaviour.get() == alternativeSettings.key) return false
|
||||
if (state.activeController.get() == alternativeSettings.key) return false
|
||||
if (!driver.jumping) return false
|
||||
if (state.lastTransition.get() + 20 >= vehicle.level().gameTime) return false
|
||||
val alternativeBehaviour = RidingBehaviours.get(alternativeSettings.key)
|
||||
|
||||
+2
-2
@@ -45,7 +45,7 @@ object RunStrategy : CompositeRidingStrategy<CompositeSettings> {
|
||||
entity: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
if (state.activeBehaviour.get() == defaultSettings.key) return false
|
||||
if (state.activeController.get() == defaultSettings.key) return false
|
||||
if (!entity.onGround()) return false
|
||||
if (state.lastTransition.get() + 20 >= entity.level().gameTime) return false
|
||||
val defaultBehaviour = RidingBehaviours.get(defaultSettings.key)
|
||||
@@ -60,7 +60,7 @@ object RunStrategy : CompositeRidingStrategy<CompositeSettings> {
|
||||
driver: Player,
|
||||
input: Vec3
|
||||
): Boolean {
|
||||
if (state.activeBehaviour.get() == alternativeSettings.key) return false
|
||||
if (state.activeController.get() == alternativeSettings.key) return false
|
||||
if (state.lastTransition.get() + 20 >= entity.level().gameTime) return false
|
||||
val alternativeBehaviour = RidingBehaviours.get(alternativeSettings.key)
|
||||
return driver.isSprinting && input.z > 0.5 && alternativeBehaviour.isActive(alternativeSettings, state.alternateBehaviourState, entity)
|
||||
|
||||
-382
@@ -1,382 +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.cobblemon.mod.common.Cobblemon
|
||||
import com.cobblemon.mod.common.OrientationControllable
|
||||
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.stats.RidingStat
|
||||
import com.cobblemon.mod.common.entity.PoseType
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.cobblemon.mod.common.util.*
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
import net.minecraft.util.Mth
|
||||
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 net.minecraft.world.phys.shapes.Shapes
|
||||
import kotlin.math.abs
|
||||
import kotlin.math.max
|
||||
import kotlin.math.min
|
||||
|
||||
class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
|
||||
companion object {
|
||||
val KEY = cobblemonResource("liquid/boat")
|
||||
val TOP_SPEED = 2.0
|
||||
}
|
||||
|
||||
override val key = KEY
|
||||
|
||||
override fun getRidingStyle(settings: BoatSettings, state: BoatState): RidingStyle {
|
||||
return RidingStyle.LIQUID
|
||||
}
|
||||
|
||||
val poseProvider = PoseProvider<BoatSettings, BoatState>(PoseType.FLOAT)
|
||||
.with(PoseOption(PoseType.SWIM) { _, _, entity -> entity.isSwimming && entity.entityData.get(PokemonEntity.MOVING) })
|
||||
|
||||
override fun isActive(settings: BoatSettings, state: BoatState, vehicle: PokemonEntity): Boolean {
|
||||
if (state.jumpBuffer.get() != -1) {
|
||||
return true
|
||||
}
|
||||
return Shapes.create(vehicle.boundingBox).blockPositionsAsListRounded().any {
|
||||
if (vehicle.isInWater || vehicle.isUnderWater) {
|
||||
return@any true
|
||||
}
|
||||
val blockState = vehicle.level().getBlockState(it)
|
||||
return@any !blockState.fluidState.isEmpty
|
||||
}
|
||||
}
|
||||
|
||||
override fun tick(
|
||||
settings: BoatSettings,
|
||||
state: BoatState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
input: Vec3
|
||||
) {
|
||||
if (state.jumpBuffer.get() > 5) {
|
||||
if ((vehicle.isInWater || vehicle.isUnderWater || vehicle.onGround())) {
|
||||
state.jumpBuffer.set(-1)
|
||||
}
|
||||
}
|
||||
else if (state.jumpBuffer.get() > -1) {
|
||||
state.jumpBuffer.set(state.jumpBuffer.get() + 1)
|
||||
}
|
||||
|
||||
if (driver.zza == 0f && (vehicle.isInWater || vehicle.isUnderWater)) {
|
||||
if (state.staminaBuffer.get() >= 20) {
|
||||
val staminaIncrease = vehicle.getRideStat(RidingStat.STAMINA, RidingStyle.LIQUID, 1.0, 2.0)
|
||||
state.stamina.set(min(1.0f, state.stamina.get() + 0.01f * staminaIncrease.toFloat()))
|
||||
}
|
||||
}
|
||||
else if (abs(state.rideVelocity.get().z) > 0.1) {
|
||||
consumeStamina(vehicle, state, 0.01f)
|
||||
}
|
||||
state.staminaBuffer.set(state.staminaBuffer.get() + 1)
|
||||
super.tick(settings, state, vehicle, driver, input)
|
||||
}
|
||||
|
||||
override fun pose(settings: BoatSettings, state: BoatState, vehicle: PokemonEntity): PoseType {
|
||||
return poseProvider.select(settings, state, vehicle)
|
||||
}
|
||||
|
||||
override fun speed(settings: BoatSettings, state: BoatState, vehicle: PokemonEntity, driver: Player): Float {
|
||||
return state.rideVelocity.get().length().toFloat()
|
||||
}
|
||||
|
||||
override fun rotation(
|
||||
settings: BoatSettings,
|
||||
state: BoatState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
): Vec2 {
|
||||
state.deltaRotation.set(state.deltaRotation.get() * 0.8)
|
||||
return Vec2(vehicle.xRot, vehicle.yRot + state.deltaRotation.get().toFloat())
|
||||
}
|
||||
|
||||
override fun velocity(
|
||||
settings: BoatSettings,
|
||||
state: BoatState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
input: Vec3
|
||||
): Vec3 {
|
||||
applyStrafeRotation(vehicle, driver, state)
|
||||
|
||||
var velocity = state.rideVelocity.get()
|
||||
velocity = applyVelocityFromInput(velocity, vehicle, driver, state)
|
||||
velocity = applyGravity(velocity, vehicle, settings, state)
|
||||
velocity = applyJump(velocity, vehicle, driver, state)
|
||||
state.rideVelocity.set(velocity)
|
||||
return state.rideVelocity.get()
|
||||
}
|
||||
|
||||
private fun applyVelocityFromInput(velocity: Vec3, vehicle: PokemonEntity, driver: Player, state: BoatState): Vec3 {
|
||||
val speed = vehicle.getRideStat(RidingStat.SPEED, RidingStyle.LIQUID, 0.8, TOP_SPEED)
|
||||
val acceleration = vehicle.getRideStat(RidingStat.ACCELERATION, RidingStyle.LIQUID, 0.05, 0.5)
|
||||
|
||||
if (state.jumpBuffer.get() != -1 || !(vehicle.isInWater || vehicle.isUnderWater)) {
|
||||
return velocity
|
||||
}
|
||||
|
||||
val forwardInput = driver.zza.toDouble()
|
||||
val delta = when {
|
||||
!hasStamina(state) || forwardInput == 0.0 -> -velocity.z * 0.04
|
||||
forwardInput < 0.0 -> when {
|
||||
velocity.z < 0.0 -> forwardInput * acceleration * 0.5
|
||||
else -> min(forwardInput * acceleration * 0.5, -velocity.z * 0.04) // We never want it to be slower to reverse than no input
|
||||
}
|
||||
else -> forwardInput * acceleration
|
||||
}
|
||||
|
||||
return Vec3(
|
||||
velocity.x,
|
||||
velocity.y,
|
||||
Mth.clamp(velocity.z + delta, -speed * 0.25, speed)
|
||||
)
|
||||
}
|
||||
|
||||
private fun applyJump(velocity: Vec3, vehicle: PokemonEntity, driver: Player, state: BoatState): Vec3 {
|
||||
if (!driver.jumping) return velocity // Not jumping
|
||||
if (state.jumpBuffer.get() != -1) return velocity // Already jumped very recently
|
||||
if (!hasStamina(state)) return velocity // Has no stamina
|
||||
|
||||
val jumpStrength = vehicle.getRideStat(RidingStat.JUMP, RidingStyle.LIQUID, 1.0, 2.5)
|
||||
state.jumpBuffer.set(0)
|
||||
consumeStamina(vehicle, state, 0.05f)
|
||||
return Vec3(velocity.x, velocity.y + jumpStrength, velocity.z)
|
||||
}
|
||||
|
||||
private fun applyGravity(velocity: Vec3, vehicle: PokemonEntity, settings: BoatSettings, state: BoatState): Vec3 {
|
||||
if (state.jumpBuffer.get() == -1 && vehicle.isInWater || vehicle.isUnderWater) {
|
||||
return Vec3(velocity.x, -0.05, velocity.z)
|
||||
}
|
||||
val terminalVelocity = vehicle.runtime.resolveDouble(settings.terminalVelocity)
|
||||
val gravity = (9.8 / ( 20.0)) * 0.2
|
||||
return Vec3(velocity.x, max(velocity.y - gravity, terminalVelocity), velocity.z)
|
||||
}
|
||||
|
||||
private fun applyStrafeRotation(vehicle: PokemonEntity, driver: Player, state: BoatState) {
|
||||
val skill = vehicle.getRideStat(RidingStat.SKILL, RidingStyle.LIQUID, 0.5, 1.5)
|
||||
val strafe = driver.xxa
|
||||
if (abs(strafe) > 0) {
|
||||
val increase = if (strafe > 0) -1 else 1
|
||||
state.deltaRotation.set(state.deltaRotation.get() + increase * skill)
|
||||
}
|
||||
}
|
||||
|
||||
private fun hasStamina(state: BoatState): Boolean {
|
||||
return state.stamina.get() != 0f
|
||||
}
|
||||
|
||||
private fun consumeStamina(vehicle: PokemonEntity, state: BoatState, drain: Float) {
|
||||
val stamina = vehicle.getRideStat(RidingStat.STAMINA, RidingStyle.LIQUID, 1.0, 5.0)
|
||||
state.stamina.set(max(0f, state.stamina.get() - drain / stamina.toFloat()))
|
||||
state.staminaBuffer.set(0)
|
||||
}
|
||||
|
||||
override fun updatePassengerRotation(
|
||||
settings: BoatSettings,
|
||||
state: BoatState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
) {
|
||||
driver.yRot += state.deltaRotation.get().toFloat() * 0.887f
|
||||
driver.yHeadRot += state.deltaRotation.get().toFloat() * 0.887f
|
||||
clampPassengerRotation(settings, state, vehicle, driver)
|
||||
}
|
||||
|
||||
override fun clampPassengerRotation(
|
||||
settings: BoatSettings,
|
||||
state: BoatState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
) {
|
||||
driver.setYBodyRot(vehicle.yRot)
|
||||
val f: Float = Mth.wrapDegrees(driver.yRot - vehicle.yRot)
|
||||
val g = Mth.clamp(f, -105.0f, 105.0f)
|
||||
driver.yRotO += g - f
|
||||
driver.yRot = driver.yRot + g - f
|
||||
driver.setYHeadRot(driver.yRot)
|
||||
vehicle.setYHeadRot(driver.yRot)
|
||||
}
|
||||
|
||||
override fun angRollVel(
|
||||
settings: BoatSettings,
|
||||
state: BoatState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
deltaTime: Double
|
||||
): Vec3 {
|
||||
return Vec3.ZERO
|
||||
}
|
||||
|
||||
override fun rotationOnMouseXY(
|
||||
settings: BoatSettings,
|
||||
state: BoatState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
mouseY: Double,
|
||||
mouseX: Double,
|
||||
mouseYSmoother: SmoothDouble,
|
||||
mouseXSmoother: SmoothDouble,
|
||||
sensitivity: Double,
|
||||
deltaTime: Double
|
||||
): Vec3 {
|
||||
if (driver !is OrientationControllable) return Vec3.ZERO
|
||||
|
||||
//Might need to add the smoothing here for default.
|
||||
val invertRoll = if (Cobblemon.config.invertRoll) -1 else 1
|
||||
val invertPitch = if (Cobblemon.config.invertPitch) -1 else 1
|
||||
return Vec3(0.0, mouseY * invertPitch, mouseX * invertRoll)
|
||||
}
|
||||
|
||||
override fun canJump(
|
||||
settings: BoatSettings,
|
||||
state: BoatState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun setRideBar(
|
||||
settings: BoatSettings,
|
||||
state: BoatState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
return (state.stamina.get() / 1.0f)
|
||||
}
|
||||
|
||||
override fun jumpForce(
|
||||
settings: BoatSettings,
|
||||
state: BoatState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
jumpStrength: Int
|
||||
): Vec3 {
|
||||
return Vec3.ZERO
|
||||
}
|
||||
|
||||
override fun gravity(
|
||||
settings: BoatSettings,
|
||||
state: BoatState,
|
||||
vehicle: PokemonEntity,
|
||||
regularGravity: Double
|
||||
): Double {
|
||||
return 0.0
|
||||
}
|
||||
|
||||
override fun rideFovMultiplier(
|
||||
settings: BoatSettings,
|
||||
state: BoatState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Float {
|
||||
if (state.rideVelocity.get().z > TOP_SPEED * 0.8) {
|
||||
return Mth.lerp((state.rideVelocity.get().z - (TOP_SPEED * 0.8)) / (TOP_SPEED * 0.2), 1.0, 1.2).toFloat()
|
||||
}
|
||||
return 1.0f
|
||||
}
|
||||
|
||||
override fun useAngVelSmoothing(settings: BoatSettings, state: BoatState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun useRidingAltPose(
|
||||
settings: BoatSettings,
|
||||
state: BoatState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun inertia(settings: BoatSettings, state: BoatState, vehicle: PokemonEntity): Double {
|
||||
return 0.5
|
||||
}
|
||||
|
||||
override fun shouldRoll(settings: BoatSettings, state: BoatState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun turnOffOnGround(settings: BoatSettings, state: BoatState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun dismountOnShift(settings: BoatSettings, state: BoatState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun shouldRotatePokemonHead(
|
||||
settings: BoatSettings,
|
||||
state: BoatState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return vehicle.runtime.resolveBoolean(settings.rotatePokemonHead)
|
||||
}
|
||||
|
||||
override fun shouldRotatePlayerHead(
|
||||
settings: BoatSettings,
|
||||
state: BoatState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return true
|
||||
}
|
||||
|
||||
override fun maxUpStep(settings: BoatSettings, state: BoatState, vehicle: PokemonEntity) = 0f
|
||||
|
||||
override fun createDefaultState(settings: BoatSettings) = BoatState()
|
||||
|
||||
}
|
||||
|
||||
class BoatSettings : RidingBehaviourSettings {
|
||||
override val key = BoatBehaviour.KEY
|
||||
|
||||
var terminalVelocity = "-2.0".asExpression()
|
||||
private set
|
||||
|
||||
var rotatePokemonHead = "true".asExpression()
|
||||
private set
|
||||
|
||||
override fun encode(buffer: RegistryFriendlyByteBuf) {
|
||||
buffer.writeResourceLocation(key)
|
||||
buffer.writeExpression(terminalVelocity)
|
||||
}
|
||||
|
||||
override fun decode(buffer: RegistryFriendlyByteBuf) {
|
||||
terminalVelocity = buffer.readExpression()
|
||||
}
|
||||
}
|
||||
|
||||
class BoatState : RidingBehaviourState() {
|
||||
val deltaRotation = ridingState(0.0, Side.CLIENT)
|
||||
val jumpBuffer = ridingState(-1, Side.CLIENT)
|
||||
val staminaBuffer = ridingState(0, Side.CLIENT)
|
||||
|
||||
override fun copy() = BoatState().also {
|
||||
it.deltaRotation.set(deltaRotation.get(), true)
|
||||
it.rideVelocity.set(rideVelocity.get(), true)
|
||||
it.stamina.set(stamina.get(), true)
|
||||
it.jumpBuffer.set(jumpBuffer.get(), true)
|
||||
it.staminaBuffer.set(staminaBuffer.get(), true)
|
||||
}
|
||||
|
||||
override fun shouldSync(previous: RidingBehaviourState): Boolean {
|
||||
if (previous !is BoatState) return false
|
||||
return super.shouldSync(previous)
|
||||
}
|
||||
|
||||
}
|
||||
-382
@@ -1,382 +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.cobblemon.mod.common.Cobblemon
|
||||
import com.cobblemon.mod.common.OrientationControllable
|
||||
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.stats.RidingStat
|
||||
import com.cobblemon.mod.common.entity.PoseType
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.cobblemon.mod.common.util.*
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
import net.minecraft.util.Mth
|
||||
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 net.minecraft.world.phys.shapes.Shapes
|
||||
import kotlin.math.abs
|
||||
import kotlin.math.max
|
||||
import kotlin.math.min
|
||||
|
||||
class SubmarineBehaviour : RidingBehaviour<SubmarineSettings, SubmarineState> {
|
||||
companion object {
|
||||
val KEY = cobblemonResource("liquid/submarine")
|
||||
val TOP_SPEED = 2.0
|
||||
}
|
||||
|
||||
override val key = KEY
|
||||
|
||||
override fun getRidingStyle(settings: SubmarineSettings, state: SubmarineState): RidingStyle {
|
||||
return RidingStyle.LIQUID
|
||||
}
|
||||
|
||||
val poseProvider = PoseProvider<SubmarineSettings, SubmarineState>(PoseType.FLOAT)
|
||||
.with(PoseOption(PoseType.SWIM) { _, _, entity -> entity.isSwimming && entity.entityData.get(PokemonEntity.MOVING) })
|
||||
|
||||
override fun isActive(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity): Boolean {
|
||||
if (state.jumpBuffer.get() != -1) {
|
||||
return true
|
||||
}
|
||||
return Shapes.create(vehicle.boundingBox).blockPositionsAsListRounded().any {
|
||||
if (vehicle.isInWater || vehicle.isUnderWater) {
|
||||
return@any true
|
||||
}
|
||||
val blockState = vehicle.level().getBlockState(it)
|
||||
return@any !blockState.fluidState.isEmpty
|
||||
}
|
||||
}
|
||||
|
||||
override fun tick(
|
||||
settings: SubmarineSettings,
|
||||
state: SubmarineState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
input: Vec3
|
||||
) {
|
||||
if (state.jumpBuffer.get() > 5) {
|
||||
if ((vehicle.isInWater || vehicle.isUnderWater || vehicle.onGround())) {
|
||||
state.jumpBuffer.set(-1)
|
||||
}
|
||||
}
|
||||
else if (state.jumpBuffer.get() > -1) {
|
||||
state.jumpBuffer.set(state.jumpBuffer.get() + 1)
|
||||
}
|
||||
|
||||
if (driver.zza == 0f && (vehicle.isInWater || vehicle.isUnderWater)) {
|
||||
if (state.staminaBuffer.get() >= 20) {
|
||||
val staminaIncrease = vehicle.getRideStat(RidingStat.STAMINA, RidingStyle.LIQUID, 1.0, 2.0)
|
||||
state.stamina.set(min(1.0f, state.stamina.get() + 0.01f * staminaIncrease.toFloat()))
|
||||
}
|
||||
}
|
||||
else if (abs(state.rideVelocity.get().z) > 0.1) {
|
||||
consumeStamina(vehicle, state, 0.01f)
|
||||
}
|
||||
state.staminaBuffer.set(state.staminaBuffer.get() + 1)
|
||||
super.tick(settings, state, vehicle, driver, input)
|
||||
}
|
||||
|
||||
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.rideVelocity.get().length().toFloat()
|
||||
}
|
||||
|
||||
override fun rotation(
|
||||
settings: SubmarineSettings,
|
||||
state: SubmarineState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
): Vec2 {
|
||||
state.deltaRotation.set(state.deltaRotation.get() * 0.8)
|
||||
return Vec2(vehicle.xRot, vehicle.yRot + state.deltaRotation.get().toFloat())
|
||||
}
|
||||
|
||||
override fun velocity(
|
||||
settings: SubmarineSettings,
|
||||
state: SubmarineState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
input: Vec3
|
||||
): Vec3 {
|
||||
applyStrafeRotation(vehicle, driver, state)
|
||||
|
||||
var velocity = state.rideVelocity.get()
|
||||
velocity = applyVelocityFromInput(velocity, vehicle, driver, state)
|
||||
velocity = applyGravity(velocity, vehicle, settings, state)
|
||||
velocity = applyJump(velocity, vehicle, driver, state)
|
||||
state.rideVelocity.set(velocity)
|
||||
return state.rideVelocity.get()
|
||||
}
|
||||
|
||||
private fun applyVelocityFromInput(velocity: Vec3, vehicle: PokemonEntity, driver: Player, state: SubmarineState): Vec3 {
|
||||
val speed = vehicle.getRideStat(RidingStat.SPEED, RidingStyle.LIQUID, 0.8, TOP_SPEED)
|
||||
val acceleration = vehicle.getRideStat(RidingStat.ACCELERATION, RidingStyle.LIQUID, 0.05, 0.5)
|
||||
|
||||
if (state.jumpBuffer.get() != -1 || !(vehicle.isInWater || vehicle.isUnderWater)) {
|
||||
return velocity
|
||||
}
|
||||
|
||||
val forwardInput = driver.zza.toDouble()
|
||||
val delta = when {
|
||||
!hasStamina(state) || forwardInput == 0.0 -> -velocity.z * 0.04
|
||||
forwardInput < 0.0 -> when {
|
||||
velocity.z < 0.0 -> forwardInput * acceleration * 0.5
|
||||
else -> min(forwardInput * acceleration * 0.5, -velocity.z * 0.04) // We never want it to be slower to reverse than no input
|
||||
}
|
||||
else -> forwardInput * acceleration
|
||||
}
|
||||
|
||||
return Vec3(
|
||||
velocity.x,
|
||||
velocity.y,
|
||||
Mth.clamp(velocity.z + delta, -speed * 0.25, speed)
|
||||
)
|
||||
}
|
||||
|
||||
private fun applyJump(velocity: Vec3, vehicle: PokemonEntity, driver: Player, state: SubmarineState): Vec3 {
|
||||
if (!driver.jumping) return velocity // Not jumping
|
||||
if (state.jumpBuffer.get() != -1) return velocity // Already jumped very recently
|
||||
if (!hasStamina(state)) return velocity // Has no stamina
|
||||
|
||||
val jumpStrength = vehicle.getRideStat(RidingStat.JUMP, RidingStyle.LIQUID, 1.0, 2.5)
|
||||
state.jumpBuffer.set(0)
|
||||
consumeStamina(vehicle, state, 0.05f)
|
||||
return Vec3(velocity.x, velocity.y + jumpStrength, velocity.z)
|
||||
}
|
||||
|
||||
private fun applyGravity(velocity: Vec3, vehicle: PokemonEntity, settings: SubmarineSettings, state: SubmarineState): Vec3 {
|
||||
if (state.jumpBuffer.get() == -1 && vehicle.isInWater || vehicle.isUnderWater) {
|
||||
return Vec3(velocity.x, -0.05, velocity.z)
|
||||
}
|
||||
val terminalVelocity = vehicle.runtime.resolveDouble(settings.terminalVelocity)
|
||||
val gravity = (9.8 / ( 20.0)) * 0.2
|
||||
return Vec3(velocity.x, max(velocity.y - gravity, terminalVelocity), velocity.z)
|
||||
}
|
||||
|
||||
private fun applyStrafeRotation(vehicle: PokemonEntity, driver: Player, state: SubmarineState) {
|
||||
val skill = vehicle.getRideStat(RidingStat.SKILL, RidingStyle.LIQUID, 0.5, 1.5)
|
||||
val strafe = driver.xxa
|
||||
if (abs(strafe) > 0) {
|
||||
val increase = if (strafe > 0) -1 else 1
|
||||
state.deltaRotation.set(state.deltaRotation.get() + increase * skill)
|
||||
}
|
||||
}
|
||||
|
||||
private fun hasStamina(state: SubmarineState): Boolean {
|
||||
return state.stamina.get() != 0f
|
||||
}
|
||||
|
||||
private fun consumeStamina(vehicle: PokemonEntity, state: SubmarineState, drain: Float) {
|
||||
val stamina = vehicle.getRideStat(RidingStat.STAMINA, RidingStyle.LIQUID, 1.0, 5.0)
|
||||
state.stamina.set(max(0f, state.stamina.get() - drain / stamina.toFloat()))
|
||||
state.staminaBuffer.set(0)
|
||||
}
|
||||
|
||||
override fun updatePassengerRotation(
|
||||
settings: SubmarineSettings,
|
||||
state: SubmarineState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
) {
|
||||
driver.yRot += state.deltaRotation.get().toFloat() * 0.887f
|
||||
driver.yHeadRot += state.deltaRotation.get().toFloat() * 0.887f
|
||||
clampPassengerRotation(settings, state, vehicle, driver)
|
||||
}
|
||||
|
||||
override fun clampPassengerRotation(
|
||||
settings: SubmarineSettings,
|
||||
state: SubmarineState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: LivingEntity
|
||||
) {
|
||||
driver.setYBodyRot(vehicle.yRot)
|
||||
val f: Float = Mth.wrapDegrees(driver.yRot - vehicle.yRot)
|
||||
val g = Mth.clamp(f, -105.0f, 105.0f)
|
||||
driver.yRotO += g - f
|
||||
driver.yRot = driver.yRot + g - f
|
||||
driver.setYHeadRot(driver.yRot)
|
||||
vehicle.setYHeadRot(driver.yRot)
|
||||
}
|
||||
|
||||
override fun angRollVel(
|
||||
settings: SubmarineSettings,
|
||||
state: SubmarineState,
|
||||
vehicle: PokemonEntity,
|
||||
driver: Player,
|
||||
deltaTime: Double
|
||||
): Vec3 {
|
||||
return Vec3.ZERO
|
||||
}
|
||||
|
||||
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 (driver !is OrientationControllable) return Vec3.ZERO
|
||||
|
||||
//Might need to add the smoothing here for default.
|
||||
val invertRoll = if (Cobblemon.config.invertRoll) -1 else 1
|
||||
val invertPitch = if (Cobblemon.config.invertPitch) -1 else 1
|
||||
return Vec3(0.0, mouseY * invertPitch, mouseX * invertRoll)
|
||||
}
|
||||
|
||||
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 {
|
||||
if (state.rideVelocity.get().z > TOP_SPEED * 0.8) {
|
||||
return Mth.lerp((state.rideVelocity.get().z - (TOP_SPEED * 0.8)) / (TOP_SPEED * 0.2), 1.0, 1.2).toFloat()
|
||||
}
|
||||
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
|
||||
): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
override fun inertia(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity): Double {
|
||||
return 0.5
|
||||
}
|
||||
|
||||
override fun shouldRoll(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity): Boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
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 shouldRotatePokemonHead(
|
||||
settings: SubmarineSettings,
|
||||
state: SubmarineState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return vehicle.runtime.resolveBoolean(settings.rotatePokemonHead)
|
||||
}
|
||||
|
||||
override fun shouldRotatePlayerHead(
|
||||
settings: SubmarineSettings,
|
||||
state: SubmarineState,
|
||||
vehicle: PokemonEntity
|
||||
): Boolean {
|
||||
return true
|
||||
}
|
||||
|
||||
override fun maxUpStep(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity) = 0f
|
||||
|
||||
override fun createDefaultState(settings: SubmarineSettings) = SubmarineState()
|
||||
|
||||
}
|
||||
|
||||
class SubmarineSettings : RidingBehaviourSettings {
|
||||
override val key = SubmarineBehaviour.KEY
|
||||
|
||||
var terminalVelocity = "-2.0".asExpression()
|
||||
private set
|
||||
|
||||
var rotatePokemonHead = "true".asExpression()
|
||||
private set
|
||||
|
||||
override fun encode(buffer: RegistryFriendlyByteBuf) {
|
||||
buffer.writeResourceLocation(key)
|
||||
buffer.writeExpression(terminalVelocity)
|
||||
}
|
||||
|
||||
override fun decode(buffer: RegistryFriendlyByteBuf) {
|
||||
terminalVelocity = buffer.readExpression()
|
||||
}
|
||||
}
|
||||
|
||||
class SubmarineState : RidingBehaviourState() {
|
||||
val deltaRotation = ridingState(0.0, Side.CLIENT)
|
||||
val jumpBuffer = ridingState(-1, Side.CLIENT)
|
||||
val staminaBuffer = ridingState(0, Side.CLIENT)
|
||||
|
||||
override fun copy() = SubmarineState().also {
|
||||
it.deltaRotation.set(deltaRotation.get(), true)
|
||||
it.rideVelocity.set(rideVelocity.get(), true)
|
||||
it.stamina.set(stamina.get(), true)
|
||||
it.jumpBuffer.set(jumpBuffer.get(), true)
|
||||
it.staminaBuffer.set(staminaBuffer.get(), true)
|
||||
}
|
||||
|
||||
override fun shouldSync(previous: RidingBehaviourState): Boolean {
|
||||
if (previous !is SubmarineState) return false
|
||||
return super.shouldSync(previous)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -55,7 +55,6 @@ class SpawnPool(val name: String) : JsonDataRegistry<SpawnSet>, Iterable<SpawnDe
|
||||
CobblemonSpawnPools.onServerLoad(server)
|
||||
}
|
||||
precalculate()
|
||||
this.observable.emit(this)
|
||||
}
|
||||
|
||||
val details = mutableListOf<SpawnDetail>()
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
/*
|
||||
* 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.block
|
||||
|
||||
import com.cobblemon.mod.common.Cobblemon
|
||||
import com.cobblemon.mod.common.api.text.red
|
||||
import com.cobblemon.mod.common.api.text.text
|
||||
import com.cobblemon.mod.common.block.entity.StadiumBlockEntity
|
||||
import net.minecraft.core.BlockPos
|
||||
import net.minecraft.core.Direction
|
||||
import net.minecraft.server.level.ServerPlayer
|
||||
import net.minecraft.world.InteractionResult
|
||||
import net.minecraft.world.entity.player.Player
|
||||
import net.minecraft.world.item.context.BlockPlaceContext
|
||||
import net.minecraft.world.level.Level
|
||||
import net.minecraft.world.level.block.BaseEntityBlock
|
||||
import net.minecraft.world.level.block.Block
|
||||
import net.minecraft.world.level.block.HorizontalDirectionalBlock
|
||||
import net.minecraft.world.level.block.Mirror
|
||||
import net.minecraft.world.level.block.RenderShape
|
||||
import net.minecraft.world.level.block.Rotation
|
||||
import net.minecraft.world.level.block.entity.BlockEntity
|
||||
import net.minecraft.world.level.block.state.BlockState
|
||||
import net.minecraft.world.level.block.state.StateDefinition
|
||||
import net.minecraft.world.phys.BlockHitResult
|
||||
|
||||
class StadiumBlock(properties: Properties): BaseEntityBlock(properties) {
|
||||
companion object {
|
||||
val CODEC = simpleCodec(::StadiumBlock)
|
||||
}
|
||||
|
||||
init {
|
||||
registerDefaultState(stateDefinition.any().setValue(HorizontalDirectionalBlock.FACING, Direction.NORTH))
|
||||
}
|
||||
|
||||
override fun codec() = CODEC
|
||||
|
||||
override fun newBlockEntity(pos: BlockPos, state: BlockState): BlockEntity {
|
||||
return StadiumBlockEntity(pos, state)
|
||||
}
|
||||
|
||||
override fun getStateForPlacement(blockPlaceContext: BlockPlaceContext): BlockState {
|
||||
return this.defaultBlockState().setValue(HorizontalDirectionalBlock.FACING, blockPlaceContext.horizontalDirection)
|
||||
}
|
||||
|
||||
override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
|
||||
builder.add(HorizontalDirectionalBlock.FACING)
|
||||
}
|
||||
|
||||
override fun rotate(blockState: BlockState, rotation: Rotation): BlockState {
|
||||
return blockState.setValue(
|
||||
HorizontalDirectionalBlock.FACING, rotation.rotate(blockState.getValue(
|
||||
HorizontalDirectionalBlock.FACING)))
|
||||
}
|
||||
|
||||
override fun mirror(blockState: BlockState, mirror: Mirror): BlockState {
|
||||
return blockState.rotate(mirror.getRotation(blockState.getValue(HorizontalDirectionalBlock.FACING)))
|
||||
}
|
||||
|
||||
override fun onRemove(state: BlockState, world: Level, pos: BlockPos, newState: BlockState, moved: Boolean) {
|
||||
if (!state.`is`(newState.block)) super.onRemove(state, world, pos, newState, moved)
|
||||
}
|
||||
|
||||
//TODO: override getTicker
|
||||
|
||||
override fun getRenderShape(state: BlockState) = RenderShape.MODEL
|
||||
|
||||
override fun useWithoutItem(
|
||||
state: BlockState,
|
||||
world: Level,
|
||||
pos: BlockPos,
|
||||
player: Player,
|
||||
hitResult: BlockHitResult
|
||||
): InteractionResult {
|
||||
if (player !is ServerPlayer) return InteractionResult.SUCCESS
|
||||
|
||||
val blockEntity = world.getBlockEntity(pos)
|
||||
if (blockEntity !is StadiumBlockEntity) return InteractionResult.SUCCESS
|
||||
|
||||
player.sendSystemMessage(text("Adding you to Battle").red())
|
||||
blockEntity.addPlayer(player)
|
||||
return InteractionResult.SUCCESS
|
||||
}
|
||||
|
||||
/*
|
||||
override fun useWithoutItem(
|
||||
blockState: BlockState,
|
||||
world: Level,
|
||||
blockPos: BlockPos,
|
||||
player: Player,
|
||||
blockHitResult: BlockHitResult
|
||||
): InteractionResult {
|
||||
if (player !is ServerPlayer) return InteractionResult.SUCCESS
|
||||
|
||||
val blockEntity = world.getBlockEntity(blockPos)
|
||||
if (blockEntity !is StadiumBlockEntity) return InteractionResult.SUCCESS
|
||||
|
||||
// Toggle isInUse state
|
||||
blockEntity.isInUse = !blockEntity.isInUse
|
||||
|
||||
// debug
|
||||
val activateMessage = if (blockEntity.isInUse) "Stadium Activated!" else "Stadium Deactivated!"
|
||||
player.sendSystemMessage(text(activateMessage).red())
|
||||
|
||||
if (blockEntity.isInUse) {
|
||||
// Generate flight path when activated
|
||||
blockEntity.generateFlightPath(world, radiusX = 5.0, radiusZ = 3.0, height = 10.0, steps = 20)
|
||||
|
||||
} else {
|
||||
// Clear path when deactivated
|
||||
blockEntity.pathPoints.clear()
|
||||
}
|
||||
|
||||
val message = "Stadium Pos: " + blockEntity.blockPos +
|
||||
"\nPlayer 1 Pos: " + blockEntity.getPlayer1Pos() +
|
||||
"\nPoke 1 Pos: " + blockEntity.getPoke1Pos() +
|
||||
"\nPlayer 2 Pos: " + blockEntity.getPlayer2Pos() +
|
||||
"\nPoke 2 Pos: " + blockEntity.getPoke2Pos()
|
||||
player.sendSystemMessage(text(message).red())
|
||||
|
||||
blockEntity.setChanged()
|
||||
world.sendBlockUpdated(blockPos, blockState, blockState, Block.UPDATE_CLIENTS)
|
||||
|
||||
return InteractionResult.SUCCESS
|
||||
}
|
||||
*/
|
||||
}
|
||||
@@ -0,0 +1,143 @@
|
||||
package com.cobblemon.mod.common.block.entity
|
||||
|
||||
import com.cobblemon.mod.common.CobblemonBlockEntities
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.drone.DroneState
|
||||
import com.cobblemon.mod.common.stadium.StadiumSingleBattle
|
||||
import net.minecraft.core.BlockPos
|
||||
import net.minecraft.core.HolderLookup
|
||||
import net.minecraft.nbt.CompoundTag
|
||||
import net.minecraft.nbt.ListTag
|
||||
import net.minecraft.network.protocol.Packet
|
||||
import net.minecraft.network.protocol.game.ClientGamePacketListener
|
||||
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket
|
||||
import net.minecraft.network.protocol.game.ClientboundPlayerLookAtPacket
|
||||
import net.minecraft.network.protocol.game.ClientboundSetCarriedItemPacket
|
||||
import net.minecraft.server.level.ServerPlayer
|
||||
import net.minecraft.world.level.Level
|
||||
import net.minecraft.world.level.block.entity.BlockEntity
|
||||
import net.minecraft.world.level.block.state.BlockState
|
||||
import net.minecraft.world.phys.Vec3
|
||||
|
||||
class StadiumBlockEntity(
|
||||
pos: BlockPos,
|
||||
blockState: BlockState
|
||||
): BlockEntity(
|
||||
CobblemonBlockEntities.STADIUM,
|
||||
pos,
|
||||
blockState
|
||||
) {
|
||||
var storedPlayers = mutableListOf<ServerPlayer>()
|
||||
|
||||
var battleDefenition = StadiumSingleBattle()
|
||||
|
||||
fun addPlayer(player: ServerPlayer) {
|
||||
battleDefenition.addPlayer(player)
|
||||
if (battleDefenition.readyForBattle()) battleDefenition.initializeBattle()
|
||||
}
|
||||
|
||||
/*
|
||||
var isInUse = false
|
||||
|
||||
val droneState = DroneState()
|
||||
|
||||
val pathPoints: MutableList<Vec3> = mutableListOf()
|
||||
|
||||
fun generateFlightPath(world: Level, radiusX: Double, radiusZ: Double, height: Double, steps: Int) {
|
||||
pathPoints.clear()
|
||||
|
||||
for (i in 0 until steps) {
|
||||
val angle = (i.toDouble() / steps) * Math.PI * 2
|
||||
val xOffset = radiusX * Math.cos(angle)
|
||||
val zOffset = radiusZ * Math.sin(angle)
|
||||
|
||||
val basePos = Vec3(blockPos.x + xOffset, blockPos.y + height, blockPos.z + zOffset)
|
||||
val adjustedPos = getValidPoint(world, basePos)
|
||||
|
||||
pathPoints.add(adjustedPos)
|
||||
}
|
||||
}
|
||||
|
||||
private fun getValidPoint(world: Level, start: Vec3): Vec3 {
|
||||
val maxHeight = 40 // Max height for drone path
|
||||
val stepHeight = 1.0 // Step size for raycast
|
||||
|
||||
var adjustedHeight = start.y
|
||||
for (h in 0..maxHeight step stepHeight.toInt()) {
|
||||
val checkPos = BlockPos(start.x.toInt(), start.y.toInt() - h, start.z.toInt()) // Convert to BlockPos
|
||||
if (!world.getBlockState(checkPos).isAir) { // Check if block is solid
|
||||
return Vec3(start.x, start.y - h - 1, start.z) // Adjust position
|
||||
}
|
||||
}
|
||||
return start // No obstruction found
|
||||
}
|
||||
|
||||
|
||||
fun getPlayer1Pos(): BlockPos {
|
||||
return blockPos.north(10)
|
||||
}
|
||||
fun getPlayer2Pos(): BlockPos {
|
||||
return blockPos.south(10)
|
||||
}
|
||||
fun getPoke1Pos(): BlockPos {
|
||||
return blockPos.north(5)
|
||||
}
|
||||
fun getPoke2Pos(): BlockPos {
|
||||
return blockPos.south(5)
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Saves data to NBT.
|
||||
*/
|
||||
override fun saveAdditional(tag: CompoundTag, registries: HolderLookup.Provider) {
|
||||
super.saveAdditional(tag, registries)
|
||||
|
||||
// Save the isInUse state
|
||||
tag.putBoolean("IsInUse", isInUse)
|
||||
|
||||
// Save path points
|
||||
val pathTag = ListTag()
|
||||
for (point in pathPoints) {
|
||||
val pointTag = CompoundTag()
|
||||
pointTag.putDouble("x", point.x)
|
||||
pointTag.putDouble("y", point.y)
|
||||
pointTag.putDouble("z", point.z)
|
||||
pathTag.add(pointTag)
|
||||
}
|
||||
tag.put("PathPoints", pathTag)
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads data from NBT.
|
||||
*/
|
||||
override fun loadAdditional(tag: CompoundTag, registries: HolderLookup.Provider) {
|
||||
super.loadAdditional(tag, registries)
|
||||
|
||||
// Load the isInUse state
|
||||
isInUse = tag.getBoolean("IsInUse")
|
||||
|
||||
// Load path points
|
||||
pathPoints.clear()
|
||||
val pathTag = tag.getList("PathPoints", 10) // 10 is the ID for CompoundTag
|
||||
for (i in 0 until pathTag.size) {
|
||||
val pointTag = pathTag.getCompound(i)
|
||||
val point = Vec3(pointTag.getDouble("x"), pointTag.getDouble("y"), pointTag.getDouble("z"))
|
||||
pathPoints.add(point)
|
||||
}
|
||||
}
|
||||
|
||||
override fun getUpdatePacket(): Packet<ClientGamePacketListener>? {
|
||||
//println("getUpdatePacket called for NestBlockEntity at $blockPos with egg: $eggComponent")
|
||||
return ClientboundBlockEntityDataPacket.create(this)
|
||||
}
|
||||
|
||||
override fun getUpdateTag(registryLookup: HolderLookup.Provider): CompoundTag {
|
||||
val tag = saveWithoutMetadata(registryLookup)
|
||||
//println("getUpdateTag called for NestBlockEntity at $blockPos with tag: $tag")
|
||||
return tag
|
||||
}
|
||||
|
||||
*/
|
||||
}
|
||||
@@ -26,13 +26,7 @@ import com.cobblemon.mod.common.client.gui.battle.BattleOverlay
|
||||
import com.cobblemon.mod.common.client.particle.BedrockParticleOptionsRepository
|
||||
import com.cobblemon.mod.common.client.render.ClientPlayerIcon
|
||||
import com.cobblemon.mod.common.client.render.DeferredRenderer
|
||||
import com.cobblemon.mod.common.client.render.block.BerryBlockRenderer
|
||||
import com.cobblemon.mod.common.client.render.block.DisplayCaseRenderer
|
||||
import com.cobblemon.mod.common.client.render.block.FossilAnalyzerRenderer
|
||||
import com.cobblemon.mod.common.client.render.block.GildedChestBlockRenderer
|
||||
import com.cobblemon.mod.common.client.render.block.HealingMachineRenderer
|
||||
import com.cobblemon.mod.common.client.render.block.LecternBlockEntityRenderer
|
||||
import com.cobblemon.mod.common.client.render.block.RestorationTankRenderer
|
||||
import com.cobblemon.mod.common.client.render.block.*
|
||||
import com.cobblemon.mod.common.client.render.boat.CobblemonBoatRenderer
|
||||
import com.cobblemon.mod.common.client.render.entity.PokeBobberEntityRenderer
|
||||
import com.cobblemon.mod.common.client.render.generic.GenericBedrockRenderer
|
||||
@@ -60,6 +54,7 @@ import com.cobblemon.mod.common.entity.boat.CobblemonBoatType
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.cobblemon.mod.common.platform.events.PlatformEvents
|
||||
import com.cobblemon.mod.common.pokedex.scanner.PokedexUsageContext
|
||||
import com.cobblemon.mod.common.stadium.StadiumClientManager
|
||||
import com.cobblemon.mod.common.util.isLookingAt
|
||||
import net.minecraft.client.Minecraft
|
||||
import net.minecraft.client.gui.GuiGraphics
|
||||
@@ -116,6 +111,7 @@ object CobblemonClient {
|
||||
CobblemonDataProvider.canReload = true
|
||||
DeferredRenderer.clearAll()
|
||||
ClientPlayerIcon.clear()
|
||||
StadiumClientManager.onLogout()
|
||||
}
|
||||
|
||||
fun initialize(implementation: CobblemonClientImplementation) {
|
||||
@@ -260,7 +256,8 @@ object CobblemonClient {
|
||||
CobblemonBlocks.SKY_TUMBLESTONE_CLUSTER,
|
||||
CobblemonBlocks.GIMMIGHOUL_CHEST,
|
||||
CobblemonBlocks.DISPLAY_CASE,
|
||||
CobblemonBlocks.LECTERN
|
||||
CobblemonBlocks.LECTERN,
|
||||
CobblemonBlocks.STADIUM
|
||||
)
|
||||
|
||||
this.createBoatModelLayers()
|
||||
@@ -294,6 +291,7 @@ object CobblemonClient {
|
||||
this.implementation.registerBlockEntityRenderer(CobblemonBlockEntities.GILDED_CHEST, ::GildedChestBlockRenderer)
|
||||
this.implementation.registerBlockEntityRenderer(CobblemonBlockEntities.DISPLAY_CASE, ::DisplayCaseRenderer)
|
||||
this.implementation.registerBlockEntityRenderer(CobblemonBlockEntities.LECTERN, ::LecternBlockEntityRenderer)
|
||||
this.implementation.registerBlockEntityRenderer(CobblemonBlockEntities.STADIUM, ::StadiumBlockRenderer)
|
||||
}
|
||||
|
||||
private fun registerEntityRenderers() {
|
||||
|
||||
@@ -58,8 +58,8 @@ class NPCClientDelegate : PosableState(), NPCSideDelegate {
|
||||
|
||||
override fun addToStruct(struct: QueryStruct) {
|
||||
super.addToStruct(struct)
|
||||
struct.addFunctions(ClientMoLangFunctions.clientFunctions)
|
||||
struct.addFunctions(functions.functions)
|
||||
struct.addFunctions(ClientMoLangFunctions.clientFunctions)
|
||||
runtime.environment.query.addFunctions(struct.functions)
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -340,8 +340,8 @@ class PokemonClientDelegate : PosableState(), PokemonSideDelegate {
|
||||
|
||||
override fun addToStruct(struct: QueryStruct) {
|
||||
super.addToStruct(struct)
|
||||
struct.addFunctions(ClientMoLangFunctions.clientFunctions)
|
||||
struct.addFunctions(functions.functions)
|
||||
struct.addFunctions(ClientMoLangFunctions.clientFunctions)
|
||||
runtime.environment.query = struct
|
||||
}
|
||||
|
||||
|
||||
@@ -75,7 +75,6 @@ fun drawProfilePokemon(
|
||||
scale: Float = 20F,
|
||||
applyProfileTransform: Boolean = true,
|
||||
applyBaseScale: Boolean = false,
|
||||
doQuirks: Boolean = false,
|
||||
r: Float = 1F,
|
||||
g: Float = 1F,
|
||||
b: Float = 1F,
|
||||
@@ -102,7 +101,7 @@ fun drawProfilePokemon(
|
||||
context.put(RenderContext.ASPECTS, state.currentAspects)
|
||||
context.put(RenderContext.RENDER_STATE, RenderContext.RenderState.PROFILE)
|
||||
context.put(RenderContext.POSABLE_STATE, state)
|
||||
context.put(RenderContext.DO_QUIRKS, doQuirks)
|
||||
context.put(RenderContext.DO_QUIRKS, false)
|
||||
|
||||
state.currentModel = model
|
||||
|
||||
|
||||
@@ -321,7 +321,6 @@ class BattleOverlay : Gui(Minecraft.getInstance()), Schedulable {
|
||||
scale = 18F * (ballState?.scale ?: 1F) * if (isCompact) 0.65F else 1.0f,
|
||||
contextScale = species.getForm(state.currentAspects).baseScale,
|
||||
reversed = reversed,
|
||||
doQuirks = false,
|
||||
state = state,
|
||||
partialTicks = partialTicks
|
||||
)
|
||||
|
||||
-1
@@ -254,7 +254,6 @@ class BattleSwitchPokemonSelection(
|
||||
matrixStack = matrixStack,
|
||||
rotation = Quaternionf().fromEulerXYZDegrees(Vector3f(13F, 35F, 0F)),
|
||||
state = state,
|
||||
doQuirks = false,
|
||||
scale = 4.5F,
|
||||
partialTicks = deltaTicks
|
||||
)
|
||||
|
||||
-304
@@ -1,304 +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.client.gui.debug.riding
|
||||
|
||||
import com.cobblemon.mod.common.CobblemonNetwork
|
||||
import com.cobblemon.mod.common.api.riding.RidingStyle
|
||||
import com.cobblemon.mod.common.api.riding.stats.RidingStat
|
||||
import com.cobblemon.mod.common.api.text.text
|
||||
import com.cobblemon.mod.common.client.gui.CobblemonRenderable
|
||||
import com.cobblemon.mod.common.client.render.drawScaledText
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.cobblemon.mod.common.net.messages.server.debug.ServerboundUpdateRidingStatRangePacket
|
||||
import com.cobblemon.mod.common.net.messages.server.debug.ServerboundUpdateRidingStatsPacket
|
||||
import com.cobblemon.mod.common.util.lang
|
||||
import net.minecraft.client.Minecraft
|
||||
import net.minecraft.client.gui.GuiGraphics
|
||||
import net.minecraft.client.gui.components.AbstractSliderButton
|
||||
import net.minecraft.client.gui.components.Button
|
||||
import net.minecraft.client.gui.components.EditBox
|
||||
import net.minecraft.client.gui.screens.Screen
|
||||
import net.minecraft.network.chat.CommonComponents
|
||||
import net.minecraft.network.chat.Component
|
||||
import net.minecraft.util.Mth
|
||||
import java.awt.Color
|
||||
|
||||
class RidingStatsDebugGUI(val vehicle: PokemonEntity) : Screen(lang("ui.debug.riding_stats")), CobblemonRenderable {
|
||||
|
||||
var ridingStyle: RidingStyle = RidingStyle.LAND
|
||||
|
||||
val changeRidingStyle: Button
|
||||
|
||||
val speedSlider: SettingsSlider
|
||||
val accelerationSlider: SettingsSlider
|
||||
val skillSlider: SettingsSlider
|
||||
val jumpSlider: SettingsSlider
|
||||
val staminaSlider: SettingsSlider
|
||||
|
||||
val minSpeedInput: RidingStatInputWidget
|
||||
val maxSpeedInput: RidingStatInputWidget
|
||||
val minAccelerationInput: RidingStatInputWidget
|
||||
val maxAccelerationInput: RidingStatInputWidget
|
||||
val minSkillInput: RidingStatInputWidget
|
||||
val maxSkillInput: RidingStatInputWidget
|
||||
val minJumpInput: RidingStatInputWidget
|
||||
val maxJumpInput: RidingStatInputWidget
|
||||
val minStaminaInput: RidingStatInputWidget
|
||||
val maxStaminaInput: RidingStatInputWidget
|
||||
|
||||
init {
|
||||
ridingStyle = vehicle.ifRidingAvailableSupply(RidingStyle.LAND) { behaviour, settings, state ->
|
||||
behaviour.getRidingStyle(settings, state)
|
||||
}
|
||||
changeRidingStyle = addRenderableWidget(
|
||||
Button.builder("Riding Style: $ridingStyle".text()) { button ->
|
||||
ridingStyle = when (ridingStyle) {
|
||||
RidingStyle.LAND -> RidingStyle.LIQUID
|
||||
RidingStyle.LIQUID -> RidingStyle.AIR
|
||||
RidingStyle.AIR -> RidingStyle.LAND
|
||||
else -> RidingStyle.LAND
|
||||
}
|
||||
refresh()
|
||||
}.bounds(10, 10, getScaledWidth() - 20, 20).build()
|
||||
)
|
||||
speedSlider = addRenderableWidget(SettingsSlider(10, 60, 200, "Speed".text(), 0, 0f, 1f))
|
||||
accelerationSlider = addRenderableWidget(SettingsSlider(10, 90, 200, "Acceleration".text(), 0, 0f, 1f))
|
||||
skillSlider = addRenderableWidget(SettingsSlider(10, 120, 200, "Skill".text(), 0, 0f, 1f))
|
||||
jumpSlider = addRenderableWidget(SettingsSlider(10, 150, 200, "Jump".text(), 0, 0f, 1f))
|
||||
staminaSlider = addRenderableWidget(SettingsSlider(10, 180, 200, "Stamina".text(), 0, 0f, 1f))
|
||||
addRenderableWidget(
|
||||
Button.builder("Save".text()) { button ->
|
||||
saveStats()
|
||||
}.bounds(10, 210, 200, 20).build()
|
||||
)
|
||||
|
||||
minSpeedInput = addRenderableWidget(RidingStatInputWidget(getScaledWidth() - 210, 60, "".text()))
|
||||
maxSpeedInput = addRenderableWidget(RidingStatInputWidget(getScaledWidth() - 100, 60, "".text()))
|
||||
minAccelerationInput = addRenderableWidget(RidingStatInputWidget(getScaledWidth() - 210, 90, "".text()))
|
||||
maxAccelerationInput = addRenderableWidget(RidingStatInputWidget(getScaledWidth() - 100, 90, "".text()))
|
||||
minSkillInput = addRenderableWidget(RidingStatInputWidget(getScaledWidth() - 210, 120, "".text()))
|
||||
maxSkillInput = addRenderableWidget(RidingStatInputWidget(getScaledWidth() - 100, 120, "".text()))
|
||||
minJumpInput = addRenderableWidget(RidingStatInputWidget(getScaledWidth() - 210, 150, "".text()))
|
||||
maxJumpInput = addRenderableWidget(RidingStatInputWidget(getScaledWidth() - 100, 150, "".text()))
|
||||
minStaminaInput = addRenderableWidget(RidingStatInputWidget(getScaledWidth() - 210, 180, "".text()))
|
||||
maxStaminaInput = addRenderableWidget(RidingStatInputWidget(getScaledWidth() - 100, 180, "".text()))
|
||||
|
||||
addRenderableWidget(
|
||||
Button.builder("Save".text()) { button ->
|
||||
saveStatRanges()
|
||||
}.bounds(getScaledWidth() - 210, 220, 200, 20).build()
|
||||
)
|
||||
|
||||
refresh()
|
||||
}
|
||||
|
||||
fun refresh() {
|
||||
changeRidingStyle.message = "Riding Style: $ridingStyle".text()
|
||||
updateElementsForStat(RidingStat.SPEED, speedSlider, minSpeedInput, maxSpeedInput)
|
||||
updateElementsForStat(RidingStat.ACCELERATION, accelerationSlider, minAccelerationInput, maxAccelerationInput)
|
||||
updateElementsForStat(RidingStat.SKILL, skillSlider, minSkillInput, maxSkillInput)
|
||||
updateElementsForStat(RidingStat.JUMP, jumpSlider, minJumpInput, maxJumpInput)
|
||||
updateElementsForStat(RidingStat.STAMINA, staminaSlider, minStaminaInput, maxStaminaInput)
|
||||
}
|
||||
|
||||
fun saveStats() {
|
||||
val speed = speedSlider.currentValue
|
||||
val acceleration = accelerationSlider.currentValue
|
||||
val skill = skillSlider.currentValue
|
||||
val jump = jumpSlider.currentValue
|
||||
val stamina = staminaSlider.currentValue
|
||||
|
||||
vehicle.overrideRideStat(ridingStyle, RidingStat.SPEED, speed.toDouble())
|
||||
vehicle.overrideRideStat(ridingStyle, RidingStat.ACCELERATION, acceleration.toDouble())
|
||||
vehicle.overrideRideStat(ridingStyle, RidingStat.SKILL, skill.toDouble())
|
||||
vehicle.overrideRideStat(ridingStyle, RidingStat.JUMP, jump.toDouble())
|
||||
vehicle.overrideRideStat(ridingStyle, RidingStat.STAMINA, stamina.toDouble())
|
||||
|
||||
CobblemonNetwork.sendToServer(
|
||||
ServerboundUpdateRidingStatsPacket(
|
||||
vehicle.id,
|
||||
ridingStyle,
|
||||
speed.toDouble(),
|
||||
acceleration.toDouble(),
|
||||
skill.toDouble(),
|
||||
jump.toDouble(),
|
||||
stamina.toDouble()
|
||||
)
|
||||
)
|
||||
refresh()
|
||||
}
|
||||
|
||||
fun saveStatRanges() {
|
||||
val minSpeed = minSpeedInput.value.toIntOrNull() ?: getRidingStatRange(RidingStat.SPEED).first
|
||||
val maxSpeed = maxSpeedInput.value.toIntOrNull() ?: getRidingStatRange(RidingStat.SPEED).first
|
||||
val minAcceleration = minAccelerationInput.value.toIntOrNull() ?: getRidingStatRange(RidingStat.ACCELERATION).first
|
||||
val maxAcceleration = maxAccelerationInput.value.toIntOrNull() ?: getRidingStatRange(RidingStat.ACCELERATION).last
|
||||
val minSkill = minSkillInput.value.toIntOrNull() ?: getRidingStatRange(RidingStat.SKILL).first
|
||||
val maxSkill = maxSkillInput.value.toIntOrNull() ?: getRidingStatRange(RidingStat.SKILL).last
|
||||
val minJump = minJumpInput.value.toIntOrNull() ?: getRidingStatRange(RidingStat.JUMP).first
|
||||
val maxJump = maxJumpInput.value.toIntOrNull() ?: getRidingStatRange(RidingStat.JUMP).last
|
||||
val minStamina = minStaminaInput.value.toIntOrNull() ?: getRidingStatRange(RidingStat.STAMINA).first
|
||||
val maxStamina = maxStaminaInput.value.toIntOrNull() ?: getRidingStatRange(RidingStat.STAMINA).last
|
||||
|
||||
if (minSpeed < maxSpeed) {
|
||||
vehicle.rideProp.stats[RidingStat.SPEED]?.ranges?.put(ridingStyle, minSpeed..maxSpeed)
|
||||
}
|
||||
if (minAcceleration < maxAcceleration) {
|
||||
vehicle.rideProp.stats[RidingStat.ACCELERATION]?.ranges?.put(ridingStyle, minAcceleration..maxAcceleration)
|
||||
}
|
||||
if (minSkill < maxSkill) {
|
||||
vehicle.rideProp.stats[RidingStat.SKILL]?.ranges?.put(ridingStyle, minSkill..maxSkill)
|
||||
}
|
||||
if (minJump < maxJump) {
|
||||
vehicle.rideProp.stats[RidingStat.JUMP]?.ranges?.put(ridingStyle, minJump..maxJump)
|
||||
}
|
||||
if (minStamina < maxStamina) {
|
||||
vehicle.rideProp.stats[RidingStat.STAMINA]?.ranges?.put(ridingStyle, minStamina..maxStamina)
|
||||
}
|
||||
|
||||
CobblemonNetwork.sendToServer(
|
||||
ServerboundUpdateRidingStatRangePacket(
|
||||
vehicle.id,
|
||||
ridingStyle,
|
||||
minSpeed,
|
||||
maxSpeed,
|
||||
minAcceleration,
|
||||
maxAcceleration,
|
||||
minSkill,
|
||||
maxSkill,
|
||||
minJump,
|
||||
maxJump,
|
||||
minStamina,
|
||||
maxStamina
|
||||
)
|
||||
)
|
||||
refresh()
|
||||
}
|
||||
|
||||
fun updateElementsForStat(
|
||||
ridingStat: RidingStat,
|
||||
slider: SettingsSlider,
|
||||
minInput: RidingStatInputWidget,
|
||||
maxInput: RidingStatInputWidget
|
||||
) {
|
||||
val range = getRidingStatRange(ridingStat)
|
||||
|
||||
slider.update(getRidingStat(ridingStat), range.first.toFloat(), range.last.toFloat())
|
||||
minInput.setHint("Min: ${range.first}".text())
|
||||
maxInput.setHint("Max: ${range.last}".text())
|
||||
}
|
||||
|
||||
fun getRidingStat(ridingStat: RidingStat): Int {
|
||||
return vehicle.getRawRideStat(ridingStat, ridingStyle).toInt()
|
||||
}
|
||||
|
||||
fun getRidingStatRange(ridingStat: RidingStat): IntRange {
|
||||
return vehicle.rideProp.stats[ridingStat]?.ranges?.get(ridingStyle) ?: 0..0
|
||||
}
|
||||
|
||||
fun getScaledWidth() = Minecraft.getInstance().window.guiScaledWidth
|
||||
|
||||
override fun render(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, partialTick: Float) {
|
||||
guiGraphics.fill(0, 0, width, height, Color(0, 0, 0, 100).rgb)
|
||||
super.render(guiGraphics, mouseX, mouseY, partialTick)
|
||||
drawScaledText(
|
||||
context = guiGraphics,
|
||||
text = "Pokemon Stats Editor".text(),
|
||||
x = 10,
|
||||
y = 40,
|
||||
)
|
||||
|
||||
drawScaledText(
|
||||
context = guiGraphics,
|
||||
text = "Species Stat Range Editor".text(),
|
||||
x = getScaledWidth() - 210,
|
||||
y = 40,
|
||||
)
|
||||
|
||||
drawScaledText(
|
||||
context = guiGraphics,
|
||||
text = "Speed".text(),
|
||||
x = getScaledWidth() - 285,
|
||||
y = 70,
|
||||
)
|
||||
|
||||
drawScaledText(
|
||||
context = guiGraphics,
|
||||
text = "Acceleration".text(),
|
||||
x = getScaledWidth() - 285,
|
||||
y = 100,
|
||||
)
|
||||
|
||||
drawScaledText(
|
||||
context = guiGraphics,
|
||||
text = "Skill".text(),
|
||||
x = getScaledWidth() - 285,
|
||||
y = 130,
|
||||
)
|
||||
|
||||
drawScaledText(
|
||||
context = guiGraphics,
|
||||
text = "Jump".text(),
|
||||
x = getScaledWidth() - 285,
|
||||
y = 160,
|
||||
)
|
||||
|
||||
drawScaledText(
|
||||
context = guiGraphics,
|
||||
text = "Stamina".text(),
|
||||
x = getScaledWidth() - 285,
|
||||
y = 190,
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class SettingsSlider(x: Int, y: Int, width: Int, val label: Component, value: Int, private var minValue: Float, private var maxValue: Float) :
|
||||
AbstractSliderButton(x, y, width, 20, CommonComponents.EMPTY, 0.0) {
|
||||
|
||||
var currentValue: Int
|
||||
get() = ((this.value * (maxValue - minValue)) + minValue).toInt()
|
||||
set(value) {
|
||||
this.value = ((Mth.clamp(value.toFloat(), minValue, maxValue) - minValue) / (maxValue - minValue)).toDouble()
|
||||
}
|
||||
|
||||
init {
|
||||
currentValue = value
|
||||
}
|
||||
|
||||
fun update(value: Int, min: Float, max: Float) {
|
||||
minValue = min
|
||||
maxValue = max
|
||||
currentValue = value
|
||||
refresh()
|
||||
}
|
||||
|
||||
override fun applyValue() {}
|
||||
|
||||
fun refresh() {
|
||||
this.updateMessage()
|
||||
}
|
||||
|
||||
override fun updateMessage() {
|
||||
this.message = CommonComponents.optionNameValue(label, "$currentValue".text())
|
||||
}
|
||||
}
|
||||
|
||||
class RidingStatInputWidget(x: Int, y: Int, val hint: Component) : EditBox(
|
||||
Minecraft.getInstance().font,
|
||||
x,
|
||||
y,
|
||||
90,
|
||||
30,
|
||||
Component.literal("Enter command")
|
||||
) {
|
||||
init {
|
||||
setHint(hint)
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.client.gui.pc
|
||||
import com.cobblemon.mod.common.CobblemonSounds
|
||||
import com.cobblemon.mod.common.api.gui.blitk
|
||||
import com.cobblemon.mod.common.api.pokemon.PokemonSortMode
|
||||
import com.cobblemon.mod.common.api.pokemon.stats.Stats
|
||||
import com.cobblemon.mod.common.api.storage.pc.search.Search
|
||||
import com.cobblemon.mod.common.api.text.bold
|
||||
import com.cobblemon.mod.common.api.text.text
|
||||
@@ -20,9 +19,6 @@ import com.cobblemon.mod.common.client.gui.CobblemonRenderable
|
||||
import com.cobblemon.mod.common.client.gui.ExitButton
|
||||
import com.cobblemon.mod.common.client.gui.TypeIcon
|
||||
import com.cobblemon.mod.common.client.gui.summary.Summary
|
||||
import com.cobblemon.mod.common.client.gui.summary.Summary.Companion.iconCosmeticItemResource
|
||||
import com.cobblemon.mod.common.client.gui.summary.Summary.Companion.iconHeldItemResource
|
||||
import com.cobblemon.mod.common.client.gui.summary.SummaryButton
|
||||
import com.cobblemon.mod.common.client.gui.summary.widgets.MarkingsWidget
|
||||
import com.cobblemon.mod.common.client.gui.summary.widgets.ModelWidget
|
||||
import com.cobblemon.mod.common.client.gui.summary.widgets.common.reformatNatureTextIfMinted
|
||||
@@ -59,40 +55,20 @@ class PCGUI(
|
||||
companion object {
|
||||
const val BASE_WIDTH = 349
|
||||
const val BASE_HEIGHT = 205
|
||||
const val INFO_BOX_WIDTH = 63
|
||||
const val INFO_BOX_HEIGHT = 69
|
||||
const val RIGHT_PANEL_WIDTH = 82
|
||||
const val RIGHT_PANEL_HEIGHT = 169
|
||||
const val TYPE_SPACER_WIDTH = 126
|
||||
const val TYPE_SPACER_WIDTH = 128
|
||||
const val TYPE_SPACER_HEIGHT = 12
|
||||
const val PC_SPACER_WIDTH = 342
|
||||
const val PC_SPACER_HEIGHT = 14
|
||||
const val PORTRAIT_SIZE = 66
|
||||
const val SCALE = 0.5F
|
||||
|
||||
const val STAT_INFO = 0
|
||||
const val STAT_IV = 1
|
||||
const val STAT_EV = 2
|
||||
|
||||
private val statLabels = arrayOf(
|
||||
lang("ui.stats.hp"),
|
||||
lang("ui.stats.atk"),
|
||||
lang("ui.stats.def"),
|
||||
lang("ui.stats.sp_atk"),
|
||||
lang("ui.stats.sp_def"),
|
||||
lang("ui.stats.speed")
|
||||
)
|
||||
|
||||
private val stats = arrayOf(Stats.HP, Stats.ATTACK, Stats.DEFENCE, Stats.SPECIAL_ATTACK, Stats.SPECIAL_DEFENCE, Stats.SPEED)
|
||||
|
||||
private val baseResource = cobblemonResource("textures/gui/pc/pc_base.png")
|
||||
private val portraitBackgroundResource = cobblemonResource("textures/gui/pc/portrait_background.png")
|
||||
private val infoBoxResource = cobblemonResource("textures/gui/pc/info_box.png")
|
||||
private val infoBoxStatResource = cobblemonResource("textures/gui/pc/info_box_stats.png")
|
||||
|
||||
private val buttonOptionsResource = cobblemonResource("textures/gui/pc/pc_icon_options.png")
|
||||
private val buttonWallpaperResource = cobblemonResource("textures/gui/pc/pc_button_set_wallpaper.png")
|
||||
private val buttonInfoArrow = cobblemonResource("textures/gui/pc/info_arrow.png")
|
||||
|
||||
private val topSpacerResource = cobblemonResource("textures/gui/pc/pc_spacer_top.png")
|
||||
private val bottomSpacerResource = cobblemonResource("textures/gui/pc/pc_spacer_bottom.png")
|
||||
@@ -111,9 +87,6 @@ class PCGUI(
|
||||
internal var previewPokemon: Pokemon? = null
|
||||
var isPreviewInParty: Boolean? = null
|
||||
|
||||
private var showCosmeticItem = false
|
||||
private var currentStatIndex = 0
|
||||
|
||||
private val optionButtons: MutableList<IconButton> = mutableListOf()
|
||||
|
||||
var search: Search = Search.DEFAULT
|
||||
@@ -271,37 +244,6 @@ class PCGUI(
|
||||
|
||||
this.markingsWidget = MarkingsWidget(x + 29, y + 96.5, null, false)
|
||||
this.addRenderableWidget(markingsWidget)
|
||||
|
||||
// Held/Cosmetic Item Button
|
||||
addRenderableWidget(
|
||||
SummaryButton(
|
||||
buttonX = x + 67F,
|
||||
buttonY = y + 107F,
|
||||
buttonWidth = 12,
|
||||
buttonHeight = 12,
|
||||
scale = 0.5F,
|
||||
resource = iconCosmeticItemResource,
|
||||
activeResource = iconHeldItemResource,
|
||||
clickAction = {
|
||||
showCosmeticItem = !showCosmeticItem
|
||||
(it as SummaryButton).buttonActive = showCosmeticItem
|
||||
}
|
||||
)
|
||||
)
|
||||
|
||||
addRenderableWidget(
|
||||
IconButton(
|
||||
pX = x + 1,
|
||||
pY = y + 157,
|
||||
buttonWidth = 10,
|
||||
buttonHeight = 16,
|
||||
resource = buttonInfoArrow,
|
||||
label = "switch"
|
||||
) {
|
||||
currentStatIndex = (currentStatIndex + 1) % 3
|
||||
}
|
||||
)
|
||||
|
||||
this.setPreviewPokemon(null)
|
||||
|
||||
super.init()
|
||||
@@ -338,68 +280,33 @@ class PCGUI(
|
||||
height = BASE_HEIGHT
|
||||
)
|
||||
|
||||
// Render Info Box
|
||||
blitk(
|
||||
matrixStack = matrices,
|
||||
texture = if (currentStatIndex > 0) infoBoxStatResource else infoBoxResource,
|
||||
x = x + 9,
|
||||
y = y + 128,
|
||||
width = INFO_BOX_WIDTH,
|
||||
height = INFO_BOX_HEIGHT
|
||||
// Render Info Labels
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = lang("ui.info.nature").bold(),
|
||||
x = x + 39,
|
||||
y = y + 129.5,
|
||||
centered = true,
|
||||
scale = SCALE
|
||||
)
|
||||
|
||||
val labelX = x + 9 + (INFO_BOX_WIDTH / 2)
|
||||
// Render Info Labels
|
||||
when (currentStatIndex) {
|
||||
STAT_INFO -> {
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = lang("ui.info.nature").bold(),
|
||||
x = labelX,
|
||||
y = y + 129.5,
|
||||
centered = true,
|
||||
scale = SCALE
|
||||
)
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = lang("ui.info.ability").bold(),
|
||||
x = x + 39,
|
||||
y = y + 146.5,
|
||||
centered = true,
|
||||
scale = SCALE
|
||||
)
|
||||
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = lang("ui.info.ability").bold(),
|
||||
x = labelX,
|
||||
y = y + 146.5,
|
||||
centered = true,
|
||||
scale = SCALE
|
||||
)
|
||||
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = lang("ui.moves").bold(),
|
||||
x = labelX,
|
||||
y = y + 163.5,
|
||||
centered = true,
|
||||
scale = SCALE
|
||||
)
|
||||
}
|
||||
STAT_IV -> {
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = lang("ui.stats.ivs").bold(),
|
||||
x = labelX,
|
||||
y = y + 129.5,
|
||||
centered = true,
|
||||
scale = SCALE
|
||||
)
|
||||
}
|
||||
STAT_EV -> {
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = lang("ui.stats.evs").bold(),
|
||||
x = labelX,
|
||||
y = y + 129.5,
|
||||
centered = true,
|
||||
scale = SCALE
|
||||
)
|
||||
}
|
||||
}
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = lang("ui.moves").bold(),
|
||||
x = x + 39,
|
||||
y = y + 163.5,
|
||||
centered = true,
|
||||
scale = SCALE
|
||||
)
|
||||
|
||||
// Render Pokemon Info
|
||||
val pokemon = previewPokemon
|
||||
@@ -491,19 +398,19 @@ class PCGUI(
|
||||
)
|
||||
}
|
||||
|
||||
// Held/Cosmetic Item
|
||||
val displayedItem = if (showCosmeticItem) pokemon.cosmeticItem else pokemon.heldItemNoCopy()
|
||||
// Held Item
|
||||
val heldItem = pokemon.heldItemNoCopy()
|
||||
val itemX = x + 3
|
||||
val itemY = y + 98
|
||||
if (!displayedItem.isEmpty) {
|
||||
context.renderItem(displayedItem, itemX, itemY)
|
||||
context.renderItemDecorations(Minecraft.getInstance().font, displayedItem, itemX, itemY)
|
||||
if (!heldItem.isEmpty) {
|
||||
context.renderItem(heldItem, itemX, itemY)
|
||||
context.renderItemDecorations(Minecraft.getInstance().font, heldItem, itemX, itemY)
|
||||
}
|
||||
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = lang("${if (showCosmeticItem) "cosmetic" else "held"}_item"),
|
||||
x = x + 24,
|
||||
text = lang("held_item"),
|
||||
x = x + 27,
|
||||
y = y + 108.5,
|
||||
scale = SCALE
|
||||
)
|
||||
@@ -524,7 +431,7 @@ class PCGUI(
|
||||
blitk(
|
||||
matrixStack = matrices,
|
||||
texture = if (pokemon.secondaryType != null) typeSpacerDoubleResource else typeSpacerSingleResource,
|
||||
x = (x + 9) / SCALE,
|
||||
x = (x + 7) / SCALE,
|
||||
y = (y + 118.5) / SCALE,
|
||||
width = TYPE_SPACER_WIDTH,
|
||||
height = TYPE_SPACER_HEIGHT,
|
||||
@@ -532,7 +439,7 @@ class PCGUI(
|
||||
)
|
||||
|
||||
TypeIcon(
|
||||
x = x + 40.5,
|
||||
x = x + 39,
|
||||
y = y + 117,
|
||||
type = pokemon.primaryType,
|
||||
secondaryType = pokemon.secondaryType,
|
||||
@@ -542,91 +449,43 @@ class PCGUI(
|
||||
centeredX = true
|
||||
).render(context)
|
||||
|
||||
when (currentStatIndex) {
|
||||
STAT_INFO -> {
|
||||
// Nature
|
||||
val natureText = reformatNatureTextIfMinted(pokemon)
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = natureText,
|
||||
x = labelX,
|
||||
y = y + 137,
|
||||
centered = true,
|
||||
shadow = true,
|
||||
scale = SCALE,
|
||||
pMouseX = mouseX,
|
||||
pMouseY = mouseY
|
||||
)
|
||||
// Nature
|
||||
val natureText = reformatNatureTextIfMinted(pokemon)
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = natureText,
|
||||
x = x + 39,
|
||||
y = y + 137,
|
||||
centered = true,
|
||||
shadow = true,
|
||||
scale = SCALE,
|
||||
pMouseX = mouseX,
|
||||
pMouseY = mouseY
|
||||
)
|
||||
|
||||
// Ability
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = pokemon.ability.displayName.asTranslated(),
|
||||
x = labelX,
|
||||
y = y + 154,
|
||||
centered = true,
|
||||
shadow = true,
|
||||
scale = SCALE
|
||||
)
|
||||
// Ability
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = pokemon.ability.displayName.asTranslated(),
|
||||
x = x + 39,
|
||||
y = y + 154,
|
||||
centered = true,
|
||||
shadow = true,
|
||||
scale = SCALE
|
||||
)
|
||||
|
||||
// Moves
|
||||
val moves = pokemon.moveSet.getMoves()
|
||||
for (i in moves.indices) {
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = moves[i].displayName,
|
||||
x = labelX,
|
||||
y = y + 170.5 + (7 * i),
|
||||
centered = true,
|
||||
shadow = true,
|
||||
scale = SCALE
|
||||
)
|
||||
}
|
||||
}
|
||||
STAT_IV -> {
|
||||
for (i in statLabels.indices) {
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = statLabels[i],
|
||||
x = x + 13,
|
||||
y = y + 139 + (10 * i),
|
||||
shadow = true,
|
||||
scale = SCALE
|
||||
)
|
||||
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = pokemon.ivs.get(stats[i]).toString().text(),
|
||||
x = x + 65,
|
||||
y = y + 139 + (10 * i),
|
||||
centered = true,
|
||||
shadow = true,
|
||||
scale = SCALE
|
||||
)
|
||||
}
|
||||
}
|
||||
STAT_EV -> {
|
||||
for (i in statLabels.indices) {
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = statLabels[i],
|
||||
x = x + 13,
|
||||
y = y + 139 + (10 * i),
|
||||
shadow = true,
|
||||
scale = SCALE
|
||||
)
|
||||
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = pokemon.evs.get(stats[i]).toString().text(),
|
||||
x = x + 65,
|
||||
y = y + 139 + (10 * i),
|
||||
centered = true,
|
||||
shadow = true,
|
||||
scale = SCALE
|
||||
)
|
||||
}
|
||||
}
|
||||
// Moves
|
||||
val moves = pokemon.moveSet.getMoves()
|
||||
for (i in moves.indices) {
|
||||
drawScaledText(
|
||||
context = context,
|
||||
text = moves[i].displayName,
|
||||
x = x + 39,
|
||||
y = y + 170.5 + (7 * i),
|
||||
centered = true,
|
||||
shadow = true,
|
||||
scale = SCALE
|
||||
)
|
||||
}
|
||||
|
||||
} else {
|
||||
@@ -678,14 +537,17 @@ class PCGUI(
|
||||
super.render(context, mouseX, mouseY, delta)
|
||||
|
||||
// Item Tooltip
|
||||
if (pokemon != null) {
|
||||
val displayedItem = if (showCosmeticItem) pokemon.cosmeticItem else pokemon.heldItemNoCopy()
|
||||
if (pokemon != null && !pokemon.heldItemNoCopy().isEmpty) {
|
||||
val itemX = x + 3
|
||||
val itemY = y + 98
|
||||
if (!displayedItem.isEmpty) {
|
||||
val itemHovered = mouseX.toFloat() in (itemX.toFloat()..(itemX.toFloat() + 16)) && mouseY.toFloat() in (itemY.toFloat()..(itemY.toFloat() + 16))
|
||||
if (itemHovered) context.renderTooltip(Minecraft.getInstance().font, displayedItem, mouseX, mouseY)
|
||||
}
|
||||
val itemHovered =
|
||||
mouseX.toFloat() in (itemX.toFloat()..(itemX.toFloat() + 16)) && mouseY.toFloat() in (itemY.toFloat()..(itemY.toFloat() + 16))
|
||||
if (itemHovered) context.renderTooltip(
|
||||
Minecraft.getInstance().font,
|
||||
pokemon.heldItemNoCopy(),
|
||||
mouseX,
|
||||
mouseY
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-21
@@ -10,12 +10,10 @@ package com.cobblemon.mod.common.client.keybind.keybinds
|
||||
|
||||
import com.cobblemon.mod.common.Cobblemon
|
||||
import com.cobblemon.mod.common.client.CobblemonClient
|
||||
import com.cobblemon.mod.common.client.gui.debug.riding.RidingStatsDebugGUI
|
||||
import com.cobblemon.mod.common.client.keybind.CobblemonKeyBinding
|
||||
import com.cobblemon.mod.common.client.keybind.KeybindCategories
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.mojang.blaze3d.platform.InputConstants
|
||||
import net.minecraft.client.Minecraft
|
||||
import net.minecraft.network.chat.Component
|
||||
@@ -28,10 +26,8 @@ object DebugKeybindings {
|
||||
TranslateRightKeybinding(),
|
||||
TranslateUpKeybinding(),
|
||||
TranslateDownKeybinding(),
|
||||
PrintModelSettingsKeybinding(),
|
||||
ToggleRidingStatsDebugGUIKeybinding()
|
||||
PrintModelSettingsKeybinding()
|
||||
)
|
||||
|
||||
class ScaleUpKeybinding: CobblemonKeyBinding(
|
||||
"key.cobblemon.scaleportraitup",
|
||||
InputConstants.Type.KEYSYM,
|
||||
@@ -149,19 +145,4 @@ object DebugKeybindings {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class ToggleRidingStatsDebugGUIKeybinding : CobblemonKeyBinding(
|
||||
"key.cobblemon.toggleridingstatsgui",
|
||||
InputConstants.Type.KEYSYM,
|
||||
InputConstants.KEY_SEMICOLON,
|
||||
KeybindCategories.COBBLEMON_DEBUG_CATEGORY
|
||||
) {
|
||||
override fun onPress() {
|
||||
val vehicle = Minecraft.getInstance().player?.vehicle ?: return
|
||||
if (vehicle is PokemonEntity) {
|
||||
Minecraft.getInstance().setScreen(RidingStatsDebugGUI(vehicle))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -282,12 +282,12 @@ class PokedexScannerRenderer {
|
||||
val effectiveIntervals = clamp(usageContext.transitionIntervals + (if (usageContext.scanningGuiOpen) 1 else -1) * tickDelta, 0F, 12F)
|
||||
|
||||
if (effectiveIntervals <= PokedexUsageContext.TRANSITION_INTERVALS) {
|
||||
val scale = 1F + (if (effectiveIntervals <= 2) 0F else ((effectiveIntervals - 2) * 0.075F))
|
||||
val scale = 1 + (if (effectiveIntervals <= 2) 0F else ((effectiveIntervals - 2) * 0.075F))
|
||||
|
||||
val centerX = (screenWidth - (BASE_WIDTH * scale)) / 2
|
||||
val centerY = (screenHeight - (BASE_HEIGHT * scale)) / 2
|
||||
|
||||
val opacity = if (effectiveIntervals > 11) 0F else effectiveIntervals / PokedexUsageContext.TRANSITION_INTERVALS
|
||||
val opacity = if (effectiveIntervals <= 2) 1F else (10F - (effectiveIntervals - 2F)) / 10F
|
||||
blitk(matrixStack = matrices, texture = CobblemonClient.pokedexUsageContext.type.getTexturePath(), x = centerX / scale, y = centerY / scale, width = BASE_WIDTH, height = BASE_HEIGHT, scale = scale, alpha = opacity)
|
||||
blitk(matrixStack = matrices, texture = SCAN_SCREEN, x = centerX / scale, y = centerY / scale, width = BASE_WIDTH, height = BASE_HEIGHT, scale = scale, alpha = opacity)
|
||||
}
|
||||
|
||||
+209
@@ -0,0 +1,209 @@
|
||||
/*
|
||||
* 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.client.render.block
|
||||
|
||||
import com.cobblemon.mod.common.CobblemonBlocks
|
||||
import com.cobblemon.mod.common.block.entity.StadiumBlockEntity
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.drone.DroneModel
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.drone.DroneState
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository
|
||||
import com.cobblemon.mod.common.util.cobblemonResource
|
||||
import com.mojang.blaze3d.vertex.PoseStack
|
||||
import com.mojang.math.Axis
|
||||
import net.minecraft.client.renderer.MultiBufferSource
|
||||
import net.minecraft.client.renderer.RenderType
|
||||
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer
|
||||
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture
|
||||
import net.minecraft.core.Direction
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
import net.minecraft.world.level.block.HorizontalDirectionalBlock
|
||||
import net.minecraft.world.level.block.state.BlockState
|
||||
|
||||
class StadiumBlockRenderer(ctx: BlockEntityRendererProvider.Context) : BlockEntityRenderer<StadiumBlockEntity> {
|
||||
val context = RenderContext().also {
|
||||
it.put(RenderContext.DO_QUIRKS, false)
|
||||
it.put(RenderContext.RENDER_STATE, RenderContext.RenderState.BLOCK)
|
||||
}
|
||||
|
||||
private var pathIndex = 0
|
||||
private var animationTime = 0.0
|
||||
private val droneSpeed = 0.10
|
||||
|
||||
override fun render(
|
||||
blockEntity: StadiumBlockEntity,
|
||||
partialTick: Float,
|
||||
poseStack: PoseStack,
|
||||
bufferSource: MultiBufferSource,
|
||||
packedLight: Int,
|
||||
packedOverlay: Int
|
||||
) {
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
override fun render(
|
||||
blockEntity: StadiumBlockEntity,
|
||||
tickDelta: Float,
|
||||
poseStack: PoseStack,
|
||||
multiBufferSource: MultiBufferSource,
|
||||
light: Int,
|
||||
overlay: Int
|
||||
) {
|
||||
val blockState = blockEntity.blockState
|
||||
val yRot = blockState.getValue(HorizontalDirectionalBlock.FACING).toYRot()
|
||||
|
||||
val isClientSide = blockEntity.level?.isClientSide == true
|
||||
if (!isClientSide) return
|
||||
|
||||
val stadiumBlockState = blockEntity.level?.getBlockState(blockEntity.blockPos) ?: return
|
||||
if (stadiumBlockState.block != CobblemonBlocks.STADIUM) {
|
||||
return
|
||||
}
|
||||
|
||||
val droneState = blockEntity.droneState
|
||||
|
||||
|
||||
poseStack.pushPose()
|
||||
if (blockEntity.isInUse) {
|
||||
if (blockEntity.pathPoints.isEmpty()) {
|
||||
|
||||
poseStack.popPose()
|
||||
return
|
||||
}
|
||||
|
||||
spawnDebugParticles(blockEntity) // debug particles
|
||||
|
||||
// Center the drone at the block's center
|
||||
poseStack.translate(0.5, -3.0, 0.5)
|
||||
//poseStack.mulPose(Axis.XP.rotationDegrees(180F))
|
||||
//poseStack.mulPose(Axis.YP.rotationDegrees(180F))
|
||||
|
||||
val points = blockEntity.pathPoints
|
||||
val nextIndex = (pathIndex + 1) % points.size
|
||||
|
||||
val currentPoint = points[pathIndex]
|
||||
val nextPoint = points[nextIndex]
|
||||
|
||||
animationTime += tickDelta * droneSpeed
|
||||
if (animationTime >= 1.0) {
|
||||
animationTime = 0.0
|
||||
pathIndex = nextIndex
|
||||
}
|
||||
|
||||
val interpolatedPos = currentPoint.lerp(nextPoint, animationTime.toDouble())
|
||||
|
||||
println("DEBUG: Drone moving between points:")
|
||||
println(" - Current Point: ${currentPoint}")
|
||||
println(" - Next Point: ${nextPoint}")
|
||||
println(" - Interpolated Position: $interpolatedPos")
|
||||
|
||||
poseStack.translate(interpolatedPos.x - blockEntity.blockPos.x,
|
||||
interpolatedPos.y - blockEntity.blockPos.y,
|
||||
interpolatedPos.z - blockEntity.blockPos.z)
|
||||
|
||||
println("DEBUG: Drone position interpolated to: $interpolatedPos")
|
||||
|
||||
poseStack.mulPose(Axis.YP.rotationDegrees(-yRot))
|
||||
poseStack.mulPose(Axis.ZP.rotationDegrees(180F)) // flip the drone right side up
|
||||
|
||||
renderDrone(droneState, "sleep", tickDelta, poseStack, 1.0F, multiBufferSource, light)
|
||||
} else {
|
||||
val yRot = blockState.getValue(HorizontalDirectionalBlock.FACING).toYRot()
|
||||
|
||||
val poseEntry = poseStack.last()
|
||||
val matrix = poseEntry.pose()
|
||||
|
||||
poseStack.translate(0.5, 0.0, 0.5)
|
||||
poseStack.mulPose(Axis.YP.rotationDegrees(yRot))
|
||||
|
||||
val posX = matrix.m03()
|
||||
val posY = matrix.m13()
|
||||
val posZ = matrix.m23()
|
||||
|
||||
println("DEBUG: Drone is NOT in use. Rendering default position at: x=$posX, y=$posY, z=$posZ")
|
||||
|
||||
poseStack.mulPose(Axis.ZP.rotationDegrees(180F))
|
||||
renderDrone(droneState, "sleep", tickDelta, poseStack, 1.0F, multiBufferSource, light)
|
||||
}
|
||||
|
||||
poseStack.popPose()
|
||||
}
|
||||
|
||||
fun renderDrone(
|
||||
state: DroneState,
|
||||
pose: String,
|
||||
tickDelta: Float,
|
||||
poseStack: PoseStack,
|
||||
scale: Float = 1F,
|
||||
multiBufferSource: MultiBufferSource,
|
||||
light: Int,
|
||||
) {
|
||||
state.updatePartialTicks(tickDelta)
|
||||
|
||||
val droneResource: ResourceLocation = cobblemonResource("rotom_drone")
|
||||
|
||||
val model = VaryingModelRepository.getPoser(droneResource, state) as DroneModel
|
||||
val texture = VaryingModelRepository.getTexture(droneResource, state)
|
||||
|
||||
val buffer = multiBufferSource.getBuffer(RenderType.entityCutout(texture))
|
||||
model.bufferProvider = multiBufferSource
|
||||
|
||||
state.currentModel = model
|
||||
state.setPose(pose)
|
||||
|
||||
model.context = context
|
||||
context.put(RenderContext.TEXTURE, texture)
|
||||
context.put(RenderContext.RENDER_STATE, RenderContext.RenderState.BLOCK)
|
||||
context.put(RenderContext.POSABLE_STATE, state)
|
||||
|
||||
model.applyAnimations(
|
||||
entity = null,
|
||||
state = state,
|
||||
headYaw = 0F,
|
||||
headPitch = 0F,
|
||||
limbSwing = 0F,
|
||||
limbSwingAmount = 0F,
|
||||
ageInTicks = state.animationSeconds * 20
|
||||
)
|
||||
|
||||
poseStack.scale(scale, scale, scale)
|
||||
|
||||
// TODO: Make drone lighting dynamic (simply using the light arg makes the drone always appear dark)
|
||||
model.withLayerContext(multiBufferSource, state, VaryingModelRepository.getLayers(droneResource, state)) {
|
||||
model.render(context, poseStack, buffer, 200, OverlayTexture.NO_OVERLAY, -0x1)
|
||||
}
|
||||
model.setDefault()
|
||||
}
|
||||
|
||||
private fun spawnDebugParticles(blockEntity: StadiumBlockEntity) {
|
||||
val world = blockEntity.level ?: return
|
||||
if (!world.isClientSide) return // Only run on the client-side
|
||||
|
||||
for (point in blockEntity.pathPoints) {
|
||||
world.addParticle(
|
||||
net.minecraft.core.particles.ParticleTypes.FLAME, // Test particle (changeable)
|
||||
point.x, point.y, point.z, // Position of the particle
|
||||
0.0, 0.02, 0.0 // Slight upward motion
|
||||
)
|
||||
}
|
||||
|
||||
// Spawn a special particle at the next interpolation point
|
||||
if (blockEntity.pathPoints.isNotEmpty()) {
|
||||
val nextPoint = blockEntity.pathPoints[(pathIndex + 1) % blockEntity.pathPoints.size]
|
||||
world.addParticle(
|
||||
net.minecraft.core.particles.ParticleTypes.END_ROD, // Different effect for next point
|
||||
nextPoint.x, nextPoint.y, nextPoint.z,
|
||||
0.0, 0.05, 0.0
|
||||
)
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
+4
-5
@@ -90,17 +90,16 @@ class HeldItemRenderer {
|
||||
poseStack.mulPose(Axis.XP.rotationDegrees(90.0f))
|
||||
}
|
||||
ItemDisplayContext.THIRD_PERSON_RIGHT_HAND, ItemDisplayContext.THIRD_PERSON_LEFT_HAND -> {
|
||||
val isLeft = displayContext==ItemDisplayContext.THIRD_PERSON_LEFT_HAND
|
||||
//For Minecraft player models
|
||||
if (state is NPCClientDelegate) {
|
||||
poseStack.mulPose(Axis.XP.rotationDegrees(-90.0f))
|
||||
poseStack.translate(0.025f * if (isLeft) 1 else -1 , 0.0f, 0.0f)
|
||||
poseStack.mulPose(Axis.XP.rotationDegrees(-90.0F))
|
||||
}
|
||||
//for T-Posing Models
|
||||
else if (state is PokemonClientDelegate || state is FloatingState) {
|
||||
poseStack.mulPose(Axis.YP.rotationDegrees(-90.0f * if (isLeft) -1f else 1f))
|
||||
poseStack.mulPose(Axis.ZP.rotationDegrees(90.0f * if (isLeft) -1f else 1f))
|
||||
poseStack.mulPose(Axis.YP.rotationDegrees(-90.0F))
|
||||
poseStack.mulPose(Axis.ZP.rotationDegrees(90.0F))
|
||||
}
|
||||
poseStack.translate(0.025f * if (displayContext==ItemDisplayContext.THIRD_PERSON_LEFT_HAND) 1 else -1 , 0.0f, 0.0f)
|
||||
}
|
||||
ItemDisplayContext.HEAD -> {
|
||||
if (state is NPCClientDelegate) {
|
||||
|
||||
+7
-8
@@ -102,7 +102,8 @@ abstract class PosableState : Schedulable {
|
||||
val allActiveAnimations: List<ActiveAnimation> get() = activeAnimations + quirks.flatMap { it.value.animations }
|
||||
|
||||
/** The tick-driven age of the state. Combines with [currentPartialTicks] to produce the animation seconds. */
|
||||
protected var age = 0
|
||||
var age = 0
|
||||
protected set
|
||||
/**
|
||||
* The partial tick value of the state. Combines with [age] to produce the animation seconds. For entity-based state
|
||||
* this will be consistently reset to a new value, whereas non-entity-based state will increment this value.
|
||||
@@ -272,19 +273,17 @@ abstract class PosableState : Schedulable {
|
||||
.addFunction("has_entity") { DoubleValue(getEntity() != null) }
|
||||
.addFunction("pose") { StringValue(currentPose ?: "") }
|
||||
.addFunction("sound") { params ->
|
||||
val entity = getEntity() ?: return@addFunction Unit
|
||||
if (params.get<MoValue>(0) !is StringValue) {
|
||||
return@addFunction Unit
|
||||
}
|
||||
val entity = getEntity()
|
||||
val soundEvent = SoundEvent.createVariableRangeEvent(params.getString(0).asIdentifierDefaultingNamespace())
|
||||
if (soundEvent != null) {
|
||||
val volume = if (params.contains(1)) params.getDouble(1).toFloat() else 1F
|
||||
val pitch = if (params.contains(2)) params.getDouble(2).toFloat() else 1F
|
||||
if (entity != null) {
|
||||
entity.level().playLocalSound(entity, soundEvent, entity.soundSource, volume, pitch)
|
||||
} else {
|
||||
Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(soundEvent, volume, pitch))
|
||||
}
|
||||
Minecraft.getInstance().soundManager.play(
|
||||
SimpleSoundInstance(soundEvent, SoundSource.NEUTRAL, volume, pitch, entity.level().random, entity.x, entity.y, entity.z)
|
||||
)
|
||||
}
|
||||
}
|
||||
.addFunction("render_item") { params ->
|
||||
@@ -564,4 +563,4 @@ abstract class PosableState : Schedulable {
|
||||
1F
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+7
-5
@@ -198,9 +198,11 @@ data class BedrockAnimation(
|
||||
|
||||
boneTimelines.forEach { (boneName, timeline) ->
|
||||
val part = relevantPartsByName[boneName] ?: if (boneName == "root_part") (rootPart as? ModelPart) else null
|
||||
val isCamera = boneName == "locator_camera"
|
||||
val scalar = if (isCamera) 1.0 else intensity.toDouble()
|
||||
if (part !== null) {
|
||||
if (!timeline.position.isEmpty()) {
|
||||
val position = timeline.position.resolve(animationSeconds.toDouble(), runtime).scale(intensity.toDouble())
|
||||
val position = timeline.position.resolve(animationSeconds.toDouble(), runtime).scale(scalar)
|
||||
part.apply {
|
||||
x += position.x.toFloat()
|
||||
y += position.y.toFloat()
|
||||
@@ -210,7 +212,7 @@ data class BedrockAnimation(
|
||||
|
||||
if (!timeline.rotation.isEmpty()) {
|
||||
try {
|
||||
val rotation = timeline.rotation.resolve(animationSeconds.toDouble(), runtime).scale(intensity.toDouble())
|
||||
val rotation = timeline.rotation.resolve(animationSeconds.toDouble(), runtime).scale(scalar)
|
||||
part.apply {
|
||||
xRot += rotation.x.toFloat().toRadians()
|
||||
yRot += rotation.y.toFloat().toRadians()
|
||||
@@ -230,14 +232,14 @@ data class BedrockAnimation(
|
||||
if (!timeline.scale.isEmpty()) {
|
||||
var scale = timeline.scale.resolve(animationSeconds.toDouble(), runtime)
|
||||
// If the goal is to make the invisible then kick that into gear after 0.5. Maybe could work better somehow else.
|
||||
if (scale == Vec3.ZERO && intensity > 0.5) {
|
||||
if (scale == Vec3.ZERO && scalar > 0.5) {
|
||||
part.xScale *= scale.x.toFloat()
|
||||
part.yScale *= scale.y.toFloat()
|
||||
part.zScale *= scale.z.toFloat()
|
||||
} else {
|
||||
// The deviation from 1 is what we want to multiply by the intensity of the animation.
|
||||
val deviation = scale.scale(-1.0).add(1.0, 1.0, 1.0)
|
||||
val weakenedDeviation = deviation.scale(intensity.toDouble())
|
||||
val weakenedDeviation = deviation.scale(scalar)
|
||||
scale = weakenedDeviation.subtract(1.0, 1.0, 1.0).scale(-1.0)
|
||||
part.xScale *= scale.x.toFloat()
|
||||
part.yScale *= scale.y.toFloat()
|
||||
@@ -394,4 +396,4 @@ enum class InterpolationType {
|
||||
|
||||
enum class Transformation {
|
||||
POSITION, ROTATION, SCALE
|
||||
}
|
||||
}
|
||||
+39
@@ -0,0 +1,39 @@
|
||||
/*
|
||||
* Copyright (C) 2025 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.client.render.models.blockbench.drone
|
||||
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.animation.PoseAnimation
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.quirk.ModelQuirk
|
||||
import com.cobblemon.mod.common.entity.PoseType
|
||||
import com.google.gson.annotations.SerializedName
|
||||
import net.minecraft.client.model.geom.ModelPart
|
||||
|
||||
/**
|
||||
* A model for rendering the Rotom drone used by the stadium block.
|
||||
*
|
||||
* @author Flarkinater
|
||||
* @since February 14th, 2025
|
||||
*/
|
||||
class DroneModel(root: Bone) : PosableModel(root) {
|
||||
@Transient
|
||||
@SerializedName("So this name can be literally anything, huh?")
|
||||
override val rootPart = (root as ModelPart).registerChildWithAllChildren(root.children.entries.first().key)
|
||||
var droneAnimations: Array<PoseAnimation> = emptyArray()
|
||||
var droneQuirks: Array<ModelQuirk<*>> = emptyArray()
|
||||
|
||||
override fun registerPoses() {
|
||||
registerPose(
|
||||
poseType = PoseType.SLEEP,
|
||||
animations = droneAnimations,
|
||||
quirks = droneQuirks
|
||||
)
|
||||
}
|
||||
}
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
/*
|
||||
* Copyright (C) 2025 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.client.render.models.blockbench.drone
|
||||
|
||||
import com.cobblemon.mod.common.api.scheduling.SchedulingTracker
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
|
||||
|
||||
/**
|
||||
* State for a drone Rotom attached to a stadium block.
|
||||
*
|
||||
* @author Flarkinater
|
||||
* @since February 12th, 2025
|
||||
*/
|
||||
class DroneState() : PosableState() {
|
||||
init {
|
||||
setPose("sleep")
|
||||
age = 0
|
||||
currentPartialTicks = 0F
|
||||
}
|
||||
|
||||
override fun getEntity() = null
|
||||
|
||||
override fun updatePartialTicks(partialTicks: Float) {
|
||||
currentPartialTicks += partialTicks / 2
|
||||
}
|
||||
|
||||
override val schedulingTracker = SchedulingTracker()
|
||||
}
|
||||
+1
-5
@@ -32,10 +32,6 @@ class WailordModel(root: ModelPart) : PokemonPosableModel(root) {
|
||||
lateinit var sleep: Pose
|
||||
lateinit var battleidle: Pose
|
||||
|
||||
override var seatToCameraOffset: MutableMap<String, Vec3> = mutableMapOf(
|
||||
"seat_1" to Vec3(0.0, 0.0, 4.0),
|
||||
)
|
||||
|
||||
val offsetY = 0.0
|
||||
override fun registerPoses() {
|
||||
val blink = quirk { bedrockStateful("wailord", "blink")}
|
||||
@@ -106,4 +102,4 @@ class WailordModel(root: ModelPart) : PokemonPosableModel(root) {
|
||||
override fun getFaintAnimation(state: PosableState) = if (state.isPosedIn(standing, walk, sleep, battleidle)) bedrockStateful("wailord", "faint") else
|
||||
if (state.isPosedIn(floating, swimming)) bedrockStateful("wailord", "faint_water")
|
||||
else null
|
||||
}
|
||||
}
|
||||
+4
@@ -19,6 +19,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.*
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.BedrockAnimationRepository
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.blockentity.BlockEntityModel
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.fossil.FossilModel
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.drone.DroneModel
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.pokeball.AncientPokeBallModel
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.pokeball.BeastBallModel
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.pokeball.PokeBallModel
|
||||
@@ -79,12 +80,14 @@ object VaryingModelRepository {
|
||||
"poke_balls",
|
||||
"generic",
|
||||
"block_entities",
|
||||
"drone"
|
||||
)
|
||||
|
||||
val poserDirectories: List<Pair<String, Class<out PosableModel>>> = listOf(
|
||||
"bedrock/posers" to PosableModel::class.java,
|
||||
"bedrock/pokemon/posers" to PokemonPosableModel::class.java,
|
||||
"bedrock/fossils/posers" to FossilModel::class.java,
|
||||
"bedrock/drone/posers" to DroneModel::class.java,
|
||||
"bedrock/block_entities/posers" to BlockEntityModel::class.java,
|
||||
"bedrock/npcs/posers" to PosableModel::class.java,
|
||||
"bedrock/poke_balls/posers" to PosableModel::class.java,
|
||||
@@ -116,6 +119,7 @@ object VaryingModelRepository {
|
||||
.registerTypeAdapter(PosableModel::class.java, JsonModelAdapter(::PosableModel))
|
||||
.registerTypeAdapter(PokemonPosableModel::class.java, JsonModelAdapter(::PokemonPosableModel))
|
||||
.registerTypeAdapter(FossilModel::class.java, JsonModelAdapter(::FossilModel))
|
||||
.registerTypeAdapter(DroneModel::class.java, JsonModelAdapter(::DroneModel))
|
||||
.registerTypeAdapter(BlockEntityModel::class.java, JsonModelAdapter(::BlockEntityModel))
|
||||
.registerTypeAdapter(Pose::class.java, PoseAdapter { JsonModelAdapter.model!! })
|
||||
.registerTypeAdapter(ModelPartTransformation::class.java, ModelPartTransformationAdapter)
|
||||
|
||||
+2
-4
@@ -62,10 +62,8 @@ object MountedPlayerRenderer {
|
||||
|
||||
val offset = Vector3f(0f, player.bbHeight / 2, 0f).mul(-1f)
|
||||
|
||||
if (entity.beamMode == 0) {
|
||||
matrix.rotate(locator.matrix.getRotation(AxisAngle4f()))
|
||||
matrix.rotate(Axis.YP.rotationDegrees(180 + yBodyRot))
|
||||
}
|
||||
matrix.rotate(locator.matrix.getRotation(AxisAngle4f()))
|
||||
matrix.rotate(Axis.YP.rotationDegrees(180 + yBodyRot))
|
||||
matrix.translate(offset)
|
||||
|
||||
matrix.translate(Vector3f(0f, 0.35f, 0f))
|
||||
|
||||
+2
-3
@@ -144,7 +144,7 @@ class PokemonRenderer(
|
||||
|
||||
|
||||
if (entity.passengers.isNotEmpty()) {
|
||||
renderRiding(entity, entityYaw, partialTicks, poseMatrix, buffer, packedLight)
|
||||
renderRiding(entity, partialTicks, poseMatrix, buffer, packedLight)
|
||||
}
|
||||
else {
|
||||
super.render(entity, entityYaw, partialTicks, poseMatrix, buffer, packedLight)
|
||||
@@ -173,7 +173,6 @@ class PokemonRenderer(
|
||||
|
||||
fun renderRiding(
|
||||
entity: PokemonEntity,
|
||||
entityYaw: Float,
|
||||
partialTicks: Float,
|
||||
poseMatrix: PoseStack,
|
||||
buffer: MultiBufferSource,
|
||||
@@ -201,7 +200,7 @@ class PokemonRenderer(
|
||||
matrix.mul(transformationMatrix)
|
||||
}
|
||||
|
||||
super.render(entity, entityYaw, partialTicks, poseMatrix, buffer, packedLight)
|
||||
super.render(entity, 0f, partialTicks, poseMatrix, buffer, packedLight)
|
||||
poseMatrix.popPose()
|
||||
}
|
||||
|
||||
|
||||
@@ -46,9 +46,6 @@ class CobblemonConfig {
|
||||
var announceDropItems = true
|
||||
@CobblemonConfigField(Category.Pokemon, lang = "default_drop_item_method")
|
||||
var defaultDropItemMethod = ItemDropMethod.ON_ENTITY
|
||||
@CobblemonConfigField(Category.Pokemon, lang = "drops_after_death_animation")
|
||||
var dropAfterDeathAnimation = false
|
||||
|
||||
@CobblemonConfigField(Category.Pokemon, lang = "ambient_pokemon_cry_ticks")
|
||||
@LastChangedVersion("1.4.0")
|
||||
var ambientPokemonCryTicks = 1080
|
||||
|
||||
@@ -49,6 +49,8 @@ import com.cobblemon.mod.common.net.messages.client.data.UnlockReloadPacket
|
||||
import com.cobblemon.mod.common.platform.events.PlatformEvents
|
||||
import com.cobblemon.mod.common.pokemon.SpeciesAdditions
|
||||
import com.cobblemon.mod.common.pokemon.properties.PropertiesCompletionProvider
|
||||
import com.cobblemon.mod.common.stadium.StadiumCameraManagers
|
||||
import com.cobblemon.mod.common.stadium.StadiumCameras
|
||||
import com.cobblemon.mod.common.util.cobblemonResource
|
||||
import com.cobblemon.mod.common.util.ifClient
|
||||
import com.cobblemon.mod.common.util.server
|
||||
@@ -97,6 +99,8 @@ object CobblemonDataProvider : DataProvider {
|
||||
this.register(CobblemonCosmeticItems)
|
||||
this.register(CobblemonFlows)
|
||||
this.register(CobblemonUnlockableWallpapers)
|
||||
this.register(StadiumCameras)
|
||||
this.register(StadiumCameraManagers)
|
||||
this.register(Marks)
|
||||
|
||||
CobblemonSpawnPools.load()
|
||||
|
||||
@@ -141,7 +141,6 @@ import net.minecraft.world.item.ItemStack
|
||||
import net.minecraft.world.item.ItemUtils
|
||||
import net.minecraft.world.item.Items
|
||||
import net.minecraft.world.level.Level
|
||||
import net.minecraft.world.level.block.state.BlockState
|
||||
import net.minecraft.world.level.gameevent.GameEvent
|
||||
import net.minecraft.world.level.material.FluidState
|
||||
import net.minecraft.world.level.pathfinder.PathType
|
||||
@@ -261,8 +260,6 @@ open class PokemonEntity(
|
||||
var ridingBehaviourSettings: RidingBehaviourSettings? = null
|
||||
override var riding: RidingBehaviour<RidingBehaviourSettings, RidingBehaviourState>? = null
|
||||
|
||||
private val rideStatOverrides = mutableMapOf<RidingStyle, MutableMap<RidingStat, Double>>()
|
||||
|
||||
val runtime: MoLangRuntime by lazy {
|
||||
MoLangRuntime()
|
||||
.setup()
|
||||
@@ -274,7 +271,11 @@ open class PokemonEntity(
|
||||
val rideStyle = RidingStyle.valueOf(params.getString(1).uppercase())
|
||||
val maxVal = params.getDouble(2)
|
||||
val minVal = params.getDouble(3)
|
||||
DoubleValue(getRideStat(rideStat, rideStyle, minVal, maxVal))
|
||||
//TODO: Use the mons actual boost once implemented
|
||||
val normalizedStat = rideProp.calculate(rideStat, rideStyle, 0) / 100.0f
|
||||
val trueStatVal = (normalizedStat * (maxVal - minVal)) + minVal
|
||||
|
||||
DoubleValue(trueStatVal)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1826,28 +1827,11 @@ open class PokemonEntity(
|
||||
// stat based on the boost of that pokemons stat
|
||||
fun getRideStat(stat: RidingStat, style: RidingStyle, baseMin: Double, baseMax: Double): Double {
|
||||
//TODO: Change from static zero boost once aprijuice is implemented.
|
||||
if (rideStatOverrides[style] != null && rideStatOverrides[style]!![stat] != null) {
|
||||
return (((baseMax - baseMin) / 100) * rideStatOverrides[style]!![stat]!!) + baseMin
|
||||
}
|
||||
val stat = this.rideProp.calculate(stat, style, 0)
|
||||
val statVal = (((baseMax - baseMin) / 100) * stat) + baseMin
|
||||
return statVal
|
||||
}
|
||||
|
||||
fun getRawRideStat(stat: RidingStat, style: RidingStyle): Double {
|
||||
if (rideStatOverrides[style] != null && rideStatOverrides[style]!![stat] != null) {
|
||||
return rideStatOverrides[style]!![stat]!!
|
||||
}
|
||||
return this.rideProp.calculate(stat, style, 0).toDouble()
|
||||
}
|
||||
|
||||
internal fun overrideRideStat(style: RidingStyle, stat: RidingStat, value: Double) {
|
||||
if (rideStatOverrides[style] == null) {
|
||||
rideStatOverrides[style] = mutableMapOf()
|
||||
}
|
||||
rideStatOverrides[style]!![stat] = value
|
||||
}
|
||||
|
||||
override fun canAddPassenger(passenger: Entity): Boolean {
|
||||
return passengers.size < seats.size
|
||||
}
|
||||
@@ -2013,13 +1997,6 @@ open class PokemonEntity(
|
||||
}
|
||||
}
|
||||
|
||||
override fun maxUpStep(): Float {
|
||||
val upStep = ifRidingAvailableSupply(fallback = null) { behaviour, settings, state ->
|
||||
behaviour.maxUpStep(settings, state, this)
|
||||
}
|
||||
return upStep ?: super.maxUpStep()
|
||||
}
|
||||
|
||||
override fun getRiddenSpeed(controller: Player): Float {
|
||||
return ifRidingAvailableSupply(fallback = 0.05f) { behaviour, settings, state ->
|
||||
behaviour.speed(settings, state,this, controller)
|
||||
@@ -2154,10 +2131,4 @@ open class PokemonEntity(
|
||||
override fun resolveEntityScan(): LivingEntity {
|
||||
return this
|
||||
}
|
||||
|
||||
fun canStopRiding(pokemon: PokemonEntity, player: ServerPlayer): Boolean {
|
||||
if (pokemon.passengers.isEmpty()) return false
|
||||
if (pokemon.controllingPassenger != player) return false
|
||||
return true
|
||||
}
|
||||
}
|
||||
+9
-12
@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.entity.pokemon
|
||||
import com.bedrockk.molang.runtime.struct.QueryStruct
|
||||
import com.bedrockk.molang.runtime.value.DoubleValue
|
||||
import com.bedrockk.molang.runtime.value.MoValue
|
||||
import com.cobblemon.mod.common.Cobblemon
|
||||
import com.cobblemon.mod.common.CobblemonSounds
|
||||
import com.cobblemon.mod.common.OrientationControllable
|
||||
import com.cobblemon.mod.common.api.entity.PokemonSender
|
||||
@@ -288,14 +287,6 @@ class PokemonServerDelegate : PokemonSideDelegate {
|
||||
}
|
||||
}
|
||||
|
||||
fun doDeathDrops() {
|
||||
if (entity.ownerUUID == null && entity.owner == null && entity.level().gameRules.getBoolean(CobblemonGameRules.DO_POKEMON_LOOT)) {
|
||||
val heldItem = (entity as PokemonEntity?)?.pokemon?.heldItemNoCopy() ?: ItemStack.EMPTY
|
||||
if (!heldItem.isEmpty) entity.spawnAtLocation(heldItem.item)
|
||||
(entity.drops ?: entity.pokemon.form.drops).drop(entity, entity.level() as ServerLevel, entity.position(), entity.killer)
|
||||
}
|
||||
}
|
||||
|
||||
override fun updatePostDeath() {
|
||||
// clear active effects before proceeding
|
||||
val owner = entity.owner
|
||||
@@ -308,7 +299,6 @@ class PokemonServerDelegate : PokemonSideDelegate {
|
||||
if (entity.deathTime == 0) {
|
||||
entity.effects.wipe()
|
||||
entity.deathTime = 1
|
||||
if (!Cobblemon.config.dropAfterDeathAnimation) doDeathDrops()
|
||||
return
|
||||
} else if (entity.effects.progress?.isDone == false) {
|
||||
return
|
||||
@@ -326,8 +316,15 @@ class PokemonServerDelegate : PokemonSideDelegate {
|
||||
}
|
||||
|
||||
if (entity.deathTime == 60) {
|
||||
entity.level().broadcastEntityEvent(entity, 60.toByte()) // Sends smoke effect
|
||||
if (Cobblemon.config.dropAfterDeathAnimation) doDeathDrops()
|
||||
if (entity.ownerUUID == null && entity.owner == null) {
|
||||
entity.level().broadcastEntityEvent(entity, 60.toByte()) // Sends smoke effect
|
||||
if(entity.level().gameRules.getBoolean(CobblemonGameRules.DO_POKEMON_LOOT)) {
|
||||
val heldItem = (entity as PokemonEntity?)?.pokemon?.heldItemNoCopy() ?: ItemStack.EMPTY
|
||||
if (!heldItem.isEmpty) entity.spawnAtLocation(heldItem.item)
|
||||
(entity.drops ?: entity.pokemon.form.drops).drop(entity, entity.level() as ServerLevel, entity.position(), entity.killer)
|
||||
}
|
||||
}
|
||||
|
||||
entity.remove(Entity.RemovalReason.KILLED)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -238,6 +238,7 @@ object CobblemonItemGroups {
|
||||
entries.accept(CobblemonItems.PC)
|
||||
entries.accept(CobblemonItems.HEALING_MACHINE)
|
||||
entries.accept(CobblemonItems.PASTURE)
|
||||
entries.accept(CobblemonItems.STADIUM)
|
||||
|
||||
entries.accept(CobblemonItems.GILDED_CHEST)
|
||||
entries.accept(CobblemonItems.YELLOW_GILDED_CHEST)
|
||||
|
||||
@@ -10,10 +10,17 @@ package com.cobblemon.mod.common.item.interactive
|
||||
|
||||
import com.cobblemon.mod.common.CobblemonSounds
|
||||
import com.cobblemon.mod.common.api.item.PokemonSelectingItem
|
||||
import com.cobblemon.mod.common.api.molang.ObjectValue
|
||||
import com.cobblemon.mod.common.client.CobblemonClient
|
||||
import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.BedrockActiveAnimation
|
||||
import com.cobblemon.mod.common.item.CobblemonItem
|
||||
import com.cobblemon.mod.common.pokemon.Nature
|
||||
import com.cobblemon.mod.common.pokemon.Pokemon
|
||||
import com.cobblemon.mod.common.util.lang
|
||||
import com.cobblemon.mod.common.stadium.StadiumClientManager
|
||||
import com.cobblemon.mod.common.stadium.deserialize
|
||||
import com.cobblemon.mod.common.util.*
|
||||
import net.minecraft.world.entity.player.Player
|
||||
import net.minecraft.world.item.ItemStack
|
||||
import net.minecraft.server.level.ServerPlayer
|
||||
@@ -45,9 +52,21 @@ class MintItem(val nature: Nature) : CobblemonItem(Properties()), PokemonSelecti
|
||||
}
|
||||
|
||||
override fun use(world: Level, user: Player, hand: InteractionHand): InteractionResultHolder<ItemStack> {
|
||||
if (user is ServerPlayer) {
|
||||
return use(user, user.getItemInHand(hand))
|
||||
// if (user is ServerPlayer) {
|
||||
// return use(user, user.getItemInHand(hand))
|
||||
// }
|
||||
if (!world.isClientSide) return InteractionResultHolder.fail(user.getItemInHand(hand))
|
||||
val pokemon = CobblemonClient.storage.myParty.first { it?.entity != null } ?: return InteractionResultHolder.fail(user.getItemInHand(hand))
|
||||
val entity = pokemon.entity ?: return InteractionResultHolder.fail(user.getItemInHand(hand))
|
||||
val delegate = entity.delegate as? PokemonClientDelegate ?: return InteractionResultHolder.fail(user.getItemInHand(hand))
|
||||
|
||||
val bedrockAnimation = when (pokemon.species.name) {
|
||||
"Tinkaton" -> (delegate.runtime.resolve("q.bedrock_primary('tinkaton', 'signature')".asExpression()).value() as ObjectValue<*>).obj as PrimaryAnimation
|
||||
"Tandemaus" -> (delegate.runtime.resolve("q.bedrock_primary('tandemaus', 'faint')".asExpression()).value() as ObjectValue<*>).obj as PrimaryAnimation
|
||||
else -> (delegate.runtime.resolve("q.bedrock_primary('ceruledge', 'battle_cry')".asExpression()).value() as ObjectValue<*>).obj as PrimaryAnimation
|
||||
}
|
||||
delegate.addPrimaryAnimation(bedrockAnimation)
|
||||
StadiumClientManager.playAnimation(entity, bedrockAnimation)
|
||||
return InteractionResultHolder.success(user.getItemInHand(hand))
|
||||
}
|
||||
}
|
||||
}
|
||||
-51
@@ -1,51 +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.net.messages.server.debug
|
||||
|
||||
import com.cobblemon.mod.common.api.net.NetworkPacket
|
||||
import com.cobblemon.mod.common.api.riding.RidingStyle
|
||||
import com.cobblemon.mod.common.util.cobblemonResource
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
|
||||
class ServerboundUpdateRidingStatsPacket(
|
||||
val entity: Int,
|
||||
val ridingStyle: RidingStyle,
|
||||
val speed: Double,
|
||||
val acceleration: Double,
|
||||
val skill: Double,
|
||||
val jump: Double,
|
||||
val stamina: Double,
|
||||
) : NetworkPacket<ServerboundUpdateRidingStatsPacket> {
|
||||
override val id = ID
|
||||
|
||||
override fun encode(buffer: RegistryFriendlyByteBuf) {
|
||||
buffer.writeInt(entity)
|
||||
buffer.writeEnum(ridingStyle)
|
||||
buffer.writeDouble(speed)
|
||||
buffer.writeDouble(acceleration)
|
||||
buffer.writeDouble(skill)
|
||||
buffer.writeDouble(jump)
|
||||
buffer.writeDouble(stamina)
|
||||
}
|
||||
|
||||
companion object {
|
||||
val ID = cobblemonResource("c2s_update_ride_stats")
|
||||
fun decode(buffer: RegistryFriendlyByteBuf): ServerboundUpdateRidingStatsPacket {
|
||||
return ServerboundUpdateRidingStatsPacket(
|
||||
entity = buffer.readInt(),
|
||||
ridingStyle = buffer.readEnum(RidingStyle::class.java),
|
||||
speed = buffer.readDouble(),
|
||||
acceleration = buffer.readDouble(),
|
||||
skill = buffer.readDouble(),
|
||||
jump = buffer.readDouble(),
|
||||
stamina = buffer.readDouble()
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
-66
@@ -1,66 +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.net.messages.server.debug
|
||||
|
||||
import com.cobblemon.mod.common.api.net.NetworkPacket
|
||||
import com.cobblemon.mod.common.api.riding.RidingStyle
|
||||
import com.cobblemon.mod.common.util.cobblemonResource
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
|
||||
class ServerboundUpdateRidingStatRangePacket(
|
||||
val entity: Int,
|
||||
val ridingStyle: RidingStyle,
|
||||
val minSpeed: Int,
|
||||
val maxSpeed: Int,
|
||||
val minAcceleration: Int,
|
||||
val maxAcceleration: Int,
|
||||
val minSkill: Int,
|
||||
val maxSkill: Int,
|
||||
val minJump: Int,
|
||||
val maxJump: Int,
|
||||
val minStamina: Int,
|
||||
val maxStamina: Int
|
||||
) : NetworkPacket<ServerboundUpdateRidingStatRangePacket> {
|
||||
override val id = ID
|
||||
|
||||
override fun encode(buffer: RegistryFriendlyByteBuf) {
|
||||
buffer.writeInt(entity)
|
||||
buffer.writeEnum(ridingStyle)
|
||||
buffer.writeInt(minSpeed)
|
||||
buffer.writeInt(maxSpeed)
|
||||
buffer.writeInt(minAcceleration)
|
||||
buffer.writeInt(maxAcceleration)
|
||||
buffer.writeInt(minSkill)
|
||||
buffer.writeInt(maxSkill)
|
||||
buffer.writeInt(minJump)
|
||||
buffer.writeInt(maxJump)
|
||||
buffer.writeInt(minStamina)
|
||||
buffer.writeInt(maxStamina)
|
||||
}
|
||||
|
||||
companion object {
|
||||
val ID = cobblemonResource("c2s_update_ride_stat_range")
|
||||
fun decode(buffer: RegistryFriendlyByteBuf): ServerboundUpdateRidingStatRangePacket {
|
||||
return ServerboundUpdateRidingStatRangePacket(
|
||||
entity = buffer.readInt(),
|
||||
ridingStyle = buffer.readEnum(RidingStyle::class.java),
|
||||
minSpeed = buffer.readInt(),
|
||||
maxSpeed = buffer.readInt(),
|
||||
minAcceleration = buffer.readInt(),
|
||||
maxAcceleration = buffer.readInt(),
|
||||
minSkill = buffer.readInt(),
|
||||
maxSkill = buffer.readInt(),
|
||||
minJump = buffer.readInt(),
|
||||
maxJump = buffer.readInt(),
|
||||
minStamina = buffer.readInt(),
|
||||
maxStamina = buffer.readInt()
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
-45
@@ -1,45 +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.net.serverhandling.debug
|
||||
|
||||
import com.cobblemon.mod.common.Cobblemon
|
||||
import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
|
||||
import com.cobblemon.mod.common.api.riding.stats.RidingStat
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.cobblemon.mod.common.net.messages.server.debug.ServerboundUpdateRidingStatRangePacket
|
||||
import net.minecraft.server.MinecraftServer
|
||||
import net.minecraft.server.level.ServerPlayer
|
||||
|
||||
object ServerboundUpdateRidingStatRangeHandler : ServerNetworkPacketHandler<ServerboundUpdateRidingStatRangePacket> {
|
||||
|
||||
override fun handle(packet: ServerboundUpdateRidingStatRangePacket, server: MinecraftServer, player: ServerPlayer) {
|
||||
if (!Cobblemon.config.enableDebugKeys) return
|
||||
|
||||
val entity = player.level().getEntity(packet.entity) ?: return
|
||||
if (entity !is PokemonEntity) return
|
||||
if (entity.controllingPassenger != player) return
|
||||
|
||||
if (packet.minSpeed < packet.maxSpeed) {
|
||||
entity.rideProp.updateStatRange(RidingStat.SPEED, packet.ridingStyle, packet.minSpeed, packet.maxSpeed)
|
||||
}
|
||||
if (packet.minAcceleration < packet.maxAcceleration) {
|
||||
entity.rideProp.updateStatRange(RidingStat.ACCELERATION, packet.ridingStyle, packet.minAcceleration, packet.maxAcceleration)
|
||||
}
|
||||
if (packet.minSkill < packet.maxSkill) {
|
||||
entity.rideProp.updateStatRange(RidingStat.SKILL, packet.ridingStyle, packet.minSkill, packet.maxSkill)
|
||||
}
|
||||
if (packet.minJump < packet.maxJump) {
|
||||
entity.rideProp.updateStatRange(RidingStat.JUMP, packet.ridingStyle, packet.minJump, packet.maxJump)
|
||||
}
|
||||
if (packet.minStamina < packet.maxStamina) {
|
||||
entity.rideProp.updateStatRange(RidingStat.STAMINA, packet.ridingStyle, packet.minStamina, packet.maxStamina)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
-34
@@ -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.net.serverhandling.debug
|
||||
|
||||
import com.cobblemon.mod.common.Cobblemon
|
||||
import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
|
||||
import com.cobblemon.mod.common.api.riding.stats.RidingStat
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.cobblemon.mod.common.net.messages.server.debug.ServerboundUpdateRidingStatsPacket
|
||||
import net.minecraft.server.MinecraftServer
|
||||
import net.minecraft.server.level.ServerPlayer
|
||||
|
||||
object ServerboundUpdateRidingStatsHandler : ServerNetworkPacketHandler<ServerboundUpdateRidingStatsPacket> {
|
||||
|
||||
override fun handle(packet: ServerboundUpdateRidingStatsPacket, server: MinecraftServer, player: ServerPlayer) {
|
||||
if (!Cobblemon.config.enableDebugKeys) return
|
||||
|
||||
val entity = player.level().getEntity(packet.entity) ?: return
|
||||
if (entity !is PokemonEntity) return
|
||||
if (entity.controllingPassenger != player) return
|
||||
entity.overrideRideStat(packet.ridingStyle, RidingStat.SPEED, packet.speed)
|
||||
entity.overrideRideStat(packet.ridingStyle, RidingStat.ACCELERATION, packet.acceleration)
|
||||
entity.overrideRideStat(packet.ridingStyle, RidingStat.SKILL, packet.skill)
|
||||
entity.overrideRideStat(packet.ridingStyle, RidingStat.JUMP, packet.jump)
|
||||
entity.overrideRideStat(packet.ridingStyle, RidingStat.STAMINA, packet.stamina)
|
||||
}
|
||||
|
||||
}
|
||||
+16
-31
@@ -10,8 +10,6 @@ package com.cobblemon.mod.common.net.serverhandling.storage
|
||||
|
||||
import com.cobblemon.mod.common.Cobblemon
|
||||
import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
|
||||
import com.cobblemon.mod.common.api.riding.RidingStyle
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.cobblemon.mod.common.net.messages.server.SendOutPokemonPacket
|
||||
import com.cobblemon.mod.common.pokemon.activestate.ActivePokemonState
|
||||
import com.cobblemon.mod.common.pokemon.activestate.ShoulderedState
|
||||
@@ -43,35 +41,22 @@ object SendOutPokemonHandler : ServerNetworkPacketHandler<SendOutPokemonPacket>
|
||||
}
|
||||
} else {
|
||||
val entity = state.entity
|
||||
when {
|
||||
entity == null -> pokemon.recall()
|
||||
entity.canStopRiding(entity, player) -> stopRiding(entity, player)
|
||||
else -> recallWithAnimation(entity)
|
||||
if (entity != null) {
|
||||
// Calculate time until ball throw animation would be finished nicely
|
||||
val buffer = THROW_DURATION + 0.5F - entity.ticksLived.toFloat() / 20F
|
||||
if (buffer > 0.75F) {
|
||||
// Do nothing if the recall button is spammed too fast
|
||||
} else if (buffer > 0) {
|
||||
// If the recall button is pressed early,
|
||||
// buffer the recall instruction until after ball throw animation is complete
|
||||
entity.after(buffer) { entity.recallWithAnimation() }
|
||||
} else {
|
||||
// Recall normally
|
||||
entity.recallWithAnimation()
|
||||
}
|
||||
} else {
|
||||
pokemon.recall()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun stopRiding(pokemon: PokemonEntity, driver: ServerPlayer) {
|
||||
val shouldStopRiding = pokemon.ifRidingAvailableSupply(false) { behaviour, settings, state ->
|
||||
behaviour.getRidingStyle(settings, state) != RidingStyle.AIR
|
||||
}
|
||||
if (shouldStopRiding) {
|
||||
driver.stopRiding()
|
||||
}
|
||||
}
|
||||
|
||||
private fun recallWithAnimation(pokemon: PokemonEntity) {
|
||||
// Calculate time until ball throw animation would be finished nicely
|
||||
val buffer = THROW_DURATION + 0.5F - pokemon.ticksLived.toFloat() / 20F
|
||||
if (buffer > 0.75F) {
|
||||
// Do nothing if the recall button is spammed too fast
|
||||
} else if (buffer > 0) {
|
||||
// If the recall button is pressed early,
|
||||
// buffer the recall instruction until after ball throw animation is complete
|
||||
pokemon.after(buffer) { pokemon.recallWithAnimation() }
|
||||
} else {
|
||||
// Recall normally
|
||||
pokemon.recallWithAnimation()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
-5
@@ -26,11 +26,6 @@ object RequestRenamePCBoxHandler : ServerNetworkPacketHandler<RequestRenamePCBox
|
||||
}
|
||||
|
||||
val box = pc.boxes[packet.boxNumber]
|
||||
if (packet.name != null && packet.name.length > 19) {
|
||||
RenamePCBoxPacket(pc.uuid, packet.boxNumber, box.name).sendToPlayer(player)
|
||||
return
|
||||
}
|
||||
|
||||
CobblemonEvents.RENAME_PC_BOX_EVENT_PRE.postThenFinally(
|
||||
event = RenamePCBoxEvent.Pre(player, box, packet.name?: ""),
|
||||
ifSucceeded = { preEvent ->
|
||||
|
||||
+8
-21
@@ -28,14 +28,11 @@ import net.minecraft.client.player.LocalPlayer
|
||||
import net.minecraft.client.resources.sounds.SimpleSoundInstance
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
import net.minecraft.sounds.SoundEvent
|
||||
import kotlin.math.exp
|
||||
import kotlin.math.ln
|
||||
import net.minecraft.util.Mth.clamp
|
||||
|
||||
class PokedexUsageContext {
|
||||
companion object {
|
||||
const val ZOOM_MAX_STEP = 9F
|
||||
const val ZOOM_TARGET_FOV = 10F // the FOV we get at max zoom (probably somewhat inaccurate, but irrelevant)
|
||||
const val ZOOM_BASE_FOV = 80F // getting FOV from MC is easy, but pin it for consistent step count/zoom dist
|
||||
const val ZOOM_STAGES = 10
|
||||
const val BLOCK_LENGTH_PER_ZOOM_STAGE = 2
|
||||
const val OPEN_SCANNER_BUFFER_TICKS = 5 // Open scanner interface if usage ticks are above this threshold
|
||||
const val VIEW_INFO_BUFFER_TICKS = 10
|
||||
@@ -62,7 +59,6 @@ class PokedexUsageContext {
|
||||
var focusIntervals: Float = 0F
|
||||
var innerRingRotation: Float = 0F
|
||||
var zoomLevel: Float = 0F
|
||||
var zoomModifier: Float = 1F
|
||||
var newPokemonInfo: PokedexLearnedInformation = PokedexLearnedInformation.NONE
|
||||
var type: PokedexType = PokedexType.RED
|
||||
var availableInfoFrames: MutableList<Boolean?> = mutableListOf(null, null, null, null)
|
||||
@@ -208,7 +204,6 @@ class PokedexUsageContext {
|
||||
fun resetState(resetAnimationStates: Boolean = true) {
|
||||
scanningGuiOpen = false
|
||||
zoomLevel = 0F
|
||||
zoomModifier = 1F
|
||||
focusIntervals = 0F
|
||||
resetFocusedPokemonState()
|
||||
|
||||
@@ -220,22 +215,14 @@ class PokedexUsageContext {
|
||||
}
|
||||
|
||||
fun adjustZoom(verticalScrollAmount: Double) {
|
||||
if ((zoomLevel <= 0F && verticalScrollAmount < 0) || (zoomLevel >= ZOOM_MAX_STEP && verticalScrollAmount > 0))
|
||||
return
|
||||
|
||||
playSound(CobblemonSounds.POKEDEX_SCAN_ZOOM_INCREMENT)
|
||||
zoomLevel = (zoomLevel + verticalScrollAmount.toFloat()).coerceIn(0F, ZOOM_MAX_STEP)
|
||||
innerRingRotation = (innerRingRotation + 15) % 360
|
||||
val startLog = ln(ZOOM_BASE_FOV)
|
||||
val targetLog = ln(ZOOM_TARGET_FOV)
|
||||
val stepSize = (startLog - targetLog) / ZOOM_MAX_STEP
|
||||
val currentZoomLog = startLog - (zoomLevel * stepSize)
|
||||
val currentFov = exp(currentZoomLog)
|
||||
zoomModifier = currentFov / ZOOM_BASE_FOV
|
||||
zoomLevel = clamp(zoomLevel + verticalScrollAmount.toFloat(), 0F, ZOOM_STAGES.toFloat())
|
||||
if (zoomLevel > 0F && zoomLevel < ZOOM_STAGES.toFloat()) {
|
||||
playSound(CobblemonSounds.POKEDEX_SCAN_ZOOM_INCREMENT)
|
||||
}
|
||||
}
|
||||
|
||||
// 1 = normal FOV; 0 = max zoom; this runs on render update, best to keep logic out of here
|
||||
fun getFovMultiplier() = zoomModifier
|
||||
// Higher multiplier = more zoomed out
|
||||
fun getFovMultiplier() = 1 - (zoomLevel / ZOOM_STAGES)
|
||||
|
||||
fun playSound(soundEvent: SoundEvent) {
|
||||
Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(soundEvent, 1.0F))
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
package com.cobblemon.mod.common.stadium
|
||||
|
||||
import com.cobblemon.mod.common.util.adapters.Vec3dAdapter
|
||||
import com.google.gson.GsonBuilder
|
||||
import net.minecraft.world.phys.Vec3
|
||||
import org.joml.Vector3f
|
||||
|
||||
val gson = GsonBuilder()
|
||||
.setPrettyPrinting()
|
||||
.disableHtmlEscaping()
|
||||
.registerTypeAdapter(Vec3::class.java, Vec3dAdapter)
|
||||
.create()
|
||||
|
||||
fun deserialize(data: String): CameraAnimation {
|
||||
return gson.fromJson(data, CameraAnimation::class.java)
|
||||
}
|
||||
|
||||
data class CameraAnimation(
|
||||
val length: Double,
|
||||
val origin: CameraOrigin,
|
||||
val timeline: Timeline
|
||||
)
|
||||
|
||||
data class Timeline(
|
||||
val position: Map<Double, Vec3>,
|
||||
val rotation: Map<Double, Vec3>,
|
||||
)
|
||||
|
||||
data class CameraOrigin(
|
||||
val position: Vec3,
|
||||
val rotation: Vec3,
|
||||
)
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.cobblemon.mod.common.stadium
|
||||
|
||||
import net.minecraft.server.level.ServerPlayer
|
||||
import java.util.*
|
||||
|
||||
abstract class StadiumBattleDefenition {
|
||||
var stadiumBattleID: UUID = UUID.randomUUID()
|
||||
|
||||
var participants: MutableList<UUID> = mutableListOf<UUID>()
|
||||
var spectators: MutableList<UUID> = mutableListOf<UUID>()
|
||||
|
||||
var cameras: MutableList<StadiumCameraEntry> = mutableListOf<StadiumCameraEntry>()
|
||||
|
||||
abstract fun readyForBattle(): Boolean
|
||||
|
||||
abstract fun canAddPlayer(player: ServerPlayer): Boolean
|
||||
|
||||
abstract fun addPlayer(player: ServerPlayer)
|
||||
|
||||
abstract fun getPlayers(): MutableList<ServerPlayer>
|
||||
|
||||
abstract fun initializeBattle()
|
||||
|
||||
abstract fun getCurrentCamera(): StadiumCameraEntry
|
||||
}
|
||||
@@ -0,0 +1,192 @@
|
||||
package com.cobblemon.mod.common.stadium
|
||||
|
||||
import com.bedrockk.molang.Expression
|
||||
import com.bedrockk.molang.runtime.value.DoubleValue
|
||||
import com.cobblemon.mod.common.util.*
|
||||
import com.google.gson.JsonArray
|
||||
import com.google.gson.JsonDeserializationContext
|
||||
import com.google.gson.JsonDeserializer
|
||||
import com.google.gson.JsonElement
|
||||
import com.google.gson.JsonObject
|
||||
import net.fabricmc.loader.impl.lib.sat4j.core.Vec
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
import net.minecraft.world.phys.Vec3
|
||||
import org.joml.Vector3f
|
||||
import java.lang.reflect.Type
|
||||
import kotlin.math.abs
|
||||
import kotlin.math.atan
|
||||
import kotlin.math.atan2
|
||||
|
||||
class StadiumCameraEntry(
|
||||
var id: ResourceLocation,
|
||||
val length: Double = 0.0,
|
||||
val positionTimeline: MutableMap<String, CameraKeyFrame> = mutableMapOf(),
|
||||
val targetPositionTimeline: MutableMap<String, CameraKeyFrame> = mutableMapOf(),
|
||||
val move: String = ""
|
||||
) {
|
||||
fun resolvePosition(time: Double): Vec3 {
|
||||
return resolvePosition(time, positionTimeline)
|
||||
}
|
||||
|
||||
private fun resolvePosition(time: Double, map: MutableMap<String, CameraKeyFrame>): Vec3 {
|
||||
val runtime = StadiumClientManager.runtime
|
||||
runtime.environment.setSimpleVariable("anim_time", DoubleValue(time))
|
||||
var frame1: CameraKeyFrame? = null
|
||||
var frame2: CameraKeyFrame? = null
|
||||
var time1 = -1.0
|
||||
var time2 = -1.0
|
||||
for (keyframe in map) {
|
||||
if (time >= keyframe.key.toDouble()) {
|
||||
if (time1 == -1.0 || abs(time - keyframe.key.toDouble()) < abs(time - time1)) {
|
||||
frame1 = keyframe.value
|
||||
time1 = keyframe.key.toDouble()
|
||||
}
|
||||
}
|
||||
if (time < keyframe.key.toDouble()) {
|
||||
if (time2 == -1.0 || abs(time - keyframe.key.toDouble()) < abs(time - time2)) {
|
||||
frame2 = keyframe.value
|
||||
time2 = keyframe.key.toDouble()
|
||||
}
|
||||
}
|
||||
}
|
||||
val difference = (time - time1) / (time2 - time1)
|
||||
|
||||
if (frame1 != null && frame1.interpolation == CameraInterpolation.STEP) {
|
||||
frame2 = null
|
||||
}
|
||||
|
||||
if (frame1 == null && frame2 == null) {
|
||||
return Vec3.ZERO
|
||||
}
|
||||
else if (frame1 == null) {
|
||||
frame2!!
|
||||
val x = runtime.resolveDouble(frame2.x)
|
||||
val y = runtime.resolveDouble(frame2.y)
|
||||
val z = runtime.resolveDouble(frame2.z)
|
||||
return Vec3(x,y,z)
|
||||
}
|
||||
else if (frame2 == null) {
|
||||
val x = runtime.resolveDouble(frame1.x)
|
||||
val y = runtime.resolveDouble(frame1.y)
|
||||
val z = runtime.resolveDouble(frame1.z)
|
||||
return Vec3(x,y,z)
|
||||
}
|
||||
else {
|
||||
val x1 = runtime.resolveDouble(frame1.x)
|
||||
val y1 = runtime.resolveDouble(frame1.y)
|
||||
val z1 = runtime.resolveDouble(frame1.z)
|
||||
val vec1 = Vec3(x1,y1,z1)
|
||||
val x2 = runtime.resolveDouble(frame2.x)
|
||||
val y2 = runtime.resolveDouble(frame2.y)
|
||||
val z2 = runtime.resolveDouble(frame2.z)
|
||||
val vec2 = Vec3(x2,y2,z2)
|
||||
return vec1.lerp(vec2, difference)
|
||||
}
|
||||
}
|
||||
|
||||
fun resolveRotation(time: Double): Vector3f {
|
||||
val position = resolvePosition(time, positionTimeline)
|
||||
val target = resolvePosition(time, targetPositionTimeline)
|
||||
val offset = target.subtract(position)
|
||||
val xRot = -atan(offset.y.toFloat()/offset.horizontalDistance().toFloat()) * (180F / Math.PI.toFloat())
|
||||
val yRot = -atan2(offset.x.toFloat(),offset.z.toFloat()) * (180F / Math.PI.toFloat())
|
||||
return Vector3f(xRot, yRot, 0.0F)
|
||||
}
|
||||
|
||||
fun encode(buf: RegistryFriendlyByteBuf) {
|
||||
buf.writeIdentifier(id)
|
||||
buf.writeDouble(length)
|
||||
buf.writeMap(positionTimeline, {_, key -> buf.writeString(key)}, {_, value ->
|
||||
buf.writeString(value.x.getString())
|
||||
buf.writeString(value.y.getString())
|
||||
buf.writeString(value.z.getString())
|
||||
buf.writeEnum(value.interpolation)
|
||||
})
|
||||
buf.writeMap(targetPositionTimeline, {_, key -> buf.writeString(key)}, {_, value ->
|
||||
buf.writeString(value.x.getString())
|
||||
buf.writeString(value.y.getString())
|
||||
buf.writeString(value.z.getString())
|
||||
buf.writeEnum(value.interpolation)
|
||||
})
|
||||
buf.writeString(move)
|
||||
}
|
||||
|
||||
companion object {
|
||||
fun decode(buf: RegistryFriendlyByteBuf) : StadiumCameraEntry {
|
||||
val id = buf.readIdentifier()
|
||||
val length = buf.readDouble()
|
||||
val positionTimeline = buf.readMap({_ -> buf.readString()}, {_ ->
|
||||
CameraKeyFrame(buf.readString().asExpression(), buf.readString().asExpression(), buf.readString().asExpression(), buf.readEnum(CameraInterpolation::class.java))
|
||||
}).toMutableMap()
|
||||
val targetPositionTimeline = buf.readMap({_ -> buf.readString()}, {_ ->
|
||||
CameraKeyFrame(buf.readString().asExpression(), buf.readString().asExpression(), buf.readString().asExpression(), buf.readEnum(CameraInterpolation::class.java))
|
||||
}).toMutableMap()
|
||||
val move = buf.readString()
|
||||
|
||||
return StadiumCameraEntry(id, length, positionTimeline, targetPositionTimeline, move)
|
||||
}
|
||||
}
|
||||
|
||||
data class CameraKeyFrame (
|
||||
val x: Expression,
|
||||
val y: Expression,
|
||||
val z: Expression,
|
||||
val interpolation: CameraInterpolation
|
||||
)
|
||||
|
||||
enum class CameraInterpolation {
|
||||
LINEAR,
|
||||
STEP
|
||||
}
|
||||
|
||||
object CameraEntryAdapter: JsonDeserializer<StadiumCameraEntry> {
|
||||
override fun deserialize(
|
||||
json: JsonElement?,
|
||||
typeOfT: Type?,
|
||||
context: JsonDeserializationContext?
|
||||
): StadiumCameraEntry {
|
||||
if (json is JsonObject) {
|
||||
val length = json["length"]?.asDouble ?: 0.0
|
||||
val positionTimeline = mutableMapOf<String, CameraKeyFrame>()
|
||||
json["positions"]?.asJsonObject?.entrySet()?.forEach { (name, position) ->
|
||||
val xyz = position.asJsonObject["xyz"]
|
||||
var x = "0.0".asExpression()
|
||||
var y = "0.0".asExpression()
|
||||
var z = "0.0".asExpression()
|
||||
if (xyz != null && xyz.isJsonArray && xyz.asJsonArray.size() == 3) {
|
||||
x = xyz.asJsonArray[0].asString.asExpression()
|
||||
y = xyz.asJsonArray[1].asString.asExpression()
|
||||
z = xyz.asJsonArray[2].asString.asExpression()
|
||||
}
|
||||
val interpolation = when (position.asJsonObject["interpolation"]?.asString) {
|
||||
"linear" -> CameraInterpolation.LINEAR
|
||||
"step" -> CameraInterpolation.STEP
|
||||
else -> CameraInterpolation.LINEAR
|
||||
}
|
||||
positionTimeline[name] = CameraKeyFrame(x, y, z, interpolation)
|
||||
}
|
||||
val targetPositionTimeline = mutableMapOf<String, CameraKeyFrame>()
|
||||
json["targetPositions"]?.asJsonObject?.entrySet()?.forEach { (name, position) ->
|
||||
val xyz = position.asJsonObject["xyz"]
|
||||
var x = "0.0".asExpression()
|
||||
var y = "0.0".asExpression()
|
||||
var z = "0.0".asExpression()
|
||||
if (xyz != null && xyz.isJsonArray && xyz.asJsonArray.size() == 3) {
|
||||
x = xyz.asJsonArray[0].asString.asExpression()
|
||||
y = xyz.asJsonArray[1].asString.asExpression()
|
||||
z = xyz.asJsonArray[2].asString.asExpression()
|
||||
}
|
||||
val interpolation = when (position.asJsonObject["interpolation"]?.asString) {
|
||||
"linear" -> CameraInterpolation.LINEAR
|
||||
"step" -> CameraInterpolation.STEP
|
||||
else -> CameraInterpolation.LINEAR
|
||||
}
|
||||
targetPositionTimeline[name] = CameraKeyFrame(x, y, z, interpolation)
|
||||
}
|
||||
val move = json["move"]?.asString ?: ""
|
||||
}
|
||||
throw IllegalStateException("Stadium Camera could not be parsed")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,119 @@
|
||||
package com.cobblemon.mod.common.stadium
|
||||
|
||||
import com.bedrockk.molang.Expression
|
||||
import com.cobblemon.mod.common.util.*
|
||||
import com.google.gson.JsonDeserializationContext
|
||||
import com.google.gson.JsonDeserializer
|
||||
import com.google.gson.JsonElement
|
||||
import com.google.gson.JsonObject
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
import java.lang.reflect.Type
|
||||
|
||||
class StadiumCameraManagerEntry(
|
||||
var id: ResourceLocation,
|
||||
val states: MutableMap<String, StadiumCameraState>,
|
||||
val startingState: String
|
||||
) {
|
||||
fun encode(buf: RegistryFriendlyByteBuf) {
|
||||
buf.writeIdentifier(id)
|
||||
buf.writeMap(states, {_, key -> buf.writeString(key)}, {_, value -> value.encode(buf)})
|
||||
buf.writeString(startingState)
|
||||
}
|
||||
|
||||
companion object {
|
||||
fun decode(buf: RegistryFriendlyByteBuf): StadiumCameraManagerEntry {
|
||||
val id = buf.readIdentifier()
|
||||
val states = buf.readMap({buf.readString()}, {StadiumCameraState.decode(buf)}).toMutableMap()
|
||||
val startState = buf.readString()
|
||||
return StadiumCameraManagerEntry(id, states, startState)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class StadiumCameraState(
|
||||
val camera: Expression,
|
||||
val target: StadiumCameraTarget,
|
||||
val listOfTransitions: MutableList<StadiumCameraTransition>,
|
||||
val loop: Boolean
|
||||
) {
|
||||
fun encode(buf: RegistryFriendlyByteBuf) {
|
||||
buf.writeString(camera.originalString)
|
||||
buf.writeEnum(target)
|
||||
buf.writeCollection(listOfTransitions) {_, transition -> transition.encode(buf)}
|
||||
buf.writeBoolean(loop)
|
||||
}
|
||||
|
||||
companion object {
|
||||
fun decode(buf: RegistryFriendlyByteBuf): StadiumCameraState {
|
||||
val camera = buf.readString().asExpression()
|
||||
val target = buf.readEnum(StadiumCameraTarget::class.java)
|
||||
val listOfTransitions = buf.readList { StadiumCameraTransition.decode(buf) }.toMutableList()
|
||||
val loop = buf.readBoolean()
|
||||
return StadiumCameraState(camera, target, listOfTransitions, loop)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class StadiumCameraTransition(
|
||||
val targetState: String,
|
||||
val checkOnEnd: Boolean,
|
||||
val condition: Expression
|
||||
) {
|
||||
fun encode(buf: RegistryFriendlyByteBuf) {
|
||||
buf.writeString(targetState)
|
||||
buf.writeBoolean(checkOnEnd)
|
||||
buf.writeString(condition.originalString)
|
||||
}
|
||||
|
||||
companion object {
|
||||
fun decode(buf: RegistryFriendlyByteBuf): StadiumCameraTransition {
|
||||
val targetState = buf.readString()
|
||||
val checkOnEnd = buf.readBoolean()
|
||||
val condition = buf.readString().asExpression()
|
||||
return StadiumCameraTransition(targetState, checkOnEnd, condition)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
enum class StadiumCameraTarget {
|
||||
CENTRE,
|
||||
ACTIVE_POKEMON,
|
||||
ENEMY_POKEMON,
|
||||
TRAINER
|
||||
}
|
||||
|
||||
object StadiumCameraManagerAdapter: JsonDeserializer<StadiumCameraManagerEntry> {
|
||||
override fun deserialize(
|
||||
json: JsonElement?,
|
||||
typeOfT: Type?,
|
||||
context: JsonDeserializationContext?
|
||||
): StadiumCameraManagerEntry {
|
||||
if (json is JsonObject) {
|
||||
val states = mutableMapOf<String, StadiumCameraState>()
|
||||
json["states"]?.asJsonObject?.entrySet()?.forEach { (name, state) ->
|
||||
val camera = state.asJsonObject["camera"]?.asString?.asExpression() ?: "".asExpression()
|
||||
val target = when (state.asJsonObject["target"]?.asString) {
|
||||
"CENTRE" -> StadiumCameraTarget.CENTRE
|
||||
"ACTIVE_POKEMON" -> StadiumCameraTarget.ACTIVE_POKEMON
|
||||
"ENEMY_POKEMON" -> StadiumCameraTarget.ENEMY_POKEMON
|
||||
"TRAINER" -> StadiumCameraTarget.TRAINER
|
||||
else -> StadiumCameraTarget.CENTRE
|
||||
}
|
||||
val listOfTransitions = mutableListOf<StadiumCameraTransition>()
|
||||
state.asJsonObject["transitions"]?.asJsonArray?.forEach {
|
||||
val targetState = it.asJsonObject["targetState"]?.asString ?: ""
|
||||
val checkOnEnd = it.asJsonObject["checkOnEnd"]?.asBoolean ?: false
|
||||
val condition = it.asJsonObject["condition"]?.asString?.asExpression() ?: "0.0".asExpression()
|
||||
listOfTransitions.add(StadiumCameraTransition(targetState, checkOnEnd, condition))
|
||||
}
|
||||
val loop = state.asJsonObject["loop"]?.asBoolean ?: false
|
||||
states[name] = StadiumCameraState(camera, target, listOfTransitions, loop)
|
||||
}
|
||||
val startingState = json["startingState"].asString ?: ""
|
||||
return StadiumCameraManagerEntry(cobblemonResource(""), states, startingState)
|
||||
}
|
||||
throw IllegalStateException("StadiumCameraManager could not be parsed")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
package com.cobblemon.mod.common.stadium
|
||||
|
||||
import com.bedrockk.molang.Expression
|
||||
import com.cobblemon.mod.common.api.data.JsonDataRegistry
|
||||
import com.cobblemon.mod.common.api.reactive.SimpleObservable
|
||||
import com.cobblemon.mod.common.util.adapters.ExpressionAdapter
|
||||
import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
|
||||
import com.cobblemon.mod.common.util.cobblemonResource
|
||||
import com.google.gson.Gson
|
||||
import com.google.gson.GsonBuilder
|
||||
import com.google.gson.reflect.TypeToken
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
import net.minecraft.server.level.ServerPlayer
|
||||
import net.minecraft.server.packs.PackType
|
||||
|
||||
object StadiumCameraManagers: JsonDataRegistry<StadiumCameraManagerEntry> {
|
||||
override val id = cobblemonResource("stadium_managers")
|
||||
override val type = PackType.SERVER_DATA
|
||||
|
||||
override val gson: Gson = GsonBuilder()
|
||||
.disableHtmlEscaping()
|
||||
.setPrettyPrinting()
|
||||
.registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
|
||||
.registerTypeAdapter(StadiumCameraManagerEntry::class.java, StadiumCameraManagerAdapter)
|
||||
.create()
|
||||
|
||||
override val typeToken: TypeToken<StadiumCameraManagerEntry> = TypeToken.get(StadiumCameraManagerEntry::class.java)
|
||||
override val resourcePath = "stadium_managers"
|
||||
|
||||
val managers = mutableMapOf<ResourceLocation, StadiumCameraManagerEntry>()
|
||||
|
||||
override fun reload(data: Map<ResourceLocation, StadiumCameraManagerEntry>) {
|
||||
managers.clear()
|
||||
data.forEach { location, manager ->
|
||||
manager.id = location
|
||||
managers[location] = manager
|
||||
}
|
||||
observable.emit(this)
|
||||
}
|
||||
|
||||
override val observable = SimpleObservable<StadiumCameraManagers>()
|
||||
|
||||
override fun sync(player: ServerPlayer) {
|
||||
StadiumCameraManagersSyncPacket(managers.values).sendToPlayer(player)
|
||||
}
|
||||
}
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
package com.cobblemon.mod.common.stadium
|
||||
|
||||
import com.cobblemon.mod.common.net.messages.client.data.DataRegistrySyncPacket
|
||||
import com.cobblemon.mod.common.util.cobblemonResource
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
|
||||
class StadiumCameraManagersSyncPacket(managers: Collection<StadiumCameraManagerEntry>) :
|
||||
DataRegistrySyncPacket<StadiumCameraManagerEntry, StadiumCameraManagersSyncPacket>(managers) {
|
||||
override fun encodeEntry(buffer: RegistryFriendlyByteBuf, entry: StadiumCameraManagerEntry) {
|
||||
entry.encode(buffer)
|
||||
}
|
||||
|
||||
override fun decodeEntry(buffer: RegistryFriendlyByteBuf): StadiumCameraManagerEntry? {
|
||||
return StadiumCameraManagerEntry.decode(buffer)
|
||||
}
|
||||
|
||||
override fun synchronizeDecoded(entries: Collection<StadiumCameraManagerEntry>) {
|
||||
StadiumCameraManagers.reload(entries.associateBy { it.id })
|
||||
}
|
||||
|
||||
override val id = ID
|
||||
|
||||
companion object {
|
||||
val ID = cobblemonResource("stadium_camera_managers_sync")
|
||||
fun decode(buffer: RegistryFriendlyByteBuf) = StadiumCameraManagersSyncPacket(emptyList()).apply { decodeBuffer(buffer) }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package com.cobblemon.mod.common.stadium
|
||||
|
||||
import com.cobblemon.mod.common.api.data.JsonDataRegistry
|
||||
import com.cobblemon.mod.common.api.reactive.SimpleObservable
|
||||
import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
|
||||
import com.cobblemon.mod.common.util.cobblemonResource
|
||||
import com.google.gson.Gson
|
||||
import com.google.gson.GsonBuilder
|
||||
import com.google.gson.reflect.TypeToken
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
import net.minecraft.server.level.ServerPlayer
|
||||
import net.minecraft.server.packs.PackType
|
||||
|
||||
object StadiumCameras: JsonDataRegistry<StadiumCameraEntry> {
|
||||
override val id = cobblemonResource("stadium_cameras")
|
||||
override val type = PackType.SERVER_DATA
|
||||
|
||||
override val gson: Gson = GsonBuilder()
|
||||
.disableHtmlEscaping()
|
||||
.setPrettyPrinting()
|
||||
.registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
|
||||
.registerTypeAdapter(StadiumCameraEntry::class.java, StadiumCameraEntry.CameraEntryAdapter)
|
||||
.create()
|
||||
|
||||
override val typeToken: TypeToken<StadiumCameraEntry> = TypeToken.get(StadiumCameraEntry::class.java)
|
||||
override val resourcePath = "stadium_cameras"
|
||||
|
||||
val cameras = mutableMapOf<ResourceLocation, StadiumCameraEntry>()
|
||||
|
||||
override fun reload(data: Map<ResourceLocation, StadiumCameraEntry>) {
|
||||
cameras.clear()
|
||||
data.forEach { location, camera ->
|
||||
camera.id = location
|
||||
cameras[location] = camera
|
||||
}
|
||||
observable.emit(this)
|
||||
}
|
||||
|
||||
override val observable = SimpleObservable<StadiumCameras>()
|
||||
|
||||
override fun sync(player: ServerPlayer) {
|
||||
StadiumCamerasSyncPacket(cameras.values).sendToPlayer(player)
|
||||
}
|
||||
|
||||
fun getMoveCamera(move: String): StadiumCameraEntry? {
|
||||
return cameras.values.firstOrNull { it.move == move }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.cobblemon.mod.common.stadium
|
||||
|
||||
import com.cobblemon.mod.common.net.messages.client.data.DataRegistrySyncPacket
|
||||
import com.cobblemon.mod.common.util.cobblemonResource
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
|
||||
class StadiumCamerasSyncPacket(cameras: Collection<StadiumCameraEntry>) :
|
||||
DataRegistrySyncPacket<StadiumCameraEntry, StadiumCamerasSyncPacket>(cameras) {
|
||||
override fun encodeEntry(buffer: RegistryFriendlyByteBuf, entry: StadiumCameraEntry) {
|
||||
entry.encode(buffer)
|
||||
}
|
||||
|
||||
override fun decodeEntry(buffer: RegistryFriendlyByteBuf): StadiumCameraEntry? {
|
||||
return StadiumCameraEntry.decode(buffer)
|
||||
}
|
||||
|
||||
override fun synchronizeDecoded(entries: Collection<StadiumCameraEntry>) {
|
||||
StadiumCameras.reload(entries.associateBy { it.id })
|
||||
}
|
||||
|
||||
override val id = ID
|
||||
|
||||
companion object {
|
||||
val ID = cobblemonResource("stadium_cameras_sync")
|
||||
fun decode(buffer: RegistryFriendlyByteBuf) = StadiumCamerasSyncPacket(emptyList()).apply { decodeBuffer(buffer) }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,232 @@
|
||||
package com.cobblemon.mod.common.stadium
|
||||
|
||||
import com.bedrockk.molang.runtime.MoLangRuntime
|
||||
import com.bedrockk.molang.runtime.value.DoubleValue
|
||||
import com.bedrockk.molang.runtime.value.MoValue
|
||||
import com.bedrockk.molang.runtime.value.StringValue
|
||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunctions
|
||||
import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
|
||||
import com.cobblemon.mod.common.client.ClientMoLangFunctions.setupClient
|
||||
import com.cobblemon.mod.common.client.CobblemonClient
|
||||
import com.cobblemon.mod.common.client.MountedPokemonAnimationRenderController
|
||||
import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation
|
||||
import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.linearLerpAlpha
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
|
||||
import com.cobblemon.mod.common.util.asResource
|
||||
import com.cobblemon.mod.common.util.math.fromEulerXYZ
|
||||
import com.cobblemon.mod.common.util.math.geometry.toRadians
|
||||
import com.cobblemon.mod.common.util.math.toEulerXYZ
|
||||
import com.cobblemon.mod.common.util.resolveBoolean
|
||||
import com.cobblemon.mod.common.util.resolveString
|
||||
import com.cobblemon.mod.common.util.toVec3d
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
import net.minecraft.util.Mth
|
||||
import net.minecraft.world.phys.Vec3
|
||||
import org.joml.Matrix4f
|
||||
import org.joml.Quaternionf
|
||||
import org.joml.Vector3f
|
||||
import java.util.*
|
||||
import java.util.function.Function
|
||||
import com.cobblemon.mod.common.util.plus
|
||||
import net.minecraft.client.Minecraft
|
||||
|
||||
object StadiumClientManager {
|
||||
//Molang
|
||||
fun MoLangRuntime.setupCameraFunctions(): MoLangRuntime {
|
||||
environment.query.addFunctions(
|
||||
hashMapOf(
|
||||
"moveCamera" to Function { params ->
|
||||
if (params.get<MoValue>(0) !is StringValue) {
|
||||
return@Function Unit
|
||||
}
|
||||
val camera = StadiumCameras.getMoveCamera(params.get<MoValue>(0).asString())
|
||||
return@Function camera?.id?.toString() ?: ""
|
||||
}
|
||||
)
|
||||
)
|
||||
return this
|
||||
}
|
||||
|
||||
val runtime = MoLangRuntime().setup().setupClient().setupCameraFunctions()
|
||||
|
||||
var currentStadiumBattleUUID: UUID? = null
|
||||
|
||||
var Instruction = "DEFAULT"
|
||||
var InstructionChangeTime = 0.0
|
||||
var InstructionJustChanged = false
|
||||
|
||||
fun updateState(newState: String) {
|
||||
Instruction = newState
|
||||
InstructionChangeTime = 0.0
|
||||
InstructionJustChanged = true
|
||||
}
|
||||
|
||||
fun onLogout() {
|
||||
currentStadiumBattleUUID = null
|
||||
}
|
||||
|
||||
fun handleJoin(battleUUID: UUID, cameraManager: ResourceLocation) {
|
||||
currentStadiumBattleUUID = battleUUID
|
||||
activeCameraManager = cameraManager
|
||||
|
||||
cameraTimer = 0.0
|
||||
currentCameraState = StadiumCameraManagers.managers[cameraManager]!!.startingState
|
||||
cameraPosition = Vec3.ZERO
|
||||
cameraRotation = Quaternionf()
|
||||
updateCameraData(0.0)
|
||||
}
|
||||
|
||||
fun inStadiumBattle(): Boolean {
|
||||
return currentStadiumBattleUUID != null
|
||||
}
|
||||
|
||||
fun shouldUseStadiumCamera(): Boolean {
|
||||
return animation != null
|
||||
}
|
||||
|
||||
//Molang Data
|
||||
fun updateMolangVar() {
|
||||
val environment = runtime.environment
|
||||
environment.setSimpleVariable("instruction", StringValue(Instruction))
|
||||
//environment.setSimpleVariable("instructionChangeTime", DoubleValue(InstructionChangeTime))
|
||||
environment.setSimpleVariable("instructionJustChanged", DoubleValue(InstructionJustChanged))
|
||||
val isSpectating = CobblemonClient.battle?.spectating ?: false
|
||||
environment.setSimpleVariable("isBattling", DoubleValue(!isSpectating))
|
||||
environment.setSimpleVariable("isSpectating", DoubleValue(isSpectating))
|
||||
}
|
||||
|
||||
fun instructionUpdate(newState: String, additionalValues: MutableMap<String, MoValue>) {
|
||||
val environment = runtime.environment
|
||||
Instruction = newState
|
||||
InstructionChangeTime = 0.0
|
||||
InstructionJustChanged = true
|
||||
for (value in additionalValues) {
|
||||
environment.setSimpleVariable(value.key, value.value)
|
||||
}
|
||||
}
|
||||
|
||||
//Camera Manager
|
||||
var activeCameraManager: ResourceLocation? = null
|
||||
var cameraTimer: Double = 0.0
|
||||
var currentCameraState: String = ""
|
||||
var nextCameraState: String = ""
|
||||
var calculateNextState: Boolean = true
|
||||
|
||||
fun tickCameraManager() {
|
||||
if (!shouldUseStadiumCamera()) return
|
||||
|
||||
//Molang Variables
|
||||
val environment = runtime.environment
|
||||
if (CobblemonClient.battle != null) {
|
||||
environment.setSimpleVariable("selectingMove", DoubleValue(CobblemonClient.battle!!.mustChoose))
|
||||
}
|
||||
else {
|
||||
environment.setSimpleVariable("selectingMove", DoubleValue(0.0))
|
||||
}
|
||||
|
||||
val currentManager = StadiumCameraManagers.managers[activeCameraManager]!!
|
||||
val currentState = currentManager.states[currentCameraState]!!
|
||||
val currentCamera = StadiumCameras.cameras[runtime.resolveString(currentState.camera).asResource()]
|
||||
|
||||
InstructionChangeTime += 0.05
|
||||
if (currentCamera != null) {
|
||||
cameraTimer += 0.05
|
||||
if (cameraTimer > currentCamera.length) {
|
||||
if (currentState.loop) {
|
||||
cameraTimer -= currentCamera.length
|
||||
}
|
||||
else {
|
||||
cameraTimer = currentCamera.length
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!calculateNextState) {
|
||||
currentCameraState = nextCameraState
|
||||
calculateNextState = true
|
||||
|
||||
cameraTimer = if (currentCamera != null && currentCamera.length != 0.0) cameraTimer - currentCamera.length else 0.0
|
||||
}
|
||||
else {
|
||||
updateMolangVar()
|
||||
environment.setSimpleVariable("instructionChangeTime", DoubleValue(InstructionChangeTime))
|
||||
|
||||
val endOfAnim = if (currentCamera != null) cameraTimer + 1/20 >= currentCamera.length else true
|
||||
|
||||
val nextState = evaluateTransitions(currentState, endOfAnim)
|
||||
if (nextState != null) {
|
||||
nextCameraState = nextState.targetState
|
||||
while (true) {
|
||||
val newState = currentManager.states[nextCameraState]!!
|
||||
val newCamera = StadiumCameras.cameras[runtime.resolveString(newState.camera).asResource()]
|
||||
val newEndOfAnim = if (newCamera != null) newCamera.length == 0.0 else true
|
||||
|
||||
val newNextState = evaluateTransitions(newState, newEndOfAnim)
|
||||
if (newNextState == null) {
|
||||
break
|
||||
}
|
||||
else {
|
||||
nextCameraState = newNextState.targetState
|
||||
}
|
||||
}
|
||||
calculateNextState = false
|
||||
}
|
||||
}
|
||||
if (InstructionJustChanged) {
|
||||
InstructionJustChanged = false
|
||||
Instruction = "NONE"
|
||||
}
|
||||
}
|
||||
|
||||
private fun evaluateTransitions(state: StadiumCameraState, checkEnd: Boolean) : StadiumCameraTransition? {
|
||||
var nextState = state.listOfTransitions.firstOrNull { !it.checkOnEnd && runtime.resolveBoolean(it.condition) }
|
||||
if (nextState == null && checkEnd) {
|
||||
nextState = state.listOfTransitions.firstOrNull { it.checkOnEnd && runtime.resolveBoolean(it.condition) }
|
||||
}
|
||||
return nextState
|
||||
}
|
||||
|
||||
var cameraPosition: Vec3 = Vec3.ZERO
|
||||
var cameraRotation: Quaternionf = Quaternionf()
|
||||
|
||||
var startTime = 0.0
|
||||
var startPosition: Vec3? = null
|
||||
var startRotation: Vector3f? = null
|
||||
var attackAnimationPokemon: PokemonEntity? = null
|
||||
var animation: PrimaryAnimation? = null
|
||||
var oldFov: Int = 0
|
||||
|
||||
fun playAnimation(pokemon: PokemonEntity, animation: PrimaryAnimation) {
|
||||
if (startTime != 0.0) return
|
||||
attackAnimationPokemon = pokemon
|
||||
this.animation = animation
|
||||
this.oldFov = Minecraft.getInstance().options.fov().get()
|
||||
animation.afterAction += {
|
||||
cameraPosition = Vec3.ZERO
|
||||
cameraRotation = Quaternionf()
|
||||
attackAnimationPokemon = null
|
||||
this.animation = null
|
||||
Minecraft.getInstance().options.fov().set(oldFov)
|
||||
}
|
||||
}
|
||||
|
||||
fun updateCameraData(delta: Double) {
|
||||
val pokemon = attackAnimationPokemon ?: return
|
||||
val delegate = pokemon.delegate as? PokemonClientDelegate ?: return
|
||||
|
||||
delegate.updatePartialTicks(delta.toFloat())
|
||||
MountedPokemonAnimationRenderController.reset()
|
||||
MountedPokemonAnimationRenderController.setup(pokemon, delta.toFloat())
|
||||
|
||||
val locator = delegate.locatorStates["camera"] ?: return
|
||||
|
||||
cameraPosition = locator.position.add(locator.matrix.getTranslation(Vector3f()).toVec3d())
|
||||
cameraRotation = locator.matrix.getUnnormalizedRotation(Quaternionf()).normalize()
|
||||
val cameraPart = delegate.currentModel?.getPart("locator_camera") ?: return
|
||||
val fov = cameraPart.zScale.toInt()
|
||||
if (Minecraft.getInstance().options.fov().get() != fov) {
|
||||
Minecraft.getInstance().options.fov().set(fov)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
package com.cobblemon.mod.common.stadium
|
||||
|
||||
class StadiumFormat {
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package com.cobblemon.mod.common.stadium
|
||||
|
||||
import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler
|
||||
import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
|
||||
import net.minecraft.client.Minecraft
|
||||
import net.minecraft.server.MinecraftServer
|
||||
import net.minecraft.server.level.ServerPlayer
|
||||
|
||||
object StadiumJoinHandler: ClientNetworkPacketHandler<StadiumJoinPacket> {
|
||||
override fun handle(packet: StadiumJoinPacket, client: Minecraft) {
|
||||
StadiumClientManager.handleJoin(packet.joiningBattle, packet.cameraManager)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.cobblemon.mod.common.stadium
|
||||
|
||||
import com.cobblemon.mod.common.api.net.NetworkPacket
|
||||
import com.cobblemon.mod.common.util.cobblemonResource
|
||||
import com.cobblemon.mod.common.util.readIdentifier
|
||||
import com.cobblemon.mod.common.util.writeIdentifier
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
import java.util.*
|
||||
|
||||
class StadiumJoinPacket(
|
||||
val joiningBattle: UUID,
|
||||
val cameraManager: ResourceLocation
|
||||
): NetworkPacket<StadiumJoinPacket> {
|
||||
override val id = ID
|
||||
override fun encode(buffer: RegistryFriendlyByteBuf) {
|
||||
buffer.writeUUID(this.joiningBattle)
|
||||
buffer.writeIdentifier(cameraManager)
|
||||
}
|
||||
companion object {
|
||||
val ID = cobblemonResource("stadium_join")
|
||||
fun decode(buffer: RegistryFriendlyByteBuf) = StadiumJoinPacket(buffer.readUUID(), buffer.readIdentifier())
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package com.cobblemon.mod.common.stadium
|
||||
|
||||
import com.cobblemon.mod.common.api.battles.model.PokemonBattle
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
import net.minecraft.server.level.ServerPlayer
|
||||
import java.util.UUID
|
||||
|
||||
object StadiumServerManager {
|
||||
val activeStadiumBattles = mutableMapOf<UUID, StadiumBattleInstance>()
|
||||
|
||||
fun createNewStadiumBattle(battle: UUID, managerResource: ResourceLocation, participants: MutableList<UUID> = mutableListOf<UUID>()) {
|
||||
val newInstance = StadiumBattleInstance(battle, managerResource)
|
||||
newInstance.participants = participants
|
||||
activeStadiumBattles[battle] = newInstance
|
||||
}
|
||||
|
||||
fun terminateNewStadiumBattle(battle: UUID) {
|
||||
activeStadiumBattles.remove(battle)
|
||||
}
|
||||
|
||||
fun addPlayerToStadiumBattle(battle: UUID, player: UUID) {
|
||||
val instance = activeStadiumBattles[battle]
|
||||
if (instance != null) {
|
||||
if (!instance.participants.contains(player)) instance.participants.add(player)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class StadiumBattleInstance(
|
||||
val stadiumBattleId: UUID,
|
||||
val managerResource: ResourceLocation
|
||||
){
|
||||
var participants = mutableListOf<UUID>()
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
package com.cobblemon.mod.common.stadium
|
||||
|
||||
import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
|
||||
import com.cobblemon.mod.common.api.battles.model.PokemonBattle
|
||||
import com.cobblemon.mod.common.battles.BattleBuilder
|
||||
import com.cobblemon.mod.common.battles.SuccessfulBattleStart
|
||||
import com.cobblemon.mod.common.util.getPlayer
|
||||
import com.cobblemon.mod.common.util.party
|
||||
import net.minecraft.server.level.ServerPlayer
|
||||
import net.minecraft.world.phys.Vec3
|
||||
|
||||
class StadiumSingleBattle: StadiumBattleDefenition() {
|
||||
@JvmField
|
||||
val MAX_PLAYERS = 2
|
||||
|
||||
var player1Position = Vec3(0.0,0.0,0.0)
|
||||
var player2Position = Vec3(0.0,0.0,0.0)
|
||||
|
||||
var player1PokemonPosition = Vec3(0.0,0.0,0.0)
|
||||
var player2PokemonPosition = Vec3(0.0,0.0,0.0)
|
||||
|
||||
var activeBattle: PokemonBattle? = null
|
||||
|
||||
override fun readyForBattle(): Boolean {
|
||||
return this.getPlayers().count() == MAX_PLAYERS
|
||||
}
|
||||
|
||||
override fun canAddPlayer(player: ServerPlayer): Boolean {
|
||||
val party = player.party()
|
||||
return party.occupied() > 0
|
||||
}
|
||||
|
||||
override fun addPlayer(player: ServerPlayer) {
|
||||
if (canAddPlayer(player)) {
|
||||
participants.add(player.uuid)
|
||||
player.sendPacket(StadiumJoinPacket(player.uuid, StadiumCameraManagers.managers.keys.first()))
|
||||
}
|
||||
}
|
||||
|
||||
override fun getPlayers(): MutableList<ServerPlayer> {
|
||||
return participants.mapNotNull { it.getPlayer() }.toMutableList()
|
||||
}
|
||||
|
||||
override fun initializeBattle() {
|
||||
if (!readyForBattle()) return
|
||||
|
||||
val players = getPlayers()
|
||||
|
||||
val player1 = players[0]
|
||||
val player2 = players[1]
|
||||
|
||||
val battleResult = BattleBuilder.pvp1v1(player1, player2)
|
||||
var errored = false
|
||||
battleResult.ifErrored { errored = true }
|
||||
if (errored) return
|
||||
|
||||
val battle = (battleResult as SuccessfulBattleStart).battle
|
||||
}
|
||||
|
||||
override fun getCurrentCamera(): StadiumCameraEntry {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.cobblemon.mod.common.util
|
||||
|
||||
import com.cobblemon.mod.common.util.math.geometry.toDegrees
|
||||
import com.cobblemon.mod.common.util.math.toEulerXYZ
|
||||
import net.minecraft.client.Camera
|
||||
import org.joml.Quaternionf
|
||||
|
||||
fun Camera.setRotation(pitch: Float, yaw: Float, roll: Float) {
|
||||
this.xRot = pitch.toDegrees()
|
||||
this.yRot = yaw.toDegrees()
|
||||
this.rotation.rotationYXZ(yaw, pitch, roll)
|
||||
Camera.FORWARDS.rotate(this.rotation, this.forwards)
|
||||
Camera.UP.rotate(this.rotation, this.up)
|
||||
Camera.LEFT.rotate(this.rotation, this.left)
|
||||
}
|
||||
+8
-15
@@ -9,18 +9,13 @@
|
||||
package com.cobblemon.mod.common.util.adapters
|
||||
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.air.*
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.*
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeBehaviour
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeSettings
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies.FallCompositeSettings
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies.FallStrategy
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies.JumpStrategy
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies.RunStrategy
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.land.HorseBehaviour
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.land.HorseSettings
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.land.VehicleBehaviour
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.land.VehicleSettings
|
||||
import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.*
|
||||
import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
|
||||
import com.google.gson.JsonDeserializationContext
|
||||
import com.google.gson.JsonDeserializer
|
||||
@@ -34,17 +29,15 @@ import java.lang.reflect.Type
|
||||
* @author landonjw
|
||||
*/
|
||||
object RidingBehaviourSettingsAdapter : JsonDeserializer<RidingBehaviourSettings> {
|
||||
val types: MutableMap<ResourceLocation, Class<out RidingBehaviourSettings>> = mutableMapOf(
|
||||
BirdBehaviour.KEY to BirdSettings::class.java,
|
||||
val types: MutableMap<ResourceLocation, Class<out RidingBehaviourSettings>> = mutableMapOf(BirdAirBehaviour.KEY to BirdAirSettings::class.java,
|
||||
DolphinBehaviour.KEY to DolphinSettings::class.java,
|
||||
HorseBehaviour.KEY to HorseSettings::class.java,
|
||||
BoatBehaviour.KEY to BoatSettings::class.java,
|
||||
SubmarineBehaviour.KEY to SubmarineSettings::class.java,
|
||||
GliderBehaviour.KEY to GliderSettings::class.java,
|
||||
GenericLandBehaviour.KEY to GenericLandSettings::class.java,
|
||||
GenericSwimBehaviour.KEY to GenericSwimSettings::class.java,
|
||||
GliderAirBehaviour.KEY to GliderAirSettings::class.java,
|
||||
HelicopterBehaviour.KEY to HelicopterSettings::class.java,
|
||||
JetBehaviour.KEY to JetSettings::class.java,
|
||||
BurstBehaviour.KEY to BurstSettings::class.java,
|
||||
VehicleBehaviour.KEY to VehicleSettings::class.java,
|
||||
JetAirBehaviour.KEY to JetAirSettings::class.java,
|
||||
SwimDashBehaviour.KEY to SwimDashSettings::class.java,
|
||||
VehicleLandBehaviour.KEY to VehicleLandSettings::class.java,
|
||||
HoverBehaviour.KEY to HoverSettings::class.java,
|
||||
CompositeBehaviour.KEY to CompositeSettings::class.java,
|
||||
|
||||
|
||||
+41
@@ -0,0 +1,41 @@
|
||||
{
|
||||
"format_version": "1.8.0",
|
||||
"animations": {
|
||||
"animation.rotom_drone.sleep": {
|
||||
"loop": true,
|
||||
"bones": {
|
||||
"body": {
|
||||
"rotation": [
|
||||
"math.sin(query.anim_time * 120) * 6",
|
||||
0,
|
||||
"math.cos(query.anim_time * 100) * 4"
|
||||
],
|
||||
"position": [
|
||||
0,
|
||||
"18 + math.sin(query.anim_time * 90) * 1",
|
||||
0
|
||||
]
|
||||
},
|
||||
"head": {
|
||||
"relative_to": {
|
||||
"rotation": "entity"
|
||||
},
|
||||
"rotation": [
|
||||
0,
|
||||
0,
|
||||
0.01
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"animation.rotom_drone.circle": {
|
||||
"loop": true,
|
||||
"bones": {
|
||||
"rotom_drone": {
|
||||
"rotation": [30, "90 - q.anim_time*90", 0],
|
||||
"position": ["48*math.cos(q.anim_time*90)", 64, "48*math.sin(q.anim_time*90)"]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,208 @@
|
||||
{
|
||||
"format_version": "1.12.0",
|
||||
"minecraft:geometry": [
|
||||
{
|
||||
"description": {
|
||||
"identifier": "geometry.drone_rotom",
|
||||
"texture_width": 64,
|
||||
"texture_height": 32,
|
||||
"visible_bounds_width": 8,
|
||||
"visible_bounds_height": 6.5,
|
||||
"visible_bounds_offset": [0, 2.75, 0]
|
||||
},
|
||||
"bones": [
|
||||
{
|
||||
"name": "rotom_drone",
|
||||
"pivot": [0, 0, 0]
|
||||
},
|
||||
{
|
||||
"name": "body",
|
||||
"parent": "rotom_drone",
|
||||
"pivot": [0, 8, 0]
|
||||
},
|
||||
{
|
||||
"name": "head",
|
||||
"parent": "body",
|
||||
"pivot": [0, 6.5, 0],
|
||||
"cubes": [
|
||||
{"origin": [-5.5, 6.5, -3.5], "size": [11, 6, 7], "uv": [0, 0]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eyes",
|
||||
"parent": "head",
|
||||
"pivot": [0.5, 6.5, -2.5]
|
||||
},
|
||||
{
|
||||
"name": "eye_right",
|
||||
"parent": "eyes",
|
||||
"pivot": [-2.9, 9.5, -3.5],
|
||||
"rotation": [0, 0, -7.5],
|
||||
"cubes": [
|
||||
{"origin": [-3.9, 7.5, -3.5], "size": [2, 4, 0], "inflate": 0.01, "uv": [0, 0], "mirror": true},
|
||||
{"origin": [-3.9, 9, -3.5], "size": [2, 1, 0], "inflate": 0.02, "uv": [0, 6], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "pupil_right",
|
||||
"parent": "eye_right",
|
||||
"pivot": [-2.9, 9.5, -3.5],
|
||||
"cubes": [
|
||||
{"origin": [-3.4, 8, -3.5], "size": [1, 3, 0], "inflate": 0.03, "uv": [5, 0], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eye_left",
|
||||
"parent": "eyes",
|
||||
"pivot": [2.9, 9.5, -3.5],
|
||||
"rotation": [0, 0, 7.5],
|
||||
"cubes": [
|
||||
{"origin": [1.9, 7.5, -3.5], "size": [2, 4, 0], "inflate": 0.01, "uv": [0, 13]},
|
||||
{"origin": [1.9, 9, -3.5], "size": [2, 1, 0], "inflate": 0.02, "uv": [0, 5]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "pupil_left",
|
||||
"parent": "eye_left",
|
||||
"pivot": [2.9, 9.5, -3.5],
|
||||
"cubes": [
|
||||
{"origin": [2.4, 8, -3.5], "size": [1, 3, 0], "inflate": 0.03, "uv": [6, 13]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "mouth_smile",
|
||||
"parent": "head",
|
||||
"pivot": [0, 7.55, -3.5],
|
||||
"cubes": [
|
||||
{"origin": [-1, 6.95, -3.5], "size": [2, 1, 0], "inflate": 0.02, "uv": [36, 7]},
|
||||
{"origin": [-1.5, 7.25, -3.5], "size": [1, 1, 0], "inflate": 0.01, "uv": [40, 7]},
|
||||
{"origin": [0.5, 7.25, -3.5], "size": [1, 1, 0], "inflate": 0.01, "uv": [42, 7]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "mouth_closed",
|
||||
"parent": "head",
|
||||
"pivot": [0, 7.45, -3.4],
|
||||
"cubes": [
|
||||
{"origin": [-0.5, 6.95, -3.4], "size": [1, 1, 0], "inflate": 0.02, "uv": [38, 8]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "mouth_open",
|
||||
"parent": "head",
|
||||
"pivot": [0, 7.45, -3.4],
|
||||
"cubes": [
|
||||
{"origin": [-0.5, 6.95, -3.4], "size": [1, 1, 0], "inflate": 0.02, "uv": [36, 8]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "mouth_sad",
|
||||
"parent": "head",
|
||||
"pivot": [0, 7.6, -3.3],
|
||||
"cubes": [
|
||||
{"origin": [-1, 7.3, -3.3], "size": [2, 1, 0], "inflate": 0.02, "uv": [36, 9]},
|
||||
{"origin": [-1.5, 7, -3.3], "size": [1, 1, 0], "inflate": 0.01, "uv": [40, 9]},
|
||||
{"origin": [0.5, 7, -3.3], "size": [1, 1, 0], "inflate": 0.01, "uv": [42, 9]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "head_spike1",
|
||||
"parent": "head",
|
||||
"pivot": [0, 12.5, 0],
|
||||
"cubes": [
|
||||
{"origin": [-1.5, 11.5, -1.5], "size": [3, 4, 3], "uv": [29, 0]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "head_spike2",
|
||||
"parent": "head_spike1",
|
||||
"pivot": [0, 15.5, 0],
|
||||
"cubes": [
|
||||
{"origin": [-1, 14.5, -1], "size": [2, 4, 2], "uv": [8, 13]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "head_spike3",
|
||||
"parent": "head_spike2",
|
||||
"pivot": [0, 18.5, 0],
|
||||
"cubes": [
|
||||
{"origin": [-0.5, 17.5, -0.5], "size": [1, 3, 1], "uv": [44, 6]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "torso",
|
||||
"parent": "body",
|
||||
"pivot": [0, 7, 0],
|
||||
"cubes": [
|
||||
{"origin": [-2, 3, -1.5], "size": [4, 4, 3], "uv": [34, 10]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "camera",
|
||||
"parent": "torso",
|
||||
"pivot": [0, 4.65, -1.25],
|
||||
"cubes": [
|
||||
{"origin": [-1, 3.65, -2.75], "size": [2, 2, 2], "uv": [24, 13]},
|
||||
{"origin": [-0.5, 4.15, -2.75], "size": [1, 1, 0], "inflate": 0.01, "uv": [38, 0]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "propeller_front_right",
|
||||
"parent": "torso",
|
||||
"pivot": [-1.5, 5, -1],
|
||||
"rotation": [0, 45, 0],
|
||||
"cubes": [
|
||||
{"origin": [-2, 5, -3.5], "size": [1, 0, 3], "uv": [37, 0]},
|
||||
{"origin": [-5.5, 5, -11.5], "size": [8, 0, 8], "uv": [40, 0]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "propeller_front_left",
|
||||
"parent": "torso",
|
||||
"pivot": [1.5, 5, -1],
|
||||
"rotation": [0, -45, 0],
|
||||
"cubes": [
|
||||
{"origin": [1, 5, -3.5], "size": [1, 0, 3], "uv": [27, 0]},
|
||||
{"origin": [-2.5, 5, -11.5], "size": [8, 0, 8], "uv": [40, 0]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "propeller_back_right",
|
||||
"parent": "torso",
|
||||
"pivot": [-1.5, 5, 1],
|
||||
"rotation": [0, -45, 0],
|
||||
"cubes": [
|
||||
{"origin": [-2, 5, 0.5], "size": [1, 0, 3], "uv": [39, 0]},
|
||||
{"origin": [-5.5, 5, 3.5], "size": [8, 0, 8], "uv": [40, 0]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "propeller_back_left",
|
||||
"parent": "torso",
|
||||
"pivot": [1.5, 5, 1],
|
||||
"rotation": [0, 45, 0],
|
||||
"cubes": [
|
||||
{"origin": [1, 5, 0.5], "size": [1, 0, 3], "uv": [42, 3]},
|
||||
{"origin": [-2.5, 5, 3.5], "size": [8, 0, 8], "uv": [40, 0]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "tail1",
|
||||
"parent": "torso",
|
||||
"pivot": [0, 3, 0],
|
||||
"cubes": [
|
||||
{"origin": [-1, 1, -1], "size": [2, 3, 2], "uv": [16, 13]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "tail2",
|
||||
"parent": "tail1",
|
||||
"pivot": [0, 1, 0],
|
||||
"cubes": [
|
||||
{"origin": [-0.5, -1, -0.5], "size": [1, 3, 1], "uv": [41, 3]}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"poses": {
|
||||
"sleep": {
|
||||
"poseTypes": ["SLEEP"],
|
||||
"animations": ["q.bedrock('rotom_drone', 'sleep')"]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
{
|
||||
"name": "cobblemon:rotom_drone",
|
||||
"order": 0,
|
||||
"variations": [
|
||||
{
|
||||
"aspects": [],
|
||||
"poser": "cobblemon:rotom_drone",
|
||||
"model": "cobblemon:rotom_drone.geo",
|
||||
"texture": "cobblemon:textures/drone/rotom_drone.png",
|
||||
"layers": []
|
||||
}
|
||||
]
|
||||
}
|
||||
+2
-10
@@ -266,7 +266,7 @@
|
||||
}
|
||||
},
|
||||
"animation.wailord.cry": {
|
||||
"animation_length": 2.8333,
|
||||
"animation_length": 2.83333,
|
||||
"bones": {
|
||||
"body": {
|
||||
"rotation": {
|
||||
@@ -1337,14 +1337,6 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"scale": {
|
||||
"loop": true,
|
||||
"bones": {
|
||||
"wailord": {
|
||||
"scale": 25
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+14
-1
@@ -458,8 +458,21 @@
|
||||
"2.125": [0, -42.5, 0],
|
||||
"2.3333": [0, -47.5, 0]
|
||||
}
|
||||
},
|
||||
"locator_camera": {
|
||||
"relative_to": {
|
||||
"rotation": "entity"
|
||||
},
|
||||
"position": {
|
||||
"0.0": [-24, 12, -23],
|
||||
"0.91667": [20, 11, -15]
|
||||
},
|
||||
"rotation": {
|
||||
"0.0": [0, -145, 0],
|
||||
"0.91667": [0, -215, 0]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+43
-1
@@ -1343,6 +1343,27 @@
|
||||
"2.2083": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
|
||||
"2.3333": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
|
||||
}
|
||||
},
|
||||
"locator_camera": {
|
||||
"relative_to": {
|
||||
"rotation": "entity"
|
||||
},
|
||||
"position": {
|
||||
"0.0": [0, 45, -42],
|
||||
"0.125": [0, 16, -42],
|
||||
"1.20833": [0, 16, -42],
|
||||
"1.41667": [0, 66, -26],
|
||||
"2.20833": [0, 72, -11],
|
||||
"2.33333": [0, 26, -37]
|
||||
},
|
||||
"rotation": {
|
||||
"0.0": [197.5, 2.5, -180],
|
||||
"0.125": [172.5, 2.5, -180],
|
||||
"1.20833": [172.5, 2.5, -180],
|
||||
"1.41667": [227.5, 2.5, -180],
|
||||
"2.20833": [245, 2.5, -180],
|
||||
"2.33333": [185, 2.5, -180]
|
||||
}
|
||||
}
|
||||
},
|
||||
"sound_effects": {
|
||||
@@ -3632,6 +3653,27 @@
|
||||
"0.2083": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
|
||||
"1.375": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
|
||||
}
|
||||
},
|
||||
"locator_camera": {
|
||||
"relative_to": {
|
||||
"rotation": "entity"
|
||||
},
|
||||
"position": {
|
||||
"0.0": [0, 22, -44],
|
||||
"0.25": [-41, 22, -25],
|
||||
"1.20833": [-41, 22, -25],
|
||||
"1.45833": [40, 22, -28],
|
||||
"2": [40, 22, -28],
|
||||
"2.20833": [0, 22, -61]
|
||||
},
|
||||
"rotation": {
|
||||
"0.0": [0, 180, 0],
|
||||
"0.25": [0, 227.5, 0],
|
||||
"1.20833": [0, 227.5, 0],
|
||||
"1.45833": [0, 127.5, 0],
|
||||
"2": [0, 127.5, 0],
|
||||
"2.20833": [0, 180, 0]
|
||||
}
|
||||
}
|
||||
},
|
||||
"sound_effects": {
|
||||
@@ -5910,4 +5952,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+10866
-3300
File diff suppressed because it is too large.
Load diff
+1
-309
@@ -15,43 +15,11 @@
|
||||
"name": "wailord",
|
||||
"pivot": [0, 0, 0]
|
||||
},
|
||||
{
|
||||
"name": "locator_root",
|
||||
"parent": "wailord",
|
||||
"pivot": [0, 0, 0],
|
||||
"locators": {
|
||||
"root": [0, 0, 0]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_top",
|
||||
"parent": "wailord",
|
||||
"pivot": [0, 38, 8],
|
||||
"locators": {
|
||||
"top": [0, 38, 8]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "body",
|
||||
"parent": "wailord",
|
||||
"pivot": [0, 0, 0]
|
||||
},
|
||||
{
|
||||
"name": "locator_middle",
|
||||
"parent": "body",
|
||||
"pivot": [0, 19, 8],
|
||||
"locators": {
|
||||
"middle": [0, 19, 8]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_target",
|
||||
"parent": "body",
|
||||
"pivot": [0, 19, -42.5],
|
||||
"locators": {
|
||||
"target": [0, 19, -42.5]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "torso",
|
||||
"parent": "body",
|
||||
@@ -70,87 +38,6 @@
|
||||
{"origin": [20.5, 14, -40.5], "size": [0, 5, 30], "uv": [14, 12]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "locator_physical",
|
||||
"parent": "head",
|
||||
"pivot": [0, 25, -41],
|
||||
"locators": {
|
||||
"item_physical": [0, 25, -41]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_item_face",
|
||||
"parent": "head",
|
||||
"pivot": [0, 20, -41],
|
||||
"locators": {
|
||||
"item_face": [0, 20, -41]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_item_hat",
|
||||
"parent": "head",
|
||||
"pivot": [0, 38, -14],
|
||||
"locators": {
|
||||
"item_hat": [0, 38, -14]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_head",
|
||||
"parent": "head",
|
||||
"pivot": [0, 38, -25],
|
||||
"locators": {
|
||||
"head": [0, 38, -25]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_face",
|
||||
"parent": "head",
|
||||
"pivot": [0, 20, -41],
|
||||
"locators": {
|
||||
"face": [0, 20, -41]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_mouth",
|
||||
"parent": "head",
|
||||
"pivot": [0, 19, -9],
|
||||
"locators": {
|
||||
"mouth": [0, 19, -9],
|
||||
"special": [0, 19, -9]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_jaw_upper",
|
||||
"parent": "head",
|
||||
"pivot": [0, 14, -40.5],
|
||||
"locators": {
|
||||
"jaw1": [0, 14, -40.5]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_1",
|
||||
"parent": "head",
|
||||
"pivot": [0, 40, -25],
|
||||
"locators": {
|
||||
"seat_1": [0, 38.25, -25]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_2",
|
||||
"parent": "head",
|
||||
"pivot": [-11, 40, -14],
|
||||
"locators": {
|
||||
"seat_2": [-11, 38.25, -14]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_3",
|
||||
"parent": "head",
|
||||
"pivot": [11, 40, -14],
|
||||
"locators": {
|
||||
"seat_3": [11, 38.25, -14]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "eyes",
|
||||
"parent": "head",
|
||||
@@ -165,14 +52,6 @@
|
||||
{"origin": [-21.5, 19.75, -26], "size": [0, 1, 1], "inflate": 0.06, "uv": [2, -1]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "locator_eye_right",
|
||||
"parent": "eye_right",
|
||||
"pivot": [-21.5, 20.25, -25.5],
|
||||
"locators": {
|
||||
"eye1": [-21.5, 20.25, -25.5]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "eyelid_right",
|
||||
"parent": "eye_right",
|
||||
@@ -190,14 +69,6 @@
|
||||
{"origin": [21.5, 19.75, -26], "size": [0, 1, 1], "inflate": 0.06, "uv": [0, -1], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "locator_eye_left",
|
||||
"parent": "eye_left",
|
||||
"pivot": [21.5, 20.25, -25.5],
|
||||
"locators": {
|
||||
"eye2": [21.5, 20.25, -25.5]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "eyelid_left",
|
||||
"parent": "eye_left",
|
||||
@@ -214,14 +85,6 @@
|
||||
{"origin": [-21.5, 0, -41], "size": [43, 19, 32], "inflate": 0.02, "uv": [159, 77]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "locator_jaw_lower",
|
||||
"parent": "lower_jaw",
|
||||
"pivot": [0, 19, -39],
|
||||
"locators": {
|
||||
"jaw2": [0, 19, -39]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "tongue",
|
||||
"parent": "lower_jaw",
|
||||
@@ -231,14 +94,6 @@
|
||||
{"origin": [-15.5, 15.5, -36], "size": [31, 7, 27], "uv": [396, 58]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "locator_item",
|
||||
"parent": "tongue",
|
||||
"pivot": [0, 22.5, -28],
|
||||
"locators": {
|
||||
"item": [0, 22.5, -28]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "torso_middle",
|
||||
"parent": "torso",
|
||||
@@ -247,107 +102,6 @@
|
||||
{"origin": [-21.5, 0, -12], "size": [43, 38, 35], "inflate": 0.01, "uv": [0, 55]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "locators",
|
||||
"parent": "torso_middle",
|
||||
"pivot": [0, 0, 0]
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_4",
|
||||
"parent": "locators",
|
||||
"pivot": [-6, 40, -1],
|
||||
"locators": {
|
||||
"seat_4": [-6, 38.25, -1]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_5",
|
||||
"parent": "locators",
|
||||
"pivot": [6, 40, -1],
|
||||
"locators": {
|
||||
"seat_5": [6, 38.25, -1]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_6",
|
||||
"parent": "locators",
|
||||
"pivot": [-16, 40, -1],
|
||||
"locators": {
|
||||
"seat_6": [-16, 38.25, -1]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_7",
|
||||
"parent": "locators",
|
||||
"pivot": [16, 40, -1],
|
||||
"locators": {
|
||||
"seat_7": [16, 38.25, -1]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_8",
|
||||
"parent": "locators",
|
||||
"pivot": [-6, 40, 11],
|
||||
"locators": {
|
||||
"seat_8": [-6, 38.25, 11]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_9",
|
||||
"parent": "locators",
|
||||
"pivot": [6, 40, 11],
|
||||
"locators": {
|
||||
"seat_9": [6, 38.25, 11]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_10",
|
||||
"parent": "locators",
|
||||
"pivot": [-16, 40, 11],
|
||||
"locators": {
|
||||
"seat_10": [-16, 38.25, 11]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_11",
|
||||
"parent": "locators",
|
||||
"pivot": [16, 40, 11],
|
||||
"locators": {
|
||||
"seat_11": [16, 38.25, 11]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_12",
|
||||
"parent": "locators",
|
||||
"pivot": [-6, 40, 21],
|
||||
"locators": {
|
||||
"seat_12": [-6, 38.25, 21]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_13",
|
||||
"parent": "locators",
|
||||
"pivot": [6, 40, 21],
|
||||
"locators": {
|
||||
"seat_13": [6, 38.25, 21]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_14",
|
||||
"parent": "locators",
|
||||
"pivot": [-16, 40, 21],
|
||||
"locators": {
|
||||
"seat_14": [-16, 38.25, 21]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_15",
|
||||
"parent": "locators",
|
||||
"pivot": [16, 40, 21],
|
||||
"locators": {
|
||||
"seat_15": [16, 38.25, 21]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "fin_right_front",
|
||||
"parent": "torso_middle",
|
||||
@@ -388,38 +142,6 @@
|
||||
{"origin": [-21.5, 0, 20], "size": [43, 38, 35], "uv": [136, 0]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_16",
|
||||
"parent": "torso_back",
|
||||
"pivot": [-6, 40, 31],
|
||||
"locators": {
|
||||
"seat_16": [-6, 38.25, 31]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_17",
|
||||
"parent": "torso_back",
|
||||
"pivot": [6, 40, 31],
|
||||
"locators": {
|
||||
"seat_17": [6, 38.25, 31]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_18",
|
||||
"parent": "torso_back",
|
||||
"pivot": [-16, 40, 31],
|
||||
"locators": {
|
||||
"seat_18": [-16, 38.25, 31]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "locator_seat_19",
|
||||
"parent": "torso_back",
|
||||
"pivot": [16, 40, 31],
|
||||
"locators": {
|
||||
"seat_19": [16, 38.25, 31]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "fin_right_back",
|
||||
"parent": "torso_back",
|
||||
@@ -470,18 +192,6 @@
|
||||
{"origin": [-3, 49.5, 45], "size": [6, 7, 10], "uv": [361, 68]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "locator_tail",
|
||||
"parent": "tail_base2",
|
||||
"pivot": [0, 53, 50],
|
||||
"rotation": [-65, 180, 0],
|
||||
"locators": {
|
||||
"tail": {
|
||||
"offset": [0, 53, 50],
|
||||
"rotation": [180, 0, 0]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "tail_fin",
|
||||
"parent": "tail_base2",
|
||||
@@ -501,15 +211,6 @@
|
||||
{"origin": [-32, 54.5, 47], "size": [7, 2, 11], "pivot": [-25, 55.5, 58], "rotation": [0, -32.5, 0], "uv": [323, 56]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "locator_tail_tip",
|
||||
"parent": "tail_right",
|
||||
"pivot": [-30.75, 55.5, 54.25],
|
||||
"rotation": [0, 150, 0],
|
||||
"locators": {
|
||||
"tail_tip1": [-30.75, 55.5, 54.25]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "tail_left",
|
||||
"parent": "tail_fin",
|
||||
@@ -520,15 +221,6 @@
|
||||
{"origin": [25, 54.5, 47], "size": [7, 2, 11], "pivot": [25, 55.5, 58], "rotation": [0, 32.5, 0], "uv": [322, 72]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "locator_tail_tip2",
|
||||
"parent": "tail_left",
|
||||
"pivot": [30.75, 55.5, 54.25],
|
||||
"rotation": [0, -150, 0],
|
||||
"locators": {
|
||||
"tail_tip2": [30.75, 55.5, 54.25]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "white_fin_right",
|
||||
"parent": "torso_back",
|
||||
@@ -550,4 +242,4 @@
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
+9
-1
@@ -237,8 +237,16 @@
|
||||
"cubes": [
|
||||
{"origin": [10, 2, -1], "size": [2, 2, 2], "inflate": -0.001, "uv": [8, 36]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "locator_camera",
|
||||
"parent": "tandemaus",
|
||||
"pivot": [0, 0, 0],
|
||||
"locators": {
|
||||
"camera": [0, 0, 0]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
+9
-1
@@ -601,8 +601,16 @@
|
||||
"cubes": [
|
||||
{"origin": [-2.33, -1, -2.65], "size": [2, 2, 2], "inflate": 0.02, "pivot": [-1.3, 0, -1.65], "rotation": [0, -45, 0], "uv": [52, 36], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "locator_camera",
|
||||
"parent": "ceruledge",
|
||||
"pivot": [0, 0, 0],
|
||||
"locators": {
|
||||
"camera": [0, 0, 0]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
+22
-4
@@ -26,8 +26,13 @@
|
||||
"pivot": [0, 4, 0]
|
||||
},
|
||||
{
|
||||
"name": "arm_hammer_right",
|
||||
"name": "arms_hammer",
|
||||
"parent": "torso_hammer",
|
||||
"pivot": [0, 7, 0]
|
||||
},
|
||||
{
|
||||
"name": "arm_hammer_right",
|
||||
"parent": "arms_hammer",
|
||||
"pivot": [-1.5, 6.5, 0]
|
||||
},
|
||||
{
|
||||
@@ -307,8 +312,13 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "arm_left",
|
||||
"name": "arms",
|
||||
"parent": "torso",
|
||||
"pivot": [0, 7, 0]
|
||||
},
|
||||
{
|
||||
"name": "arm_left",
|
||||
"parent": "arms",
|
||||
"pivot": [1.5, 6.5, 0],
|
||||
"cubes": [
|
||||
{"origin": [1.5, 5.5, -1.5], "size": [3, 2, 3], "uv": [94, 16]}
|
||||
@@ -369,7 +379,7 @@
|
||||
},
|
||||
{
|
||||
"name": "arm_right",
|
||||
"parent": "torso",
|
||||
"parent": "arms",
|
||||
"pivot": [-1.5, 6.5, 0],
|
||||
"cubes": [
|
||||
{"origin": [-4.5, 5.5, -1.5], "size": [3, 2, 3], "uv": [58, 93]}
|
||||
@@ -459,8 +469,16 @@
|
||||
"cubes": [
|
||||
{"origin": [0.25, 0, -1], "size": [2, 2, 2], "inflate": 0.2, "uv": [38, 54]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "locator_camera",
|
||||
"parent": "tinkaton",
|
||||
"pivot": [0, 0, 0],
|
||||
"locators": {
|
||||
"camera": [0, 0, 0]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"variants": {
|
||||
"": {
|
||||
"model": "cobblemon:block/stadium_terminal"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -419,12 +419,12 @@
|
||||
"cobblemon.fossil.sail": "Flosse",
|
||||
"cobblemon.fossil.skull": "Kopf",
|
||||
"cobblemon.fossilmachine.protected": "Dieses Fossil gehört %s!",
|
||||
"itemGroup.cobblemon.blocks": "Cobblemon: Blöcke",
|
||||
"itemGroup.cobblemon.blocks": "Blöcke",
|
||||
"itemGroup.cobblemon.pokeball": "Pokébälle",
|
||||
"itemGroup.cobblemon.agriculture": "Cobblemon: Agrikultur",
|
||||
"itemGroup.cobblemon.consumables": "Cobblemon: Verwendbare Items",
|
||||
"itemGroup.cobblemon.held_item": "Cobblemon: Getragene Items",
|
||||
"itemGroup.cobblemon.evolution_item": "Cobblemon: Evolution Items",
|
||||
"itemGroup.cobblemon.agriculture": "Agrikultur",
|
||||
"itemGroup.cobblemon.consumables": "Verwendbare Items",
|
||||
"itemGroup.cobblemon.held_item": "Getragene Items",
|
||||
"itemGroup.cobblemon.evolution_item": "Evolution Items",
|
||||
"itemGroup.cobblemon.archaeology": "Archaeology",
|
||||
"block.cobblemon.apricorn_log": "Aprikoko Stamm",
|
||||
"block.cobblemon.stripped_apricorn_log": "Entrindeter Aprikoko Stamm",
|
||||
@@ -943,7 +943,7 @@
|
||||
"cobblemon.battle.side_subject.ally": "dein",
|
||||
"cobblemon.battle.side_subject.opponent": "der feindlicher",
|
||||
"cobblemon.battle.transform": "%1$s transformed into %2$s",
|
||||
"cobblemon.battle.endability": "Die Fähigkeit von %1$s wirkt nicht mehr!",
|
||||
"cobblemon.battle.endability": "%1$s's Ability was suppressed!",
|
||||
"cobblemon.battle.weather.raindance.start": "Es fängt an zu regnen!",
|
||||
"cobblemon.battle.weather.raindance.upkeep": "Der strömende Regen lässt nicht nach!",
|
||||
"cobblemon.battle.weather.raindance.end": "Der Regen lässt nach!",
|
||||
@@ -3674,7 +3674,7 @@
|
||||
"cobblemon.move.zippyzap": "Britzelturbo",
|
||||
"cobblemon.move.zippyzap.desc": "Ein stürmischer Blitz-Angriff mit hoher Erstschlag- und Volltrefferquote.",
|
||||
"cobblemon.species.bulbasaur.name": "Bisasam",
|
||||
"cobblemon.species.bulbasaur.desc": "Obwohl selten und schwer fassbar in der Wilderniss, ist Bisasam dennoch unter Anfängeren beliebt für seine ruhige, gelassane Natur. Die Knospe auf seinem Rücken ist noch unterentwickelt, also braucht dieses Pokémon hohe Mengen an Energie, um dessen Wachstum zu fördern. Folglich ist es oft in Kompostern zu finden, wo es nach wertvollem Dünger sucht.",
|
||||
"cobblemon.species.bulbasaur.desc": "Nach der Geburt nimmt es für eine Weile Nährstoffe über den Samen auf seinem Rücken auf.",
|
||||
"cobblemon.species.ivysaur.name": "Bisaknosp",
|
||||
"cobblemon.species.ivysaur.desc": "Die Sonne macht es stärker. Die Knospe auf seinem Rücken wächst unter dem Einfluss von Sonnenlicht.",
|
||||
"cobblemon.species.venusaur.name": "Bisaflor",
|
||||
@@ -6237,8 +6237,8 @@
|
||||
"cobblemon.challenge.multi.team_request.accept.sender": "Du hast %1$ss Einladung angenommen!",
|
||||
"key.cobblemon.pokedex": "Öffne Pokédex",
|
||||
"cobblemon.challenge.multi.team_reject.existing_team": "Du bist schon teil eines Teams!",
|
||||
"cobblemon.challenge.multi.decline.receiver": "Dein team hat %1$s's Herausforderung abgelehnt.",
|
||||
"cobblemon.challenge.decline.sender": "%1$s hat deine Herausforderung abgelehnt...",
|
||||
"cobblemon.challenge.multi.decline.receiver": "%1$s hat die Herausforderung abgelehnt...",
|
||||
"cobblemon.challenge.decline.sender": "Du hast %1$s's Herausforderung abgelehnt...",
|
||||
"cobblemon.ui.pokenav.narrator.backbutton": "PokéNav Knopf gedrückt",
|
||||
"cobblemon.fishing_bait_effect_header": "Fisch Köder Effekte:",
|
||||
"cobblemon.fishing_bait_effects.iv.tooltip": "%1$s%% - %2$s IV +%3$s",
|
||||
@@ -6253,17 +6253,17 @@
|
||||
"cobblemon.ui.pokedex.info.form.maushold-family-four": "Familie",
|
||||
"cobblemon.ui.starter.narrator.backbutton": "Zurück-Knopf gedrückt",
|
||||
"cobblemon.pokerod.bobber": "Schwimmer: %1$s",
|
||||
"cobblemon.pokerod.bait": "Köder: %1$s ×%2$s",
|
||||
"cobblemon.pokerod.bait": "Köder: %1$s x%2$s",
|
||||
"block.cobblemon.lectern": "Pult",
|
||||
"cobblemon.fishing_bait_effects.level_raise.tooltip": "%1$s%% - Erhöhe Level +%3$s",
|
||||
"cobblemon.fishing_bait_effects.shiny_reroll.tooltip": "%1$s%% - %3$s× Shiny Chance",
|
||||
"cobblemon.fishing_bait_effects.shiny_reroll.tooltip": "%1$sx - %3$sx Shiny Chance",
|
||||
"entity.minecraft.villager.cobblemon.nurse": "Schwester",
|
||||
"cobblemon.fishing_bait_effects.friendship.tooltip": "%1$s%% - Erhöht Freundschaft +%3$s",
|
||||
"cobblemon.ui.stash.gold": "Münzlager",
|
||||
"cobblemon.ui.interact.accept": "Akzeptieren",
|
||||
"cobblemon.ui.interact.decline": "Ablehnen",
|
||||
"cobblemon.ui.interact.team_request": "Zusammenschließen",
|
||||
"cobblemon.ui.interact.too_far": "Das Ziel ist zu weit entfernt!",
|
||||
"cobblemon.ui.interact.too_far": "Das Ziel ist zu weit entfernt",
|
||||
"cobblemon.ui.pokedex.scan.registered_suffix": "%1$s registriert",
|
||||
"cobblemon.ui.pokedex.scan.trainer_owned": "Trainerbesitz",
|
||||
"cobblemon.ui.pokedex.info.drops_display": "%1$s %2$s",
|
||||
@@ -6291,7 +6291,7 @@
|
||||
"cobblemon.challenge.multi.sender": "Du hast %1$s (%2$s Mitglieder) zu einen Multikampf herausgefordert!",
|
||||
"cobblemon.challenge.multi.receiver": "%1$s (%2$s Mitglieder) hat dich zu einen Multikampf herausgefordert!",
|
||||
"cobblemon.challenge.multi.decline.disband": "Das generische Team wurde aufgelöst, Multikampf abgebrochen...",
|
||||
"cobblemon.challenge.multi.decline.sender": "%1$s's team hat die Herausforderung abgelehnt...",
|
||||
"cobblemon.challenge.multi.decline.sender": "%1$s hat %2$s's Multikampf Herausforderung abgelehnt...",
|
||||
"cobblemon.challenge.multi.decline.sender.personal": "Du hast %1$s's Multikampf Herausforderung abgelehnt...",
|
||||
"cobblemon.challenge.decline.receiver": "%1$s hat deine Herausforderung abgelehnt...",
|
||||
"cobblemon.command.freezepokemon.non_pokemon": "Du musst auf ein Pokémon zielen.",
|
||||
@@ -6316,16 +6316,5 @@
|
||||
"cobblemon.ui.pokedex.info.form.hisui": "Hisui",
|
||||
"cobblemon.ui.pokedex.info.form.region-bias-hisui": "Hisui-Einfluss",
|
||||
"cobblemon.ui.pokedex.info.form.region-bias-paldea": "Paldea-Einfluss",
|
||||
"cobblemon.ui.pokedex.info.form.no_ice": "Wohlfühlkopf",
|
||||
"cobblemon.ui.pokedex.info.form.tree-warped": "Wirr",
|
||||
"cobblemon.config.ui.starters": "Starter",
|
||||
"cobblemon.battle.start.flashfire": "Die Stärke der Feuer-Attacken von %1$s wurde erhöht!",
|
||||
"cobblemon.battle.activate.mummy": "%1$s hat die Fähigkeit Mumie angenommen!",
|
||||
"cobblemon.battle.activate.allyswitch": "%1$s und %2$s haben den Platz getauscht!",
|
||||
"cobblemon.battle.activate.insomnia": "Das Pokémon leidet von Insomnia, und kann nicht Einschlafen.",
|
||||
"cobblemon.battle.activate.custapberry": "Dank seiner Eipfelbeere kann %1$s schneller handeln als sonst!",
|
||||
"cobblemon.battle.enditem.ejectpack": "%1$s wird dank Fluchttasche ausgewechselt!",
|
||||
"item.cobblemon.galarica_nuts": "Galarnüsse",
|
||||
"cobblemon.ui.pokedex.info.form.tree-crimson": "Karmesin",
|
||||
"cobblemon.battle.enditem.focussash": "%1$s hält mithilfe seinem Fokusgurt durch!"
|
||||
"cobblemon.ui.pokedex.info.form.no_ice": "Wohlfühlkopf"
|
||||
}
|
||||
@@ -803,6 +803,7 @@
|
||||
"block.cobblemon.healing_machine.tooltip2": "Charges over time.",
|
||||
"block.cobblemon.pc": "PC",
|
||||
"block.cobblemon.lectern": "Lectern",
|
||||
"block.cobblemon.stadium_terminal": "Stadium Terminal",
|
||||
"block.cobblemon.restoration_tank": "Restoration Tank",
|
||||
"block.cobblemon.fossil_analyzer": "Fossil Analyzer",
|
||||
"block.cobblemon.monitor": "Data Monitor",
|
||||
@@ -2224,8 +2225,6 @@
|
||||
"cobblemon.config.ui.default_drop_item_method.on_player.tooltip": "Drops the item on the player that caused the drop, if they exist. If not, drops at the position parsed into drops.",
|
||||
"cobblemon.config.ui.default_drop_item_method.to_inventory": "To Inventory",
|
||||
"cobblemon.config.ui.default_drop_item_method.to_inventory.tooltip": "Puts the item in the player's inventory or drops it on the ground if the inventory is full. If the player that caused the drop doesn't exist, it drops at the position parsed into drops.",
|
||||
"cobblemon.config.ui.drops_after_death_animation": "Drops After Death Animation",
|
||||
"cobblemon.config.ui.drops_after_death_animation.tooltip": "Whether Pokémon drop loot and Minecraft XP after their death animations are finished playing, or instantly upon death like vanilla mobs.",
|
||||
"cobblemon.config.ui.ambient_pokemon_cry_ticks": "Ambient Pokémon Cry Ticks",
|
||||
"cobblemon.config.ui.ambient_pokemon_cry_ticks.tooltip": "Ticks between Pokémon cries. (Currently unused)",
|
||||
"cobblemon.config.ui.default_box_count": "Default Box Count",
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
Loaded 100 of 156 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user