helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2026-08-15 13:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix CS9107 warnings: use base class properties instead of captured primary constructor parameters

Browse source 
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>
This commit is contained in:
copilot-swe-agent[bot] 2026-03-24 01:16:05 +00:00
parent 94bf42710a
commit 640a4e39b7
90 changed files with 366 additions and 366 deletions
Download patch file Download diff file Expand all files Collapse all files

42
MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/BlocksAttacksComponent.cs
View file

@ -16,63 +16,63 @@ public class BlocksAttacksComponent(DataTypes dataTypes, ItemPalette itemPalette
public override void Parse(Queue<byte> 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<DamageType> as ResourceLocation
DataTypes.ReadNextString(data); // TagKey<DamageType> 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<byte> 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<DamageType> registry ids
DataTypes.ReadNextVarInt(data); // Holder<DamageType> registry ids
}
}
private void ReadSoundEventHolder(Queue<byte> 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);
}
}

6
MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/EitherHolderComponent.cs
View file

@ -13,10 +13,10 @@ public class EitherHolderComponent(DataTypes dataTypes, ItemPalette itemPalette,
public override void Parse(Queue<byte> 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);
}
}

6
MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/EnchantmentsComponent1215.cs
View file

@ -15,12 +15,12 @@ public class EnchantmentsComponent1215(DataTypes dataTypes, ItemPalette itemPale
{
public override void Parse(Queue<byte> 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));
}
}

20
MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/InstrumentComponent1215.cs
View file

@ -10,29 +10,29 @@ public class InstrumentComponent1215(DataTypes dataTypes, ItemPalette itemPalett
public override void Parse(Queue<byte> data)
{
// EitherHolder<Instrument>: Bool + (Holder<Instrument> 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
}
}

16
MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/PaintingVariantHolderComponent.cs
View file

@ -10,21 +10,21 @@ public class PaintingVariantHolderComponent(DataTypes dataTypes, ItemPalette ite
public override void Parse(Queue<byte> data)
{
// Holder<PaintingVariant>: 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<Component> title
if (dataTypes.ReadNextBool(data))
dataTypes.ReadNextString(data);
if (DataTypes.ReadNextBool(data))
DataTypes.ReadNextString(data);
// Optional<Component> author
if (dataTypes.ReadNextBool(data))
dataTypes.ReadNextString(data);
if (DataTypes.ReadNextBool(data))
DataTypes.ReadNextString(data);
}
}

2
MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/PotionDurationScaleComponent.cs
View file

@ -11,7 +11,7 @@ public class PotionDurationScaleComponent(DataTypes dataTypes, ItemPalette itemP
public override void Parse(Queue<byte> data)
{
Scale = dataTypes.ReadNextFloat(data);
Scale = DataTypes.ReadNextFloat(data);
}
public override Queue<byte> Serialize()

2
MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/ProvidesBannerPatternsComponent.cs
View file

@ -11,7 +11,7 @@ public class ProvidesBannerPatternsComponent(DataTypes dataTypes, ItemPalette it
public override void Parse(Queue<byte> data)
{
TagKey = dataTypes.ReadNextString(data); // ResourceLocation
TagKey = DataTypes.ReadNextString(data); // ResourceLocation
}
public override Queue<byte> Serialize()

16
MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/ProvidesTrimMaterialComponent.cs
View file

@ -10,28 +10,28 @@ public class ProvidesTrimMaterialComponent(DataTypes dataTypes, ItemPalette item
public override void Parse(Queue<byte> data)
{
// EitherHolder<TrimMaterial>: Bool + (Holder<TrimMaterial> 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<ResourceLocation, string>
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<EquipmentAsset>
dataTypes.ReadNextString(data); // override suffix
DataTypes.ReadNextString(data); // ResourceKey<EquipmentAsset>
DataTypes.ReadNextString(data); // override suffix
}
// description Component
dataTypes.ReadNextString(data);
DataTypes.ReadNextString(data);
}
}
else
{
dataTypes.ReadNextString(data); // ResourceLocation key
DataTypes.ReadNextString(data); // ResourceLocation key
}
}

8
MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/SoundEventHolderComponent.cs
View file

@ -14,13 +14,13 @@ public class SoundEventHolderComponent(DataTypes dataTypes, ItemPalette itemPale
public override void Parse(Queue<byte> 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);
}
}

6
MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/TooltipDisplayComponent.cs
View file

@ -12,10 +12,10 @@ public class TooltipDisplayComponent(DataTypes dataTypes, ItemPalette itemPalett
public override void Parse(Queue<byte> 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<byte> Serialize()

2
MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/VarIntComponent.cs
View file

@ -11,7 +11,7 @@ public class VarIntComponent(DataTypes dataTypes, ItemPalette itemPalette, SubCo
public override void Parse(Queue<byte> data)
{
Value = dataTypes.ReadNextVarInt(data);
Value = DataTypes.ReadNextVarInt(data);
}
public override Queue<byte> Serialize()

4
MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_21_5/WeaponComponent.cs
View file

@ -12,8 +12,8 @@ public class WeaponComponent(DataTypes dataTypes, ItemPalette itemPalette, SubCo
public override void Parse(Queue<byte> data)
{
ItemDamagePerAttack = dataTypes.ReadNextVarInt(data);
DisableBlockingForSeconds = dataTypes.ReadNextFloat(data);
ItemDamagePerAttack = DataTypes.ReadNextVarInt(data);
DisableBlockingForSeconds = DataTypes.ReadNextFloat(data);
}
public override Queue<byte> Serialize()