Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-11-22 11:56:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implemented last special cases in EntityHeightOffset emulator

Browse Source
This commit is contained in:
FlorianMichael 2023-09-24 16:22:13 +02:00
parent 62aea682c7
commit a4dc619363
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
3 changed files with 58 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/main/java/de/florianmichael/viafabricplus/definition/EntityHeightOffsetsPre1_20_2.java
View File

@ -18,10 +18,7 @@
package de.florianmichael.viafabricplus.definition;
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityDimensions;
import net.minecraft.entity.EntityPose;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.*;
import net.minecraft.entity.boss.dragon.EnderDragonEntity;
import net.minecraft.entity.decoration.ArmorStandEntity;
import net.minecraft.entity.mob.*;
@ -29,6 +26,7 @@ import net.minecraft.entity.passive.*;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.vehicle.AbstractMinecartEntity;
import net.minecraft.entity.vehicle.BoatEntity;
import net.minecraft.entity.vehicle.ChestBoatEntity;
import net.minecraft.util.math.MathHelper;
import net.raphimc.vialoader.util.VersionEnum;
import org.joml.Vector3f;
@ -47,6 +45,22 @@ public class EntityHeightOffsetsPre1_20_2 {
final float newYaw = passengerYaw + clampedDelta - deltaDegrees;
passenger.setYaw(newYaw);
passenger.setHeadYaw(newYaw);
} else if (entity instanceof BoatEntity boatEntity) {
passenger.setYaw(passenger.getYaw() + boatEntity.yawVelocity);
passenger.setHeadYaw(passenger.getHeadYaw() + boatEntity.yawVelocity);
passenger.setBodyYaw(entity.getYaw());
final float f = MathHelper.wrapDegrees(passenger.getYaw() - entity.getYaw());
final float g = MathHelper.clamp(f, -105.0f, 105.0f);
passenger.prevYaw += g - f;
passenger.setYaw(passenger.getYaw() + g - f);
passenger.setHeadYaw(passenger.getYaw());
if (passenger instanceof AnimalEntity && boatEntity.getPassengerList().size() == boatEntity.getMaxPassengers()) {
int j = passenger.getId() % 2 == 0 ? 90 : 270;
passenger.setBodyYaw(((AnimalEntity) passenger).bodyYaw + (float) j);
passenger.setHeadYaw(passenger.getHeadYaw() + (float) j);
}
}
}
@ -65,24 +79,18 @@ public class EntityHeightOffsetsPre1_20_2 {
final int passengerIndex = camelEntity.getPassengerList().indexOf(passenger);
final boolean firstIndex = passengerIndex == 0;
if (passengerIndex >= 0) {
float zOffset = 0.5f;
if (camelEntity.isRemoved()) {
yOffset = 0.01f;
} else {
final var fakeDimension = EntityDimensions.fixed(0F, (0.375F * camelEntity.getScaleFactor()) + (float) yOffset); // Reverts original calculation to set yOffset to our field
yOffset = camelEntity.getPassengerAttachmentY(firstIndex, 0.0f, fakeDimension, camelEntity.getScaleFactor());
}
if (camelEntity.getPassengerList().size() > 1) {
if (!firstIndex) {
zOffset = -0.7f;
}
if (passenger instanceof AnimalEntity) {
zOffset += 0.2f;
}
if (!firstIndex) zOffset = -0.7f;
if (passenger instanceof AnimalEntity) zOffset += 0.2f;
}
return new Vector3f(0, (float) yOffset, zOffset);
@ -110,6 +118,23 @@ public class EntityHeightOffsetsPre1_20_2 {
} else {
yOffset = boatEntity.getVariant() == BoatEntity.Type.BAMBOO ? 0.25 : -0.1;
}
if (boatEntity.hasPassenger(passenger)) {
float xOffset = (boatEntity instanceof ChestBoatEntity) ? 0.15F : 0.0F;
yOffset = (boatEntity.isRemoved() ? (double) 0.01f : yOffset);
if (boatEntity.getPassengerList().size() > 1) {
int i = boatEntity.getPassengerList().indexOf(passenger);
xOffset = i == 0 ? 0.2f : -0.6f;
if (passenger instanceof AnimalEntity) {
xOffset += 0.2f;
}
}
return new Vector3f(xOffset, (float) yOffset, 0.0F);
} else {
return new Vector3f();
}
} else if (entity instanceof StriderEntity striderEntity) {
final var var1 = Math.min(0.25F, striderEntity.limbAnimator.getSpeed());
final var var2 = striderEntity.limbAnimator.getPos();
@ -128,6 +153,15 @@ public class EntityHeightOffsetsPre1_20_2 {
yOffset -= 0.25;
} else if (entity instanceof AbstractMinecartEntity) {
yOffset = 0.0;
} else if (entity instanceof AbstractHorseEntity abstractHorseEntity) {
if (abstractHorseEntity.lastAngryAnimationProgress > 0.0f) {
final float xOffset = MathHelper.sin(abstractHorseEntity.bodyYaw * ((float) Math.PI / 180));
final float zOffset = MathHelper.cos(abstractHorseEntity.bodyYaw * ((float) Math.PI / 180));
final float xzFactor = 0.7F * abstractHorseEntity.lastAngryAnimationProgress;
return new Vector3f(xzFactor * xOffset, (float) (yOffset + 0.15F * abstractHorseEntity.lastAngryAnimationProgress), xzFactor * zOffset);
}
}
return new Vector3f(0.0F, (float) yOffset, 0.0F);

10
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBoatEntity.java
View File

@ -279,7 +279,7 @@ public abstract class MixinBoatEntity extends Entity implements IBoatEntity {
}
@Inject(method = "updatePassengerPosition", at = @At("HEAD"), cancellable = true)
private void onUpdatePassengerPosition(Entity passenger, PositionUpdater positionUpdater, CallbackInfo ci) {
private void emulatePassengerOffset1_8(Entity passenger, PositionUpdater positionUpdater, CallbackInfo ci) {
if (this.viafabricplus_boatMovementEmulation()) {
if (hasPassenger(passenger)) {
double dx = Math.cos(this.getYaw() * Math.PI / 180) * 0.4;
@ -290,6 +290,14 @@ public abstract class MixinBoatEntity extends Entity implements IBoatEntity {
}
}
@Inject(method = "updatePassengerPosition", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;updatePassengerPosition(Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/Entity$PositionUpdater;)V", shift = At.Shift.AFTER), cancellable = true)
public void emulatePassengerOffset1_20_1(Entity passenger, PositionUpdater positionUpdater, CallbackInfo ci) {
if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_20tor1_20_1)) {
EntityHeightOffsetsPre1_20_2.clamPassengerYaw(this, passenger);
ci.cancel();
}
}
@Inject(method = "onPassengerLookAround", at = @At("HEAD"), cancellable = true)
private void onOnPassengerLookAround(Entity passenger, CallbackInfo ci) {
if (this.viafabricplus_boatMovementEmulation()) {

3
src/main/resources/viafabricplus.accesswidener
View File

@ -13,10 +13,13 @@ accessible field net/minecraft/client/font/FontStorage$GlyphPair MISSING Lnet/mi
accessible field net/minecraft/client/network/AllowedAddressResolver addressResolver Lnet/minecraft/client/network/AddressResolver;
accessible field net/minecraft/network/ClientConnection packetSizeLogger Lnet/minecraft/network/handler/PacketSizeLogger;
accessible field net/minecraft/entity/boss/dragon/EnderDragonEntity body Lnet/minecraft/entity/boss/dragon/EnderDragonPart;
accessible field net/minecraft/entity/passive/AbstractHorseEntity lastAngryAnimationProgress F
accessible field net/minecraft/entity/vehicle/BoatEntity yawVelocity F
accessible method net/minecraft/screen/GenericContainerScreenHandler <init> (Lnet/minecraft/screen/ScreenHandlerType;ILnet/minecraft/entity/player/PlayerInventory;I)V
accessible method net/minecraft/client/font/FontStorage$GlyphPair <init> (Lnet/minecraft/client/font/Glyph;Lnet/minecraft/client/font/Glyph;)V
accessible method net/minecraft/entity/passive/CamelEntity getPassengerAttachmentY (ZFLnet/minecraft/entity/EntityDimensions;F)D
accessible method net/minecraft/entity/vehicle/BoatEntity getMaxPassengers ()I
accessible class net/minecraft/client/gui/screen/GameModeSelectionScreen$GameModeSelection
accessible class net/minecraft/client/font/FontStorage$GlyphPair