19w38b no movableBEs

This commit is contained in:
gnembon committed 2019-09-18 21:57:08 -03:00
1 parent 59f2c8f958
commit a825134fba
6 files changed
+11 -9

No files matched your search

@@ -26,9 +26,9 @@ public abstract class BlockEntityRenderDispatcher_movableTEMixin implements Bloc
@Shadow @Shadow
public World world; public World world;
@Shadow //@Shadow
public abstract void renderEntity(BlockEntity blockEntity_1, double double_1, double double_2, double double_3, //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); // float float_1, int int_1, boolean boolean_1);
/** /**
* @author 2No2Name * @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, public void renderBlockEntityOffset(BlockEntity blockEntity_1, float partialTicks, int destroyStage, double xOffset,
double yOffset, double zOffset) 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()) this.cameraEntity.getPos().z - zOffset) < blockEntity_1.getSquaredRenderDistance())
{ {
GuiLighting.enable(); GuiLighting.enable();
@@ -48,6 +48,6 @@ public abstract class BlockEntityRenderDispatcher_movableTEMixin implements Bloc
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
BlockPos blockpos = blockEntity_1.getPos(); 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); this.renderEntity(blockEntity_1, (double) blockpos.getX() - renderOffsetX + xOffset, (double) blockpos.getY() - renderOffsetY + yOffset, (double) blockpos.getZ() - renderOffsetZ + zOffset, partialTicks, destroyStage, false);
} }*/
} }
} }
@@ -14,7 +14,7 @@ public class MinecraftClientMixin
{ {
//to inject right before //to inject right before
// this.tickWorlds(booleanSupplier_1); // this.tickWorlds(booleanSupplier_1);
@Inject(method = "start", at = @At(value = "RETURN") @Inject(method = "start", at = @At(value = "HEAD")
) )
private void onInit(CallbackInfo ci) { private void onInit(CallbackInfo ci) {
//CM start game hook //CM start game hook
@@ -157,7 +157,7 @@ public abstract class MinecraftServer_tickspeedMixin
} }
@Inject(method = "method_16208", at = @At( @Inject(method = "method_16208", at = @At(
value = "INVOKE", 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 shift = At.Shift.BEFORE
)) ))
private void stopAsync(CallbackInfo ci) private void stopAsync(CallbackInfo ci)
@@ -16,6 +16,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(PistonBlockEntityRenderer.class) @Mixin(PistonBlockEntityRenderer.class)
public abstract class PistonBlockEntityRenderer_movableTEMixin extends BlockEntityRenderer<PistonBlockEntity> public abstract class PistonBlockEntityRenderer_movableTEMixin extends BlockEntityRenderer<PistonBlockEntity>
{ {
/*
@Inject(method = "method_3576", at = @At(value = "INVOKE", @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)) 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, private void updateRenderBool(PistonBlockEntity pistonBlockEntity_1, double double_1, double double_2,
@@ -39,4 +40,5 @@ public abstract class PistonBlockEntityRenderer_movableTEMixin extends BlockEnti
} }
} }
} }
*/
} }
@@ -43,7 +43,7 @@ public class ServerPlayNetworkHandler_scarpetEventsMixin
@Inject(method = "onPlayerAction", at = @At( @Inject(method = "onPlayerAction", at = @At(
value = "INVOKE", 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) private void onClicked(PlayerActionC2SPacket packet, CallbackInfo ci)
{ {
@@ -46,7 +46,7 @@ public class ServerPlayerInteractionManager_ghostBlocksMixin
return progress; return progress;
}*/ }*/
@ModifyConstant(method = "method_14263", @ModifyConstant(method = "processBlockBreakingAction",
constant = @Constant(doubleValue = 36D)) constant = @Constant(doubleValue = 36D))
private double addDistance(double original) { private double addDistance(double original) {
if (CarpetSettings.miningGhostBlockFix) if (CarpetSettings.miningGhostBlockFix)