Skip to content

Commit 1905941

Browse files
milutinkemilutinke
authored
[1.19] Added Entity, Block, Material and Item palettes, Enabled Entity and Inventory handling + Fixed few bugs.
[1.19] Added Entity, Block, Material and Item palettes, Enabled Entity and Inventory handling + Fixed few bugs.
2 parents ee7432d + 71d11f4 commit 1905941

File tree

20 files changed

+3740
-791
lines changed

20 files changed

+3740
-791
lines changed

‎MinecraftClient/Inventory/ItemPalettes/ItemPalette115.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ static ItemPalette115()
335335
mappings[319] = ItemType.AcaciaStairs;
336336
mappings[320] = ItemType.DarkOakStairs;
337337
mappings[321] = ItemType.SlimeBlock;
338-
mappings[322] = ItemType.GrassPath;
338+
mappings[322] = ItemType.DirtPath;
339339
mappings[323] = ItemType.Sunflower;
340340
mappings[324] = ItemType.Lilac;
341341
mappings[325] = ItemType.RoseBush;

‎MinecraftClient/Inventory/ItemPalettes/ItemPalette1161.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ static ItemPalette1161()
385385
mappings[369] = ItemType.AcaciaStairs;
386386
mappings[370] = ItemType.DarkOakStairs;
387387
mappings[371] = ItemType.SlimeBlock;
388-
mappings[372] = ItemType.GrassPath;
388+
mappings[372] = ItemType.DirtPath;
389389
mappings[373] = ItemType.Sunflower;
390390
mappings[374] = ItemType.Lilac;
391391
mappings[375] = ItemType.RoseBush;

‎MinecraftClient/Inventory/ItemPalettes/ItemPalette1162.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ static ItemPalette1162()
385385
mappings[369] = ItemType.AcaciaStairs;
386386
mappings[370] = ItemType.DarkOakStairs;
387387
mappings[371] = ItemType.SlimeBlock;
388-
mappings[372] = ItemType.GrassPath;
388+
mappings[372] = ItemType.DirtPath;
389389
mappings[373] = ItemType.Sunflower;
390390
mappings[374] = ItemType.Lilac;
391391
mappings[375] = ItemType.RoseBush;

‎MinecraftClient/Inventory/ItemPalettes/ItemPalette117.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ static ItemPalette117()
402402
mappings[390] = ItemType.PackedIce;
403403
mappings[391] = ItemType.AcaciaStairs;
404404
mappings[392] = ItemType.DarkOakStairs;
405-
mappings[393] = ItemType.GrassPath;
405+
mappings[393] = ItemType.DirtPath;
406406
mappings[394] = ItemType.Sunflower;
407407
mappings[395] = ItemType.Lilac;
408408
mappings[396] = ItemType.RoseBush;

‎MinecraftClient/Inventory/ItemPalettes/ItemPalette118.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ static ItemPalette118()
402402
mappings[390] = ItemType.PackedIce;
403403
mappings[391] = ItemType.AcaciaStairs;
404404
mappings[392] = ItemType.DarkOakStairs;
405-
mappings[393] = ItemType.GrassPath;
405+
mappings[393] = ItemType.DirtPath;
406406
mappings[394] = ItemType.Sunflower;
407407
mappings[395] = ItemType.Lilac;
408408
mappings[396] = ItemType.RoseBush;

‎MinecraftClient/Inventory/ItemPalettes/ItemPalette119.cs‎

Lines changed: 1171 additions & 0 deletions
Large diffs are not rendered by default.

‎MinecraftClient/Inventory/ItemType.cs‎

Lines changed: 56 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
namespace MinecraftClient.Inventory
22
{
33
/// <summary>
4-
/// For MC version 1.16.2.
5-
/// Generated using ItemPaletteGenerator.
4+
/// Generated using the --generator flag on the client
65
/// Typical steps to handle new item IDs for newer Minecraft versions:
7-
/// 1. Generate registries.json using data reporting on Vanilla Minecraft (https://wiki.vg/Data_Generators)
8-
/// 2. Generate temporary ItemTypeXXX.cs and ItemPaletteXXX.cs using ItemPaletteGenerator.cs
6+
/// 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
7+
/// 2. Generate temporary ItemTypeXXX.cs and ItemPaletteXXX.cs using the --generator flag on the client
98
/// 3. Perform a diff with existing versions, add missing entries in ItemType.cs and ItemTypeExtensions.cs
109
/// 4. If existing entity IDs were not randomized by Mojang, simply add missing entries to the latest existing ItemPaletteXXX.cs
1110
/// 5. If existing entity IDs were randomized, add a new palette as ItemPaletteXXX.cs into the codebase
@@ -14,9 +13,10 @@ public enum ItemType
1413
{
1514
Unknown = -2, // Unsupported item type (Forge mod custom item...)
1615
Null = -1, // Unspecified item type (Used in the network protocol)
17-
16+
1817
AcaciaBoat,
1918
AcaciaButton,
19+
AcaciaChestBoat,
2020
AcaciaDoor,
2121
AcaciaFence,
2222
AcaciaFenceGate,
@@ -32,6 +32,7 @@ public enum ItemType
3232
AcaciaWood,
3333
ActivatorRail,
3434
Air,
35+
AllaySpawnEgg,
3536
Allium,
3637
AmethystBlock,
3738
AmethystCluster,
@@ -69,6 +70,7 @@ public enum ItemType
6970
BigDripleaf,
7071
BirchBoat,
7172
BirchButton,
73+
BirchChestBoat,
7274
BirchDoor,
7375
BirchFence,
7476
BirchFenceGate,
@@ -279,6 +281,7 @@ public enum ItemType
279281
Dandelion,
280282
DarkOakBoat,
281283
DarkOakButton,
284+
DarkOakChestBoat,
282285
DarkOakDoor,
283286
DarkOakFence,
284287
DarkOakFenceGate,
@@ -349,6 +352,8 @@ public enum ItemType
349352
DioriteStairs,
350353
DioriteWall,
351354
Dirt,
355+
DirtPath,
356+
DiscFragment5,
352357
Dispenser,
353358
DolphinSpawnEgg,
354359
DonkeySpawnEgg,
@@ -360,6 +365,7 @@ public enum ItemType
360365
DripstoneBlock,
361366
Dropper,
362367
DrownedSpawnEgg,
368+
EchoShard,
363369
Egg,
364370
ElderGuardianSpawnEgg,
365371
Elytra,
@@ -408,6 +414,8 @@ public enum ItemType
408414
FloweringAzalea,
409415
FloweringAzaleaLeaves,
410416
FoxSpawnEgg,
417+
FrogSpawnEgg,
418+
Frogspawn,
411419
Furnace,
412420
FurnaceMinecart,
413421
GhastSpawnEgg,
@@ -425,6 +433,7 @@ public enum ItemType
425433
GlowSquidSpawnEgg,
426434
Glowstone,
427435
GlowstoneDust,
436+
GoatHorn,
428437
GoatSpawnEgg,
429438
GoldBlock,
430439
GoldIngot,
@@ -448,7 +457,6 @@ public enum ItemType
448457
GraniteWall,
449458
Grass,
450459
GrassBlock,
451-
GrassPath,
452460
Gravel,
453461
GrayBanner,
454462
GrayBed,
@@ -527,6 +535,7 @@ public enum ItemType
527535
Jukebox,
528536
JungleBoat,
529537
JungleButton,
538+
JungleChestBoat,
530539
JungleDoor,
531540
JungleFence,
532541
JungleFenceGate,
@@ -624,6 +633,23 @@ public enum ItemType
624633
MagmaBlock,
625634
MagmaCream,
626635
MagmaCubeSpawnEgg,
636+
MangroveBoat,
637+
MangroveButton,
638+
MangroveChestBoat,
639+
MangroveDoor,
640+
MangroveFence,
641+
MangroveFenceGate,
642+
MangroveLeaves,
643+
MangroveLog,
644+
MangrovePlanks,
645+
MangrovePressurePlate,
646+
MangrovePropagule,
647+
MangroveRoots,
648+
MangroveSign,
649+
MangroveSlab,
650+
MangroveStairs,
651+
MangroveTrapdoor,
652+
MangroveWood,
627653
Map,
628654
MediumAmethystBud,
629655
Melon,
@@ -643,11 +669,18 @@ public enum ItemType
643669
MossyStoneBrickStairs,
644670
MossyStoneBrickWall,
645671
MossyStoneBricks,
672+
Mud,
673+
MudBrickSlab,
674+
MudBrickStairs,
675+
MudBrickWall,
676+
MudBricks,
677+
MuddyMangroveRoots,
646678
MuleSpawnEgg,
647679
MushroomStem,
648680
MushroomStew,
649681
MusicDisc11,
650682
MusicDisc13,
683+
MusicDisc5,
651684
MusicDiscBlocks,
652685
MusicDiscCat,
653686
MusicDiscChirp,
@@ -692,6 +725,7 @@ public enum ItemType
692725
NoteBlock,
693726
OakBoat,
694727
OakButton,
728+
OakChestBoat,
695729
OakDoor,
696730
OakFence,
697731
OakFenceGate,
@@ -708,6 +742,7 @@ public enum ItemType
708742
Observer,
709743
Obsidian,
710744
OcelotSpawnEgg,
745+
OchreFroglight,
711746
OrangeBanner,
712747
OrangeBed,
713748
OrangeCandle,
@@ -728,10 +763,12 @@ public enum ItemType
728763
OxidizedCutCopperSlab,
729764
OxidizedCutCopperStairs,
730765
PackedIce,
766+
PackedMud,
731767
Painting,
732768
PandaSpawnEgg,
733769
Paper,
734770
ParrotSpawnEgg,
771+
PearlescentFroglight,
735772
Peony,
736773
PetrifiedOakSlab,
737774
PhantomMembrane,
@@ -843,6 +880,7 @@ public enum ItemType
843880
RawGoldBlock,
844881
RawIron,
845882
RawIronBlock,
883+
RecoveryCompass,
846884
RedBanner,
847885
RedBed,
848886
RedCandle,
@@ -873,6 +911,7 @@ public enum ItemType
873911
RedstoneLamp,
874912
RedstoneOre,
875913
RedstoneTorch,
914+
ReinforcedDeepslate,
876915
Repeater,
877916
RepeatingCommandBlock,
878917
RespawnAnchor,
@@ -889,7 +928,11 @@ public enum ItemType
889928
SandstoneStairs,
890929
SandstoneWall,
891930
Scaffolding,
931+
Sculk,
932+
SculkCatalyst,
892933
SculkSensor,
934+
SculkShrieker,
935+
SculkVein,
893936
Scute,
894937
SeaLantern,
895938
SeaPickle,
@@ -942,6 +985,7 @@ public enum ItemType
942985
SporeBlossom,
943986
SpruceBoat,
944987
SpruceButton,
988+
SpruceChestBoat,
945989
SpruceDoor,
946990
SpruceFence,
947991
SpruceFenceGate,
@@ -987,6 +1031,8 @@ public enum ItemType
9871031
StrippedDarkOakWood,
9881032
StrippedJungleLog,
9891033
StrippedJungleWood,
1034+
StrippedMangroveLog,
1035+
StrippedMangroveWood,
9901036
StrippedOakLog,
9911037
StrippedOakWood,
9921038
StrippedSpruceLog,
@@ -1000,6 +1046,8 @@ public enum ItemType
10001046
Sunflower,
10011047
SuspiciousStew,
10021048
SweetBerries,
1049+
TadpoleBucket,
1050+
TadpoleSpawnEgg,
10031051
TallGrass,
10041052
Target,
10051053
Terracotta,
@@ -1024,11 +1072,13 @@ public enum ItemType
10241072
TurtleHelmet,
10251073
TurtleSpawnEgg,
10261074
TwistingVines,
1075+
VerdantFroglight,
10271076
VexSpawnEgg,
10281077
VillagerSpawnEgg,
10291078
VindicatorSpawnEgg,
10301079
Vine,
10311080
WanderingTraderSpawnEgg,
1081+
WardenSpawnEgg,
10321082
WarpedButton,
10331083
WarpedDoor,
10341084
WarpedFence,

‎MinecraftClient/Mapping/BlockPalettes/Palette113.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ static Palette113()
760760
materials[8158] = Material.EndStoneBricks;
761761
for (int i = 8159; i <= 8162; i++)
762762
materials[i] = Material.Beetroots;
763-
materials[8163] = Material.GrassPath;
763+
materials[8163] = Material.DirtPath;
764764
materials[8164] = Material.EndGateway;
765765
for (int i = 8165; i <= 8176; i++)
766766
materials[i] = Material.RepeatingCommandBlock;

‎MinecraftClient/Mapping/BlockPalettes/Palette114.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ static Palette114()
792792
materials[8682] = Material.EndStoneBricks;
793793
for (int i = 8683; i <= 8686; i++)
794794
materials[i] = Material.Beetroots;
795-
materials[8687] = Material.GrassPath;
795+
materials[8687] = Material.DirtPath;
796796
materials[8688] = Material.EndGateway;
797797
for (int i = 8689; i <= 8700; i++)
798798
materials[i] = Material.RepeatingCommandBlock;

‎MinecraftClient/Mapping/BlockPalettes/Palette115.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ static Palette115()
792792
materials[8682] = Material.EndStoneBricks;
793793
for (int i = 8683; i <= 8686; i++)
794794
materials[i] = Material.Beetroots;
795-
materials[8687] = Material.GrassPath;
795+
materials[8687] = Material.DirtPath;
796796
materials[8688] = Material.EndGateway;
797797
for (int i = 8689; i <= 8700; i++)
798798
materials[i] = Material.RepeatingCommandBlock;

0 commit comments

Comments
 (0)