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

Implemented Registry for Entity height offsets in <= 1.20.1

Browse Source
This commit is contained in:
FlorianMichael 2023-09-24 00:15:41 +02:00
parent 531ef3eea3
commit 42d8a36990
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
4 changed files with 131 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/main/java/de/florianmichael/viafabricplus/definition/EntityHeightOffsets1_20_1.java Normal file
View File

@ -0,0 +1,112 @@
/*
* This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus
* Copyright (C) 2021-2023 FlorianMichael/EnZaXD and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package de.florianmichael.viafabricplus.definition;
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityPose;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.boss.dragon.EnderDragonEntity;
import net.minecraft.entity.decoration.ArmorStandEntity;
import net.minecraft.entity.mob.*;
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.util.math.MathHelper;
import net.raphimc.vialoader.util.VersionEnum;
public class EntityHeightOffsets1_20_1 {
public static double getMountedHeightOffset(final Entity entity) {
double offset = entity.getHeight() * 0.75;
if (entity instanceof LlamaEntity) {
offset = entity.getHeight() * 0.6;
} else if (entity instanceof CamelEntity camelEntity) {
offset = entity.getDimensions(camelEntity.isSitting() ? EntityPose.SITTING : EntityPose.STANDING).height - (camelEntity.isBaby() ? 0.35F : 0.6F);
} else if (entity instanceof SnifferEntity) {
offset = 1.8;
} else if (entity instanceof EnderDragonEntity enderDragonEntity) {
offset = enderDragonEntity.body.getHeight();
} else if (entity instanceof PiglinEntity) {
offset = entity.getHeight() * 0.92;
} else if (entity instanceof HoglinEntity hoglinEntity) {
offset = entity.getHeight() - (hoglinEntity.isBaby() ? 0.2 : 0.15);
} else if (entity instanceof SkeletonHorseEntity) {
offset -= 0.1875;
} else if (entity instanceof PhantomEntity) {
offset = entity.getEyeHeight(entity.getPose());
} else if (entity instanceof RavagerEntity) {
offset = 2.1;
} else if (entity instanceof ZoglinEntity zoglinEntity) {
offset = (double) entity.getHeight() - (zoglinEntity.isBaby() ? 0.2 : 0.15);
} else if (entity instanceof BoatEntity boatEntity) {
offset = boatEntity.getVariant() == BoatEntity.Type.BAMBOO ? 0.25 : -0.1;
} else if (entity instanceof StriderEntity striderEntity) {
float var1 = Math.min(0.25F, striderEntity.limbAnimator.getSpeed());
float var2 = striderEntity.limbAnimator.getPos();
offset = (double) striderEntity.getHeight() - 0.19 + (double) (0.12F * MathHelper.cos(var2 * 1.5F) * 2.0F * var1);
} else if (entity instanceof SpiderEntity) {
offset = entity.getHeight() * 0.5F;
}
if (entity instanceof AbstractDonkeyEntity) {
offset -= 0.25;
} else if (entity instanceof AbstractMinecartEntity) {
offset = 0.0;
}
return offset;
}
public static double getHeightOffset(final Entity entity) {
if (entity instanceof AllayEntity) {
return ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_19_4) ? 0 : 0.4;
} else if (entity instanceof ArmorStandEntity armorStandEntity && !armorStandEntity.isMarker()) {
return 0.1;
} else if (entity instanceof EndermiteEntity) {
return 0.1;
} else if (entity instanceof ShulkerEntity shulkerEntity) {
final var vehicleType = shulkerEntity.getVehicle().getType();
return !(shulkerEntity.getVehicle() instanceof BoatEntity) && vehicleType != EntityType.MINECART ? 0 : 0.1875 - getMountedHeightOffset(shulkerEntity.getVehicle());
} else if (entity instanceof SilverfishEntity) {
return 0.1;
} else if (entity instanceof VexEntity) {
return 0.4;
} else if (entity instanceof ZombifiedPiglinEntity zombifiedPiglinEntity) {
return zombifiedPiglinEntity.isBaby() ? -0.05 : -0.45;
} else if (entity instanceof ZombieEntity zombieEntity) {
return zombieEntity.isBaby() ? 0.0 : -0.45;
}
if (entity instanceof PlayerEntity) {
return -0.35;
} else if (entity instanceof PatrolEntity) {
return -0.45;
} else if (entity instanceof AbstractPiglinEntity abstractPiglinEntity) {
return abstractPiglinEntity.isBaby() ? -0.05 : -0.45;
} else if (entity instanceof AbstractSkeletonEntity) {
return -0.6;
} else if (entity instanceof AnimalEntity) {
return 0.14;
}
return 0;
}
}

11
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntity.java
View File

@ -17,6 +17,7 @@
*/
package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
import de.florianmichael.viafabricplus.definition.EntityHeightOffsets1_20_1;
import net.minecraft.entity.EntityDimensions;
import net.raphimc.vialoader.util.VersionEnum;
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
@ -194,12 +195,18 @@ public abstract class MixinEntity {
}
}
@Inject(method = "getRidingOffset", at = @At("HEAD"), cancellable = true)
public void replaceRidingOffset(Entity vehicle, CallbackInfoReturnable<Float> cir) {
if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_20tor1_20_1)) {
cir.setReturnValue((float) EntityHeightOffsets1_20_1.getHeightOffset((Entity) (Object) this));
}
}
@Redirect(method = "getPassengerRidingPos", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;getPassengerAttachmentPos(Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/EntityDimensions;F)Lorg/joml/Vector3f;"))
public Vector3f revertStaticRidingOffsetCalculation(Entity instance, Entity passenger, EntityDimensions dimensions, float scaleFactor) {
if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_20tor1_20_1)) {
return new Vector3f(0.0F, dimensions.height * 0.75F, 0.0F);
return new Vector3f(0.0F, (float) EntityHeightOffsets1_20_1.getMountedHeightOffset(instance), 0.0F);
}
return getPassengerAttachmentPos(passenger, dimensions, scaleFactor);
}
}

11
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java
View File

@ -19,6 +19,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
import com.llamalad7.mixinextras.injector.WrapWithCondition;
import de.florianmichael.viafabricplus.base.settings.groups.ExperimentalSettings;
import de.florianmichael.viafabricplus.definition.EntityHeightOffsets1_20_1;
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
import net.minecraft.block.BlockState;
import net.minecraft.block.TrapdoorBlock;
@ -207,12 +208,18 @@ public abstract class MixinLivingEntity extends Entity {
}
}
@Inject(method = "getRidingOffset", at = @At("HEAD"), cancellable = true)
public void replaceRidingOffset(Entity vehicle, CallbackInfoReturnable<Float> cir) {
if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_20tor1_20_1)) {
cir.setReturnValue((float) EntityHeightOffsets1_20_1.getHeightOffset((Entity) (Object) this));
}
}
@Redirect(method = "getPassengerRidingPos", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;getPassengerAttachmentPos(Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/EntityDimensions;F)Lorg/joml/Vector3f;"))
public Vector3f revertStaticRidingOffsetCalculation(LivingEntity instance, Entity entity, EntityDimensions entityDimensions, float v) {
if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_20tor1_20_1)) {
return new Vector3f(0.0F, entityDimensions.height * 0.75F, 0.0F);
return new Vector3f(0.0F, (float) EntityHeightOffsets1_20_1.getMountedHeightOffset(instance), 0.0F);
}
return getPassengerAttachmentPos(entity, entityDimensions, v);
}
}

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

@ -12,6 +12,7 @@ accessible field net/minecraft/client/gui/screen/GameMenuScreen exitButton Lnet/
accessible field net/minecraft/client/font/FontStorage$GlyphPair MISSING Lnet/minecraft/client/font/FontStorage$GlyphPair;
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 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