Fix Reach not working in creative (MeteorDevelopment#3826)

RacoonDog · Jul 12, 2023 · 5e29429 · 5e29429
1 parent 9a36f0a
commit 5e29429
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayerInteractionManagerMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayerInteractionManagerMixin.java
@@ -113,6 +113,11 @@ private void onGetReachDistance(CallbackInfoReturnable<Float> info) {
         info.setReturnValue(Modules.get().get(Reach.class).blockReach());
     }
 
+    @Inject(method = "hasExtendedReach", at = @At("HEAD"), cancellable = true)
+    private void onHasExtendedReach(CallbackInfoReturnable<Boolean> info) {
+        if (Modules.get().isActive(Reach.class)) info.setReturnValue(false);
+    }
+
     @Redirect(method = "updateBlockBreakingProgress", at = @At(value = "FIELD", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;blockBreakingCooldown:I", opcode = Opcodes.PUTFIELD, ordinal = 1))
     private void creativeBreakDelayChange(ClientPlayerInteractionManager interactionManager, int value) {
         BlockBreakingCooldownEvent event = MeteorClient.EVENT_BUS.post(BlockBreakingCooldownEvent.get(value));

diff --git a/...ain/java/meteordevelopment/meteorclient/mixin/indigo/AbstractBlockRenderContextMixin.java b/...ain/java/meteordevelopment/meteorclient/mixin/indigo/AbstractBlockRenderContextMixin.java
@@ -18,9 +18,7 @@
 
 @Mixin(AbstractBlockRenderContext.class)
 public class AbstractBlockRenderContextMixin {
-    @Final
-    @Shadow
-    protected BlockRenderInfo blockInfo;
+    @Final @Shadow(remap = false) protected BlockRenderInfo blockInfo;
 
     @Inject(method = "renderQuad", at = @At(value = "INVOKE", target = "Lnet/fabricmc/fabric/impl/client/indigo/renderer/render/AbstractBlockRenderContext;bufferQuad(Lnet/fabricmc/fabric/impl/client/indigo/renderer/mesh/MutableQuadViewImpl;Lnet/minecraft/client/render/VertexConsumer;)V"), cancellable = true)
     private void onBufferQuad(MutableQuadViewImpl quad, boolean isVanilla, CallbackInfo ci) {