backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-07-25 15:57:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix a myriad of other files

Browse source
This commit is contained in:
Leah Anderson 2026-03-02 14:09:40 -07:00
parent b2e255fc05
commit d6d7fa7ada
66 changed files with 116 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Minecraft.World/Animal.cpp
View file

@ -12,6 +12,7 @@
#include "Random.h" #include "Random.h"
#include "Animal.h" #include "Animal.h"
#include "../Minecraft.Client/Windows64Media/strings.h"
Animal::Animal(Level *level) : AgableMob( level ) Animal::Animal(Level *level) : AgableMob( level )

2
Minecraft.World/ArmorItem.cpp
View file

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

2
Minecraft.World/Biome.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "Color.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.levelgen.feature.h"
#include "net.minecraft.world.level.tile.h" #include "net.minecraft.world.level.tile.h"
#include "net.minecraft.world.level.h" #include "net.minecraft.world.level.h"

4
Minecraft.World/BiomeSource.cpp
View file

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

2
Minecraft.World/Blaze.cpp
View file

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

6
Minecraft.World/BucketItem.cpp
View file

@ -12,9 +12,9 @@
#include "Material.h" #include "Material.h"
#include "ItemInstance.h" #include "ItemInstance.h"
#include "BucketItem.h" #include "BucketItem.h"
#include "..\Minecraft.Client\LocalPlayer.h" #include "../Minecraft.Client/LocalPlayer.h"
#include "..\Minecraft.Client\ServerPlayer.h" #include "../Minecraft.Client/ServerPlayer.h"
#include "..\Minecraft.Client\PlayerConnection.h" #include "../Minecraft.Client/PlayerConnection.h"
#include "..\Minecraft.World\ChatPacket.h" #include "..\Minecraft.World\ChatPacket.h"
#include "SoundTypes.h" #include "SoundTypes.h"

6
Minecraft.World/C4JThread.cpp
View file

@ -3,8 +3,8 @@
#include "C4JThread.h" #include "C4JThread.h"
#ifdef __PSVITA__ #ifdef __PSVITA__
#include "..\Minecraft.Client\PSVita\PSVitaExtras\ShutdownManager.h" #include "../Minecraft.Client/PSVita\PSVitaExtras\ShutdownManager.h"
#include "..\Minecraft.Client\PSVita\PSVitaExtras\PSVitaTLSStorage.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 // 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" { extern "C" {
@ -12,7 +12,7 @@ extern void user_registerthread();
extern void user_removethread(); extern void user_removethread();
} }
#else #else
#include "..\Minecraft.Client\PS3\PS3Extras\ShutdownManager.h" #include "../Minecraft.Client/PS3\PS3Extras\ShutdownManager.h"
#endif #endif

2
Minecraft.World/CauldronTile.cpp
View file

@ -6,7 +6,7 @@
#include "net.minecraft.world.entity.item.h" #include "net.minecraft.world.entity.item.h"
#include "net.minecraft.world.entity.player.h" #include "net.minecraft.world.entity.player.h"
#include "net.minecraft.world.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_INSIDE = L"cauldron_inner";
const wstring CauldronTile::TEXTURE_BOTTOM = L"cauldron_bottom"; const wstring CauldronTile::TEXTURE_BOTTOM = L"cauldron_bottom";

2
Minecraft.World/CaveSpider.cpp
View file

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

2
Minecraft.World/Chicken.cpp
View file

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

4
Minecraft.World/ClockItem.cpp
View file

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

4
Minecraft.World/CompassItem.cpp
View file

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

8
Minecraft.World/ConsoleSaveFileSplit.cpp
View file

@ -5,12 +5,12 @@
#include "File.h" #include "File.h"
#include <xuiapp.h> #include <xuiapp.h>
#include "compression.h" #include "compression.h"
#include "..\Minecraft.Client\Minecraft.h" #include "../Minecraft.Client/Minecraft.h"
#include "..\Minecraft.Client\MinecraftServer.h" #include "../Minecraft.Client/MinecraftServer.h"
#include "..\Minecraft.Client\ServerLevel.h" #include "../Minecraft.Client/ServerLevel.h"
#include "..\Minecraft.World\net.minecraft.world.level.h" #include "..\Minecraft.World\net.minecraft.world.level.h"
#include "..\Minecraft.World\LevelData.h" #include "..\Minecraft.World\LevelData.h"
#include "..\Minecraft.Client\Common\GameRules\LevelGenerationOptions.h" #include "../Minecraft.Client/Common\GameRules\LevelGenerationOptions.h"
#include "..\Minecraft.World\net.minecraft.world.level.chunk.storage.h" #include "..\Minecraft.World\net.minecraft.world.level.chunk.storage.h"
#define RESERVE_ALLOCATION MEM_RESERVE #define RESERVE_ALLOCATION MEM_RESERVE

6
Minecraft.World/ContainerMenu.cpp
View file

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

2
Minecraft.World/ControlledByPlayerGoal.h
View file

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

2
Minecraft.World/Cow.cpp
View file

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

2
Minecraft.World/Creeper.cpp
View file

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

4
Minecraft.World/Dimension.cpp
View file

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

8
Minecraft.World/DurangoStats.cpp
View file

@ -12,16 +12,16 @@
#include "Item.h" #include "Item.h"
#include "Level.h" #include "Level.h"
#include "..\Minecraft.Client\Minecraft.h" #include "../Minecraft.Client/Minecraft.h"
#include "LevelData.h" #include "LevelData.h"
#include "LevelSettings.h" #include "LevelSettings.h"
#include "..\Minecraft.Client\LocalPlayer.h" #include "../Minecraft.Client/LocalPlayer.h"
#include "..\Minecraft.Client\MultiPlayerLocalPlayer.h" #include "../Minecraft.Client/MultiPlayerLocalPlayer.h"
#include "EntityIO.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" #include "DurangoStats.h"

4
Minecraft.World/EnderDragon.cpp
View file

@ -7,12 +7,14 @@
#include "net.minecraft.world.phys.h" #include "net.minecraft.world.phys.h"
#include "net.minecraft.world.damagesource.h" #include "net.minecraft.world.damagesource.h"
#include "BasicTypeContainers.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.entity.boss.enderdragon.h"
#include "net.minecraft.world.level.pathfinder.h" #include "net.minecraft.world.level.pathfinder.h"
#include "SharedConstants.h" #include "SharedConstants.h"
#include "EnderDragon.h" #include "EnderDragon.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
#define PRINT_DRAGON_STATE_CHANGE_MESSAGES 1 #define PRINT_DRAGON_STATE_CHANGE_MESSAGES 1

2
Minecraft.World/EnderMan.cpp
View file

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

6
Minecraft.World/Entity.cpp
View file

@ -50,8 +50,8 @@ int Entity::getSmallId()
#ifdef _WIN32 #ifdef _WIN32
if( ((size_t)TlsGetValue(tlsIdx) != 0 ) ) if( ((size_t)TlsGetValue(tlsIdx) != 0 ) )
#else #else
pthread_key_create(&tlsKey, nullptr); pthread_key_create(&tlsIdx, nullptr);
if ( ((size_t)pthread_getspecific(tlsKey) != 0) ) if ( ((size_t)pthread_getspecific(tlsIdx) != 0) )
#endif #endif
{ {
MinecraftServer *server = MinecraftServer::getInstance(); MinecraftServer *server = MinecraftServer::getInstance();
@ -154,7 +154,7 @@ void Entity::freeSmallId(int index)
void Entity::useSmallIds() void Entity::useSmallIds()
{ {
TlsSetValue(tlsIdx,(LPVOID)1); pthread_setspecific(tlsIdx,(LPVOID)1);
} }
// Things also added here to be able to manage the concept of a number of extra "wandering" entities - normally path finding entities aren't allowed to // Things also added here to be able to manage the concept of a number of extra "wandering" entities - normally path finding entities aren't allowed to

6
Minecraft.World/FireTile.cpp
View file

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

2
Minecraft.World/FoliageColor.cpp
View file

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

2
Minecraft.World/Ghast.cpp
View file

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

2
Minecraft.World/Giant.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "net.minecraft.world.level.h" #include "net.minecraft.world.level.h"
#include "Giant.h" #include "Giant.h"
#include "..\Minecraft.Client\Textures.h" #include "../Minecraft.Client/Textures.h"

4
Minecraft.World/GrassTile.cpp
View file

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

4
Minecraft.World/HellDimension.cpp
View file

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

2
Minecraft.World/LavaSlime.cpp
View file

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

2
Minecraft.World/Layer.cpp
View file

@ -5,7 +5,7 @@
#ifdef __PSVITA__ #ifdef __PSVITA__
// AP - this is used to perform fast 64bit divides of known values // 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_d2(2);
libdivide::divider<long long> fast_d3(3); libdivide::divider<long long> fast_d3(3);

2
Minecraft.World/LeafTile.cpp
View file

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

14
Minecraft.World/Level.cpp
View file

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

8
Minecraft.World/LevelChunk.cpp
View file

@ -11,10 +11,10 @@
#include "SparseLightStorage.h" #include "SparseLightStorage.h"
#include "BlockReplacements.h" #include "BlockReplacements.h"
#include "LevelChunk.h" #include "LevelChunk.h"
#include "..\Minecraft.Client\MinecraftServer.h" #include "../Minecraft.Client/MinecraftServer.h"
#include "..\Minecraft.Client\ServerLevel.h" #include "../Minecraft.Client/ServerLevel.h"
#include "..\Minecraft.Client\ServerChunkCache.h" #include "../Minecraft.Client/ServerChunkCache.h"
#include "..\Minecraft.Client\GameRenderer.h" #include "../Minecraft.Client/GameRenderer.h"
#ifdef __PS3__ #ifdef __PS3__
#include "C4JSpursJob.h" #include "C4JSpursJob.h"

4
Minecraft.World/LightningBolt.cpp
View file

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

8
Minecraft.World/MapItemSavedData.cpp
View file

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

2
Minecraft.World/Minecart.cpp
View file

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

2
Minecraft.World/MobSpawner.cpp
View file

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

2
Minecraft.World/Monster.cpp
View file

@ -8,7 +8,7 @@
#include "net.minecraft.world.item.enchantment.h" #include "net.minecraft.world.item.enchantment.h"
#include "Monster.h" #include "Monster.h"
#include "..\Minecraft.Client\Minecraft.h" #include "../Minecraft.Client/Minecraft.h"

2
Minecraft.World/MonsterPlacerItem.cpp
View file

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

2
Minecraft.World/MushroomCow.cpp
View file

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

2
Minecraft.World/Ozelot.cpp
View file

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

2
Minecraft.World/Pig.cpp
View file

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

2
Minecraft.World/PigZombie.cpp
View file

@ -9,7 +9,7 @@
#include "net.minecraft.world.entity.item.h" #include "net.minecraft.world.entity.item.h"
#include "net.minecraft.world.damagesource.h" #include "net.minecraft.world.damagesource.h"
#include "PigZombie.h" #include "PigZombie.h"
#include "..\Minecraft.Client\Textures.h" #include "../Minecraft.Client/Textures.h"
#include "SoundTypes.h" #include "SoundTypes.h"

4
Minecraft.World/PistonBaseTile.cpp
View file

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

6
Minecraft.World/Player.cpp
View file

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

2
Minecraft.World/PotionBrewing.cpp
View file

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

2
Minecraft.World/RandomLevelSource.cpp
View file

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

4
Minecraft.World/RedStoneDustTile.cpp
View file

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

2
Minecraft.World/Sheep.cpp
View file

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

6
Minecraft.World/SignTileEntity.cpp
View file

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

2
Minecraft.World/Silverfish.cpp
View file

@ -4,7 +4,7 @@
#include "net.minecraft.world.phys.h" #include "net.minecraft.world.phys.h"
#include "net.minecraft.world.damagesource.h" #include "net.minecraft.world.damagesource.h"
#include "net.minecraft.h" #include "net.minecraft.h"
#include "..\Minecraft.Client\Textures.h" #include "../Minecraft.Client/Textures.h"
#include "Silverfish.h" #include "Silverfish.h"
#include "SoundTypes.h" #include "SoundTypes.h"

2
Minecraft.World/Skeleton.cpp
View file

@ -13,7 +13,7 @@
#include "net.minecraft.world.damagesource.h" #include "net.minecraft.world.damagesource.h"
#include "SharedConstants.h" #include "SharedConstants.h"
#include "Skeleton.h" #include "Skeleton.h"
#include "..\Minecraft.Client\Textures.h" #include "../Minecraft.Client/Textures.h"
#include "SoundTypes.h" #include "SoundTypes.h"

2
Minecraft.World/Slime.cpp
View file

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

2
Minecraft.World/SnowMan.cpp
View file

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

2
Minecraft.World/Spider.cpp
View file

@ -8,7 +8,7 @@
#include "net.minecraft.world.entity.h" #include "net.minecraft.world.entity.h"
#include "com.mojang.nbt.h" #include "com.mojang.nbt.h"
#include "Spider.h" #include "Spider.h"
#include "..\Minecraft.Client\Textures.h" #include "../Minecraft.Client/Textures.h"
#include "SoundTypes.h" #include "SoundTypes.h"

2
Minecraft.World/Squid.cpp
View file

@ -8,7 +8,7 @@ using namespace std;
#include "net.minecraft.world.item.h" #include "net.minecraft.world.item.h"
#include "SharedConstants.h" #include "SharedConstants.h"
#include "Squid.h" #include "Squid.h"
#include "..\Minecraft.Client\Textures.h" #include "../Minecraft.Client/Textures.h"

4
Minecraft.World/StemTile.cpp
View file

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

2
Minecraft.World/TallGrass.cpp
View file

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

4
Minecraft.World/TheEndDimension.cpp
View file

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

4
Minecraft.World/ThrownEnderpearl.cpp
View file

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

2
Minecraft.World/Villager.cpp
View file

@ -13,7 +13,7 @@
#include "net.minecraft.world.item.trading.h" #include "net.minecraft.world.item.trading.h"
#include "net.minecraft.world.level.tile.h" #include "net.minecraft.world.level.tile.h"
#include "net.minecraft.world.level.h" #include "net.minecraft.world.level.h"
#include "..\Minecraft.Client\Textures.h" #include "../Minecraft.Client/Textures.h"
#include "Villager.h" #include "Villager.h"
unordered_map<int, pair<int,int> > Villager::MIN_MAX_VALUES; unordered_map<int, pair<int,int> > Villager::MIN_MAX_VALUES;

2
Minecraft.World/VillagerGolem.cpp
View file

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

2
Minecraft.World/WaterLilyTile.cpp
View file

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

2
Minecraft.World/Wolf.cpp
View file

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

2
Minecraft.World/Zombie.cpp
View file

@ -11,7 +11,7 @@
#include "net.minecraft.world.entity.player.h" #include "net.minecraft.world.entity.player.h"
#include "Zombie.h" #include "Zombie.h"
#include "GenericStats.h" #include "GenericStats.h"
#include "..\Minecraft.Client\Textures.h" #include "../Minecraft.Client/Textures.h"
#include "net.minecraft.world.entity.h" #include "net.minecraft.world.entity.h"
#include "SoundTypes.h" #include "SoundTypes.h"

6
Minecraft.World/compression.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "compression.h" #include "compression.h"
#if defined __ORBIS__ || defined __PS3__ || defined _DURANGO || defined _WIN64 #if defined __ORBIS__ || defined __PS3__ || defined _DURANGO || defined _WIN64
#include "..\Minecraft.Client\Common\zlib\zlib.h" #include "../Minecraft.Client/Common\zlib\zlib.h"
#endif #endif
#if defined(__linux__) #if defined(__linux__)
@ -10,9 +10,9 @@
#endif // __linux__ #endif // __linux__
#if defined __PSVITA__ #if defined __PSVITA__
#include "..\Minecraft.Client\PSVita\PSVitaExtras\zlib.h" #include "../Minecraft.Client/PSVita\PSVitaExtras\zlib.h"
#elif defined __PS3__ #elif defined __PS3__
#include "..\Minecraft.Client\PS3\PS3Extras\EdgeZLib.h" #include "../Minecraft.Client/PS3\PS3Extras\EdgeZLib.h"
#endif //__PS3__ #endif //__PS3__
#if defined(__linux__) #if defined(__linux__)