Implement DamageSource and EntityDamageSource (#49)

* DamageSource and EntityDamageSource with a lot of non-matching

* clean up random shit from ida

* more of clean up

* remove clion header again

* update state of some functions

Author: danilwhale

data/mcswitch_functions.csv

@@ -6674,7 +6674,7 @@ Address,Quality,Size,Name
 0x00000071000f4234,U,000016,_ZN12DamageSource12bypassArmourEv
 0x00000071000f4244,U,000016,
 0x00000071000f4254,U,000012,
-0x00000071000f4260,U,000012,
+0x00000071000f4260,O,000012,_ZN18EntityDamageSource9setThornsEv
 0x00000071000f426c,U,000012,
 0x00000071000f4278,U,000164,
 0x00000071000f431c,U,000120,_ZN12DamageSource12CreateThornsENSt3__110shared_ptrI6EntityEE
@@ -6691,25 +6691,25 @@ Address,Quality,Size,Name
 0x00000071000f4a7c,U,000008,_ZN12DamageSource11isExplosionEv
 0x00000071000f4a84,U,000008,
 0x00000071000f4a8c,U,000012,
-0x00000071000f4a98,U,000008,
+0x00000071000f4a98,O,000008,_ZNK12DamageSource12isProjectileEv
 0x00000071000f4aa0,U,000008,
 0x00000071000f4aa8,U,000008,
-0x00000071000f4ab0,U,000008,_ZNK12DamageSource13isBypassInvulEv
+0x00000071000f4ab0,O,000008,_ZNK12DamageSource13isBypassInvulEv
 0x00000071000f4ab8,U,000008,
-0x00000071000f4ac0,U,000092,_ZN12DamageSourceC1Ev
-0x00000071000f4b1c,U,000012,_ZN12DamageSource15getDirectEntityEv
-0x00000071000f4b28,U,000008,_ZN12DamageSource9getEntityEv
-0x00000071000f4b30,U,000008,_ZN12DamageSource20scalesWithDifficultyEv
+0x00000071000f4ac0,O,000092,_ZN12DamageSourceC1EN21ClientboundChatPacket18EChatPacketMessageES1_
+0x00000071000f4b1c,O,000012,_ZN12DamageSource15getDirectEntityEv
+0x00000071000f4b28,O,000008,_ZN12DamageSource9getEntityEv
+0x00000071000f4b30,O,000008,_ZN12DamageSource20scalesWithDifficultyEv
 0x00000071000f4b38,U,000008,
 0x00000071000f4b40,U,000300,
 0x00000071000f4c6c,U,000216,_ZNSt3__120__shared_ptr_pointerIP32ClientboundDamageIndicatorPacketNS_14default_deleteIS1_EENS_9allocatorIS1_EEEC_gen
-0x00000071000f4d44,U,000304,_ZN12DamageSource21getDeathMessagePacketENSt3__110shared_ptrI12LivingEntityE
+0x00000071000f4d44,U,000304,_ZN12DamageSource21getDeathMessagePacketENSt3__110shared_ptrI12LivingEntityEE
 0x00000071000f4e74,U,000008,_ZN12DamageSource6isFireEv
 0x00000071000f4e7c,U,000008,
 0x00000071000f4e84,U,000160,
-0x00000071000f4f24,U,000052,_ZN12DamageSource4copyEv
+0x00000071000f4f24,M,000052,_ZN12DamageSource4copyEv
 0x00000071000f4f58,U,000044,_ZN12DamageSourceC_gen
-0x00000071000f4f84,U,000008,_ZN12DamageSource17getSourcePositionEv
+0x00000071000f4f84,O,000008,_ZN12DamageSource17getSourcePositionEv
 0x00000071000f4f8c,U,000004,_ZN12DamageSource19GetBaseDamageSourceEv
 0x00000071000f4f90,U,000068,_ZN15DataInputStreamC1EP11InputStream
 0x00000071000f4fd4,U,000020,_ZN9DataInputC1Ev
@@ -8293,8 +8293,8 @@ Address,Quality,Size,Name
 0x000000710012a808,O,000036,_ZN8CoalItemD0Ev
 0x000000710012a82c,U,000036,_ZN10CocoaBlockD0Ev
 0x000000710012a850,U,000036,_ZN12ColoredBlockD0Ev
-0x000000710012a874,U,000004,_ZN12DamageSourceD2Ev
-0x000000710012a878,U,000036,_ZN12DamageSourceD0Ev
+0x000000710012a874,O,000004,_ZN12DamageSourceD2Ev
+0x000000710012a878,O,000036,_ZN12DamageSourceD0Ev
 0x000000710012a89c,U,000012,
 0x000000710012a8a8,U,000036,_ZN18CommandBlockEntityD0Ev
 0x000000710012a8cc,O,000004,_ZN12GenericStatsD2Ev
@@ -10116,15 +10116,15 @@ Address,Quality,Size,Name
 0x000000710015b160,U,000036,_ZN6Entity15stopCurrentLerpEv
 0x000000710015b184,U,000092,
 0x000000710015b1e0,U,000008,_ZN6Entity18getFireImmuneTicksEv
-0x000000710015b1e8,U,000144,_ZN18EntityDamageSourceC_gen
-0x000000710015b278,U,000012,
+0x000000710015b1e8,O,000144,_ZN18EntityDamageSourceC1EN21ClientboundChatPacket18EChatPacketMessageES1_NSt3__110shared_ptrI6EntityEE
+0x000000710015b278,O,000012,_ZN12DamageSource8setMagicEv
 0x000000710015b284,U,000008,
-0x000000710015b28c,U,000028,
-0x000000710015b2a8,U,000824,
-0x000000710015b5e0,U,000076,
-0x000000710015b62c,U,000052,
+0x000000710015b28c,M,000028,_ZN18EntityDamageSource9getEntityEv
+0x000000710015b2a8,U,000824,_ZN18EntityDamageSource21getDeathMessagePacketENSt3__110shared_ptrI12LivingEntityEE
+0x000000710015b5e0,M,000076,_ZN18EntityDamageSource20scalesWithDifficultyEv
+0x000000710015b62c,M,000052,_ZN18EntityDamageSource4copyEv
 0x000000710015b660,U,000084,_ZN18EntityDamageSourceC_gen2
-0x000000710015b6b4,U,000016,
+0x000000710015b6b4,M,000016,_ZN18EntityDamageSource17getSourcePositionEv
 0x000000710015b6c4,U,000048,_ZN21EntityDataSerializers25BYTE_EntityDataSerializerC_gen
 0x000000710015b6f4,U,000040,_ZN20EntityDataSerializerIhEC_gen
 0x000000710015b71c,U,000020,
@@ -13055,8 +13055,8 @@ Address,Quality,Size,Name
 0x00000071001cf3f8,O,000024,_ZN20KnockbackEnchantment10getMaxCostEi
 0x00000071001cf410,O,000008,_ZN20KnockbackEnchantment11getMaxLevelEv
 0x00000071001cf418,O,000036,_ZN4ItemD0Ev
-0x00000071001cf43c,U,000052,_ZN18EntityDamageSourceC_gen3
-0x00000071001cf470,U,000036,_ZN18EntityDamageSourceD0Ev
+0x00000071001cf43c,M,000052,_ZN18EntityDamageSourceD1Ev
+0x00000071001cf470,O,000036,_ZN18EntityDamageSourceD0Ev
 0x00000071001cf494,U,000052,_ZN26IndirectEntityDamageSourceD2Ev
 0x00000071001cf4c8,U,000036,_ZN26IndirectEntityDamageSourceD0Ev
 0x00000071001cf4ec,O,000040,_ZN13GetInfoPacketD2Ev

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

@@ -0,0 +1,52 @@
+#include "net/minecraft/world/damagesource/DamageSource.h"
+#include "net/minecraft/world/food/FoodConstants.h"
+
+DamageSource::DamageSource(ClientboundChatPacket::EChatPacketMessage unk0,
+                           ClientboundChatPacket::EChatPacketMessage unk1) {
+    this->field_0xa = false;
+    this->mBypassInvul = false;
+    this->mBypassArmour = false;
+    this->mExhaustion = FoodConstants::ExhaustionAttack();
+    this->mIsFireSource = false;
+    this->mIsExplosion = false;
+    this->mScalesWithDifficulty = false;
+    this->mIsThorns = false;
+    this->mIsProjectile = false;
+    this->field_0x15 = false;
+    this->field_0x18 = unk0;
+    this->field_0x1a = 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

@@ -1,28 +1,48 @@
 #pragma once
 
-#include "net/minecraft/core/Direction.h"
 #include "net/minecraft/world/entity/Entity.h"
 #include <memory>
 
+class EntityDamageSource;
 class DamageSource {
 public:
     static DamageSource* BYPASS_ARMOUR;  // this name is wrong
     static DamageSource* IN_FIRE;
     static DamageSource* WITHER;
 
-    static DamageSource* CreateThorns(std::shared_ptr<Entity>);
+    static DamageSource* CreateThorns(std::shared_ptr<Entity> entity);
 
-    virtual ~DamageSource();
-    virtual Direction* getDirectionEntity();
-    virtual Entity* getEntity();
-    virtual void scalesWithDifficulty();
-    virtual void getDeathMessagePacket(std::shared_ptr<LivingEntity>);
-    virtual void getSourcePosition();
-    virtual void copy();
+    DamageSource(ClientboundChatPacket::EChatPacketMessage, ClientboundChatPacket::EChatPacketMessage);
+    virtual ~DamageSource() = default;
+
+    virtual std::shared_ptr<Entity> getDirectEntity();
+    virtual std::shared_ptr<Entity> getEntity();
+    virtual bool scalesWithDifficulty();
+    virtual std::shared_ptr<ClientboundChatPacket>
+    getDeathMessagePacket(std::shared_ptr<LivingEntity> entity);
+    virtual Vec3* getSourcePosition();
+    virtual DamageSource* copy();
     virtual void GetBaseDamageSource();
 
+    DamageSource* setMagic();
+
     bool isBypassInvul() const;
     bool isFire() const;
-    bool isProjectile() const;
     bool isExplosion() const;
+    bool isProjectile() const;
+
+protected:
+    bool mBypassArmour;
+    bool mBypassInvul;
+    bool field_0xa;
+    float mExhaustion;
+    bool mIsFireSource;
+    bool mIsExplosion;
+    bool mScalesWithDifficulty;
+    bool mIsThorns;
+    bool mIsProjectile;
+    bool field_0x15;
+    ClientboundChatPacket::EChatPacketMessage field_0x18;
+    ClientboundChatPacket::EChatPacketMessage field_0x1a;
+    bool mIsMagic;
 };

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

@@ -0,0 +1,48 @@
+#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;
+}
+
+// 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);
+}
+
+EntityDamageSource* EntityDamageSource::setThorns() {
+    this->mIsThorns = true;
+    return this;
+}

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

@@ -0,0 +1,25 @@
+#pragma once
+
+#include "net/minecraft/world/damagesource/DamageSource.h"
+#include "net/minecraft/world/entity/Entity.h"
+#include <memory>
+
+class EntityDamageSource : public DamageSource {
+public:
+    EntityDamageSource(ClientboundChatPacket::EChatPacketMessage, ClientboundChatPacket::EChatPacketMessage,
+                       std::shared_ptr<Entity> entity);
+    ~EntityDamageSource() override;
+
+    std::shared_ptr<Entity> getEntity() override;
+    bool scalesWithDifficulty() override;
+    std::shared_ptr<ClientboundChatPacket>
+    getDeathMessagePacket(std::shared_ptr<LivingEntity> entity) override;
+    Vec3* getSourcePosition() override;
+    DamageSource* copy() override;
+
+    EntityDamageSource* setThorns();
+
+private:
+    std::shared_ptr<Entity> mEntity;
+    bool field_0x30;
+};

src/Minecraft.World/net/minecraft/world/enchantment/enchantments/ProtectionEnchantment.cpp

@@ -44,10 +44,10 @@ int ProtectionEnchantment::getDamageProtection(int level, const DamageSource* so
         return level * 2;
     } else if (this->mType == FALL && source == DamageSource::BYPASS_ARMOUR) {
         return level * 3;
-    } else if (this->mType == EXPLOSION && source->isExplosion()) {
+    } else if (this->mType == PROJECTILE && source->isProjectile()) {
         return level * 2;
     } else {
-        return this->mType == PROJECTILE && source->isProjectile() ? level * 2 : 0;
+        return this->mType == EXPLOSION && source->isExplosion() ? level * 2 : 0;
     }
 }
 bool ProtectionEnchantment::checkCompatibility(const Enchantment* other) {

src/Minecraft.World/net/minecraft/world/food/FoodConstants.h

@@ -0,0 +1,6 @@
+#pragma once
+
+class FoodConstants {
+public:
+    static float ExhaustionAttack();
+};