Skip to content

Commit b406cc6

Browse files
committed
try fix
1 parent b910031 commit b406cc6

2 files changed

Lines changed: 13 additions & 7 deletions

File tree

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
package fi.dy.masa.tweakeroo.mixin.network;
22

3+
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
4+
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
35
import org.spongepowered.asm.mixin.Mixin;
46
import org.spongepowered.asm.mixin.injection.At;
5-
import org.spongepowered.asm.mixin.injection.Redirect;
67
import net.minecraft.server.network.ServerPlayNetworkHandler;
78
import net.minecraft.util.math.Vec3d;
89
import fi.dy.masa.tweakeroo.config.Configs;
910

1011
@Mixin(value = ServerPlayNetworkHandler.class, priority = 1005)
1112
public class MixinServerPlayNetworkHandler
1213
{
13-
@Redirect(method = "onPlayerInteractBlock", require = 0,
14+
@WrapOperation(method = "onPlayerInteractBlock", require = 0,
1415
at = @At(value = "INVOKE",
1516
target = "Lnet/minecraft/util/math/Vec3d;subtract(Lnet/minecraft/util/math/Vec3d;)Lnet/minecraft/util/math/Vec3d;"))
16-
private Vec3d tweakeroo_removeHitPosCheck(Vec3d hitVec, Vec3d blockCenter)
17+
private Vec3d tweakeroo_removeHitPosCheck(Vec3d hitVec, Vec3d blockCenter, Operation<Vec3d> original)
1718
{
1819
if (Configs.Generic.ITEM_USE_PACKET_CHECK_BYPASS.getBooleanValue())
1920
{
2021
return Vec3d.ZERO;
2122
}
2223

23-
return hitVec.subtract(blockCenter);
24+
return original.call(hitVec, blockCenter);
2425
}
2526
}

src/main/java/fi/dy/masa/tweakeroo/mixin/render/MixinGameRenderer_ViewBob.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package fi.dy.masa.tweakeroo.mixin.render;
22

3+
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
4+
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
35
import org.spongepowered.asm.mixin.Mixin;
46
import org.spongepowered.asm.mixin.Shadow;
57
import org.spongepowered.asm.mixin.injection.At;
6-
import org.spongepowered.asm.mixin.injection.Redirect;
78
import net.minecraft.client.render.GameRenderer;
89
import net.minecraft.client.util.math.MatrixStack;
910
import fi.dy.masa.tweakeroo.config.Configs;
@@ -17,13 +18,17 @@ public abstract class MixinGameRenderer_ViewBob
1718
@Shadow
1819
protected abstract void bobView(MatrixStack matrices, float tickDelta);
1920

20-
@Redirect(method = "renderWorld", require = 0, at = @At(value = "INVOKE",
21+
@WrapOperation(method = "renderWorld", require = 0, at = @At(value = "INVOKE",
2122
target = "Lnet/minecraft/client/render/GameRenderer;bobView(Lnet/minecraft/client/util/math/MatrixStack;F)V"))
22-
private void disableWorldViewBob(GameRenderer renderer, MatrixStack matrices, float tickDelta)
23+
private void disableWorldViewBob(GameRenderer renderer, MatrixStack matrices, float tickDelta, Operation<Void> original)
2324
{
2425
if (Configs.Disable.DISABLE_WORLD_VIEW_BOB.getBooleanValue() == false)
2526
{
2627
this.bobView(matrices, tickDelta);
2728
}
29+
else
30+
{
31+
original.call(renderer, matrices, tickDelta);
32+
}
2833
}
2934
}

0 commit comments

Comments
 (0)