mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2026-08-15 13:04:36 +00:00
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>
This commit is contained in:
parent
94bf42710a
commit
640a4e39b7
90 changed files with 366 additions and 366 deletions
|
|
@ -15,12 +15,12 @@ public class AttributeModifiersComponent(DataTypes dataTypes, ItemPalette itemPa
|
|||
|
||||
public override void Parse(Queue<byte> 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<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -13,17 +13,17 @@ public class BannerPatternsComponent(DataTypes dataTypes, ItemPalette itemPalett
|
|||
|
||||
public override void Parse(Queue<byte> 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)
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class BaseColorComponent(DataTypes dataTypes, ItemPalette itemPalette, Su
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
DyeColor = dataTypes.ReadNextVarInt(data);
|
||||
DyeColor = DataTypes.ReadNextVarInt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@ public class BeesComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComp
|
|||
|
||||
public override void Parse(Queue<byte> 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)));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ public class BlockStateComponent(DataTypes dataTypes, ItemPalette itemPalette, S
|
|||
|
||||
public override void Parse(Queue<byte> 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<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@ public class BundleContentsComponent(DataTypes dataTypes, ItemPalette itemPalett
|
|||
|
||||
public override void Parse(Queue<byte> 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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@ public class CanBreakComponent(DataTypes dataTypes, ItemPalette itemPalette, Sub
|
|||
|
||||
public override void Parse(Queue<byte> 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<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@ public class CanPlaceOnComponent(DataTypes dataTypes, ItemPalette itemPalette, S
|
|||
|
||||
public override void Parse(Queue<byte> 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<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@ public class ChargedProjectilesComponent(DataTypes dataTypes, ItemPalette itemPa
|
|||
|
||||
public override void Parse(Queue<byte> 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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ public class ContainerComponent(DataTypes dataTypes, ItemPalette itemPalette, Su
|
|||
|
||||
public override void Parse(Queue<byte> 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<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class ContainerLootComponent(DataTypes dataTypes, ItemPalette itemPalette
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Nbt = dataTypes.ReadNextNbt(data);
|
||||
Nbt = DataTypes.ReadNextNbt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class CustomDataComponent(DataTypes dataTypes, ItemPalette itemPalette, S
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Nbt = dataTypes.ReadNextNbt(data);
|
||||
Nbt = DataTypes.ReadNextNbt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ public class CustomModelDataComponent(DataTypes dataTypes, ItemPalette itemPalet
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Value = dataTypes.ReadNextVarInt(data);
|
||||
Value = DataTypes.ReadNextVarInt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ public class CustomNameComponent(DataTypes dataTypes, ItemPalette itemPalette, S
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
CustomNameNbt = dataTypes.ReadNextNbt(data);
|
||||
CustomNameNbt = DataTypes.ReadNextNbt(data);
|
||||
CustomName = ChatParser.ParseText(CustomNameNbt);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class DamageComponent(DataTypes dataTypes, ItemPalette itemPalette, SubCo
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Damage = dataTypes.ReadNextVarInt(data);
|
||||
Damage = DataTypes.ReadNextVarInt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class DebugStickStateComponent(DataTypes dataTypes, ItemPalette itemPalet
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Nbt = dataTypes.ReadNextNbt(data);
|
||||
Nbt = DataTypes.ReadNextNbt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ public class DyeColorComponent(DataTypes dataTypes, ItemPalette itemPalette, Sub
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Color = dataTypes.ReadNextInt(data);
|
||||
ShowInTooltip = dataTypes.ReadNextBool(data);
|
||||
Color = DataTypes.ReadNextInt(data);
|
||||
ShowInTooltip = DataTypes.ReadNextBool(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class EnchantmentGlintOverrideComponent(DataTypes dataTypes, ItemPalette
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
HasGlint = dataTypes.ReadNextBool(data);
|
||||
HasGlint = DataTypes.ReadNextBool(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@ public class EnchantmentsComponent(DataTypes dataTypes, ItemPalette itemPalette,
|
|||
|
||||
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));
|
||||
}
|
||||
|
||||
ShowTooltip = dataTypes.ReadNextBool(data);
|
||||
ShowTooltip = DataTypes.ReadNextBool(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class EntityDataComponent(DataTypes dataTypes, ItemPalette itemPalette, S
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Nbt = dataTypes.ReadNextNbt(data);
|
||||
Nbt = DataTypes.ReadNextNbt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ public class FireworkExplosionComponent(DataTypes dataTypes, ItemPalette itemPal
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
FireworkExplosionSubComponent = (FireworkExplosionSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.FireworkExplosion, data);
|
||||
FireworkExplosionSubComponent = (FireworkExplosionSubComponent)SubComponentRegistry.ParseSubComponent(SubComponents.FireworkExplosion, data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@ public class FireworksComponent(DataTypes dataTypes, ItemPalette itemPalette, Su
|
|||
|
||||
public override void Parse(Queue<byte> 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));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@ public class FoodComponentComponent(DataTypes dataTypes, ItemPalette itemPalette
|
|||
|
||||
public override void Parse(Queue<byte> 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<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -23,22 +23,22 @@ public class InstrumentComponent(DataTypes dataTypes, ItemPalette itemPalette, S
|
|||
|
||||
public override void Parse(Queue<byte> 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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class IntangibleProjectileComponent(DataTypes dataTypes, ItemPalette item
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Nbt = dataTypes.ReadNextNbt(data);
|
||||
Nbt = DataTypes.ReadNextNbt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ public class ItemNameComponent(DataTypes dataTypes, ItemPalette itemPalette, Sub
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
ItemNameNbt = dataTypes.ReadNextNbt(data);
|
||||
ItemNameNbt = DataTypes.ReadNextNbt(data);
|
||||
ItemName = ChatParser.ParseText(ItemNameNbt);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class LockComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComp
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Nbt = dataTypes.ReadNextNbt(data);
|
||||
Nbt = DataTypes.ReadNextNbt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -15,15 +15,15 @@ public class LodestoneTrackerComponent(DataTypes dataTypes, ItemPalette itemPale
|
|||
|
||||
public override void Parse(Queue<byte> 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<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@ public class LoreNameComponent1206(DataTypes dataTypes, ItemPalette itemPalette,
|
|||
|
||||
public override void Parse(Queue<byte> 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));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class MapColorComponent(DataTypes dataTypes, ItemPalette itemPalette, Sub
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Id = dataTypes.ReadNextInt(data);
|
||||
Id = DataTypes.ReadNextInt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class MapDecorationsComponent(DataTypes dataTypes, ItemPalette itemPalett
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Nbt = dataTypes.ReadNextNbt(data);
|
||||
Nbt = DataTypes.ReadNextNbt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class MapIdComponent(DataTypes dataTypes, ItemPalette itemPalette, SubCom
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Id = dataTypes.ReadNextVarInt(data);
|
||||
Id = DataTypes.ReadNextVarInt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class MapPostProcessingComponent(DataTypes dataTypes, ItemPalette itemPal
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Type = dataTypes.ReadNextVarInt(data);
|
||||
Type = DataTypes.ReadNextVarInt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class MaxDamageComponent(DataTypes dataTypes, ItemPalette itemPalette, Su
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
MaxDamage = dataTypes.ReadNextVarInt(data);
|
||||
MaxDamage = DataTypes.ReadNextVarInt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class MaxStackSizeComponent(DataTypes dataTypes, ItemPalette itemPalette,
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
MaxStackSize = dataTypes.ReadNextVarInt(data);
|
||||
MaxStackSize = DataTypes.ReadNextVarInt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class NoteBlockSoundComponent(DataTypes dataTypes, ItemPalette itemPalett
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Identifier = dataTypes.ReadNextString(data);
|
||||
Identifier = DataTypes.ReadNextString(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class OmniousBottleAmplifierComponent(DataTypes dataTypes, ItemPalette it
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Amplifier = dataTypes.ReadNextVarInt(data);
|
||||
Amplifier = DataTypes.ReadNextVarInt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ public class PotDecorationsComponent(DataTypes dataTypes, ItemPalette itemPalett
|
|||
|
||||
public override void Parse(Queue<byte> 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<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -17,17 +17,17 @@ public class PotionContentsComponent(DataTypes dataTypes, ItemPalette itemPalett
|
|||
|
||||
public override void Parse(Queue<byte> 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<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -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<byte> 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<byte> 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<byte> 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<byte> 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<byte>(data);
|
||||
}
|
||||
|
|
@ -181,10 +181,10 @@ public class ProfileComponent(DataTypes dataTypes, ItemPalette itemPalette, SubC
|
|||
var properties = new List<ProfileProperty>(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<byte> data)
|
||||
{
|
||||
return dataTypes.ReadNextBool(data) ? dataTypes.ReadNextString(data) : null;
|
||||
return DataTypes.ReadNextBool(data) ? DataTypes.ReadNextString(data) : null;
|
||||
}
|
||||
|
||||
private void SerializeOptionalResourceLocation(List<byte> data, string? resourceLocation)
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ public class RarityComponent(DataTypes dataTypes, ItemPalette itemPalette, SubCo
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Rarity = (ItemRarity)dataTypes.ReadNextVarInt(data);
|
||||
Rarity = (ItemRarity)DataTypes.ReadNextVarInt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class RecipesComponent(DataTypes dataTypes, ItemPalette itemPalette, SubC
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Nbt = dataTypes.ReadNextNbt(data);
|
||||
Nbt = DataTypes.ReadNextNbt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class RepairCostComponent(DataTypes dataTypes, ItemPalette itemPalette, S
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Cost = dataTypes.ReadNextVarInt(data);
|
||||
Cost = DataTypes.ReadNextVarInt(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@ public class SuspiciousStewEffectsComponent(DataTypes dataTypes, ItemPalette ite
|
|||
|
||||
public override void Parse(Queue<byte> 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<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ public class ToolComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComp
|
|||
|
||||
public override void Parse(Queue<byte> 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<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -27,40 +27,40 @@ public class TrimComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComp
|
|||
|
||||
public override void Parse(Queue<byte> 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<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class UnbrekableComponent1206(DataTypes dataTypes, ItemPalette itemPalett
|
|||
|
||||
public override void Parse(Queue<byte> data)
|
||||
{
|
||||
Unbrekable = dataTypes.ReadNextBool(data);
|
||||
Unbrekable = DataTypes.ReadNextBool(data);
|
||||
}
|
||||
|
||||
public override Queue<byte> Serialize()
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@ public class WritableBlookContentComponent(DataTypes dataTypes, ItemPalette item
|
|||
|
||||
public override void Parse(Queue<byte> 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));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,34 +20,34 @@ public class WrittenBlookContentComponent(DataTypes dataTypes, ItemPalette itemP
|
|||
|
||||
public override void Parse(Queue<byte> 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<string, object>? 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<byte> Serialize()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue