Added palettes

This commit is contained in:
Anon 2023-03-21 23:31:10 +01:00
parent 046cb15c75
commit 2e55a6bc85
7 changed files with 3128 additions and 8 deletions

File diff suppressed because it is too large Load diff

View file

@ -171,6 +171,7 @@
BrownStainedGlassPane, BrownStainedGlassPane,
BrownTerracotta, BrownTerracotta,
BrownWool, BrownWool,
Brush,
BubbleCoral, BubbleCoral,
BubbleCoralBlock, BubbleCoralBlock,
BubbleCoralFan, BubbleCoralFan,
@ -197,6 +198,23 @@
ChainmailHelmet, ChainmailHelmet,
ChainmailLeggings, ChainmailLeggings,
Charcoal, Charcoal,
CherryBoat,
CherryButton,
CherryChestBoat,
CherryDoor,
CherryFence,
CherryFenceGate,
CherryHangingSign,
CherryLeaves,
CherryLog,
CherryPlanks,
CherryPressurePlate,
CherrySapling,
CherrySign,
CherrySlab,
CherryStairs,
CherryTrapdoor,
CherryWood,
Chest, Chest,
ChestMinecart, ChestMinecart,
Chicken, Chicken,
@ -220,6 +238,7 @@
CoalBlock, CoalBlock,
CoalOre, CoalOre,
CoarseDirt, CoarseDirt,
CoastArmorTrimSmithingTemplate,
CobbledDeepslate, CobbledDeepslate,
CobbledDeepslateSlab, CobbledDeepslateSlab,
CobbledDeepslateStairs, CobbledDeepslateStairs,
@ -339,6 +358,7 @@
DeadTubeCoralBlock, DeadTubeCoralBlock,
DeadTubeCoralFan, DeadTubeCoralFan,
DebugStick, DebugStick,
DecoratedPot,
Deepslate, Deepslate,
DeepslateBrickSlab, DeepslateBrickSlab,
DeepslateBrickStairs, DeepslateBrickStairs,
@ -388,6 +408,7 @@
DripstoneBlock, DripstoneBlock,
Dropper, Dropper,
DrownedSpawnEgg, DrownedSpawnEgg,
DuneArmorTrimSmithingTemplate,
EchoShard, EchoShard,
Egg, Egg,
ElderGuardianSpawnEgg, ElderGuardianSpawnEgg,
@ -418,6 +439,7 @@
ExposedCutCopper, ExposedCutCopper,
ExposedCutCopperSlab, ExposedCutCopperSlab,
ExposedCutCopperStairs, ExposedCutCopperStairs,
EyeArmorTrimSmithingTemplate,
Farmland, Farmland,
Feather, Feather,
FermentedSpiderEye, FermentedSpiderEye,
@ -748,6 +770,7 @@
NetheriteScrap, NetheriteScrap,
NetheriteShovel, NetheriteShovel,
NetheriteSword, NetheriteSword,
NetheriteUpgradeSmithingTemplate,
Netherrack, Netherrack,
NoteBlock, NoteBlock,
OakBoat, OakBoat,
@ -815,6 +838,7 @@
PinkConcretePowder, PinkConcretePowder,
PinkDye, PinkDye,
PinkGlazedTerracotta, PinkGlazedTerracotta,
PinkPetals,
PinkShulkerBox, PinkShulkerBox,
PinkStainedGlass, PinkStainedGlass,
PinkStainedGlassPane, PinkStainedGlassPane,
@ -856,6 +880,10 @@
Porkchop, Porkchop,
Potato, Potato,
Potion, Potion,
PotteryShardArcher,
PotteryShardArmsUp,
PotteryShardPrize,
PotteryShardSkull,
PowderSnowBucket, PowderSnowBucket,
PoweredRail, PoweredRail,
Prismarine, Prismarine,
@ -944,6 +972,7 @@
Repeater, Repeater,
RepeatingCommandBlock, RepeatingCommandBlock,
RespawnAnchor, RespawnAnchor,
RibArmorTrimSmithingTemplate,
RootedDirt, RootedDirt,
RoseBush, RoseBush,
RottenFlesh, RottenFlesh,
@ -966,6 +995,7 @@
SeaLantern, SeaLantern,
SeaPickle, SeaPickle,
Seagrass, Seagrass,
SentryArmorTrimSmithingTemplate,
Shears, Shears,
SheepSpawnEgg, SheepSpawnEgg,
Shield, Shield,
@ -997,6 +1027,8 @@
SmoothSandstoneStairs, SmoothSandstoneStairs,
SmoothStone, SmoothStone,
SmoothStoneSlab, SmoothStoneSlab,
SnifferSpawnEgg,
SnoutArmorTrimSmithingTemplate,
Snow, Snow,
SnowBlock, SnowBlock,
SnowGolemSpawnEgg, SnowGolemSpawnEgg,
@ -1010,6 +1042,7 @@
SpectralArrow, SpectralArrow,
SpiderEye, SpiderEye,
SpiderSpawnEgg, SpiderSpawnEgg,
SpireArmorTrimSmithingTemplate,
SplashPotion, SplashPotion,
Sponge, Sponge,
SporeBlossom, SporeBlossom,
@ -1057,6 +1090,8 @@
StrippedBambooBlock, StrippedBambooBlock,
StrippedBirchLog, StrippedBirchLog,
StrippedBirchWood, StrippedBirchWood,
StrippedCherryLog,
StrippedCherryWood,
StrippedCrimsonHyphae, StrippedCrimsonHyphae,
StrippedCrimsonStem, StrippedCrimsonStem,
StrippedDarkOakLog, StrippedDarkOakLog,
@ -1076,6 +1111,7 @@
Sugar, Sugar,
SugarCane, SugarCane,
Sunflower, Sunflower,
SuspiciousSand,
SuspiciousStew, SuspiciousStew,
SweetBerries, SweetBerries,
TadpoleBucket, TadpoleBucket,
@ -1083,11 +1119,14 @@
TallGrass, TallGrass,
Target, Target,
Terracotta, Terracotta,
TideArmorTrimSmithingTemplate,
TintedGlass, TintedGlass,
TippedArrow, TippedArrow,
Tnt, Tnt,
TntMinecart, TntMinecart,
Torch, Torch,
Torchflower,
TorchflowerSeeds,
TotemOfUndying, TotemOfUndying,
TraderLlamaSpawnEgg, TraderLlamaSpawnEgg,
TrappedChest, TrappedChest,
@ -1105,11 +1144,13 @@
TurtleSpawnEgg, TurtleSpawnEgg,
TwistingVines, TwistingVines,
VerdantFroglight, VerdantFroglight,
VexArmorTrimSmithingTemplate,
VexSpawnEgg, VexSpawnEgg,
VillagerSpawnEgg, VillagerSpawnEgg,
VindicatorSpawnEgg, VindicatorSpawnEgg,
Vine, Vine,
WanderingTraderSpawnEgg, WanderingTraderSpawnEgg,
WardArmorTrimSmithingTemplate,
WardenSpawnEgg, WardenSpawnEgg,
WarpedButton, WarpedButton,
WarpedDoor, WarpedDoor,
@ -1168,6 +1209,7 @@
WhiteTerracotta, WhiteTerracotta,
WhiteTulip, WhiteTulip,
WhiteWool, WhiteWool,
WildArmorTrimSmithingTemplate,
WitchSpawnEgg, WitchSpawnEgg,
WitherRose, WitherRose,
WitherSkeletonSkull, WitherSkeletonSkull,

File diff suppressed because it is too large Load diff

View file

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

View file

@ -22,6 +22,7 @@
Bat, Bat,
Bee, Bee,
Blaze, Blaze,
BlockDisplay,
Boat, Boat,
Camel, Camel,
Cat, Cat,
@ -67,8 +68,10 @@
Horse, Horse,
Husk, Husk,
Illusioner, Illusioner,
Interaction,
IronGolem, IronGolem,
Item, Item,
ItemDisplay,
ItemFrame, ItemFrame,
LeashKnot, LeashKnot,
LightningBolt, LightningBolt,
@ -103,6 +106,7 @@
SkeletonHorse, SkeletonHorse,
Slime, Slime,
SmallFireball, SmallFireball,
Sniffer,
SnowGolem, SnowGolem,
Snowball, Snowball,
SpawnerMinecart, SpawnerMinecart,
@ -112,6 +116,7 @@
Stray, Stray,
Strider, Strider,
Tadpole, Tadpole,
TextDisplay,
Tnt, Tnt,
TntMinecart, TntMinecart,
TraderLlama, TraderLlama,

View file

@ -177,6 +177,23 @@
CaveVinesPlant, CaveVinesPlant,
Chain, Chain,
ChainCommandBlock, ChainCommandBlock,
CherryButton,
CherryDoor,
CherryFence,
CherryFenceGate,
CherryHangingSign,
CherryLeaves,
CherryLog,
CherryPlanks,
CherryPressurePlate,
CherrySapling,
CherrySign,
CherrySlab,
CherryStairs,
CherryTrapdoor,
CherryWallHangingSign,
CherryWallSign,
CherryWood,
Chest, Chest,
ChippedAnvil, ChippedAnvil,
ChiseledBookshelf, ChiseledBookshelf,
@ -302,6 +319,7 @@
DeadTubeCoralBlock, DeadTubeCoralBlock,
DeadTubeCoralFan, DeadTubeCoralFan,
DeadTubeCoralWallFan, DeadTubeCoralWallFan,
DecoratedPot,
Deepslate, Deepslate,
DeepslateBrickSlab, DeepslateBrickSlab,
DeepslateBrickStairs, DeepslateBrickStairs,
@ -638,6 +656,7 @@
PinkConcrete, PinkConcrete,
PinkConcretePowder, PinkConcretePowder,
PinkGlazedTerracotta, PinkGlazedTerracotta,
PinkPetals,
PinkShulkerBox, PinkShulkerBox,
PinkStainedGlass, PinkStainedGlass,
PinkStainedGlassPane, PinkStainedGlassPane,
@ -686,6 +705,7 @@
PottedBlueOrchid, PottedBlueOrchid,
PottedBrownMushroom, PottedBrownMushroom,
PottedCactus, PottedCactus,
PottedCherrySapling,
PottedCornflower, PottedCornflower,
PottedCrimsonFungus, PottedCrimsonFungus,
PottedCrimsonRoots, PottedCrimsonRoots,
@ -705,6 +725,7 @@
PottedRedMushroom, PottedRedMushroom,
PottedRedTulip, PottedRedTulip,
PottedSpruceSapling, PottedSpruceSapling,
PottedTorchflower,
PottedWarpedFungus, PottedWarpedFungus,
PottedWarpedRoots, PottedWarpedRoots,
PottedWhiteTulip, PottedWhiteTulip,
@ -866,6 +887,8 @@
StrippedBambooBlock, StrippedBambooBlock,
StrippedBirchLog, StrippedBirchLog,
StrippedBirchWood, StrippedBirchWood,
StrippedCherryLog,
StrippedCherryWood,
StrippedCrimsonHyphae, StrippedCrimsonHyphae,
StrippedCrimsonStem, StrippedCrimsonStem,
StrippedDarkOakLog, StrippedDarkOakLog,
@ -884,6 +907,7 @@
StructureVoid, StructureVoid,
SugarCane, SugarCane,
Sunflower, Sunflower,
SuspiciousSand,
SweetBerryBush, SweetBerryBush,
TallGrass, TallGrass,
TallSeagrass, TallSeagrass,
@ -892,6 +916,8 @@
TintedGlass, TintedGlass,
Tnt, Tnt,
Torch, Torch,
Torchflower,
TorchflowerCrop,
TrappedChest, TrappedChest,
Tripwire, Tripwire,
TripwireHook, TripwireHook,

View file

@ -110,13 +110,13 @@ namespace MinecraftClient.Protocol.Handlers
randomGen = RandomNumberGenerator.Create(); randomGen = RandomNumberGenerator.Create();
lastSeenMessagesCollector = protocolVersion >= MC_1_19_3_Version ? new(20) : new(5); lastSeenMessagesCollector = protocolVersion >= MC_1_19_3_Version ? new(20) : new(5);
if (handler.GetTerrainEnabled() && protocolVersion > MC_1_19_3_Version) if (handler.GetTerrainEnabled() && protocolVersion > MC_1_19_4_Version)
{ {
log.Error("§c" + Translations.extra_terrainandmovement_disabled); log.Error("§c" + Translations.extra_terrainandmovement_disabled);
handler.SetTerrainEnabled(false); handler.SetTerrainEnabled(false);
} }
if (handler.GetInventoryEnabled() && (protocolVersion < MC_1_10_Version || protocolVersion > MC_1_19_3_Version)) if (handler.GetInventoryEnabled() && (protocolVersion < MC_1_10_Version || protocolVersion > MC_1_19_4_Version))
{ {
log.Error("§c" + Translations.extra_inventory_disabled); log.Error("§c" + Translations.extra_inventory_disabled);
handler.SetInventoryEnabled(false); handler.SetInventoryEnabled(false);
@ -128,10 +128,12 @@ namespace MinecraftClient.Protocol.Handlers
} }
// Block palette // Block palette
if (protocolVersion > MC_1_19_3_Version && handler.GetTerrainEnabled()) if (protocolVersion > MC_1_19_4_Version && handler.GetTerrainEnabled())
throw new NotImplementedException(Translations.exception_palette_block); throw new NotImplementedException(Translations.exception_palette_block);
if (protocolVersion >= MC_1_19_3_Version) if (protocolVersion >= MC_1_19_4_Version)
Block.Palette = new Palette1194();
else if (protocolVersion >= MC_1_19_3_Version)
Block.Palette = new Palette1193(); Block.Palette = new Palette1193();
else if (protocolVersion >= MC_1_19_Version) else if (protocolVersion >= MC_1_19_Version)
Block.Palette = new Palette119(); Block.Palette = new Palette119();
@ -149,10 +151,12 @@ namespace MinecraftClient.Protocol.Handlers
Block.Palette = new Palette112(); Block.Palette = new Palette112();
// Entity palette // Entity palette
if (protocolVersion > MC_1_19_3_Version && handler.GetEntityHandlingEnabled()) if (protocolVersion > MC_1_19_4_Version && handler.GetEntityHandlingEnabled())
throw new NotImplementedException(Translations.exception_palette_entity); throw new NotImplementedException(Translations.exception_palette_entity);
if (protocolVersion >= MC_1_19_3_Version) if (protocolVersion >= MC_1_19_4_Version)
entityPalette = new EntityPalette1194();
else if (protocolVersion >= MC_1_19_3_Version)
entityPalette = new EntityPalette1193(); entityPalette = new EntityPalette1193();
else if (protocolVersion >= MC_1_19_Version) else if (protocolVersion >= MC_1_19_Version)
entityPalette = new EntityPalette119(); entityPalette = new EntityPalette119();
@ -172,10 +176,12 @@ namespace MinecraftClient.Protocol.Handlers
entityPalette = new EntityPalette112(); entityPalette = new EntityPalette112();
// Item palette // Item palette
if (protocolVersion > MC_1_19_3_Version && handler.GetInventoryEnabled()) if (protocolVersion > MC_1_19_4_Version && handler.GetInventoryEnabled())
throw new NotImplementedException(Translations.exception_palette_item); throw new NotImplementedException(Translations.exception_palette_item);
if (protocolVersion >= MC_1_19_3_Version) if (protocolVersion >= MC_1_19_4_Version)
itemPalette = new ItemPalette1194();
else if (protocolVersion >= MC_1_19_3_Version)
itemPalette = new ItemPalette1193(); itemPalette = new ItemPalette1193();
else if (protocolVersion >= MC_1_19_Version) else if (protocolVersion >= MC_1_19_Version)
itemPalette = new ItemPalette119(); itemPalette = new ItemPalette119();