yindo/Project-Reboot-3.0
1
0
Fork 0
mirror of https://github.com/Milxnor/Project-Reboot-3.0.git synced 2026-01-13 02:42:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix everything

Browse Source
This commit is contained in:
Gray
2024-03-19 09:47:24 -04:00
parent a8e3bd4fbf
commit 54b2383124
10 changed files with 118 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Project Reboot 3.0/BuildingWeapons.h
View File

@@ -14,6 +14,8 @@ class AFortWeap_BuildingTool : public AFortWeap_BuildingToolBase
class AFortWeap_EditingTool : public AFortWeap_BuildingToolBase
{
public:
static inline void (*originalOnRep_EditActor)(AFortWeap_EditingTool*);
ABuildingSMActor*& GetEditActor()
{
static auto EditActorOffset = GetOffset("EditActor");
@@ -27,7 +29,7 @@ public:
// if (HasAuthority())
{
GetEditActor() = EditActor;
OnRep_EditActor();
originalOnRep_EditActor(this);
}
}

43
Project Reboot 3.0/FortPlayerController.cpp
View File

@@ -53,6 +53,13 @@ void AFortPlayerController::ClientEquipItem(const FGuid& ItemGuid, bool bForceEx
}
}
void AFortPlayerController::ClientForceCancelBuildingTool()
{
static auto ClientForceCancelBuildingToolFn = FindObject<UFunction>(L"/Script/FortniteGame.FortPlayerController.ClientForceCancelBuildingTool");
this->ProcessEvent(ClientForceCancelBuildingToolFn);
}
bool AFortPlayerController::DoesBuildFree()
{
if (Globals::bInfiniteMaterials)
@@ -963,6 +970,7 @@ void AFortPlayerController::ServerCreateBuildingActorHook(UObject* Context, FFra
ExistingBuildings.Free();
// BuildingActor->SetCurrentBuildingLevel()
BuildingActor->SetPlayerPlaced(true);
BuildingActor->InitializeBuildingActor(PlayerController, BuildingActor, true);
BuildingActor->SetTeam(PlayerStateAthena->GetTeamIndex()); // required?
@@ -1676,6 +1684,23 @@ bool IsOkForEditing(ABuildingSMActor* BuildingActor, AFortPlayerController* Cont
Idk(BuildingActor);
}
/*
The editing dilemma:
15.10:
Valid edit pattern:
ServerBeginEditingActorblahblah
ServerEdit
ClientForceStop
WHERE IS END EDITING?!?!??!
Invalid EDitPattern:
ServerBeginEditingActorblahblah
ServerEnd
*/
void AFortPlayerController::ServerBeginEditingBuildingActorHook(AFortPlayerController* PlayerController, ABuildingSMActor* BuildingActorToEdit)
{
if (!BuildingActorToEdit || !BuildingActorToEdit->IsPlayerPlaced()) // We need more checks.
@@ -1738,7 +1763,7 @@ void AFortPlayerController::ServerEditBuildingActorHook(UObject* Context, FFrame
// LOG_INFO(LogDev, "RotationIterations: {}", RotationIterations);
if (!BuildingActorToEdit || !NewBuildingClass || BuildingActorToEdit->IsDestroyed() || BuildingActorToEdit->GetEditingPlayer() != PlayerState)
if (!BuildingActorToEdit || !NewBuildingClass || BuildingActorToEdit->GetEditingPlayer() != PlayerState || BuildingActorToEdit->IsDestroyed())
{
// LOG_INFO(LogDev, "Cheater?");
// LOG_INFO(LogDev, "BuildingActorToEdit->GetEditingPlayer(): {} PlayerState: {} NewBuildingClass: {} BuildingActorToEdit: {}", BuildingActorToEdit ? __int64(BuildingActorToEdit->GetEditingPlayer()) : -1, __int64(PlayerState), __int64(NewBuildingClass), __int64(BuildingActorToEdit));
@@ -1782,15 +1807,17 @@ void AFortPlayerController::ServerEndEditingBuildingActorHook(AFortPlayerControl
if (!WorldInventory)
return;
AFortWeap_EditingTool* EditTool = Cast<AFortWeap_EditingTool>(Pawn->GetCurrentWeapon());
auto EditToolInstance = WorldInventory->FindItemInstance(EditToolDef);
if (EditTool)
if (!EditToolInstance)
return;
// Pawn->EquipWeaponDefinition(EditToolDef, EditToolInstance->GetItemEntry()->GetItemGuid()); // why do they do this on older builds bru
if (auto EditTool = Cast<AFortWeap_EditingTool>(Pawn->GetCurrentWeapon()))
{
static auto bEditConfirmedOffset = EditTool->GetOffset("bEditConfirmed");
if (bEditConfirmedOffset != -1)
EditTool->Get<bool>(bEditConfirmedOffset) = true; // this probably does nothing on server
EditTool->SetEditActor(nullptr);
}
PlayerController->ClientForceCancelBuildingTool();
}

1
Project Reboot 3.0/FortPlayerController.h
View File

@@ -188,6 +188,7 @@ public:
}
void ClientEquipItem(const FGuid& ItemGuid, bool bForceExecution);
void ClientForceCancelBuildingTool();
bool DoesBuildFree();
void DropAllItems(const std::vector<UFortItemDefinition*>& IgnoreItemDefs, bool bIgnoreSecondaryQuickbar = false, bool bRemoveIfNotDroppable = false, bool RemovePickaxe = false);

5
Project Reboot 3.0/die.h
View File

@@ -2,11 +2,6 @@
#include "reboot.h"
#include "FortGameModeAthena.h"
#include "GameplayStatics.h"
#include "CurveTable.h"
#include "KismetStringLibrary.h"
#include "DataTableFunctionLibrary.h"
#include "FortPlaysetItemDefinition.h"
extern inline void (*SetZoneToIndexOriginal)(AFortGameModeAthena* GameModeAthena, int OverridePhaseMaybeIDFK) = nullptr;

25
Project Reboot 3.0/dllmain.cpp
View File

@@ -16,6 +16,7 @@
#include "FortAthenaMutator_GiveItemsAtGamePhaseStep.h"
#include "FortGameStateAthena.h"
#include "BuildingGameplayActorSpawnMachine.h"
#include "BuildingWeapons.h"
#include "BuildingFoundation.h"
#include "Map.h"
@@ -1169,6 +1170,26 @@ DWORD WINAPI Main(LPVOID)
nullptr, false);
}
auto OnRep_EditActorFn = FindObject<UFunction>(L"/Script/FortniteGame.FortWeap_EditingTool.OnRep_EditActor");
if (OnRep_EditActorFn)
{
auto OnRep_EditActorExec = (uint64)OnRep_EditActorFn->GetFunc();
uint64 OnRep_EditActorOriginal = 0;
for (int i = 0; i < 400; i++)
{
if (*(uint8_t*)(OnRep_EditActorExec + i) == 0xE8 || *(uint8_t*)(OnRep_EditActorExec + i) == 0xE9)
{
OnRep_EditActorOriginal = Memcury::Scanner(OnRep_EditActorExec + i).RelativeOffset(1).Get();
break;
}
}
LOG_INFO(LogDev, "OnRep_EditActor Offset: {}", OnRep_EditActorOriginal - __int64(GetModuleHandleW(0)));
AFortWeap_EditingTool::originalOnRep_EditActor = decltype(AFortWeap_EditingTool::originalOnRep_EditActor)(OnRep_EditActorOriginal);
}
static auto ServerReturnToMainMenuFn = FindObject<UFunction>(L"/Script/FortniteGame.FortPlayerController.ServerReturnToMainMenu");
static auto ServerReturnToMainMenuIdx = GetFunctionIdxOrPtr(ServerReturnToMainMenuFn) / 8;
auto FortServerRestartPlayer = FortPlayerControllerDefault->VFTable[ServerReturnToMainMenuIdx];
@@ -1566,10 +1587,6 @@ DWORD WINAPI Main(LPVOID)
Hooking::MinHook::Hook((PVOID)Addresses::SetZoneToIndex, (PVOID)SetZoneToIndexHook, (PVOID*)&SetZoneToIndexOriginal);
Hooking::MinHook::Hook((PVOID)Addresses::EnterAircraft, (PVOID)AFortPlayerControllerAthena::EnterAircraftHook, (PVOID*)&AFortPlayerControllerAthena::EnterAircraftOriginal);
#ifndef PROD
Hooking::MinHook::Hook((PVOID)Addresses::ProcessEvent, ProcessEventHook, (PVOID*)&UObject::ProcessEventOriginal);
#endif
AddVehicleHook();
auto ClientOnPawnDiedCallAddr = FindFunctionCall(L"ClientOnPawnDied", Engine_Version == 416 ? std::vector<uint8_t>{ 0x48, 0x89, 0x54 } : std::vector<uint8_t>{ 0x48, 0x89, 0x5C });

10
Project Reboot 3.0/finder.cpp
View File

@@ -52,7 +52,7 @@ uint64 FindGIsClient()
std::vector<std::vector<uint8_t>> BytesArray = {
{0x88, 0x05}, // 20.40 21.00
{0xC6, 0x05}, // mov cs X // Checked on 1.11, 12.41
{0xC6, 0x05}, // mov cs X // Checked on 1.11, 12.41, 15.10
{0x88, 0x1D}, // mov cs bl // Checked on 17.50, 19.10
{0x44, 0x88} // 4.5
};
@@ -60,6 +60,7 @@ uint64 FindGIsClient()
int Skip = 2;
uint64 Addy = 0;
int PickedByte = 0;
for (int i = 0; i < 50; i++) // we should subtract from skip if go up
{
@@ -98,6 +99,13 @@ uint64 FindGIsClient()
continue;
}
if (!PickedByte)
{
PickedByte = Bytes[0];
}
else if (PickedByte != Bytes[0])
continue; // Its one of the bytes, but not the first one we found.
if (Skip > 0)
{
Skip--;

1
Project Reboot 3.0/globals.h
View File

@@ -24,6 +24,7 @@ namespace Globals
extern inline bool bAutoRestart = false; // doesnt work fyi
extern inline bool bFillVendingMachines = true;
extern inline int AmountOfListens = 0; // TODO: Switch to this for LastNum
extern inline bool bDeveloperMode = false;
}
extern inline int NumToSubtractFromSquadId = 0; // I think 2?

20
Project Reboot 3.0/gui.h
View File

@@ -35,6 +35,7 @@
#include "GameplayStatics.h"
#include "Text.h"
#include <Images/reboot_icon.h>
#include "hooking.h"
#include "FortGadgetItemDefinition.h"
#include "FortWeaponItemDefinition.h"
#include "events.h"
@@ -325,10 +326,18 @@ static inline void StaticUI()
ImGui::InputInt("Shield/Health for siphon", &AmountOfHealthSiphon);
#ifndef PROD
ImGui::Checkbox("Log ProcessEvent", &Globals::bLogProcessEvent);
ImGui::Checkbox("Enable Developer Mode", &Globals::bDeveloperMode);
if (Globals::bDeveloperMode)
{
if (ImGui::Checkbox("Log ProcessEvent", &Globals::bLogProcessEvent))
{
// todo toggle hook
Hooking::MinHook::Hook((PVOID)Addresses::ProcessEvent, ProcessEventHook, (PVOID*)&UObject::ProcessEventOriginal);
}
}
// ImGui::InputInt("Amount of bots to spawn", &AmountOfBotsToSpawn);
#endif
ImGui::Checkbox("Infinite Ammo", &Globals::bInfiniteAmmo);
ImGui::Checkbox("Infinite Materials", &Globals::bInfiniteMaterials);
@@ -444,7 +453,8 @@ static inline void MainTabs()
// maybe a Replication Stats for >3.3?
#ifndef PROD
if (Globals::bDeveloperMode)
{
if (ImGui::BeginTabItem("Developer"))
{
Tab = DEVELOPER_TAB;
@@ -460,7 +470,7 @@ static inline void MainTabs()
bInformationTab = false;
ImGui::EndTabItem();
}
#endif
}
if (false && ImGui::BeginTabItem(("Credits")))
{

20
Project Reboot 3.0/hooking.h
View File

@@ -357,14 +357,22 @@ namespace Hooking
static bool Unhook(void* Addr)
{
return MH_DisableHook((PVOID)Addr) == MH_OK;
bool bWasUnHookSuccessful = MH_DisableHook((PVOID)Addr) == MH_OK;
if (bWasUnHookSuccessful)
{
for (auto it = AllFunctionHooks.begin(); it != AllFunctionHooks.end(); it++)
{
if (it->Original == Addr)
{
AllFunctionHooks.erase(it);
break;
}
}
}
/* static bool Unhook(void** Addr, void* Original) // I got brain damaged
{
Unhook(Addr);
*Addr = Original;
} */
return bWasUnHookSuccessful;
}
}
}

6
Project Reboot 3.0/inc.h
View File

@@ -20,7 +20,11 @@ extern inline int Engine_Version = 0; // For example, 420, 421, etc. // Prevent
extern inline double Fortnite_Version = 0; // For example, 4.1, 6.21, etc. // Prevent using this when possible.
extern inline int Fortnite_CL = 0;
#define PROD // this doesnt do anything besides remove processeventhook and some assert stuff
// #define PROD // this doesnt do anything besides remove processeventhook and some assert stuff
// DEPRACTERD ^^^
// #define ABOVE_S20
struct PlaceholderBitfield