diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index d393f9f8..831fd620 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -23,6 +23,7 @@ jobs: echo win-out-path=${{ env.project-path }}/bin/Release/${{ env.target-version }}/win-x64/publish/ >> $GITHUB_ENV echo linux-out-path=${{ env.project-path }}/bin/Release/${{ env.target-version }}/linux-x64/publish/ >> $GITHUB_ENV echo osx-out-path=${{ env.project-path }}/bin/Release/${{ env.target-version }}/osx-x64/publish/ >> $GITHUB_ENV + echo linux-arm64-out-path=${{ env.project-path }}/bin/Release/${{ env.target-version }}/linux-arm64/publish/ >> $GITHUB_ENV - name: Setup .NET SDK uses: actions/setup-dotnet@v2.1.0 @@ -60,6 +61,13 @@ jobs: run: zip -qq -r linux.zip * working-directory: ${{ env.linux-out-path }} + - name: Build for ARM64 Linux + run: dotnet publish ${{ env.project-path }}.sln -f ${{ env.target-version }} -r linux-arm64 ${{ env.compile-flags }} + + - name: Zip ARM64 Linux Build + run: zip -qq -r linux-arm64.zip * + working-directory: ${{ env.linux-arm64-out-path }} + - name: Build for OSX run: dotnet publish ${{ env.project-path }}.sln -f ${{ env.target-version }} -r osx-x64 ${{ env.compile-flags }} @@ -92,6 +100,15 @@ jobs: assetName: ${{ env.PROJECT }}-linux.zip tag: ${{ format('{0}-{1}', steps.date-release.outputs.time, github.run_number) }} + - name: Linux ARM64 Release + uses: tix-factory/release-manager@v1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + mode: uploadReleaseAsset + filePath: ${{ env.linux-arm64-out-path }}linux-arm64.zip + assetName: ${{ env.PROJECT }}-linux-arm64.zip + tag: ${{ format('{0}-{1}', steps.date-release.outputs.time, github.run_number) }} + - name: OSX Release uses: tix-factory/release-manager@v1 with: diff --git a/MinecraftClient/Inventory/ItemPalettes/ItemPalette115.cs b/MinecraftClient/Inventory/ItemPalettes/ItemPalette115.cs index 99331b85..d69e143f 100644 --- a/MinecraftClient/Inventory/ItemPalettes/ItemPalette115.cs +++ b/MinecraftClient/Inventory/ItemPalettes/ItemPalette115.cs @@ -335,7 +335,7 @@ namespace MinecraftClient.Inventory.ItemPalettes mappings[319] = ItemType.AcaciaStairs; mappings[320] = ItemType.DarkOakStairs; mappings[321] = ItemType.SlimeBlock; - mappings[322] = ItemType.GrassPath; + mappings[322] = ItemType.DirtPath; mappings[323] = ItemType.Sunflower; mappings[324] = ItemType.Lilac; mappings[325] = ItemType.RoseBush; diff --git a/MinecraftClient/Inventory/ItemPalettes/ItemPalette1161.cs b/MinecraftClient/Inventory/ItemPalettes/ItemPalette1161.cs index c077afb2..0b0504c2 100644 --- a/MinecraftClient/Inventory/ItemPalettes/ItemPalette1161.cs +++ b/MinecraftClient/Inventory/ItemPalettes/ItemPalette1161.cs @@ -385,7 +385,7 @@ namespace MinecraftClient.Inventory.ItemPalettes mappings[369] = ItemType.AcaciaStairs; mappings[370] = ItemType.DarkOakStairs; mappings[371] = ItemType.SlimeBlock; - mappings[372] = ItemType.GrassPath; + mappings[372] = ItemType.DirtPath; mappings[373] = ItemType.Sunflower; mappings[374] = ItemType.Lilac; mappings[375] = ItemType.RoseBush; diff --git a/MinecraftClient/Inventory/ItemPalettes/ItemPalette1162.cs b/MinecraftClient/Inventory/ItemPalettes/ItemPalette1162.cs index f9e75cdc..aa674f45 100644 --- a/MinecraftClient/Inventory/ItemPalettes/ItemPalette1162.cs +++ b/MinecraftClient/Inventory/ItemPalettes/ItemPalette1162.cs @@ -385,7 +385,7 @@ namespace MinecraftClient.Inventory.ItemPalettes mappings[369] = ItemType.AcaciaStairs; mappings[370] = ItemType.DarkOakStairs; mappings[371] = ItemType.SlimeBlock; - mappings[372] = ItemType.GrassPath; + mappings[372] = ItemType.DirtPath; mappings[373] = ItemType.Sunflower; mappings[374] = ItemType.Lilac; mappings[375] = ItemType.RoseBush; diff --git a/MinecraftClient/Inventory/ItemPalettes/ItemPalette117.cs b/MinecraftClient/Inventory/ItemPalettes/ItemPalette117.cs index e11312dd..35d903ab 100644 --- a/MinecraftClient/Inventory/ItemPalettes/ItemPalette117.cs +++ b/MinecraftClient/Inventory/ItemPalettes/ItemPalette117.cs @@ -402,7 +402,7 @@ namespace MinecraftClient.Inventory.ItemPalettes mappings[390] = ItemType.PackedIce; mappings[391] = ItemType.AcaciaStairs; mappings[392] = ItemType.DarkOakStairs; - mappings[393] = ItemType.GrassPath; + mappings[393] = ItemType.DirtPath; mappings[394] = ItemType.Sunflower; mappings[395] = ItemType.Lilac; mappings[396] = ItemType.RoseBush; diff --git a/MinecraftClient/Inventory/ItemPalettes/ItemPalette118.cs b/MinecraftClient/Inventory/ItemPalettes/ItemPalette118.cs index 0e4577eb..d8e1d61d 100644 --- a/MinecraftClient/Inventory/ItemPalettes/ItemPalette118.cs +++ b/MinecraftClient/Inventory/ItemPalettes/ItemPalette118.cs @@ -402,7 +402,7 @@ namespace MinecraftClient.Inventory.ItemPalettes mappings[390] = ItemType.PackedIce; mappings[391] = ItemType.AcaciaStairs; mappings[392] = ItemType.DarkOakStairs; - mappings[393] = ItemType.GrassPath; + mappings[393] = ItemType.DirtPath; mappings[394] = ItemType.Sunflower; mappings[395] = ItemType.Lilac; mappings[396] = ItemType.RoseBush; diff --git a/MinecraftClient/Inventory/ItemPalettes/ItemPalette119.cs b/MinecraftClient/Inventory/ItemPalettes/ItemPalette119.cs new file mode 100644 index 00000000..c0540f4a --- /dev/null +++ b/MinecraftClient/Inventory/ItemPalettes/ItemPalette119.cs @@ -0,0 +1,1171 @@ +using System; +using System.Collections.Generic; + +namespace MinecraftClient.Inventory.ItemPalettes +{ + public class ItemPalette119 : ItemPalette + { + private static Dictionary mappings = new Dictionary(); + + static ItemPalette119() + { + mappings[706] = ItemType.AcaciaBoat; + mappings[638] = ItemType.AcaciaButton; + mappings[707] = ItemType.AcaciaChestBoat; + mappings[661] = ItemType.AcaciaDoor; + mappings[272] = ItemType.AcaciaFence; + mappings[680] = ItemType.AcaciaFenceGate; + mappings[146] = ItemType.AcaciaLeaves; + mappings[108] = ItemType.AcaciaLog; + mappings[27] = ItemType.AcaciaPlanks; + mappings[651] = ItemType.AcaciaPressurePlate; + mappings[36] = ItemType.AcaciaSapling; + mappings[808] = ItemType.AcaciaSign; + mappings[218] = ItemType.AcaciaSlab; + mappings[342] = ItemType.AcaciaStairs; + mappings[671] = ItemType.AcaciaTrapdoor; + mappings[137] = ItemType.AcaciaWood; + mappings[688] = ItemType.ActivatorRail; + mappings[0] = ItemType.Air; + mappings[912] = ItemType.AllaySpawnEgg; + mappings[186] = ItemType.Allium; + mappings[66] = ItemType.AmethystBlock; + mappings[1145] = ItemType.AmethystCluster; + mappings[726] = ItemType.AmethystShard; + mappings[61] = ItemType.AncientDebris; + mappings[6] = ItemType.Andesite; + mappings[599] = ItemType.AndesiteSlab; + mappings[582] = ItemType.AndesiteStairs; + mappings[359] = ItemType.AndesiteWall; + mappings[371] = ItemType.Anvil; + mappings[717] = ItemType.Apple; + mappings[1015] = ItemType.ArmorStand; + mappings[719] = ItemType.Arrow; + mappings[824] = ItemType.AxolotlBucket; + mappings[913] = ItemType.AxolotlSpawnEgg; + mappings[162] = ItemType.Azalea; + mappings[149] = ItemType.AzaleaLeaves; + mappings[187] = ItemType.AzureBluet; + mappings[992] = ItemType.BakedPotato; + mappings[213] = ItemType.Bamboo; + mappings[1089] = ItemType.Barrel; + mappings[395] = ItemType.Barrier; + mappings[283] = ItemType.Basalt; + mappings[914] = ItemType.BatSpawnEgg; + mappings[348] = ItemType.Beacon; + mappings[39] = ItemType.Bedrock; + mappings[1106] = ItemType.BeeNest; + mappings[915] = ItemType.BeeSpawnEgg; + mappings[892] = ItemType.Beef; + mappings[1107] = ItemType.Beehive; + mappings[1044] = ItemType.Beetroot; + mappings[1045] = ItemType.BeetrootSeeds; + mappings[1046] = ItemType.BeetrootSoup; + mappings[1097] = ItemType.Bell; + mappings[211] = ItemType.BigDripleaf; + mappings[702] = ItemType.BirchBoat; + mappings[636] = ItemType.BirchButton; + mappings[703] = ItemType.BirchChestBoat; + mappings[659] = ItemType.BirchDoor; + mappings[270] = ItemType.BirchFence; + mappings[678] = ItemType.BirchFenceGate; + mappings[144] = ItemType.BirchLeaves; + mappings[106] = ItemType.BirchLog; + mappings[25] = ItemType.BirchPlanks; + mappings[649] = ItemType.BirchPressurePlate; + mappings[34] = ItemType.BirchSapling; + mappings[806] = ItemType.BirchSign; + mappings[216] = ItemType.BirchSlab; + mappings[340] = ItemType.BirchStairs; + mappings[669] = ItemType.BirchTrapdoor; + mappings[135] = ItemType.BirchWood; + mappings[1040] = ItemType.BlackBanner; + mappings[884] = ItemType.BlackBed; + mappings[1141] = ItemType.BlackCandle; + mappings[413] = ItemType.BlackCarpet; + mappings[522] = ItemType.BlackConcrete; + mappings[538] = ItemType.BlackConcretePowder; + mappings[864] = ItemType.BlackDye; + mappings[506] = ItemType.BlackGlazedTerracotta; + mappings[490] = ItemType.BlackShulkerBox; + mappings[438] = ItemType.BlackStainedGlass; + mappings[454] = ItemType.BlackStainedGlassPane; + mappings[394] = ItemType.BlackTerracotta; + mappings[182] = ItemType.BlackWool; + mappings[1112] = ItemType.Blackstone; + mappings[1113] = ItemType.BlackstoneSlab; + mappings[1114] = ItemType.BlackstoneStairs; + mappings[364] = ItemType.BlackstoneWall; + mappings[1091] = ItemType.BlastFurnace; + mappings[906] = ItemType.BlazePowder; + mappings[898] = ItemType.BlazeRod; + mappings[916] = ItemType.BlazeSpawnEgg; + mappings[1036] = ItemType.BlueBanner; + mappings[880] = ItemType.BlueBed; + mappings[1137] = ItemType.BlueCandle; + mappings[409] = ItemType.BlueCarpet; + mappings[518] = ItemType.BlueConcrete; + mappings[534] = ItemType.BlueConcretePowder; + mappings[860] = ItemType.BlueDye; + mappings[502] = ItemType.BlueGlazedTerracotta; + mappings[570] = ItemType.BlueIce; + mappings[185] = ItemType.BlueOrchid; + mappings[486] = ItemType.BlueShulkerBox; + mappings[434] = ItemType.BlueStainedGlass; + mappings[450] = ItemType.BlueStainedGlassPane; + mappings[390] = ItemType.BlueTerracotta; + mappings[178] = ItemType.BlueWool; + mappings[866] = ItemType.Bone; + mappings[472] = ItemType.BoneBlock; + mappings[865] = ItemType.BoneMeal; + mappings[830] = ItemType.Book; + mappings[245] = ItemType.Bookshelf; + mappings[718] = ItemType.Bow; + mappings[766] = ItemType.Bowl; + mappings[551] = ItemType.BrainCoral; + mappings[546] = ItemType.BrainCoralBlock; + mappings[561] = ItemType.BrainCoralFan; + mappings[773] = ItemType.Bread; + mappings[908] = ItemType.BrewingStand; + mappings[826] = ItemType.Brick; + mappings[229] = ItemType.BrickSlab; + mappings[316] = ItemType.BrickStairs; + mappings[351] = ItemType.BrickWall; + mappings[244] = ItemType.Bricks; + mappings[1037] = ItemType.BrownBanner; + mappings[881] = ItemType.BrownBed; + mappings[1138] = ItemType.BrownCandle; + mappings[410] = ItemType.BrownCarpet; + mappings[519] = ItemType.BrownConcrete; + mappings[535] = ItemType.BrownConcretePowder; + mappings[861] = ItemType.BrownDye; + mappings[503] = ItemType.BrownGlazedTerracotta; + mappings[197] = ItemType.BrownMushroom; + mappings[307] = ItemType.BrownMushroomBlock; + mappings[487] = ItemType.BrownShulkerBox; + mappings[435] = ItemType.BrownStainedGlass; + mappings[451] = ItemType.BrownStainedGlassPane; + mappings[391] = ItemType.BrownTerracotta; + mappings[179] = ItemType.BrownWool; + mappings[552] = ItemType.BubbleCoral; + mappings[547] = ItemType.BubbleCoralBlock; + mappings[562] = ItemType.BubbleCoralFan; + mappings[813] = ItemType.Bucket; + mappings[67] = ItemType.BuddingAmethyst; + mappings[835] = ItemType.Bundle; + mappings[265] = ItemType.Cactus; + mappings[868] = ItemType.Cake; + mappings[11] = ItemType.Calcite; + mappings[1102] = ItemType.Campfire; + mappings[1125] = ItemType.Candle; + mappings[990] = ItemType.Carrot; + mappings[695] = ItemType.CarrotOnAStick; + mappings[1092] = ItemType.CartographyTable; + mappings[278] = ItemType.CarvedPumpkin; + mappings[917] = ItemType.CatSpawnEgg; + mappings[909] = ItemType.Cauldron; + mappings[918] = ItemType.CaveSpiderSpawnEgg; + mappings[311] = ItemType.Chain; + mappings[467] = ItemType.ChainCommandBlock; + mappings[781] = ItemType.ChainmailBoots; + mappings[779] = ItemType.ChainmailChestplate; + mappings[778] = ItemType.ChainmailHelmet; + mappings[780] = ItemType.ChainmailLeggings; + mappings[721] = ItemType.Charcoal; + mappings[256] = ItemType.Chest; + mappings[691] = ItemType.ChestMinecart; + mappings[894] = ItemType.Chicken; + mappings[919] = ItemType.ChickenSpawnEgg; + mappings[372] = ItemType.ChippedAnvil; + mappings[305] = ItemType.ChiseledDeepslate; + mappings[323] = ItemType.ChiseledNetherBricks; + mappings[1119] = ItemType.ChiseledPolishedBlackstone; + mappings[374] = ItemType.ChiseledQuartzBlock; + mappings[463] = ItemType.ChiseledRedSandstone; + mappings[157] = ItemType.ChiseledSandstone; + mappings[298] = ItemType.ChiseledStoneBricks; + mappings[251] = ItemType.ChorusFlower; + mappings[1042] = ItemType.ChorusFruit; + mappings[250] = ItemType.ChorusPlant; + mappings[266] = ItemType.Clay; + mappings[827] = ItemType.ClayBall; + mappings[837] = ItemType.Clock; + mappings[720] = ItemType.Coal; + mappings[62] = ItemType.CoalBlock; + mappings[43] = ItemType.CoalOre; + mappings[16] = ItemType.CoarseDirt; + mappings[9] = ItemType.CobbledDeepslate; + mappings[603] = ItemType.CobbledDeepslateSlab; + mappings[586] = ItemType.CobbledDeepslateStairs; + mappings[367] = ItemType.CobbledDeepslateWall; + mappings[22] = ItemType.Cobblestone; + mappings[228] = ItemType.CobblestoneSlab; + mappings[261] = ItemType.CobblestoneStairs; + mappings[349] = ItemType.CobblestoneWall; + mappings[159] = ItemType.Cobweb; + mappings[848] = ItemType.CocoaBeans; + mappings[840] = ItemType.Cod; + mappings[822] = ItemType.CodBucket; + mappings[920] = ItemType.CodSpawnEgg; + mappings[347] = ItemType.CommandBlock; + mappings[1022] = ItemType.CommandBlockMinecart; + mappings[612] = ItemType.Comparator; + mappings[833] = ItemType.Compass; + mappings[1088] = ItemType.Composter; + mappings[571] = ItemType.Conduit; + mappings[893] = ItemType.CookedBeef; + mappings[895] = ItemType.CookedChicken; + mappings[844] = ItemType.CookedCod; + mappings[1024] = ItemType.CookedMutton; + mappings[800] = ItemType.CookedPorkchop; + mappings[1011] = ItemType.CookedRabbit; + mappings[845] = ItemType.CookedSalmon; + mappings[885] = ItemType.Cookie; + mappings[69] = ItemType.CopperBlock; + mappings[730] = ItemType.CopperIngot; + mappings[47] = ItemType.CopperOre; + mappings[193] = ItemType.Cornflower; + mappings[921] = ItemType.CowSpawnEgg; + mappings[302] = ItemType.CrackedDeepslateBricks; + mappings[304] = ItemType.CrackedDeepslateTiles; + mappings[322] = ItemType.CrackedNetherBricks; + mappings[1123] = ItemType.CrackedPolishedBlackstoneBricks; + mappings[297] = ItemType.CrackedStoneBricks; + mappings[257] = ItemType.CraftingTable; + mappings[1082] = ItemType.CreeperBannerPattern; + mappings[1000] = ItemType.CreeperHead; + mappings[922] = ItemType.CreeperSpawnEgg; + mappings[641] = ItemType.CrimsonButton; + mappings[664] = ItemType.CrimsonDoor; + mappings[275] = ItemType.CrimsonFence; + mappings[683] = ItemType.CrimsonFenceGate; + mappings[199] = ItemType.CrimsonFungus; + mappings[140] = ItemType.CrimsonHyphae; + mappings[20] = ItemType.CrimsonNylium; + mappings[30] = ItemType.CrimsonPlanks; + mappings[654] = ItemType.CrimsonPressurePlate; + mappings[201] = ItemType.CrimsonRoots; + mappings[811] = ItemType.CrimsonSign; + mappings[221] = ItemType.CrimsonSlab; + mappings[345] = ItemType.CrimsonStairs; + mappings[113] = ItemType.CrimsonStem; + mappings[674] = ItemType.CrimsonTrapdoor; + mappings[1078] = ItemType.Crossbow; + mappings[1111] = ItemType.CryingObsidian; + mappings[76] = ItemType.CutCopper; + mappings[84] = ItemType.CutCopperSlab; + mappings[80] = ItemType.CutCopperStairs; + mappings[464] = ItemType.CutRedSandstone; + mappings[235] = ItemType.CutRedSandstoneSlab; + mappings[158] = ItemType.CutSandstone; + mappings[226] = ItemType.CutSandstoneSlab; + mappings[1034] = ItemType.CyanBanner; + mappings[878] = ItemType.CyanBed; + mappings[1135] = ItemType.CyanCandle; + mappings[407] = ItemType.CyanCarpet; + mappings[516] = ItemType.CyanConcrete; + mappings[532] = ItemType.CyanConcretePowder; + mappings[858] = ItemType.CyanDye; + mappings[500] = ItemType.CyanGlazedTerracotta; + mappings[484] = ItemType.CyanShulkerBox; + mappings[432] = ItemType.CyanStainedGlass; + mappings[448] = ItemType.CyanStainedGlassPane; + mappings[388] = ItemType.CyanTerracotta; + mappings[176] = ItemType.CyanWool; + mappings[373] = ItemType.DamagedAnvil; + mappings[183] = ItemType.Dandelion; + mappings[708] = ItemType.DarkOakBoat; + mappings[639] = ItemType.DarkOakButton; + mappings[709] = ItemType.DarkOakChestBoat; + mappings[662] = ItemType.DarkOakDoor; + mappings[273] = ItemType.DarkOakFence; + mappings[681] = ItemType.DarkOakFenceGate; + mappings[147] = ItemType.DarkOakLeaves; + mappings[109] = ItemType.DarkOakLog; + mappings[28] = ItemType.DarkOakPlanks; + mappings[652] = ItemType.DarkOakPressurePlate; + mappings[37] = ItemType.DarkOakSapling; + mappings[809] = ItemType.DarkOakSign; + mappings[219] = ItemType.DarkOakSlab; + mappings[343] = ItemType.DarkOakStairs; + mappings[672] = ItemType.DarkOakTrapdoor; + mappings[138] = ItemType.DarkOakWood; + mappings[457] = ItemType.DarkPrismarine; + mappings[239] = ItemType.DarkPrismarineSlab; + mappings[460] = ItemType.DarkPrismarineStairs; + mappings[625] = ItemType.DaylightDetector; + mappings[555] = ItemType.DeadBrainCoral; + mappings[541] = ItemType.DeadBrainCoralBlock; + mappings[566] = ItemType.DeadBrainCoralFan; + mappings[556] = ItemType.DeadBubbleCoral; + mappings[542] = ItemType.DeadBubbleCoralBlock; + mappings[567] = ItemType.DeadBubbleCoralFan; + mappings[164] = ItemType.DeadBush; + mappings[557] = ItemType.DeadFireCoral; + mappings[543] = ItemType.DeadFireCoralBlock; + mappings[568] = ItemType.DeadFireCoralFan; + mappings[558] = ItemType.DeadHornCoral; + mappings[544] = ItemType.DeadHornCoralBlock; + mappings[569] = ItemType.DeadHornCoralFan; + mappings[559] = ItemType.DeadTubeCoral; + mappings[540] = ItemType.DeadTubeCoralBlock; + mappings[565] = ItemType.DeadTubeCoralFan; + mappings[1057] = ItemType.DebugStick; + mappings[8] = ItemType.Deepslate; + mappings[605] = ItemType.DeepslateBrickSlab; + mappings[588] = ItemType.DeepslateBrickStairs; + mappings[369] = ItemType.DeepslateBrickWall; + mappings[301] = ItemType.DeepslateBricks; + mappings[44] = ItemType.DeepslateCoalOre; + mappings[48] = ItemType.DeepslateCopperOre; + mappings[58] = ItemType.DeepslateDiamondOre; + mappings[54] = ItemType.DeepslateEmeraldOre; + mappings[50] = ItemType.DeepslateGoldOre; + mappings[46] = ItemType.DeepslateIronOre; + mappings[56] = ItemType.DeepslateLapisOre; + mappings[52] = ItemType.DeepslateRedstoneOre; + mappings[606] = ItemType.DeepslateTileSlab; + mappings[589] = ItemType.DeepslateTileStairs; + mappings[370] = ItemType.DeepslateTileWall; + mappings[303] = ItemType.DeepslateTiles; + mappings[686] = ItemType.DetectorRail; + mappings[722] = ItemType.Diamond; + mappings[758] = ItemType.DiamondAxe; + mappings[71] = ItemType.DiamondBlock; + mappings[789] = ItemType.DiamondBoots; + mappings[787] = ItemType.DiamondChestplate; + mappings[786] = ItemType.DiamondHelmet; + mappings[759] = ItemType.DiamondHoe; + mappings[1018] = ItemType.DiamondHorseArmor; + mappings[788] = ItemType.DiamondLeggings; + mappings[57] = ItemType.DiamondOre; + mappings[757] = ItemType.DiamondPickaxe; + mappings[756] = ItemType.DiamondShovel; + mappings[755] = ItemType.DiamondSword; + mappings[4] = ItemType.Diorite; + mappings[602] = ItemType.DioriteSlab; + mappings[585] = ItemType.DioriteStairs; + mappings[363] = ItemType.DioriteWall; + mappings[15] = ItemType.Dirt; + mappings[416] = ItemType.DirtPath; + mappings[1073] = ItemType.DiscFragment5; + mappings[619] = ItemType.Dispenser; + mappings[923] = ItemType.DolphinSpawnEgg; + mappings[924] = ItemType.DonkeySpawnEgg; + mappings[1047] = ItemType.DragonBreath; + mappings[334] = ItemType.DragonEgg; + mappings[1001] = ItemType.DragonHead; + mappings[889] = ItemType.DriedKelp; + mappings[828] = ItemType.DriedKelpBlock; + mappings[13] = ItemType.DripstoneBlock; + mappings[620] = ItemType.Dropper; + mappings[925] = ItemType.DrownedSpawnEgg; + mappings[1151] = ItemType.EchoShard; + mappings[832] = ItemType.Egg; + mappings[926] = ItemType.ElderGuardianSpawnEgg; + mappings[697] = ItemType.Elytra; + mappings[723] = ItemType.Emerald; + mappings[337] = ItemType.EmeraldBlock; + mappings[53] = ItemType.EmeraldOre; + mappings[1006] = ItemType.EnchantedBook; + mappings[803] = ItemType.EnchantedGoldenApple; + mappings[330] = ItemType.EnchantingTable; + mappings[1041] = ItemType.EndCrystal; + mappings[331] = ItemType.EndPortalFrame; + mappings[249] = ItemType.EndRod; + mappings[332] = ItemType.EndStone; + mappings[595] = ItemType.EndStoneBrickSlab; + mappings[577] = ItemType.EndStoneBrickStairs; + mappings[362] = ItemType.EndStoneBrickWall; + mappings[333] = ItemType.EndStoneBricks; + mappings[336] = ItemType.EnderChest; + mappings[910] = ItemType.EnderEye; + mappings[897] = ItemType.EnderPearl; + mappings[927] = ItemType.EndermanSpawnEgg; + mappings[928] = ItemType.EndermiteSpawnEgg; + mappings[929] = ItemType.EvokerSpawnEgg; + mappings[983] = ItemType.ExperienceBottle; + mappings[73] = ItemType.ExposedCopper; + mappings[77] = ItemType.ExposedCutCopper; + mappings[85] = ItemType.ExposedCutCopperSlab; + mappings[81] = ItemType.ExposedCutCopperStairs; + mappings[258] = ItemType.Farmland; + mappings[769] = ItemType.Feather; + mappings[905] = ItemType.FermentedSpiderEye; + mappings[161] = ItemType.Fern; + mappings[886] = ItemType.FilledMap; + mappings[984] = ItemType.FireCharge; + mappings[553] = ItemType.FireCoral; + mappings[548] = ItemType.FireCoralBlock; + mappings[563] = ItemType.FireCoralFan; + mappings[1004] = ItemType.FireworkRocket; + mappings[1005] = ItemType.FireworkStar; + mappings[836] = ItemType.FishingRod; + mappings[1093] = ItemType.FletchingTable; + mappings[798] = ItemType.Flint; + mappings[716] = ItemType.FlintAndSteel; + mappings[1081] = ItemType.FlowerBannerPattern; + mappings[989] = ItemType.FlowerPot; + mappings[163] = ItemType.FloweringAzalea; + mappings[150] = ItemType.FloweringAzaleaLeaves; + mappings[930] = ItemType.FoxSpawnEgg; + mappings[931] = ItemType.FrogSpawnEgg; + mappings[1150] = ItemType.Frogspawn; + mappings[259] = ItemType.Furnace; + mappings[692] = ItemType.FurnaceMinecart; + mappings[932] = ItemType.GhastSpawnEgg; + mappings[899] = ItemType.GhastTear; + mappings[1115] = ItemType.GildedBlackstone; + mappings[153] = ItemType.Glass; + mappings[903] = ItemType.GlassBottle; + mappings[312] = ItemType.GlassPane; + mappings[911] = ItemType.GlisteringMelonSlice; + mappings[1085] = ItemType.GlobeBannerPattern; + mappings[1101] = ItemType.GlowBerries; + mappings[847] = ItemType.GlowInkSac; + mappings[988] = ItemType.GlowItemFrame; + mappings[315] = ItemType.GlowLichen; + mappings[933] = ItemType.GlowSquidSpawnEgg; + mappings[287] = ItemType.Glowstone; + mappings[839] = ItemType.GlowstoneDust; + mappings[1087] = ItemType.GoatHorn; + mappings[934] = ItemType.GoatSpawnEgg; + mappings[70] = ItemType.GoldBlock; + mappings[732] = ItemType.GoldIngot; + mappings[900] = ItemType.GoldNugget; + mappings[49] = ItemType.GoldOre; + mappings[802] = ItemType.GoldenApple; + mappings[748] = ItemType.GoldenAxe; + mappings[793] = ItemType.GoldenBoots; + mappings[995] = ItemType.GoldenCarrot; + mappings[791] = ItemType.GoldenChestplate; + mappings[790] = ItemType.GoldenHelmet; + mappings[749] = ItemType.GoldenHoe; + mappings[1017] = ItemType.GoldenHorseArmor; + mappings[792] = ItemType.GoldenLeggings; + mappings[747] = ItemType.GoldenPickaxe; + mappings[746] = ItemType.GoldenShovel; + mappings[745] = ItemType.GoldenSword; + mappings[2] = ItemType.Granite; + mappings[598] = ItemType.GraniteSlab; + mappings[581] = ItemType.GraniteStairs; + mappings[355] = ItemType.GraniteWall; + mappings[160] = ItemType.Grass; + mappings[14] = ItemType.GrassBlock; + mappings[42] = ItemType.Gravel; + mappings[1032] = ItemType.GrayBanner; + mappings[876] = ItemType.GrayBed; + mappings[1133] = ItemType.GrayCandle; + mappings[405] = ItemType.GrayCarpet; + mappings[514] = ItemType.GrayConcrete; + mappings[530] = ItemType.GrayConcretePowder; + mappings[856] = ItemType.GrayDye; + mappings[498] = ItemType.GrayGlazedTerracotta; + mappings[482] = ItemType.GrayShulkerBox; + mappings[430] = ItemType.GrayStainedGlass; + mappings[446] = ItemType.GrayStainedGlassPane; + mappings[386] = ItemType.GrayTerracotta; + mappings[174] = ItemType.GrayWool; + mappings[1038] = ItemType.GreenBanner; + mappings[882] = ItemType.GreenBed; + mappings[1139] = ItemType.GreenCandle; + mappings[411] = ItemType.GreenCarpet; + mappings[520] = ItemType.GreenConcrete; + mappings[536] = ItemType.GreenConcretePowder; + mappings[862] = ItemType.GreenDye; + mappings[504] = ItemType.GreenGlazedTerracotta; + mappings[488] = ItemType.GreenShulkerBox; + mappings[436] = ItemType.GreenStainedGlass; + mappings[452] = ItemType.GreenStainedGlassPane; + mappings[392] = ItemType.GreenTerracotta; + mappings[180] = ItemType.GreenWool; + mappings[1094] = ItemType.Grindstone; + mappings[935] = ItemType.GuardianSpawnEgg; + mappings[770] = ItemType.Gunpowder; + mappings[210] = ItemType.HangingRoots; + mappings[397] = ItemType.HayBlock; + mappings[1077] = ItemType.HeartOfTheSea; + mappings[646] = ItemType.HeavyWeightedPressurePlate; + mappings[936] = ItemType.HoglinSpawnEgg; + mappings[616] = ItemType.HoneyBlock; + mappings[1108] = ItemType.HoneyBottle; + mappings[1105] = ItemType.Honeycomb; + mappings[1109] = ItemType.HoneycombBlock; + mappings[618] = ItemType.Hopper; + mappings[694] = ItemType.HopperMinecart; + mappings[554] = ItemType.HornCoral; + mappings[549] = ItemType.HornCoralBlock; + mappings[564] = ItemType.HornCoralFan; + mappings[937] = ItemType.HorseSpawnEgg; + mappings[938] = ItemType.HuskSpawnEgg; + mappings[263] = ItemType.Ice; + mappings[293] = ItemType.InfestedChiseledStoneBricks; + mappings[289] = ItemType.InfestedCobblestone; + mappings[292] = ItemType.InfestedCrackedStoneBricks; + mappings[294] = ItemType.InfestedDeepslate; + mappings[291] = ItemType.InfestedMossyStoneBricks; + mappings[288] = ItemType.InfestedStone; + mappings[290] = ItemType.InfestedStoneBricks; + mappings[846] = ItemType.InkSac; + mappings[753] = ItemType.IronAxe; + mappings[310] = ItemType.IronBars; + mappings[68] = ItemType.IronBlock; + mappings[785] = ItemType.IronBoots; + mappings[783] = ItemType.IronChestplate; + mappings[656] = ItemType.IronDoor; + mappings[782] = ItemType.IronHelmet; + mappings[754] = ItemType.IronHoe; + mappings[1016] = ItemType.IronHorseArmor; + mappings[728] = ItemType.IronIngot; + mappings[784] = ItemType.IronLeggings; + mappings[1055] = ItemType.IronNugget; + mappings[45] = ItemType.IronOre; + mappings[752] = ItemType.IronPickaxe; + mappings[751] = ItemType.IronShovel; + mappings[750] = ItemType.IronSword; + mappings[666] = ItemType.IronTrapdoor; + mappings[987] = ItemType.ItemFrame; + mappings[279] = ItemType.JackOLantern; + mappings[713] = ItemType.Jigsaw; + mappings[267] = ItemType.Jukebox; + mappings[704] = ItemType.JungleBoat; + mappings[637] = ItemType.JungleButton; + mappings[705] = ItemType.JungleChestBoat; + mappings[660] = ItemType.JungleDoor; + mappings[271] = ItemType.JungleFence; + mappings[679] = ItemType.JungleFenceGate; + mappings[145] = ItemType.JungleLeaves; + mappings[107] = ItemType.JungleLog; + mappings[26] = ItemType.JunglePlanks; + mappings[650] = ItemType.JunglePressurePlate; + mappings[35] = ItemType.JungleSapling; + mappings[807] = ItemType.JungleSign; + mappings[217] = ItemType.JungleSlab; + mappings[341] = ItemType.JungleStairs; + mappings[670] = ItemType.JungleTrapdoor; + mappings[136] = ItemType.JungleWood; + mappings[207] = ItemType.Kelp; + mappings[1056] = ItemType.KnowledgeBook; + mappings[260] = ItemType.Ladder; + mappings[1098] = ItemType.Lantern; + mappings[155] = ItemType.LapisBlock; + mappings[724] = ItemType.LapisLazuli; + mappings[55] = ItemType.LapisOre; + mappings[1144] = ItemType.LargeAmethystBud; + mappings[422] = ItemType.LargeFern; + mappings[815] = ItemType.LavaBucket; + mappings[1020] = ItemType.Lead; + mappings[818] = ItemType.Leather; + mappings[777] = ItemType.LeatherBoots; + mappings[775] = ItemType.LeatherChestplate; + mappings[774] = ItemType.LeatherHelmet; + mappings[1019] = ItemType.LeatherHorseArmor; + mappings[776] = ItemType.LeatherLeggings; + mappings[621] = ItemType.Lectern; + mappings[623] = ItemType.Lever; + mappings[396] = ItemType.Light; + mappings[1028] = ItemType.LightBlueBanner; + mappings[872] = ItemType.LightBlueBed; + mappings[1129] = ItemType.LightBlueCandle; + mappings[401] = ItemType.LightBlueCarpet; + mappings[510] = ItemType.LightBlueConcrete; + mappings[526] = ItemType.LightBlueConcretePowder; + mappings[852] = ItemType.LightBlueDye; + mappings[494] = ItemType.LightBlueGlazedTerracotta; + mappings[478] = ItemType.LightBlueShulkerBox; + mappings[426] = ItemType.LightBlueStainedGlass; + mappings[442] = ItemType.LightBlueStainedGlassPane; + mappings[382] = ItemType.LightBlueTerracotta; + mappings[170] = ItemType.LightBlueWool; + mappings[1033] = ItemType.LightGrayBanner; + mappings[877] = ItemType.LightGrayBed; + mappings[1134] = ItemType.LightGrayCandle; + mappings[406] = ItemType.LightGrayCarpet; + mappings[515] = ItemType.LightGrayConcrete; + mappings[531] = ItemType.LightGrayConcretePowder; + mappings[857] = ItemType.LightGrayDye; + mappings[499] = ItemType.LightGrayGlazedTerracotta; + mappings[483] = ItemType.LightGrayShulkerBox; + mappings[431] = ItemType.LightGrayStainedGlass; + mappings[447] = ItemType.LightGrayStainedGlassPane; + mappings[387] = ItemType.LightGrayTerracotta; + mappings[175] = ItemType.LightGrayWool; + mappings[645] = ItemType.LightWeightedPressurePlate; + mappings[624] = ItemType.LightningRod; + mappings[418] = ItemType.Lilac; + mappings[194] = ItemType.LilyOfTheValley; + mappings[320] = ItemType.LilyPad; + mappings[1030] = ItemType.LimeBanner; + mappings[874] = ItemType.LimeBed; + mappings[1131] = ItemType.LimeCandle; + mappings[403] = ItemType.LimeCarpet; + mappings[512] = ItemType.LimeConcrete; + mappings[528] = ItemType.LimeConcretePowder; + mappings[854] = ItemType.LimeDye; + mappings[496] = ItemType.LimeGlazedTerracotta; + mappings[480] = ItemType.LimeShulkerBox; + mappings[428] = ItemType.LimeStainedGlass; + mappings[444] = ItemType.LimeStainedGlassPane; + mappings[384] = ItemType.LimeTerracotta; + mappings[172] = ItemType.LimeWool; + mappings[1051] = ItemType.LingeringPotion; + mappings[939] = ItemType.LlamaSpawnEgg; + mappings[1110] = ItemType.Lodestone; + mappings[1080] = ItemType.Loom; + mappings[1027] = ItemType.MagentaBanner; + mappings[871] = ItemType.MagentaBed; + mappings[1128] = ItemType.MagentaCandle; + mappings[400] = ItemType.MagentaCarpet; + mappings[509] = ItemType.MagentaConcrete; + mappings[525] = ItemType.MagentaConcretePowder; + mappings[851] = ItemType.MagentaDye; + mappings[493] = ItemType.MagentaGlazedTerracotta; + mappings[477] = ItemType.MagentaShulkerBox; + mappings[425] = ItemType.MagentaStainedGlass; + mappings[441] = ItemType.MagentaStainedGlassPane; + mappings[381] = ItemType.MagentaTerracotta; + mappings[169] = ItemType.MagentaWool; + mappings[468] = ItemType.MagmaBlock; + mappings[907] = ItemType.MagmaCream; + mappings[940] = ItemType.MagmaCubeSpawnEgg; + mappings[710] = ItemType.MangroveBoat; + mappings[640] = ItemType.MangroveButton; + mappings[711] = ItemType.MangroveChestBoat; + mappings[663] = ItemType.MangroveDoor; + mappings[274] = ItemType.MangroveFence; + mappings[682] = ItemType.MangroveFenceGate; + mappings[148] = ItemType.MangroveLeaves; + mappings[110] = ItemType.MangroveLog; + mappings[29] = ItemType.MangrovePlanks; + mappings[653] = ItemType.MangrovePressurePlate; + mappings[38] = ItemType.MangrovePropagule; + mappings[111] = ItemType.MangroveRoots; + mappings[810] = ItemType.MangroveSign; + mappings[220] = ItemType.MangroveSlab; + mappings[344] = ItemType.MangroveStairs; + mappings[673] = ItemType.MangroveTrapdoor; + mappings[139] = ItemType.MangroveWood; + mappings[994] = ItemType.Map; + mappings[1143] = ItemType.MediumAmethystBud; + mappings[313] = ItemType.Melon; + mappings[891] = ItemType.MelonSeeds; + mappings[888] = ItemType.MelonSlice; + mappings[819] = ItemType.MilkBucket; + mappings[690] = ItemType.Minecart; + mappings[1084] = ItemType.MojangBannerPattern; + mappings[941] = ItemType.MooshroomSpawnEgg; + mappings[209] = ItemType.MossBlock; + mappings[208] = ItemType.MossCarpet; + mappings[246] = ItemType.MossyCobblestone; + mappings[594] = ItemType.MossyCobblestoneSlab; + mappings[576] = ItemType.MossyCobblestoneStairs; + mappings[350] = ItemType.MossyCobblestoneWall; + mappings[592] = ItemType.MossyStoneBrickSlab; + mappings[574] = ItemType.MossyStoneBrickStairs; + mappings[354] = ItemType.MossyStoneBrickWall; + mappings[296] = ItemType.MossyStoneBricks; + mappings[19] = ItemType.Mud; + mappings[231] = ItemType.MudBrickSlab; + mappings[318] = ItemType.MudBrickStairs; + mappings[357] = ItemType.MudBrickWall; + mappings[300] = ItemType.MudBricks; + mappings[112] = ItemType.MuddyMangroveRoots; + mappings[942] = ItemType.MuleSpawnEgg; + mappings[309] = ItemType.MushroomStem; + mappings[767] = ItemType.MushroomStew; + mappings[1068] = ItemType.MusicDisc11; + mappings[1058] = ItemType.MusicDisc13; + mappings[1071] = ItemType.MusicDisc5; + mappings[1060] = ItemType.MusicDiscBlocks; + mappings[1059] = ItemType.MusicDiscCat; + mappings[1061] = ItemType.MusicDiscChirp; + mappings[1062] = ItemType.MusicDiscFar; + mappings[1063] = ItemType.MusicDiscMall; + mappings[1064] = ItemType.MusicDiscMellohi; + mappings[1070] = ItemType.MusicDiscOtherside; + mappings[1072] = ItemType.MusicDiscPigstep; + mappings[1065] = ItemType.MusicDiscStal; + mappings[1066] = ItemType.MusicDiscStrad; + mappings[1069] = ItemType.MusicDiscWait; + mappings[1067] = ItemType.MusicDiscWard; + mappings[1023] = ItemType.Mutton; + mappings[319] = ItemType.Mycelium; + mappings[1021] = ItemType.NameTag; + mappings[1076] = ItemType.NautilusShell; + mappings[1007] = ItemType.NetherBrick; + mappings[324] = ItemType.NetherBrickFence; + mappings[232] = ItemType.NetherBrickSlab; + mappings[325] = ItemType.NetherBrickStairs; + mappings[358] = ItemType.NetherBrickWall; + mappings[321] = ItemType.NetherBricks; + mappings[59] = ItemType.NetherGoldOre; + mappings[60] = ItemType.NetherQuartzOre; + mappings[203] = ItemType.NetherSprouts; + mappings[1002] = ItemType.NetherStar; + mappings[901] = ItemType.NetherWart; + mappings[469] = ItemType.NetherWartBlock; + mappings[763] = ItemType.NetheriteAxe; + mappings[72] = ItemType.NetheriteBlock; + mappings[797] = ItemType.NetheriteBoots; + mappings[795] = ItemType.NetheriteChestplate; + mappings[794] = ItemType.NetheriteHelmet; + mappings[764] = ItemType.NetheriteHoe; + mappings[733] = ItemType.NetheriteIngot; + mappings[796] = ItemType.NetheriteLeggings; + mappings[762] = ItemType.NetheritePickaxe; + mappings[734] = ItemType.NetheriteScrap; + mappings[761] = ItemType.NetheriteShovel; + mappings[760] = ItemType.NetheriteSword; + mappings[280] = ItemType.Netherrack; + mappings[631] = ItemType.NoteBlock; + mappings[698] = ItemType.OakBoat; + mappings[634] = ItemType.OakButton; + mappings[699] = ItemType.OakChestBoat; + mappings[657] = ItemType.OakDoor; + mappings[268] = ItemType.OakFence; + mappings[676] = ItemType.OakFenceGate; + mappings[142] = ItemType.OakLeaves; + mappings[104] = ItemType.OakLog; + mappings[23] = ItemType.OakPlanks; + mappings[647] = ItemType.OakPressurePlate; + mappings[32] = ItemType.OakSapling; + mappings[804] = ItemType.OakSign; + mappings[214] = ItemType.OakSlab; + mappings[338] = ItemType.OakStairs; + mappings[667] = ItemType.OakTrapdoor; + mappings[133] = ItemType.OakWood; + mappings[617] = ItemType.Observer; + mappings[247] = ItemType.Obsidian; + mappings[943] = ItemType.OcelotSpawnEgg; + mappings[1147] = ItemType.OchreFroglight; + mappings[1026] = ItemType.OrangeBanner; + mappings[870] = ItemType.OrangeBed; + mappings[1127] = ItemType.OrangeCandle; + mappings[399] = ItemType.OrangeCarpet; + mappings[508] = ItemType.OrangeConcrete; + mappings[524] = ItemType.OrangeConcretePowder; + mappings[850] = ItemType.OrangeDye; + mappings[492] = ItemType.OrangeGlazedTerracotta; + mappings[476] = ItemType.OrangeShulkerBox; + mappings[424] = ItemType.OrangeStainedGlass; + mappings[440] = ItemType.OrangeStainedGlassPane; + mappings[380] = ItemType.OrangeTerracotta; + mappings[189] = ItemType.OrangeTulip; + mappings[168] = ItemType.OrangeWool; + mappings[192] = ItemType.OxeyeDaisy; + mappings[75] = ItemType.OxidizedCopper; + mappings[79] = ItemType.OxidizedCutCopper; + mappings[87] = ItemType.OxidizedCutCopperSlab; + mappings[83] = ItemType.OxidizedCutCopperStairs; + mappings[415] = ItemType.PackedIce; + mappings[299] = ItemType.PackedMud; + mappings[801] = ItemType.Painting; + mappings[944] = ItemType.PandaSpawnEgg; + mappings[829] = ItemType.Paper; + mappings[945] = ItemType.ParrotSpawnEgg; + mappings[1149] = ItemType.PearlescentFroglight; + mappings[420] = ItemType.Peony; + mappings[227] = ItemType.PetrifiedOakSlab; + mappings[1075] = ItemType.PhantomMembrane; + mappings[946] = ItemType.PhantomSpawnEgg; + mappings[947] = ItemType.PigSpawnEgg; + mappings[1086] = ItemType.PiglinBannerPattern; + mappings[949] = ItemType.PiglinBruteSpawnEgg; + mappings[948] = ItemType.PiglinSpawnEgg; + mappings[950] = ItemType.PillagerSpawnEgg; + mappings[1031] = ItemType.PinkBanner; + mappings[875] = ItemType.PinkBed; + mappings[1132] = ItemType.PinkCandle; + mappings[404] = ItemType.PinkCarpet; + mappings[513] = ItemType.PinkConcrete; + mappings[529] = ItemType.PinkConcretePowder; + mappings[855] = ItemType.PinkDye; + mappings[497] = ItemType.PinkGlazedTerracotta; + mappings[481] = ItemType.PinkShulkerBox; + mappings[429] = ItemType.PinkStainedGlass; + mappings[445] = ItemType.PinkStainedGlassPane; + mappings[385] = ItemType.PinkTerracotta; + mappings[191] = ItemType.PinkTulip; + mappings[173] = ItemType.PinkWool; + mappings[613] = ItemType.Piston; + mappings[998] = ItemType.PlayerHead; + mappings[17] = ItemType.Podzol; + mappings[1146] = ItemType.PointedDripstone; + mappings[993] = ItemType.PoisonousPotato; + mappings[951] = ItemType.PolarBearSpawnEgg; + mappings[7] = ItemType.PolishedAndesite; + mappings[601] = ItemType.PolishedAndesiteSlab; + mappings[584] = ItemType.PolishedAndesiteStairs; + mappings[284] = ItemType.PolishedBasalt; + mappings[1116] = ItemType.PolishedBlackstone; + mappings[1121] = ItemType.PolishedBlackstoneBrickSlab; + mappings[1122] = ItemType.PolishedBlackstoneBrickStairs; + mappings[366] = ItemType.PolishedBlackstoneBrickWall; + mappings[1120] = ItemType.PolishedBlackstoneBricks; + mappings[633] = ItemType.PolishedBlackstoneButton; + mappings[644] = ItemType.PolishedBlackstonePressurePlate; + mappings[1117] = ItemType.PolishedBlackstoneSlab; + mappings[1118] = ItemType.PolishedBlackstoneStairs; + mappings[365] = ItemType.PolishedBlackstoneWall; + mappings[10] = ItemType.PolishedDeepslate; + mappings[604] = ItemType.PolishedDeepslateSlab; + mappings[587] = ItemType.PolishedDeepslateStairs; + mappings[368] = ItemType.PolishedDeepslateWall; + mappings[5] = ItemType.PolishedDiorite; + mappings[593] = ItemType.PolishedDioriteSlab; + mappings[575] = ItemType.PolishedDioriteStairs; + mappings[3] = ItemType.PolishedGranite; + mappings[590] = ItemType.PolishedGraniteSlab; + mappings[572] = ItemType.PolishedGraniteStairs; + mappings[1043] = ItemType.PoppedChorusFruit; + mappings[184] = ItemType.Poppy; + mappings[799] = ItemType.Porkchop; + mappings[991] = ItemType.Potato; + mappings[902] = ItemType.Potion; + mappings[816] = ItemType.PowderSnowBucket; + mappings[685] = ItemType.PoweredRail; + mappings[455] = ItemType.Prismarine; + mappings[238] = ItemType.PrismarineBrickSlab; + mappings[459] = ItemType.PrismarineBrickStairs; + mappings[456] = ItemType.PrismarineBricks; + mappings[1009] = ItemType.PrismarineCrystals; + mappings[1008] = ItemType.PrismarineShard; + mappings[237] = ItemType.PrismarineSlab; + mappings[458] = ItemType.PrismarineStairs; + mappings[352] = ItemType.PrismarineWall; + mappings[843] = ItemType.Pufferfish; + mappings[820] = ItemType.PufferfishBucket; + mappings[952] = ItemType.PufferfishSpawnEgg; + mappings[277] = ItemType.Pumpkin; + mappings[1003] = ItemType.PumpkinPie; + mappings[890] = ItemType.PumpkinSeeds; + mappings[1035] = ItemType.PurpleBanner; + mappings[879] = ItemType.PurpleBed; + mappings[1136] = ItemType.PurpleCandle; + mappings[408] = ItemType.PurpleCarpet; + mappings[517] = ItemType.PurpleConcrete; + mappings[533] = ItemType.PurpleConcretePowder; + mappings[859] = ItemType.PurpleDye; + mappings[501] = ItemType.PurpleGlazedTerracotta; + mappings[485] = ItemType.PurpleShulkerBox; + mappings[433] = ItemType.PurpleStainedGlass; + mappings[449] = ItemType.PurpleStainedGlassPane; + mappings[389] = ItemType.PurpleTerracotta; + mappings[177] = ItemType.PurpleWool; + mappings[252] = ItemType.PurpurBlock; + mappings[253] = ItemType.PurpurPillar; + mappings[236] = ItemType.PurpurSlab; + mappings[254] = ItemType.PurpurStairs; + mappings[725] = ItemType.Quartz; + mappings[375] = ItemType.QuartzBlock; + mappings[376] = ItemType.QuartzBricks; + mappings[377] = ItemType.QuartzPillar; + mappings[233] = ItemType.QuartzSlab; + mappings[378] = ItemType.QuartzStairs; + mappings[1010] = ItemType.Rabbit; + mappings[1013] = ItemType.RabbitFoot; + mappings[1014] = ItemType.RabbitHide; + mappings[953] = ItemType.RabbitSpawnEgg; + mappings[1012] = ItemType.RabbitStew; + mappings[687] = ItemType.Rail; + mappings[954] = ItemType.RavagerSpawnEgg; + mappings[729] = ItemType.RawCopper; + mappings[64] = ItemType.RawCopperBlock; + mappings[731] = ItemType.RawGold; + mappings[65] = ItemType.RawGoldBlock; + mappings[727] = ItemType.RawIron; + mappings[63] = ItemType.RawIronBlock; + mappings[834] = ItemType.RecoveryCompass; + mappings[1039] = ItemType.RedBanner; + mappings[883] = ItemType.RedBed; + mappings[1140] = ItemType.RedCandle; + mappings[412] = ItemType.RedCarpet; + mappings[521] = ItemType.RedConcrete; + mappings[537] = ItemType.RedConcretePowder; + mappings[863] = ItemType.RedDye; + mappings[505] = ItemType.RedGlazedTerracotta; + mappings[198] = ItemType.RedMushroom; + mappings[308] = ItemType.RedMushroomBlock; + mappings[600] = ItemType.RedNetherBrickSlab; + mappings[583] = ItemType.RedNetherBrickStairs; + mappings[360] = ItemType.RedNetherBrickWall; + mappings[471] = ItemType.RedNetherBricks; + mappings[41] = ItemType.RedSand; + mappings[462] = ItemType.RedSandstone; + mappings[234] = ItemType.RedSandstoneSlab; + mappings[465] = ItemType.RedSandstoneStairs; + mappings[353] = ItemType.RedSandstoneWall; + mappings[489] = ItemType.RedShulkerBox; + mappings[437] = ItemType.RedStainedGlass; + mappings[453] = ItemType.RedStainedGlassPane; + mappings[393] = ItemType.RedTerracotta; + mappings[188] = ItemType.RedTulip; + mappings[181] = ItemType.RedWool; + mappings[608] = ItemType.Redstone; + mappings[610] = ItemType.RedstoneBlock; + mappings[630] = ItemType.RedstoneLamp; + mappings[51] = ItemType.RedstoneOre; + mappings[609] = ItemType.RedstoneTorch; + mappings[306] = ItemType.ReinforcedDeepslate; + mappings[611] = ItemType.Repeater; + mappings[466] = ItemType.RepeatingCommandBlock; + mappings[1124] = ItemType.RespawnAnchor; + mappings[18] = ItemType.RootedDirt; + mappings[419] = ItemType.RoseBush; + mappings[896] = ItemType.RottenFlesh; + mappings[689] = ItemType.Saddle; + mappings[841] = ItemType.Salmon; + mappings[821] = ItemType.SalmonBucket; + mappings[955] = ItemType.SalmonSpawnEgg; + mappings[40] = ItemType.Sand; + mappings[156] = ItemType.Sandstone; + mappings[225] = ItemType.SandstoneSlab; + mappings[335] = ItemType.SandstoneStairs; + mappings[361] = ItemType.SandstoneWall; + mappings[607] = ItemType.Scaffolding; + mappings[326] = ItemType.Sculk; + mappings[328] = ItemType.SculkCatalyst; + mappings[626] = ItemType.SculkSensor; + mappings[329] = ItemType.SculkShrieker; + mappings[327] = ItemType.SculkVein; + mappings[715] = ItemType.Scute; + mappings[461] = ItemType.SeaLantern; + mappings[166] = ItemType.SeaPickle; + mappings[165] = ItemType.Seagrass; + mappings[887] = ItemType.Shears; + mappings[956] = ItemType.SheepSpawnEgg; + mappings[1052] = ItemType.Shield; + mappings[1104] = ItemType.Shroomlight; + mappings[474] = ItemType.ShulkerBox; + mappings[1054] = ItemType.ShulkerShell; + mappings[957] = ItemType.ShulkerSpawnEgg; + mappings[958] = ItemType.SilverfishSpawnEgg; + mappings[960] = ItemType.SkeletonHorseSpawnEgg; + mappings[996] = ItemType.SkeletonSkull; + mappings[959] = ItemType.SkeletonSpawnEgg; + mappings[1083] = ItemType.SkullBannerPattern; + mappings[831] = ItemType.SlimeBall; + mappings[615] = ItemType.SlimeBlock; + mappings[961] = ItemType.SlimeSpawnEgg; + mappings[1142] = ItemType.SmallAmethystBud; + mappings[212] = ItemType.SmallDripleaf; + mappings[1095] = ItemType.SmithingTable; + mappings[1090] = ItemType.Smoker; + mappings[285] = ItemType.SmoothBasalt; + mappings[240] = ItemType.SmoothQuartz; + mappings[597] = ItemType.SmoothQuartzSlab; + mappings[580] = ItemType.SmoothQuartzStairs; + mappings[241] = ItemType.SmoothRedSandstone; + mappings[591] = ItemType.SmoothRedSandstoneSlab; + mappings[573] = ItemType.SmoothRedSandstoneStairs; + mappings[242] = ItemType.SmoothSandstone; + mappings[596] = ItemType.SmoothSandstoneSlab; + mappings[579] = ItemType.SmoothSandstoneStairs; + mappings[243] = ItemType.SmoothStone; + mappings[224] = ItemType.SmoothStoneSlab; + mappings[262] = ItemType.Snow; + mappings[264] = ItemType.SnowBlock; + mappings[817] = ItemType.Snowball; + mappings[1103] = ItemType.SoulCampfire; + mappings[1099] = ItemType.SoulLantern; + mappings[281] = ItemType.SoulSand; + mappings[282] = ItemType.SoulSoil; + mappings[286] = ItemType.SoulTorch; + mappings[255] = ItemType.Spawner; + mappings[1049] = ItemType.SpectralArrow; + mappings[904] = ItemType.SpiderEye; + mappings[962] = ItemType.SpiderSpawnEgg; + mappings[1048] = ItemType.SplashPotion; + mappings[151] = ItemType.Sponge; + mappings[196] = ItemType.SporeBlossom; + mappings[700] = ItemType.SpruceBoat; + mappings[635] = ItemType.SpruceButton; + mappings[701] = ItemType.SpruceChestBoat; + mappings[658] = ItemType.SpruceDoor; + mappings[269] = ItemType.SpruceFence; + mappings[677] = ItemType.SpruceFenceGate; + mappings[143] = ItemType.SpruceLeaves; + mappings[105] = ItemType.SpruceLog; + mappings[24] = ItemType.SprucePlanks; + mappings[648] = ItemType.SprucePressurePlate; + mappings[33] = ItemType.SpruceSapling; + mappings[805] = ItemType.SpruceSign; + mappings[215] = ItemType.SpruceSlab; + mappings[339] = ItemType.SpruceStairs; + mappings[668] = ItemType.SpruceTrapdoor; + mappings[134] = ItemType.SpruceWood; + mappings[838] = ItemType.Spyglass; + mappings[963] = ItemType.SquidSpawnEgg; + mappings[765] = ItemType.Stick; + mappings[614] = ItemType.StickyPiston; + mappings[1] = ItemType.Stone; + mappings[743] = ItemType.StoneAxe; + mappings[230] = ItemType.StoneBrickSlab; + mappings[317] = ItemType.StoneBrickStairs; + mappings[356] = ItemType.StoneBrickWall; + mappings[295] = ItemType.StoneBricks; + mappings[632] = ItemType.StoneButton; + mappings[744] = ItemType.StoneHoe; + mappings[742] = ItemType.StonePickaxe; + mappings[643] = ItemType.StonePressurePlate; + mappings[741] = ItemType.StoneShovel; + mappings[223] = ItemType.StoneSlab; + mappings[578] = ItemType.StoneStairs; + mappings[740] = ItemType.StoneSword; + mappings[1096] = ItemType.Stonecutter; + mappings[964] = ItemType.StraySpawnEgg; + mappings[965] = ItemType.StriderSpawnEgg; + mappings[768] = ItemType.String; + mappings[119] = ItemType.StrippedAcaciaLog; + mappings[128] = ItemType.StrippedAcaciaWood; + mappings[117] = ItemType.StrippedBirchLog; + mappings[126] = ItemType.StrippedBirchWood; + mappings[131] = ItemType.StrippedCrimsonHyphae; + mappings[122] = ItemType.StrippedCrimsonStem; + mappings[120] = ItemType.StrippedDarkOakLog; + mappings[129] = ItemType.StrippedDarkOakWood; + mappings[118] = ItemType.StrippedJungleLog; + mappings[127] = ItemType.StrippedJungleWood; + mappings[121] = ItemType.StrippedMangroveLog; + mappings[130] = ItemType.StrippedMangroveWood; + mappings[115] = ItemType.StrippedOakLog; + mappings[124] = ItemType.StrippedOakWood; + mappings[116] = ItemType.StrippedSpruceLog; + mappings[125] = ItemType.StrippedSpruceWood; + mappings[132] = ItemType.StrippedWarpedHyphae; + mappings[123] = ItemType.StrippedWarpedStem; + mappings[712] = ItemType.StructureBlock; + mappings[473] = ItemType.StructureVoid; + mappings[867] = ItemType.Sugar; + mappings[206] = ItemType.SugarCane; + mappings[417] = ItemType.Sunflower; + mappings[1079] = ItemType.SuspiciousStew; + mappings[1100] = ItemType.SweetBerries; + mappings[825] = ItemType.TadpoleBucket; + mappings[966] = ItemType.TadpoleSpawnEgg; + mappings[421] = ItemType.TallGrass; + mappings[622] = ItemType.Target; + mappings[414] = ItemType.Terracotta; + mappings[154] = ItemType.TintedGlass; + mappings[1050] = ItemType.TippedArrow; + mappings[629] = ItemType.Tnt; + mappings[693] = ItemType.TntMinecart; + mappings[248] = ItemType.Torch; + mappings[1053] = ItemType.TotemOfUndying; + mappings[967] = ItemType.TraderLlamaSpawnEgg; + mappings[628] = ItemType.TrappedChest; + mappings[1074] = ItemType.Trident; + mappings[627] = ItemType.TripwireHook; + mappings[842] = ItemType.TropicalFish; + mappings[823] = ItemType.TropicalFishBucket; + mappings[968] = ItemType.TropicalFishSpawnEgg; + mappings[550] = ItemType.TubeCoral; + mappings[545] = ItemType.TubeCoralBlock; + mappings[560] = ItemType.TubeCoralFan; + mappings[12] = ItemType.Tuff; + mappings[539] = ItemType.TurtleEgg; + mappings[714] = ItemType.TurtleHelmet; + mappings[969] = ItemType.TurtleSpawnEgg; + mappings[205] = ItemType.TwistingVines; + mappings[1148] = ItemType.VerdantFroglight; + mappings[970] = ItemType.VexSpawnEgg; + mappings[971] = ItemType.VillagerSpawnEgg; + mappings[972] = ItemType.VindicatorSpawnEgg; + mappings[314] = ItemType.Vine; + mappings[973] = ItemType.WanderingTraderSpawnEgg; + mappings[974] = ItemType.WardenSpawnEgg; + mappings[642] = ItemType.WarpedButton; + mappings[665] = ItemType.WarpedDoor; + mappings[276] = ItemType.WarpedFence; + mappings[684] = ItemType.WarpedFenceGate; + mappings[200] = ItemType.WarpedFungus; + mappings[696] = ItemType.WarpedFungusOnAStick; + mappings[141] = ItemType.WarpedHyphae; + mappings[21] = ItemType.WarpedNylium; + mappings[31] = ItemType.WarpedPlanks; + mappings[655] = ItemType.WarpedPressurePlate; + mappings[202] = ItemType.WarpedRoots; + mappings[812] = ItemType.WarpedSign; + mappings[222] = ItemType.WarpedSlab; + mappings[346] = ItemType.WarpedStairs; + mappings[114] = ItemType.WarpedStem; + mappings[675] = ItemType.WarpedTrapdoor; + mappings[470] = ItemType.WarpedWartBlock; + mappings[814] = ItemType.WaterBucket; + mappings[88] = ItemType.WaxedCopperBlock; + mappings[92] = ItemType.WaxedCutCopper; + mappings[100] = ItemType.WaxedCutCopperSlab; + mappings[96] = ItemType.WaxedCutCopperStairs; + mappings[89] = ItemType.WaxedExposedCopper; + mappings[93] = ItemType.WaxedExposedCutCopper; + mappings[101] = ItemType.WaxedExposedCutCopperSlab; + mappings[97] = ItemType.WaxedExposedCutCopperStairs; + mappings[91] = ItemType.WaxedOxidizedCopper; + mappings[95] = ItemType.WaxedOxidizedCutCopper; + mappings[103] = ItemType.WaxedOxidizedCutCopperSlab; + mappings[99] = ItemType.WaxedOxidizedCutCopperStairs; + mappings[90] = ItemType.WaxedWeatheredCopper; + mappings[94] = ItemType.WaxedWeatheredCutCopper; + mappings[102] = ItemType.WaxedWeatheredCutCopperSlab; + mappings[98] = ItemType.WaxedWeatheredCutCopperStairs; + mappings[74] = ItemType.WeatheredCopper; + mappings[78] = ItemType.WeatheredCutCopper; + mappings[86] = ItemType.WeatheredCutCopperSlab; + mappings[82] = ItemType.WeatheredCutCopperStairs; + mappings[204] = ItemType.WeepingVines; + mappings[152] = ItemType.WetSponge; + mappings[772] = ItemType.Wheat; + mappings[771] = ItemType.WheatSeeds; + mappings[1025] = ItemType.WhiteBanner; + mappings[869] = ItemType.WhiteBed; + mappings[1126] = ItemType.WhiteCandle; + mappings[398] = ItemType.WhiteCarpet; + mappings[507] = ItemType.WhiteConcrete; + mappings[523] = ItemType.WhiteConcretePowder; + mappings[849] = ItemType.WhiteDye; + mappings[491] = ItemType.WhiteGlazedTerracotta; + mappings[475] = ItemType.WhiteShulkerBox; + mappings[423] = ItemType.WhiteStainedGlass; + mappings[439] = ItemType.WhiteStainedGlassPane; + mappings[379] = ItemType.WhiteTerracotta; + mappings[190] = ItemType.WhiteTulip; + mappings[167] = ItemType.WhiteWool; + mappings[975] = ItemType.WitchSpawnEgg; + mappings[195] = ItemType.WitherRose; + mappings[997] = ItemType.WitherSkeletonSkull; + mappings[976] = ItemType.WitherSkeletonSpawnEgg; + mappings[977] = ItemType.WolfSpawnEgg; + mappings[738] = ItemType.WoodenAxe; + mappings[739] = ItemType.WoodenHoe; + mappings[737] = ItemType.WoodenPickaxe; + mappings[736] = ItemType.WoodenShovel; + mappings[735] = ItemType.WoodenSword; + mappings[985] = ItemType.WritableBook; + mappings[986] = ItemType.WrittenBook; + mappings[1029] = ItemType.YellowBanner; + mappings[873] = ItemType.YellowBed; + mappings[1130] = ItemType.YellowCandle; + mappings[402] = ItemType.YellowCarpet; + mappings[511] = ItemType.YellowConcrete; + mappings[527] = ItemType.YellowConcretePowder; + mappings[853] = ItemType.YellowDye; + mappings[495] = ItemType.YellowGlazedTerracotta; + mappings[479] = ItemType.YellowShulkerBox; + mappings[427] = ItemType.YellowStainedGlass; + mappings[443] = ItemType.YellowStainedGlassPane; + mappings[383] = ItemType.YellowTerracotta; + mappings[171] = ItemType.YellowWool; + mappings[978] = ItemType.ZoglinSpawnEgg; + mappings[999] = ItemType.ZombieHead; + mappings[980] = ItemType.ZombieHorseSpawnEgg; + mappings[979] = ItemType.ZombieSpawnEgg; + mappings[981] = ItemType.ZombieVillagerSpawnEgg; + mappings[982] = ItemType.ZombifiedPiglinSpawnEgg; + } + + protected override Dictionary GetDict() + { + return mappings; + } + } +} diff --git a/MinecraftClient/Inventory/ItemType.cs b/MinecraftClient/Inventory/ItemType.cs index 062e93e3..50966bf0 100644 --- a/MinecraftClient/Inventory/ItemType.cs +++ b/MinecraftClient/Inventory/ItemType.cs @@ -1,11 +1,10 @@ namespace MinecraftClient.Inventory { /// - /// For MC version 1.16.2. - /// Generated using ItemPaletteGenerator. + /// Generated using the --generator flag on the client /// Typical steps to handle new item IDs for newer Minecraft versions: - /// 1. Generate registries.json using data reporting on Vanilla Minecraft (https://wiki.vg/Data_Generators) - /// 2. Generate temporary ItemTypeXXX.cs and ItemPaletteXXX.cs using ItemPaletteGenerator.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 ItemTypeXXX.cs and ItemPaletteXXX.cs using the --generator flag on the client /// 3. Perform a diff with existing versions, add missing entries in ItemType.cs and ItemTypeExtensions.cs /// 4. If existing entity IDs were not randomized by Mojang, simply add missing entries to the latest existing ItemPaletteXXX.cs /// 5. If existing entity IDs were randomized, add a new palette as ItemPaletteXXX.cs into the codebase @@ -14,9 +13,10 @@ namespace MinecraftClient.Inventory { Unknown = -2, // Unsupported item type (Forge mod custom item...) Null = -1, // Unspecified item type (Used in the network protocol) - + AcaciaBoat, AcaciaButton, + AcaciaChestBoat, AcaciaDoor, AcaciaFence, AcaciaFenceGate, @@ -32,6 +32,7 @@ namespace MinecraftClient.Inventory AcaciaWood, ActivatorRail, Air, + AllaySpawnEgg, Allium, AmethystBlock, AmethystCluster, @@ -69,6 +70,7 @@ namespace MinecraftClient.Inventory BigDripleaf, BirchBoat, BirchButton, + BirchChestBoat, BirchDoor, BirchFence, BirchFenceGate, @@ -279,6 +281,7 @@ namespace MinecraftClient.Inventory Dandelion, DarkOakBoat, DarkOakButton, + DarkOakChestBoat, DarkOakDoor, DarkOakFence, DarkOakFenceGate, @@ -349,6 +352,8 @@ namespace MinecraftClient.Inventory DioriteStairs, DioriteWall, Dirt, + DirtPath, + DiscFragment5, Dispenser, DolphinSpawnEgg, DonkeySpawnEgg, @@ -360,6 +365,7 @@ namespace MinecraftClient.Inventory DripstoneBlock, Dropper, DrownedSpawnEgg, + EchoShard, Egg, ElderGuardianSpawnEgg, Elytra, @@ -408,6 +414,8 @@ namespace MinecraftClient.Inventory FloweringAzalea, FloweringAzaleaLeaves, FoxSpawnEgg, + FrogSpawnEgg, + Frogspawn, Furnace, FurnaceMinecart, GhastSpawnEgg, @@ -425,6 +433,7 @@ namespace MinecraftClient.Inventory GlowSquidSpawnEgg, Glowstone, GlowstoneDust, + GoatHorn, GoatSpawnEgg, GoldBlock, GoldIngot, @@ -448,7 +457,6 @@ namespace MinecraftClient.Inventory GraniteWall, Grass, GrassBlock, - GrassPath, Gravel, GrayBanner, GrayBed, @@ -527,6 +535,7 @@ namespace MinecraftClient.Inventory Jukebox, JungleBoat, JungleButton, + JungleChestBoat, JungleDoor, JungleFence, JungleFenceGate, @@ -624,6 +633,23 @@ namespace MinecraftClient.Inventory MagmaBlock, MagmaCream, MagmaCubeSpawnEgg, + MangroveBoat, + MangroveButton, + MangroveChestBoat, + MangroveDoor, + MangroveFence, + MangroveFenceGate, + MangroveLeaves, + MangroveLog, + MangrovePlanks, + MangrovePressurePlate, + MangrovePropagule, + MangroveRoots, + MangroveSign, + MangroveSlab, + MangroveStairs, + MangroveTrapdoor, + MangroveWood, Map, MediumAmethystBud, Melon, @@ -643,11 +669,18 @@ namespace MinecraftClient.Inventory MossyStoneBrickStairs, MossyStoneBrickWall, MossyStoneBricks, + Mud, + MudBrickSlab, + MudBrickStairs, + MudBrickWall, + MudBricks, + MuddyMangroveRoots, MuleSpawnEgg, MushroomStem, MushroomStew, MusicDisc11, MusicDisc13, + MusicDisc5, MusicDiscBlocks, MusicDiscCat, MusicDiscChirp, @@ -692,6 +725,7 @@ namespace MinecraftClient.Inventory NoteBlock, OakBoat, OakButton, + OakChestBoat, OakDoor, OakFence, OakFenceGate, @@ -708,6 +742,7 @@ namespace MinecraftClient.Inventory Observer, Obsidian, OcelotSpawnEgg, + OchreFroglight, OrangeBanner, OrangeBed, OrangeCandle, @@ -728,10 +763,12 @@ namespace MinecraftClient.Inventory OxidizedCutCopperSlab, OxidizedCutCopperStairs, PackedIce, + PackedMud, Painting, PandaSpawnEgg, Paper, ParrotSpawnEgg, + PearlescentFroglight, Peony, PetrifiedOakSlab, PhantomMembrane, @@ -843,6 +880,7 @@ namespace MinecraftClient.Inventory RawGoldBlock, RawIron, RawIronBlock, + RecoveryCompass, RedBanner, RedBed, RedCandle, @@ -873,6 +911,7 @@ namespace MinecraftClient.Inventory RedstoneLamp, RedstoneOre, RedstoneTorch, + ReinforcedDeepslate, Repeater, RepeatingCommandBlock, RespawnAnchor, @@ -889,7 +928,11 @@ namespace MinecraftClient.Inventory SandstoneStairs, SandstoneWall, Scaffolding, + Sculk, + SculkCatalyst, SculkSensor, + SculkShrieker, + SculkVein, Scute, SeaLantern, SeaPickle, @@ -942,6 +985,7 @@ namespace MinecraftClient.Inventory SporeBlossom, SpruceBoat, SpruceButton, + SpruceChestBoat, SpruceDoor, SpruceFence, SpruceFenceGate, @@ -987,6 +1031,8 @@ namespace MinecraftClient.Inventory StrippedDarkOakWood, StrippedJungleLog, StrippedJungleWood, + StrippedMangroveLog, + StrippedMangroveWood, StrippedOakLog, StrippedOakWood, StrippedSpruceLog, @@ -1000,6 +1046,8 @@ namespace MinecraftClient.Inventory Sunflower, SuspiciousStew, SweetBerries, + TadpoleBucket, + TadpoleSpawnEgg, TallGrass, Target, Terracotta, @@ -1024,11 +1072,13 @@ namespace MinecraftClient.Inventory TurtleHelmet, TurtleSpawnEgg, TwistingVines, + VerdantFroglight, VexSpawnEgg, VillagerSpawnEgg, VindicatorSpawnEgg, Vine, WanderingTraderSpawnEgg, + WardenSpawnEgg, WarpedButton, WarpedDoor, WarpedFence, diff --git a/MinecraftClient/Mapping/BlockPalettes/Palette119.cs b/MinecraftClient/Mapping/BlockPalettes/Palette119.cs index b3cc787d..88521065 100644 --- a/MinecraftClient/Mapping/BlockPalettes/Palette119.cs +++ b/MinecraftClient/Mapping/BlockPalettes/Palette119.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; namespace MinecraftClient.Mapping.BlockPalettes diff --git a/MinecraftClient/Mapping/EntityPalettes/EntityPalette119.cs b/MinecraftClient/Mapping/EntityPalettes/EntityPalette119.cs new file mode 100644 index 00000000..b85059cc --- /dev/null +++ b/MinecraftClient/Mapping/EntityPalettes/EntityPalette119.cs @@ -0,0 +1,137 @@ +using System; +using System.Collections.Generic; + +namespace MinecraftClient.Mapping.EntityPalettes +{ + public class EntityPalette119 : EntityPalette + { + private static Dictionary mappings = new Dictionary(); + + 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 GetDict() + { + return mappings; + } + } +} diff --git a/MinecraftClient/Mapping/EntityType.cs b/MinecraftClient/Mapping/EntityType.cs index a0368e98..43bb89da 100644 --- a/MinecraftClient/Mapping/EntityType.cs +++ b/MinecraftClient/Mapping/EntityType.cs @@ -4,16 +4,17 @@ namespace MinecraftClient.Mapping /// Represents Minecraft Entity Types /// /// - /// 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) /// 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, diff --git a/MinecraftClient/Mapping/MaterialExtensions.cs b/MinecraftClient/Mapping/MaterialExtensions.cs index 39f9e51a..25e7a8b6 100644 --- a/MinecraftClient/Mapping/MaterialExtensions.cs +++ b/MinecraftClient/Mapping/MaterialExtensions.cs @@ -19,623 +19,634 @@ namespace MinecraftClient.Mapping { switch (m) { - case Material.Stone: - case Material.Granite: - case Material.PolishedGranite: - case Material.Diorite: - case Material.PolishedDiorite: - case Material.Andesite: - case Material.PolishedAndesite: - case Material.GrassBlock: - case Material.Dirt: - case Material.CoarseDirt: - case Material.Podzol: - case Material.Cobblestone: - case Material.OakPlanks: - case Material.SprucePlanks: - case Material.BirchPlanks: - case Material.JunglePlanks: - case Material.AcaciaPlanks: - case Material.DarkOakPlanks: - case Material.Bedrock: - case Material.Sand: - case Material.RedSand: - case Material.Gravel: - case Material.GoldOre: - case Material.IronOre: - case Material.CoalOre: - case Material.OakLog: - case Material.SpruceLog: - case Material.BirchLog: - case Material.JungleLog: - case Material.AcaciaLog: - case Material.DarkOakLog: - case Material.StrippedSpruceLog: - case Material.StrippedBirchLog: - case Material.StrippedJungleLog: - case Material.StrippedAcaciaLog: - case Material.StrippedDarkOakLog: - case Material.StrippedOakLog: - case Material.OakWood: - case Material.SpruceWood: - case Material.BirchWood: - case Material.JungleWood: - case Material.AcaciaWood: - case Material.DarkOakWood: - case Material.StrippedOakWood: - case Material.StrippedSpruceWood: - case Material.StrippedBirchWood: - case Material.StrippedJungleWood: - case Material.StrippedAcaciaWood: - case Material.StrippedDarkOakWood: - case Material.OakLeaves: - case Material.SpruceLeaves: - case Material.BirchLeaves: - case Material.JungleLeaves: + case Material.AcaciaFence: + case Material.AcaciaFenceGate: case Material.AcaciaLeaves: - case Material.DarkOakLeaves: - case Material.AzaleaLeaves: - case Material.FloweringAzaleaLeaves: - case Material.Sponge: - case Material.WetSponge: - case Material.Glass: - case Material.LapisOre: - case Material.LapisBlock: - case Material.Dispenser: - case Material.Sandstone: - case Material.ChiseledSandstone: - case Material.CutSandstone: - case Material.NoteBlock: - case Material.WhiteBed: - case Material.OrangeBed: - case Material.MagentaBed: - case Material.LightBlueBed: - case Material.YellowBed: - case Material.LimeBed: - case Material.PinkBed: - case Material.GrayBed: - case Material.LightGrayBed: - case Material.CyanBed: - case Material.PurpleBed: - case Material.BlueBed: - case Material.BrownBed: - case Material.GreenBed: - case Material.RedBed: - case Material.BlackBed: - case Material.StickyPiston: - case Material.Piston: - case Material.PistonHead: - case Material.WhiteWool: - case Material.OrangeWool: - case Material.MagentaWool: - case Material.LightBlueWool: - case Material.YellowWool: - case Material.LimeWool: - case Material.PinkWool: - case Material.GrayWool: - case Material.LightGrayWool: - case Material.CyanWool: - case Material.PurpleWool: - case Material.BlueWool: - case Material.BrownWool: - case Material.GreenWool: - case Material.RedWool: - case Material.BlackWool: - case Material.MovingPiston: - case Material.GoldBlock: - case Material.IronBlock: - case Material.Bricks: - case Material.Tnt: - case Material.Bookshelf: - case Material.MossyCobblestone: - case Material.Obsidian: - case Material.Spawner: - case Material.OakStairs: - case Material.Chest: - case Material.DiamondOre: - case Material.DiamondBlock: - case Material.CraftingTable: - case Material.Farmland: - case Material.Furnace: - case Material.OakDoor: - case Material.Ladder: - case Material.CobblestoneStairs: - case Material.IronDoor: - case Material.RedstoneOre: - case Material.Ice: - case Material.SnowBlock: - case Material.Cactus: - case Material.Clay: - case Material.Jukebox: - case Material.OakFence: - case Material.Pumpkin: - case Material.Netherrack: - case Material.SoulSand: - case Material.Glowstone: - case Material.CarvedPumpkin: - case Material.JackOLantern: - case Material.Cake: - case Material.WhiteStainedGlass: - case Material.OrangeStainedGlass: - case Material.MagentaStainedGlass: - case Material.LightBlueStainedGlass: - case Material.YellowStainedGlass: - case Material.LimeStainedGlass: - case Material.PinkStainedGlass: - case Material.GrayStainedGlass: - case Material.LightGrayStainedGlass: - case Material.CyanStainedGlass: - case Material.PurpleStainedGlass: - case Material.BlueStainedGlass: - case Material.BrownStainedGlass: - case Material.GreenStainedGlass: - case Material.RedStainedGlass: - case Material.BlackStainedGlass: - case Material.OakTrapdoor: - case Material.SpruceTrapdoor: - case Material.BirchTrapdoor: - case Material.JungleTrapdoor: + case Material.AcaciaLog: + case Material.AcaciaPlanks: + case Material.AcaciaSlab: + case Material.AcaciaStairs: case Material.AcaciaTrapdoor: - case Material.DarkOakTrapdoor: - case Material.StoneBricks: - case Material.MossyStoneBricks: - case Material.CrackedStoneBricks: - case Material.ChiseledStoneBricks: - case Material.InfestedStone: - case Material.InfestedCobblestone: - case Material.InfestedStoneBricks: - case Material.InfestedMossyStoneBricks: - case Material.InfestedCrackedStoneBricks: - case Material.InfestedChiseledStoneBricks: - case Material.BrownMushroomBlock: - case Material.RedMushroomBlock: - case Material.MushroomStem: - case Material.IronBars: - case Material.GlassPane: - case Material.Melon: - case Material.OakFenceGate: - case Material.BrickStairs: - case Material.StoneBrickStairs: - case Material.Mycelium: - case Material.LilyPad: - case Material.NetherBricks: - case Material.NetherBrickFence: - case Material.NetherBrickStairs: - case Material.EnchantingTable: - case Material.BrewingStand: - case Material.Cauldron: - case Material.WaterCauldron: - case Material.LavaCauldron: - case Material.PowderSnowCauldron: - case Material.EndPortalFrame: - case Material.EndStone: - case Material.DragonEgg: - case Material.RedstoneLamp: - case Material.SandstoneStairs: - case Material.EmeraldOre: - case Material.EnderChest: - case Material.EmeraldBlock: - case Material.SpruceStairs: - case Material.BirchStairs: - case Material.JungleStairs: - case Material.CommandBlock: + case Material.AcaciaWood: + case Material.AmethystBlock: + case Material.AmethystCluster: + case Material.Andesite: + case Material.AndesiteSlab: + case Material.AndesiteStairs: + case Material.AndesiteWall: + case Material.Anvil: + case Material.Azalea: + case Material.AzaleaLeaves: + case Material.Bamboo: + case Material.Barrel: + case Material.Barrier: + case Material.Basalt: case Material.Beacon: + case Material.Bedrock: + case Material.BeeNest: + case Material.Beehive: + case Material.Bell: + case Material.BirchDoor: + case Material.BirchFence: + case Material.BirchFenceGate: + case Material.BirchLeaves: + case Material.BirchLog: + case Material.BirchPlanks: + case Material.BirchSlab: + case Material.BirchStairs: + case Material.BirchTrapdoor: + case Material.BirchWood: + case Material.BlackBed: + case Material.BlackCandle: + case Material.BlackCandleCake: + case Material.BlackConcrete: + case Material.BlackConcretePowder: + case Material.BlackGlazedTerracotta: + case Material.BlackShulkerBox: + case Material.BlackStainedGlass: + case Material.BlackStainedGlassPane: + case Material.BlackTerracotta: + case Material.BlackWool: + case Material.BlastFurnace: + case Material.BlueBed: + case Material.BlueCandle: + case Material.BlueCandleCake: + case Material.BlueConcrete: + case Material.BlueConcretePowder: + case Material.BlueGlazedTerracotta: + case Material.BlueIce: + case Material.BlueShulkerBox: + case Material.BlueStainedGlass: + case Material.BlueStainedGlassPane: + case Material.BlueTerracotta: + case Material.BlueWool: + case Material.BoneBlock: + case Material.Bookshelf: + case Material.BrainCoralBlock: + case Material.BrewingStand: + case Material.BrickSlab: + case Material.BrickStairs: + case Material.BrickWall: + case Material.Bricks: + case Material.BrownBed: + case Material.BrownCandle: + case Material.BrownCandleCake: + case Material.BrownConcrete: + case Material.BrownConcretePowder: + case Material.BrownGlazedTerracotta: + case Material.BrownMushroomBlock: + case Material.BrownShulkerBox: + case Material.BrownStainedGlass: + case Material.BrownStainedGlassPane: + case Material.BrownTerracotta: + case Material.BrownWool: + case Material.BubbleColumn: + case Material.BubbleCoralBlock: + case Material.BuddingAmethyst: + case Material.Cactus: + case Material.Cake: + case Material.Calcite: + case Material.Campfire: + case Material.Candle: + case Material.CandleCake: + case Material.CartographyTable: + case Material.CarvedPumpkin: + case Material.Cauldron: + case Material.ChainCommandBlock: + case Material.Chest: + case Material.ChippedAnvil: + case Material.ChiseledDeepslate: + case Material.ChiseledQuartzBlock: + case Material.ChiseledRedSandstone: + case Material.ChiseledSandstone: + case Material.ChiseledStoneBricks: + case Material.ChorusFlower: + case Material.ChorusPlant: + case Material.Clay: + case Material.CoalBlock: + case Material.CoalOre: + case Material.CoarseDirt: + case Material.CobbledDeepslate: + case Material.CobbledDeepslateSlab: + case Material.CobbledDeepslateStairs: + case Material.CobbledDeepslateWall: + case Material.Cobblestone: + case Material.CobblestoneSlab: + case Material.CobblestoneStairs: case Material.CobblestoneWall: - case Material.MossyCobblestoneWall: - case Material.FlowerPot: - case Material.PottedOakSapling: - case Material.PottedSpruceSapling: - case Material.PottedBirchSapling: - case Material.PottedJungleSapling: - case Material.PottedAcaciaSapling: - case Material.PottedDarkOakSapling: - case Material.PottedFern: - case Material.PottedDandelion: - case Material.PottedPoppy: - case Material.PottedBlueOrchid: - case Material.PottedAllium: - case Material.PottedAzureBluet: - case Material.PottedRedTulip: - case Material.PottedOrangeTulip: - case Material.PottedWhiteTulip: - case Material.PottedPinkTulip: - case Material.PottedOxeyeDaisy: - case Material.PottedCornflower: - case Material.PottedLilyOfTheValley: - case Material.PottedWitherRose: - case Material.PottedRedMushroom: - case Material.PottedBrownMushroom: - case Material.PottedDeadBush: - case Material.PottedCactus: - case Material.SkeletonSkull: - case Material.SkeletonWallSkull: - case Material.WitherSkeletonSkull: - case Material.WitherSkeletonWallSkull: - case Material.ZombieHead: - case Material.ZombieWallHead: - case Material.PlayerHead: - case Material.PlayerWallHead: + case Material.CommandBlock: + case Material.Composter: + case Material.Conduit: + case Material.CopperBlock: + case Material.CopperOre: + case Material.CrackedDeepslateBricks: + case Material.CrackedDeepslateTiles: + case Material.CrackedStoneBricks: + case Material.CraftingTable: case Material.CreeperHead: case Material.CreeperWallHead: - case Material.DragonHead: - case Material.DragonWallHead: - case Material.Anvil: - case Material.ChippedAnvil: - case Material.DamagedAnvil: - case Material.TrappedChest: - case Material.DaylightDetector: - case Material.RedstoneBlock: - case Material.NetherQuartzOre: - case Material.Hopper: - case Material.QuartzBlock: - case Material.ChiseledQuartzBlock: - case Material.QuartzPillar: - case Material.QuartzStairs: - case Material.Dropper: - case Material.WhiteTerracotta: - case Material.OrangeTerracotta: - case Material.MagentaTerracotta: - case Material.LightBlueTerracotta: - case Material.YellowTerracotta: - case Material.LimeTerracotta: - case Material.PinkTerracotta: - case Material.GrayTerracotta: - case Material.LightGrayTerracotta: - case Material.CyanTerracotta: - case Material.PurpleTerracotta: - case Material.BlueTerracotta: - case Material.BrownTerracotta: - case Material.GreenTerracotta: - case Material.RedTerracotta: - case Material.BlackTerracotta: - case Material.WhiteStainedGlassPane: - case Material.OrangeStainedGlassPane: - case Material.MagentaStainedGlassPane: - case Material.LightBlueStainedGlassPane: - case Material.YellowStainedGlassPane: - case Material.LimeStainedGlassPane: - case Material.PinkStainedGlassPane: - case Material.GrayStainedGlassPane: - case Material.LightGrayStainedGlassPane: - case Material.CyanStainedGlassPane: - case Material.PurpleStainedGlassPane: - case Material.BlueStainedGlassPane: - case Material.BrownStainedGlassPane: - case Material.GreenStainedGlassPane: - case Material.RedStainedGlassPane: - case Material.BlackStainedGlassPane: - case Material.AcaciaStairs: - case Material.DarkOakStairs: - case Material.SlimeBlock: - case Material.Barrier: - case Material.IronTrapdoor: - case Material.Prismarine: - case Material.PrismarineBricks: - case Material.DarkPrismarine: - case Material.PrismarineStairs: - case Material.PrismarineBrickStairs: - case Material.DarkPrismarineStairs: - case Material.PrismarineSlab: - case Material.PrismarineBrickSlab: - case Material.DarkPrismarineSlab: - case Material.SeaLantern: - case Material.HayBlock: - case Material.Terracotta: - case Material.CoalBlock: - case Material.PackedIce: - case Material.RedSandstone: - case Material.ChiseledRedSandstone: + case Material.CutCopper: + case Material.CutCopperSlab: + case Material.CutCopperStairs: case Material.CutRedSandstone: - case Material.RedSandstoneStairs: - case Material.OakSlab: - case Material.SpruceSlab: - case Material.BirchSlab: - case Material.JungleSlab: - case Material.AcaciaSlab: - case Material.DarkOakSlab: - case Material.StoneSlab: - case Material.SmoothStoneSlab: - case Material.SandstoneSlab: - case Material.CutSandstoneSlab: - case Material.PetrifiedOakSlab: - case Material.CobblestoneSlab: - case Material.BrickSlab: - case Material.StoneBrickSlab: - case Material.NetherBrickSlab: - case Material.QuartzSlab: - case Material.RedSandstoneSlab: case Material.CutRedSandstoneSlab: - case Material.PurpurSlab: - case Material.SmoothStone: - case Material.SmoothSandstone: - case Material.SmoothQuartz: - case Material.SmoothRedSandstone: - case Material.SpruceFenceGate: - case Material.BirchFenceGate: - case Material.JungleFenceGate: - case Material.AcaciaFenceGate: - case Material.DarkOakFenceGate: - case Material.SpruceFence: - case Material.BirchFence: - case Material.JungleFence: - case Material.AcaciaFence: - case Material.DarkOakFence: - case Material.SpruceDoor: - case Material.BirchDoor: - case Material.JungleDoor: - case Material.AcaciaDoor: - case Material.DarkOakDoor: - case Material.EndRod: - case Material.ChorusPlant: - case Material.ChorusFlower: - case Material.PurpurBlock: - case Material.PurpurPillar: - case Material.PurpurStairs: - case Material.EndStoneBricks: - case Material.DirtPath: - case Material.RepeatingCommandBlock: - case Material.ChainCommandBlock: - case Material.FrostedIce: - case Material.MagmaBlock: - case Material.NetherWartBlock: - case Material.RedNetherBricks: - case Material.BoneBlock: - case Material.Observer: - case Material.ShulkerBox: - case Material.WhiteShulkerBox: - case Material.OrangeShulkerBox: - case Material.MagentaShulkerBox: - case Material.LightBlueShulkerBox: - case Material.YellowShulkerBox: - case Material.LimeShulkerBox: - case Material.PinkShulkerBox: - case Material.GrayShulkerBox: - case Material.LightGrayShulkerBox: - case Material.CyanShulkerBox: - case Material.PurpleShulkerBox: - case Material.BlueShulkerBox: - case Material.BrownShulkerBox: - case Material.GreenShulkerBox: - case Material.RedShulkerBox: - case Material.BlackShulkerBox: - case Material.WhiteGlazedTerracotta: - case Material.OrangeGlazedTerracotta: - case Material.MagentaGlazedTerracotta: - case Material.LightBlueGlazedTerracotta: - case Material.YellowGlazedTerracotta: - case Material.LimeGlazedTerracotta: - case Material.PinkGlazedTerracotta: - case Material.GrayGlazedTerracotta: - case Material.LightGrayGlazedTerracotta: - case Material.CyanGlazedTerracotta: - case Material.PurpleGlazedTerracotta: - case Material.BlueGlazedTerracotta: - case Material.BrownGlazedTerracotta: - case Material.GreenGlazedTerracotta: - case Material.RedGlazedTerracotta: - case Material.BlackGlazedTerracotta: - case Material.WhiteConcrete: - case Material.OrangeConcrete: - case Material.MagentaConcrete: - case Material.LightBlueConcrete: - case Material.YellowConcrete: - case Material.LimeConcrete: - case Material.PinkConcrete: - case Material.GrayConcrete: - case Material.LightGrayConcrete: + case Material.CutSandstone: + case Material.CutSandstoneSlab: + case Material.CyanBed: + case Material.CyanCandle: + case Material.CyanCandleCake: case Material.CyanConcrete: - case Material.PurpleConcrete: - case Material.BlueConcrete: - case Material.BrownConcrete: - case Material.GreenConcrete: - case Material.RedConcrete: - case Material.BlackConcrete: - case Material.WhiteConcretePowder: - case Material.OrangeConcretePowder: - case Material.MagentaConcretePowder: - case Material.LightBlueConcretePowder: - case Material.YellowConcretePowder: - case Material.LimeConcretePowder: - case Material.PinkConcretePowder: - case Material.GrayConcretePowder: - case Material.LightGrayConcretePowder: case Material.CyanConcretePowder: - case Material.PurpleConcretePowder: - case Material.BlueConcretePowder: - case Material.BrownConcretePowder: - case Material.GreenConcretePowder: - case Material.RedConcretePowder: - case Material.BlackConcretePowder: - case Material.DriedKelpBlock: - case Material.TurtleEgg: - case Material.DeadTubeCoralBlock: + case Material.CyanGlazedTerracotta: + case Material.CyanShulkerBox: + case Material.CyanStainedGlass: + case Material.CyanStainedGlassPane: + case Material.CyanTerracotta: + case Material.CyanWool: + case Material.DamagedAnvil: + case Material.DarkOakDoor: + case Material.DarkOakFence: + case Material.DarkOakFenceGate: + case Material.DarkOakLeaves: + case Material.DarkOakLog: + case Material.DarkOakPlanks: + case Material.DarkOakSlab: + case Material.DarkOakStairs: + case Material.DarkOakTrapdoor: + case Material.DarkOakWood: + case Material.DarkPrismarine: + case Material.DarkPrismarineSlab: + case Material.DarkPrismarineStairs: + case Material.DaylightDetector: case Material.DeadBrainCoralBlock: case Material.DeadBubbleCoralBlock: case Material.DeadFireCoralBlock: case Material.DeadHornCoralBlock: - case Material.TubeCoralBlock: - case Material.BrainCoralBlock: - case Material.BubbleCoralBlock: - case Material.FireCoralBlock: - case Material.HornCoralBlock: - case Material.SeaPickle: - case Material.BlueIce: - case Material.Conduit: - case Material.Bamboo: - case Material.PottedBamboo: - case Material.BubbleColumn: - case Material.PolishedGraniteStairs: - case Material.SmoothRedSandstoneStairs: - case Material.MossyStoneBrickStairs: - case Material.PolishedDioriteStairs: - case Material.MossyCobblestoneStairs: - case Material.EndStoneBrickStairs: - case Material.StoneStairs: - case Material.SmoothSandstoneStairs: - case Material.SmoothQuartzStairs: - case Material.GraniteStairs: - case Material.AndesiteStairs: - case Material.RedNetherBrickStairs: - case Material.PolishedAndesiteStairs: - case Material.DioriteStairs: - case Material.PolishedGraniteSlab: - case Material.SmoothRedSandstoneSlab: - case Material.MossyStoneBrickSlab: - case Material.PolishedDioriteSlab: - case Material.MossyCobblestoneSlab: - case Material.EndStoneBrickSlab: - case Material.SmoothSandstoneSlab: - case Material.SmoothQuartzSlab: - case Material.GraniteSlab: - case Material.AndesiteSlab: - case Material.RedNetherBrickSlab: - case Material.PolishedAndesiteSlab: + case Material.DeadTubeCoralBlock: + case Material.Deepslate: + case Material.DeepslateBrickSlab: + case Material.DeepslateBrickStairs: + case Material.DeepslateBrickWall: + case Material.DeepslateBricks: + case Material.DeepslateCopperOre: + case Material.DeepslateTileSlab: + case Material.DeepslateTileStairs: + case Material.DeepslateTileWall: + case Material.DeepslateTiles: + case Material.DiamondBlock: + case Material.DiamondOre: + case Material.Diorite: case Material.DioriteSlab: - case Material.BrickWall: - case Material.PrismarineWall: - case Material.RedSandstoneWall: - case Material.MossyStoneBrickWall: - case Material.GraniteWall: - case Material.StoneBrickWall: - case Material.NetherBrickWall: - case Material.AndesiteWall: - case Material.RedNetherBrickWall: - case Material.SandstoneWall: - case Material.EndStoneBrickWall: + case Material.DioriteStairs: case Material.DioriteWall: - case Material.Loom: - case Material.Barrel: - case Material.Smoker: - case Material.BlastFurnace: - case Material.CartographyTable: + case Material.Dirt: + case Material.DirtPath: + case Material.Dispenser: + case Material.DragonEgg: + case Material.DragonHead: + case Material.DragonWallHead: + case Material.DriedKelpBlock: + case Material.DripstoneBlock: + case Material.Dropper: + case Material.EmeraldBlock: + case Material.EmeraldOre: + case Material.EnchantingTable: + case Material.EndPortalFrame: + case Material.EndRod: + case Material.EndStone: + case Material.EndStoneBrickSlab: + case Material.EndStoneBrickStairs: + case Material.EndStoneBrickWall: + case Material.EndStoneBricks: + case Material.EnderChest: + case Material.ExposedCopper: + case Material.ExposedCutCopper: + case Material.ExposedCutCopperSlab: + case Material.ExposedCutCopperStairs: + case Material.Farmland: + case Material.FireCoralBlock: case Material.FletchingTable: + case Material.FlowerPot: + case Material.FloweringAzalea: + case Material.FloweringAzaleaLeaves: + case Material.FrostedIce: + case Material.Furnace: + case Material.Glass: + case Material.GlassPane: + case Material.Glowstone: + case Material.GoldBlock: + case Material.GoldOre: + case Material.Granite: + case Material.GraniteSlab: + case Material.GraniteStairs: + case Material.GraniteWall: + case Material.GrassBlock: + case Material.Gravel: + case Material.GrayBed: + case Material.GrayCandle: + case Material.GrayCandleCake: + case Material.GrayConcrete: + case Material.GrayConcretePowder: + case Material.GrayGlazedTerracotta: + case Material.GrayShulkerBox: + case Material.GrayStainedGlass: + case Material.GrayStainedGlassPane: + case Material.GrayTerracotta: + case Material.GrayWool: + case Material.GreenBed: + case Material.GreenCandle: + case Material.GreenCandleCake: + case Material.GreenConcrete: + case Material.GreenConcretePowder: + case Material.GreenGlazedTerracotta: + case Material.GreenShulkerBox: + case Material.GreenStainedGlass: + case Material.GreenStainedGlassPane: + case Material.GreenTerracotta: + case Material.GreenWool: case Material.Grindstone: - case Material.Lectern: - case Material.SmithingTable: - case Material.Stonecutter: - case Material.Bell: - case Material.Lantern: - case Material.Campfire: - case Material.StructureBlock: - case Material.Jigsaw: - case Material.Composter: - case Material.BeeNest: - case Material.Beehive: + case Material.HayBlock: case Material.HoneyBlock: case Material.HoneycombBlock: - case Material.Candle: - case Material.WhiteCandle: - case Material.OrangeCandle: - case Material.MagentaCandle: - case Material.LightBlueCandle: - case Material.YellowCandle: - case Material.LimeCandle: - case Material.PinkCandle: - case Material.GrayCandle: - case Material.LightGrayCandle: - case Material.CyanCandle: - case Material.PurpleCandle: - case Material.BlueCandle: - case Material.BrownCandle: - case Material.GreenCandle: - case Material.RedCandle: - case Material.BlackCandle: - case Material.CandleCake: - case Material.WhiteCandleCake: - case Material.OrangeCandleCake: - case Material.MagentaCandleCake: - case Material.LightBlueCandleCake: - case Material.YellowCandleCake: - case Material.LimeCandleCake: - case Material.PinkCandleCake: - case Material.GrayCandleCake: - case Material.LightGrayCandleCake: - case Material.CyanCandleCake: - case Material.PurpleCandleCake: - case Material.BlueCandleCake: - case Material.BrownCandleCake: - case Material.GreenCandleCake: - case Material.RedCandleCake: - case Material.BlackCandleCake: - case Material.AmethystBlock: - case Material.BuddingAmethyst: - case Material.AmethystCluster: - case Material.LargeAmethystBud: - case Material.MediumAmethystBud: - case Material.SmallAmethystBud: - case Material.Tuff: - case Material.Calcite: - case Material.TintedGlass: - case Material.SculkSensor: - case Material.OxidizedCopper: - case Material.WeatheredCopper: - case Material.ExposedCopper: - case Material.CopperBlock: - case Material.CopperOre: - case Material.DeepslateCopperOre: - case Material.OxidizedCutCopper: - case Material.WeatheredCutCopper: - case Material.ExposedCutCopper: - case Material.CutCopper: - case Material.OxidizedCutCopperStairs: - case Material.WeatheredCutCopperStairs: - case Material.ExposedCutCopperStairs: - case Material.CutCopperStairs: - case Material.OxidizedCutCopperSlab: - case Material.WeatheredCutCopperSlab: - case Material.ExposedCutCopperSlab: - case Material.CutCopperSlab: - case Material.WaxedCopperBlock: - case Material.WaxedWeatheredCopper: - case Material.WaxedExposedCopper: - case Material.WaxedOxidizedCopper: - case Material.WaxedOxidizedCutCopper: - case Material.WaxedWeatheredCutCopper: - case Material.WaxedExposedCutCopper: - case Material.WaxedCutCopper: - case Material.WaxedOxidizedCutCopperStairs: - case Material.WaxedWeatheredCutCopperStairs: - case Material.WaxedExposedCutCopperStairs: - case Material.WaxedCutCopperStairs: - case Material.WaxedOxidizedCutCopperSlab: - case Material.WaxedWeatheredCutCopperSlab: - case Material.WaxedExposedCutCopperSlab: - case Material.WaxedCutCopperSlab: - case Material.LightningRod: - case Material.PointedDripstone: - case Material.DripstoneBlock: - case Material.Azalea: - case Material.FloweringAzalea: - case Material.MossCarpet: - case Material.MossBlock: - case Material.RootedDirt: - case Material.Deepslate: - case Material.CobbledDeepslate: - case Material.CobbledDeepslateStairs: - case Material.CobbledDeepslateSlab: - case Material.CobbledDeepslateWall: - case Material.PolishedDeepslate: - case Material.PolishedDeepslateStairs: - case Material.PolishedDeepslateSlab: - case Material.PolishedDeepslateWall: - case Material.DeepslateTiles: - case Material.DeepslateTileStairs: - case Material.DeepslateTileSlab: - case Material.DeepslateTileWall: - case Material.DeepslateBricks: - case Material.DeepslateBrickStairs: - case Material.DeepslateBrickSlab: - case Material.DeepslateBrickWall: - case Material.ChiseledDeepslate: - case Material.CrackedDeepslateBricks: - case Material.CrackedDeepslateTiles: + case Material.Hopper: + case Material.HornCoralBlock: + case Material.Ice: + case Material.InfestedChiseledStoneBricks: + case Material.InfestedCobblestone: + case Material.InfestedCrackedStoneBricks: case Material.InfestedDeepslate: - case Material.SmoothBasalt: - case Material.RawIronBlock: + case Material.InfestedMossyStoneBricks: + case Material.InfestedStone: + case Material.InfestedStoneBricks: + case Material.IronBars: + case Material.IronBlock: + case Material.IronDoor: + case Material.IronOre: + case Material.IronTrapdoor: + case Material.JackOLantern: + case Material.Jigsaw: + case Material.Jukebox: + case Material.JungleDoor: + case Material.JungleFence: + case Material.JungleFenceGate: + case Material.JungleLeaves: + case Material.JungleLog: + case Material.JunglePlanks: + case Material.JungleSlab: + case Material.JungleStairs: + case Material.JungleTrapdoor: + case Material.JungleWood: + case Material.Ladder: + case Material.Lantern: + case Material.LapisBlock: + case Material.LapisOre: + case Material.LargeAmethystBud: + case Material.LavaCauldron: + case Material.Lectern: + case Material.LightBlueBed: + case Material.LightBlueCandle: + case Material.LightBlueCandleCake: + case Material.LightBlueConcrete: + case Material.LightBlueConcretePowder: + case Material.LightBlueGlazedTerracotta: + case Material.LightBlueShulkerBox: + case Material.LightBlueStainedGlass: + case Material.LightBlueStainedGlassPane: + case Material.LightBlueTerracotta: + case Material.LightBlueWool: + case Material.LightGrayBed: + case Material.LightGrayCandle: + case Material.LightGrayCandleCake: + case Material.LightGrayConcrete: + case Material.LightGrayConcretePowder: + case Material.LightGrayGlazedTerracotta: + case Material.LightGrayShulkerBox: + case Material.LightGrayStainedGlass: + case Material.LightGrayStainedGlassPane: + case Material.LightGrayTerracotta: + case Material.LightGrayWool: + case Material.LightningRod: + case Material.LilyPad: + case Material.LimeBed: + case Material.LimeCandle: + case Material.LimeCandleCake: + case Material.LimeConcrete: + case Material.LimeConcretePowder: + case Material.LimeGlazedTerracotta: + case Material.LimeShulkerBox: + case Material.LimeStainedGlass: + case Material.LimeStainedGlassPane: + case Material.LimeTerracotta: + case Material.LimeWool: + case Material.Loom: + case Material.MagentaBed: + case Material.MagentaCandle: + case Material.MagentaCandleCake: + case Material.MagentaConcrete: + case Material.MagentaConcretePowder: + case Material.MagentaGlazedTerracotta: + case Material.MagentaShulkerBox: + case Material.MagentaStainedGlass: + case Material.MagentaStainedGlassPane: + case Material.MagentaTerracotta: + case Material.MagentaWool: + case Material.MagmaBlock: + case Material.MangroveLeaves: + case Material.MangroveLog: + case Material.MangrovePlanks: + case Material.MangrovePressurePlate: + case Material.MangroveRoots: + case Material.MangroveSlab: + case Material.MangroveStairs: + case Material.MangroveWood: + case Material.MediumAmethystBud: + case Material.Melon: + case Material.MossBlock: + case Material.MossCarpet: + case Material.MossyCobblestone: + case Material.MossyCobblestoneSlab: + case Material.MossyCobblestoneStairs: + case Material.MossyCobblestoneWall: + case Material.MossyStoneBrickSlab: + case Material.MossyStoneBrickStairs: + case Material.MossyStoneBrickWall: + case Material.MossyStoneBricks: + case Material.MovingPiston: + case Material.MushroomStem: + case Material.Mycelium: + case Material.NetherBrickFence: + case Material.NetherBrickSlab: + case Material.NetherBrickStairs: + case Material.NetherBrickWall: + case Material.NetherBricks: + case Material.NetherQuartzOre: + case Material.NetherWartBlock: + case Material.Netherrack: + case Material.NoteBlock: + case Material.OakDoor: + case Material.OakFence: + case Material.OakFenceGate: + case Material.OakLeaves: + case Material.OakLog: + case Material.OakPlanks: + case Material.OakSlab: + case Material.OakStairs: + case Material.OakTrapdoor: + case Material.OakWood: + case Material.Observer: + case Material.Obsidian: + case Material.OrangeBed: + case Material.OrangeCandle: + case Material.OrangeCandleCake: + case Material.OrangeConcrete: + case Material.OrangeConcretePowder: + case Material.OrangeGlazedTerracotta: + case Material.OrangeShulkerBox: + case Material.OrangeStainedGlass: + case Material.OrangeStainedGlassPane: + case Material.OrangeTerracotta: + case Material.OrangeWool: + case Material.OxidizedCopper: + case Material.OxidizedCutCopper: + case Material.OxidizedCutCopperSlab: + case Material.OxidizedCutCopperStairs: + case Material.PackedIce: + case Material.PetrifiedOakSlab: + case Material.PinkBed: + case Material.PinkCandle: + case Material.PinkCandleCake: + case Material.PinkConcrete: + case Material.PinkConcretePowder: + case Material.PinkGlazedTerracotta: + case Material.PinkShulkerBox: + case Material.PinkStainedGlass: + case Material.PinkStainedGlassPane: + case Material.PinkTerracotta: + case Material.PinkWool: + case Material.Piston: + case Material.PistonHead: + case Material.PlayerHead: + case Material.PlayerWallHead: + case Material.Podzol: + case Material.PointedDripstone: + case Material.PolishedAndesite: + case Material.PolishedAndesiteSlab: + case Material.PolishedAndesiteStairs: + case Material.PolishedBasalt: + case Material.PolishedDeepslate: + case Material.PolishedDeepslateSlab: + case Material.PolishedDeepslateStairs: + case Material.PolishedDeepslateWall: + case Material.PolishedDiorite: + case Material.PolishedDioriteSlab: + case Material.PolishedDioriteStairs: + case Material.PolishedGranite: + case Material.PolishedGraniteSlab: + case Material.PolishedGraniteStairs: + case Material.PottedAcaciaSapling: + case Material.PottedAllium: + case Material.PottedAzaleaBush: + case Material.PottedAzureBluet: + case Material.PottedBamboo: + case Material.PottedBirchSapling: + case Material.PottedBlueOrchid: + case Material.PottedBrownMushroom: + case Material.PottedCactus: + case Material.PottedCornflower: + case Material.PottedDandelion: + case Material.PottedDarkOakSapling: + case Material.PottedDeadBush: + case Material.PottedFern: + case Material.PottedFloweringAzaleaBush: + case Material.PottedJungleSapling: + case Material.PottedLilyOfTheValley: + case Material.PottedOakSapling: + case Material.PottedOrangeTulip: + case Material.PottedOxeyeDaisy: + case Material.PottedPinkTulip: + case Material.PottedPoppy: + case Material.PottedRedMushroom: + case Material.PottedRedTulip: + case Material.PottedSpruceSapling: + case Material.PottedWhiteTulip: + case Material.PottedWitherRose: + case Material.PowderSnowCauldron: + case Material.Prismarine: + case Material.PrismarineBrickSlab: + case Material.PrismarineBrickStairs: + case Material.PrismarineBricks: + case Material.PrismarineSlab: + case Material.PrismarineStairs: + case Material.PrismarineWall: + case Material.Pumpkin: + case Material.PurpleBed: + case Material.PurpleCandle: + case Material.PurpleCandleCake: + case Material.PurpleConcrete: + case Material.PurpleConcretePowder: + case Material.PurpleGlazedTerracotta: + case Material.PurpleShulkerBox: + case Material.PurpleStainedGlass: + case Material.PurpleStainedGlassPane: + case Material.PurpleTerracotta: + case Material.PurpleWool: + case Material.PurpurBlock: + case Material.PurpurPillar: + case Material.PurpurSlab: + case Material.PurpurStairs: + case Material.QuartzBlock: + case Material.QuartzPillar: + case Material.QuartzSlab: + case Material.QuartzStairs: case Material.RawCopperBlock: case Material.RawGoldBlock: - case Material.PottedAzaleaBush: - case Material.PottedFloweringAzaleaBush: + case Material.RawIronBlock: + case Material.RedBed: + case Material.RedCandle: + case Material.RedCandleCake: + case Material.RedConcrete: + case Material.RedConcretePowder: + case Material.RedGlazedTerracotta: + case Material.RedMushroomBlock: + case Material.RedNetherBrickSlab: + case Material.RedNetherBrickStairs: + case Material.RedNetherBrickWall: + case Material.RedNetherBricks: + case Material.RedSand: + case Material.RedSandstone: + case Material.RedSandstoneSlab: + case Material.RedSandstoneStairs: + case Material.RedSandstoneWall: + case Material.RedShulkerBox: + case Material.RedStainedGlass: + case Material.RedStainedGlassPane: + case Material.RedTerracotta: + case Material.RedWool: + case Material.RedstoneBlock: + case Material.RedstoneLamp: + case Material.RedstoneOre: + case Material.RepeatingCommandBlock: + case Material.RootedDirt: + case Material.Sand: + case Material.Sandstone: + case Material.SandstoneSlab: + case Material.SandstoneStairs: + case Material.SandstoneWall: + case Material.SculkSensor: + case Material.SeaLantern: + case Material.SeaPickle: + case Material.ShulkerBox: + case Material.SkeletonSkull: + case Material.SkeletonWallSkull: + case Material.SlimeBlock: + case Material.SmallAmethystBud: + case Material.SmithingTable: + case Material.Smoker: + case Material.SmoothBasalt: + case Material.SmoothQuartz: + case Material.SmoothQuartzSlab: + case Material.SmoothQuartzStairs: + case Material.SmoothRedSandstone: + case Material.SmoothRedSandstoneSlab: + case Material.SmoothRedSandstoneStairs: + case Material.SmoothSandstone: + case Material.SmoothSandstoneSlab: + case Material.SmoothSandstoneStairs: + case Material.SmoothStone: + case Material.SmoothStoneSlab: + case Material.SnowBlock: + case Material.SoulSand: + case Material.SoulSoil: + case Material.Spawner: + case Material.Sponge: + case Material.SpruceDoor: + case Material.SpruceFence: + case Material.SpruceFenceGate: + case Material.SpruceLeaves: + case Material.SpruceLog: + case Material.SprucePlanks: + case Material.SpruceSlab: + case Material.SpruceStairs: + case Material.SpruceTrapdoor: + case Material.SpruceWood: + case Material.StickyPiston: + case Material.Stone: + case Material.StoneBrickSlab: + case Material.StoneBrickStairs: + case Material.StoneBrickWall: + case Material.StoneBricks: + case Material.StoneSlab: + case Material.StoneStairs: + case Material.Stonecutter: + case Material.StrippedAcaciaLog: + case Material.StrippedAcaciaWood: + case Material.StrippedBirchLog: + case Material.StrippedBirchWood: + case Material.StrippedDarkOakLog: + case Material.StrippedDarkOakWood: + case Material.StrippedJungleLog: + case Material.StrippedJungleWood: + case Material.StrippedOakLog: + case Material.StrippedOakWood: + case Material.StrippedSpruceLog: + case Material.StrippedSpruceWood: + case Material.StructureBlock: + case Material.Terracotta: + case Material.TintedGlass: + case Material.Tnt: + case Material.TrappedChest: + case Material.TubeCoralBlock: + case Material.Tuff: + case Material.TurtleEgg: + case Material.WaterCauldron: + case Material.WaxedCopperBlock: + case Material.WaxedCutCopper: + case Material.WaxedCutCopperSlab: + case Material.WaxedCutCopperStairs: + case Material.WaxedExposedCopper: + case Material.WaxedExposedCutCopper: + case Material.WaxedExposedCutCopperSlab: + case Material.WaxedExposedCutCopperStairs: + case Material.WaxedOxidizedCopper: + case Material.WaxedOxidizedCutCopper: + case Material.WaxedOxidizedCutCopperSlab: + case Material.WaxedOxidizedCutCopperStairs: + case Material.WaxedWeatheredCopper: + case Material.WaxedWeatheredCutCopper: + case Material.WaxedWeatheredCutCopperSlab: + case Material.WaxedWeatheredCutCopperStairs: + case Material.WeatheredCopper: + case Material.WeatheredCutCopper: + case Material.WeatheredCutCopperSlab: + case Material.WeatheredCutCopperStairs: + case Material.WetSponge: + case Material.WhiteBed: + case Material.WhiteCandle: + case Material.WhiteCandleCake: + case Material.WhiteConcrete: + case Material.WhiteConcretePowder: + case Material.WhiteGlazedTerracotta: + case Material.WhiteShulkerBox: + case Material.WhiteStainedGlass: + case Material.WhiteStainedGlassPane: + case Material.WhiteTerracotta: + case Material.WhiteWool: + case Material.WitherSkeletonSkull: + case Material.WitherSkeletonWallSkull: + case Material.YellowBed: + case Material.YellowCandle: + case Material.YellowCandleCake: + case Material.YellowConcrete: + case Material.YellowConcretePowder: + case Material.YellowGlazedTerracotta: + case Material.YellowShulkerBox: + case Material.YellowStainedGlass: + case Material.YellowStainedGlassPane: + case Material.YellowTerracotta: + case Material.YellowWool: + case Material.ZombieHead: + case Material.ZombieWallHead: + case Material.AcaciaDoor: return true; default: return false; diff --git a/MinecraftClient/Protocol/Handlers/DataTypes.cs b/MinecraftClient/Protocol/Handlers/DataTypes.cs index c7f84f57..d4e82e2e 100644 --- a/MinecraftClient/Protocol/Handlers/DataTypes.cs +++ b/MinecraftClient/Protocol/Handlers/DataTypes.cs @@ -403,13 +403,13 @@ namespace MinecraftClient.Protocol.Handlers Double entityX = ReadNextDouble(cache); Double entityY = ReadNextDouble(cache); Double entityZ = ReadNextDouble(cache); - byte entityYaw = ReadNextByte(cache); byte entityPitch = ReadNextByte(cache); + byte entityYaw = ReadNextByte(cache); int metadata = -1; if (living) { - if (protocolversion >= Protocol18Handler.MC_1_18_2_Version) + if (protocolversion == Protocol18Handler.MC_1_18_2_Version) entityYaw = ReadNextByte(cache); else entityPitch = ReadNextByte(cache); @@ -418,15 +418,17 @@ namespace MinecraftClient.Protocol.Handlers { if (protocolversion >= Protocol18Handler.MC_1_19_Version) { - metadata = ReadNextVarInt(cache); entityYaw = ReadNextByte(cache); + metadata = ReadNextVarInt(cache); } else metadata = ReadNextInt(cache); } + short velocityX = ReadNextShort(cache); short velocityY = ReadNextShort(cache); short velocityZ = ReadNextShort(cache); + return new Entity(entityID, entityType, new Location(entityX, entityY, entityZ), entityYaw, entityPitch, metadata); } diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 0a50a925..a837cce6 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -24,7 +24,7 @@ using MinecraftClient.Protocol.Message; namespace MinecraftClient.Protocol.Handlers { /// - /// Implementation for Minecraft 1.7.X+ Protocols + /// Implementation for Minecraft 1.8.X+ Protocols /// /// /// Typical update steps for implementing protocol changes for a new Minecraft version: @@ -97,20 +97,18 @@ namespace MinecraftClient.Protocol.Handlers this.packetPalette = new PacketTypeHandler(protocolVersion, forgeInfo != null).GetTypeHandler(); this.log = handler.GetLogger(); this.randomGen = RandomNumberGenerator.Create(); - - if (handler.GetTerrainEnabled() && this.protocolVersion > MC_1_19_2_Version) + if (handler.GetTerrainEnabled() && protocolVersion > MC_1_18_2_Version) { log.Error(Translations.Get("extra.terrainandmovement_disabled")); handler.SetTerrainEnabled(false); } - if (handler.GetInventoryEnabled() && (this.protocolVersion < MC_1_10_Version || this.protocolVersion > MC_1_18_2_Version)) + if (handler.GetInventoryEnabled() && (protocolVersion < MC_1_10_Version || protocolVersion > MC_1_19_Version)) { log.Error(Translations.Get("extra.inventory_disabled")); handler.SetInventoryEnabled(false); } - - if (handler.GetEntityHandlingEnabled() && (this.protocolVersion < MC_1_10_Version || this.protocolVersion > MC_1_18_2_Version)) + if (handler.GetEntityHandlingEnabled() && (protocolVersion < MC_1_10_Version || protocolVersion > MC_1_19_Version)) { log.Error(Translations.Get("extra.entity_disabled")); handler.SetEntityHandlingEnabled(false); @@ -136,23 +134,24 @@ namespace MinecraftClient.Protocol.Handlers Block.Palette = new Palette112(); // Entity palette - if (this.protocolVersion >= MC_1_13_Version) + if (protocolVersion >= MC_1_13_Version) { - if (this.protocolVersion > MC_1_18_2_Version && handler.GetEntityHandlingEnabled()) + if (protocolVersion > MC_1_19_Version && handler.GetEntityHandlingEnabled()) throw new NotImplementedException(Translations.Get("exception.palette.entity")); - if (this.protocolVersion >= MC_1_17_Version) + if (protocolVersion == MC_1_19_Version) + entityPalette = new EntityPalette119(); + else if (protocolVersion >= MC_1_17_Version) entityPalette = new EntityPalette117(); - else if (this.protocolVersion >= MC_1_16_2_Version) + else if (protocolVersion >= MC_1_16_2_Version) entityPalette = new EntityPalette1162(); - else if (this.protocolVersion >= MC_1_16_Version) + else if (protocolVersion >= MC_1_16_Version) entityPalette = new EntityPalette1161(); - else if (this.protocolVersion >= MC_1_15_Version) + else if (protocolVersion >= MC_1_15_Version) entityPalette = new EntityPalette115(); else if (protocolVersion >= MC_1_14_Version) entityPalette = new EntityPalette114(); - else - entityPalette = new EntityPalette113(); + else entityPalette = new EntityPalette113(); } else entityPalette = new EntityPalette112(); @@ -162,14 +161,16 @@ namespace MinecraftClient.Protocol.Handlers if (protocolVersion > MC_1_19_Version && handler.GetInventoryEnabled()) throw new NotImplementedException(Translations.Get("exception.palette.item")); - if (protocolVersion >= MC_1_18_1_Version) + if (protocolVersion == MC_1_19_Version) + itemPalette = new ItemPalette119(); + else if (protocolVersion >= MC_1_18_1_Version) itemPalette = new ItemPalette118(); else if (protocolVersion >= MC_1_17_Version) itemPalette = new ItemPalette117(); else if (protocolVersion >= MC_1_16_2_Version) - itemPalette = new ItemPalette1162(); - else - itemPalette = new ItemPalette1161(); + if (protocolVersion >= MC_1_16_2_Version) + itemPalette = new ItemPalette1162(); + else itemPalette = new ItemPalette1161(); } else itemPalette = new ItemPalette115(); @@ -1424,7 +1425,7 @@ namespace MinecraftClient.Protocol.Handlers healthField = 8; // 1.14 and above if (protocolVersion >= MC_1_17_Version) healthField = 9; // 1.17 and above - if (protocolVersion > MC_1_18_2_Version) + if (protocolVersion > MC_1_19_Version) throw new NotImplementedException(Translations.Get("exception.palette.healthfield")); if (metadata.ContainsKey(healthField) && metadata[healthField] != null && metadata[healthField].GetType() == typeof(float)) @@ -1895,7 +1896,7 @@ namespace MinecraftClient.Protocol.Handlers /// Ping a Minecraft server to get information about the server /// /// True if ping was successful - public static bool doPing(string host, int port, ref int protocolversion, ref ForgeInfo? forgeInfo) + public static bool doPing(string host, int port, ref int protocolVersion, ref ForgeInfo? forgeInfo) { string version = ""; TcpClient tcp = ProxyHandler.newTcpClient(host, port); @@ -1947,12 +1948,12 @@ namespace MinecraftClient.Protocol.Handlers //Retrieve protocol version number for handling this server if (versionData.Properties.ContainsKey("protocol")) - protocolversion = int.Parse(versionData.Properties["protocol"].StringValue); + protocolVersion = int.Parse(versionData.Properties["protocol"].StringValue); // Check for forge on the server. Protocol18Forge.ServerInfoCheckForge(jsonData, ref forgeInfo); - ConsoleIO.WriteLineFormatted(Translations.Get("mcc.server_protocol", version, protocolversion + (forgeInfo != null ? Translations.Get("mcc.with_forge") : ""))); + ConsoleIO.WriteLineFormatted(Translations.Get("mcc.server_protocol", version, protocolVersion + (forgeInfo != null ? Translations.Get("mcc.with_forge") : ""))); return true; }