Fix DamageSource mismatches

Author: GRAnimated

data/mcswitch_functions.csv

@@ -6674,7 +6674,7 @@ Address,Quality,Size,Name
 0x00000071000f4234,U,000016,_ZN12DamageSource12bypassArmourEv
 0x00000071000f4244,U,000016,
 0x00000071000f4254,U,000012,
-0x00000071000f4260,O,000012,_ZN18EntityDamageSource9setThornsEv
+0x00000071000f4260,O,000012,_ZN12DamageSource8setMagicEv
 0x00000071000f426c,U,000012,
 0x00000071000f4278,U,000164,
 0x00000071000f431c,U,000120,_ZN12DamageSource12CreateThornsENSt3__110shared_ptrI6EntityEE
@@ -6707,7 +6707,7 @@ Address,Quality,Size,Name
 0x00000071000f4e74,U,000008,_ZN12DamageSource6isFireEv
 0x00000071000f4e7c,U,000008,
 0x00000071000f4e84,U,000160,
-0x00000071000f4f24,M,000052,_ZN12DamageSource4copyEv
+0x00000071000f4f24,O,000052,_ZN12DamageSource4copyEv
 0x00000071000f4f58,U,000044,_ZN12DamageSourceC_gen
 0x00000071000f4f84,O,000008,_ZN12DamageSource17getSourcePositionEv
 0x00000071000f4f8c,U,000004,_ZN12DamageSource19GetBaseDamageSourceEv
@@ -10117,14 +10117,14 @@ Address,Quality,Size,Name
 0x000000710015b184,U,000092,
 0x000000710015b1e0,U,000008,_ZN6Entity18getFireImmuneTicksEv
 0x000000710015b1e8,O,000144,_ZN18EntityDamageSourceC1EN21ClientboundChatPacket18EChatPacketMessageES1_NSt3__110shared_ptrI6EntityEE
-0x000000710015b278,O,000012,_ZN12DamageSource8setMagicEv
+0x000000710015b278,O,000012,_ZN18EntityDamageSource9setThornsEv
 0x000000710015b284,U,000008,
-0x000000710015b28c,M,000028,_ZN18EntityDamageSource9getEntityEv
+0x000000710015b28c,O,000028,_ZN18EntityDamageSource9getEntityEv
 0x000000710015b2a8,U,000824,_ZN18EntityDamageSource21getDeathMessagePacketENSt3__110shared_ptrI12LivingEntityEE
-0x000000710015b5e0,M,000076,_ZN18EntityDamageSource20scalesWithDifficultyEv
-0x000000710015b62c,M,000052,_ZN18EntityDamageSource4copyEv
+0x000000710015b5e0,O,000076,_ZN18EntityDamageSource20scalesWithDifficultyEv
+0x000000710015b62c,O,000052,_ZN18EntityDamageSource4copyEv
 0x000000710015b660,U,000084,_ZN18EntityDamageSourceC_gen2
-0x000000710015b6b4,M,000016,_ZN18EntityDamageSource17getSourcePositionEv
+0x000000710015b6b4,O,000016,_ZN18EntityDamageSource17getSourcePositionEv
 0x000000710015b6c4,U,000048,_ZN21EntityDataSerializers25BYTE_EntityDataSerializerC_gen
 0x000000710015b6f4,U,000040,_ZN20EntityDataSerializerIhEC_gen
 0x000000710015b71c,U,000020,
@@ -12372,19 +12372,19 @@ Address,Quality,Size,Name
 0x00000071001a6eac,U,000120,
 0x00000071001a6f24,U,000152,_ZN5Horse14addDataWalkersEP14DataFixerUpper
 0x00000071001a6fbc,U,000300,
-0x00000071001a70e8,U,000020,
+0x00000071001a70e8,U,000020,getVariant__5HorseFv
 0x00000071001a70fc,U,000392,
 0x00000071001a7284,U,000064,
 0x00000071001a72c4,U,000084,
 0x00000071001a7318,U,000084,
-0x00000071001a736c,U,000720,
-0x00000071001a763c,U,000112,
-0x00000071001a76ac,U,000016,
-0x00000071001a76bc,U,000032,
+0x00000071001a736c,U,000720,rebuildLayeredTextureInfo__5HorseFv
+0x00000071001a763c,U,000112,getArmorType__5HorseFv
+0x00000071001a76ac,U,000016,getTextureCount__14HorseArmorItemCFv
+0x00000071001a76bc,U,000032,getTexture__14HorseArmorItemCFi
 0x00000071001a76dc,O,000128,_ZNSt3__1plIwNS_11char_traitsIwEENS_9allocatorIwEEEENS_12basic_stringIT_T0_T1_EEPKS6_RKS9_
-0x00000071001a775c,U,000012,
-0x00000071001a7768,U,000072,
-0x00000071001a77b0,U,000072,
+0x00000071001a775c,U,000012,getHash__14HorseArmorItemCFv
+0x00000071001a7768,U,000072,getLayeredTextureHashName__5HorseFv
+0x00000071001a77b0,U,000072,getLayeredTextureLayers__5HorseFv
 0x00000071001a77f8,U,000076,
 0x00000071001a7844,U,000028,
 0x00000071001a7860,U,000096,
@@ -13055,7 +13055,7 @@ Address,Quality,Size,Name
 0x00000071001cf3f8,O,000024,_ZN20KnockbackEnchantment10getMaxCostEi
 0x00000071001cf410,O,000008,_ZN20KnockbackEnchantment11getMaxLevelEv
 0x00000071001cf418,O,000036,_ZN4ItemD0Ev
-0x00000071001cf43c,M,000052,_ZN18EntityDamageSourceD1Ev
+0x00000071001cf43c,O,000052,_ZN18EntityDamageSourceD1Ev
 0x00000071001cf470,O,000036,_ZN18EntityDamageSourceD0Ev
 0x00000071001cf494,U,000052,_ZN26IndirectEntityDamageSourceD2Ev
 0x00000071001cf4c8,U,000036,_ZN26IndirectEntityDamageSourceD0Ev
@@ -42179,7 +42179,7 @@ Address,Quality,Size,Name
 0x00000071006abab4,U,000132,_ZN13HorseRendererC_gen
 0x00000071006abb38,U,000664,
 0x00000071006abdd0,U,000012,
-0x00000071006abddc,U,000204,
+0x00000071006abddc,U,000204,getTextureLocation__13HorseRendererFRQ2_5boost25shared_ptr__tm__8_6Entity
 0x00000071006abea8,U,000052,
 0x00000071006abedc,U,000056,
 0x00000071006abf14,U,000256,_ZN21HugeExplosionParticleC_gen
@@ -43500,7 +43500,7 @@ Address,Quality,Size,Name
 0x00000071006f8890,U,000036,_ZN11PigRendererD0Ev
 0x00000071006f88b4,U,000036,_ZN15LargeChestModelD0Ev
 0x00000071006f88d8,U,000012,
-0x00000071006f88e4,U,000068,_ZN8ParticleC_gen3
+0x00000071006f88e4,U,000068,_ZN8ParticleD2Ev
 0x00000071006f8928,U,000036,_ZN18LargeSmokeParticleD0Ev
 0x00000071006f894c,U,000036,_ZN23MinecartSpawnerRendererD0Ev
 0x00000071006f8970,U,000036,_ZN8PigModelD0Ev

src/Minecraft.World/net/minecraft/world/damagesource/DamageSource.cpp

@@ -10,43 +10,50 @@ DamageSource::DamageSource(ClientboundChatPacket::EChatPacketMessage unk0,
     this->mIsFireSource = false;
     this->mIsExplosion = false;
     this->mScalesWithDifficulty = false;
-    this->mIsThorns = false;
+    this->mIsMagic = false;
     this->mIsProjectile = false;
     this->field_0x15 = false;
     this->field_0x18 = unk0;
-    this->field_0x1a = unk1;
+    this->field_0x1c = unk1;
 }
+
 std::shared_ptr<Entity> DamageSource::getDirectEntity() {
     return this->getEntity();
 }
+
 std::shared_ptr<Entity> DamageSource::getEntity() {
     return nullptr;
 }
+
 bool DamageSource::scalesWithDifficulty() {
     return this->mScalesWithDifficulty;
 }
+
 Vec3* DamageSource::getSourcePosition() {
     return nullptr;
 }
-// NON_MATCHING | Score: 10
-// stop whining about std::shared_ptr<Entity> mEntity offset.
-// also why is target using 'orr', but current is using 'mov'??
+
 DamageSource* DamageSource::copy() {
     return new DamageSource(*this);
 }
+
 DamageSource* DamageSource::setMagic() {
     this->mIsMagic = true;
     return this;
 }
+
 bool DamageSource::isBypassInvul() const {
     return this->mBypassInvul;
 }
+
 bool DamageSource::isFire() const {
     return this->mIsFireSource;
 }
+
 bool DamageSource::isProjectile() const {
     return this->mIsProjectile;
 }
+
 bool DamageSource::isExplosion() const {
     return this->mIsExplosion;
 }

src/Minecraft.World/net/minecraft/world/damagesource/DamageSource.h

@@ -39,10 +39,9 @@ class DamageSource {
     bool mIsFireSource;
     bool mIsExplosion;
     bool mScalesWithDifficulty;
-    bool mIsThorns;
+    bool mIsMagic;
     bool mIsProjectile;
     bool field_0x15;
     ClientboundChatPacket::EChatPacketMessage field_0x18;
-    ClientboundChatPacket::EChatPacketMessage field_0x1a;
-    bool mIsMagic;
+    ClientboundChatPacket::EChatPacketMessage field_0x1c;
 };

src/Minecraft.World/net/minecraft/world/damagesource/EntityDamageSource.cpp

@@ -1,43 +1,27 @@
 #include "net/minecraft/world/damagesource/EntityDamageSource.h"
 
-// there's some wild shit going on with std::shared_ptr<Entity> mEntity
-// it's getting referenced by 0x28 instead of 0x20
-// i already tried using `unsigned short` for `EChatPacketMessage` enum, it fixes EntityDamageSource, but then
-// it breaks DamageSource constructor
-// i wish i knew why...
-
-// NON_MATCHING | Score: 25 (lower is better)
-// mEntity is located at 0x28 instead of 0x20, read above
 EntityDamageSource::EntityDamageSource(ClientboundChatPacket::EChatPacketMessage unk0,
                                        ClientboundChatPacket::EChatPacketMessage unk1,
                                        std::shared_ptr<Entity> entity)
     : DamageSource(unk0, unk1) {
     this->mEntity = entity;
-    this->field_0x30 = false;
+    this->mIsThorns = false;
 }
 
-// NON_MATCHING | Score: 10 (lower is better)
-// mEntity is located at 0x28 instead of 0x20, read above
 EntityDamageSource::~EntityDamageSource() {}
 
-// NON_MATCHING | Score: 15 (lower is better)
-// mEntity is located at 0x28 instead of 0x20, read above
 std::shared_ptr<Entity> EntityDamageSource::getEntity() {
     return this->mEntity;
 }
 
-// NON_MATCHING | Score: 10 (lower is better)
-// mEntity is located at 0x28 instead of 0x20, read above
 bool EntityDamageSource::scalesWithDifficulty() {
     return this->mEntity && this->mEntity->isType(eLivingEntity) && !this->mEntity->isType(ePlayer);
 }
-// NON_MATCHING | Score: 10 (lower is better)
-// mEntity is located at 0x28 instead of 0x20 and Vec3::newTemp is at wrong address
+
 Vec3* EntityDamageSource::getSourcePosition() {
     return Vec3::newTemp(this->mEntity->mX, this->mEntity->mY, this->mEntity->mZ);
 }
-// NON_MATCHING | Score: 5 (lower is better)
-// continue pulling 2 extra bytes offset out of your ass
+
 DamageSource* EntityDamageSource::copy() {
     return new EntityDamageSource(*this);
 }

src/Minecraft.World/net/minecraft/world/damagesource/EntityDamageSource.h

@@ -21,5 +21,5 @@ class EntityDamageSource : public DamageSource {
 
 private:
     std::shared_ptr<Entity> mEntity;
-    bool field_0x30;
+    bool mIsThorns;
 };