helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-11-07 17:36:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed requested changes in the review. Except: Container (TODO)

Browse source
This commit is contained in:
Dušan Milutinović 2022-06-28 13:45:23 +02:00
parent 3ea109b330
commit 9d3357eeee
8 changed files with 1809 additions and 1799 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MinecraftClient/Mapping/BlockPalettes/BlockPaletteGenerator.cs
View file

@ -29,7 +29,7 @@ namespace MinecraftClient.Mapping.BlockPalettes
/// <param name="blocksJsonFile">path to blocks.json</param>
/// <remarks>java -cp minecraft_server.jar net.minecraft.data.Main --reports</remarks>
/// <returns>state => block name mappings</returns>
public static void GenerateBlockPallete(string blocksJsonFile)
public static void GenerateBlockPalette(string blocksJsonFile)
{
BlockPaletteGenerator.JsonToClass(blocksJsonFile, "Palette", "Material");
}

34
MinecraftClient/Mapping/EntityType.cs
View file

@ -24,26 +24,34 @@ namespace MinecraftClient.Mapping
Boat,
Cat,
CaveSpider,
ChestMinecart,
Chicken,
Cod,
CommandBlockMinecart,
Cow,
Creeper,
Dolphin,
Donkey,
DragonFireball,
Drowned,
Egg,
ElderGuardian,
EndCrystal,
EnderDragon,
Enderman,
Endermite,
EnderPearl,
Evoker,
EvokerFangs,
ExperienceBottle,
ExperienceOrb,
EyeOfEnder,
FallingBlock,
Fireball,
FireworkRocket,
FishingBobber,
Fox,
FurnaceMinecart,
Ghast,
Giant,
GlowItemFrame,
@ -51,13 +59,13 @@ namespace MinecraftClient.Mapping
Goat,
Guardian,
Hoglin,
HopperMinecart,
Horse,
Husk,
Illusioner,
IronGolem,
Item,
ItemFrame,
Fireball,
LeashKnot,
LightningBolt,
Llama,
@ -65,14 +73,8 @@ namespace MinecraftClient.Mapping
MagmaCube,
Marker,
Minecart,
ChestMinecart,
CommandBlockMinecart,
FurnaceMinecart,
HopperMinecart,
SpawnerMinecart,
TntMinecart,
Mule,
Mooshroom,
Mule,
Ocelot,
Painting,
Panda,
@ -82,8 +84,9 @@ namespace MinecraftClient.Mapping
Piglin,
PiglinBrute,
Pillager,
Player,
PolarBear,
Tnt,
Potion,
Pufferfish,
Rabbit,
Ravager,
@ -96,19 +99,18 @@ namespace MinecraftClient.Mapping
SkeletonHorse,
Slime,
SmallFireball,
SnowGolem,
Snowball,
SnowGolem,
SpawnerMinecart,
SpectralArrow,
Spider,
Squid,
Stray,
Strider,
Egg,
EnderPearl,
ExperienceBottle,
Potion,
Trident,
Tnt,
TntMinecart,
TraderLlama,
Trident,
TropicalFish,
Turtle,
Vex,
@ -125,7 +127,5 @@ namespace MinecraftClient.Mapping
ZombieHorse,
ZombieVillager,
ZombifiedPiglin,
Player,
FishingBobber,
}
}

1760
MinecraftClient/Mapping/Material.cs
View file

File diff suppressed because it is too large Load diff

40
MinecraftClient/Mapping/Material2Tool.cs
View file

@ -42,12 +42,9 @@ namespace MinecraftClient.Mapping
Material.BrownGlazedTerracotta,
Material.BrownShulkerBox,
Material.BrownTerracotta,
Material.Cauldron,
Material.WaterCauldron,
Material.LavaCauldron,
Material.PowderSnowCauldron,
Material.Chain,
Material.Calcite,
Material.Cauldron,
Material.Chain,
Material.ChippedAnvil,
Material.ChiseledDeepslate,
Material.ChiseledNetherBricks,
@ -58,10 +55,10 @@ namespace MinecraftClient.Mapping
Material.ChiseledStoneBricks,
Material.CoalBlock,
Material.CoalOre,
Material.CobbledDeepslate,
Material.CobbledDeepslateSlab,
Material.CobbledDeepslateStairs,
Material.CobbledDeepslateWall,
Material.CobbledDeepslate,
Material.Cobblestone,
Material.CobblestoneSlab,
Material.CobblestoneStairs,
@ -88,20 +85,20 @@ namespace MinecraftClient.Mapping
Material.Deepslate,
Material.DeepslateBrickSlab,
Material.DeepslateBrickStairs,
Material.DeepslateBricks,
Material.DeepslateBrickWall,
Material.DeepslateBricks,
Material.DeepslateCoalOre,
Material.DeepslateTileSlab,
Material.DeepslateTileStairs,
Material.DeepslateTiles,
Material.DeepslateTileWall,
Material.DeepslateTiles,
Material.DetectorRail,
Material.Diorite,
Material.DioriteSlab,
Material.DioriteStairs,
Material.DioriteWall,
Material.DripstoneBlock,
Material.Dispenser,
Material.DripstoneBlock,
Material.Dropper,
Material.EnchantingTable,
Material.EndRod,
@ -135,6 +132,7 @@ namespace MinecraftClient.Mapping
Material.IronDoor,
Material.IronTrapdoor,
Material.Lantern,
Material.LavaCauldron,
Material.LightBlueConcrete,
Material.LightBlueGlazedTerracotta,
Material.LightBlueShulkerBox,
@ -203,6 +201,7 @@ namespace MinecraftClient.Mapping
Material.PolishedGranite,
Material.PolishedGraniteSlab,
Material.PolishedGraniteStairs,
Material.PowderSnowCauldron,
Material.PoweredRail,
Material.Prismarine,
Material.PrismarineBrickSlab,
@ -271,6 +270,7 @@ namespace MinecraftClient.Mapping
Material.Terracotta,
Material.Tuff,
Material.WarpedNylium,
Material.WaterCauldron,
Material.WhiteConcrete,
Material.WhiteGlazedTerracotta,
Material.WhiteShulkerBox,
@ -641,7 +641,7 @@ namespace MinecraftClient.Mapping
// Liquids
private static readonly List<Material> bucket = new List<Material>()
{
Material.Lava,
Material.Lava,
Material.Water
};
@ -673,7 +673,7 @@ namespace MinecraftClient.Mapping
{
if (pickaxeTier0.Contains(block))
{
return new ItemType[]
return new ItemType[]
{
ItemType.NetheritePickaxe,
ItemType.DiamondPickaxe,
@ -685,7 +685,7 @@ namespace MinecraftClient.Mapping
}
else if (pickaxeTier1.Contains(block))
{
return new ItemType[]
return new ItemType[]
{
ItemType.NetheritePickaxe,
ItemType.DiamondPickaxe,
@ -696,7 +696,7 @@ namespace MinecraftClient.Mapping
}
else if (pickaxeTier2.Contains(block))
{
return new ItemType[]
return new ItemType[]
{
ItemType.NetheritePickaxe,
ItemType.DiamondPickaxe,
@ -705,7 +705,7 @@ namespace MinecraftClient.Mapping
}
else if (pickaxeTier3.Contains(block))
{
return new ItemType[]
return new ItemType[]
{
ItemType.NetheritePickaxe,
ItemType.DiamondPickaxe,
@ -713,7 +713,7 @@ namespace MinecraftClient.Mapping
}
else if (shovel.Contains(block))
{
return new ItemType[]
return new ItemType[]
{
ItemType.NetheriteShovel,
ItemType.DiamondShovel,
@ -725,7 +725,7 @@ namespace MinecraftClient.Mapping
}
else if (axe.Contains(block))
{
return new ItemType[]
return new ItemType[]
{
ItemType.NetheriteAxe,
ItemType.DiamondAxe,
@ -737,14 +737,14 @@ namespace MinecraftClient.Mapping
}
else if (shears.Contains(block))
{
return new ItemType[]
return new ItemType[]
{
ItemType.Shears,
};
}
else if (sword.Contains(block))
{
return new ItemType[]
return new ItemType[]
{
ItemType.NetheriteSword,
ItemType.DiamondSword,
@ -756,7 +756,7 @@ namespace MinecraftClient.Mapping
}
else if (hoe.Contains(block))
{
return new ItemType[]
return new ItemType[]
{
ItemType.NetheriteHoe,
ItemType.DiamondHoe,
@ -768,7 +768,7 @@ namespace MinecraftClient.Mapping
}
else if (bucket.Contains(block))
{
return new ItemType[]
return new ItemType[]
{
ItemType.Bucket,
};