From 640a4e39b72c248a989bd2cb25cddbc074a3903f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 24 Mar 2026 01:16:05 +0000 Subject: [PATCH] Fix CS9107 warnings: use base class properties instead of captured primary constructor parameters Replace lowercase primary constructor parameter references (dataTypes., subComponentRegistry., itemPalette.) with PascalCase base class property references (DataTypes., SubComponentRegistry., ItemPalette.) in method bodies of all StructuredComponent and SubComponent subclasses. This eliminates CS9107 warnings where subclass primary constructor parameters shadow the base class properties they are assigned to. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../1_20_6/AttributeModifiersComponent.cs | 6 +-- .../1_20_6/BannerPatternsComponent.cs | 10 ++-- .../Components/1_20_6/BaseColorComponent.cs | 2 +- .../Components/1_20_6/BeesComponent.cs | 4 +- .../Components/1_20_6/BlockStateComponent.cs | 4 +- .../1_20_6/BundleContentsComponent.cs | 4 +- .../Components/1_20_6/CanBreakComponent.cs | 6 +-- .../Components/1_20_6/CanPlaceOnComponent.cs | 6 +-- .../1_20_6/ChargedProjectilesComponent.cs | 4 +- .../Components/1_20_6/ContainerComponent.cs | 4 +- .../1_20_6/ContainerLootComponent.cs | 2 +- .../Components/1_20_6/CustomDataComponent.cs | 2 +- .../1_20_6/CustomModelDataComponent.cs | 2 +- .../Components/1_20_6/CustomNameComponent.cs | 2 +- .../Components/1_20_6/DamageComponent.cs | 2 +- .../1_20_6/DebugStickStateComponent.cs | 2 +- .../Components/1_20_6/DyeColorComponent.cs | 4 +- .../EnchantmentGlintOverrideComponent.cs | 2 +- .../1_20_6/EnchantmentsComponent.cs | 8 ++-- .../Components/1_20_6/EntityDataComponent.cs | 2 +- .../1_20_6/FireworkExplosionComponent.cs | 2 +- .../Components/1_20_6/FireworksComponent.cs | 6 +-- .../1_20_6/FoodComponentComponent.cs | 12 ++--- .../Components/1_20_6/InstrumentComponent.cs | 14 +++--- .../1_20_6/IntangibleProjectileComponent.cs | 2 +- .../Components/1_20_6/ItemNameComponent.cs | 2 +- .../Components/1_20_6/LockComponent.cs | 2 +- .../1_20_6/LodestoneTrackerComponent.cs | 8 ++-- .../Components/1_20_6/LoreComponent.cs | 4 +- .../Components/1_20_6/MapColorComponent.cs | 2 +- .../1_20_6/MapDecorationsComponent.cs | 2 +- .../Components/1_20_6/MapIdComponent.cs | 2 +- .../1_20_6/MapPostProcessingComponent.cs | 2 +- .../Components/1_20_6/MaxDamageComponent.cs | 2 +- .../1_20_6/MaxStackSizeComponent.cs | 2 +- .../1_20_6/NoteBlockSoundComponent.cs | 2 +- .../1_20_6/OmniousBottleAmplifierComponent.cs | 2 +- .../1_20_6/PotDecorationsComponent.cs | 4 +- .../1_20_6/PotionContentsComponent.cs | 12 ++--- .../Components/1_20_6/ProfileComponent.cs | 48 +++++++++---------- .../Components/1_20_6/RarityComponent.cs | 2 +- .../Components/1_20_6/RecipesComponent.cs | 2 +- .../Components/1_20_6/RepairCostComponent.cs | 2 +- .../1_20_6/SuspiciousStewEffectsComponent.cs | 4 +- .../Components/1_20_6/ToolComponent.cs | 8 ++-- .../Components/1_20_6/TrimComponent.cs | 28 +++++------ .../Components/1_20_6/UnbreakableComponent.cs | 2 +- .../1_20_6/WritableBlookContentComponent.cs | 8 ++-- .../1_20_6/WrittenBlookContentComponent.cs | 20 ++++---- .../1_21/JukeBoxPlayableComponent.cs | 16 +++---- .../1_21_11/AttackRangeComponent.cs | 12 ++--- .../1_21_11/KineticWeaponComponent.cs | 26 +++++----- .../1_21_11/PiercingWeaponComponent.cs | 14 +++--- .../1_21_11/RegistryEitherHolderComponent.cs | 6 +-- .../1_21_11/SwingAnimationComponent.cs | 4 +- .../Components/1_21_11/UseEffectsComponent.cs | 6 +-- .../Components/1_21_2/ConsumableComponent.cs | 40 ++++++++-------- .../1_21_2/DamageResistantComponent.cs | 2 +- .../1_21_2/DeathProtectionComponent.cs | 32 ++++++------- .../Components/1_21_2/EnchantableComponent.cs | 2 +- .../Components/1_21_2/EquippableComponent.cs | 26 +++++----- .../Components/1_21_2/FoodComponent1212.cs | 6 +-- .../Components/1_21_2/ItemModelComponent.cs | 2 +- .../Components/1_21_2/RepairableComponent.cs | 6 +-- .../1_21_2/TooltipStyleComponent.cs | 2 +- .../Components/1_21_2/UseCooldownComponent.cs | 6 +-- .../1_21_2/UseRemainderComponent.cs | 4 +- .../1_21_5/BlocksAttacksComponent.cs | 42 ++++++++-------- .../1_21_5/EitherHolderComponent.cs | 6 +-- .../1_21_5/EnchantmentsComponent1215.cs | 6 +-- .../1_21_5/InstrumentComponent1215.cs | 20 ++++---- .../1_21_5/PaintingVariantHolderComponent.cs | 16 +++---- .../1_21_5/PotionDurationScaleComponent.cs | 2 +- .../1_21_5/ProvidesBannerPatternsComponent.cs | 2 +- .../1_21_5/ProvidesTrimMaterialComponent.cs | 16 +++---- .../1_21_5/SoundEventHolderComponent.cs | 8 ++-- .../1_21_5/TooltipDisplayComponent.cs | 6 +-- .../Components/1_21_5/VarIntComponent.cs | 2 +- .../Components/1_21_5/WeaponComponent.cs | 4 +- .../1_20_6/AttributeSubComponent.cs | 12 ++--- .../1_20_6/BlockPredicateSubcomponent.cs | 14 +++--- .../1_20_6/BlockSetSubcomponent.cs | 4 +- .../1_20_6/DetailsSubComponent.cs | 14 +++--- .../1_20_6/EffectSubComponent.cs | 4 +- .../1_20_6/FireworkExplosionSubComponent.cs | 14 +++--- .../1_20_6/PotionEffectSubComponent.cs | 4 +- .../1_20_6/PropertySubComponent.cs | 10 ++-- .../Subcomponents/1_20_6/RuleSubComponent.cs | 10 ++-- .../1_21/AttributeSubComponent121.cs | 10 ++-- .../1_21/SoundEventSubComponent.cs | 8 ++-- 90 files changed, 366 insertions(+), 366 deletions(-) diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/AttributeModifiersComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/AttributeModifiersComponent.cs index 3cac3667..b458b786 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/AttributeModifiersComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/AttributeModifiersComponent.cs @@ -15,12 +15,12 @@ public class AttributeModifiersComponent(DataTypes dataTypes, ItemPalette itemPa public override void Parse(Queue data) { - NumberOfAttributes = dataTypes.ReadNextVarInt(data); + NumberOfAttributes = DataTypes.ReadNextVarInt(data); for (var i = 0; i < NumberOfAttributes; i++) - Attributes.Add(subComponentRegistry.ParseSubComponent(SubComponents.Attribute, data)); + Attributes.Add(SubComponentRegistry.ParseSubComponent(SubComponents.Attribute, data)); - ShowInTooltip = dataTypes.ReadNextBool(data); + ShowInTooltip = DataTypes.ReadNextBool(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BannerPatternsComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BannerPatternsComponent.cs index 82df01c9..6a69bc79 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BannerPatternsComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BannerPatternsComponent.cs @@ -13,17 +13,17 @@ public class BannerPatternsComponent(DataTypes dataTypes, ItemPalette itemPalett public override void Parse(Queue data) { - NumberOfLayers = dataTypes.ReadNextVarInt(data); + NumberOfLayers = DataTypes.ReadNextVarInt(data); for (var i = 0; i < NumberOfLayers; i++) { - var patternType = dataTypes.ReadNextVarInt(data); + var patternType = DataTypes.ReadNextVarInt(data); Layers.Add(new BannerLayer { PatternType = patternType, - AssetId = patternType == 0 ? dataTypes.ReadNextString(data) : null, - TranslationKey = patternType == 0 ? dataTypes.ReadNextString(data) : null, - DyeColor = dataTypes.ReadNextVarInt(data) + AssetId = patternType == 0 ? DataTypes.ReadNextString(data) : null, + TranslationKey = patternType == 0 ? DataTypes.ReadNextString(data) : null, + DyeColor = DataTypes.ReadNextVarInt(data) }); } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BaseColorComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BaseColorComponent.cs index 0f2d9620..417c658c 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BaseColorComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BaseColorComponent.cs @@ -11,7 +11,7 @@ public class BaseColorComponent(DataTypes dataTypes, ItemPalette itemPalette, Su public override void Parse(Queue data) { - DyeColor = dataTypes.ReadNextVarInt(data); + DyeColor = DataTypes.ReadNextVarInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BeesComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BeesComponent.cs index f0630fe1..cbe0424b 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BeesComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BeesComponent.cs @@ -14,10 +14,10 @@ public class BeesComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComp public override void Parse(Queue data) { - NumberOfBees = dataTypes.ReadNextVarInt(data); + NumberOfBees = DataTypes.ReadNextVarInt(data); for (var i = 0; i < NumberOfBees; i++) { - Bees.Add(new Bee(dataTypes.ReadNextNbt(data), dataTypes.ReadNextVarInt(data), dataTypes.ReadNextVarInt(data))); + Bees.Add(new Bee(DataTypes.ReadNextNbt(data), DataTypes.ReadNextVarInt(data), DataTypes.ReadNextVarInt(data))); } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BlockStateComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BlockStateComponent.cs index 8037d07c..c36bb10c 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BlockStateComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BlockStateComponent.cs @@ -11,9 +11,9 @@ public class BlockStateComponent(DataTypes dataTypes, ItemPalette itemPalette, S public override void Parse(Queue data) { - var count = dataTypes.ReadNextVarInt(data); + var count = DataTypes.ReadNextVarInt(data); for(var i = 0; i < count; i++) - Properties.Add((dataTypes.ReadNextString(data), dataTypes.ReadNextString(data))); + Properties.Add((DataTypes.ReadNextString(data), DataTypes.ReadNextString(data))); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BundleContentsComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BundleContentsComponent.cs index 09f6d7a9..4ff4c4ff 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BundleContentsComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BundleContentsComponent.cs @@ -12,11 +12,11 @@ public class BundleContentsComponent(DataTypes dataTypes, ItemPalette itemPalett public override void Parse(Queue data) { - var count = dataTypes.ReadNextVarInt(data); + var count = DataTypes.ReadNextVarInt(data); for (var i = 0; i < count; i++) { - var item = dataTypes.ReadNextItemSlot(data, itemPalette); + var item = DataTypes.ReadNextItemSlot(data, itemPalette); if (item is not null) Items.Add(item); } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CanBreakComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CanBreakComponent.cs index 06ca3a7b..d561788b 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CanBreakComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CanBreakComponent.cs @@ -16,12 +16,12 @@ public class CanBreakComponent(DataTypes dataTypes, ItemPalette itemPalette, Sub public override void Parse(Queue data) { - NumberOfPredicates = dataTypes.ReadNextVarInt(data); + NumberOfPredicates = DataTypes.ReadNextVarInt(data); for (var i = 0; i < NumberOfPredicates; i++) - BlockPredicates.Add((BlockPredicateSubcomponent)subComponentRegistry.ParseSubComponent(SubComponents.BlockPredicate, data)); + BlockPredicates.Add((BlockPredicateSubcomponent)SubComponentRegistry.ParseSubComponent(SubComponents.BlockPredicate, data)); - ShowInTooltip = dataTypes.ReadNextBool(data); + ShowInTooltip = DataTypes.ReadNextBool(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CanPlaceOnComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CanPlaceOnComponent.cs index 581c089f..2a15d58d 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CanPlaceOnComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CanPlaceOnComponent.cs @@ -16,12 +16,12 @@ public class CanPlaceOnComponent(DataTypes dataTypes, ItemPalette itemPalette, S public override void Parse(Queue data) { - NumberOfPredicates = dataTypes.ReadNextVarInt(data); + NumberOfPredicates = DataTypes.ReadNextVarInt(data); for (var i = 0; i < NumberOfPredicates; i++) - BlockPredicates.Add((BlockPredicateSubcomponent)subComponentRegistry.ParseSubComponent(SubComponents.BlockPredicate, data)); + BlockPredicates.Add((BlockPredicateSubcomponent)SubComponentRegistry.ParseSubComponent(SubComponents.BlockPredicate, data)); - ShowInTooltip = dataTypes.ReadNextBool(data); + ShowInTooltip = DataTypes.ReadNextBool(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ChargedProjectilesComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ChargedProjectilesComponent.cs index ecbf18da..06b5904e 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ChargedProjectilesComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ChargedProjectilesComponent.cs @@ -12,11 +12,11 @@ public class ChargedProjectilesComponent(DataTypes dataTypes, ItemPalette itemPa public override void Parse(Queue data) { - var count = dataTypes.ReadNextVarInt(data); + var count = DataTypes.ReadNextVarInt(data); for (var i = 0; i < count; i++) { - var item = dataTypes.ReadNextItemSlot(data, itemPalette); + var item = DataTypes.ReadNextItemSlot(data, itemPalette); if (item is not null) Items.Add(item); } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ContainerComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ContainerComponent.cs index c132e06f..61428b36 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ContainerComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ContainerComponent.cs @@ -12,9 +12,9 @@ public class ContainerComponent(DataTypes dataTypes, ItemPalette itemPalette, Su public override void Parse(Queue data) { - var count = dataTypes.ReadNextVarInt(data); + var count = DataTypes.ReadNextVarInt(data); for (var i = 0; i < count; i++) - Items.Add(dataTypes.ReadNextItemSlot(data, ItemPalette)); + Items.Add(DataTypes.ReadNextItemSlot(data, ItemPalette)); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ContainerLootComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ContainerLootComponent.cs index d0f951ae..a1ebfa6c 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ContainerLootComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ContainerLootComponent.cs @@ -11,7 +11,7 @@ public class ContainerLootComponent(DataTypes dataTypes, ItemPalette itemPalette public override void Parse(Queue data) { - Nbt = dataTypes.ReadNextNbt(data); + Nbt = DataTypes.ReadNextNbt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CustomDataComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CustomDataComponent.cs index 22b22b70..4abf1782 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CustomDataComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CustomDataComponent.cs @@ -11,7 +11,7 @@ public class CustomDataComponent(DataTypes dataTypes, ItemPalette itemPalette, S public override void Parse(Queue data) { - Nbt = dataTypes.ReadNextNbt(data); + Nbt = DataTypes.ReadNextNbt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CustomModelDataComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CustomModelDataComponent.cs index e8c05528..03fabecd 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CustomModelDataComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CustomModelDataComponent.cs @@ -10,7 +10,7 @@ public class CustomModelDataComponent(DataTypes dataTypes, ItemPalette itemPalet public override void Parse(Queue data) { - Value = dataTypes.ReadNextVarInt(data); + Value = DataTypes.ReadNextVarInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CustomNameComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CustomNameComponent.cs index f4f2fc92..140b60d5 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CustomNameComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/CustomNameComponent.cs @@ -13,7 +13,7 @@ public class CustomNameComponent(DataTypes dataTypes, ItemPalette itemPalette, S public override void Parse(Queue data) { - CustomNameNbt = dataTypes.ReadNextNbt(data); + CustomNameNbt = DataTypes.ReadNextNbt(data); CustomName = ChatParser.ParseText(CustomNameNbt); } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/DamageComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/DamageComponent.cs index 9ac84800..3c377177 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/DamageComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/DamageComponent.cs @@ -11,7 +11,7 @@ public class DamageComponent(DataTypes dataTypes, ItemPalette itemPalette, SubCo public override void Parse(Queue data) { - Damage = dataTypes.ReadNextVarInt(data); + Damage = DataTypes.ReadNextVarInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/DebugStickStateComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/DebugStickStateComponent.cs index 7cfc68e4..3d2eba6d 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/DebugStickStateComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/DebugStickStateComponent.cs @@ -11,7 +11,7 @@ public class DebugStickStateComponent(DataTypes dataTypes, ItemPalette itemPalet public override void Parse(Queue data) { - Nbt = dataTypes.ReadNextNbt(data); + Nbt = DataTypes.ReadNextNbt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/DyeColorComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/DyeColorComponent.cs index fc6de3d0..deb3f584 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/DyeColorComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/DyeColorComponent.cs @@ -12,8 +12,8 @@ public class DyeColorComponent(DataTypes dataTypes, ItemPalette itemPalette, Sub public override void Parse(Queue data) { - Color = dataTypes.ReadNextInt(data); - ShowInTooltip = dataTypes.ReadNextBool(data); + Color = DataTypes.ReadNextInt(data); + ShowInTooltip = DataTypes.ReadNextBool(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/EnchantmentGlintOverrideComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/EnchantmentGlintOverrideComponent.cs index af5ff63c..af8032fc 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/EnchantmentGlintOverrideComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/EnchantmentGlintOverrideComponent.cs @@ -11,7 +11,7 @@ public class EnchantmentGlintOverrideComponent(DataTypes dataTypes, ItemPalette public override void Parse(Queue data) { - HasGlint = dataTypes.ReadNextBool(data); + HasGlint = DataTypes.ReadNextBool(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/EnchantmentsComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/EnchantmentsComponent.cs index bfc942a1..08205408 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/EnchantmentsComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/EnchantmentsComponent.cs @@ -14,16 +14,16 @@ public class EnchantmentsComponent(DataTypes dataTypes, ItemPalette itemPalette, public override void Parse(Queue data) { - NumberOfEnchantments = dataTypes.ReadNextVarInt(data); + NumberOfEnchantments = DataTypes.ReadNextVarInt(data); for (var i = 0; i < NumberOfEnchantments; i++) { - var registryId = dataTypes.ReadNextVarInt(data); - var level = dataTypes.ReadNextVarInt(data); + var registryId = DataTypes.ReadNextVarInt(data); + var level = DataTypes.ReadNextVarInt(data); Enchantments.Add(new Enchantment(EnchantmentMapping.GetEnchantmentByRegistryId1206(registryId), level)); } - ShowTooltip = dataTypes.ReadNextBool(data); + ShowTooltip = DataTypes.ReadNextBool(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/EntityDataComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/EntityDataComponent.cs index a4e6ef98..a40b7bc6 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/EntityDataComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/EntityDataComponent.cs @@ -11,7 +11,7 @@ public class EntityDataComponent(DataTypes dataTypes, ItemPalette itemPalette, S public override void Parse(Queue data) { - Nbt = dataTypes.ReadNextNbt(data); + Nbt = DataTypes.ReadNextNbt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/FireworkExplosionComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/FireworkExplosionComponent.cs index eeb4e876..b85a0d93 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/FireworkExplosionComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/FireworkExplosionComponent.cs @@ -15,7 +15,7 @@ public class FireworkExplosionComponent(DataTypes dataTypes, ItemPalette itemPal public override void Parse(Queue data) { - FireworkExplosionSubComponent = (FireworkExplosionSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.FireworkExplosion, data); + FireworkExplosionSubComponent = (FireworkExplosionSubComponent)SubComponentRegistry.ParseSubComponent(SubComponents.FireworkExplosion, data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/FireworksComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/FireworksComponent.cs index c670e95d..46fdfacd 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/FireworksComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/FireworksComponent.cs @@ -19,14 +19,14 @@ public class FireworksComponent(DataTypes dataTypes, ItemPalette itemPalette, Su public override void Parse(Queue data) { - FlightDuration = dataTypes.ReadNextVarInt(data); - NumberOfExplosions = dataTypes.ReadNextVarInt(data); + FlightDuration = DataTypes.ReadNextVarInt(data); + NumberOfExplosions = DataTypes.ReadNextVarInt(data); if (NumberOfExplosions > 0) { for(var i = 0; i < NumberOfExplosions; i++) Explosions.Add( - (FireworkExplosionSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.FireworkExplosion, + (FireworkExplosionSubComponent)SubComponentRegistry.ParseSubComponent(SubComponents.FireworkExplosion, data)); } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/FoodComponentComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/FoodComponentComponent.cs index aac861c2..276de892 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/FoodComponentComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/FoodComponentComponent.cs @@ -18,14 +18,14 @@ public class FoodComponentComponent(DataTypes dataTypes, ItemPalette itemPalette public override void Parse(Queue data) { - Nutrition = dataTypes.ReadNextVarInt(data); - Saturation = dataTypes.ReadNextFloat(data); - CanAlwaysEat = dataTypes.ReadNextBool(data); - SecondsToEat = dataTypes.ReadNextFloat(data); - var numberOfEffects = dataTypes.ReadNextVarInt(data); + Nutrition = DataTypes.ReadNextVarInt(data); + Saturation = DataTypes.ReadNextFloat(data); + CanAlwaysEat = DataTypes.ReadNextBool(data); + SecondsToEat = DataTypes.ReadNextFloat(data); + var numberOfEffects = DataTypes.ReadNextVarInt(data); for(var i = 0; i < numberOfEffects; i++) - Effects.Add((EffectSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.Effect, data)); + Effects.Add((EffectSubComponent)SubComponentRegistry.ParseSubComponent(SubComponents.Effect, data)); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/InstrumentComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/InstrumentComponent.cs index ccfcf915..8c0895eb 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/InstrumentComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/InstrumentComponent.cs @@ -23,22 +23,22 @@ public class InstrumentComponent(DataTypes dataTypes, ItemPalette itemPalette, S public override void Parse(Queue data) { - InstrumentHolderId = dataTypes.ReadNextVarInt(data); + InstrumentHolderId = DataTypes.ReadNextVarInt(data); if (InstrumentHolderId == 0) { - SoundEventHolderId = dataTypes.ReadNextVarInt(data); + SoundEventHolderId = DataTypes.ReadNextVarInt(data); if (SoundEventHolderId == 0) { - SoundLocation = dataTypes.ReadNextString(data); - HasFixedRange = dataTypes.ReadNextBool(data); + SoundLocation = DataTypes.ReadNextString(data); + HasFixedRange = DataTypes.ReadNextBool(data); if (HasFixedRange) - FixedRange = dataTypes.ReadNextFloat(data); + FixedRange = DataTypes.ReadNextFloat(data); } - UseDuration = dataTypes.ReadNextVarInt(data); - Range = dataTypes.ReadNextFloat(data); + UseDuration = DataTypes.ReadNextVarInt(data); + Range = DataTypes.ReadNextFloat(data); } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/IntangibleProjectileComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/IntangibleProjectileComponent.cs index cba25e6e..5006fad0 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/IntangibleProjectileComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/IntangibleProjectileComponent.cs @@ -11,7 +11,7 @@ public class IntangibleProjectileComponent(DataTypes dataTypes, ItemPalette item public override void Parse(Queue data) { - Nbt = dataTypes.ReadNextNbt(data); + Nbt = DataTypes.ReadNextNbt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ItemNameComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ItemNameComponent.cs index 6fc8ae3e..3aa26373 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ItemNameComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ItemNameComponent.cs @@ -13,7 +13,7 @@ public class ItemNameComponent(DataTypes dataTypes, ItemPalette itemPalette, Sub public override void Parse(Queue data) { - ItemNameNbt = dataTypes.ReadNextNbt(data); + ItemNameNbt = DataTypes.ReadNextNbt(data); ItemName = ChatParser.ParseText(ItemNameNbt); } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/LockComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/LockComponent.cs index c9ebe0b0..cc7b924c 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/LockComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/LockComponent.cs @@ -11,7 +11,7 @@ public class LockComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComp public override void Parse(Queue data) { - Nbt = dataTypes.ReadNextNbt(data); + Nbt = DataTypes.ReadNextNbt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/LodestoneTrackerComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/LodestoneTrackerComponent.cs index 702b8763..b1cdda3a 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/LodestoneTrackerComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/LodestoneTrackerComponent.cs @@ -15,15 +15,15 @@ public class LodestoneTrackerComponent(DataTypes dataTypes, ItemPalette itemPale public override void Parse(Queue data) { - HasGlobalPosition = dataTypes.ReadNextBool(data); + HasGlobalPosition = DataTypes.ReadNextBool(data); if (HasGlobalPosition) { - Dimension = dataTypes.ReadNextString(data); - Position = dataTypes.ReadNextLocation(data); + Dimension = DataTypes.ReadNextString(data); + Position = DataTypes.ReadNextLocation(data); } - Tracked = dataTypes.ReadNextBool(data); + Tracked = DataTypes.ReadNextBool(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/LoreComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/LoreComponent.cs index aaca1b72..2c5219f9 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/LoreComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/LoreComponent.cs @@ -14,13 +14,13 @@ public class LoreNameComponent1206(DataTypes dataTypes, ItemPalette itemPalette, public override void Parse(Queue data) { - NumberOfLines = dataTypes.ReadNextVarInt(data); + NumberOfLines = DataTypes.ReadNextVarInt(data); if (NumberOfLines <= 0) return; for (var i = 0; i < NumberOfLines; i++) { - var lineNbt = dataTypes.ReadNextNbt(data); + var lineNbt = DataTypes.ReadNextNbt(data); LinesNbt.Add(lineNbt); Lines.Add(ChatParser.ParseText(lineNbt)); } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MapColorComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MapColorComponent.cs index 7c7e9186..af5a6989 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MapColorComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MapColorComponent.cs @@ -11,7 +11,7 @@ public class MapColorComponent(DataTypes dataTypes, ItemPalette itemPalette, Sub public override void Parse(Queue data) { - Id = dataTypes.ReadNextInt(data); + Id = DataTypes.ReadNextInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MapDecorationsComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MapDecorationsComponent.cs index c6f8f343..4c38ec50 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MapDecorationsComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MapDecorationsComponent.cs @@ -11,7 +11,7 @@ public class MapDecorationsComponent(DataTypes dataTypes, ItemPalette itemPalett public override void Parse(Queue data) { - Nbt = dataTypes.ReadNextNbt(data); + Nbt = DataTypes.ReadNextNbt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MapIdComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MapIdComponent.cs index 2df65305..88312a23 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MapIdComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MapIdComponent.cs @@ -11,7 +11,7 @@ public class MapIdComponent(DataTypes dataTypes, ItemPalette itemPalette, SubCom public override void Parse(Queue data) { - Id = dataTypes.ReadNextVarInt(data); + Id = DataTypes.ReadNextVarInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MapPostProcessingComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MapPostProcessingComponent.cs index 3d02a8bf..cda1ced4 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MapPostProcessingComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MapPostProcessingComponent.cs @@ -11,7 +11,7 @@ public class MapPostProcessingComponent(DataTypes dataTypes, ItemPalette itemPal public override void Parse(Queue data) { - Type = dataTypes.ReadNextVarInt(data); + Type = DataTypes.ReadNextVarInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MaxDamageComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MaxDamageComponent.cs index 8edbd0c2..fd90e8bf 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MaxDamageComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MaxDamageComponent.cs @@ -11,7 +11,7 @@ public class MaxDamageComponent(DataTypes dataTypes, ItemPalette itemPalette, Su public override void Parse(Queue data) { - MaxDamage = dataTypes.ReadNextVarInt(data); + MaxDamage = DataTypes.ReadNextVarInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MaxStackSizeComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MaxStackSizeComponent.cs index 11855c6a..6bd20710 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MaxStackSizeComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/MaxStackSizeComponent.cs @@ -11,7 +11,7 @@ public class MaxStackSizeComponent(DataTypes dataTypes, ItemPalette itemPalette, public override void Parse(Queue data) { - MaxStackSize = dataTypes.ReadNextVarInt(data); + MaxStackSize = DataTypes.ReadNextVarInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/NoteBlockSoundComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/NoteBlockSoundComponent.cs index d4c0a157..985c7609 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/NoteBlockSoundComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/NoteBlockSoundComponent.cs @@ -11,7 +11,7 @@ public class NoteBlockSoundComponent(DataTypes dataTypes, ItemPalette itemPalett public override void Parse(Queue data) { - Identifier = dataTypes.ReadNextString(data); + Identifier = DataTypes.ReadNextString(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/OmniousBottleAmplifierComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/OmniousBottleAmplifierComponent.cs index f92a23e7..6f688b79 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/OmniousBottleAmplifierComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/OmniousBottleAmplifierComponent.cs @@ -11,7 +11,7 @@ public class OmniousBottleAmplifierComponent(DataTypes dataTypes, ItemPalette it public override void Parse(Queue data) { - Amplifier = dataTypes.ReadNextVarInt(data); + Amplifier = DataTypes.ReadNextVarInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/PotDecorationsComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/PotDecorationsComponent.cs index 0acc10e6..e7bf200e 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/PotDecorationsComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/PotDecorationsComponent.cs @@ -11,9 +11,9 @@ public class PotDecorationsComponent(DataTypes dataTypes, ItemPalette itemPalett public override void Parse(Queue data) { - var count = dataTypes.ReadNextVarInt(data); + var count = DataTypes.ReadNextVarInt(data); for(var i = 0; i < count; i++) - Items.Add(dataTypes.ReadNextVarInt(data)); + Items.Add(DataTypes.ReadNextVarInt(data)); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/PotionContentsComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/PotionContentsComponent.cs index e8b3443e..ff76f5a7 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/PotionContentsComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/PotionContentsComponent.cs @@ -17,17 +17,17 @@ public class PotionContentsComponent(DataTypes dataTypes, ItemPalette itemPalett public override void Parse(Queue data) { - HasPotionId = dataTypes.ReadNextBool(data); + HasPotionId = DataTypes.ReadNextBool(data); if (HasPotionId) - PotionId = dataTypes.ReadNextVarInt(data); + PotionId = DataTypes.ReadNextVarInt(data); - HasCustomColor = dataTypes.ReadNextBool(data); + HasCustomColor = DataTypes.ReadNextBool(data); if (HasCustomColor) - CustomColor = dataTypes.ReadNextInt(data); + CustomColor = DataTypes.ReadNextInt(data); - var numberOfEffects = dataTypes.ReadNextVarInt(data); + var numberOfEffects = DataTypes.ReadNextVarInt(data); for (var i = 0; i < numberOfEffects; i++) - Effects.Add((PotionEffectSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.PotionEffect, data)); + Effects.Add((PotionEffectSubComponent)SubComponentRegistry.ParseSubComponent(SubComponents.PotionEffect, data)); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ProfileComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ProfileComponent.cs index cafacfec..d8540488 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ProfileComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ProfileComponent.cs @@ -23,7 +23,7 @@ public class ProfileComponent(DataTypes dataTypes, ItemPalette itemPalette, SubC { ResetState(); - if (dataTypes.ProtocolVersion >= Protocol18Handler.MC_1_21_9_Version) + if (DataTypes.ProtocolVersion >= Protocol18Handler.MC_1_21_9_Version) { ParseResolvableProfile(data); return; @@ -34,7 +34,7 @@ public class ProfileComponent(DataTypes dataTypes, ItemPalette itemPalette, SubC public override Queue Serialize() { - return dataTypes.ProtocolVersion >= Protocol18Handler.MC_1_21_9_Version + return DataTypes.ProtocolVersion >= Protocol18Handler.MC_1_21_9_Version ? SerializeResolvableProfile() : SerializeLegacyProfile(); } @@ -56,44 +56,44 @@ public class ProfileComponent(DataTypes dataTypes, ItemPalette itemPalette, SubC private void ParseLegacyProfile(Queue data) { - HasName = dataTypes.ReadNextBool(data); + HasName = DataTypes.ReadNextBool(data); if (HasName) - Name = dataTypes.ReadNextString(data); + Name = DataTypes.ReadNextString(data); - HasUniqueId = dataTypes.ReadNextBool(data); + HasUniqueId = DataTypes.ReadNextBool(data); if (HasUniqueId) - Uuid = dataTypes.ReadNextUUID(data); + Uuid = DataTypes.ReadNextUUID(data); - NumberOfProperties = dataTypes.ReadNextVarInt(data); + NumberOfProperties = DataTypes.ReadNextVarInt(data); ProfileProperties = ReadProfileProperties(data, NumberOfProperties); } private void ParseResolvableProfile(Queue data) { - IsFullProfile = dataTypes.ReadNextBool(data); + IsFullProfile = DataTypes.ReadNextBool(data); if (IsFullProfile) { HasUniqueId = true; - Uuid = dataTypes.ReadNextUUID(data); + Uuid = DataTypes.ReadNextUUID(data); HasName = true; - Name = dataTypes.ReadNextString(data); - NumberOfProperties = dataTypes.ReadNextVarInt(data); + Name = DataTypes.ReadNextString(data); + NumberOfProperties = DataTypes.ReadNextVarInt(data); ProfileProperties = ReadProfileProperties(data, NumberOfProperties); } else { - HasName = dataTypes.ReadNextBool(data); + HasName = DataTypes.ReadNextBool(data); if (HasName) - Name = dataTypes.ReadNextString(data); + Name = DataTypes.ReadNextString(data); - HasUniqueId = dataTypes.ReadNextBool(data); + HasUniqueId = DataTypes.ReadNextBool(data); if (HasUniqueId) - Uuid = dataTypes.ReadNextUUID(data); + Uuid = DataTypes.ReadNextUUID(data); - NumberOfProperties = dataTypes.ReadNextVarInt(data); + NumberOfProperties = DataTypes.ReadNextVarInt(data); ProfileProperties = ReadProfileProperties(data, NumberOfProperties); } @@ -101,8 +101,8 @@ public class ProfileComponent(DataTypes dataTypes, ItemPalette itemPalette, SubC CapeAssetId = ReadOptionalResourceLocation(data); ElytraAssetId = ReadOptionalResourceLocation(data); - if (dataTypes.ReadNextBool(data)) - Model = dataTypes.ReadNextBool(data) ? ProfileSkinModel.Slim : ProfileSkinModel.Wide; + if (DataTypes.ReadNextBool(data)) + Model = DataTypes.ReadNextBool(data) ? ProfileSkinModel.Slim : ProfileSkinModel.Wide; } private Queue SerializeLegacyProfile() @@ -171,7 +171,7 @@ public class ProfileComponent(DataTypes dataTypes, ItemPalette itemPalette, SubC data.AddRange(DataTypes.GetBool(Model.HasValue)); if (Model.HasValue) - data.AddRange(dataTypes.GetBool(Model.Value == ProfileSkinModel.Slim)); + data.AddRange(DataTypes.GetBool(Model.Value == ProfileSkinModel.Slim)); return new Queue(data); } @@ -181,10 +181,10 @@ public class ProfileComponent(DataTypes dataTypes, ItemPalette itemPalette, SubC var properties = new List(count); for (var i = 0; i < count; i++) { - var propertyName = dataTypes.ReadNextString(data); - var propertyValue = dataTypes.ReadNextString(data); - var hasSignature = dataTypes.ReadNextBool(data); - var signature = hasSignature ? dataTypes.ReadNextString(data) : null; + var propertyName = DataTypes.ReadNextString(data); + var propertyValue = DataTypes.ReadNextString(data); + var hasSignature = DataTypes.ReadNextBool(data); + var signature = hasSignature ? DataTypes.ReadNextString(data) : null; properties.Add(new ProfileProperty(propertyName, propertyValue, hasSignature, signature)); } @@ -211,7 +211,7 @@ public class ProfileComponent(DataTypes dataTypes, ItemPalette itemPalette, SubC private string? ReadOptionalResourceLocation(Queue data) { - return dataTypes.ReadNextBool(data) ? dataTypes.ReadNextString(data) : null; + return DataTypes.ReadNextBool(data) ? DataTypes.ReadNextString(data) : null; } private void SerializeOptionalResourceLocation(List data, string? resourceLocation) diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/RarityComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/RarityComponent.cs index 4da4cb00..2814cf2b 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/RarityComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/RarityComponent.cs @@ -12,7 +12,7 @@ public class RarityComponent(DataTypes dataTypes, ItemPalette itemPalette, SubCo public override void Parse(Queue data) { - Rarity = (ItemRarity)dataTypes.ReadNextVarInt(data); + Rarity = (ItemRarity)DataTypes.ReadNextVarInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/RecipesComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/RecipesComponent.cs index a1101eca..7f95bcd0 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/RecipesComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/RecipesComponent.cs @@ -11,7 +11,7 @@ public class RecipesComponent(DataTypes dataTypes, ItemPalette itemPalette, SubC public override void Parse(Queue data) { - Nbt = dataTypes.ReadNextNbt(data); + Nbt = DataTypes.ReadNextNbt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/RepairCostComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/RepairCostComponent.cs index ccd1e2b5..b025a0a7 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/RepairCostComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/RepairCostComponent.cs @@ -11,7 +11,7 @@ public class RepairCostComponent(DataTypes dataTypes, ItemPalette itemPalette, S public override void Parse(Queue data) { - Cost = dataTypes.ReadNextVarInt(data); + Cost = DataTypes.ReadNextVarInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/SuspiciousStewEffectsComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/SuspiciousStewEffectsComponent.cs index a6d81d9a..d97dee90 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/SuspiciousStewEffectsComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/SuspiciousStewEffectsComponent.cs @@ -15,10 +15,10 @@ public class SuspiciousStewEffectsComponent(DataTypes dataTypes, ItemPalette ite public override void Parse(Queue data) { - NumberOfEffects = dataTypes.ReadNextVarInt(data); + NumberOfEffects = DataTypes.ReadNextVarInt(data); for (var i = 0; i < NumberOfEffects; i++) - Effects.Add(new SuspiciousStewEffect(dataTypes.ReadNextVarInt(data), dataTypes.ReadNextVarInt(data))); + Effects.Add(new SuspiciousStewEffect(DataTypes.ReadNextVarInt(data), DataTypes.ReadNextVarInt(data))); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ToolComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ToolComponent.cs index 3c09e43e..033d41bf 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ToolComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ToolComponent.cs @@ -17,13 +17,13 @@ public class ToolComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComp public override void Parse(Queue data) { - NumberOfRules = dataTypes.ReadNextVarInt(data); + NumberOfRules = DataTypes.ReadNextVarInt(data); for (var i = 0; i < NumberOfRules; i++) - Rules.Add((RuleSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.Rule, data)); + Rules.Add((RuleSubComponent)SubComponentRegistry.ParseSubComponent(SubComponents.Rule, data)); - DefaultMiningSpeed = dataTypes.ReadNextFloat(data); - DamagePerBlock = dataTypes.ReadNextVarInt(data); + DefaultMiningSpeed = DataTypes.ReadNextFloat(data); + DamagePerBlock = DataTypes.ReadNextVarInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/TrimComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/TrimComponent.cs index 374f1962..ed474825 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/TrimComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/TrimComponent.cs @@ -27,40 +27,40 @@ public class TrimComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComp public override void Parse(Queue data) { - TrimMaterialType = dataTypes.ReadNextVarInt(data); + TrimMaterialType = DataTypes.ReadNextVarInt(data); if (TrimMaterialType == 0) { - AssetName = dataTypes.ReadNextString(data); - Ingredient = dataTypes.ReadNextVarInt(data); - ItemModelIndex = dataTypes.ReadNextFloat(data); - NumberOfOverrides = dataTypes.ReadNextVarInt(data); + AssetName = DataTypes.ReadNextString(data); + Ingredient = DataTypes.ReadNextVarInt(data); + ItemModelIndex = DataTypes.ReadNextFloat(data); + NumberOfOverrides = DataTypes.ReadNextVarInt(data); if (NumberOfOverrides > 0) { Overrides = []; for (var i = 0; i < NumberOfOverrides; i++) - Overrides.Add(new TrimAssetOverride(dataTypes.ReadNextVarInt(data), - dataTypes.ReadNextString(data))); + Overrides.Add(new TrimAssetOverride(DataTypes.ReadNextVarInt(data), + DataTypes.ReadNextString(data))); } - DescriptionNbt = dataTypes.ReadNextNbt(data); + DescriptionNbt = DataTypes.ReadNextNbt(data); Description = ChatParser.ParseText(DescriptionNbt); } - TrimPatternType = dataTypes.ReadNextVarInt(data); + TrimPatternType = DataTypes.ReadNextVarInt(data); if (TrimPatternType == 0) { - TrimPatternTypeAssetName = dataTypes.ReadNextString(data); - TemplateItem = dataTypes.ReadNextVarInt(data); - TrimPatternTypeDescriptionNbt = dataTypes.ReadNextNbt(data); + TrimPatternTypeAssetName = DataTypes.ReadNextString(data); + TemplateItem = DataTypes.ReadNextVarInt(data); + TrimPatternTypeDescriptionNbt = DataTypes.ReadNextNbt(data); TrimPatternTypeDescription = ChatParser.ParseText(TrimPatternTypeDescriptionNbt); - Decal = dataTypes.ReadNextBool(data); + Decal = DataTypes.ReadNextBool(data); } - ShowInTooltip = dataTypes.ReadNextBool(data); + ShowInTooltip = DataTypes.ReadNextBool(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/UnbreakableComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/UnbreakableComponent.cs index 39c19014..bfc09cda 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/UnbreakableComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/UnbreakableComponent.cs @@ -11,7 +11,7 @@ public class UnbrekableComponent1206(DataTypes dataTypes, ItemPalette itemPalett public override void Parse(Queue data) { - Unbrekable = dataTypes.ReadNextBool(data); + Unbrekable = DataTypes.ReadNextBool(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/WritableBlookContentComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/WritableBlookContentComponent.cs index e22c714a..c366e6b7 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/WritableBlookContentComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/WritableBlookContentComponent.cs @@ -12,16 +12,16 @@ public class WritableBlookContentComponent(DataTypes dataTypes, ItemPalette item public override void Parse(Queue data) { - var count = dataTypes.ReadNextVarInt(data); + var count = DataTypes.ReadNextVarInt(data); for (var i = 0; i < count; i++) { - var rawContent = dataTypes.ReadNextString(data); - var hasFilteredContent = dataTypes.ReadNextBool(data); + var rawContent = DataTypes.ReadNextString(data); + var hasFilteredContent = DataTypes.ReadNextBool(data); var filteredContent = null as string; if(hasFilteredContent) - filteredContent = dataTypes.ReadNextString(data); + filteredContent = DataTypes.ReadNextString(data); Pages.Add(new BookPage(rawContent, hasFilteredContent, filteredContent)); } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/WrittenBlookContentComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/WrittenBlookContentComponent.cs index 1f7cc905..55650913 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/WrittenBlookContentComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/WrittenBlookContentComponent.cs @@ -20,34 +20,34 @@ public class WrittenBlookContentComponent(DataTypes dataTypes, ItemPalette itemP public override void Parse(Queue data) { - RawTitle = dataTypes.ReadNextString(data); - HasFilteredTitle = dataTypes.ReadNextBool(data); + RawTitle = DataTypes.ReadNextString(data); + HasFilteredTitle = DataTypes.ReadNextBool(data); if (HasFilteredTitle) - FilteredTitle = dataTypes.ReadNextString(data); + FilteredTitle = DataTypes.ReadNextString(data); - Author = dataTypes.ReadNextString(data); - Generation = dataTypes.ReadNextVarInt(data); - NumberOfPages = dataTypes.ReadNextVarInt(data); + Author = DataTypes.ReadNextString(data); + Generation = DataTypes.ReadNextVarInt(data); + NumberOfPages = DataTypes.ReadNextVarInt(data); for (var i = 0; i < NumberOfPages; i++) { - var rawContentNbt = dataTypes.ReadNextNbt(data); + var rawContentNbt = DataTypes.ReadNextNbt(data); var rawContent = ChatParser.ParseText(rawContentNbt); - var hasFilteredContent = dataTypes.ReadNextBool(data); + var hasFilteredContent = DataTypes.ReadNextBool(data); Dictionary? filteredContentNbt = null; string? filteredContent = null; if (hasFilteredContent) { - filteredContentNbt = dataTypes.ReadNextNbt(data); + filteredContentNbt = DataTypes.ReadNextNbt(data); filteredContent = ChatParser.ParseText(filteredContentNbt); } Pages.Add(new BookPage(rawContent, hasFilteredContent, filteredContent, rawContentNbt, filteredContentNbt)); } - Resolved = dataTypes.ReadNextBool(data); + Resolved = DataTypes.ReadNextBool(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21/JukeBoxPlayableComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21/JukeBoxPlayableComponent.cs index d97b9cf8..d5f7c6f5 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21/JukeBoxPlayableComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21/JukeBoxPlayableComponent.cs @@ -21,26 +21,26 @@ public class JukeBoxPlayableComponent(DataTypes dataTypes, ItemPalette itemPalet public override void Parse(Queue data) { - DirectMode = dataTypes.ReadNextBool(data); + DirectMode = DataTypes.ReadNextBool(data); if (!DirectMode) - SongName = dataTypes.ReadNextString(data); + SongName = DataTypes.ReadNextString(data); if (DirectMode) { - SongType = dataTypes.ReadNextVarInt(data); + SongType = DataTypes.ReadNextVarInt(data); if (SongType == 0) { SoundEvent = - (SoundEventSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.SoundEvent, data); - Description = dataTypes.ReadNextString(data); - Duration = dataTypes.ReadNextFloat(data); - Output = dataTypes.ReadNextVarInt(data); + (SoundEventSubComponent)SubComponentRegistry.ParseSubComponent(SubComponents.SoundEvent, data); + Description = DataTypes.ReadNextString(data); + Duration = DataTypes.ReadNextFloat(data); + Output = DataTypes.ReadNextVarInt(data); } } - ShowTooltip = dataTypes.ReadNextBool(data); + ShowTooltip = DataTypes.ReadNextBool(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/AttackRangeComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/AttackRangeComponent.cs index d4cc2dde..f06bff42 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/AttackRangeComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/AttackRangeComponent.cs @@ -16,12 +16,12 @@ public class AttackRangeComponent(DataTypes dataTypes, ItemPalette itemPalette, public override void Parse(Queue data) { - MinRange = dataTypes.ReadNextFloat(data); - MaxRange = dataTypes.ReadNextFloat(data); - MinCreativeRange = dataTypes.ReadNextFloat(data); - MaxCreativeRange = dataTypes.ReadNextFloat(data); - HitboxMargin = dataTypes.ReadNextFloat(data); - MobFactor = dataTypes.ReadNextFloat(data); + MinRange = DataTypes.ReadNextFloat(data); + MaxRange = DataTypes.ReadNextFloat(data); + MinCreativeRange = DataTypes.ReadNextFloat(data); + MaxCreativeRange = DataTypes.ReadNextFloat(data); + HitboxMargin = DataTypes.ReadNextFloat(data); + MobFactor = DataTypes.ReadNextFloat(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/KineticWeaponComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/KineticWeaponComponent.cs index 1e1da338..9bfeb283 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/KineticWeaponComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/KineticWeaponComponent.cs @@ -9,34 +9,34 @@ public class KineticWeaponComponent(DataTypes dataTypes, ItemPalette itemPalette { public override void Parse(Queue data) { - dataTypes.ReadNextVarInt(data); // contactCooldownTicks - dataTypes.ReadNextVarInt(data); // delayTicks + DataTypes.ReadNextVarInt(data); // contactCooldownTicks + DataTypes.ReadNextVarInt(data); // delayTicks ReadOptionalCondition(data); // dismountConditions ReadOptionalCondition(data); // knockbackConditions ReadOptionalCondition(data); // damageConditions - dataTypes.ReadNextFloat(data); // forwardMovement - dataTypes.ReadNextFloat(data); // damageMultiplier + DataTypes.ReadNextFloat(data); // forwardMovement + DataTypes.ReadNextFloat(data); // damageMultiplier ReadOptionalSoundEventHolder(data); // sound ReadOptionalSoundEventHolder(data); // hitSound } private void ReadOptionalCondition(Queue data) { - if (!dataTypes.ReadNextBool(data)) return; - dataTypes.ReadNextVarInt(data); // maxDurationTicks - dataTypes.ReadNextFloat(data); // minSpeed - dataTypes.ReadNextFloat(data); // minRelativeSpeed + if (!DataTypes.ReadNextBool(data)) return; + DataTypes.ReadNextVarInt(data); // maxDurationTicks + DataTypes.ReadNextFloat(data); // minSpeed + DataTypes.ReadNextFloat(data); // minRelativeSpeed } private void ReadOptionalSoundEventHolder(Queue data) { - if (!dataTypes.ReadNextBool(data)) return; - var holderId = dataTypes.ReadNextVarInt(data); + if (!DataTypes.ReadNextBool(data)) return; + var holderId = DataTypes.ReadNextVarInt(data); if (holderId == 0) { - dataTypes.ReadNextString(data); - if (dataTypes.ReadNextBool(data)) - dataTypes.ReadNextFloat(data); + DataTypes.ReadNextString(data); + if (DataTypes.ReadNextBool(data)) + DataTypes.ReadNextFloat(data); } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/PiercingWeaponComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/PiercingWeaponComponent.cs index 08646c66..904044ef 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/PiercingWeaponComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/PiercingWeaponComponent.cs @@ -12,21 +12,21 @@ public class PiercingWeaponComponent(DataTypes dataTypes, ItemPalette itemPalett public override void Parse(Queue data) { - DealsKnockback = dataTypes.ReadNextBool(data); - Dismounts = dataTypes.ReadNextBool(data); + DealsKnockback = DataTypes.ReadNextBool(data); + Dismounts = DataTypes.ReadNextBool(data); ReadOptionalSoundEventHolder(data); ReadOptionalSoundEventHolder(data); } private void ReadOptionalSoundEventHolder(Queue data) { - if (!dataTypes.ReadNextBool(data)) return; - var holderId = dataTypes.ReadNextVarInt(data); + if (!DataTypes.ReadNextBool(data)) return; + var holderId = DataTypes.ReadNextVarInt(data); if (holderId == 0) { - dataTypes.ReadNextString(data); - if (dataTypes.ReadNextBool(data)) - dataTypes.ReadNextFloat(data); + DataTypes.ReadNextString(data); + if (DataTypes.ReadNextBool(data)) + DataTypes.ReadNextFloat(data); } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/RegistryEitherHolderComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/RegistryEitherHolderComponent.cs index bba3d3c7..6d786f8c 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/RegistryEitherHolderComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/RegistryEitherHolderComponent.cs @@ -18,11 +18,11 @@ public class RegistryEitherHolderComponent(DataTypes dataTypes, ItemPalette item public override void Parse(Queue data) { - IsHolder = dataTypes.ReadNextBool(data); + IsHolder = DataTypes.ReadNextBool(data); if (IsHolder) - HolderId = dataTypes.ReadNextVarInt(data); + HolderId = DataTypes.ReadNextVarInt(data); else - ResourceKey = dataTypes.ReadNextString(data); + ResourceKey = DataTypes.ReadNextString(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/SwingAnimationComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/SwingAnimationComponent.cs index 7980f9f6..3ce47920 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/SwingAnimationComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/SwingAnimationComponent.cs @@ -12,8 +12,8 @@ public class SwingAnimationComponent(DataTypes dataTypes, ItemPalette itemPalett public override void Parse(Queue data) { - AnimationType = dataTypes.ReadNextVarInt(data); - Duration = dataTypes.ReadNextVarInt(data); + AnimationType = DataTypes.ReadNextVarInt(data); + Duration = DataTypes.ReadNextVarInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/UseEffectsComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/UseEffectsComponent.cs index 053e7d58..a4b72a9f 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/UseEffectsComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_11/UseEffectsComponent.cs @@ -13,9 +13,9 @@ public class UseEffectsComponent(DataTypes dataTypes, ItemPalette itemPalette, S public override void Parse(Queue data) { - CanSprint = dataTypes.ReadNextBool(data); - InteractVibrations = dataTypes.ReadNextBool(data); - SpeedMultiplier = dataTypes.ReadNextFloat(data); + CanSprint = DataTypes.ReadNextBool(data); + InteractVibrations = DataTypes.ReadNextBool(data); + SpeedMultiplier = DataTypes.ReadNextFloat(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/ConsumableComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/ConsumableComponent.cs index cd85f621..ac3c34ea 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/ConsumableComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/ConsumableComponent.cs @@ -17,15 +17,15 @@ public class ConsumableComponent(DataTypes dataTypes, ItemPalette itemPalette, S public override void Parse(Queue data) { - ConsumeSeconds = dataTypes.ReadNextFloat(data); - Animation = dataTypes.ReadNextVarInt(data); - Sound = (SoundEventSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.SoundEvent, data); - HasConsumeParticles = dataTypes.ReadNextBool(data); + ConsumeSeconds = DataTypes.ReadNextFloat(data); + Animation = DataTypes.ReadNextVarInt(data); + Sound = (SoundEventSubComponent)SubComponentRegistry.ParseSubComponent(SubComponents.SoundEvent, data); + HasConsumeParticles = DataTypes.ReadNextBool(data); - var effectCount = dataTypes.ReadNextVarInt(data); + var effectCount = DataTypes.ReadNextVarInt(data); for (var i = 0; i < effectCount; i++) { - var effectTypeId = dataTypes.ReadNextVarInt(data); + var effectTypeId = DataTypes.ReadNextVarInt(data); var effectData = ReadConsumeEffectPayload(effectTypeId, data); Effects.Add(new ConsumeEffectData(effectTypeId, effectData)); } @@ -37,11 +37,11 @@ public class ConsumableComponent(DataTypes dataTypes, ItemPalette itemPalette, S switch (effectTypeId) { case 0: // apply_effects: List + probability(float) - var effectCount = dataTypes.ReadNextVarInt(data); + var effectCount = DataTypes.ReadNextVarInt(data); payload.AddRange(DataTypes.GetVarInt(effectCount)); for (var i = 0; i < effectCount; i++) payload.AddRange(ReadMobEffectInstance(data)); - payload.AddRange(DataTypes.GetFloat(dataTypes.ReadNextFloat(data))); + payload.AddRange(DataTypes.GetFloat(DataTypes.ReadNextFloat(data))); break; case 1: // remove_effects: HolderSet payload.AddRange(ReadHolderSet(data)); @@ -49,10 +49,10 @@ public class ConsumableComponent(DataTypes dataTypes, ItemPalette itemPalette, S case 2: // clear_all_effects: empty break; case 3: // teleport_randomly: float diameter - payload.AddRange(DataTypes.GetFloat(dataTypes.ReadNextFloat(data))); + payload.AddRange(DataTypes.GetFloat(DataTypes.ReadNextFloat(data))); break; case 4: // play_sound: Holder - var sound = (SoundEventSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.SoundEvent, data); + var sound = (SoundEventSubComponent)SubComponentRegistry.ParseSubComponent(SubComponents.SoundEvent, data); payload.AddRange(sound.Serialize()); break; } @@ -62,7 +62,7 @@ public class ConsumableComponent(DataTypes dataTypes, ItemPalette itemPalette, S private byte[] ReadMobEffectInstance(Queue data) { var result = new List(); - var effectId = dataTypes.ReadNextVarInt(data); + var effectId = DataTypes.ReadNextVarInt(data); result.AddRange(DataTypes.GetVarInt(effectId)); result.AddRange(ReadMobEffectDetails(data)); return result.ToArray(); @@ -71,17 +71,17 @@ public class ConsumableComponent(DataTypes dataTypes, ItemPalette itemPalette, S private byte[] ReadMobEffectDetails(Queue data) { var result = new List(); - var amplifier = dataTypes.ReadNextVarInt(data); + var amplifier = DataTypes.ReadNextVarInt(data); result.AddRange(DataTypes.GetVarInt(amplifier)); - var duration = dataTypes.ReadNextVarInt(data); + var duration = DataTypes.ReadNextVarInt(data); result.AddRange(DataTypes.GetVarInt(duration)); - var ambient = dataTypes.ReadNextBool(data); + var ambient = DataTypes.ReadNextBool(data); result.AddRange(DataTypes.GetBool(ambient)); - var showParticles = dataTypes.ReadNextBool(data); + var showParticles = DataTypes.ReadNextBool(data); result.AddRange(DataTypes.GetBool(showParticles)); - var showIcon = dataTypes.ReadNextBool(data); + var showIcon = DataTypes.ReadNextBool(data); result.AddRange(DataTypes.GetBool(showIcon)); - var hasHiddenEffect = dataTypes.ReadNextBool(data); + var hasHiddenEffect = DataTypes.ReadNextBool(data); result.AddRange(DataTypes.GetBool(hasHiddenEffect)); if (hasHiddenEffect) result.AddRange(ReadMobEffectDetails(data)); @@ -91,18 +91,18 @@ public class ConsumableComponent(DataTypes dataTypes, ItemPalette itemPalette, S private byte[] ReadHolderSet(Queue data) { var result = new List(); - var type = dataTypes.ReadNextVarInt(data); + var type = DataTypes.ReadNextVarInt(data); result.AddRange(DataTypes.GetVarInt(type)); if (type == 0) { - var tagName = dataTypes.ReadNextString(data); + var tagName = DataTypes.ReadNextString(data); result.AddRange(DataTypes.GetString(tagName)); } else { for (var i = 0; i < type - 1; i++) { - var id = dataTypes.ReadNextVarInt(data); + var id = DataTypes.ReadNextVarInt(data); result.AddRange(DataTypes.GetVarInt(id)); } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/DamageResistantComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/DamageResistantComponent.cs index 25592d2f..cc5867bb 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/DamageResistantComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/DamageResistantComponent.cs @@ -11,7 +11,7 @@ public class DamageResistantComponent(DataTypes dataTypes, ItemPalette itemPalet public override void Parse(Queue data) { - Types = dataTypes.ReadNextString(data); + Types = DataTypes.ReadNextString(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/DeathProtectionComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/DeathProtectionComponent.cs index 36c59690..5b5cc011 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/DeathProtectionComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/DeathProtectionComponent.cs @@ -13,10 +13,10 @@ public class DeathProtectionComponent(DataTypes dataTypes, ItemPalette itemPalet public override void Parse(Queue data) { - var effectCount = dataTypes.ReadNextVarInt(data); + var effectCount = DataTypes.ReadNextVarInt(data); for (var i = 0; i < effectCount; i++) { - var effectTypeId = dataTypes.ReadNextVarInt(data); + var effectTypeId = DataTypes.ReadNextVarInt(data); var effectData = ReadConsumeEffectPayload(effectTypeId, data); DeathEffects.Add(new ConsumeEffectData(effectTypeId, effectData)); } @@ -28,11 +28,11 @@ public class DeathProtectionComponent(DataTypes dataTypes, ItemPalette itemPalet switch (effectTypeId) { case 0: // apply_effects - var effectCount = dataTypes.ReadNextVarInt(data); + var effectCount = DataTypes.ReadNextVarInt(data); payload.AddRange(DataTypes.GetVarInt(effectCount)); for (var i = 0; i < effectCount; i++) payload.AddRange(ReadMobEffectInstance(data)); - payload.AddRange(DataTypes.GetFloat(dataTypes.ReadNextFloat(data))); + payload.AddRange(DataTypes.GetFloat(DataTypes.ReadNextFloat(data))); break; case 1: // remove_effects payload.AddRange(ReadHolderSet(data)); @@ -40,10 +40,10 @@ public class DeathProtectionComponent(DataTypes dataTypes, ItemPalette itemPalet case 2: // clear_all_effects break; case 3: // teleport_randomly - payload.AddRange(DataTypes.GetFloat(dataTypes.ReadNextFloat(data))); + payload.AddRange(DataTypes.GetFloat(DataTypes.ReadNextFloat(data))); break; case 4: // play_sound - var sound = (SoundEventSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.SoundEvent, data); + var sound = (SoundEventSubComponent)SubComponentRegistry.ParseSubComponent(SubComponents.SoundEvent, data); payload.AddRange(sound.Serialize()); break; } @@ -53,7 +53,7 @@ public class DeathProtectionComponent(DataTypes dataTypes, ItemPalette itemPalet private byte[] ReadMobEffectInstance(Queue data) { var result = new List(); - result.AddRange(DataTypes.GetVarInt(dataTypes.ReadNextVarInt(data))); + result.AddRange(DataTypes.GetVarInt(DataTypes.ReadNextVarInt(data))); result.AddRange(ReadMobEffectDetails(data)); return result.ToArray(); } @@ -61,12 +61,12 @@ public class DeathProtectionComponent(DataTypes dataTypes, ItemPalette itemPalet private byte[] ReadMobEffectDetails(Queue data) { var result = new List(); - result.AddRange(DataTypes.GetVarInt(dataTypes.ReadNextVarInt(data))); - result.AddRange(DataTypes.GetVarInt(dataTypes.ReadNextVarInt(data))); - result.AddRange(DataTypes.GetBool(dataTypes.ReadNextBool(data))); - result.AddRange(DataTypes.GetBool(dataTypes.ReadNextBool(data))); - result.AddRange(DataTypes.GetBool(dataTypes.ReadNextBool(data))); - var hasHidden = dataTypes.ReadNextBool(data); + result.AddRange(DataTypes.GetVarInt(DataTypes.ReadNextVarInt(data))); + result.AddRange(DataTypes.GetVarInt(DataTypes.ReadNextVarInt(data))); + result.AddRange(DataTypes.GetBool(DataTypes.ReadNextBool(data))); + result.AddRange(DataTypes.GetBool(DataTypes.ReadNextBool(data))); + result.AddRange(DataTypes.GetBool(DataTypes.ReadNextBool(data))); + var hasHidden = DataTypes.ReadNextBool(data); result.AddRange(DataTypes.GetBool(hasHidden)); if (hasHidden) result.AddRange(ReadMobEffectDetails(data)); @@ -76,16 +76,16 @@ public class DeathProtectionComponent(DataTypes dataTypes, ItemPalette itemPalet private byte[] ReadHolderSet(Queue data) { var result = new List(); - var type = dataTypes.ReadNextVarInt(data); + var type = DataTypes.ReadNextVarInt(data); result.AddRange(DataTypes.GetVarInt(type)); if (type == 0) { - result.AddRange(DataTypes.GetString(dataTypes.ReadNextString(data))); + result.AddRange(DataTypes.GetString(DataTypes.ReadNextString(data))); } else { for (var i = 0; i < type - 1; i++) - result.AddRange(DataTypes.GetVarInt(dataTypes.ReadNextVarInt(data))); + result.AddRange(DataTypes.GetVarInt(DataTypes.ReadNextVarInt(data))); } return result.ToArray(); } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/EnchantableComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/EnchantableComponent.cs index 4ef63563..f522dbd9 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/EnchantableComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/EnchantableComponent.cs @@ -11,7 +11,7 @@ public class EnchantableComponent(DataTypes dataTypes, ItemPalette itemPalette, public override void Parse(Queue data) { - Value = dataTypes.ReadNextVarInt(data); + Value = DataTypes.ReadNextVarInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/EquippableComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/EquippableComponent.cs index a71e5197..46191449 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/EquippableComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/EquippableComponent.cs @@ -25,36 +25,36 @@ public class EquippableComponent(DataTypes dataTypes, ItemPalette itemPalette, S public override void Parse(Queue data) { - Slot = dataTypes.ReadNextVarInt(data); - EquipSound = (SoundEventSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.SoundEvent, data); + Slot = DataTypes.ReadNextVarInt(data); + EquipSound = (SoundEventSubComponent)SubComponentRegistry.ParseSubComponent(SubComponents.SoundEvent, data); - HasModel = dataTypes.ReadNextBool(data); + HasModel = DataTypes.ReadNextBool(data); if (HasModel) - Model = dataTypes.ReadNextString(data); + Model = DataTypes.ReadNextString(data); - HasCameraOverlay = dataTypes.ReadNextBool(data); + HasCameraOverlay = DataTypes.ReadNextBool(data); if (HasCameraOverlay) - CameraOverlay = dataTypes.ReadNextString(data); + CameraOverlay = DataTypes.ReadNextString(data); - HasAllowedEntities = dataTypes.ReadNextBool(data); + HasAllowedEntities = DataTypes.ReadNextBool(data); if (HasAllowedEntities) { - AllowedEntitiesType = dataTypes.ReadNextVarInt(data); + AllowedEntitiesType = DataTypes.ReadNextVarInt(data); if (AllowedEntitiesType == 0) { - AllowedEntitiesTag = dataTypes.ReadNextString(data); + AllowedEntitiesTag = DataTypes.ReadNextString(data); } else { AllowedEntitiesIds = new List(); for (var i = 0; i < AllowedEntitiesType - 1; i++) - AllowedEntitiesIds.Add(dataTypes.ReadNextVarInt(data)); + AllowedEntitiesIds.Add(DataTypes.ReadNextVarInt(data)); } } - Dispensable = dataTypes.ReadNextBool(data); - Swappable = dataTypes.ReadNextBool(data); - DamageOnHurt = dataTypes.ReadNextBool(data); + Dispensable = DataTypes.ReadNextBool(data); + Swappable = DataTypes.ReadNextBool(data); + DamageOnHurt = DataTypes.ReadNextBool(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/FoodComponent1212.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/FoodComponent1212.cs index 1832234d..65c58d53 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/FoodComponent1212.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/FoodComponent1212.cs @@ -13,9 +13,9 @@ public class FoodComponent1212(DataTypes dataTypes, ItemPalette itemPalette, Sub public override void Parse(Queue data) { - Nutrition = dataTypes.ReadNextVarInt(data); - Saturation = dataTypes.ReadNextFloat(data); - CanAlwaysEat = dataTypes.ReadNextBool(data); + Nutrition = DataTypes.ReadNextVarInt(data); + Saturation = DataTypes.ReadNextFloat(data); + CanAlwaysEat = DataTypes.ReadNextBool(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/ItemModelComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/ItemModelComponent.cs index 65cdac8c..97915e66 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/ItemModelComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/ItemModelComponent.cs @@ -11,7 +11,7 @@ public class ItemModelComponent(DataTypes dataTypes, ItemPalette itemPalette, Su public override void Parse(Queue data) { - Identifier = dataTypes.ReadNextString(data); + Identifier = DataTypes.ReadNextString(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/RepairableComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/RepairableComponent.cs index dcdc36ff..481c58a3 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/RepairableComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/RepairableComponent.cs @@ -13,16 +13,16 @@ public class RepairableComponent(DataTypes dataTypes, ItemPalette itemPalette, S public override void Parse(Queue data) { - Type = dataTypes.ReadNextVarInt(data); + Type = DataTypes.ReadNextVarInt(data); if (Type == 0) { - TagName = dataTypes.ReadNextString(data); + TagName = DataTypes.ReadNextString(data); } else { ItemIds = new List(); for (var i = 0; i < Type - 1; i++) - ItemIds.Add(dataTypes.ReadNextVarInt(data)); + ItemIds.Add(DataTypes.ReadNextVarInt(data)); } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/TooltipStyleComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/TooltipStyleComponent.cs index aed0af34..ac25df8f 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/TooltipStyleComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/TooltipStyleComponent.cs @@ -11,7 +11,7 @@ public class TooltipStyleComponent(DataTypes dataTypes, ItemPalette itemPalette, public override void Parse(Queue data) { - Identifier = dataTypes.ReadNextString(data); + Identifier = DataTypes.ReadNextString(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/UseCooldownComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/UseCooldownComponent.cs index 620deb1e..217c56ce 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/UseCooldownComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/UseCooldownComponent.cs @@ -13,10 +13,10 @@ public class UseCooldownComponent(DataTypes dataTypes, ItemPalette itemPalette, public override void Parse(Queue data) { - Seconds = dataTypes.ReadNextFloat(data); - HasCooldownGroup = dataTypes.ReadNextBool(data); + Seconds = DataTypes.ReadNextFloat(data); + HasCooldownGroup = DataTypes.ReadNextBool(data); if (HasCooldownGroup) - CooldownGroup = dataTypes.ReadNextString(data); + CooldownGroup = DataTypes.ReadNextString(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/UseRemainderComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/UseRemainderComponent.cs index ead551aa..da371a95 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/UseRemainderComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_2/UseRemainderComponent.cs @@ -12,13 +12,13 @@ public class UseRemainderComponent(DataTypes dataTypes, ItemPalette itemPalette, public override void Parse(Queue data) { - ConvertInto = dataTypes.ReadNextItemSlot(data, ItemPalette); + ConvertInto = DataTypes.ReadNextItemSlot(data, ItemPalette); } public override Queue Serialize() { var data = new List(); - data.AddRange(dataTypes.GetItemSlot(ConvertInto, ItemPalette)); + data.AddRange(DataTypes.GetItemSlot(ConvertInto, ItemPalette)); return new Queue(data); } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/BlocksAttacksComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/BlocksAttacksComponent.cs index f756e9a2..030133c7 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/BlocksAttacksComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/BlocksAttacksComponent.cs @@ -16,63 +16,63 @@ public class BlocksAttacksComponent(DataTypes dataTypes, ItemPalette itemPalette public override void Parse(Queue data) { - BlockDelaySeconds = dataTypes.ReadNextFloat(data); - DisableCooldownScale = dataTypes.ReadNextFloat(data); + BlockDelaySeconds = DataTypes.ReadNextFloat(data); + DisableCooldownScale = DataTypes.ReadNextFloat(data); - var reductionCount = dataTypes.ReadNextVarInt(data); + var reductionCount = DataTypes.ReadNextVarInt(data); for (var i = 0; i < reductionCount; i++) { - var horizontalBlockingAngle = dataTypes.ReadNextFloat(data); + var horizontalBlockingAngle = DataTypes.ReadNextFloat(data); - var hasTypeFilter = dataTypes.ReadNextBool(data); + var hasTypeFilter = DataTypes.ReadNextBool(data); if (hasTypeFilter) ReadHolderSet(data); - var baseDmg = dataTypes.ReadNextFloat(data); - var factor = dataTypes.ReadNextFloat(data); + var baseDmg = DataTypes.ReadNextFloat(data); + var factor = DataTypes.ReadNextFloat(data); } - ItemDamageThreshold = dataTypes.ReadNextFloat(data); - ItemDamageBase = dataTypes.ReadNextFloat(data); - ItemDamageFactor = dataTypes.ReadNextFloat(data); + ItemDamageThreshold = DataTypes.ReadNextFloat(data); + ItemDamageBase = DataTypes.ReadNextFloat(data); + ItemDamageFactor = DataTypes.ReadNextFloat(data); - var hasBypassedBy = dataTypes.ReadNextBool(data); + var hasBypassedBy = DataTypes.ReadNextBool(data); if (hasBypassedBy) - dataTypes.ReadNextString(data); // TagKey as ResourceLocation + DataTypes.ReadNextString(data); // TagKey as ResourceLocation - var hasBlockSound = dataTypes.ReadNextBool(data); + var hasBlockSound = DataTypes.ReadNextBool(data); if (hasBlockSound) ReadSoundEventHolder(data); - var hasDisableSound = dataTypes.ReadNextBool(data); + var hasDisableSound = DataTypes.ReadNextBool(data); if (hasDisableSound) ReadSoundEventHolder(data); } private void ReadHolderSet(Queue data) { - var sizeOrTag = dataTypes.ReadNextVarInt(data); + var sizeOrTag = DataTypes.ReadNextVarInt(data); if (sizeOrTag == 0) { - dataTypes.ReadNextString(data); // Tag ResourceLocation + DataTypes.ReadNextString(data); // Tag ResourceLocation } else { var count = sizeOrTag - 1; for (var i = 0; i < count; i++) - dataTypes.ReadNextVarInt(data); // Holder registry ids + DataTypes.ReadNextVarInt(data); // Holder registry ids } } private void ReadSoundEventHolder(Queue data) { - var holderId = dataTypes.ReadNextVarInt(data); + var holderId = DataTypes.ReadNextVarInt(data); if (holderId == 0) { - dataTypes.ReadNextString(data); // ResourceLocation - var hasFixedRange = dataTypes.ReadNextBool(data); + DataTypes.ReadNextString(data); // ResourceLocation + var hasFixedRange = DataTypes.ReadNextBool(data); if (hasFixedRange) - dataTypes.ReadNextFloat(data); + DataTypes.ReadNextFloat(data); } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/EitherHolderComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/EitherHolderComponent.cs index 4319693f..352e5f3e 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/EitherHolderComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/EitherHolderComponent.cs @@ -13,10 +13,10 @@ public class EitherHolderComponent(DataTypes dataTypes, ItemPalette itemPalette, public override void Parse(Queue data) { - IsHolder = dataTypes.ReadNextBool(data); + IsHolder = DataTypes.ReadNextBool(data); if (IsHolder) { - HolderId = dataTypes.ReadNextVarInt(data); + HolderId = DataTypes.ReadNextVarInt(data); // For simple entity variants, holderId > 0 means registry ref (id = holderId - 1) // holderId == 0 means inline data; for most variants the inline is just the variant fields // We skip inline data since MCC doesn't use variant details @@ -30,7 +30,7 @@ public class EitherHolderComponent(DataTypes dataTypes, ItemPalette itemPalette, } else { - ResourceKey = dataTypes.ReadNextString(data); + ResourceKey = DataTypes.ReadNextString(data); } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/EnchantmentsComponent1215.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/EnchantmentsComponent1215.cs index 4ade9885..1c228658 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/EnchantmentsComponent1215.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/EnchantmentsComponent1215.cs @@ -15,12 +15,12 @@ public class EnchantmentsComponent1215(DataTypes dataTypes, ItemPalette itemPale { public override void Parse(Queue data) { - NumberOfEnchantments = dataTypes.ReadNextVarInt(data); + NumberOfEnchantments = DataTypes.ReadNextVarInt(data); for (var i = 0; i < NumberOfEnchantments; i++) { - var registryId = dataTypes.ReadNextVarInt(data); - var level = dataTypes.ReadNextVarInt(data); + var registryId = DataTypes.ReadNextVarInt(data); + var level = DataTypes.ReadNextVarInt(data); Enchantments.Add(new Enchantment(EnchantmentMapping.GetEnchantmentByRegistryId1206(registryId), level)); } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/InstrumentComponent1215.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/InstrumentComponent1215.cs index bedbde20..e8780324 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/InstrumentComponent1215.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/InstrumentComponent1215.cs @@ -10,29 +10,29 @@ public class InstrumentComponent1215(DataTypes dataTypes, ItemPalette itemPalett public override void Parse(Queue data) { // EitherHolder: Bool + (Holder OR ResourceLocation) - var isHolder = dataTypes.ReadNextBool(data); + var isHolder = DataTypes.ReadNextBool(data); if (isHolder) { - var holderId = dataTypes.ReadNextVarInt(data); + var holderId = DataTypes.ReadNextVarInt(data); if (holderId == 0) { // Inline Instrument: SoundEvent holder + VarInt useDuration + Float range + Component description - var soundHolderId = dataTypes.ReadNextVarInt(data); + var soundHolderId = DataTypes.ReadNextVarInt(data); if (soundHolderId == 0) { - dataTypes.ReadNextString(data); // ResourceLocation - var hasFixedRange = dataTypes.ReadNextBool(data); + DataTypes.ReadNextString(data); // ResourceLocation + var hasFixedRange = DataTypes.ReadNextBool(data); if (hasFixedRange) - dataTypes.ReadNextFloat(data); + DataTypes.ReadNextFloat(data); } - dataTypes.ReadNextVarInt(data); // useDuration - dataTypes.ReadNextFloat(data); // range - dataTypes.ReadNextString(data); // description (Component as JSON string) + DataTypes.ReadNextVarInt(data); // useDuration + DataTypes.ReadNextFloat(data); // range + DataTypes.ReadNextString(data); // description (Component as JSON string) } } else { - dataTypes.ReadNextString(data); // ResourceLocation key + DataTypes.ReadNextString(data); // ResourceLocation key } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/PaintingVariantHolderComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/PaintingVariantHolderComponent.cs index a67bef25..0065441a 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/PaintingVariantHolderComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/PaintingVariantHolderComponent.cs @@ -10,21 +10,21 @@ public class PaintingVariantHolderComponent(DataTypes dataTypes, ItemPalette ite public override void Parse(Queue data) { // Holder: VarInt discriminator - var holderId = dataTypes.ReadNextVarInt(data); + var holderId = DataTypes.ReadNextVarInt(data); if (holderId == 0) { // Inline PaintingVariant: VarInt width + VarInt height + ResourceLocation assetId - dataTypes.ReadNextVarInt(data); // width - dataTypes.ReadNextVarInt(data); // height - dataTypes.ReadNextString(data); // assetId + DataTypes.ReadNextVarInt(data); // width + DataTypes.ReadNextVarInt(data); // height + DataTypes.ReadNextString(data); // assetId // Optional title - if (dataTypes.ReadNextBool(data)) - dataTypes.ReadNextString(data); + if (DataTypes.ReadNextBool(data)) + DataTypes.ReadNextString(data); // Optional author - if (dataTypes.ReadNextBool(data)) - dataTypes.ReadNextString(data); + if (DataTypes.ReadNextBool(data)) + DataTypes.ReadNextString(data); } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/PotionDurationScaleComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/PotionDurationScaleComponent.cs index d0fac894..88354b2c 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/PotionDurationScaleComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/PotionDurationScaleComponent.cs @@ -11,7 +11,7 @@ public class PotionDurationScaleComponent(DataTypes dataTypes, ItemPalette itemP public override void Parse(Queue data) { - Scale = dataTypes.ReadNextFloat(data); + Scale = DataTypes.ReadNextFloat(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/ProvidesBannerPatternsComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/ProvidesBannerPatternsComponent.cs index 0b0db7f7..cc2356e1 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/ProvidesBannerPatternsComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/ProvidesBannerPatternsComponent.cs @@ -11,7 +11,7 @@ public class ProvidesBannerPatternsComponent(DataTypes dataTypes, ItemPalette it public override void Parse(Queue data) { - TagKey = dataTypes.ReadNextString(data); // ResourceLocation + TagKey = DataTypes.ReadNextString(data); // ResourceLocation } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/ProvidesTrimMaterialComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/ProvidesTrimMaterialComponent.cs index fde8db41..a8e5725a 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/ProvidesTrimMaterialComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/ProvidesTrimMaterialComponent.cs @@ -10,28 +10,28 @@ public class ProvidesTrimMaterialComponent(DataTypes dataTypes, ItemPalette item public override void Parse(Queue data) { // EitherHolder: Bool + (Holder OR ResourceLocation) - var isHolder = dataTypes.ReadNextBool(data); + var isHolder = DataTypes.ReadNextBool(data); if (isHolder) { - var holderId = dataTypes.ReadNextVarInt(data); + var holderId = DataTypes.ReadNextVarInt(data); if (holderId == 0) { // Inline TrimMaterial: MaterialAssetGroup + Component description // MaterialAssetGroup: string + map - dataTypes.ReadNextString(data); // base asset suffix - var overrideCount = dataTypes.ReadNextVarInt(data); + DataTypes.ReadNextString(data); // base asset suffix + var overrideCount = DataTypes.ReadNextVarInt(data); for (var i = 0; i < overrideCount; i++) { - dataTypes.ReadNextString(data); // ResourceKey - dataTypes.ReadNextString(data); // override suffix + DataTypes.ReadNextString(data); // ResourceKey + DataTypes.ReadNextString(data); // override suffix } // description Component - dataTypes.ReadNextString(data); + DataTypes.ReadNextString(data); } } else { - dataTypes.ReadNextString(data); // ResourceLocation key + DataTypes.ReadNextString(data); // ResourceLocation key } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/SoundEventHolderComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/SoundEventHolderComponent.cs index 849f3018..8fe14f7d 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/SoundEventHolderComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/SoundEventHolderComponent.cs @@ -14,13 +14,13 @@ public class SoundEventHolderComponent(DataTypes dataTypes, ItemPalette itemPale public override void Parse(Queue data) { - HolderId = dataTypes.ReadNextVarInt(data); + HolderId = DataTypes.ReadNextVarInt(data); if (HolderId == 0) { - SoundLocation = dataTypes.ReadNextString(data); - HasFixedRange = dataTypes.ReadNextBool(data); + SoundLocation = DataTypes.ReadNextString(data); + HasFixedRange = DataTypes.ReadNextBool(data); if (HasFixedRange) - FixedRange = dataTypes.ReadNextFloat(data); + FixedRange = DataTypes.ReadNextFloat(data); } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/TooltipDisplayComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/TooltipDisplayComponent.cs index 9611e3d5..859b3cbc 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/TooltipDisplayComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/TooltipDisplayComponent.cs @@ -12,10 +12,10 @@ public class TooltipDisplayComponent(DataTypes dataTypes, ItemPalette itemPalett public override void Parse(Queue data) { - HideTooltip = dataTypes.ReadNextBool(data); - var count = dataTypes.ReadNextVarInt(data); + HideTooltip = DataTypes.ReadNextBool(data); + var count = DataTypes.ReadNextVarInt(data); for (var i = 0; i < count; i++) - HiddenComponentIds.Add(dataTypes.ReadNextVarInt(data)); + HiddenComponentIds.Add(DataTypes.ReadNextVarInt(data)); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/VarIntComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/VarIntComponent.cs index 086b14cd..38eebf96 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/VarIntComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/VarIntComponent.cs @@ -11,7 +11,7 @@ public class VarIntComponent(DataTypes dataTypes, ItemPalette itemPalette, SubCo public override void Parse(Queue data) { - Value = dataTypes.ReadNextVarInt(data); + Value = DataTypes.ReadNextVarInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/WeaponComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/WeaponComponent.cs index 64c513eb..f831e82b 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/WeaponComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/WeaponComponent.cs @@ -12,8 +12,8 @@ public class WeaponComponent(DataTypes dataTypes, ItemPalette itemPalette, SubCo public override void Parse(Queue data) { - ItemDamagePerAttack = dataTypes.ReadNextVarInt(data); - DisableBlockingForSeconds = dataTypes.ReadNextFloat(data); + ItemDamagePerAttack = DataTypes.ReadNextVarInt(data); + DisableBlockingForSeconds = DataTypes.ReadNextFloat(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/AttributeSubComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/AttributeSubComponent.cs index a29374e1..897d41b8 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/AttributeSubComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/AttributeSubComponent.cs @@ -15,12 +15,12 @@ public class AttributeSubComponent(DataTypes dataTypes, SubComponentRegistry sub protected override void Parse(Queue data) { - TypeId = dataTypes.ReadNextVarInt(data); - Uuid = dataTypes.ReadNextUUID(data); - Name = dataTypes.ReadNextString(data); - Value = dataTypes.ReadNextDouble(data); - Operation = dataTypes.ReadNextVarInt(data); - Slot = dataTypes.ReadNextVarInt(data); + TypeId = DataTypes.ReadNextVarInt(data); + Uuid = DataTypes.ReadNextUUID(data); + Name = DataTypes.ReadNextString(data); + Value = DataTypes.ReadNextDouble(data); + Operation = DataTypes.ReadNextVarInt(data); + Slot = DataTypes.ReadNextVarInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/BlockPredicateSubcomponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/BlockPredicateSubcomponent.cs index 05e0d6d2..d66eb47c 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/BlockPredicateSubcomponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/BlockPredicateSubcomponent.cs @@ -15,25 +15,25 @@ public class BlockPredicateSubcomponent(DataTypes dataTypes, SubComponentRegistr protected override void Parse(Queue data) { - HasBlocks = dataTypes.ReadNextBool(data); + HasBlocks = DataTypes.ReadNextBool(data); if (HasBlocks) - BlockSet = (BlockSetSubcomponent)subComponentRegistry.ParseSubComponent(SubComponents.BlockSet, data); + BlockSet = (BlockSetSubcomponent)SubComponentRegistry.ParseSubComponent(SubComponents.BlockSet, data); - HasProperities = dataTypes.ReadNextBool(data); + HasProperities = DataTypes.ReadNextBool(data); if (HasProperities) { Properties = new(); - var numberOfProperties = dataTypes.ReadNextVarInt(data); + var numberOfProperties = DataTypes.ReadNextVarInt(data); for (var i = 0; i < numberOfProperties; i++) - Properties.Add((PropertySubComponent)subComponentRegistry.ParseSubComponent(SubComponents.Property, data)); + Properties.Add((PropertySubComponent)SubComponentRegistry.ParseSubComponent(SubComponents.Property, data)); } - HasNbt = dataTypes.ReadNextBool(data); + HasNbt = DataTypes.ReadNextBool(data); if (HasNbt) - Nbt = dataTypes.ReadNextNbt(data); + Nbt = DataTypes.ReadNextNbt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/BlockSetSubcomponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/BlockSetSubcomponent.cs index 4f6e01a7..70f2b78c 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/BlockSetSubcomponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/BlockSetSubcomponent.cs @@ -15,14 +15,14 @@ public class BlockSetSubcomponent(DataTypes dataTypes, SubComponentRegistry subC Type = DataTypes.ReadNextVarInt(data); if (Type == 0) - TagName = dataTypes.ReadNextString(data); + TagName = DataTypes.ReadNextString(data); if (Type == 0) return; BlockIds = []; for (var i = 0; i < Type - 1; i++) - BlockIds.Add(dataTypes.ReadNextVarInt(data)); + BlockIds.Add(DataTypes.ReadNextVarInt(data)); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/DetailsSubComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/DetailsSubComponent.cs index 7394e13d..ac6b28c9 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/DetailsSubComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/DetailsSubComponent.cs @@ -16,15 +16,15 @@ public class DetailsSubComponent(DataTypes dataTypes, SubComponentRegistry subCo protected override void Parse(Queue data) { - Amplifier = dataTypes.ReadNextVarInt(data); - Duration = dataTypes.ReadNextVarInt(data); - Ambient = dataTypes.ReadNextBool(data); - ShowParticles = dataTypes.ReadNextBool(data); - ShowIcon = dataTypes.ReadNextBool(data); - HasHiddenEffects = dataTypes.ReadNextBool(data); + Amplifier = DataTypes.ReadNextVarInt(data); + Duration = DataTypes.ReadNextVarInt(data); + Ambient = DataTypes.ReadNextBool(data); + ShowParticles = DataTypes.ReadNextBool(data); + ShowIcon = DataTypes.ReadNextBool(data); + HasHiddenEffects = DataTypes.ReadNextBool(data); if(HasHiddenEffects) - Detail = (DetailsSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.Details, data); + Detail = (DetailsSubComponent)SubComponentRegistry.ParseSubComponent(SubComponents.Details, data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/EffectSubComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/EffectSubComponent.cs index a676cfca..8b6795ec 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/EffectSubComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/EffectSubComponent.cs @@ -11,8 +11,8 @@ public class EffectSubComponent(DataTypes dataTypes, SubComponentRegistry subCom protected override void Parse(Queue data) { - TypeId = (PotionEffectSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.PotionEffect, data); - Probability = dataTypes.ReadNextFloat(data); + TypeId = (PotionEffectSubComponent)SubComponentRegistry.ParseSubComponent(SubComponents.PotionEffect, data); + Probability = DataTypes.ReadNextFloat(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/FireworkExplosionSubComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/FireworkExplosionSubComponent.cs index e4c67cc7..37fec5b7 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/FireworkExplosionSubComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/FireworkExplosionSubComponent.cs @@ -16,19 +16,19 @@ public class FireworkExplosionSubComponent(DataTypes dataTypes, SubComponentRegi protected override void Parse(Queue data) { - Shape = dataTypes.ReadNextVarInt(data); - NumberOfColors = dataTypes.ReadNextVarInt(data); + Shape = DataTypes.ReadNextVarInt(data); + NumberOfColors = DataTypes.ReadNextVarInt(data); for (var i = 0; i < NumberOfColors; i++) - Colors.Add(dataTypes.ReadNextInt(data)); + Colors.Add(DataTypes.ReadNextInt(data)); - NumberOfFadeColors = dataTypes.ReadNextVarInt(data); + NumberOfFadeColors = DataTypes.ReadNextVarInt(data); for (var i = 0; i < NumberOfFadeColors; i++) - FadeColors.Add(dataTypes.ReadNextInt(data)); + FadeColors.Add(DataTypes.ReadNextInt(data)); - HasTrail = dataTypes.ReadNextBool(data); - HasTwinkle = dataTypes.ReadNextBool(data); + HasTrail = DataTypes.ReadNextBool(data); + HasTwinkle = DataTypes.ReadNextBool(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/PotionEffectSubComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/PotionEffectSubComponent.cs index 13cc55f9..c627f726 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/PotionEffectSubComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/PotionEffectSubComponent.cs @@ -11,8 +11,8 @@ public class PotionEffectSubComponent(DataTypes dataTypes, SubComponentRegistry protected override void Parse(Queue data) { - TypeId = dataTypes.ReadNextVarInt(data); - Details = (DetailsSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.Details, data); + TypeId = DataTypes.ReadNextVarInt(data); + Details = (DetailsSubComponent)SubComponentRegistry.ParseSubComponent(SubComponents.Details, data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/PropertySubComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/PropertySubComponent.cs index d35de380..af83fc08 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/PropertySubComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/PropertySubComponent.cs @@ -14,17 +14,17 @@ public class PropertySubComponent(DataTypes dataTypes, SubComponentRegistry subC protected override void Parse(Queue data) { - Name = dataTypes.ReadNextString(data); - IsExactMatch = dataTypes.ReadNextBool(data); + Name = DataTypes.ReadNextString(data); + IsExactMatch = DataTypes.ReadNextBool(data); if (IsExactMatch) { - ExactValue = dataTypes.ReadNextString(data); + ExactValue = DataTypes.ReadNextString(data); } else { - MinValue = dataTypes.ReadNextBool(data) ? dataTypes.ReadNextString(data) : null; - MaxValue = dataTypes.ReadNextBool(data) ? dataTypes.ReadNextString(data) : null; + MinValue = DataTypes.ReadNextBool(data) ? DataTypes.ReadNextString(data) : null; + MaxValue = DataTypes.ReadNextBool(data) ? DataTypes.ReadNextString(data) : null; } } diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/RuleSubComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/RuleSubComponent.cs index ca8807b5..6cf163fd 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/RuleSubComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_20_6/RuleSubComponent.cs @@ -14,16 +14,16 @@ public class RuleSubComponent(DataTypes dataTypes, SubComponentRegistry subCompo protected override void Parse(Queue data) { - Blocks = (BlockSetSubcomponent)subComponentRegistry.ParseSubComponent(SubComponents.BlockSet, data); - HasSpeed = dataTypes.ReadNextBool(data); + Blocks = (BlockSetSubcomponent)SubComponentRegistry.ParseSubComponent(SubComponents.BlockSet, data); + HasSpeed = DataTypes.ReadNextBool(data); if(HasSpeed) - Speed = dataTypes.ReadNextFloat(data); + Speed = DataTypes.ReadNextFloat(data); - HasCorrectDropForBlocks = dataTypes.ReadNextBool(data); + HasCorrectDropForBlocks = DataTypes.ReadNextBool(data); if(HasCorrectDropForBlocks) - CorrectDropForBlocks = dataTypes.ReadNextBool(data); + CorrectDropForBlocks = DataTypes.ReadNextBool(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_21/AttributeSubComponent121.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_21/AttributeSubComponent121.cs index 6357e47f..46b70970 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_21/AttributeSubComponent121.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_21/AttributeSubComponent121.cs @@ -14,11 +14,11 @@ public class AttributeSubComponent121(DataTypes dataTypes, SubComponentRegistry protected override void Parse(Queue data) { - TypeId = dataTypes.ReadNextVarInt(data); - ResourceLocation = dataTypes.ReadNextString(data); - Value = dataTypes.ReadNextDouble(data); - Operation = dataTypes.ReadNextVarInt(data); - Slot = dataTypes.ReadNextVarInt(data); + TypeId = DataTypes.ReadNextVarInt(data); + ResourceLocation = DataTypes.ReadNextString(data); + Value = DataTypes.ReadNextDouble(data); + Operation = DataTypes.ReadNextVarInt(data); + Slot = DataTypes.ReadNextVarInt(data); } public override Queue Serialize() diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_21/SoundEventSubComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_21/SoundEventSubComponent.cs index cfa0f833..cb10dcee 100644 --- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_21/SoundEventSubComponent.cs +++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/Subcomponents/1_21/SoundEventSubComponent.cs @@ -13,15 +13,15 @@ public class SoundEventSubComponent(DataTypes dataTypes, SubComponentRegistry su protected override void Parse(Queue data) { - Type = dataTypes.ReadNextVarInt(data); + Type = DataTypes.ReadNextVarInt(data); if (Type != 0) return; - SoundName = dataTypes.ReadNextString(data); - HasFixedRange = dataTypes.ReadNextBool(data); + SoundName = DataTypes.ReadNextString(data); + HasFixedRange = DataTypes.ReadNextBool(data); if (HasFixedRange) - FixedRange = dataTypes.ReadNextFloat(data); + FixedRange = DataTypes.ReadNextFloat(data); } public override Queue Serialize()