Add 1.19 block palette

This commit is contained in:
BruceChen 2022-08-28 18:39:59 +08:00
parent 7ceb4807f3
commit 9e4184a98d
10 changed files with 1778 additions and 212 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

File diff suppressed because it is too large Load diff

View file

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

View file

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

View file

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

File diff suppressed because it is too large Load diff