generated from FabricMC/fabric-example-mod
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added various features surrounding the fishing rod
- Loading branch information
Showing
7 changed files
with
183 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
83 changes: 83 additions & 0 deletions
83
src/main/java/me/mixces/animatium/mixins/MixinFishingBobberEntityRenderer.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,83 @@ | ||
| package me.mixces.animatium.mixins; | ||
|
|
||
| import com.llamalad7.mixinextras.injector.ModifyExpressionValue; | ||
| import com.llamalad7.mixinextras.injector.wrapoperation.Operation; | ||
| import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; | ||
| import com.llamalad7.mixinextras.sugar.Local; | ||
| import me.mixces.animatium.config.AnimatiumConfig; | ||
| import me.mixces.animatium.mixins.accessor.CameraAccessor; | ||
| import me.mixces.animatium.util.HandUtils; | ||
| import net.minecraft.client.MinecraftClient; | ||
| import net.minecraft.client.render.VertexConsumerProvider; | ||
| import net.minecraft.client.render.entity.EntityRenderer; | ||
| import net.minecraft.client.render.entity.EntityRendererFactory; | ||
| import net.minecraft.client.render.entity.FishingBobberEntityRenderer; | ||
| import net.minecraft.client.render.entity.state.FishingBobberEntityState; | ||
| import net.minecraft.client.util.math.MatrixStack; | ||
| import net.minecraft.entity.player.PlayerEntity; | ||
| import net.minecraft.entity.projectile.FishingBobberEntity; | ||
| import net.minecraft.item.FishingRodItem; | ||
| import net.minecraft.util.math.MathHelper; | ||
| import net.minecraft.util.math.Vec3d; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Unique; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.ModifyArg; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
| @Mixin(FishingBobberEntityRenderer.class) | ||
| public abstract class MixinFishingBobberEntityRenderer extends EntityRenderer<FishingBobberEntity, FishingBobberEntityState> { | ||
| protected MixinFishingBobberEntityRenderer(EntityRendererFactory.Context ctx) { | ||
| super(ctx); | ||
| } | ||
|
|
||
| @Inject(method = "render(Lnet/minecraft/client/render/entity/state/FishingBobberEntityState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;peek()Lnet/minecraft/client/util/math/MatrixStack$Entry;", ordinal = 0)) | ||
| private void animatium$shiftFishingBobber(FishingBobberEntityState fishingBobberEntityState, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, CallbackInfo ci) { | ||
| if (AnimatiumConfig.oldFishingBobberPosition) { | ||
| HandUtils instance = new HandUtils(MinecraftClient.getInstance().player, dispatcher); | ||
| //TODO: Fix line | ||
| matrixStack.translate(instance.handMultiplier() * 0.5F, 0.0F, 0.0F); | ||
| } | ||
| } | ||
|
|
||
| @WrapOperation(method = "getHandPos", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;getCameraPosVec(F)Lnet/minecraft/util/math/Vec3d;")) | ||
| private Vec3d animatium$useInterpolatedEyeHeight(PlayerEntity instance, float v, Operation<Vec3d> original) { | ||
| if (AnimatiumConfig.fishingRodLineInterpolation) { | ||
| CameraAccessor cameraAccessor = (CameraAccessor) dispatcher.camera; | ||
| float eyeHeight = MathHelper.lerp(v, cameraAccessor.getLastCameraY(), cameraAccessor.getCameraY()); | ||
| return this.animatium$getCameraPosVec(instance, v, eyeHeight); | ||
| } | ||
| return original.call(instance, v); | ||
| } | ||
|
|
||
| @ModifyExpressionValue(method = "getHandPos", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;isInSneakingPose()Z")) | ||
| private boolean animatium$removeLineOffset(boolean original) { | ||
| return !AnimatiumConfig.noMoveFishingRodLine && original; | ||
| } | ||
|
|
||
| @ModifyExpressionValue(method = "getHandPos", at = @At(value = "CONSTANT", args = "doubleValue=0.8")) | ||
| private double animatium$moveLineHorizontally(double original) { | ||
| return original + (AnimatiumConfig.oldFishingRodLinePositionThirdPerson ? 0.05 : 0.0); | ||
| } | ||
|
|
||
| @WrapOperation(method = "getArmHoldingRod", at = @At(value = "CONSTANT", args = "classValue=net/minecraft/item/FishingRodItem")) | ||
| private static boolean animatium$fixCastLineCheck(Object object, Operation<Boolean> original, @Local(argsOnly = true) PlayerEntity player) { | ||
| return original.call(object) || (AnimatiumConfig.fixCastLineCheck && !(player.getOffHandStack().getItem() instanceof FishingRodItem)); | ||
| } | ||
|
|
||
| @ModifyArg(method = "updateRenderState(Lnet/minecraft/entity/projectile/FishingBobberEntity;Lnet/minecraft/client/render/entity/state/FishingBobberEntityState;F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/FishingBobberEntityRenderer;getHandPos(Lnet/minecraft/entity/player/PlayerEntity;FF)Lnet/minecraft/util/math/Vec3d;"), index = 1) | ||
| private float animatium$mirrorRodSwing(float f) { | ||
| HandUtils instance = new HandUtils(MinecraftClient.getInstance().player, dispatcher); | ||
| int multiplier = instance.handMultiplier(); | ||
| return f * (AnimatiumConfig.fixCastLineSwing ? multiplier : 1); | ||
| } | ||
|
|
||
| @Unique | ||
| private Vec3d animatium$getCameraPosVec(PlayerEntity entity, float tickDelta, float eyeHeight) { | ||
| double d = MathHelper.lerp(tickDelta, entity.prevX, entity.getX()); | ||
| double e = MathHelper.lerp(tickDelta, entity.prevY, entity.getY()) + eyeHeight; | ||
| double f = MathHelper.lerp(tickDelta, entity.prevZ, entity.getZ()); | ||
| return new Vec3d(d, e, f); | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
src/main/java/me/mixces/animatium/mixins/MixinThrownEntity.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,16 @@ | ||
| package me.mixces.animatium.mixins; | ||
|
|
||
| import com.llamalad7.mixinextras.injector.ModifyExpressionValue; | ||
| import me.mixces.animatium.config.AnimatiumConfig; | ||
| import net.minecraft.entity.projectile.thrown.ThrownEntity; | ||
| import org.objectweb.asm.Opcodes; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
|
|
||
| @Mixin(ThrownEntity.class) | ||
| public abstract class MixinThrownEntity { | ||
| @ModifyExpressionValue(method = "shouldRender", at = @At(value = "FIELD", opcode = Opcodes.GETFIELD, target = "Lnet/minecraft/entity/projectile/thrown/ThrownEntity;age:I")) | ||
| private int animatium$disableProjectileAgeCheck(int original) { | ||
| return original + (AnimatiumConfig.disableProjectileAgeCheck ? 2 : 0); | ||
| } | ||
| } |
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,24 @@ | ||
| package me.mixces.animatium.util; | ||
|
|
||
| import com.google.common.base.MoreObjects; | ||
| import net.minecraft.client.network.ClientPlayerEntity; | ||
| import net.minecraft.client.render.entity.EntityRenderDispatcher; | ||
| import net.minecraft.util.Arm; | ||
| import net.minecraft.util.Hand; | ||
|
|
||
| public class HandUtils { | ||
| private final EntityRenderDispatcher dispatcher; | ||
| private final ClientPlayerEntity player; | ||
|
|
||
| public HandUtils(ClientPlayerEntity player, EntityRenderDispatcher dispatcher) { | ||
| this.player = player; | ||
| this.dispatcher = dispatcher; | ||
| } | ||
|
|
||
| public int handMultiplier() { | ||
| Hand hand = MoreObjects.firstNonNull(player.preferredHand, Hand.MAIN_HAND); | ||
| Arm arm = hand == Hand.MAIN_HAND ? player.getMainArm() : player.getMainArm().getOpposite(); | ||
| int i = dispatcher.gameOptions.getPerspective().isFirstPerson() ? 1 : -1; | ||
| return arm == Arm.RIGHT ? i : -i; | ||
| } | ||
| } |
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