mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-04-27 01:43:37 +00:00
fix: remove hardcoded locales and include through stdafx
This commit is contained in:
parent
36daeebed0
commit
0f560867c0
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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>;
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@
|
|||
#include "Minecart.h"
|
||||
#include "SharedConstants.h"
|
||||
|
||||
#include "../Minecraft.Client/Windows64Media/strings.h"
|
||||
|
||||
const int Minecart::EXITS[][2][3] = { //
|
||||
//
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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];
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Reference in a new issue