backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-28 04:53:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7 from tropicaaal/leahs-dev-branch

Browse source 
fix: remove hardcoded locales and include through stdafx
This commit is contained in:
Leah Anderson 2026-03-02 15:29:16 -07:00 committed by GitHub
parent 6b31c49bc9 c197c6049e
commit e835351668
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/Common/Telemetry/TelemetryManager.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "../../Common/UI/UIEnums.h"
#include "../../Xbox/Sentient/SentientTelemetryCommon.h"
enum ETelemetryChallenges
{

13
Minecraft.Client/stdafx.h
View file

@ -279,6 +279,19 @@ typedef XUID GameSessionUID;
#include "Windows64\Iggy\include\iggy.h"
#include "Windows64\Iggy\gdraw\gdraw_d3d11.h"
#include "Windows64\Windows64_UIController.h"
#elif defined __linux__
// #include "Windows64/Sentient/MinecraftTelemetry.h"
#include "Windows64Media/strings.h"
// #include "Windows64/Windows64_App.h"
// #include "Windows64/Sentient/DynamicConfigurations.h"
// #include "Windows64/Sentient/SentientTelemetryCommon.h"
// #include "Windows64/GameConfig/Minecraft.spa.h"
// #include "Windows64/XML/ATGXmlParser.h"
// #include "Windows64/Social/SocialManager.h"
// #include "Common/Audio/SoundEngine.h"
// #include "Windows64/Iggy/include/iggy.h"
// #include "Windows64/Iggy/gdraw/gdraw_d3d11.h"
// #include "Windows64/Windows64_UIController.h"
#elif defined __PSVITA__
#include "PSVita\PSVita_App.h"
#include "PSVitaMedia\strings.h" // TODO - create PSVita-specific version of this

3
Minecraft.World/Animal.cpp
View file

@ -12,9 +12,6 @@
#include "Random.h"
#include "Animal.h"
#include "../Minecraft.Client/Windows64Media/strings.h"
Animal::Animal(Level *level) : AgableMob( level )
{
// inLove = 0; // 4J removed - now synched data

2
Minecraft.World/BucketItem.cpp
View file

@ -15,7 +15,7 @@
#include "../Minecraft.Client/LocalPlayer.h"
#include "../Minecraft.Client/ServerPlayer.h"
#include "../Minecraft.Client/PlayerConnection.h"
#include "..\Minecraft.World\ChatPacket.h"
#include "../Minecraft.World/ChatPacket.h"
#include "SoundTypes.h"
BucketItem::BucketItem(int id, int content) : Item( id )

1
Minecraft.World/EnchantmentContainer.cpp
View file

@ -1,7 +1,6 @@
#include "stdafx.h"
#include "net.minecraft.world.inventory.h"
#include "EnchantmentContainer.h"
#include "../Minecraft.Client/Windows64Media/strings.h"
EnchantmentContainer::EnchantmentContainer(EnchantmentMenu *menu) : SimpleContainer(IDS_ENCHANT, 1), m_menu( menu )
{

1
Minecraft.World/EntityIO.cpp
View file

@ -13,7 +13,6 @@
#include "net.minecraft.world.level.h"
#include "com.mojang.nbt.h"
#include "EntityIO.h"
#include "../Minecraft.Client/Windows64Media/strings.h"
unordered_map<wstring, entityCreateFn> *EntityIO::idCreateMap = new unordered_map<wstring, entityCreateFn>;
unordered_map<eINSTANCEOF, wstring, eINSTANCEOFKeyHash, eINSTANCEOFKeyEq> *EntityIO::classIdMap = new unordered_map<eINSTANCEOF, wstring, eINSTANCEOFKeyHash, eINSTANCEOFKeyEq>;

2
Minecraft.World/FireChargeItem.cpp
View file

@ -6,7 +6,7 @@
#include "net.minecraft.world.h"
#include "SoundTypes.h"
#include "FireChargeItem.h"
#include "tile.h"
#include "Tile.h"
FireChargeItem::FireChargeItem(int id) : Item(id)
{

2
Minecraft.World/HangingEntityItem.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "item.h"
#include "Item.h"
class HangingEntity;

1
Minecraft.World/Inventory.cpp
View file

@ -6,7 +6,6 @@
#include "net.minecraft.stats.h"
#include "Material.h"
#include "Inventory.h"
#include "../Minecraft.Client/Windows64Media/strings.h"
const int Inventory::POP_TIME_DURATION = 5;
const int Inventory::MAX_INVENTORY_STACK_SIZE = 64;

2
Minecraft.World/Minecart.cpp
View file

@ -12,8 +12,6 @@
#include "Minecart.h"
#include "SharedConstants.h"
#include "../Minecraft.Client/Windows64Media/strings.h"
const int Minecart::EXITS[][2][3] = { //
//
{

1
Minecraft.World/MobEffect.cpp
View file

@ -4,7 +4,6 @@
#include "net.minecraft.world.food.h"
#include "net.minecraft.world.effect.h"
#include "SharedConstants.h"
#include "../Minecraft.Client/Windows64Media/strings.h"
MobEffect *MobEffect::effects[NUM_EFFECTS];

2
Minecraft.World/NetherBridgeFeature.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "StructureFeature.h"
#include "StructureStart.h"
#include "biome.h"
#include "Biome.h"
class Random;
class NetherBridgeFeature : public StructureFeature

1
Minecraft.World/PlayerEnderChestContainer.cpp
View file

@ -1,7 +1,6 @@
#include "stdafx.h"
#include "net.minecraft.world.level.tile.entity.h"
#include "PlayerEnderChestContainer.h"
#include "../Minecraft.Client/Windows64Media/strings.h"
PlayerEnderChestContainer::PlayerEnderChestContainer() : SimpleContainer(IDS_TILE_ENDERCHEST, 9 * 3)
{

2
Minecraft.World/RedStoneItem.cpp
View file

@ -4,7 +4,7 @@
#include "net.minecraft.world.level.tile.h"
#include "ItemInstance.h"
#include "GenericStats.h"
#include "RedstoneItem.h"
#include "RedStoneItem.h"
RedStoneItem::RedStoneItem(int id) : Item(id)
{

2
Minecraft.World/RepairMenu.cpp
View file

@ -5,8 +5,6 @@
#include "net.minecraft.world.item.h"
#include "net.minecraft.world.item.enchantment.h"
#include "RepairMenu.h"
#include "../Minecraft.Client/Windows64Media/strings.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
RepairMenu::RepairMenu(shared_ptr<Inventory> inventory, Level *level, int xt, int yt, int zt, shared_ptr<Player> player)
{

2
Minecraft.World/TileItem.cpp
View file

@ -10,7 +10,7 @@ using namespace std;
#include "net.minecraft.world.h"
#include "net.minecraft.stats.h"
#include "TileItem.h"
#include "facing.h"
#include "Facing.h"
// 4J-PB - for the debug option of not removing items
#include <xuiresource.h>

1
Minecraft.World/Villager.cpp
View file

@ -15,7 +15,6 @@
#include "net.minecraft.world.level.h"
#include "../Minecraft.Client/Textures.h"
#include "Villager.h"
#include "../Minecraft.Client/Windows64Media/strings.h"
unordered_map<int, pair<int,int> > Villager::MIN_MAX_VALUES;
unordered_map<int, pair<int,int> > Villager::MIN_MAX_PRICES;

1
Minecraft.World/linux/wlinux.h
View file

@ -44,6 +44,7 @@ typedef struct {
typedef long long LONGLONG;
typedef size_t SIZE_T;
typedef std::wstring LPWSTR;
typedef unsigned char boolean; // java brainrot
// https://learn.microsoft.com/en-us/windows/win32/api/minwinbase/ns-minwinbase-filetime
typedef struct _FILETIME {

5
Minecraft.World/stdafx.h
View file

@ -246,7 +246,10 @@ void MemSect(int sect);
#include "..\Minecraft.Client\PSVita\Sentient\SentientManager.h"
#include "..\Minecraft.Client\PSVita\Sentient\MinecraftTelemetry.h"
#elif defined(__linux__)
// DecalOverdose: TODO????
#include "../Minecraft.Client/Windows64/Windows64_App.h"
#include "../Minecraft.Client/Windows64Media/strings.h"
#include "../Minecraft.Client/Windows64/Sentient/SentientTelemetryCommon.h"
// #include "../Minecraft.Client/Windows64/Sentient/MinecraftTelemetry.h"
#else
#include "..\Minecraft.Client\Orbis\Orbis_App.h"
#include "..\Minecraft.Client\OrbisMedia\strings.h"