From a825134fbaf779e4d8c62ad551c7651f05898517 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 18 Sep 2019 21:57:08 -0300 Subject: [PATCH] 19w38b no movableBEs --- .../BlockEntityRenderDispatcher_movableTEMixin.java | 10 +++++----- src/main/java/carpet/mixins/MinecraftClientMixin.java | 2 +- .../carpet/mixins/MinecraftServer_tickspeedMixin.java | 2 +- .../PistonBlockEntityRenderer_movableTEMixin.java | 2 ++ .../ServerPlayNetworkHandler_scarpetEventsMixin.java | 2 +- ...erverPlayerInteractionManager_ghostBlocksMixin.java | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/carpet/mixins/BlockEntityRenderDispatcher_movableTEMixin.java b/src/main/java/carpet/mixins/BlockEntityRenderDispatcher_movableTEMixin.java index 2d8694ed..9da5718e 100644 --- a/src/main/java/carpet/mixins/BlockEntityRenderDispatcher_movableTEMixin.java +++ b/src/main/java/carpet/mixins/BlockEntityRenderDispatcher_movableTEMixin.java @@ -26,9 +26,9 @@ public abstract class BlockEntityRenderDispatcher_movableTEMixin implements Bloc @Shadow public World world; - @Shadow - public abstract void renderEntity(BlockEntity blockEntity_1, double double_1, double double_2, double double_3, - float float_1, int int_1, boolean boolean_1); + //@Shadow + //public abstract void renderEntity(BlockEntity blockEntity_1, double double_1, double double_2, double double_3, + // float float_1, int int_1, boolean boolean_1); /** * @author 2No2Name @@ -37,7 +37,7 @@ public abstract class BlockEntityRenderDispatcher_movableTEMixin implements Bloc public void renderBlockEntityOffset(BlockEntity blockEntity_1, float partialTicks, int destroyStage, double xOffset, double yOffset, double zOffset) { - if (blockEntity_1.getSquaredDistance(this.cameraEntity.getPos().x - xOffset, this.cameraEntity.getPos().y - yOffset, + /*if (blockEntity_1.getSquaredDistance(this.cameraEntity.getPos().x - xOffset, this.cameraEntity.getPos().y - yOffset, this.cameraEntity.getPos().z - zOffset) < blockEntity_1.getSquaredRenderDistance()) { GuiLighting.enable(); @@ -48,6 +48,6 @@ public abstract class BlockEntityRenderDispatcher_movableTEMixin implements Bloc RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); BlockPos blockpos = blockEntity_1.getPos(); this.renderEntity(blockEntity_1, (double) blockpos.getX() - renderOffsetX + xOffset, (double) blockpos.getY() - renderOffsetY + yOffset, (double) blockpos.getZ() - renderOffsetZ + zOffset, partialTicks, destroyStage, false); - } + }*/ } } diff --git a/src/main/java/carpet/mixins/MinecraftClientMixin.java b/src/main/java/carpet/mixins/MinecraftClientMixin.java index 02759436..fe3e942b 100644 --- a/src/main/java/carpet/mixins/MinecraftClientMixin.java +++ b/src/main/java/carpet/mixins/MinecraftClientMixin.java @@ -14,7 +14,7 @@ public class MinecraftClientMixin { //to inject right before // this.tickWorlds(booleanSupplier_1); - @Inject(method = "start", at = @At(value = "RETURN") + @Inject(method = "start", at = @At(value = "HEAD") ) private void onInit(CallbackInfo ci) { //CM start game hook diff --git a/src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java b/src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java index a9d86dd0..7b631828 100644 --- a/src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java +++ b/src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java @@ -157,7 +157,7 @@ public abstract class MinecraftServer_tickspeedMixin } @Inject(method = "method_16208", at = @At( value = "INVOKE", - target = "Lnet/minecraft/server/MinecraftServer;waitFor(Ljava/util/function/BooleanSupplier;)V", + target = "Lnet/minecraft/server/MinecraftServer;executeTasks(Ljava/util/function/BooleanSupplier;)V", shift = At.Shift.BEFORE )) private void stopAsync(CallbackInfo ci) diff --git a/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java b/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java index f841ae43..30ebfc56 100644 --- a/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java +++ b/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java @@ -16,6 +16,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(PistonBlockEntityRenderer.class) public abstract class PistonBlockEntityRenderer_movableTEMixin extends BlockEntityRenderer { + /* @Inject(method = "method_3576", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/block/entity/PistonBlockEntityRenderer;method_3575(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/client/render/BufferBuilder;Lnet/minecraft/world/World;Z)Z", ordinal = 3)) private void updateRenderBool(PistonBlockEntity pistonBlockEntity_1, double double_1, double double_2, @@ -39,4 +40,5 @@ public abstract class PistonBlockEntityRenderer_movableTEMixin extends BlockEnti } } } + */ } diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java index aacf95ac..bbe6f640 100644 --- a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java @@ -43,7 +43,7 @@ public class ServerPlayNetworkHandler_scarpetEventsMixin @Inject(method = "onPlayerAction", at = @At( value = "INVOKE", - target = "Lnet/minecraft/server/network/ServerPlayerInteractionManager;method_14263(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/server/network/packet/PlayerActionC2SPacket$Action;Lnet/minecraft/util/math/Direction;I)V" + target = "Lnet/minecraft/server/network/ServerPlayerInteractionManager;processBlockBreakingAction(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/server/network/packet/PlayerActionC2SPacket$Action;Lnet/minecraft/util/math/Direction;I)V" )) private void onClicked(PlayerActionC2SPacket packet, CallbackInfo ci) { diff --git a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java b/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java index 06f96f95..0fe7ade3 100644 --- a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java @@ -46,7 +46,7 @@ public class ServerPlayerInteractionManager_ghostBlocksMixin return progress; }*/ - @ModifyConstant(method = "method_14263", + @ModifyConstant(method = "processBlockBreakingAction", constant = @Constant(doubleValue = 36D)) private double addDistance(double original) { if (CarpetSettings.miningGhostBlockFix)