helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bugs in gravity handle

Browse source
This commit is contained in:
BruceChen 2022-07-25 03:19:24 +08:00
parent 86dfd60d07
commit 357820e1c2
7 changed files with 54 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MinecraftClient/Commands/Move.cs
View file

@ -76,7 +76,7 @@ namespace MinecraftClient.Commands
int z = int.Parse(args[2]);
Location goal = new Location(x, y, z);
if (handler.GetWorld().GetChunkColumn(goal) == null)
if (handler.GetWorld().GetChunkColumn(goal) == null || handler.GetWorld().GetChunkColumn(goal).FullyLoaded == false)
return Translations.Get("cmd.move.chunk_not_loaded");
else if (handler.MoveTo(goal, allowUnsafe: takeRisk))
return Translations.Get("cmd.move.walk", goal);

2
MinecraftClient/Mapping/ChunkColumn.cs
View file

@ -13,6 +13,8 @@ namespace MinecraftClient.Mapping
{
public int ColumnSize;
public bool FullyLoaded = false;
/// <summary>
/// Blocks contained into the chunk
/// </summary>

7
MinecraftClient/Mapping/Movement.cs
View file

@ -31,9 +31,11 @@ namespace MinecraftClient.Mapping
belowFoots = location;
belowFoots.Y = Math.Truncate(location.Y);
}
//Console.WriteLine("IsOnGround = " + IsOnGround(world, location));
if (!IsOnGround(world, location) && !IsSwimming(world, location))
{
while (!IsOnGround(world, belowFoots) && belowFoots.Y >= 1)
while (!IsOnGround(world, belowFoots) &&
belowFoots.Y >= 1 + (world.GetDimension() == null ? 0 : world.GetDimension().minY))
belowFoots = Move(belowFoots, Direction.Down);
location = Move2Steps(location, belowFoots, ref motionY, true).Dequeue();
}
@ -262,6 +264,9 @@ namespace MinecraftClient.Mapping
/// <returns>True if the specified location is on the ground</returns>
public static bool IsOnGround(World world, Location location)
{
if (world.GetChunkColumn(location) == null || world.GetChunkColumn(location).FullyLoaded == false)
return true; // avoid moving downward in a not loaded chunk
return world.GetBlock(Move(location, Direction.Down)).Type.IsSolid()
&& (location.Y <= Math.Truncate(location.Y) + 0.0001);
}

7
MinecraftClient/Mapping/World.cs
View file

@ -26,6 +26,13 @@ namespace MinecraftClient.Mapping
/// </summary>
private readonly ReaderWriterLockSlim chunksLock = new ReaderWriterLockSlim();
/// <summary>
/// Chunk data parsing progress
/// </summary>
public uint chunkCnt = 0;
public uint chunkLoadNotCompleted = 0;
/// <summary>
/// Read, set or unload the specified chunk column
/// </summary>

22
MinecraftClient/McClient.cs
View file

@ -59,6 +59,8 @@ namespace MinecraftClient
private float playerYaw;
private float playerPitch;
private double motionY;
private int chunkLoadingStateTicks = 30; // Setting it to zero to disable chunk loading statu log
private double lastChunkLoadedRatio = 0;
private string host;
private int port;
@ -385,6 +387,26 @@ namespace MinecraftClient
taskToRun();
}
}
if (terrainAndMovementsEnabled)
{
if (chunkLoadingStateTicks <= 0)
{
chunkLoadingStateTicks = 50;
if (world.chunkCnt != 0)
{
double chunkLoadedRatio = (world.chunkCnt - world.chunkLoadNotCompleted) / (double)world.chunkCnt;
if (chunkLoadedRatio != lastChunkLoadedRatio)
{
Log.Info(string.Format("Chunk loading: {0:P} {1}/{2}",
chunkLoadedRatio, world.chunkCnt - world.chunkLoadNotCompleted, world.chunkCnt));
lastChunkLoadedRatio = chunkLoadedRatio;
}
}
}
else
chunkLoadingStateTicks--;
}
}
#region Connection Lost and Disconnect from Server

16
MinecraftClient/Protocol/Handlers/Protocol18.cs
View file

@ -475,7 +475,10 @@ namespace MinecraftClient.Protocol.Handlers
int dataSize = dataTypes.ReadNextVarInt(packetData); // Size
new Task(() =>
{
handler.GetWorld().chunkCnt++;
handler.GetWorld().chunkLoadNotCompleted++;
pTerrain.ProcessChunkColumnData(chunkX, chunkZ, verticalStripBitmask, packetData);
handler.GetWorld().chunkLoadNotCompleted--;
}).Start();
}
else
@ -628,9 +631,12 @@ namespace MinecraftClient.Protocol.Handlers
if (protocolversion >= MC1162Version)
{
long chunkSection = dataTypes.ReadNextLong(packetData);
int sectionX = (int)((chunkSection >> 42) & 0x3FFFFF);
int sectionZ = (int)((chunkSection >> 20) & 0x3FFFFF);
int sectionY = (int)((chunkSection) & 0xFFFFF);
int sectionX = (int)(chunkSection >> 42);
int sectionY = (int)((chunkSection << 44) >> 44);
int sectionZ = (int)((chunkSection << 22) >> 42);
//int sectionX = (int)((chunkSection >> 42) & 0x3FFFFF);
//int sectionZ = (int)((chunkSection >> 20) & 0x3FFFFF);
//int sectionY = (int)((chunkSection) & 0xFFFFF);
dataTypes.ReadNextBool(packetData); // Useless boolean (Related to light update)
int blocksSize = dataTypes.ReadNextVarInt(packetData);
for (int i = 0; i < blocksSize; i++)
@ -750,6 +756,10 @@ namespace MinecraftClient.Protocol.Handlers
{
int chunkX = dataTypes.ReadNextInt(packetData);
int chunkZ = dataTypes.ReadNextInt(packetData);
if (handler.GetWorld()[chunkX, chunkZ] != null)
handler.GetWorld().chunkCnt--;
handler.GetWorld()[chunkX, chunkZ] = null;
}
break;

5
MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs
View file

@ -147,8 +147,8 @@ namespace MinecraftClient.Protocol.Handlers
public void ProcessChunkColumnData(int chunkX, int chunkZ, ulong[] verticalStripBitmask, Queue<byte> cache)
{
var world = handler.GetWorld();
while (world.GetDimension() == null)
; // Dimension parsing unfinished
if (world.GetDimension() == null)
return;
int chunkColumnSize = (world.GetDimension().height + 15) / 16;
@ -207,6 +207,7 @@ namespace MinecraftClient.Protocol.Handlers
// Don't worry about skipping remaining data since there is no useful data afterwards in 1.9
// (plus, it would require parsing the tile entity lists' NBT)
}
handler.GetWorld()[chunkX, chunkZ].FullyLoaded = true;
}
/// <summary>