helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-11-07 17:36:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement Terrain and Movements for MC 1.13

Browse source 
Special thanks to @TheSnoozer and @vkorn for their help!

 - Implement global block Palette mechanism
 - Add class generation tool from blocks.json
 - Regenerate Material.cs and redefine solid blocks
 - Migrate previous Material.cs into Palette112
 - Generate Palette113 from MC 1.13.2 blocks.json
 - Improve Block class to handle up to 65535 block states
 - Adjust terrain parsing, small fixes in packets
 - Remove unused snapshot-related protocol cases

Solves #599
This commit is contained in:
ORelio 2019-04-25 22:09:33 +02:00
parent b57630a5e4
commit c04b17cabc
12 changed files with 10147 additions and 573 deletions
Download patch file Download diff file Expand all files Collapse all files

61
MinecraftClient/Mapping/Block.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using MinecraftClient.Mapping.BlockPalettes;
namespace MinecraftClient.Mapping
{
@ -11,37 +12,68 @@ namespace MinecraftClient.Mapping
public struct Block
{
/// <summary>
/// Storage for block ID and metadata
/// Get or set global block ID to Material mapping
/// The global Palette is a concept introduced with Minecraft 1.13
/// </summary>
public static PaletteMapping Palette { get; set; }
/// <summary>
/// Storage for block ID and metadata, as ushort for compatibility, performance and lower memory footprint
/// For Minecraft 1.12 and lower, first 12 bits contain block ID (0-4095), last 4 bits contain metadata (0-15)
/// For Minecraft 1.13 and greater, all 16 bits are used to store block state ID (0-65535)
/// </summary>
private ushort blockIdAndMeta;
/// <summary>
/// Id of the block
/// </summary>
public short BlockId
public int BlockId
{
get
{
return (short)(blockIdAndMeta >> 4);
if (Palette.IdHasMetadata)
{
return blockIdAndMeta >> 4;
}
return blockIdAndMeta;
}
set
{
blockIdAndMeta = (ushort)(value << 4 | BlockMeta);
if (Palette.IdHasMetadata)
{
if (value > (ushort.MaxValue >> 4) || value < 0)
throw new ArgumentOutOfRangeException("value", "Invalid block ID. Accepted range: 0-4095");
blockIdAndMeta = (ushort)(value << 4 | BlockMeta);
}
else
{
if (value > ushort.MaxValue || value < 0)
throw new ArgumentOutOfRangeException("value", "Invalid block ID. Accepted range: 0-65535");
blockIdAndMeta = (ushort)value;
}
}
}
/// <summary>
/// Metadata of the block
/// Metadata of the block.
/// This field has no effect starting with Minecraft 1.13.
/// </summary>
public byte BlockMeta
{
get
{
return (byte)(blockIdAndMeta & 0x0F);
if (Palette.IdHasMetadata)
{
return (byte)(blockIdAndMeta & 0x0F);
}
return 0;
}
set
{
blockIdAndMeta = (ushort)((blockIdAndMeta & ~0x0F) | (value & 0x0F));
if (Palette.IdHasMetadata)
{
blockIdAndMeta = (ushort)((blockIdAndMeta & ~0x0F) | (value & 0x0F));
}
}
}
@ -52,7 +84,7 @@ namespace MinecraftClient.Mapping
{
get
{
return (Material)BlockId;
return Palette.FromId(BlockId);
}
}
@ -63,27 +95,22 @@ namespace MinecraftClient.Mapping
/// <param name="metadata">Block metadata</param>
public Block(short type, byte metadata = 0)
{
if (!Palette.IdHasMetadata)
throw new InvalidOperationException("Current global Palette does not support block Metadata");
this.blockIdAndMeta = 0;
this.BlockId = type;
this.BlockMeta = metadata;
}
/// <summary>
/// Get a block of the specified type and metadata
/// Get a block of the specified type and metadata OR block state
/// </summary>
/// <param name="typeAndMeta">Type and metadata packed in the same value</param>
/// <param name="typeAndMeta">Type and metadata packed in the same value OR block state</param>
public Block(ushort typeAndMeta)
{
this.blockIdAndMeta = typeAndMeta;
}
/// <summary>
/// Get a block of the specified type and metadata
/// </summary>
/// <param name="type">Block type</param>
public Block(Material type, byte metadata = 0)
: this((short)type, metadata) { }
/// <summary>
/// String representation of the block
/// </summary>