summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Palettes
diff options
context:
space:
mode:
Diffstat (limited to 'src/Protocol/Palettes')
-rw-r--r--src/Protocol/Palettes/Palette_1_13.cpp106
-rw-r--r--src/Protocol/Palettes/Palette_1_13.h2
-rw-r--r--src/Protocol/Palettes/Palette_1_13_1.cpp118
-rw-r--r--src/Protocol/Palettes/Palette_1_13_1.h2
-rw-r--r--src/Protocol/Palettes/Palette_1_14.cpp140
-rw-r--r--src/Protocol/Palettes/Palette_1_14.h2
-rw-r--r--src/Protocol/Palettes/Palette_1_15.cpp144
-rw-r--r--src/Protocol/Palettes/Palette_1_15.h2
-rw-r--r--src/Protocol/Palettes/Palette_1_16.cpp150
-rw-r--r--src/Protocol/Palettes/Palette_1_16.h2
10 files changed, 334 insertions, 334 deletions
diff --git a/src/Protocol/Palettes/Palette_1_13.cpp b/src/Protocol/Palettes/Palette_1_13.cpp
index 513763b2a..d60c7a516 100644
--- a/src/Protocol/Palettes/Palette_1_13.cpp
+++ b/src/Protocol/Palettes/Palette_1_13.cpp
@@ -7859,62 +7859,62 @@ namespace Palette_1_13
}
}
- UInt32 From(const Statistic ID)
+ UInt32 From(const CustomStatistic ID)
{
switch (ID)
{
- case Statistic::AnimalsBred: return 25;
- case Statistic::AviateOneCm: return 17;
- case Statistic::BoatOneCm: return 14;
- case Statistic::CleanArmor: return 33;
- case Statistic::CleanBanner: return 34;
- case Statistic::ClimbOneCm: return 10;
- case Statistic::CrouchOneCm: return 6;
- case Statistic::DamageDealt: return 21;
- case Statistic::DamageTaken: return 22;
- case Statistic::Deaths: return 23;
- case Statistic::Drop: return 20;
- case Statistic::EatCakeSlice: return 30;
- case Statistic::EnchantItem: return 45;
- case Statistic::FallOneCm: return 9;
- case Statistic::FillCauldron: return 31;
- case Statistic::FishCaught: return 27;
- case Statistic::FlyOneCm: return 11;
- case Statistic::HorseOneCm: return 16;
- case Statistic::InspectDispenser: return 39;
- case Statistic::InspectDropper: return 37;
- case Statistic::InspectHopper: return 38;
- case Statistic::InteractWithBeacon: return 36;
- case Statistic::InteractWithBrewingstand: return 35;
- case Statistic::InteractWithCraftingTable: return 48;
- case Statistic::InteractWithFurnace: return 47;
- case Statistic::Jump: return 19;
- case Statistic::LeaveGame: return 0;
- case Statistic::MinecartOneCm: return 13;
- case Statistic::MobKills: return 24;
- case Statistic::OpenChest: return 49;
- case Statistic::OpenEnderchest: return 44;
- case Statistic::OpenShulkerBox: return 51;
- case Statistic::PigOneCm: return 15;
- case Statistic::PlayerKills: return 26;
- case Statistic::PlayNoteblock: return 40;
- case Statistic::PlayOneMinute: return 1;
- case Statistic::PlayRecord: return 46;
- case Statistic::PotFlower: return 42;
- case Statistic::SleepInBed: return 50;
- case Statistic::SneakTime: return 4;
- case Statistic::SprintOneCm: return 7;
- case Statistic::SwimOneCm: return 8;
- case Statistic::TalkedToVillager: return 28;
- case Statistic::TimeSinceDeath: return 2;
- case Statistic::TimeSinceRest: return 3;
- case Statistic::TradedWithVillager: return 29;
- case Statistic::TriggerTrappedChest: return 43;
- case Statistic::TuneNoteblock: return 41;
- case Statistic::UseCauldron: return 32;
- case Statistic::WalkOneCm: return 5;
- case Statistic::WalkOnWaterOneCm: return 18;
- case Statistic::WalkUnderWaterOneCm: return 12;
+ case CustomStatistic::AnimalsBred: return 25;
+ case CustomStatistic::AviateOneCm: return 17;
+ case CustomStatistic::BoatOneCm: return 14;
+ case CustomStatistic::CleanArmor: return 33;
+ case CustomStatistic::CleanBanner: return 34;
+ case CustomStatistic::ClimbOneCm: return 10;
+ case CustomStatistic::CrouchOneCm: return 6;
+ case CustomStatistic::DamageDealt: return 21;
+ case CustomStatistic::DamageTaken: return 22;
+ case CustomStatistic::Deaths: return 23;
+ case CustomStatistic::Drop: return 20;
+ case CustomStatistic::EatCakeSlice: return 30;
+ case CustomStatistic::EnchantItem: return 45;
+ case CustomStatistic::FallOneCm: return 9;
+ case CustomStatistic::FillCauldron: return 31;
+ case CustomStatistic::FishCaught: return 27;
+ case CustomStatistic::FlyOneCm: return 11;
+ case CustomStatistic::HorseOneCm: return 16;
+ case CustomStatistic::InspectDispenser: return 39;
+ case CustomStatistic::InspectDropper: return 37;
+ case CustomStatistic::InspectHopper: return 38;
+ case CustomStatistic::InteractWithBeacon: return 36;
+ case CustomStatistic::InteractWithBrewingstand: return 35;
+ case CustomStatistic::InteractWithCraftingTable: return 48;
+ case CustomStatistic::InteractWithFurnace: return 47;
+ case CustomStatistic::Jump: return 19;
+ case CustomStatistic::LeaveGame: return 0;
+ case CustomStatistic::MinecartOneCm: return 13;
+ case CustomStatistic::MobKills: return 24;
+ case CustomStatistic::OpenChest: return 49;
+ case CustomStatistic::OpenEnderchest: return 44;
+ case CustomStatistic::OpenShulkerBox: return 51;
+ case CustomStatistic::PigOneCm: return 15;
+ case CustomStatistic::PlayerKills: return 26;
+ case CustomStatistic::PlayNoteblock: return 40;
+ case CustomStatistic::PlayOneMinute: return 1;
+ case CustomStatistic::PlayRecord: return 46;
+ case CustomStatistic::PotFlower: return 42;
+ case CustomStatistic::SleepInBed: return 50;
+ case CustomStatistic::SneakTime: return 4;
+ case CustomStatistic::SprintOneCm: return 7;
+ case CustomStatistic::SwimOneCm: return 8;
+ case CustomStatistic::TalkedToVillager: return 28;
+ case CustomStatistic::TimeSinceDeath: return 2;
+ case CustomStatistic::TimeSinceRest: return 3;
+ case CustomStatistic::TradedWithVillager: return 29;
+ case CustomStatistic::TriggerTrappedChest: return 43;
+ case CustomStatistic::TuneNoteblock: return 41;
+ case CustomStatistic::UseCauldron: return 32;
+ case CustomStatistic::WalkOneCm: return 5;
+ case CustomStatistic::WalkOnWaterOneCm: return 18;
+ case CustomStatistic::WalkUnderWaterOneCm: return 12;
default: return UInt32(-1);
}
}
diff --git a/src/Protocol/Palettes/Palette_1_13.h b/src/Protocol/Palettes/Palette_1_13.h
index 6f8ceec2e..5b2a5ccb5 100644
--- a/src/Protocol/Palettes/Palette_1_13.h
+++ b/src/Protocol/Palettes/Palette_1_13.h
@@ -8,6 +8,6 @@ namespace Palette_1_13
{
UInt32 From(BlockState Block);
UInt32 From(Item ID);
- UInt32 From(Statistic ID);
+ UInt32 From(CustomStatistic ID);
Item ToItem(UInt32 ID);
}
diff --git a/src/Protocol/Palettes/Palette_1_13_1.cpp b/src/Protocol/Palettes/Palette_1_13_1.cpp
index cfc4ed5f4..1dba4caf8 100644
--- a/src/Protocol/Palettes/Palette_1_13_1.cpp
+++ b/src/Protocol/Palettes/Palette_1_13_1.cpp
@@ -7870,68 +7870,68 @@ namespace Palette_1_13_1
}
}
- UInt32 From(const Statistic ID)
+ UInt32 From(const CustomStatistic ID)
{
switch (ID)
{
- case Statistic::AnimalsBred: return 30;
- case Statistic::AviateOneCm: return 17;
- case Statistic::BoatOneCm: return 14;
- case Statistic::CleanArmor: return 38;
- case Statistic::CleanBanner: return 39;
- case Statistic::CleanShulkerBox: return 40;
- case Statistic::ClimbOneCm: return 10;
- case Statistic::CrouchOneCm: return 6;
- case Statistic::DamageAbsorbed: return 26;
- case Statistic::DamageBlockedByShield: return 25;
- case Statistic::DamageDealt: return 21;
- case Statistic::DamageDealtAbsorbed: return 22;
- case Statistic::DamageDealtResisted: return 23;
- case Statistic::DamageResisted: return 27;
- case Statistic::DamageTaken: return 24;
- case Statistic::Deaths: return 28;
- case Statistic::Drop: return 20;
- case Statistic::EatCakeSlice: return 35;
- case Statistic::EnchantItem: return 51;
- case Statistic::FallOneCm: return 9;
- case Statistic::FillCauldron: return 36;
- case Statistic::FishCaught: return 32;
- case Statistic::FlyOneCm: return 11;
- case Statistic::HorseOneCm: return 16;
- case Statistic::InspectDispenser: return 45;
- case Statistic::InspectDropper: return 43;
- case Statistic::InspectHopper: return 44;
- case Statistic::InteractWithBeacon: return 42;
- case Statistic::InteractWithBrewingstand: return 41;
- case Statistic::InteractWithCraftingTable: return 54;
- case Statistic::InteractWithFurnace: return 53;
- case Statistic::Jump: return 19;
- case Statistic::LeaveGame: return 0;
- case Statistic::MinecartOneCm: return 13;
- case Statistic::MobKills: return 29;
- case Statistic::OpenChest: return 55;
- case Statistic::OpenEnderchest: return 50;
- case Statistic::OpenShulkerBox: return 57;
- case Statistic::PigOneCm: return 15;
- case Statistic::PlayerKills: return 31;
- case Statistic::PlayNoteblock: return 46;
- case Statistic::PlayOneMinute: return 1;
- case Statistic::PlayRecord: return 52;
- case Statistic::PotFlower: return 48;
- case Statistic::SleepInBed: return 56;
- case Statistic::SneakTime: return 4;
- case Statistic::SprintOneCm: return 7;
- case Statistic::SwimOneCm: return 8;
- case Statistic::TalkedToVillager: return 33;
- case Statistic::TimeSinceDeath: return 2;
- case Statistic::TimeSinceRest: return 3;
- case Statistic::TradedWithVillager: return 34;
- case Statistic::TriggerTrappedChest: return 49;
- case Statistic::TuneNoteblock: return 47;
- case Statistic::UseCauldron: return 37;
- case Statistic::WalkOneCm: return 5;
- case Statistic::WalkOnWaterOneCm: return 18;
- case Statistic::WalkUnderWaterOneCm: return 12;
+ case CustomStatistic::AnimalsBred: return 30;
+ case CustomStatistic::AviateOneCm: return 17;
+ case CustomStatistic::BoatOneCm: return 14;
+ case CustomStatistic::CleanArmor: return 38;
+ case CustomStatistic::CleanBanner: return 39;
+ case CustomStatistic::CleanShulkerBox: return 40;
+ case CustomStatistic::ClimbOneCm: return 10;
+ case CustomStatistic::CrouchOneCm: return 6;
+ case CustomStatistic::DamageAbsorbed: return 26;
+ case CustomStatistic::DamageBlockedByShield: return 25;
+ case CustomStatistic::DamageDealt: return 21;
+ case CustomStatistic::DamageDealtAbsorbed: return 22;
+ case CustomStatistic::DamageDealtResisted: return 23;
+ case CustomStatistic::DamageResisted: return 27;
+ case CustomStatistic::DamageTaken: return 24;
+ case CustomStatistic::Deaths: return 28;
+ case CustomStatistic::Drop: return 20;
+ case CustomStatistic::EatCakeSlice: return 35;
+ case CustomStatistic::EnchantItem: return 51;
+ case CustomStatistic::FallOneCm: return 9;
+ case CustomStatistic::FillCauldron: return 36;
+ case CustomStatistic::FishCaught: return 32;
+ case CustomStatistic::FlyOneCm: return 11;
+ case CustomStatistic::HorseOneCm: return 16;
+ case CustomStatistic::InspectDispenser: return 45;
+ case CustomStatistic::InspectDropper: return 43;
+ case CustomStatistic::InspectHopper: return 44;
+ case CustomStatistic::InteractWithBeacon: return 42;
+ case CustomStatistic::InteractWithBrewingstand: return 41;
+ case CustomStatistic::InteractWithCraftingTable: return 54;
+ case CustomStatistic::InteractWithFurnace: return 53;
+ case CustomStatistic::Jump: return 19;
+ case CustomStatistic::LeaveGame: return 0;
+ case CustomStatistic::MinecartOneCm: return 13;
+ case CustomStatistic::MobKills: return 29;
+ case CustomStatistic::OpenChest: return 55;
+ case CustomStatistic::OpenEnderchest: return 50;
+ case CustomStatistic::OpenShulkerBox: return 57;
+ case CustomStatistic::PigOneCm: return 15;
+ case CustomStatistic::PlayerKills: return 31;
+ case CustomStatistic::PlayNoteblock: return 46;
+ case CustomStatistic::PlayOneMinute: return 1;
+ case CustomStatistic::PlayRecord: return 52;
+ case CustomStatistic::PotFlower: return 48;
+ case CustomStatistic::SleepInBed: return 56;
+ case CustomStatistic::SneakTime: return 4;
+ case CustomStatistic::SprintOneCm: return 7;
+ case CustomStatistic::SwimOneCm: return 8;
+ case CustomStatistic::TalkedToVillager: return 33;
+ case CustomStatistic::TimeSinceDeath: return 2;
+ case CustomStatistic::TimeSinceRest: return 3;
+ case CustomStatistic::TradedWithVillager: return 34;
+ case CustomStatistic::TriggerTrappedChest: return 49;
+ case CustomStatistic::TuneNoteblock: return 47;
+ case CustomStatistic::UseCauldron: return 37;
+ case CustomStatistic::WalkOneCm: return 5;
+ case CustomStatistic::WalkOnWaterOneCm: return 18;
+ case CustomStatistic::WalkUnderWaterOneCm: return 12;
default: return UInt32(-1);
}
}
diff --git a/src/Protocol/Palettes/Palette_1_13_1.h b/src/Protocol/Palettes/Palette_1_13_1.h
index 02085aa2b..fda47e5c4 100644
--- a/src/Protocol/Palettes/Palette_1_13_1.h
+++ b/src/Protocol/Palettes/Palette_1_13_1.h
@@ -8,6 +8,6 @@ namespace Palette_1_13_1
{
UInt32 From(BlockState Block);
UInt32 From(Item ID);
- UInt32 From(Statistic ID);
+ UInt32 From(CustomStatistic ID);
Item ToItem(UInt32 ID);
}
diff --git a/src/Protocol/Palettes/Palette_1_14.cpp b/src/Protocol/Palettes/Palette_1_14.cpp
index 02c871331..0dca7c142 100644
--- a/src/Protocol/Palettes/Palette_1_14.cpp
+++ b/src/Protocol/Palettes/Palette_1_14.cpp
@@ -9505,79 +9505,79 @@ namespace Palette_1_14
}
}
- UInt32 From(const Statistic ID)
+ UInt32 From(const CustomStatistic ID)
{
switch (ID)
{
- case Statistic::AnimalsBred: return 30;
- case Statistic::AviateOneCm: return 17;
- case Statistic::BellRing: return 66;
- case Statistic::BoatOneCm: return 14;
- case Statistic::CleanArmor: return 38;
- case Statistic::CleanBanner: return 39;
- case Statistic::CleanShulkerBox: return 40;
- case Statistic::ClimbOneCm: return 10;
- case Statistic::CrouchOneCm: return 6;
- case Statistic::DamageAbsorbed: return 26;
- case Statistic::DamageBlockedByShield: return 25;
- case Statistic::DamageDealt: return 21;
- case Statistic::DamageDealtAbsorbed: return 22;
- case Statistic::DamageDealtResisted: return 23;
- case Statistic::DamageResisted: return 27;
- case Statistic::DamageTaken: return 24;
- case Statistic::Deaths: return 28;
- case Statistic::Drop: return 20;
- case Statistic::EatCakeSlice: return 35;
- case Statistic::EnchantItem: return 51;
- case Statistic::FallOneCm: return 9;
- case Statistic::FillCauldron: return 36;
- case Statistic::FishCaught: return 32;
- case Statistic::FlyOneCm: return 11;
- case Statistic::HorseOneCm: return 16;
- case Statistic::InspectDispenser: return 45;
- case Statistic::InspectDropper: return 43;
- case Statistic::InspectHopper: return 44;
- case Statistic::InteractWithBeacon: return 42;
- case Statistic::InteractWithBlastFurnace: return 59;
- case Statistic::InteractWithBrewingstand: return 41;
- case Statistic::InteractWithCampfire: return 62;
- case Statistic::InteractWithCartographyTable: return 63;
- case Statistic::InteractWithCraftingTable: return 54;
- case Statistic::InteractWithFurnace: return 53;
- case Statistic::InteractWithLectern: return 61;
- case Statistic::InteractWithLoom: return 64;
- case Statistic::InteractWithSmoker: return 60;
- case Statistic::InteractWithStonecutter: return 65;
- case Statistic::Jump: return 19;
- case Statistic::LeaveGame: return 0;
- case Statistic::MinecartOneCm: return 13;
- case Statistic::MobKills: return 29;
- case Statistic::OpenBarrel: return 58;
- case Statistic::OpenChest: return 55;
- case Statistic::OpenEnderchest: return 50;
- case Statistic::OpenShulkerBox: return 57;
- case Statistic::PigOneCm: return 15;
- case Statistic::PlayerKills: return 31;
- case Statistic::PlayNoteblock: return 46;
- case Statistic::PlayOneMinute: return 1;
- case Statistic::PlayRecord: return 52;
- case Statistic::PotFlower: return 48;
- case Statistic::RaidTrigger: return 67;
- case Statistic::RaidWin: return 68;
- case Statistic::SleepInBed: return 56;
- case Statistic::SneakTime: return 4;
- case Statistic::SprintOneCm: return 7;
- case Statistic::SwimOneCm: return 18;
- case Statistic::TalkedToVillager: return 33;
- case Statistic::TimeSinceDeath: return 2;
- case Statistic::TimeSinceRest: return 3;
- case Statistic::TradedWithVillager: return 34;
- case Statistic::TriggerTrappedChest: return 49;
- case Statistic::TuneNoteblock: return 47;
- case Statistic::UseCauldron: return 37;
- case Statistic::WalkOneCm: return 5;
- case Statistic::WalkOnWaterOneCm: return 8;
- case Statistic::WalkUnderWaterOneCm: return 12;
+ case CustomStatistic::AnimalsBred: return 30;
+ case CustomStatistic::AviateOneCm: return 17;
+ case CustomStatistic::BellRing: return 66;
+ case CustomStatistic::BoatOneCm: return 14;
+ case CustomStatistic::CleanArmor: return 38;
+ case CustomStatistic::CleanBanner: return 39;
+ case CustomStatistic::CleanShulkerBox: return 40;
+ case CustomStatistic::ClimbOneCm: return 10;
+ case CustomStatistic::CrouchOneCm: return 6;
+ case CustomStatistic::DamageAbsorbed: return 26;
+ case CustomStatistic::DamageBlockedByShield: return 25;
+ case CustomStatistic::DamageDealt: return 21;
+ case CustomStatistic::DamageDealtAbsorbed: return 22;
+ case CustomStatistic::DamageDealtResisted: return 23;
+ case CustomStatistic::DamageResisted: return 27;
+ case CustomStatistic::DamageTaken: return 24;
+ case CustomStatistic::Deaths: return 28;
+ case CustomStatistic::Drop: return 20;
+ case CustomStatistic::EatCakeSlice: return 35;
+ case CustomStatistic::EnchantItem: return 51;
+ case CustomStatistic::FallOneCm: return 9;
+ case CustomStatistic::FillCauldron: return 36;
+ case CustomStatistic::FishCaught: return 32;
+ case CustomStatistic::FlyOneCm: return 11;
+ case CustomStatistic::HorseOneCm: return 16;
+ case CustomStatistic::InspectDispenser: return 45;
+ case CustomStatistic::InspectDropper: return 43;
+ case CustomStatistic::InspectHopper: return 44;
+ case CustomStatistic::InteractWithBeacon: return 42;
+ case CustomStatistic::InteractWithBlastFurnace: return 59;
+ case CustomStatistic::InteractWithBrewingstand: return 41;
+ case CustomStatistic::InteractWithCampfire: return 62;
+ case CustomStatistic::InteractWithCartographyTable: return 63;
+ case CustomStatistic::InteractWithCraftingTable: return 54;
+ case CustomStatistic::InteractWithFurnace: return 53;
+ case CustomStatistic::InteractWithLectern: return 61;
+ case CustomStatistic::InteractWithLoom: return 64;
+ case CustomStatistic::InteractWithSmoker: return 60;
+ case CustomStatistic::InteractWithStonecutter: return 65;
+ case CustomStatistic::Jump: return 19;
+ case CustomStatistic::LeaveGame: return 0;
+ case CustomStatistic::MinecartOneCm: return 13;
+ case CustomStatistic::MobKills: return 29;
+ case CustomStatistic::OpenBarrel: return 58;
+ case CustomStatistic::OpenChest: return 55;
+ case CustomStatistic::OpenEnderchest: return 50;
+ case CustomStatistic::OpenShulkerBox: return 57;
+ case CustomStatistic::PigOneCm: return 15;
+ case CustomStatistic::PlayerKills: return 31;
+ case CustomStatistic::PlayNoteblock: return 46;
+ case CustomStatistic::PlayOneMinute: return 1;
+ case CustomStatistic::PlayRecord: return 52;
+ case CustomStatistic::PotFlower: return 48;
+ case CustomStatistic::RaidTrigger: return 67;
+ case CustomStatistic::RaidWin: return 68;
+ case CustomStatistic::SleepInBed: return 56;
+ case CustomStatistic::SneakTime: return 4;
+ case CustomStatistic::SprintOneCm: return 7;
+ case CustomStatistic::SwimOneCm: return 18;
+ case CustomStatistic::TalkedToVillager: return 33;
+ case CustomStatistic::TimeSinceDeath: return 2;
+ case CustomStatistic::TimeSinceRest: return 3;
+ case CustomStatistic::TradedWithVillager: return 34;
+ case CustomStatistic::TriggerTrappedChest: return 49;
+ case CustomStatistic::TuneNoteblock: return 47;
+ case CustomStatistic::UseCauldron: return 37;
+ case CustomStatistic::WalkOneCm: return 5;
+ case CustomStatistic::WalkOnWaterOneCm: return 8;
+ case CustomStatistic::WalkUnderWaterOneCm: return 12;
default: return static_cast<UInt32>(-1);
}
}
diff --git a/src/Protocol/Palettes/Palette_1_14.h b/src/Protocol/Palettes/Palette_1_14.h
index 037d9b4c1..c92a19eba 100644
--- a/src/Protocol/Palettes/Palette_1_14.h
+++ b/src/Protocol/Palettes/Palette_1_14.h
@@ -8,6 +8,6 @@ namespace Palette_1_14
{
UInt32 From(BlockState Block);
UInt32 From(Item ID);
- UInt32 From(Statistic ID);
+ UInt32 From(CustomStatistic ID);
Item ToItem(UInt32 ID);
}
diff --git a/src/Protocol/Palettes/Palette_1_15.cpp b/src/Protocol/Palettes/Palette_1_15.cpp
index 4070a3715..29467d6d7 100644
--- a/src/Protocol/Palettes/Palette_1_15.cpp
+++ b/src/Protocol/Palettes/Palette_1_15.cpp
@@ -9578,81 +9578,81 @@ namespace Palette_1_15
}
}
- UInt32 From(const Statistic ID)
+ UInt32 From(const CustomStatistic ID)
{
switch (ID)
{
- case Statistic::AnimalsBred: return 30;
- case Statistic::AviateOneCm: return 17;
- case Statistic::BellRing: return 66;
- case Statistic::BoatOneCm: return 14;
- case Statistic::CleanArmor: return 38;
- case Statistic::CleanBanner: return 39;
- case Statistic::CleanShulkerBox: return 40;
- case Statistic::ClimbOneCm: return 10;
- case Statistic::CrouchOneCm: return 6;
- case Statistic::DamageAbsorbed: return 26;
- case Statistic::DamageBlockedByShield: return 25;
- case Statistic::DamageDealt: return 21;
- case Statistic::DamageDealtAbsorbed: return 22;
- case Statistic::DamageDealtResisted: return 23;
- case Statistic::DamageResisted: return 27;
- case Statistic::DamageTaken: return 24;
- case Statistic::Deaths: return 28;
- case Statistic::Drop: return 20;
- case Statistic::EatCakeSlice: return 35;
- case Statistic::EnchantItem: return 51;
- case Statistic::FallOneCm: return 9;
- case Statistic::FillCauldron: return 36;
- case Statistic::FishCaught: return 32;
- case Statistic::FlyOneCm: return 11;
- case Statistic::HorseOneCm: return 16;
- case Statistic::InspectDispenser: return 45;
- case Statistic::InspectDropper: return 43;
- case Statistic::InspectHopper: return 44;
- case Statistic::InteractWithAnvil: return 69;
- case Statistic::InteractWithBeacon: return 42;
- case Statistic::InteractWithBlastFurnace: return 59;
- case Statistic::InteractWithBrewingstand: return 41;
- case Statistic::InteractWithCampfire: return 62;
- case Statistic::InteractWithCartographyTable: return 63;
- case Statistic::InteractWithCraftingTable: return 54;
- case Statistic::InteractWithFurnace: return 53;
- case Statistic::InteractWithGrindstone: return 70;
- case Statistic::InteractWithLectern: return 61;
- case Statistic::InteractWithLoom: return 64;
- case Statistic::InteractWithSmoker: return 60;
- case Statistic::InteractWithStonecutter: return 65;
- case Statistic::Jump: return 19;
- case Statistic::LeaveGame: return -0;
- case Statistic::MinecartOneCm: return 13;
- case Statistic::MobKills: return 29;
- case Statistic::OpenBarrel: return 58;
- case Statistic::OpenChest: return 55;
- case Statistic::OpenEnderchest: return 50;
- case Statistic::OpenShulkerBox: return 57;
- case Statistic::PigOneCm: return 15;
- case Statistic::PlayNoteblock: return 46;
- case Statistic::PlayOneMinute: return 1;
- case Statistic::PlayRecord: return 52;
- case Statistic::PlayerKills: return 31;
- case Statistic::PotFlower: return 48;
- case Statistic::RaidTrigger: return 67;
- case Statistic::RaidWin: return 68;
- case Statistic::SleepInBed: return 56;
- case Statistic::SneakTime: return 4;
- case Statistic::SprintOneCm: return 7;
- case Statistic::SwimOneCm: return 18;
- case Statistic::TalkedToVillager: return 33;
- case Statistic::TimeSinceDeath: return 2;
- case Statistic::TimeSinceRest: return 3;
- case Statistic::TradedWithVillager: return 34;
- case Statistic::TriggerTrappedChest: return 49;
- case Statistic::TuneNoteblock: return 47;
- case Statistic::UseCauldron: return 37;
- case Statistic::WalkOnWaterOneCm: return 8;
- case Statistic::WalkOneCm: return 5;
- case Statistic::WalkUnderWaterOneCm: return 12;
+ case CustomStatistic::AnimalsBred: return 30;
+ case CustomStatistic::AviateOneCm: return 17;
+ case CustomStatistic::BellRing: return 66;
+ case CustomStatistic::BoatOneCm: return 14;
+ case CustomStatistic::CleanArmor: return 38;
+ case CustomStatistic::CleanBanner: return 39;
+ case CustomStatistic::CleanShulkerBox: return 40;
+ case CustomStatistic::ClimbOneCm: return 10;
+ case CustomStatistic::CrouchOneCm: return 6;
+ case CustomStatistic::DamageAbsorbed: return 26;
+ case CustomStatistic::DamageBlockedByShield: return 25;
+ case CustomStatistic::DamageDealt: return 21;
+ case CustomStatistic::DamageDealtAbsorbed: return 22;
+ case CustomStatistic::DamageDealtResisted: return 23;
+ case CustomStatistic::DamageResisted: return 27;
+ case CustomStatistic::DamageTaken: return 24;
+ case CustomStatistic::Deaths: return 28;
+ case CustomStatistic::Drop: return 20;
+ case CustomStatistic::EatCakeSlice: return 35;
+ case CustomStatistic::EnchantItem: return 51;
+ case CustomStatistic::FallOneCm: return 9;
+ case CustomStatistic::FillCauldron: return 36;
+ case CustomStatistic::FishCaught: return 32;
+ case CustomStatistic::FlyOneCm: return 11;
+ case CustomStatistic::HorseOneCm: return 16;
+ case CustomStatistic::InspectDispenser: return 45;
+ case CustomStatistic::InspectDropper: return 43;
+ case CustomStatistic::InspectHopper: return 44;
+ case CustomStatistic::InteractWithAnvil: return 69;
+ case CustomStatistic::InteractWithBeacon: return 42;
+ case CustomStatistic::InteractWithBlastFurnace: return 59;
+ case CustomStatistic::InteractWithBrewingstand: return 41;
+ case CustomStatistic::InteractWithCampfire: return 62;
+ case CustomStatistic::InteractWithCartographyTable: return 63;
+ case CustomStatistic::InteractWithCraftingTable: return 54;
+ case CustomStatistic::InteractWithFurnace: return 53;
+ case CustomStatistic::InteractWithGrindstone: return 70;
+ case CustomStatistic::InteractWithLectern: return 61;
+ case CustomStatistic::InteractWithLoom: return 64;
+ case CustomStatistic::InteractWithSmoker: return 60;
+ case CustomStatistic::InteractWithStonecutter: return 65;
+ case CustomStatistic::Jump: return 19;
+ case CustomStatistic::LeaveGame: return -0;
+ case CustomStatistic::MinecartOneCm: return 13;
+ case CustomStatistic::MobKills: return 29;
+ case CustomStatistic::OpenBarrel: return 58;
+ case CustomStatistic::OpenChest: return 55;
+ case CustomStatistic::OpenEnderchest: return 50;
+ case CustomStatistic::OpenShulkerBox: return 57;
+ case CustomStatistic::PigOneCm: return 15;
+ case CustomStatistic::PlayNoteblock: return 46;
+ case CustomStatistic::PlayOneMinute: return 1;
+ case CustomStatistic::PlayRecord: return 52;
+ case CustomStatistic::PlayerKills: return 31;
+ case CustomStatistic::PotFlower: return 48;
+ case CustomStatistic::RaidTrigger: return 67;
+ case CustomStatistic::RaidWin: return 68;
+ case CustomStatistic::SleepInBed: return 56;
+ case CustomStatistic::SneakTime: return 4;
+ case CustomStatistic::SprintOneCm: return 7;
+ case CustomStatistic::SwimOneCm: return 18;
+ case CustomStatistic::TalkedToVillager: return 33;
+ case CustomStatistic::TimeSinceDeath: return 2;
+ case CustomStatistic::TimeSinceRest: return 3;
+ case CustomStatistic::TradedWithVillager: return 34;
+ case CustomStatistic::TriggerTrappedChest: return 49;
+ case CustomStatistic::TuneNoteblock: return 47;
+ case CustomStatistic::UseCauldron: return 37;
+ case CustomStatistic::WalkOnWaterOneCm: return 8;
+ case CustomStatistic::WalkOneCm: return 5;
+ case CustomStatistic::WalkUnderWaterOneCm: return 12;
default: return UInt32(-1);
}
}
diff --git a/src/Protocol/Palettes/Palette_1_15.h b/src/Protocol/Palettes/Palette_1_15.h
index 7fcac7e72..22c993de7 100644
--- a/src/Protocol/Palettes/Palette_1_15.h
+++ b/src/Protocol/Palettes/Palette_1_15.h
@@ -8,6 +8,6 @@ namespace Palette_1_15
{
UInt32 From(BlockState Block);
UInt32 From(Item ID);
- UInt32 From(Statistic ID);
+ UInt32 From(CustomStatistic ID);
Item ToItem(UInt32 ID);
}
diff --git a/src/Protocol/Palettes/Palette_1_16.cpp b/src/Protocol/Palettes/Palette_1_16.cpp
index fae43766d..86b684cb8 100644
--- a/src/Protocol/Palettes/Palette_1_16.cpp
+++ b/src/Protocol/Palettes/Palette_1_16.cpp
@@ -12762,84 +12762,84 @@ namespace Palette_1_16
UNREACHABLE("Invalid item");
}
- UInt32 From(const Statistic ID)
+ UInt32 From(const CustomStatistic ID)
{
switch (ID)
{
- case Statistic::AnimalsBred: return 31;
- case Statistic::AviateOneCm: return 17;
- case Statistic::BellRing: return 67;
- case Statistic::BoatOneCm: return 14;
- case Statistic::CleanArmor: return 39;
- case Statistic::CleanBanner: return 40;
- case Statistic::CleanShulkerBox: return 41;
- case Statistic::ClimbOneCm: return 10;
- case Statistic::CrouchOneCm: return 6;
- case Statistic::DamageAbsorbed: return 27;
- case Statistic::DamageBlockedByShield: return 26;
- case Statistic::DamageDealt: return 22;
- case Statistic::DamageDealtAbsorbed: return 23;
- case Statistic::DamageDealtResisted: return 24;
- case Statistic::DamageResisted: return 28;
- case Statistic::DamageTaken: return 25;
- case Statistic::Deaths: return 29;
- case Statistic::Drop: return 21;
- case Statistic::EatCakeSlice: return 36;
- case Statistic::EnchantItem: return 52;
- case Statistic::FallOneCm: return 9;
- case Statistic::FillCauldron: return 37;
- case Statistic::FishCaught: return 33;
- case Statistic::FlyOneCm: return 11;
- case Statistic::HorseOneCm: return 16;
- case Statistic::InspectDispenser: return 46;
- case Statistic::InspectDropper: return 44;
- case Statistic::InspectHopper: return 45;
- case Statistic::InteractWithAnvil: return 70;
- case Statistic::InteractWithBeacon: return 43;
- case Statistic::InteractWithBlastFurnace: return 60;
- case Statistic::InteractWithBrewingstand: return 42;
- case Statistic::InteractWithCampfire: return 63;
- case Statistic::InteractWithCartographyTable: return 64;
- case Statistic::InteractWithCraftingTable: return 55;
- case Statistic::InteractWithFurnace: return 54;
- case Statistic::InteractWithGrindstone: return 71;
- case Statistic::InteractWithLectern: return 62;
- case Statistic::InteractWithLoom: return 65;
- case Statistic::InteractWithSmithingTable: return 73;
- case Statistic::InteractWithSmoker: return 61;
- case Statistic::InteractWithStonecutter: return 66;
- case Statistic::Jump: return 20;
- case Statistic::LeaveGame: return -0;
- case Statistic::MinecartOneCm: return 13;
- case Statistic::MobKills: return 30;
- case Statistic::OpenBarrel: return 59;
- case Statistic::OpenChest: return 56;
- case Statistic::OpenEnderchest: return 51;
- case Statistic::OpenShulkerBox: return 58;
- case Statistic::PigOneCm: return 15;
- case Statistic::PlayNoteblock: return 47;
- case Statistic::PlayOneMinute: return 1;
- case Statistic::PlayRecord: return 53;
- case Statistic::PlayerKills: return 32;
- case Statistic::PotFlower: return 49;
- case Statistic::RaidTrigger: return 68;
- case Statistic::RaidWin: return 69;
- case Statistic::SleepInBed: return 57;
- case Statistic::SneakTime: return 4;
- case Statistic::SprintOneCm: return 7;
- case Statistic::StriderOneCm: return 19;
- case Statistic::SwimOneCm: return 18;
- case Statistic::TalkedToVillager: return 34;
- case Statistic::TargetHit: return 72;
- case Statistic::TimeSinceDeath: return 2;
- case Statistic::TimeSinceRest: return 3;
- case Statistic::TradedWithVillager: return 35;
- case Statistic::TriggerTrappedChest: return 50;
- case Statistic::TuneNoteblock: return 48;
- case Statistic::UseCauldron: return 38;
- case Statistic::WalkOnWaterOneCm: return 8;
- case Statistic::WalkOneCm: return 5;
- case Statistic::WalkUnderWaterOneCm: return 12;
+ case CustomStatistic::AnimalsBred: return 31;
+ case CustomStatistic::AviateOneCm: return 17;
+ case CustomStatistic::BellRing: return 67;
+ case CustomStatistic::BoatOneCm: return 14;
+ case CustomStatistic::CleanArmor: return 39;
+ case CustomStatistic::CleanBanner: return 40;
+ case CustomStatistic::CleanShulkerBox: return 41;
+ case CustomStatistic::ClimbOneCm: return 10;
+ case CustomStatistic::CrouchOneCm: return 6;
+ case CustomStatistic::DamageAbsorbed: return 27;
+ case CustomStatistic::DamageBlockedByShield: return 26;
+ case CustomStatistic::DamageDealt: return 22;
+ case CustomStatistic::DamageDealtAbsorbed: return 23;
+ case CustomStatistic::DamageDealtResisted: return 24;
+ case CustomStatistic::DamageResisted: return 28;
+ case CustomStatistic::DamageTaken: return 25;
+ case CustomStatistic::Deaths: return 29;
+ case CustomStatistic::Drop: return 21;
+ case CustomStatistic::EatCakeSlice: return 36;
+ case CustomStatistic::EnchantItem: return 52;
+ case CustomStatistic::FallOneCm: return 9;
+ case CustomStatistic::FillCauldron: return 37;
+ case CustomStatistic::FishCaught: return 33;
+ case CustomStatistic::FlyOneCm: return 11;
+ case CustomStatistic::HorseOneCm: return 16;
+ case CustomStatistic::InspectDispenser: return 46;
+ case CustomStatistic::InspectDropper: return 44;
+ case CustomStatistic::InspectHopper: return 45;
+ case CustomStatistic::InteractWithAnvil: return 70;
+ case CustomStatistic::InteractWithBeacon: return 43;
+ case CustomStatistic::InteractWithBlastFurnace: return 60;
+ case CustomStatistic::InteractWithBrewingstand: return 42;
+ case CustomStatistic::InteractWithCampfire: return 63;
+ case CustomStatistic::InteractWithCartographyTable: return 64;
+ case CustomStatistic::InteractWithCraftingTable: return 55;
+ case CustomStatistic::InteractWithFurnace: return 54;
+ case CustomStatistic::InteractWithGrindstone: return 71;
+ case CustomStatistic::InteractWithLectern: return 62;
+ case CustomStatistic::InteractWithLoom: return 65;
+ case CustomStatistic::InteractWithSmithingTable: return 73;
+ case CustomStatistic::InteractWithSmoker: return 61;
+ case CustomStatistic::InteractWithStonecutter: return 66;
+ case CustomStatistic::Jump: return 20;
+ case CustomStatistic::LeaveGame: return -0;
+ case CustomStatistic::MinecartOneCm: return 13;
+ case CustomStatistic::MobKills: return 30;
+ case CustomStatistic::OpenBarrel: return 59;
+ case CustomStatistic::OpenChest: return 56;
+ case CustomStatistic::OpenEnderchest: return 51;
+ case CustomStatistic::OpenShulkerBox: return 58;
+ case CustomStatistic::PigOneCm: return 15;
+ case CustomStatistic::PlayNoteblock: return 47;
+ case CustomStatistic::PlayOneMinute: return 1;
+ case CustomStatistic::PlayRecord: return 53;
+ case CustomStatistic::PlayerKills: return 32;
+ case CustomStatistic::PotFlower: return 49;
+ case CustomStatistic::RaidTrigger: return 68;
+ case CustomStatistic::RaidWin: return 69;
+ case CustomStatistic::SleepInBed: return 57;
+ case CustomStatistic::SneakTime: return 4;
+ case CustomStatistic::SprintOneCm: return 7;
+ case CustomStatistic::StriderOneCm: return 19;
+ case CustomStatistic::SwimOneCm: return 18;
+ case CustomStatistic::TalkedToVillager: return 34;
+ case CustomStatistic::TargetHit: return 72;
+ case CustomStatistic::TimeSinceDeath: return 2;
+ case CustomStatistic::TimeSinceRest: return 3;
+ case CustomStatistic::TradedWithVillager: return 35;
+ case CustomStatistic::TriggerTrappedChest: return 50;
+ case CustomStatistic::TuneNoteblock: return 48;
+ case CustomStatistic::UseCauldron: return 38;
+ case CustomStatistic::WalkOnWaterOneCm: return 8;
+ case CustomStatistic::WalkOneCm: return 5;
+ case CustomStatistic::WalkUnderWaterOneCm: return 12;
default: return UInt32(-1);
}
}
diff --git a/src/Protocol/Palettes/Palette_1_16.h b/src/Protocol/Palettes/Palette_1_16.h
index 6e6e632ce..ae6cf9484 100644
--- a/src/Protocol/Palettes/Palette_1_16.h
+++ b/src/Protocol/Palettes/Palette_1_16.h
@@ -8,6 +8,6 @@ namespace Palette_1_16
{
UInt32 From(BlockState Block);
UInt32 From(Item ID);
- UInt32 From(Statistic ID);
+ UInt32 From(CustomStatistic ID);
Item ToItem(UInt32 ID);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 07:51:16 +0100