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

Added Item, Entity, Block, Material Palettes for 1.19. Fixed SpawnEntity and disabled BlockChange packet on 1.19 to prevent crashing until it's fixed. Enabled Entity and Inventory handling.

Browse source
This commit is contained in:
Milutinke 2022-08-22 19:46:30 +02:00
parent e150bd569b
commit d7310e477b
20 changed files with 3161 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MinecraftClient/Mapping/BlockPalettes/Palette113.cs
View file

@ -760,7 +760,7 @@ namespace MinecraftClient.Mapping.BlockPalettes
materials[8158] = Material.EndStoneBricks;
for (int i = 8159; i <= 8162; i++)
materials[i] = Material.Beetroots;
materials[8163] = Material.GrassPath;
materials[8163] = Material.DirtPath;
materials[8164] = Material.EndGateway;
for (int i = 8165; i <= 8176; i++)
materials[i] = Material.RepeatingCommandBlock;

2
MinecraftClient/Mapping/BlockPalettes/Palette114.cs
View file

@ -792,7 +792,7 @@ namespace MinecraftClient.Mapping.BlockPalettes
materials[8682] = Material.EndStoneBricks;
for (int i = 8683; i <= 8686; i++)
materials[i] = Material.Beetroots;
materials[8687] = Material.GrassPath;
materials[8687] = Material.DirtPath;
materials[8688] = Material.EndGateway;
for (int i = 8689; i <= 8700; i++)
materials[i] = Material.RepeatingCommandBlock;

2
MinecraftClient/Mapping/BlockPalettes/Palette115.cs
View file

@ -792,7 +792,7 @@ namespace MinecraftClient.Mapping.BlockPalettes
materials[8682] = Material.EndStoneBricks;
for (int i = 8683; i <= 8686; i++)
materials[i] = Material.Beetroots;
materials[8687] = Material.GrassPath;
materials[8687] = Material.DirtPath;
materials[8688] = Material.EndGateway;
for (int i = 8689; i <= 8700; i++)
materials[i] = Material.RepeatingCommandBlock;

2
MinecraftClient/Mapping/BlockPalettes/Palette116.cs
View file

@ -800,7 +800,7 @@ namespace MinecraftClient.Mapping.BlockPalettes
materials[9222] = Material.EndStoneBricks;
for (int i = 9223; i <= 9226; i++)
materials[i] = Material.Beetroots;
materials[9227] = Material.GrassPath;
materials[9227] = Material.DirtPath;
materials[9228] = Material.EndGateway;
for (int i = 9229; i <= 9240; i++)
materials[i] = Material.RepeatingCommandBlock;

2
MinecraftClient/Mapping/BlockPalettes/Palette117.cs
View file

@ -820,7 +820,7 @@ namespace MinecraftClient.Mapping.BlockPalettes
materials[9468] = Material.EndStoneBricks;
for (int i = 9469; i <= 9472; i++)
materials[i] = Material.Beetroots;
materials[9473] = Material.GrassPath;
materials[9473] = Material.DirtPath;
materials[9474] = Material.EndGateway;
for (int i = 9475; i <= 9486; i++)
materials[i] = Material.RepeatingCommandBlock;

1530
MinecraftClient/Mapping/BlockPalettes/Palette119.cs Normal file
View file

File diff suppressed because it is too large Load diff

137
MinecraftClient/Mapping/EntityPalettes/EntityPalette119.cs Normal file
View file

@ -0,0 +1,137 @@
using System;
using System.Collections.Generic;
namespace MinecraftClient.Mapping.EntityPalettes
{
public class EntityPalette119 : EntityPalette
{
private static Dictionary<int, EntityType> mappings = new Dictionary<int, EntityType>();
static EntityPalette119()
{
mappings[0] = EntityType.Allay;
mappings[1] = EntityType.AreaEffectCloud;
mappings[2] = EntityType.ArmorStand;
mappings[3] = EntityType.Arrow;
mappings[4] = EntityType.Axolotl;
mappings[5] = EntityType.Bat;
mappings[6] = EntityType.Bee;
mappings[7] = EntityType.Blaze;
mappings[8] = EntityType.Boat;
mappings[10] = EntityType.Cat;
mappings[11] = EntityType.CaveSpider;
mappings[9] = EntityType.ChestBoat;
mappings[54] = EntityType.ChestMinecart;
mappings[12] = EntityType.Chicken;
mappings[13] = EntityType.Cod;
mappings[55] = EntityType.CommandBlockMinecart;
mappings[14] = EntityType.Cow;
mappings[15] = EntityType.Creeper;
mappings[16] = EntityType.Dolphin;
mappings[17] = EntityType.Donkey;
mappings[18] = EntityType.DragonFireball;
mappings[19] = EntityType.Drowned;
mappings[93] = EntityType.Egg;
mappings[20] = EntityType.ElderGuardian;
mappings[21] = EntityType.EndCrystal;
mappings[22] = EntityType.EnderDragon;
mappings[94] = EntityType.EnderPearl;
mappings[23] = EntityType.Enderman;
mappings[24] = EntityType.Endermite;
mappings[25] = EntityType.Evoker;
mappings[26] = EntityType.EvokerFangs;
mappings[95] = EntityType.ExperienceBottle;
mappings[27] = EntityType.ExperienceOrb;
mappings[28] = EntityType.EyeOfEnder;
mappings[29] = EntityType.FallingBlock;
mappings[46] = EntityType.Fireball;
mappings[30] = EntityType.FireworkRocket;
mappings[117] = EntityType.FishingBobber;
mappings[31] = EntityType.Fox;
mappings[32] = EntityType.Frog;
mappings[56] = EntityType.FurnaceMinecart;
mappings[33] = EntityType.Ghast;
mappings[34] = EntityType.Giant;
mappings[35] = EntityType.GlowItemFrame;
mappings[36] = EntityType.GlowSquid;
mappings[37] = EntityType.Goat;
mappings[38] = EntityType.Guardian;
mappings[39] = EntityType.Hoglin;
mappings[57] = EntityType.HopperMinecart;
mappings[40] = EntityType.Horse;
mappings[41] = EntityType.Husk;
mappings[42] = EntityType.Illusioner;
mappings[43] = EntityType.IronGolem;
mappings[44] = EntityType.Item;
mappings[45] = EntityType.ItemFrame;
mappings[47] = EntityType.LeashKnot;
mappings[48] = EntityType.LightningBolt;
mappings[49] = EntityType.Llama;
mappings[50] = EntityType.LlamaSpit;
mappings[51] = EntityType.MagmaCube;
mappings[52] = EntityType.Marker;
mappings[53] = EntityType.Minecart;
mappings[61] = EntityType.Mooshroom;
mappings[60] = EntityType.Mule;
mappings[62] = EntityType.Ocelot;
mappings[63] = EntityType.Painting;
mappings[64] = EntityType.Panda;
mappings[65] = EntityType.Parrot;
mappings[66] = EntityType.Phantom;
mappings[67] = EntityType.Pig;
mappings[68] = EntityType.Piglin;
mappings[69] = EntityType.PiglinBrute;
mappings[70] = EntityType.Pillager;
mappings[116] = EntityType.Player;
mappings[71] = EntityType.PolarBear;
mappings[96] = EntityType.Potion;
mappings[73] = EntityType.Pufferfish;
mappings[74] = EntityType.Rabbit;
mappings[75] = EntityType.Ravager;
mappings[76] = EntityType.Salmon;
mappings[77] = EntityType.Sheep;
mappings[78] = EntityType.Shulker;
mappings[79] = EntityType.ShulkerBullet;
mappings[80] = EntityType.Silverfish;
mappings[81] = EntityType.Skeleton;
mappings[82] = EntityType.SkeletonHorse;
mappings[83] = EntityType.Slime;
mappings[84] = EntityType.SmallFireball;
mappings[85] = EntityType.SnowGolem;
mappings[86] = EntityType.Snowball;
mappings[58] = EntityType.SpawnerMinecart;
mappings[87] = EntityType.SpectralArrow;
mappings[88] = EntityType.Spider;
mappings[89] = EntityType.Squid;
mappings[90] = EntityType.Stray;
mappings[91] = EntityType.Strider;
mappings[92] = EntityType.Tadpole;
mappings[72] = EntityType.Tnt;
mappings[59] = EntityType.TntMinecart;
mappings[98] = EntityType.TraderLlama;
mappings[97] = EntityType.Trident;
mappings[99] = EntityType.TropicalFish;
mappings[100] = EntityType.Turtle;
mappings[101] = EntityType.Vex;
mappings[102] = EntityType.Villager;
mappings[103] = EntityType.Vindicator;
mappings[104] = EntityType.WanderingTrader;
mappings[105] = EntityType.Warden;
mappings[106] = EntityType.Witch;
mappings[107] = EntityType.Wither;
mappings[108] = EntityType.WitherSkeleton;
mappings[109] = EntityType.WitherSkull;
mappings[110] = EntityType.Wolf;
mappings[111] = EntityType.Zoglin;
mappings[112] = EntityType.Zombie;
mappings[113] = EntityType.ZombieHorse;
mappings[114] = EntityType.ZombieVillager;
mappings[115] = EntityType.ZombifiedPiglin;
}
protected override Dictionary<int, EntityType> GetDict()
{
return mappings;
}
}
}

15
MinecraftClient/Mapping/EntityType.cs
View file

@ -4,16 +4,17 @@ namespace MinecraftClient.Mapping
/// Represents Minecraft Entity Types
/// </summary>
/// <remarks>
/// Generated from registries.json using EntityPaletteGenerator.cs.
/// Generated from registries.json using the --generator flag on the client
/// Typical steps to handle new entity IDs for newer Minecraft versions:
/// 1. Generate registries.json using data reporting on Vanilla Minecraft (https://wiki.vg/Data_Generators)
/// 2. Generate temporary EntityTypeXXX.cs and EntityPaletteXXX.cs using EntityPaletteGenerator.cs
/// 1. Generate registries.json using data reporting on Vanilla Minecraft (https://wiki.vg/Data_Generators) or download it from: https://github.com/PixiGeko/Minecraft-generated-data
/// 2. Generate temporary EntityTypeXXX.cs and EntityPaletteXXX.cs using the --generator flag on the client
/// 3. Perform a diff with existing versions, add missing entries in EntityType.cs and EntityTypeExtensions.cs
/// 4. If existing entity IDs were not randomized by Mojang, simply add missing entries to the latest existing EntityPaletteXXX.cs
/// 5. If existing entity IDs were randomized, add a new palette as EntityPaletteXXX.cs into the codebase (worst case)
/// </remarks>
public enum EntityType
{
Allay,
AreaEffectCloud,
ArmorStand,
Arrow,
@ -24,6 +25,7 @@ namespace MinecraftClient.Mapping
Boat,
Cat,
CaveSpider,
ChestBoat,
ChestMinecart,
Chicken,
Cod,
@ -38,9 +40,9 @@ namespace MinecraftClient.Mapping
ElderGuardian,
EndCrystal,
EnderDragon,
EnderPearl,
Enderman,
Endermite,
EnderPearl,
Evoker,
EvokerFangs,
ExperienceBottle,
@ -51,6 +53,7 @@ namespace MinecraftClient.Mapping
FireworkRocket,
FishingBobber,
Fox,
Frog,
FurnaceMinecart,
Ghast,
Giant,
@ -99,14 +102,15 @@ namespace MinecraftClient.Mapping
SkeletonHorse,
Slime,
SmallFireball,
Snowball,
SnowGolem,
Snowball,
SpawnerMinecart,
SpectralArrow,
Spider,
Squid,
Stray,
Strider,
Tadpole,
Tnt,
TntMinecart,
TraderLlama,
@ -117,6 +121,7 @@ namespace MinecraftClient.Mapping
Villager,
Vindicator,
WanderingTrader,
Warden,
Witch,
Wither,
WitherSkeleton,

93
MinecraftClient/Mapping/Material.cs
View file

@ -4,10 +4,10 @@
/// Represents Minecraft Materials
/// </summary>
/// <remarks>
/// Generated from blocks.json using BlockPaletteGenerator.cs.
/// Generated from blocks.json using the --generator flag on the client
/// Typical steps to handle new blocks for newer Minecraft versions:
/// 1. Generate blocks.json using data reporting on Vanilla Minecraft (https://wiki.vg/Data_Generators)
/// 2. Generate temporary MaterialXXX.cs and PaletteXXX.cs using BlockPaletteGenerator.cs
/// 1. Generate blocks.json using data reporting on Vanilla Minecraft (https://wiki.vg/Data_Generators) or download it from: https://github.com/PixiGeko/Minecraft-generated-data
/// 2. Generate temporary MaterialXXX.cs and PaletteXXX.cs using the --generator flag on the client
/// 3. Perform a diff with existing versions, add missing entries in Material.cs and MaterialExtensions.cs
/// 4. If existing state IDs were not randomized by Mojang, simply add missing state entries to Palette113.cs
/// 5. If existing state IDs were randomized, add a new palette as PaletteXXX.cs into the codebase (worst case)
@ -52,8 +52,8 @@
Basalt,
Beacon,
Bedrock,
Beehive,
BeeNest,
Beehive,
Beetroots,
Bell,
BigDripleaf,
@ -84,13 +84,13 @@
BlackShulkerBox,
BlackStainedGlass,
BlackStainedGlassPane,
BlackTerracotta,
BlackWallBanner,
BlackWool,
Blackstone,
BlackstoneSlab,
BlackstoneStairs,
BlackstoneWall,
BlackTerracotta,
BlackWallBanner,
BlackWool,
BlastFurnace,
BlueBanner,
BlueBed,
@ -115,10 +115,10 @@
BrainCoralFan,
BrainCoralWallFan,
BrewingStand,
Bricks,
BrickSlab,
BrickStairs,
BrickWall,
Bricks,
BrownBanner,
BrownBed,
BrownCandle,
@ -277,10 +277,10 @@
DeadTubeCoralFan,
DeadTubeCoralWallFan,
Deepslate,
DeepslateBricks,
DeepslateBrickSlab,
DeepslateBrickStairs,
DeepslateBrickWall,
DeepslateBricks,
DeepslateCoalOre,
DeepslateCopperOre,
DeepslateDiamondOre,
@ -289,10 +289,10 @@
DeepslateIronOre,
DeepslateLapisOre,
DeepslateRedstoneOre,
DeepslateTiles,
DeepslateTileSlab,
DeepslateTileStairs,
DeepslateTileWall,
DeepslateTiles,
DetectorRail,
DiamondBlock,
DiamondOre,
@ -301,6 +301,7 @@
DioriteStairs,
DioriteWall,
Dirt,
DirtPath,
Dispenser,
DragonEgg,
DragonHead,
@ -311,16 +312,16 @@
EmeraldBlock,
EmeraldOre,
EnchantingTable,
EnderChest,
EndGateway,
EndPortal,
EndPortalFrame,
EndRod,
EndStone,
EndStoneBricks,
EndStoneBrickSlab,
EndStoneBrickStairs,
EndStoneBrickWall,
EndStoneBricks,
EnderChest,
ExposedCopper,
ExposedCutCopper,
ExposedCutCopperSlab,
@ -333,9 +334,10 @@
FireCoralFan,
FireCoralWallFan,
FletchingTable,
FlowerPot,
FloweringAzalea,
FloweringAzaleaLeaves,
FlowerPot,
Frogspawn,
FrostedIce,
Furnace,
GildedBlackstone,
@ -351,7 +353,6 @@
GraniteWall,
Grass,
GrassBlock,
GrassPath,
Gravel,
GrayBanner,
GrayBed,
@ -464,8 +465,8 @@
LightGrayTerracotta,
LightGrayWallBanner,
LightGrayWool,
LightningRod,
LightWeightedPressurePlate,
LightningRod,
Lilac,
LilyOfTheValley,
LilyPad,
@ -500,6 +501,22 @@
MagentaWallBanner,
MagentaWool,
MagmaBlock,
MangroveButton,
MangroveDoor,
MangroveFence,
MangroveFenceGate,
MangroveLeaves,
MangroveLog,
MangrovePlanks,
MangrovePressurePlate,
MangrovePropagule,
MangroveRoots,
MangroveSign,
MangroveSlab,
MangroveStairs,
MangroveTrapdoor,
MangroveWallSign,
MangroveWood,
MediumAmethystBud,
Melon,
MelonStem,
@ -509,26 +526,32 @@
MossyCobblestoneSlab,
MossyCobblestoneStairs,
MossyCobblestoneWall,
MossyStoneBricks,
MossyStoneBrickSlab,
MossyStoneBrickStairs,
MossyStoneBrickWall,
MossyStoneBricks,
MovingPiston,
Mud,
MudBrickSlab,
MudBrickStairs,
MudBrickWall,
MudBricks,
MuddyMangroveRoots,
MushroomStem,
Mycelium,
NetherBrickFence,
NetherBricks,
NetherBrickSlab,
NetherBrickStairs,
NetherBrickWall,
NetherBricks,
NetherGoldOre,
NetheriteBlock,
NetherPortal,
NetherQuartzOre,
Netherrack,
NetherSprouts,
NetherWart,
NetherWartBlock,
NetheriteBlock,
Netherrack,
NoteBlock,
OakButton,
OakDoor,
@ -547,6 +570,7 @@
OakWood,
Observer,
Obsidian,
OchreFroglight,
OrangeBanner,
OrangeBed,
OrangeCandle,
@ -568,6 +592,8 @@
OxidizedCutCopperSlab,
OxidizedCutCopperStairs,
PackedIce,
PackedMud,
PearlescentFroglight,
Peony,
PetrifiedOakSlab,
PinkBanner,
@ -596,10 +622,10 @@
PolishedAndesiteStairs,
PolishedBasalt,
PolishedBlackstone,
PolishedBlackstoneBricks,
PolishedBlackstoneBrickSlab,
PolishedBlackstoneBrickStairs,
PolishedBlackstoneBrickWall,
PolishedBlackstoneBricks,
PolishedBlackstoneButton,
PolishedBlackstonePressurePlate,
PolishedBlackstoneSlab,
@ -636,6 +662,7 @@
PottedFloweringAzaleaBush,
PottedJungleSapling,
PottedLilyOfTheValley,
PottedMangrovePropagule,
PottedOakSapling,
PottedOrangeTulip,
PottedOxeyeDaisy,
@ -652,9 +679,9 @@
PowderSnowCauldron,
PoweredRail,
Prismarine,
PrismarineBricks,
PrismarineBrickSlab,
PrismarineBrickStairs,
PrismarineBricks,
PrismarineSlab,
PrismarineStairs,
PrismarineWall,
@ -697,10 +724,10 @@
RedGlazedTerracotta,
RedMushroom,
RedMushroomBlock,
RedNetherBricks,
RedNetherBrickSlab,
RedNetherBrickStairs,
RedNetherBrickWall,
RedNetherBricks,
RedSand,
RedSandstone,
RedSandstoneSlab,
@ -709,16 +736,17 @@
RedShulkerBox,
RedStainedGlass,
RedStainedGlassPane,
RedTerracotta,
RedTulip,
RedWallBanner,
RedWool,
RedstoneBlock,
RedstoneLamp,
RedstoneOre,
RedstoneTorch,
RedstoneWallTorch,
RedstoneWire,
RedTerracotta,
RedTulip,
RedWallBanner,
RedWool,
ReinforcedDeepslate,
Repeater,
RepeatingCommandBlock,
RespawnAnchor,
@ -730,10 +758,14 @@
SandstoneStairs,
SandstoneWall,
Scaffolding,
Sculk,
SculkCatalyst,
SculkSensor,
Seagrass,
SculkShrieker,
SculkVein,
SeaLantern,
SeaPickle,
Seagrass,
Shroomlight,
ShulkerBox,
SkeletonSkull,
@ -784,15 +816,15 @@
SpruceWood,
StickyPiston,
Stone,
StoneBricks,
StoneBrickSlab,
StoneBrickStairs,
StoneBrickWall,
StoneBricks,
StoneButton,
Stonecutter,
StonePressurePlate,
StoneSlab,
StoneStairs,
Stonecutter,
StrippedAcaciaLog,
StrippedAcaciaWood,
StrippedBirchLog,
@ -803,6 +835,8 @@
StrippedDarkOakWood,
StrippedJungleLog,
StrippedJungleWood,
StrippedMangroveLog,
StrippedMangroveWood,
StrippedOakLog,
StrippedOakWood,
StrippedSpruceLog,
@ -832,6 +866,7 @@
TurtleEgg,
TwistingVines,
TwistingVinesPlant,
VerdantFroglight,
Vine,
VoidAir,
WallTorch,

2
MinecraftClient/Mapping/Material2Tool.cs
View file

@ -367,7 +367,7 @@ namespace MinecraftClient.Mapping
Material.Farmland,
Material.Grass,
Material.GrassBlock,
Material.GrassPath,
Material.DirtPath,
Material.Gravel,
Material.GrayConcretePowder,
Material.GreenConcretePowder,

2
MinecraftClient/Mapping/MaterialExtensions.cs
View file

@ -372,7 +372,7 @@ namespace MinecraftClient.Mapping
case Material.PurpurPillar:
case Material.PurpurStairs:
case Material.EndStoneBricks:
case Material.GrassPath:
case Material.DirtPath:
case Material.RepeatingCommandBlock:
case Material.ChainCommandBlock:
case Material.FrostedIce: