major: Switch to forward slashes(+more) to fix compilation on Linux (#1403)

Notably also adds some metadata files for NixOS 

* add support for linux clang cross compiles

* add linux clang instructions

* un-capitalize Mob.horse.*

* update the description in flake.nix

---------

Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
Riley M.
2026-04-14 16:47:37 -05:00
committed by GitHub
parent f78dec6e00
commit c0da06e4ee
874 changed files with 4256 additions and 3544 deletions

View File

@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "../Minecraft.Client/Minecraft.h"
#include "net.minecraft.world.h"
#include "net.minecraft.world.level.tile.h"
#include "net.minecraft.world.entity.player.h"

View File

@@ -8,8 +8,8 @@
#include "net.minecraft.world.damagesource.h"
#include "net.minecraft.world.item.enchantment.h"
#include "net.minecraft.network.packet.h"
#include "..\Minecraft.Client\ServerPlayer.h"
#include "..\Minecraft.Client\PlayerConnection.h"
#include "../Minecraft.Client/ServerPlayer.h"
#include "../Minecraft.Client/PlayerConnection.h"
#include "com.mojang.nbt.h"
#include "Arrow.h"

View File

@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "Color.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "../Minecraft.Client/Minecraft.h"
#include "net.minecraft.world.level.levelgen.feature.h"
#include "net.minecraft.world.level.tile.h"
#include "net.minecraft.world.level.h"

View File

@@ -1,5 +1,5 @@
#pragma once
#include "..\Minecraft.World\JavaIntHash.h"
#include "../Minecraft.World/JavaIntHash.h"
class BiomeCache
{

View File

@@ -5,8 +5,8 @@
#include "net.minecraft.world.level.newbiome.layer.h"
#include "System.h"
#include "BiomeSource.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "..\Minecraft.Client\ProgressRenderer.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/ProgressRenderer.h"
// 4J - removal of separate temperature & downfall layers brought forward from 1.2.3
void BiomeSource::_init()

View File

@@ -9,7 +9,7 @@
#include "net.minecraft.world.entity.monster.h"
#include "net.minecraft.world.entity.projectile.h"
#include "SharedConstants.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "Blaze.h"
#include "SoundTypes.h"

View File

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

View File

@@ -3,8 +3,8 @@
#include "C4JThread.h"
#ifdef __PSVITA__
#include "..\Minecraft.Client\PSVita\PSVitaExtras\ShutdownManager.h"
#include "..\Minecraft.Client\PSVita\PSVitaExtras\PSVitaTLSStorage.h"
#include "../Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.h"
#include "../Minecraft.Client/PSVita/PSVitaExtras/PSVitaTLSStorage.h"
// AP - this comes from the low level user_malloc.c file used to overide the default memory functions. These must be called when a thread is started/stopped
extern "C" {
@@ -12,7 +12,7 @@ extern void user_registerthread();
extern void user_removethread();
}
#else
#include "..\Minecraft.Client\PS3\PS3Extras\ShutdownManager.h"
#include "../Minecraft.Client/PS3/PS3Extras/ShutdownManager.h"
#endif

View File

@@ -6,7 +6,7 @@
#include "net.minecraft.world.entity.item.h"
#include "net.minecraft.world.entity.player.h"
#include "net.minecraft.world.h"
#include "..\Minecraft.Client\ServerPlayer.h"
#include "../Minecraft.Client/ServerPlayer.h"
const wstring CauldronTile::TEXTURE_INSIDE = L"cauldron_inner";
const wstring CauldronTile::TEXTURE_BOTTOM = L"cauldron_bottom";

View File

@@ -5,7 +5,7 @@
#include "net.minecraft.world.effect.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "CaveSpider.h"

View File

@@ -8,7 +8,7 @@
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.item.h"
#include "Chicken.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "SoundTypes.h"
#include "MobCategory.h"

View File

@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "ClockItem.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "..\Minecraft.Client\MultiPlayerLocalPlayer.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/MultiPlayerLocalPlayer.h"
#include "net.minecraft.world.h"
#ifdef __PSVITA__

View File

@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "net.minecraft.world.Item.h"
#include "net.minecraft.world.item.h"
#include "net.minecraft.world.level.tile.h"
#include "Recipy.h"
#include "Recipes.h"

View File

@@ -1,8 +1,8 @@
#include "stdafx.h"
#include "net.minecraft.commands.h"
#include "..\Minecraft.Client\MinecraftServer.h"
#include "..\Minecraft.Client\PlayerList.h"
#include "..\Minecraft.Client\ServerPlayer.h"
#include "../Minecraft.Client/MinecraftServer.h"
#include "../Minecraft.Client/PlayerList.h"
#include "../Minecraft.Client/ServerPlayer.h"
#include "Command.h"
AdminLogCommand *Command::logger;

View File

@@ -2,7 +2,7 @@
#include "net.minecraft.network.packet.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.commands.h"
#include "..\Minecraft.Client\MinecraftServer.h"
#include "../Minecraft.Client/MinecraftServer.h"
#include "CommandBlockEntity.h"
CommandBlockEntity::CommandBlockEntity()

View File

@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "CompassItem.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "..\Minecraft.Client\MultiPlayerLocalPlayer.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/MultiPlayerLocalPlayer.h"
#include "net.minecraft.world.h"
#ifdef __PSVITA__

View File

@@ -6,7 +6,7 @@
#endif
#ifdef __PS3__
#include "..\SPU_Tasks\CompressedTileStorage_compress\CompressedTileStorage_compress.h"
#include "../SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.h"
#include "C4JSpursJob.h"
static const int sc_maxCompressTiles = 64;
static CompressedTileStorage_compress_dataIn g_compressTileDataIn[sc_maxCompressTiles] __attribute__((__aligned__(16)));

View File

@@ -4,7 +4,7 @@
#include "Connection.h"
#include "ThreadName.h"
#include "compression.h"
#include "..\Minecraft.Client\PS3\PS3Extras\ShutdownManager.h"
#include "../Minecraft.Client/PS3/PS3Extras/ShutdownManager.h"
// This should always be enabled, except for debugging use
#ifndef _DEBUG

View File

@@ -4,13 +4,13 @@
#include "File.h"
#include <xuiapp.h>
#include "compression.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "..\Minecraft.Client\MinecraftServer.h"
#include "..\Minecraft.Client\ServerLevel.h"
#include "..\Minecraft.World\net.minecraft.world.level.h"
#include "..\Minecraft.World\LevelData.h"
#include "..\Minecraft.Client\Common\GameRules\LevelGenerationOptions.h"
#include "..\Minecraft.World\net.minecraft.world.level.chunk.storage.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/MinecraftServer.h"
#include "../Minecraft.Client/ServerLevel.h"
#include "../Minecraft.World/net.minecraft.world.level.h"
#include "../Minecraft.World/LevelData.h"
#include "../Minecraft.Client/Common/GameRules/LevelGenerationOptions.h"
#include "../Minecraft.World/net.minecraft.world.level.chunk.storage.h"
#ifdef MINECRAFT_SERVER_BUILD
#include <thread>

View File

@@ -3,9 +3,9 @@
#include "net.minecraft.world.item.h"
#include "Slot.h"
#include "GenericStats.h"
#include "..\Minecraft.Client\StatsCounter.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "..\Minecraft.Client\LocalPlayer.h"
#include "../Minecraft.Client/StatsCounter.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/LocalPlayer.h"
#include "ContainerMenu.h"
ContainerMenu::ContainerMenu(shared_ptr<Container> inventory, shared_ptr<Container> container) : AbstractContainerMenu()

View File

@@ -1,7 +1,7 @@
#pragma once
#include "Goal.h"
#include "..\Minecraft.World\SharedConstants.h"
#include "../Minecraft.World/SharedConstants.h"
class Mob;

View File

@@ -11,7 +11,7 @@
#include "net.minecraft.world.entity.monster.h"
#include "net.minecraft.stats.h"
#include "Cow.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "MobCategory.h"

View File

@@ -15,7 +15,7 @@
#include "Skeleton.h"
#include "Creeper.h"
#include "Arrow.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "SoundTypes.h"

View File

@@ -3,7 +3,7 @@
#include "net.minecraft.world.level.levelgen.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.level.storage.h"
#include "dimension.h"
#include "Dimension.h"
#include "BiomeSource.h"
#include "FixedBiomeSource.h"
#include "OldChunkStorage.h"
@@ -11,8 +11,8 @@
#include "NormalDimension.h"
#include "TheEndDimension.h"
#include "net.minecraft.world.level.tile.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "..\Minecraft.Client\Common\Colours\ColourTable.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/Common/Colours/ColourTable.h"
const float Dimension::MOON_BRIGHTNESS_PER_PHASE[8] = {1.0f, 0.75f, 0.5f, 0.25f, 0, 0.25f, 0.5f, 0.75f};

View File

@@ -12,16 +12,16 @@
#include "Item.h"
#include "Level.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "../Minecraft.Client/Minecraft.h"
#include "LevelData.h"
#include "LevelSettings.h"
#include "..\Minecraft.Client\LocalPlayer.h"
#include "..\Minecraft.Client\MultiPlayerLocalPlayer.h"
#include "../Minecraft.Client/LocalPlayer.h"
#include "../Minecraft.Client/MultiPlayerLocalPlayer.h"
#include "EntityIO.h"
#include "..\Minecraft.Client\Durango\ServiceConfig\Events-XBLA.8-149E11AEEvents.h"
#include "../Minecraft.Client/Durango/ServiceConfig/Events-XBLA.8-149E11AEEvents.h"
#include "DurangoStats.h"

View File

@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "net.minecraft.commands.common.h"
#include "..\Minecraft.Client\MinecraftServer.h"
#include "../Minecraft.Client/MinecraftServer.h"
EGameCommand EffectCommand::getId()
{

View File

@@ -2,7 +2,7 @@
#include "net.minecraft.network.packet.h"
#include "net.minecraft.world.item.h"
#include "net.minecraft.world.item.enchantment.h"
#include "..\Minecraft.Client\ServerPlayer.h"
#include "../Minecraft.Client/ServerPlayer.h"
#include "EnchantItemCommand.h"
EGameCommand EnchantItemCommand::getId()

View File

@@ -9,7 +9,7 @@
#include "net.minecraft.world.phys.h"
#include "net.minecraft.world.damagesource.h"
#include "BasicTypeContainers.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "net.minecraft.world.entity.boss.enderdragon.h"
#include "net.minecraft.world.level.pathfinder.h"
#include "SharedConstants.h"

View File

@@ -9,7 +9,7 @@
#include "net.minecraft.world.damagesource.h"
#include "net.minecraft.world.phys.h"
#include "com.mojang.nbt.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "EnderMan.h"
AttributeModifier *EnderMan::SPEED_MODIFIER_ATTACKING = (new AttributeModifier(eModifierId_MOB_ENDERMAN_ATTACKSPEED, 6.2f, AttributeModifier::OPERATION_ADDITION))->setSerialize(false);

View File

@@ -18,12 +18,12 @@
#include "EntityPos.h"
#include "Entity.h"
#include "SoundTypes.h"
#include "..\minecraft.Client\HumanoidModel.h"
#include "..\Minecraft.Client\MinecraftServer.h"
#include "..\Minecraft.Client\MultiPlayerLevel.h"
#include "..\Minecraft.Client\MultiplayerLocalPlayer.h"
#include "..\Minecraft.Client\ServerLevel.h"
#include "..\Minecraft.Client\PlayerList.h"
#include "../Minecraft.Client/HumanoidModel.h"
#include "../Minecraft.Client/MinecraftServer.h"
#include "../Minecraft.Client/MultiPlayerLevel.h"
#include "../Minecraft.Client/MultiPlayerLocalPlayer.h"
#include "../Minecraft.Client/ServerLevel.h"
#include "../Minecraft.Client/PlayerList.h"
const wstring Entity::RIDING_TAG = L"Riding";

View File

@@ -13,8 +13,8 @@
#include "net.minecraft.world.level.tile.h"
#include "net.minecraft.world.inventory.h"
#include "net.minecraft.world.phys.h"
#include "..\Minecraft.Client\Textures.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "../Minecraft.Client/Textures.h"
#include "../Minecraft.Client/Minecraft.h"
#include "BasicTypeContainers.h"
#include "EntityHorse.h"
@@ -558,17 +558,17 @@ int EntityHorse::getDeathSound()
int type = getType();
if (type == TYPE_UNDEAD)
{
return eSoundType_MOB_HORSE_ZOMBIE_DEATH; //"mob.horse.zombie.death";
return eSoundType_MOB_HORSE_ZOMBIE_DEATH; //"Mob.horse.zombie.death";
}
if (type == TYPE_SKELETON)
{
return eSoundType_MOB_HORSE_SKELETON_DEATH; //"mob.horse.skeleton.death";
return eSoundType_MOB_HORSE_SKELETON_DEATH; //"Mob.horse.skeleton.death";
}
if (type == TYPE_DONKEY || type == TYPE_MULE)
{
return eSoundType_MOB_HORSE_DONKEY_DEATH; //"mob.horse.donkey.death";
return eSoundType_MOB_HORSE_DONKEY_DEATH; //"Mob.horse.donkey.death";
}
return eSoundType_MOB_HORSE_DEATH; //"mob.horse.death";
return eSoundType_MOB_HORSE_DEATH; //"Mob.horse.death";
}
int EntityHorse::getDeathLoot()
@@ -604,17 +604,17 @@ int EntityHorse::getHurtSound()
int type = getType();
if (type == TYPE_UNDEAD)
{
return eSoundType_MOB_HORSE_ZOMBIE_HIT; //"mob.horse.zombie.hit";
return eSoundType_MOB_HORSE_ZOMBIE_HIT; //"Mob.horse.zombie.hit";
}
if (type == TYPE_SKELETON)
{
return eSoundType_MOB_HORSE_SKELETON_HIT; //"mob.horse.skeleton.hit";
return eSoundType_MOB_HORSE_SKELETON_HIT; //"Mob.horse.skeleton.hit";
}
if (type == TYPE_DONKEY || type == TYPE_MULE)
{
return eSoundType_MOB_HORSE_DONKEY_HIT; //"mob.horse.donkey.hit";
return eSoundType_MOB_HORSE_DONKEY_HIT; //"Mob.horse.donkey.hit";
}
return eSoundType_MOB_HORSE_HIT; //"mob.horse.hit";
return eSoundType_MOB_HORSE_HIT; //"Mob.horse.hit";
}
bool EntityHorse::isSaddled()
@@ -633,17 +633,17 @@ int EntityHorse::getAmbientSound()
int type = getType();
if (type == TYPE_UNDEAD)
{
return eSoundType_MOB_HORSE_ZOMBIE_IDLE; //"mob.horse.zombie.idle";
return eSoundType_MOB_HORSE_ZOMBIE_IDLE; //"Mob.horse.zombie.idle";
}
if (type == TYPE_SKELETON)
{
return eSoundType_MOB_HORSE_SKELETON_IDLE; //"mob.horse.skeleton.idle";
return eSoundType_MOB_HORSE_SKELETON_IDLE; //"Mob.horse.skeleton.idle";
}
if (type == TYPE_DONKEY || type == TYPE_MULE)
{
return eSoundType_MOB_HORSE_DONKEY_IDLE; //"mob.horse.donkey.idle";
return eSoundType_MOB_HORSE_DONKEY_IDLE; //"Mob.horse.donkey.idle";
}
return eSoundType_MOB_HORSE_IDLE; //"mob.horse.idle";
return eSoundType_MOB_HORSE_IDLE; //"Mob.horse.idle";
}
/**
@@ -660,9 +660,9 @@ int EntityHorse::getMadSound()
}
if (type == TYPE_DONKEY || type == TYPE_MULE)
{
return eSoundType_MOB_HORSE_DONKEY_ANGRY; //"mob.horse.donkey.angry";
return eSoundType_MOB_HORSE_DONKEY_ANGRY; //"Mob.horse.donkey.angry";
}
return eSoundType_MOB_HORSE_ANGRY; //"mob.horse.angry";
return eSoundType_MOB_HORSE_ANGRY; //"Mob.horse.angry";
}
void EntityHorse::playStepSound(int xt, int yt, int zt, int t)

View File

@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "net.minecraft.commands.h"
#include "..\Minecraft.Client\MinecraftServer.h"
#include "..\Minecraft.Client\PlayerList.h"
#include "../Minecraft.Client/MinecraftServer.h"
#include "../Minecraft.Client/PlayerList.h"
#include "net.minecraft.world.level.h"
#include "ExperienceCommand.h"

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)
{

View File

@@ -5,12 +5,12 @@
#include "net.minecraft.world.level.tile.h"
#include "FireTile.h"
#include "SoundTypes.h"
#include "..\Minecraft.Client\MinecraftServer.h"
#include "..\Minecraft.Client\PlayerList.h"
#include "../Minecraft.Client/MinecraftServer.h"
#include "../Minecraft.Client/PlayerList.h"
// AP - added for Vita to set Alpha Cut out
#include "IntBuffer.h"
#include "..\Minecraft.Client\Tesselator.h"
#include "../Minecraft.Client/Tesselator.h"
const wstring FireTile::TEXTURE_FIRST = L"fire_0";

View File

@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "../Minecraft.Client/Minecraft.h"
#include "FoliageColor.h"
// 4J Stu - Don't use this any more

View File

@@ -5,7 +5,7 @@
//#include "DamageSource.h"
//#include "..\Minecraft.Client\Common\Console_Awards_enum.h"
//#include "../Minecraft.Client/Common/Console_Awards_enum.h"
/**
4J-JEV:

View File

@@ -11,7 +11,7 @@
#include "net.minecraft.world.damagesource.h"
#include "net.minecraft.stats.h"
#include "Ghast.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "LevelEvent.h"
#include "SoundTypes.h"

View File

@@ -3,7 +3,7 @@
#include "net.minecraft.world.entity.ai.attributes.h"
#include "net.minecraft.world.entity.monster.h"
#include "Giant.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"

View File

@@ -3,7 +3,7 @@
#include "net.minecraft.world.entity.item.h"
#include "net.minecraft.world.item.h"
#include "net.minecraft.network.packet.h"
#include "..\Minecraft.Client\ServerPlayer.h"
#include "../Minecraft.Client/ServerPlayer.h"
#include "GiveItemCommand.h"
EGameCommand GiveItemCommand::getId()

View File

@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "Glowstonetile.h"
#include "GlowstoneTile.h"
#include "net.minecraft.world.item.h"
Glowstonetile::Glowstonetile(int id, Material *material) : Tile(id, material)

View File

@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "../Minecraft.Client/Minecraft.h"
#include "GrassTile.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.level.biome.h"
@@ -8,7 +8,7 @@
// AP - included for PSVita Alpha cut out optimisation
#include "IntBuffer.h"
#include "..\Minecraft.Client\Tesselator.h"
#include "../Minecraft.Client/Tesselator.h"
GrassTile::GrassTile(int id) : Tile(id, Material::grass)
{

View File

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

View File

@@ -5,8 +5,8 @@
#include "net.minecraft.world.level.levelgen.h"
#include "net.minecraft.world.level.biome.h"
#include "net.minecraft.world.level.tile.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "..\Minecraft.Client\Common\Colours\ColourTable.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/Common/Colours/ColourTable.h"
void HellDimension::init()
{

View File

@@ -4,7 +4,7 @@
#include "net.minecraft.world.entity.ai.attributes.h"
#include "net.minecraft.world.entity.monster.h"
#include "net.minecraft.world.item.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "LavaSlime.h"
#include "SoundTypes.h"

View File

@@ -5,7 +5,7 @@
#ifdef __PSVITA__
// AP - this is used to perform fast 64bit divides of known values
#include "..\Minecraft.Client\PSVita\PSVitaExtras\libdivide.h"
#include "../Minecraft.Client/PSVita/PSVitaExtras/libdivide.h"
libdivide::divider<long long> fast_d2(2);
libdivide::divider<long long> fast_d3(3);

View File

@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "../Minecraft.Client/Minecraft.h"
#include "LeafTile.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.level.biome.h"

View File

@@ -29,16 +29,16 @@
#include "ConsoleSaveFile.h"
#include <xuiapp.h>
#include "..\Minecraft.Client\Minecraft.h"
#include "..\Minecraft.Client\LevelRenderer.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/LevelRenderer.h"
#include "SoundTypes.h"
#include "SparseLightStorage.h"
#include "..\Minecraft.Client\Textures.h"
#include "..\Minecraft.Client\TexturePackRepository.h"
#include "..\Minecraft.Client\DLCTexturePack.h"
#include "..\Minecraft.Client\Common\DLC\DLCPack.h"
#include "..\Minecraft.Client\PS3\PS3Extras\ShutdownManager.h"
#include "..\Minecraft.Client\MinecraftServer.h"
#include "../Minecraft.Client/Textures.h"
#include "../Minecraft.Client/TexturePackRepository.h"
#include "../Minecraft.Client/DLCTexturePack.h"
#include "../Minecraft.Client/Common/DLC/DLCPack.h"
#include "../Minecraft.Client/PS3/PS3Extras/ShutdownManager.h"
#include "../Minecraft.Client/MinecraftServer.h"
DWORD Level::tlsIdx = TlsAlloc();

View File

@@ -7,11 +7,11 @@ using namespace std;
#include "SavedData.h"
#include "Definitions.h"
#include "ParticleTypes.h"
#include "biome.h"
#include "Biome.h"
#include "C4JThread.h"
#ifdef __PSVITA__
#include "..\Minecraft.Client\PSVita\PSVitaExtras\CustomSet.h"
#include "../Minecraft.Client/PSVita/PSVitaExtras/CustomSet.h"
#endif
// 4J Stu - This value should be big enough that we don't get any crashes causes by memory overwrites,

View File

@@ -12,10 +12,10 @@
#include "BlockReplacements.h"
#include "LevelChunk.h"
#include "BasicTypeContainers.h"
#include "..\Minecraft.Client\MinecraftServer.h"
#include "..\Minecraft.Client\ServerLevel.h"
#include "..\Minecraft.Client\ServerChunkCache.h"
#include "..\Minecraft.Client\GameRenderer.h"
#include "../Minecraft.Client/MinecraftServer.h"
#include "../Minecraft.Client/ServerLevel.h"
#include "../Minecraft.Client/ServerChunkCache.h"
#include "../Minecraft.Client/GameRenderer.h"
#include "ItemEntity.h"
#include "Minecart.h"

View File

@@ -4,8 +4,8 @@
#include "net.minecraft.world.phys.h"
#include "LightningBolt.h"
#include "SoundTypes.h"
#include "..\Minecraft.Client\MinecraftServer.h"
#include "..\Minecraft.Client\PlayerList.h"
#include "../Minecraft.Client/MinecraftServer.h"
#include "../Minecraft.Client/PlayerList.h"
#include "net.minecraft.world.level.dimension.h"

View File

@@ -24,9 +24,9 @@
#include "net.minecraft.world.scores.h"
#include "com.mojang.nbt.h"
#include "LivingEntity.h"
#include "..\Minecraft.Client\Textures.h"
#include "..\Minecraft.Client\ServerLevel.h"
#include "..\Minecraft.Client\EntityTracker.h"
#include "../Minecraft.Client/Textures.h"
#include "../Minecraft.Client/ServerLevel.h"
#include "../Minecraft.Client/EntityTracker.h"
#include "SoundTypes.h"
#include "BasicTypeContainers.h"
#include "ParticleTypes.h"

View File

@@ -3,12 +3,12 @@
#include "net.minecraft.world.entity.player.h"
#include "net.minecraft.world.item.h"
#include "MapItemSavedData.h"
#include "..\Minecraft.Client\PlayerList.h"
#include "..\Minecraft.Client\MinecraftServer.h"
#include "..\Minecraft.Client\ServerPlayer.h"
#include "../Minecraft.Client/PlayerList.h"
#include "../Minecraft.Client/MinecraftServer.h"
#include "../Minecraft.Client/ServerPlayer.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.level.storage.h"
#include "..\Minecraft.Client\PlayerConnection.h"
#include "../Minecraft.Client/PlayerConnection.h"
const int MapItemSavedData::END_PORTAL_DECORATION_KEY = -1;

View File

@@ -9,8 +9,8 @@
#include "net.minecraft.world.entity.animal.h"
#include "net.minecraft.world.item.h"
#include "net.minecraft.world.damagesource.h"
#include "..\Minecraft.Client\MinecraftServer.h"
#include "..\Minecraft.Client\ServerLevel.h"
#include "../Minecraft.Client/MinecraftServer.h"
#include "../Minecraft.Client/ServerLevel.h"
#include "com.mojang.nbt.h"
#include "Minecart.h"
#include "SharedConstants.h"

View File

@@ -15,7 +15,7 @@
#include "net.minecraft.world.effect.h"
#include "Minecraft.World.h"
#include "..\Minecraft.Client\ServerLevel.h"
#include "../Minecraft.Client/ServerLevel.h"
#ifdef _DURANGO
#include "DurangoStats.h"

View File

@@ -19,11 +19,11 @@
#include "net.minecraft.world.item.alchemy.h"
#include "net.minecraft.world.item.enchantment.h"
#include "net.minecraft.world.h"
#include "..\Minecraft.Client\ServerLevel.h"
#include "..\Minecraft.Client\EntityTracker.h"
#include "../Minecraft.Client/ServerLevel.h"
#include "../Minecraft.Client/EntityTracker.h"
#include "com.mojang.nbt.h"
#include "Mob.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "SoundTypes.h"
#include "BasicTypeContainers.h"
#include "ParticleTypes.h"

View File

@@ -14,7 +14,7 @@
#include "Level.h"
#include "ChunkPos.h"
#include "TilePos.h"
#include "..\Minecraft.Client\ServerLevel.h"
#include "../Minecraft.Client/ServerLevel.h"
#include "MobSpawner.h"
#include "Dimension.h"

View File

@@ -3,7 +3,7 @@
#include "Mob.h"
#ifdef __PSVITA__
#include "..\Minecraft.Client\PSVita\PSVitaExtras\CustomMap.h"
#include "../Minecraft.Client/PSVita/PSVitaExtras/CustomMap.h"
#endif
class Player;

View File

@@ -10,7 +10,7 @@
#include "net.minecraft.world.item.enchantment.h"
#include "Monster.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "../Minecraft.Client/Minecraft.h"
Monster::Monster(Level *level) : PathfinderMob( level )

View File

@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "../Minecraft.Client/Minecraft.h"
#include "net.minecraft.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.level.tile.h"

View File

@@ -4,7 +4,7 @@
#include "net.minecraft.world.item.h"
#include "net.minecraft.world.entity.player.h"
#include "net.minecraft.world.entity.item.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "MushroomCow.h"
#include "MobCategory.h"
#include "AABB.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

View File

@@ -14,9 +14,9 @@
#include "net.minecraft.world.phys.h"
#include "SynchedEntityData.h"
#include "StringHelpers.h"
#include "..\Minecraft.Client\Textures.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "..\Minecraft.Client\MultiPlayerLocalPlayer.h"
#include "../Minecraft.Client/Textures.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/MultiPlayerLocalPlayer.h"
#include "GenericStats.h"
#include "Ocelot.h"

View File

@@ -12,7 +12,7 @@
#include "net.minecraft.world.phys.h"
#include "SynchedEntityData.h"
#include "StringHelpers.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "GenericStats.h"
#include "Ozelot.h"

View File

@@ -8,8 +8,8 @@
#include "com.mojang.nbt.h"
#ifndef _CONTENT_PACKAGE
#include "..\Minecraft.Client\Minecraft.h"
#include "..\Minecraft.Client\Gui.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/Gui.h"
#endif
void Packet::staticCtor()

View File

@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "net.minecraft.world.entity.h"
#include "net.minecraft.world.level.pathfinder.h"
#include "path.h"
#include "Path.h"
Path::~Path()
{

View File

@@ -14,7 +14,7 @@
#include "net.minecraft.world.entity.player.h"
#include "net.minecraft.world.entity.global.h"
#include "Pig.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "MobCategory.h"

View File

@@ -11,7 +11,7 @@
#include "net.minecraft.world.entity.item.h"
#include "net.minecraft.world.damagesource.h"
#include "PigZombie.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "SoundTypes.h"
AttributeModifier *PigZombie::SPEED_MODIFIER_ATTACKING = (new AttributeModifier(eModifierId_MOB_PIG_ATTACKSPEED, 0.45, AttributeModifier::OPERATION_ADDITION))->setSerialize(false);

View File

@@ -5,8 +5,8 @@
#include "PistonExtensionTile.h"
#include "Facing.h"
#include "net.minecraft.world.level.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "..\Minecraft.Client\MultiPlayerLevel.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/MultiPlayerLevel.h"
#include "net.minecraft.world.h"
#include "LevelChunk.h"
#include "Dimension.h"

View File

@@ -37,10 +37,10 @@
#include "Player.h"
#include "ParticleTypes.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "..\Minecraft.Client\LocalPlayer.h"
#include "..\Minecraft.Client\HumanoidModel.h"
#include "../Minecraft.Client/LocalPlayer.h"
#include "../Minecraft.Client/HumanoidModel.h"
#include "SoundTypes.h"

View File

@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "net.minecraft.world.entity.player.h"
#include "..\Minecraft.Client\ServerPlayer.h"
#include "..\Minecraft.Client\PlayerConnection.h"
#include "../Minecraft.Client/ServerPlayer.h"
#include "../Minecraft.Client/PlayerConnection.h"
#include <qnet.h>
#include "PacketListener.h"
#include "InputOutputStream.h"

View File

@@ -3,7 +3,7 @@
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.level.tile.h"
#include "net.minecraft.world.level.dimension.h"
#include "..\Minecraft.Client\ServerLevel.h"
#include "../Minecraft.Client/ServerLevel.h"
#include "PortalForcer.h"
PortalForcer::PortalPosition::PortalPosition(int x, int y, int z, int64_t time) : Pos(x, y, z)

View File

@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "../Minecraft.Client/Minecraft.h"
#include "net.minecraft.world.effect.h"
#include "JavaMath.h"
#include "SharedConstants.h"

View File

@@ -1,7 +1,7 @@
#include "stdafx.h"
#include <iostream>
#include "PacketListener.h"
#include "PreloginPacket.h"
#include "PreLoginPacket.h"
#include "InputOutputStream.h"

View File

@@ -11,7 +11,7 @@
#include "RandomLevelSource.h"
#ifdef __PS3__
#include "..\Minecraft.Client\PS3\SPU_Tasks\PerlinNoise\PerlinNoiseJob.h"
#include "../Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.h"
#include "C4JSpursJob.h"
static PerlinNoise_DataIn g_lperlinNoise1_SPU __attribute__((__aligned__(16)));
static PerlinNoise_DataIn g_lperlinNoise2_SPU __attribute__((__aligned__(16)));

View File

@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "../Minecraft.Client/Minecraft.h"
#include "RedStoneDustTile.h"
#include "net.minecraft.world.item.h"
#include "net.minecraft.world.level.h"
@@ -12,7 +12,7 @@
// AP - added for Vita to set Alpha Cut out
#include "IntBuffer.h"
#include "..\Minecraft.Client\Tesselator.h"
#include "../Minecraft.Client/Tesselator.h"
const wstring RedStoneDustTile::TEXTURE_CROSS = L"_cross";
const wstring RedStoneDustTile::TEXTURE_LINE = L"_line";

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)
{

View File

@@ -16,7 +16,7 @@
#include "net.minecraft.world.entity.player.h"
#include "net.minecraft.world.entity.monster.h"
#include "Sheep.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "MobCategory.h"
#include "GenericStats.h"

View File

@@ -9,10 +9,10 @@
#include "net.minecraft.network.packet.h"
#include "SignTileEntity.h"
#include <xuiapp.h>
#include "..\Minecraft.Client\ClientConnection.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "..\Minecraft.Client\ServerLevel.h"
#include "..\Minecraft.World\Level.h"
#include "../Minecraft.Client/ClientConnection.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/ServerLevel.h"
#include "../Minecraft.World/Level.h"

View File

@@ -6,7 +6,7 @@
#include "net.minecraft.world.entity.ai.attributes.h"
#include "net.minecraft.world.entity.monster.h"
#include "net.minecraft.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "Silverfish.h"
#include "SoundTypes.h"

View File

@@ -19,7 +19,7 @@
#include "net.minecraft.world.damagesource.h"
#include "SharedConstants.h"
#include "Skeleton.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "SoundTypes.h"
Skeleton::Skeleton(Level *level) : Monster( level )

View File

@@ -13,7 +13,7 @@
#include "net.minecraft.world.damagesource.h"
#include "com.mojang.nbt.h"
#include "Slime.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "SoundTypes.h"

View File

@@ -12,7 +12,7 @@
#include "net.minecraft.world.level.biome.h"
#include "net.minecraft.world.item.h"
#include "SharedConstants.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "SnowMan.h"
#include "SoundTypes.h"

View File

@@ -3,9 +3,9 @@
#include "SocketAddress.h"
#include "Socket.h"
#include "ThreadName.h"
#include "..\Minecraft.Client\ServerConnection.h"
#include "../Minecraft.Client/ServerConnection.h"
#include <algorithm>
#include "..\Minecraft.Client\PS3\PS3Extras\ShutdownManager.h"
#include "../Minecraft.Client/PS3/PS3Extras/ShutdownManager.h"
// This current socket implementation is for the creation of a single local link. 2 sockets can be created, one for either end of this local
// link, the end (0 or 1) is passed as a parameter to the ctor.

View File

@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "../Minecraft.Client/Minecraft.h"
#include "net.minecraft.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.level.tile.h"

View File

@@ -11,7 +11,7 @@
#include "com.mojang.nbt.h"
#include "BasicTypeContainers.h"
#include "Spider.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "SoundTypes.h"

View File

@@ -9,7 +9,7 @@
#include "net.minecraft.world.entity.monster.h"
#include "SharedConstants.h"
#include "Squid.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
void Squid::_init()
{

View File

@@ -8,7 +8,7 @@
#include "ItemStat.h"
#include "GeneralStat.h"
#include "Stats.h"
#include "..\Minecraft.Client\StatsCounter.h"
#include "../Minecraft.Client/StatsCounter.h"
const int Stats::BLOCKS_MINED_OFFSET = 0x1000000;
const int Stats::ITEMS_COLLECTED_OFFSET = 0x1010000;

View File

@@ -3,8 +3,8 @@
#include "net.minecraft.world.entity.item.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "..\Minecraft.Client\Common\Colours\ColourTable.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/Common/Colours/ColourTable.h"
#include "StemTile.h"
const wstring StemTile::TEXTURE_ANGLED = L"stem_bent";

View File

@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "../Minecraft.Client/Minecraft.h"
#include "net.minecraft.world.item.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.level.biome.h"

View File

@@ -2,8 +2,8 @@
using namespace std;
#include "Packet.h"
#include "..\Minecraft.Client\Model.h"
#include "..\Minecraft.Client\SkinBox.h"
#include "../Minecraft.Client/Model.h"
#include "../Minecraft.Client/SkinBox.h"
class DLCSkinFile;

View File

@@ -4,8 +4,8 @@
#include "net.minecraft.world.level.levelgen.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.level.tile.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "..\Minecraft.Client\Common\Colours\ColourTable.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/Common/Colours/ColourTable.h"
void TheEndDimension::init()
{

View File

@@ -3,8 +3,8 @@
#include "net.minecraft.world.damagesource.h"
#include "net.minecraft.world.entity.h"
#include "net.minecraft.world.level.h"
#include "..\Minecraft.Client\ServerPlayer.h"
#include "..\Minecraft.Client\PlayerConnection.h"
#include "../Minecraft.Client/ServerPlayer.h"
#include "../Minecraft.Client/PlayerConnection.h"
#include "ThrownEnderpearl.h"

View File

@@ -2,7 +2,7 @@
using namespace std;
#include "HashExtension.h"
#include "..\Minecraft.World\JavaIntHash.h"
#include "../Minecraft.World/JavaIntHash.h"
class Level;
class Packet;

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>

View File

@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "net.minecraft.commands.h"
#include "..\Minecraft.Client\MinecraftServer.h"
#include "..\Minecraft.Client\ServerLevel.h"
#include "../Minecraft.Client/MinecraftServer.h"
#include "../Minecraft.Client/ServerLevel.h"
#include "net.minecraft.network.packet.h"
#include "TimeCommand.h"

View File

@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "..\Minecraft.Client\MinecraftServer.h"
#include "..\Minecraft.Client\ServerLevel.h"
#include "../Minecraft.Client/MinecraftServer.h"
#include "../Minecraft.Client/ServerLevel.h"
#include "net.minecraft.commands.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.level.storage.h"

View File

@@ -14,7 +14,7 @@
#include "net.minecraft.world.item.trading.h"
#include "net.minecraft.world.level.tile.h"
#include "net.minecraft.world.level.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "Villager.h"
#include "AbstractContainerMenu.h"

View File

@@ -14,7 +14,7 @@
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.level.tile.h"
#include "net.minecraft.world.phys.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "SynchedEntityData.h"
#include "VillagerGolem.h"
#include "ParticleTypes.h"

View File

@@ -2,7 +2,7 @@
#include "WaterLilyTile.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.entity.item.h"
#include "..\Minecraft.Client\Minecraft.h"
#include "../Minecraft.Client/Minecraft.h"
#include "AABB.h"
WaterlilyTile::WaterlilyTile(int id) : Bush(id)

View File

@@ -18,7 +18,7 @@
#include "net.minecraft.stats.h"
#include "Sheep.h"
#include "Wolf.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "SoundTypes.h"

Some files were not shown because too many files have changed in this diff Show More