helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2026-08-15 13:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix AutoDig mining timing

Browse source
This commit is contained in:
Anon 2026-05-23 10:56:06 +02:00
parent 6331478e30
commit b74364d465
10 changed files with 1576 additions and 899 deletions
Download patch file Download diff file Expand all files Collapse all files

29
MinecraftClient/Mapping/MiningCalculator.cs
View file

@ -16,6 +16,15 @@ namespace MinecraftClient.Mapping
/// </summary>
public static class MiningCalculator
{
public sealed class MiningOptions
{
public static readonly MiningOptions Vanilla = new();
public bool ApplyEfficiencyEnchantments { get; init; } = true;
public bool ApplyHasteEffects { get; init; } = true;
}
/// <summary>
/// Compute the number of ticks required to break a block in survival mode.
/// Returns 0 for instant-break blocks, -1 for unbreakable blocks.
@ -37,8 +46,10 @@ namespace MinecraftClient.Mapping
Dictionary<string, double> playerAttributes,
bool isUnderwater,
bool isOnGround,
int protocolVersion)
int protocolVersion,
MiningOptions? options = null)
{
options ??= MiningOptions.Vanilla;
float hardness = BlockHardness.GetHardness(blockMaterial);
if (hardness < 0)
@ -49,7 +60,7 @@ namespace MinecraftClient.Mapping
float destroySpeed = GetDestroySpeed(
blockMaterial, heldItem, helmetItem, effects, playerAttributes,
isUnderwater, isOnGround, protocolVersion);
isUnderwater, isOnGround, protocolVersion, options);
bool correctTool = HasCorrectToolForDrops(blockMaterial, heldItem, protocolVersion);
int divisor = correctTool ? 30 : 100;
@ -73,18 +84,22 @@ namespace MinecraftClient.Mapping
Dictionary<string, double> playerAttributes,
bool isUnderwater,
bool isOnGround,
int protocolVersion)
int protocolVersion,
MiningOptions options)
{
float speed = GetToolSpeed(blockMaterial, heldItem, protocolVersion);
if (speed > 1.0f)
if (speed > 1.0f && options.ApplyEfficiencyEnchantments)
{
speed += GetEfficiencyBonus(heldItem, playerAttributes, protocolVersion);
}
int digSpeedAmplifier = GetDigSpeedAmplifier(effects);
if (digSpeedAmplifier >= 0)
speed *= 1.0f + (digSpeedAmplifier + 1) * 0.2f;
if (options.ApplyHasteEffects)
{
int digSpeedAmplifier = GetDigSpeedAmplifier(effects);
if (digSpeedAmplifier >= 0)
speed *= 1.0f + (digSpeedAmplifier + 1) * 0.2f;
}
// Mining Fatigue
if (effects.TryGetValue(Effects.MiningFatigue, out var fatigueData))