-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Compatibility with Patchwork entity size event
- Loading branch information
Showing
6 changed files
with
96 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
...virtuoel/pehkui/mixin/compat116minus/patchwork/compat/EntityCalculateDimensionsMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| package virtuoel.pehkui.mixin.compat116minus.patchwork.compat; | ||
|
|
||
| import org.spongepowered.asm.mixin.Final; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Mutable; | ||
| import org.spongepowered.asm.mixin.Shadow; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.At.Shift; | ||
| import org.spongepowered.asm.mixin.injection.Coerce; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
| import org.spongepowered.asm.mixin.injection.callback.LocalCapture; | ||
|
|
||
| import net.minecraft.entity.Entity; | ||
| import net.minecraft.entity.EntityDimensions; | ||
| import net.minecraft.entity.EntityPose; | ||
| import net.minecraft.entity.EntityType; | ||
| import net.minecraft.entity.MovementType; | ||
| import net.minecraft.util.math.Box; | ||
| import net.minecraft.util.math.Vec3d; | ||
| import net.minecraft.world.World; | ||
| import virtuoel.pehkui.util.ScaleUtils; | ||
|
|
||
| @Mixin(value = Entity.class, priority = 1010) | ||
| public abstract class EntityCalculateDimensionsMixin | ||
| { | ||
| @Shadow World world; | ||
| @Shadow @Final @Mutable EntityType<?> type; | ||
| @Shadow abstract void move(MovementType type, Vec3d movement); | ||
|
|
||
| @Inject(method = "calculateDimensions", locals = LocalCapture.CAPTURE_FAILHARD, at = @At(value = "INVOKE", shift = Shift.AFTER, ordinal = 1, target = "Lnet/minecraft/entity/Entity;setBoundingBox(Lnet/minecraft/util/math/Box;)V")) | ||
| private void onCalculateDimensions(CallbackInfo info, EntityDimensions previous, EntityPose pose, @Coerce Object sizeEvent, EntityDimensions current, Box box) | ||
| { | ||
| if (this.world.isClient && type == EntityType.PLAYER && current.width > previous.width) | ||
| { | ||
| final float scale = ScaleUtils.getWidthScale((Entity) (Object) this); | ||
| final float dist = (previous.width - current.width) / 2.0F; | ||
|
|
||
| move(MovementType.SELF, new Vec3d(dist / scale, 0.0D, dist / scale)); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
.../virtuoel/pehkui/mixin/compat117plus/patchwork/compat/EntityCalculateDimensionsMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| package virtuoel.pehkui.mixin.compat117plus.patchwork.compat; | ||
|
|
||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Shadow; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.At.Shift; | ||
| import org.spongepowered.asm.mixin.injection.Coerce; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
| import org.spongepowered.asm.mixin.injection.callback.LocalCapture; | ||
|
|
||
| import net.minecraft.entity.Entity; | ||
| import net.minecraft.entity.EntityDimensions; | ||
| import net.minecraft.entity.EntityPose; | ||
| import net.minecraft.entity.EntityType; | ||
| import net.minecraft.util.math.Box; | ||
| import net.minecraft.util.math.Vec3d; | ||
| import net.minecraft.util.shape.VoxelShape; | ||
| import net.minecraft.util.shape.VoxelShapes; | ||
|
|
||
| @Mixin(value = Entity.class, priority = 1010) | ||
| public abstract class EntityCalculateDimensionsMixin | ||
| { | ||
| @Shadow | ||
| protected boolean firstUpdate; | ||
|
|
||
| @Inject(method = "calculateDimensions", locals = LocalCapture.CAPTURE_FAILHARD, at = @At(value = "INVOKE", shift = Shift.AFTER, target = "Lnet/minecraft/entity/Entity;refreshPosition()V")) | ||
| private void onCalculateDimensions(CallbackInfo info, EntityDimensions previous, EntityPose pose, @Coerce Object sizeEvent, EntityDimensions current) | ||
| { | ||
| final Entity self = (Entity) (Object) this; | ||
|
|
||
| if (self.world.isClient && self.getType() == EntityType.PLAYER && current.width > previous.width) | ||
| { | ||
| final Vec3d lastCenter = self.getPos().add(0.0D, previous.height / 2.0D, 0.0D); | ||
| final double w = Math.max(0.0F, current.width - previous.width) + 1.0E-6D; | ||
| final double h = Math.max(0.0F, current.height - previous.height) + 1.0E-6D; | ||
| final VoxelShape voxelShape = VoxelShapes.cuboid(Box.of(lastCenter, w, h, w)); | ||
| self.world.method_33594(self, voxelShape, lastCenter, current.width, current.height, current.width) | ||
| .ifPresent(vec -> self.method_33574(vec.add(0.0D, (-current.height) / 2.0D, 0.0D))); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters