Inventory, Terrain and Entity handling

This commit is contained in:
Anon 2024-07-02 11:08:46 +02:00
parent 58a5260b5b
commit 5a6fd577e5
35 changed files with 3456 additions and 66 deletions

View file

@ -641,7 +641,7 @@ namespace MinecraftClient.Mapping.BlockPalettes
materials[i] = Material.GraniteStairs;
for (int i = 15315; i <= 15638; i++)
materials[i] = Material.GraniteWall;
materials[2005] = Material.Grass;
materials[2005] = Material.ShortGrass;
for (int i = 8; i <= 9; i++)
materials[i] = Material.GrassBlock;
materials[118] = Material.Gravel;

View file

@ -43,7 +43,7 @@ namespace MinecraftClient.Mapping.BlockPalettes
{ 28, Material.DetectorRail },
{ 29, Material.StickyPiston }, // PistonStickyBase
{ 30, Material.Cobweb }, // Web
{ 31, Material.Grass }, // LongGrass
{ 31, Material.TallGrass }, // LongGrass
{ 32, Material.DeadBush },
{ 33, Material.Piston }, // PistonBase
{ 34, Material.PistonHead }, // PistonExtension

View file

@ -167,7 +167,7 @@ namespace MinecraftClient.Mapping.BlockPalettes
for (int i = 1028; i <= 1039; i++)
materials[i] = Material.StickyPiston;
materials[1040] = Material.Cobweb;
materials[1041] = Material.Grass;
materials[1041] = Material.ShortGrass;
materials[1042] = Material.Fern;
materials[1043] = Material.DeadBush;
materials[1044] = Material.Seagrass;

View file

@ -167,7 +167,7 @@ namespace MinecraftClient.Mapping.BlockPalettes
for (int i = 1328; i <= 1339; i++)
materials[i] = Material.StickyPiston;
materials[1340] = Material.Cobweb;
materials[1341] = Material.Grass;
materials[1341] = Material.ShortGrass;
materials[1342] = Material.Fern;
materials[1343] = Material.DeadBush;
materials[1344] = Material.Seagrass;

View file

@ -167,7 +167,7 @@ namespace MinecraftClient.Mapping.BlockPalettes
for (int i = 1328; i <= 1339; i++)
materials[i] = Material.StickyPiston;
materials[1340] = Material.Cobweb;
materials[1341] = Material.Grass;
materials[1341] = Material.ShortGrass;
materials[1342] = Material.Fern;
materials[1343] = Material.DeadBush;
materials[1344] = Material.Seagrass;

View file

@ -164,7 +164,7 @@ namespace MinecraftClient.Mapping.BlockPalettes
for (int i = 1329; i <= 1340; i++)
materials[i] = Material.StickyPiston;
materials[1341] = Material.Cobweb;
materials[1342] = Material.Grass;
materials[1342] = Material.ShortGrass;
materials[1343] = Material.Fern;
materials[1344] = Material.DeadBush;
materials[1345] = Material.Seagrass;

View file

@ -172,7 +172,7 @@ namespace MinecraftClient.Mapping.BlockPalettes
for (int i = 1385; i <= 1396; i++)
materials[i] = Material.StickyPiston;
materials[1397] = Material.Cobweb;
materials[1398] = Material.Grass;
materials[1398] = Material.ShortGrass;
materials[1399] = Material.Fern;
materials[1400] = Material.DeadBush;
materials[1401] = Material.Seagrass;

View file

@ -554,7 +554,7 @@ namespace MinecraftClient.Mapping.BlockPalettes
materials[i] = Material.GraniteStairs;
for (int i = 13044; i <= 13367; i++)
materials[i] = Material.GraniteWall;
materials[1596] = Material.Grass;
materials[1596] = Material.ShortGrass;
for (int i = 8; i <= 9; i++)
materials[i] = Material.GrassBlock;
materials[109] = Material.Gravel;

View file

@ -604,7 +604,7 @@ namespace MinecraftClient.Mapping.BlockPalettes
materials[i] = Material.GraniteStairs;
for (int i = 14828; i <= 15151; i++)
materials[i] = Material.GraniteWall;
materials[1954] = Material.Grass;
materials[1954] = Material.ShortGrass;
for (int i = 8; i <= 9; i++)
materials[i] = Material.GrassBlock;
materials[111] = Material.Gravel;

View file

@ -639,7 +639,7 @@ namespace MinecraftClient.Mapping.BlockPalettes
materials[i] = Material.GraniteStairs;
for (int i = 15297; i <= 15620; i++)
materials[i] = Material.GraniteWall;
materials[2001] = Material.Grass;
materials[2001] = Material.ShortGrass;
for (int i = 8; i <= 9; i++)
materials[i] = Material.GrassBlock;
materials[118] = Material.Gravel;

File diff suppressed because it is too large Load diff

View file

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

View file

@ -16,6 +16,7 @@
{
Allay,
AreaEffectCloud,
Armadillo,
ArmorStand,
Arrow,
Axolotl,
@ -24,7 +25,9 @@
Blaze,
BlockDisplay,
Boat,
Bogged,
Breeze,
BreezeWindCharge,
Camel,
Cat,
CaveSpider,
@ -84,6 +87,7 @@
Mooshroom,
Mule,
Ocelot,
OminousItemSpawner,
Painting,
Panda,
Parrot,

View file

@ -409,7 +409,6 @@
GraniteSlab,
GraniteStairs,
GraniteWall,
Grass, // 1.20.3+ renamed to ShortGrass
GrassBlock,
Gravel,
GrayBanner,
@ -443,6 +442,7 @@
Grindstone,
HangingRoots,
HayBlock,
HeavyCore,
HeavyWeightedPressurePlate,
HoneyBlock,
HoneycombBlock,
@ -965,6 +965,7 @@
TurtleEgg,
TwistingVines,
TwistingVinesPlant,
Vault,
VerdantFroglight,
Vine,
VoidAir,

View file

@ -365,7 +365,7 @@ namespace MinecraftClient.Mapping
Material.CyanConcretePowder,
Material.Dirt,
Material.Farmland,
Material.Grass,
Material.ShortGrass,
Material.GrassBlock,
Material.DirtPath,
Material.Gravel,
@ -374,6 +374,7 @@ namespace MinecraftClient.Mapping
Material.LightBlueConcretePowder,
Material.LightGrayConcretePowder,
Material.LimeConcretePowder,
Material.TallGrass,
Material.MagentaConcretePowder,
Material.Mycelium,
Material.OrangeConcretePowder,