1.15 pre1 - 7

This commit is contained in:
gnembon committed 2019-11-25 15:17:44 -04:00
1 parent aa8f5c1921
commit a463b10bca
17 files changed
+36 -36

No files matched your search

@@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
public abstract class ClientConnectionMixin
{
// Add to the packet counter whenever a packet is received.
@Inject(method = "method_10770", at = @At("HEAD"))
@Inject(method = "channelRead0", at = @At("HEAD"))
private void packetInCount(ChannelHandlerContext channelHandlerContext_1, Packet<?> packet_1, CallbackInfo ci)
{
PacketCounter.totalIn++;
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(FossilFeature.class)
public class FossilFeatureMixin
{
@Redirect(method = "method_13236", at = @At(
@Redirect(method = "generate", at = @At(
value = "INVOKE",
target = "Lnet/minecraft/world/IWorld;getTopY(Lnet/minecraft/world/Heightmap$Type;II)I"
))
@@ -23,7 +23,7 @@ public abstract class PistonBlockEntityRenderer_movableTEMixin extends BlockEnti
super(blockEntityRenderDispatcher_1);
}
@Inject(method = "method_3576", at = @At(value = "INVOKE",
@Inject(method = "render", 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/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/world/World;ZI)V", ordinal = 3))
private void updateRenderBool(PistonBlockEntity pistonBlockEntity_1, float float_1, MatrixStack matrixStack_1, VertexConsumerProvider layeredVertexConsumerStorage_1, int int_1, int int_2, CallbackInfo ci)
//private void updateRenderBool(PistonBlockEntity pistonBlockEntity_1, double double_1, double double_2, double double_3, float float_1, class_4587 class_4587_1, class_4597 class_4597_1, int int_1, CallbackInfo ci)
@@ -33,7 +33,7 @@ public abstract class PistonBlockEntityRenderer_movableTEMixin extends BlockEnti
}
@Inject(method = "method_3576", at = @At("RETURN"), locals = LocalCapture.NO_CAPTURE)
@Inject(method = "render", at = @At("RETURN"), locals = LocalCapture.NO_CAPTURE)
private void endMethod3576(PistonBlockEntity pistonBlockEntity_1, float partialTicks, MatrixStack matrixStack_1, VertexConsumerProvider layeredVertexConsumerStorage_1, int int_1, int init_2, CallbackInfo ci)
{
if (((PistonBlockEntityInterface) pistonBlockEntity_1).getRenderCarriedBlockEntity())
@@ -28,7 +28,7 @@ public abstract class PlayerEntity_horseFixMixin extends Entity
{
super(entityType_1, world_1);
}
/* fixed in 1.15 pre-2
@Inject(method = "stopRiding", at = @At("HEAD"))
private void resetNavigation(CallbackInfo ci)
{
@@ -38,11 +38,11 @@ public abstract class PlayerEntity_horseFixMixin extends Entity
((MobEntity) getVehicle()).getNavigation().stop();
if (!getEntityWorld().isClient)
{
((ServerWorld) getEntityWorld()).method_14178().sendToNearbyPlayers(this, new EntityPositionS2CPacket(getVehicle()));
((ServerWorld) getEntityWorld()).getChunkManager().sendToNearbyPlayers(this, new EntityPositionS2CPacket(getVehicle()));
// not sure if player at this point is actually considered to be next to the exiting vehicle
((ServerPlayerEntity)(Object)this).networkHandler.sendPacket(new EntityPositionS2CPacket(getVehicle()));
((ServerPlayerEntity)(Object)this).networkHandler.sendPacket(new VehicleMoveS2CPacket(getVehicle()));
}
}
}
}*/
}
@@ -105,7 +105,7 @@ public abstract class RedstoneWireBlockMixin implements RedstoneWireBlockInterfa
if (blockState_3.isSimpleFullBlock(world_1, blockPos_2) && !world_1.getBlockState(blockPos_3).isSimpleFullBlock(world_1, blockPos_3)) {
int_3 = this.increasePower(int_3, world_1.getBlockState(blockPos_2.up()));
} else if (!blockState_3.isSimpleFullBlock(world_1, blockPos_2)) {
int_3 = this.increasePower(int_3, world_1.getBlockState(blockPos_2.method_10074()));
int_3 = this.increasePower(int_3, world_1.getBlockState(blockPos_2.down()));
}
}
}
@@ -27,7 +27,7 @@ public abstract class ServerWorld_fakePlayersMixin
if ( !(ticking && serverPlayerEntity_1 instanceof EntityPlayerMPFake) )
serverWorld.removeEntity(entity_1);
else
getServer().method_18858(new ServerTask(getServer().getTicks(), () ->
getServer().send(new ServerTask(getServer().getTicks(), () ->
{
serverWorld.removeEntity(serverPlayerEntity_1);
serverPlayerEntity_1.onTeleportationDone();
@@ -35,7 +35,7 @@ public abstract class StructureFeatureMixin implements StructureFeatureInterface
@Override
public boolean plopAnywhere(ServerWorld world, BlockPos pos)
{
return plopAnywhere(world, pos, world.method_14178().getChunkGenerator());
return plopAnywhere(world, pos, world.getChunkManager().getChunkGenerator());
}
@Override
public boolean plopAnywhere(ServerWorld world, BlockPos pos, ChunkGenerator<? extends ChunkGeneratorConfig> generator)