From bed181cd59ea31285b231b017792b013fbd8831b Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Tue, 31 Mar 2026 01:39:49 -0500 Subject: [PATCH] run IWYU on Minecraft.World --- .../ConsoleHelpers/C4JThread.cpp | 17 ++- .../ConsoleSaveFileConverter.cpp | 8 +- .../ConsoleSaveFileInputStream.cpp | 7 +- .../ConsoleSaveFileInputStream.h | 3 +- .../ConsoleSaveFileOriginal.cpp | 35 +++-- .../ConsoleSaveFileOriginal.h | 3 + .../ConsoleSaveFileOutputStream.cpp | 9 +- .../ConsoleSaveFileOutputStream.h | 3 +- .../ConsoleSaveFileSplit.cpp | 34 ++++- .../ConsoleSaveFileIO/ConsoleSaveFileSplit.h | 7 + .../ConsoleSaveFileIO/FileHeader.cpp | 18 ++- .../ConsoleHelpers/PerformanceTimer.cpp | 9 +- .../ConsoleHelpers/StringHelpers.cpp | 2 +- .../ConsoleHelpers/ThreadName.cpp | 1 - .../Header Files/PortableFileIO.h | 2 +- .../Header Files/compression.h | 2 +- .../Minecraft.World/Header Files/stdafx.h | 18 +-- .../Source Files/Minecraft.World.cpp | 58 ++++--- .../Source Files/compression.cpp | 13 +- .../net/minecraft/Direction.cpp | 2 +- .../Minecraft.World/net/minecraft/Direction.h | 2 + .../Minecraft.World/net/minecraft/Facing.cpp | 1 - .../Minecraft.World/net/minecraft/Facing.h | 2 + .../Minecraft.World/net/minecraft/Pos.cpp | 7 +- .../net/minecraft/SharedConstants.cpp | 9 +- .../net/minecraft/commands/AdminLogCommand.h | 2 +- .../net/minecraft/commands/Command.cpp | 6 +- .../net/minecraft/commands/Command.h | 8 +- .../minecraft/commands/CommandDispatcher.cpp | 8 +- .../minecraft/commands/CommandDispatcher.h | 8 + .../net/minecraft/commands/CommandSender.h | 2 +- .../common/DefaultGameModeCommand.cpp | 4 +- .../commands/common/DefaultGameModeCommand.h | 3 + .../commands/common/EffectCommand.cpp | 12 +- .../minecraft/commands/common/EffectCommand.h | 8 +- .../commands/common/EnchantItemCommand.cpp | 19 ++- .../commands/common/EnchantItemCommand.h | 7 +- .../commands/common/ExperienceCommand.cpp | 7 +- .../commands/common/ExperienceCommand.h | 5 +- .../commands/common/GameModeCommand.cpp | 4 +- .../commands/common/GameModeCommand.h | 8 +- .../commands/common/GiveItemCommand.cpp | 18 ++- .../commands/common/GiveItemCommand.h | 8 +- .../minecraft/commands/common/KillCommand.cpp | 12 +- .../minecraft/commands/common/KillCommand.h | 5 +- .../minecraft/commands/common/TimeCommand.cpp | 13 +- .../minecraft/commands/common/TimeCommand.h | 9 +- .../commands/common/ToggleDownfallCommand.cpp | 11 +- .../commands/common/ToggleDownfallCommand.h | 6 +- .../AbstractProjectileDispenseBehavior.cpp | 18 ++- .../core/AbstractProjectileDispenseBehavior.h | 3 + .../net/minecraft/core/BehaviorRegistry.cpp | 5 +- .../net/minecraft/core/BehaviorRegistry.h | 5 + .../net/minecraft/core/BlockSourceImpl.cpp | 8 +- .../core/DefaultDispenseItemBehavior.cpp | 14 +- .../core/DefaultDispenseItemBehavior.h | 5 + .../minecraft/core/DispenseItemBehavior.cpp | 2 - .../net/minecraft/core/DispenseItemBehavior.h | 2 + .../net/minecraft/core/FacingEnum.cpp | 2 - .../minecraft/core/ItemDispenseBehaviors.cpp | 42 ++++- .../net/minecraft/locale/I18n.cpp | 1 - .../net/minecraft/locale/I18n.h | 7 +- .../net/minecraft/locale/Language.cpp | 8 +- .../net/minecraft/locale/Language.h | 4 + .../net/minecraft/network/Connection.cpp | 24 ++- .../net/minecraft/network/Connection.h | 23 ++- .../network/packet/AddEntityPacket.cpp | 9 +- .../network/packet/AddEntityPacket.h | 6 + .../network/packet/AddExperienceOrbPacket.cpp | 7 +- .../network/packet/AddExperienceOrbPacket.h | 3 + .../network/packet/AddGlobalEntityPacket.cpp | 13 +- .../network/packet/AddGlobalEntityPacket.h | 5 + .../minecraft/network/packet/AddMobPacket.cpp | 11 +- .../minecraft/network/packet/AddMobPacket.h | 7 +- .../network/packet/AddPaintingPacket.cpp | 7 +- .../network/packet/AddPaintingPacket.h | 4 + .../network/packet/AddPlayerPacket.cpp | 14 +- .../network/packet/AddPlayerPacket.h | 7 +- .../network/packet/AnimatePacket.cpp | 9 +- .../minecraft/network/packet/AnimatePacket.h | 5 + .../network/packet/AwardStatPacket.cpp | 7 +- .../network/packet/AwardStatPacket.h | 6 + .../packet/BlockRegionUpdatePacket.cpp | 19 +-- .../network/packet/BlockRegionUpdatePacket.h | 5 + .../minecraft/network/packet/ChatPacket.cpp | 9 +- .../net/minecraft/network/packet/ChatPacket.h | 5 + .../network/packet/ChunkTilesUpdatePacket.cpp | 11 +- .../network/packet/ChunkTilesUpdatePacket.h | 6 + .../packet/ChunkVisibilityAreaPacket.cpp | 6 +- .../packet/ChunkVisibilityAreaPacket.h | 3 + .../network/packet/ChunkVisibilityPacket.cpp | 5 +- .../network/packet/ChunkVisibilityPacket.h | 8 +- .../network/packet/ClientCommandPacket.cpp | 5 +- .../network/packet/ClientCommandPacket.h | 3 + .../network/packet/ClientInformationPacket.h | 2 +- .../network/packet/ComplexItemDataPacket.cpp | 8 +- .../network/packet/ComplexItemDataPacket.h | 5 + .../network/packet/ContainerAckPacket.cpp | 7 +- .../network/packet/ContainerAckPacket.h | 8 +- .../packet/ContainerButtonClickPacket.cpp | 8 +- .../packet/ContainerButtonClickPacket.h | 3 + .../network/packet/ContainerClickPacket.cpp | 9 +- .../network/packet/ContainerClickPacket.h | 5 + .../network/packet/ContainerClosePacket.cpp | 7 +- .../network/packet/ContainerClosePacket.h | 3 + .../network/packet/ContainerOpenPacket.cpp | 5 +- .../network/packet/ContainerOpenPacket.h | 4 + .../packet/ContainerSetContentPacket.cpp | 9 +- .../packet/ContainerSetContentPacket.h | 7 + .../network/packet/ContainerSetDataPacket.cpp | 7 +- .../network/packet/ContainerSetDataPacket.h | 3 + .../network/packet/ContainerSetSlotPacket.cpp | 9 +- .../network/packet/ContainerSetSlotPacket.h | 5 + .../network/packet/CraftItemPacket.cpp | 6 +- .../network/packet/CraftItemPacket.h | 3 + .../network/packet/CustomPayloadPacket.cpp | 9 +- .../network/packet/CustomPayloadPacket.h | 7 + .../network/packet/DebugOptionsPacket.cpp | 6 +- .../network/packet/DebugOptionsPacket.h | 3 + .../network/packet/DisconnectPacket.cpp | 12 +- .../packet/EntityActionAtPositionPacket.cpp | 9 +- .../packet/EntityActionAtPositionPacket.h | 5 + .../network/packet/EntityEventPacket.cpp | 5 +- .../network/packet/EntityEventPacket.h | 4 + .../network/packet/ExplodePacket.cpp | 9 +- .../minecraft/network/packet/ExplodePacket.h | 10 +- .../network/packet/GameCommandPacket.cpp | 10 +- .../network/packet/GameCommandPacket.h | 8 +- .../network/packet/GameEventPacket.cpp | 2 +- .../network/packet/GetInfoPacket.cpp | 2 - .../minecraft/network/packet/GetInfoPacket.h | 3 + .../network/packet/InteractPacket.cpp | 7 +- .../minecraft/network/packet/InteractPacket.h | 3 + .../network/packet/KeepAlivePacket.cpp | 5 +- .../network/packet/KeepAlivePacket.h | 3 + .../network/packet/KickPlayerPacket.cpp | 5 +- .../network/packet/KickPlayerPacket.h | 2 + .../network/packet/LevelEventPacket.cpp | 5 +- .../network/packet/LevelEventPacket.h | 3 + .../network/packet/LevelParticlesPacket.cpp | 3 +- .../network/packet/LevelParticlesPacket.h | 4 + .../network/packet/LevelSoundPacket.cpp | 9 +- .../network/packet/LevelSoundPacket.h | 3 + .../minecraft/network/packet/LoginPacket.cpp | 13 +- .../minecraft/network/packet/LoginPacket.h | 5 + .../network/packet/MoveEntityPacket.cpp | 8 +- .../network/packet/MoveEntityPacket.h | 3 + .../network/packet/MoveEntityPacketSmall.cpp | 8 +- .../network/packet/MoveEntityPacketSmall.h | 3 + .../network/packet/MovePlayerPacket.cpp | 5 +- .../network/packet/MovePlayerPacket.h | 3 + .../net/minecraft/network/packet/Packet.cpp | 121 +++++++++++++-- .../net/minecraft/network/packet/Packet.h | 2 + .../network/packet/PacketListener.cpp | 89 ++++++++++- .../minecraft/network/packet/PacketListener.h | 14 +- .../network/packet/PlayerAbilitiesPacket.cpp | 9 +- .../network/packet/PlayerAbilitiesPacket.h | 3 + .../network/packet/PlayerActionPacket.cpp | 5 +- .../network/packet/PlayerActionPacket.h | 3 + .../network/packet/PlayerCommandPacket.cpp | 7 +- .../network/packet/PlayerCommandPacket.h | 5 + .../network/packet/PlayerInfoPacket.cpp | 8 +- .../network/packet/PlayerInfoPacket.h | 4 + .../network/packet/PlayerInputPacket.cpp | 5 +- .../network/packet/PlayerInputPacket.h | 3 + .../network/packet/PreLoginPacket.cpp | 9 +- .../minecraft/network/packet/PreLoginPacket.h | 4 + .../network/packet/RemoveEntitiesPacket.cpp | 6 +- .../network/packet/RemoveEntitiesPacket.h | 5 + .../network/packet/RemoveMobEffectPacket.cpp | 8 +- .../network/packet/RemoveMobEffectPacket.h | 5 +- .../network/packet/RespawnPacket.cpp | 12 +- .../minecraft/network/packet/RespawnPacket.h | 4 + .../network/packet/RotateHeadPacket.cpp | 5 +- .../network/packet/RotateHeadPacket.h | 3 + .../packet/ServerSettingsChangedPacket.cpp | 6 +- .../packet/ServerSettingsChangedPacket.h | 3 + .../network/packet/SetCarriedItemPacket.cpp | 5 +- .../network/packet/SetCarriedItemPacket.h | 3 + .../packet/SetCreativeModeSlotPacket.cpp | 5 +- .../packet/SetCreativeModeSlotPacket.h | 5 + .../packet/SetDisplayObjectivePacket.cpp | 5 +- .../packet/SetDisplayObjectivePacket.h | 4 + .../network/packet/SetEntityDataPacket.cpp | 9 +- .../network/packet/SetEntityDataPacket.h | 6 +- .../network/packet/SetEntityLinkPacket.cpp | 7 +- .../network/packet/SetEntityLinkPacket.h | 5 + .../network/packet/SetEntityMotionPacket.cpp | 7 +- .../network/packet/SetEntityMotionPacket.h | 5 + .../network/packet/SetEquippedItemPacket.cpp | 6 +- .../network/packet/SetEquippedItemPacket.h | 4 + .../network/packet/SetExperiencePacket.cpp | 4 +- .../network/packet/SetExperiencePacket.h | 3 + .../network/packet/SetHealthPacket.cpp | 5 +- .../network/packet/SetHealthPacket.h | 1 + .../network/packet/SetObjectivePacket.cpp | 5 +- .../network/packet/SetObjectivePacket.h | 4 + .../network/packet/SetPlayerTeamPacket.cpp | 12 +- .../network/packet/SetPlayerTeamPacket.h | 6 + .../network/packet/SetScorePacket.cpp | 8 +- .../minecraft/network/packet/SetScorePacket.h | 4 + .../network/packet/SetSpawnPositionPacket.cpp | 5 +- .../network/packet/SetSpawnPositionPacket.h | 3 + .../network/packet/SetTimePacket.cpp | 5 +- .../minecraft/network/packet/SetTimePacket.h | 4 + .../network/packet/SignUpdatePacket.cpp | 9 +- .../network/packet/SignUpdatePacket.h | 4 + .../network/packet/TakeItemEntityPacket.cpp | 5 +- .../network/packet/TakeItemEntityPacket.h | 3 + .../network/packet/TeleportEntityPacket.cpp | 8 +- .../network/packet/TeleportEntityPacket.h | 6 + .../packet/TextureAndGeometryChangePacket.cpp | 10 +- .../packet/TextureAndGeometryChangePacket.h | 5 + .../packet/TextureAndGeometryPacket.cpp | 10 +- .../network/packet/TextureAndGeometryPacket.h | 4 + .../network/packet/TextureChangePacket.cpp | 7 +- .../network/packet/TextureChangePacket.h | 6 + .../network/packet/TexturePacket.cpp | 5 +- .../minecraft/network/packet/TexturePacket.h | 3 + .../network/packet/TileDestructionPacket.cpp | 5 +- .../network/packet/TileDestructionPacket.h | 3 + .../network/packet/TileEditorOpenPacket.cpp | 4 +- .../network/packet/TileEditorOpenPacket.h | 3 + .../network/packet/TileEntityDataPacket.cpp | 8 +- .../network/packet/TileEntityDataPacket.h | 3 + .../network/packet/TileEventPacket.cpp | 7 +- .../network/packet/TileEventPacket.h | 3 + .../network/packet/TileUpdatePacket.cpp | 11 +- .../network/packet/TileUpdatePacket.h | 5 + .../network/packet/TradeItemPacket.cpp | 5 +- .../network/packet/TradeItemPacket.h | 8 +- .../network/packet/UpdateAttributesPacket.cpp | 7 +- .../network/packet/UpdateAttributesPacket.h | 5 + .../packet/UpdateGameRuleProgressPacket.cpp | 6 +- .../packet/UpdateGameRuleProgressPacket.h | 7 + .../network/packet/UpdateMobEffectPacket.cpp | 12 +- .../network/packet/UpdateMobEffectPacket.h | 2 + .../network/packet/UpdateProgressPacket.cpp | 5 +- .../network/packet/UpdateProgressPacket.h | 3 + .../network/packet/UseItemPacket.cpp | 6 +- .../minecraft/network/packet/UseItemPacket.h | 4 + .../net/minecraft/network/packet/XZPacket.cpp | 6 +- .../net/minecraft/network/packet/XZPacket.h | 3 + .../net/minecraft/stats/Achievement.cpp | 11 +- .../net/minecraft/stats/Achievement.h | 6 + .../net/minecraft/stats/Achievements.cpp | 12 +- .../net/minecraft/stats/Achievements.h | 2 + .../net/minecraft/stats/CommonStats.cpp | 9 +- .../net/minecraft/stats/CommonStats.h | 6 + .../net/minecraft/stats/GeneralStat.cpp | 8 +- .../net/minecraft/stats/GeneralStat.h | 4 + .../net/minecraft/stats/GenericStats.cpp | 10 +- .../net/minecraft/stats/GenericStats.h | 15 +- .../net/minecraft/stats/ItemStat.cpp | 2 +- .../net/minecraft/stats/ItemStat.h | 2 + .../net/minecraft/stats/Stat.cpp | 5 +- .../net/minecraft/stats/Stat.h | 7 + .../net/minecraft/stats/Stats.cpp | 18 ++- .../net/minecraft/stats/Stats.h | 4 + .../net/minecraft/util/Hasher.cpp | 7 +- .../net/minecraft/util/Hasher.h | 2 + .../net/minecraft/util/HtmlString.cpp | 8 +- .../net/minecraft/util/HtmlString.h | 5 + .../net/minecraft/util/Mth.cpp | 14 +- .../net/minecraft/util/SmoothFloat.cpp | 1 - .../net/minecraft/util/WeighedRandom.cpp | 10 +- .../net/minecraft/util/WeighedTreasure.cpp | 8 +- .../net/minecraft/util/WeighedTreasure.h | 10 ++ .../net/minecraft/world/CompoundContainer.cpp | 5 +- .../net/minecraft/world/CompoundContainer.h | 4 + .../net/minecraft/world/FlippedIcon.cpp | 4 +- .../net/minecraft/world/FlippedIcon.h | 2 + .../net/minecraft/world/SimpleContainer.cpp | 6 +- .../net/minecraft/world/SimpleContainer.h | 10 ++ .../world/damageSource/CombatEntry.cpp | 11 +- .../world/damageSource/CombatEntry.h | 2 + .../world/damageSource/CombatTracker.cpp | 20 ++- .../world/damageSource/CombatTracker.h | 7 +- .../world/damageSource/DamageSource.cpp | 24 ++- .../world/damageSource/DamageSource.h | 6 +- .../world/damageSource/EntityDamageSource.cpp | 18 ++- .../world/damageSource/EntityDamageSource.h | 3 + .../IndirectEntityDamageSource.cpp | 17 ++- .../damageSource/IndirectEntityDamageSource.h | 3 + .../world/effect/AbsoptionMobEffect.cpp | 7 +- .../world/effect/AbsoptionMobEffect.h | 5 +- .../world/effect/AttackDamageMobEffect.cpp | 3 +- .../world/effect/AttackDamageMobEffect.h | 1 + .../world/effect/HealthBoostMobEffect.cpp | 6 +- .../world/effect/HealthBoostMobEffect.h | 1 + .../world/effect/InstantaneousMobEffect.cpp | 6 +- .../world/effect/InstantaneousMobEffect.h | 1 + .../net/minecraft/world/effect/MobEffect.cpp | 18 +-- .../net/minecraft/world/effect/MobEffect.h | 2 +- .../world/effect/MobEffectInstance.cpp | 13 +- .../world/effect/MobEffectInstance.h | 5 + .../net/minecraft/world/entity/AgeableMob.cpp | 22 ++- .../net/minecraft/world/entity/AgeableMob.h | 4 + .../net/minecraft/world/entity/Creature.cpp | 1 - .../minecraft/world/entity/DelayedRelease.cpp | 3 +- .../minecraft/world/entity/DelayedRelease.h | 5 + .../net/minecraft/world/entity/Entity.cpp | 69 ++++++--- .../net/minecraft/world/entity/Entity.h | 11 +- .../net/minecraft/world/entity/EntityIO.cpp | 20 +-- .../net/minecraft/world/entity/EntityPos.cpp | 4 +- .../net/minecraft/world/entity/EntityPos.h | 4 + .../minecraft/world/entity/EntitySelector.cpp | 9 +- .../minecraft/world/entity/EntitySelector.h | 5 + .../minecraft/world/entity/ExperienceOrb.cpp | 25 +-- .../minecraft/world/entity/ExperienceOrb.h | 7 + .../net/minecraft/world/entity/FlyingMob.cpp | 10 +- .../net/minecraft/world/entity/FlyingMob.h | 1 + .../minecraft/world/entity/HangingEntity.cpp | 23 ++- .../minecraft/world/entity/HangingEntity.h | 6 + .../net/minecraft/world/entity/ItemFrame.cpp | 25 +-- .../net/minecraft/world/entity/ItemFrame.h | 5 + .../world/entity/LeashFenceKnotEntity.cpp | 20 ++- .../world/entity/LeashFenceKnotEntity.h | 7 + .../minecraft/world/entity/LivingEntity.cpp | 98 ++++++++---- .../net/minecraft/world/entity/LivingEntity.h | 5 +- .../net/minecraft/world/entity/Mob.cpp | 79 ++++++---- .../net/minecraft/world/entity/Mob.h | 2 +- .../minecraft/world/entity/MobCategory.cpp | 8 +- .../net/minecraft/world/entity/MobCategory.h | 5 + .../net/minecraft/world/entity/Painting.cpp | 22 +-- .../net/minecraft/world/entity/Painting.h | 4 + .../minecraft/world/entity/PathfinderMob.cpp | 30 ++-- .../minecraft/world/entity/PathfinderMob.h | 7 + .../world/entity/SyncedEntityData.cpp | 14 +- .../minecraft/world/entity/SyncedEntityData.h | 9 ++ .../minecraft/world/entity/TamableAnimal.cpp | 14 +- .../minecraft/world/entity/TamableAnimal.h | 8 +- .../world/entity/ai/attributes/Attribute.cpp | 2 +- .../ai/attributes/AttributeModifier.cpp | 7 +- .../entity/ai/attributes/AttributeModifier.h | 3 + .../entity/ai/attributes/BaseAttribute.cpp | 2 - .../entity/ai/attributes/BaseAttribute.h | 1 + .../entity/ai/attributes/BaseAttributeMap.cpp | 8 +- .../entity/ai/attributes/BaseAttributeMap.h | 8 + .../ModifiableAttributeInstance.cpp | 7 +- .../attributes/ModifiableAttributeInstance.h | 7 + .../entity/ai/attributes/RangedAttribute.cpp | 3 +- .../entity/ai/attributes/RangedAttribute.h | 1 + .../ai/attributes/ServersideAttributeMap.cpp | 7 +- .../ai/attributes/ServersideAttributeMap.h | 5 + .../world/entity/ai/control/BodyControl.cpp | 9 +- .../world/entity/ai/control/BodyControl.h | 2 + .../world/entity/ai/control/JumpControl.cpp | 3 +- .../world/entity/ai/control/LookControl.cpp | 14 +- .../world/entity/ai/control/LookControl.h | 3 + .../world/entity/ai/control/MoveControl.cpp | 15 +- .../world/entity/ai/goal/AvoidPlayerGoal.cpp | 27 ++-- .../world/entity/ai/goal/AvoidPlayerGoal.h | 6 +- .../world/entity/ai/goal/BegGoal.cpp | 15 +- .../minecraft/world/entity/ai/goal/BegGoal.h | 4 + .../world/entity/ai/goal/BreakDoorGoal.cpp | 14 +- .../world/entity/ai/goal/BreakDoorGoal.h | 5 +- .../world/entity/ai/goal/BreedGoal.cpp | 27 ++-- .../world/entity/ai/goal/BreedGoal.h | 2 + .../entity/ai/goal/ControlledByPlayerGoal.cpp | 33 +++- .../entity/ai/goal/ControlledByPlayerGoal.h | 3 +- .../world/entity/ai/goal/DoorInteractGoal.cpp | 16 +- .../world/entity/ai/goal/DoorInteractGoal.h | 1 + .../world/entity/ai/goal/EatTileGoal.cpp | 18 ++- .../world/entity/ai/goal/EatTileGoal.h | 6 +- .../world/entity/ai/goal/FleeSunGoal.cpp | 16 +- .../world/entity/ai/goal/FleeSunGoal.h | 6 +- .../world/entity/ai/goal/FloatGoal.cpp | 9 +- .../world/entity/ai/goal/FollowOwnerGoal.cpp | 16 +- .../world/entity/ai/goal/FollowOwnerGoal.h | 4 + .../world/entity/ai/goal/FollowParentGoal.cpp | 16 +- .../world/entity/ai/goal/FollowParentGoal.h | 2 + .../minecraft/world/entity/ai/goal/Goal.cpp | 1 - .../net/minecraft/world/entity/ai/goal/Goal.h | 2 + .../world/entity/ai/goal/GoalSelector.cpp | 10 +- .../world/entity/ai/goal/InteractGoal.cpp | 6 +- .../world/entity/ai/goal/InteractGoal.h | 4 + .../world/entity/ai/goal/LeapAtTargetGoal.cpp | 9 +- .../world/entity/ai/goal/LeapAtTargetGoal.h | 5 + .../world/entity/ai/goal/LookAtPlayerGoal.cpp | 13 +- .../world/entity/ai/goal/LookAtPlayerGoal.h | 4 + .../ai/goal/LookAtTradingPlayerGoal.cpp | 11 +- .../world/entity/ai/goal/MakeLoveGoal.cpp | 21 ++- .../world/entity/ai/goal/MakeLoveGoal.h | 3 + .../world/entity/ai/goal/MeleeAttackGoal.cpp | 21 +-- .../world/entity/ai/goal/MeleeAttackGoal.h | 1 + .../world/entity/ai/goal/MoveIndoorsGoal.cpp | 22 ++- .../world/entity/ai/goal/MoveIndoorsGoal.h | 2 + .../entity/ai/goal/MoveThroughVillageGoal.cpp | 24 +-- .../entity/ai/goal/MoveThroughVillageGoal.h | 4 + .../ai/goal/MoveTowardsRestrictionGoal.cpp | 15 +- .../ai/goal/MoveTowardsRestrictionGoal.h | 2 + .../entity/ai/goal/MoveTowardsTargetGoal.cpp | 15 +- .../entity/ai/goal/MoveTowardsTargetGoal.h | 5 + .../world/entity/ai/goal/OcelotAttackGoal.cpp | 15 +- .../world/entity/ai/goal/OcelotAttackGoal.h | 6 + .../entity/ai/goal/OcelotSitOnTileGoal.cpp | 23 +-- .../entity/ai/goal/OcelotSitOnTileGoal.h | 1 + .../world/entity/ai/goal/OfferFlowerGoal.cpp | 13 +- .../world/entity/ai/goal/OfferFlowerGoal.h | 3 + .../world/entity/ai/goal/OpenDoorGoal.cpp | 6 +- .../world/entity/ai/goal/OpenDoorGoal.h | 2 + .../world/entity/ai/goal/PanicGoal.cpp | 15 +- .../world/entity/ai/goal/PlayGoal.cpp | 25 +-- .../minecraft/world/entity/ai/goal/PlayGoal.h | 5 + .../entity/ai/goal/RandomLookAroundGoal.cpp | 10 +- .../entity/ai/goal/RandomLookAroundGoal.h | 2 + .../world/entity/ai/goal/RandomStrollGoal.cpp | 17 ++- .../world/entity/ai/goal/RangedAttackGoal.cpp | 16 +- .../world/entity/ai/goal/RangedAttackGoal.h | 4 + .../entity/ai/goal/RestrictOpenDoorGoal.cpp | 12 +- .../entity/ai/goal/RestrictOpenDoorGoal.h | 2 + .../world/entity/ai/goal/RestrictSunGoal.cpp | 7 +- .../world/entity/ai/goal/RestrictSunGoal.h | 2 + .../entity/ai/goal/RunAroundLikeCrazyGoal.cpp | 24 ++- .../world/entity/ai/goal/SitGoal.cpp | 13 +- .../minecraft/world/entity/ai/goal/SitGoal.h | 2 + .../world/entity/ai/goal/SwellGoal.cpp | 10 +- .../world/entity/ai/goal/SwellGoal.h | 3 + .../world/entity/ai/goal/TakeFlowerGoal.cpp | 22 ++- .../world/entity/ai/goal/TakeFlowerGoal.h | 5 + .../world/entity/ai/goal/TemptGoal.cpp | 15 +- .../world/entity/ai/goal/TemptGoal.h | 5 + .../entity/ai/goal/TradeWithPlayerGoal.cpp | 11 +- .../goal/target/DefendVillageTargetGoal.cpp | 9 +- .../ai/goal/target/DefendVillageTargetGoal.h | 3 + .../ai/goal/target/HurtByTargetGoal.cpp | 14 +- .../entity/ai/goal/target/HurtByTargetGoal.h | 2 + .../target/NearestAttackableTargetGoal.cpp | 17 ++- .../goal/target/NearestAttackableTargetGoal.h | 8 +- .../goal/target/NonTameRandomTargetGoal.cpp | 4 +- .../ai/goal/target/NonTameRandomTargetGoal.h | 2 + .../ai/goal/target/OwnerHurtByTargetGoal.cpp | 7 +- .../ai/goal/target/OwnerHurtByTargetGoal.h | 3 + .../ai/goal/target/OwnerHurtTargetGoal.cpp | 7 +- .../ai/goal/target/OwnerHurtTargetGoal.h | 3 + .../entity/ai/goal/target/TargetGoal.cpp | 26 ++-- .../world/entity/ai/goal/target/TargetGoal.h | 5 +- .../entity/ai/navigation/PathNavigation.cpp | 26 ++-- .../entity/ai/navigation/PathNavigation.h | 6 + .../world/entity/ai/sensing/Sensing.cpp | 5 +- .../world/entity/ai/sensing/Sensing.h | 6 + .../world/entity/ai/util/RandomPos.cpp | 10 +- .../world/entity/ai/util/RandomPos.h | 4 + .../world/entity/ai/village/DoorInfo.cpp | 2 +- .../world/entity/ai/village/Village.cpp | 28 +++- .../world/entity/ai/village/Village.h | 15 ++ .../world/entity/ai/village/VillageSiege.cpp | 21 ++- .../world/entity/ai/village/VillageSiege.h | 6 + .../world/entity/ai/village/Villages.cpp | 15 +- .../world/entity/ai/village/Villages.h | 14 +- .../world/entity/ambient/AmbientCreature.cpp | 4 +- .../world/entity/ambient/AmbientCreature.h | 7 +- .../minecraft/world/entity/ambient/Bat.cpp | 25 ++- .../net/minecraft/world/entity/ambient/Bat.h | 5 + .../minecraft/world/entity/animal/Animal.cpp | 24 +-- .../minecraft/world/entity/animal/Animal.h | 4 +- .../minecraft/world/entity/animal/Chicken.cpp | 32 ++-- .../minecraft/world/entity/animal/Chicken.h | 2 + .../net/minecraft/world/entity/animal/Cow.cpp | 38 +++-- .../net/minecraft/world/entity/animal/Cow.h | 2 + .../world/entity/animal/EntityHorse.cpp | 70 ++++++--- .../world/entity/animal/EntityHorse.h | 17 ++- .../minecraft/world/entity/animal/Golem.cpp | 3 +- .../net/minecraft/world/entity/animal/Golem.h | 4 +- .../world/entity/animal/MushroomCow.cpp | 25 +-- .../world/entity/animal/MushroomCow.h | 4 + .../minecraft/world/entity/animal/Ocelot.cpp | 64 +++++--- .../minecraft/world/entity/animal/Ocelot.h | 7 +- .../net/minecraft/world/entity/animal/Pig.cpp | 46 +++--- .../net/minecraft/world/entity/animal/Pig.h | 3 + .../minecraft/world/entity/animal/Sheep.cpp | 57 ++++--- .../net/minecraft/world/entity/animal/Sheep.h | 15 +- .../minecraft/world/entity/animal/SnowMan.cpp | 42 +++-- .../minecraft/world/entity/animal/SnowMan.h | 6 +- .../minecraft/world/entity/animal/Squid.cpp | 27 ++-- .../net/minecraft/world/entity/animal/Squid.h | 3 + .../world/entity/animal/VillagerGolem.cpp | 58 ++++--- .../world/entity/animal/VillagerGolem.h | 5 + .../world/entity/animal/WaterAnimal.cpp | 12 +- .../world/entity/animal/WaterAnimal.h | 5 +- .../minecraft/world/entity/animal/Wolf.cpp | 68 ++++++--- .../net/minecraft/world/entity/animal/Wolf.h | 11 +- .../world/entity/boss/MultiEntityMobPart.cpp | 2 - .../world/entity/boss/MultiEntityMobPart.h | 7 +- .../entity/boss/enderdragon/EnderCrystal.cpp | 10 +- .../entity/boss/enderdragon/EnderCrystal.h | 2 +- .../entity/boss/enderdragon/EnderDragon.cpp | 24 +-- .../entity/boss/enderdragon/EnderDragon.h | 6 +- ....minecraft.world.entity.boss.enderdragon.h | 2 +- .../world/entity/boss/wither/WitherBoss.cpp | 32 ++-- .../world/entity/boss/wither/WitherBoss.h | 6 +- .../world/entity/global/GlobalEntity.cpp | 1 - .../world/entity/global/GlobalEntity.h | 3 +- .../world/entity/global/LightningBolt.cpp | 22 ++- .../world/entity/global/LightningBolt.h | 7 +- .../net/minecraft/world/entity/item/Boat.cpp | 30 ++-- .../net/minecraft/world/entity/item/Boat.h | 6 +- .../world/entity/item/FallingTile.cpp | 23 ++- .../minecraft/world/entity/item/FallingTile.h | 5 +- .../world/entity/item/ItemEntity.cpp | 33 ++-- .../minecraft/world/entity/item/ItemEntity.h | 12 +- .../minecraft/world/entity/item/Minecart.cpp | 51 +++++-- .../minecraft/world/entity/item/Minecart.h | 3 +- .../world/entity/item/MinecartChest.cpp | 8 +- .../world/entity/item/MinecartChest.h | 5 + .../world/entity/item/MinecartContainer.cpp | 10 +- .../world/entity/item/MinecartContainer.h | 2 +- .../world/entity/item/MinecartFurnace.cpp | 26 +++- .../world/entity/item/MinecartFurnace.h | 5 + .../world/entity/item/MinecartHopper.cpp | 29 ++-- .../world/entity/item/MinecartHopper.h | 2 +- .../world/entity/item/MinecartRideable.cpp | 9 +- .../world/entity/item/MinecartRideable.h | 5 + .../world/entity/item/MinecartSpawner.cpp | 7 +- .../world/entity/item/MinecartSpawner.h | 9 +- .../world/entity/item/MinecartTNT.cpp | 17 ++- .../minecraft/world/entity/item/MinecartTNT.h | 7 + .../minecraft/world/entity/item/PrimedTnt.cpp | 11 +- .../minecraft/world/entity/item/PrimedTnt.h | 9 +- .../minecraft/world/entity/monster/Blaze.cpp | 34 +++-- .../minecraft/world/entity/monster/Blaze.h | 4 + .../world/entity/monster/CaveSpider.cpp | 20 ++- .../world/entity/monster/CaveSpider.h | 4 + .../world/entity/monster/Creeper.cpp | 47 +++--- .../minecraft/world/entity/monster/Creeper.h | 2 + .../world/entity/monster/EnderMan.cpp | 43 ++++-- .../minecraft/world/entity/monster/EnderMan.h | 8 + .../minecraft/world/entity/monster/Enemy.cpp | 7 +- .../minecraft/world/entity/monster/Enemy.h | 4 +- .../minecraft/world/entity/monster/Ghast.cpp | 42 +++-- .../minecraft/world/entity/monster/Ghast.h | 6 +- .../minecraft/world/entity/monster/Giant.cpp | 9 +- .../minecraft/world/entity/monster/Giant.h | 2 + .../world/entity/monster/LavaSlime.cpp | 19 ++- .../world/entity/monster/LavaSlime.h | 5 + .../world/entity/monster/Monster.cpp | 33 ++-- .../minecraft/world/entity/monster/Monster.h | 4 +- .../world/entity/monster/PigZombie.cpp | 34 +++-- .../world/entity/monster/PigZombie.h | 6 + .../monster/SharedMonsterAttributes.cpp | 17 ++- .../entity/monster/SharedMonsterAttributes.h | 7 + .../world/entity/monster/Silverfish.cpp | 29 ++-- .../world/entity/monster/Silverfish.h | 5 + .../world/entity/monster/Skeleton.cpp | 68 ++++++--- .../minecraft/world/entity/monster/Skeleton.h | 4 + .../minecraft/world/entity/monster/Slime.cpp | 39 +++-- .../minecraft/world/entity/monster/Slime.h | 11 +- .../minecraft/world/entity/monster/Spider.cpp | 35 +++-- .../minecraft/world/entity/monster/Spider.h | 8 +- .../minecraft/world/entity/monster/Witch.cpp | 48 ++++-- .../minecraft/world/entity/monster/Witch.h | 7 + .../minecraft/world/entity/monster/Zombie.cpp | 68 ++++++--- .../minecraft/world/entity/monster/Zombie.h | 14 +- .../world/entity/npc/ClientSideMerchant.cpp | 9 +- .../world/entity/npc/ClientSideMerchant.h | 7 +- .../net/minecraft/world/entity/npc/Npc.cpp | 2 - .../net/minecraft/world/entity/npc/Npc.h | 2 +- .../minecraft/world/entity/npc/Villager.cpp | 30 ++-- .../net/minecraft/world/entity/npc/Villager.h | 6 +- .../world/entity/player/Abilities.cpp | 5 +- .../world/entity/player/Inventory.cpp | 10 +- .../minecraft/world/entity/player/Inventory.h | 4 +- .../minecraft/world/entity/player/Player.cpp | 107 +++++++++---- .../minecraft/world/entity/player/Player.h | 26 +++- .../world/entity/projectile/Arrow.cpp | 46 ++++-- .../minecraft/world/entity/projectile/Arrow.h | 7 +- .../entity/projectile/DragonFireball.cpp | 19 ++- .../world/entity/projectile/DragonFireball.h | 7 + .../entity/projectile/EyeOfEnderSignal.cpp | 20 ++- .../entity/projectile/EyeOfEnderSignal.h | 6 +- .../world/entity/projectile/Fireball.cpp | 33 ++-- .../world/entity/projectile/Fireball.h | 10 +- .../projectile/FireworksRocketEntity.cpp | 19 ++- .../entity/projectile/FireworksRocketEntity.h | 10 +- .../world/entity/projectile/FishingHook.cpp | 36 +++-- .../world/entity/projectile/FishingHook.h | 7 +- .../world/entity/projectile/LargeFireball.cpp | 14 +- .../world/entity/projectile/LargeFireball.h | 7 + .../world/entity/projectile/SmallFireball.cpp | 14 +- .../world/entity/projectile/SmallFireball.h | 6 + .../world/entity/projectile/Snowball.cpp | 13 +- .../world/entity/projectile/Snowball.h | 6 + .../world/entity/projectile/Throwable.cpp | 23 ++- .../world/entity/projectile/Throwable.h | 8 +- .../world/entity/projectile/ThrownEgg.cpp | 16 +- .../world/entity/projectile/ThrownEgg.h | 5 + .../entity/projectile/ThrownEnderpearl.cpp | 13 +- .../entity/projectile/ThrownEnderpearl.h | 6 + .../entity/projectile/ThrownExpBottle.cpp | 11 +- .../world/entity/projectile/ThrownExpBottle.h | 6 + .../world/entity/projectile/ThrownPotion.cpp | 27 +++- .../world/entity/projectile/ThrownPotion.h | 7 + .../world/entity/projectile/WitherSkull.cpp | 24 ++- .../world/entity/projectile/WitherSkull.h | 7 + .../minecraft/world/food/FoodConstants.cpp | 2 - .../net/minecraft/world/food/FoodData.cpp | 18 ++- .../net/minecraft/world/food/FoodData.h | 2 + .../world/inventory/AbstractContainerMenu.cpp | 14 +- .../world/inventory/AbstractContainerMenu.h | 12 +- .../minecraft/world/inventory/AnimalChest.cpp | 2 +- .../minecraft/world/inventory/AnimalChest.h | 2 +- .../minecraft/world/inventory/AnvilMenu.cpp | 10 +- .../minecraft/world/inventory/ArmorSlot.cpp | 11 +- .../net/minecraft/world/inventory/ArmorSlot.h | 2 + .../minecraft/world/inventory/BeaconMenu.cpp | 13 +- .../minecraft/world/inventory/BeaconMenu.h | 3 + .../world/inventory/BrewingStandMenu.cpp | 18 ++- .../world/inventory/BrewingStandMenu.h | 3 + .../world/inventory/ContainerMenu.cpp | 12 +- .../minecraft/world/inventory/ContainerMenu.h | 2 + .../world/inventory/CraftingContainer.cpp | 5 +- .../world/inventory/CraftingContainer.h | 8 +- .../world/inventory/CraftingMenu.cpp | 17 ++- .../minecraft/world/inventory/CraftingMenu.h | 4 + .../world/inventory/EnchantmentContainer.cpp | 2 +- .../world/inventory/EnchantmentContainer.h | 2 +- .../world/inventory/EnchantmentMenu.cpp | 26 +++- .../world/inventory/EnchantmentMenu.h | 7 + .../world/inventory/FireworksMenu.cpp | 17 ++- .../minecraft/world/inventory/FireworksMenu.h | 4 + .../minecraft/world/inventory/FurnaceMenu.cpp | 18 ++- .../minecraft/world/inventory/FurnaceMenu.h | 3 + .../world/inventory/FurnaceResultSlot.cpp | 20 ++- .../world/inventory/FurnaceResultSlot.h | 5 + .../minecraft/world/inventory/HopperMenu.cpp | 7 +- .../minecraft/world/inventory/HopperMenu.h | 3 + .../world/inventory/HorseInventoryMenu.cpp | 11 +- .../world/inventory/HorseInventoryMenu.h | 4 + .../world/inventory/InventoryMenu.cpp | 18 ++- .../minecraft/world/inventory/InventoryMenu.h | 4 + .../minecraft/world/inventory/MenuBackup.cpp | 7 +- .../minecraft/world/inventory/MenuBackup.h | 5 + .../world/inventory/MerchantContainer.cpp | 6 +- .../world/inventory/MerchantContainer.h | 8 +- .../world/inventory/MerchantMenu.cpp | 15 +- .../minecraft/world/inventory/MerchantMenu.h | 5 + .../world/inventory/MerchantResultSlot.cpp | 12 +- .../world/inventory/MerchantResultSlot.h | 4 + .../inventory/PlayerEnderChestContainer.cpp | 6 +- .../inventory/PlayerEnderChestContainer.h | 2 +- .../world/inventory/RepairContainer.cpp | 4 +- .../world/inventory/RepairContainer.h | 4 +- .../world/inventory/RepairResultSlot.cpp | 15 +- .../world/inventory/RepairResultSlot.h | 3 + .../world/inventory/ResultContainer.cpp | 2 - .../world/inventory/ResultContainer.h | 8 +- .../minecraft/world/inventory/ResultSlot.cpp | 16 +- .../minecraft/world/inventory/ResultSlot.h | 5 + .../net/minecraft/world/inventory/Slot.cpp | 14 +- .../net/minecraft/world/inventory/Slot.h | 6 + .../minecraft/world/inventory/TrapMenu.cpp | 10 +- .../net/minecraft/world/inventory/TrapMenu.h | 3 + .../minecraft/world/item/AnvilTileItem.cpp | 5 +- .../net/minecraft/world/item/AnvilTileItem.h | 2 + .../net/minecraft/world/item/ArmorItem.cpp | 32 +++- .../net/minecraft/world/item/ArmorItem.h | 9 +- .../minecraft/world/item/AuxDataTileItem.cpp | 4 +- .../net/minecraft/world/item/BedItem.cpp | 20 ++- .../net/minecraft/world/item/BoatItem.cpp | 14 +- .../net/minecraft/world/item/BookItem.cpp | 4 +- .../net/minecraft/world/item/BottleItem.cpp | 16 +- .../net/minecraft/world/item/BowItem.cpp | 24 ++- .../net/minecraft/world/item/BowItem.h | 4 + .../net/minecraft/world/item/BowlFoodItem.cpp | 8 +- .../net/minecraft/world/item/BucketItem.cpp | 36 +++-- .../world/item/CarrotOnAStickItem.cpp | 14 +- .../net/minecraft/world/item/ClockItem.cpp | 8 +- .../net/minecraft/world/item/ClockItem.h | 5 + .../net/minecraft/world/item/CoalItem.cpp | 8 +- .../minecraft/world/item/ColoredTileItem.cpp | 7 +- .../minecraft/world/item/ColoredTileItem.h | 4 + .../net/minecraft/world/item/CompassItem.cpp | 8 +- .../net/minecraft/world/item/CompassItem.h | 5 + .../net/minecraft/world/item/ComplexItem.cpp | 7 +- .../net/minecraft/world/item/ComplexItem.h | 3 + .../net/minecraft/world/item/DiggerItem.cpp | 14 +- .../net/minecraft/world/item/DiggerItem.h | 4 + .../net/minecraft/world/item/DoorItem.cpp | 21 +-- .../net/minecraft/world/item/DoorItem.h | 1 + .../minecraft/world/item/DyePowderItem.cpp | 20 +-- .../net/minecraft/world/item/EggItem.cpp | 21 ++- .../net/minecraft/world/item/EmptyMapItem.cpp | 11 +- .../world/item/EnchantedBookItem.cpp | 15 +- .../minecraft/world/item/EnchantedBookItem.h | 10 ++ .../net/minecraft/world/item/EnderEyeItem.cpp | 28 ++-- .../minecraft/world/item/EnderpearlItem.cpp | 15 +- .../minecraft/world/item/ExperienceItem.cpp | 16 +- .../minecraft/world/item/FireChargeItem.cpp | 20 ++- .../net/minecraft/world/item/FireChargeItem.h | 1 + .../world/item/FireworksChargeItem.cpp | 4 +- .../minecraft/world/item/FireworksItem.cpp | 8 +- .../minecraft/world/item/FishingRodItem.cpp | 26 ++-- .../net/minecraft/world/item/FishingRodItem.h | 1 + .../world/item/FlintAndSteelItem.cpp | 20 +-- .../net/minecraft/world/item/FoodItem.cpp | 21 ++- .../net/minecraft/world/item/FoodItem.h | 4 + .../minecraft/world/item/GoldenAppleItem.cpp | 10 +- .../world/item/HangingEntityItem.cpp | 20 +-- .../net/minecraft/world/item/HatchetItem.cpp | 10 +- .../net/minecraft/world/item/HatchetItem.h | 4 + .../net/minecraft/world/item/HoeItem.cpp | 12 +- .../net/minecraft/world/item/Item.cpp | 26 ++-- .../net/minecraft/world/item/Item.h | 2 +- .../net/minecraft/world/item/ItemInstance.cpp | 48 ++++-- .../net/minecraft/world/item/ItemInstance.h | 2 +- .../net/minecraft/world/item/LeafTileItem.cpp | 11 +- .../net/minecraft/world/item/LeashItem.cpp | 18 ++- .../net/minecraft/world/item/LeashItem.h | 5 + .../net/minecraft/world/item/MapItem.cpp | 39 +++-- .../net/minecraft/world/item/MapItem.h | 5 + .../minecraft/world/item/MilkBucketItem.cpp | 10 +- .../net/minecraft/world/item/MilkBucketItem.h | 1 + .../net/minecraft/world/item/MinecartItem.cpp | 21 ++- .../net/minecraft/world/item/MinecartItem.h | 4 +- .../world/item/MultiTextureTileItem.cpp | 9 +- .../net/minecraft/world/item/NameTagItem.cpp | 10 +- .../net/minecraft/world/item/PickaxeItem.cpp | 9 +- .../net/minecraft/world/item/PickaxeItem.h | 4 + .../minecraft/world/item/PistonTileItem.cpp | 5 +- .../minecraft/world/item/PlanterTileItem.cpp | 19 ++- .../minecraft/world/item/PlanterTileItem.h | 2 + .../net/minecraft/world/item/PotionItem.cpp | 24 +-- .../net/minecraft/world/item/Rarity.cpp | 2 - .../net/minecraft/world/item/Rarity.h | 4 + .../minecraft/world/item/RecordingItem.cpp | 25 ++- .../net/minecraft/world/item/RecordingItem.h | 3 + .../net/minecraft/world/item/RedStoneItem.cpp | 15 +- .../net/minecraft/world/item/SaddleItem.cpp | 11 +- .../minecraft/world/item/SaplingTileItem.cpp | 7 +- .../net/minecraft/world/item/SeedFoodItem.cpp | 11 +- .../net/minecraft/world/item/SeedItem.cpp | 10 +- .../net/minecraft/world/item/ShearsItem.cpp | 8 +- .../net/minecraft/world/item/ShovelItem.cpp | 7 +- .../net/minecraft/world/item/ShovelItem.h | 4 + .../net/minecraft/world/item/SignItem.cpp | 18 ++- .../minecraft/world/item/SimpleFoiledItem.cpp | 3 +- .../net/minecraft/world/item/SkullItem.cpp | 14 +- .../net/minecraft/world/item/SnowItem.cpp | 14 +- .../net/minecraft/world/item/SnowItem.h | 2 + .../net/minecraft/world/item/SnowballItem.cpp | 18 ++- .../net/minecraft/world/item/SpawnEggItem.cpp | 20 +-- .../world/item/StoneSlabTileItem.cpp | 17 ++- .../minecraft/world/item/StoneSlabTileItem.h | 9 +- .../net/minecraft/world/item/TileItem.cpp | 26 ++-- .../net/minecraft/world/item/TileItem.h | 4 + .../world/item/WaterLilyTileItem.cpp | 16 +- .../net/minecraft/world/item/WeaponItem.cpp | 16 +- .../net/minecraft/world/item/WeaponItem.h | 2 + .../net/minecraft/world/item/WoolTileItem.cpp | 4 +- .../world/item/alchemy/PotionBrewing.cpp | 6 +- .../world/item/crafting/ArmorDyeRecipe.cpp | 19 ++- .../world/item/crafting/ArmorDyeRecipe.h | 5 + .../world/item/crafting/ArmorRecipes.cpp | 12 +- .../world/item/crafting/ArmorRecipes.h | 6 + .../world/item/crafting/ClothDyeRecipes.cpp | 11 +- .../world/item/crafting/ClothDyeRecipes.h | 2 + .../world/item/crafting/FireworksRecipe.cpp | 12 +- .../world/item/crafting/FireworksRecipe.h | 5 + .../world/item/crafting/FoodRecipes.cpp | 9 +- .../world/item/crafting/FoodRecipes.h | 2 + .../world/item/crafting/FurnaceRecipes.cpp | 10 +- .../world/item/crafting/FurnaceRecipes.h | 4 + .../world/item/crafting/OreRecipes.cpp | 10 +- .../world/item/crafting/OreRecipes.h | 5 + .../minecraft/world/item/crafting/Recipes.cpp | 45 ++++-- .../minecraft/world/item/crafting/Recipes.h | 12 +- .../minecraft/world/item/crafting/Recipy.h | 2 +- .../world/item/crafting/ShapedRecipy.cpp | 12 +- .../world/item/crafting/ShapedRecipy.h | 7 + .../world/item/crafting/ShapelessRecipy.cpp | 13 +- .../world/item/crafting/ShapelessRecipy.h | 6 + .../world/item/crafting/StructureRecipes.cpp | 13 +- .../world/item/crafting/StructureRecipes.h | 2 + .../world/item/crafting/ToolRecipes.cpp | 11 +- .../world/item/crafting/ToolRecipes.h | 4 + .../world/item/crafting/WeaponRecipes.cpp | 9 +- .../world/item/crafting/WeaponRecipes.h | 6 + .../enchantment/ArrowDamageEnchantment.cpp | 2 +- .../item/enchantment/ArrowFireEnchantment.cpp | 2 +- .../enchantment/ArrowInfiniteEnchantment.cpp | 2 +- .../enchantment/ArrowKnockbackEnchantment.cpp | 2 +- .../item/enchantment/DamageEnchantment.cpp | 6 +- .../enchantment/DigDurabilityEnchantment.cpp | 4 +- .../item/enchantment/DiggingEnchantment.cpp | 4 +- .../world/item/enchantment/Enchantment.cpp | 4 +- .../item/enchantment/EnchantmentCategory.cpp | 7 +- .../item/enchantment/EnchantmentHelper.cpp | 23 ++- .../item/enchantment/EnchantmentHelper.h | 6 + .../item/enchantment/EnchantmentInstance.cpp | 5 +- .../item/enchantment/EnchantmentInstance.h | 5 +- .../enchantment/FireAspectEnchantment.cpp | 2 +- .../item/enchantment/KnockbackEnchantment.cpp | 2 +- .../item/enchantment/LootBonusEnchantment.cpp | 2 +- .../item/enchantment/OxygenEnchantment.cpp | 2 +- .../enchantment/ProtectionEnchantment.cpp | 6 +- .../item/enchantment/ThornsEnchantment.cpp | 8 +- .../enchantment/UntouchingEnchantment.cpp | 4 +- .../enchantment/WaterWorkerEnchantment.cpp | 2 +- .../world/item/net.minecraft.world.item.h | 4 +- .../world/item/trading/MerchantRecipe.cpp | 6 +- .../world/item/trading/MerchantRecipe.h | 8 + .../world/item/trading/MerchantRecipeList.cpp | 12 +- .../world/item/trading/MerchantRecipeList.h | 2 + .../minecraft/world/level/BaseMobSpawner.cpp | 22 ++- .../minecraft/world/level/BaseMobSpawner.h | 11 +- .../world/level/BlockDestructionProgress.cpp | 1 - .../net/minecraft/world/level/Calendar.cpp | 4 +- .../net/minecraft/world/level/ChunkPos.cpp | 13 +- .../net/minecraft/world/level/Explosion.cpp | 31 ++-- .../net/minecraft/world/level/Explosion.h | 11 +- .../minecraft/world/level/FoliageColor.cpp | 3 +- .../net/minecraft/world/level/GameRules.cpp | 4 +- .../net/minecraft/world/level/GameRules.h | 3 + .../net/minecraft/world/level/GrassColor.cpp | 1 - .../net/minecraft/world/level/Level.cpp | 143 ++++++++---------- .../net/minecraft/world/level/Level.h | 35 ++++- .../world/level/LevelConflictException.cpp | 2 +- .../net/minecraft/world/level/LevelListener.h | 4 +- .../minecraft/world/level/LevelSettings.cpp | 5 +- .../net/minecraft/world/level/LevelSettings.h | 4 +- .../net/minecraft/world/level/LevelType.cpp | 6 +- .../net/minecraft/world/level/LevelType.h | 2 + .../net/minecraft/world/level/MobSpawner.cpp | 39 ++--- .../net/minecraft/world/level/MobSpawner.h | 14 +- .../minecraft/world/level/PortalForcer.cpp | 17 ++- .../net/minecraft/world/level/PortalForcer.h | 9 ++ .../net/minecraft/world/level/Region.cpp | 18 ++- .../net/minecraft/world/level/Region.h | 6 + .../world/level/TickNextTickData.cpp | 5 +- .../minecraft/world/level/TickNextTickData.h | 1 + .../minecraft/world/level/TileEventData.cpp | 2 - .../net/minecraft/world/level/TilePos.cpp | 8 +- .../net/minecraft/world/level/WaterColor.cpp | 2 - .../world/level/biome/BeachBiome.cpp | 6 +- .../minecraft/world/level/biome/BeachBiome.h | 1 + .../net/minecraft/world/level/biome/Biome.cpp | 44 ++++-- .../net/minecraft/world/level/biome/Biome.h | 6 +- .../world/level/biome/BiomeCache.cpp | 5 +- .../minecraft/world/level/biome/BiomeCache.h | 8 + .../world/level/biome/BiomeDecorator.cpp | 26 +++- .../world/level/biome/BiomeSource.cpp | 8 +- .../minecraft/world/level/biome/BiomeSource.h | 2 +- .../world/level/biome/DesertBiome.cpp | 17 ++- .../minecraft/world/level/biome/DesertBiome.h | 1 + .../world/level/biome/ExtremeHillsBiome.cpp | 11 +- .../world/level/biome/ExtremeHillsBiome.h | 3 + .../world/level/biome/FixedBiomeSource.cpp | 7 +- .../world/level/biome/FixedBiomeSource.h | 5 + .../world/level/biome/ForestBiome.cpp | 13 +- .../minecraft/world/level/biome/ForestBiome.h | 1 + .../minecraft/world/level/biome/HellBiome.cpp | 5 +- .../minecraft/world/level/biome/HellBiome.h | 1 + .../minecraft/world/level/biome/IceBiome.cpp | 1 - .../minecraft/world/level/biome/IceBiome.h | 1 + .../world/level/biome/JungleBiome.cpp | 23 ++- .../minecraft/world/level/biome/JungleBiome.h | 1 + .../world/level/biome/MushroomIslandBiome.cpp | 8 +- .../world/level/biome/MushroomIslandBiome.h | 1 + .../world/level/biome/PlainsBiome.cpp | 9 +- .../minecraft/world/level/biome/PlainsBiome.h | 1 + .../world/level/biome/RainforestBiome.cpp | 5 +- .../world/level/biome/RainforestBiome.h | 1 + .../world/level/biome/SwampBiome.cpp | 11 +- .../minecraft/world/level/biome/SwampBiome.h | 2 + .../world/level/biome/TaigaBiome.cpp | 11 +- .../minecraft/world/level/biome/TaigaBiome.h | 1 + .../world/level/biome/TheEndBiome.cpp | 8 +- .../minecraft/world/level/biome/TheEndBiome.h | 1 + .../level/biome/TheEndBiomeDecorator.cpp | 10 +- .../world/level/biome/WaterlilyFeature.cpp | 6 +- .../world/level/biome/WaterlilyFeature.h | 2 +- .../biome/net.minecraft.world.level.biome.h | 2 +- .../world/level/chunk/BlockReplacements.cpp | 5 +- .../world/level/chunk/BlockReplacements.h | 3 + .../minecraft/world/level/chunk/ChunkSource.h | 2 +- .../level/chunk/CompressedTileStorage.cpp | 12 +- .../world/level/chunk/CompressedTileStorage.h | 7 + .../minecraft/world/level/chunk/DataLayer.cpp | 1 - .../minecraft/world/level/chunk/DataLayer.h | 4 + .../world/level/chunk/EmptyLevelChunk.cpp | 10 +- .../world/level/chunk/EmptyLevelChunk.h | 11 +- .../world/level/chunk/LevelChunk.cpp | 59 ++++++-- .../minecraft/world/level/chunk/LevelChunk.h | 34 ++++- .../world/level/chunk/ReadOnlyChunkCache.cpp | 7 +- .../world/level/chunk/ReadOnlyChunkCache.h | 11 +- .../world/level/chunk/SparseDataStorage.cpp | 10 +- .../world/level/chunk/SparseDataStorage.h | 5 + .../world/level/chunk/SparseLightStorage.cpp | 10 +- .../world/level/chunk/SparseLightStorage.h | 5 + .../world/level/chunk/WaterLevelChunk.cpp | 11 +- .../world/level/chunk/WaterLevelChunk.h | 10 +- .../storage/ChunkStorageProfileDecorator.cpp | 5 +- .../storage/ChunkStorageProfileDecorator.h | 2 + .../chunk/storage/McRegionChunkStorage.cpp | 34 ++++- .../chunk/storage/McRegionChunkStorage.h | 12 +- .../chunk/storage/MemoryChunkStorage.cpp | 6 +- .../level/chunk/storage/MemoryChunkStorage.h | 2 +- .../world/level/chunk/storage/NbtSlotFile.cpp | 2 +- .../level/chunk/storage/OldChunkStorage.cpp | 37 ++++- .../level/chunk/storage/OldChunkStorage.h | 10 +- .../world/level/chunk/storage/RegionFile.cpp | 34 ++--- .../world/level/chunk/storage/RegionFile.h | 10 +- .../level/chunk/storage/RegionFileCache.cpp | 10 +- .../level/chunk/storage/RegionFileCache.h | 9 ++ .../world/level/chunk/storage/ZoneFile.cpp | 2 +- .../world/level/chunk/storage/ZoneIo.cpp | 2 +- .../level/chunk/storage/ZonedChunkStorage.cpp | 10 +- .../level/chunk/storage/ZonedChunkStorage.h | 2 +- .../world/level/dimension/Dimension.cpp | 30 ++-- .../world/level/dimension/Dimension.h | 14 +- .../world/level/dimension/HellDimension.cpp | 20 ++- .../world/level/dimension/HellDimension.h | 2 + .../world/level/dimension/TheEndDimension.cpp | 17 ++- .../world/level/dimension/TheEndDimension.h | 2 + .../world/level/levelgen/CanyonFeature.cpp | 14 +- .../world/level/levelgen/CanyonFeature.h | 4 + .../level/levelgen/CustomLevelSource.cpp | 35 +++-- .../world/level/levelgen/CustomLevelSource.h | 13 +- .../world/level/levelgen/DungeonFeature.cpp | 10 +- .../world/level/levelgen/DungeonFeature.h | 4 + .../world/level/levelgen/FlatLevelSource.cpp | 19 ++- .../world/level/levelgen/FlatLevelSource.h | 10 +- .../level/levelgen/HellFlatLevelSource.cpp | 18 ++- .../level/levelgen/HellFlatLevelSource.h | 24 ++- .../level/levelgen/HellRandomLevelSource.cpp | 31 +++- .../level/levelgen/HellRandomLevelSource.h | 30 ++-- .../world/level/levelgen/LargeCaveFeature.cpp | 12 +- .../world/level/levelgen/LargeCaveFeature.h | 4 + .../world/level/levelgen/LargeFeature.cpp | 12 +- .../world/level/levelgen/LargeFeature.h | 2 +- .../level/levelgen/LargeHellCaveFeature.cpp | 10 +- .../level/levelgen/LargeHellCaveFeature.h | 4 + .../level/levelgen/RandomLevelSource.cpp | 35 +++-- .../world/level/levelgen/RandomLevelSource.h | 11 +- .../levelgen/TheEndLevelRandomLevelSource.cpp | 21 +-- .../levelgen/TheEndLevelRandomLevelSource.h | 12 +- .../levelgen/feature/BasicTreeFeature.cpp | 16 +- .../level/levelgen/feature/BasicTreeFeature.h | 3 + .../level/levelgen/feature/BirchFeature.cpp | 13 +- .../levelgen/feature/BonusChestFeature.cpp | 13 +- .../levelgen/feature/BonusChestFeature.h | 4 + .../level/levelgen/feature/CactusFeature.cpp | 6 +- .../level/levelgen/feature/CaveFeature.cpp | 15 +- .../level/levelgen/feature/CaveFeature.h | 2 +- .../level/levelgen/feature/ClayFeature.cpp | 8 +- .../level/levelgen/feature/ClayFeature.h | 2 +- .../levelgen/feature/DeadBushFeature.cpp | 6 +- .../levelgen/feature/DesertWellFeature.cpp | 6 +- .../levelgen/feature/EndPodiumFeature.cpp | 8 +- .../world/level/levelgen/feature/Feature.cpp | 7 +- .../world/level/levelgen/feature/Feature.h | 1 + .../level/levelgen/feature/FlowerFeature.cpp | 10 +- .../levelgen/feature/GroundBushFeature.cpp | 9 +- .../levelgen/feature/HellFireFeature.cpp | 6 +- .../levelgen/feature/HellPortalFeature.cpp | 6 +- .../levelgen/feature/HellSpringFeature.cpp | 5 +- .../level/levelgen/feature/HouseFeature.cpp | 13 +- .../level/levelgen/feature/HouseFeature.h | 2 +- .../levelgen/feature/HugeMushroomFeature.cpp | 7 +- .../level/levelgen/feature/LakeFeature.cpp | 12 +- .../level/levelgen/feature/LakeFeature.h | 2 +- .../levelgen/feature/LightGemFeature.cpp | 6 +- .../levelgen/feature/MegaTreeFeature.cpp | 14 +- .../level/levelgen/feature/MegaTreeFeature.h | 3 + .../levelgen/feature/MonsterRoomFeature.cpp | 20 ++- .../levelgen/feature/MonsterRoomFeature.h | 5 +- .../levelgen/feature/NetherSphereFeature.cpp | 3 +- .../levelgen/feature/NetherSphereFeature.h | 6 +- .../level/levelgen/feature/OreFeature.cpp | 12 +- .../level/levelgen/feature/PineFeature.cpp | 12 +- .../level/levelgen/feature/PumpkinFeature.cpp | 6 +- .../level/levelgen/feature/ReedsFeature.cpp | 9 +- .../level/levelgen/feature/ReedsFeature.h | 2 +- .../level/levelgen/feature/SandFeature.cpp | 9 +- .../level/levelgen/feature/SandFeature.h | 1 + .../level/levelgen/feature/SpikeFeature.cpp | 8 +- .../level/levelgen/feature/SpringFeature.cpp | 7 +- .../level/levelgen/feature/SpruceFeature.cpp | 13 +- .../levelgen/feature/SwampTreeFeature.cpp | 13 +- .../level/levelgen/feature/SwampTreeFeature.h | 2 + .../levelgen/feature/TallGrassFeature.cpp | 6 +- .../level/levelgen/feature/TreeFeature.cpp | 14 +- .../level/levelgen/feature/TreeFeature.h | 2 + .../level/levelgen/feature/VinesFeature.cpp | 9 +- .../level/levelgen/flat/FlatGeneratorInfo.cpp | 8 +- .../level/levelgen/flat/FlatGeneratorInfo.h | 5 + .../level/levelgen/flat/FlatLayerInfo.cpp | 3 +- .../world/level/levelgen/flat/FlatLayerInfo.h | 2 + .../levelgen/structure/BlockGenMethods.cpp | 8 +- .../levelgen/structure/BlockGenMethods.h | 5 +- .../level/levelgen/structure/BoundingBox.cpp | 11 +- .../level/levelgen/structure/BoundingBox.h | 2 +- .../levelgen/structure/MineShaftFeature.cpp | 18 ++- .../levelgen/structure/MineShaftFeature.h | 4 + .../levelgen/structure/MineShaftPieces.cpp | 33 ++-- .../levelgen/structure/MineShaftPieces.h | 9 ++ .../levelgen/structure/MineShaftStart.cpp | 11 +- .../level/levelgen/structure/MineShaftStart.h | 4 + .../structure/NetherBridgeFeature.cpp | 18 ++- .../levelgen/structure/NetherBridgeFeature.h | 12 +- .../levelgen/structure/NetherBridgePieces.cpp | 26 ++-- .../levelgen/structure/NetherBridgePieces.h | 11 ++ .../structure/RandomScatteredLargeFeature.cpp | 16 +- .../structure/RandomScatteredLargeFeature.h | 11 ++ .../structure/ScatteredFeaturePieces.cpp | 39 +++-- .../structure/ScatteredFeaturePieces.h | 7 + .../levelgen/structure/SkyIslandDimension.cpp | 10 +- .../levelgen/structure/StrongholdFeature.cpp | 28 +++- .../levelgen/structure/StrongholdFeature.h | 15 +- .../levelgen/structure/StrongholdPieces.cpp | 39 +++-- .../levelgen/structure/StrongholdPieces.h | 11 ++ .../levelgen/structure/StructureFeature.cpp | 25 ++- .../levelgen/structure/StructureFeature.h | 2 +- .../levelgen/structure/StructureFeatureIO.cpp | 23 ++- .../structure/StructureFeatureSavedData.cpp | 6 +- .../structure/StructureFeatureSavedData.h | 2 +- .../levelgen/structure/StructurePiece.cpp | 39 +++-- .../level/levelgen/structure/StructurePiece.h | 2 +- .../levelgen/structure/StructureStart.cpp | 14 +- .../level/levelgen/structure/StructureStart.h | 10 +- .../levelgen/structure/VillageFeature.cpp | 21 ++- .../level/levelgen/structure/VillageFeature.h | 9 ++ .../levelgen/structure/VillagePieces.cpp | 32 ++-- .../level/levelgen/structure/VillagePieces.h | 11 ++ .../world/level/levelgen/synth/Distort.cpp | 2 +- .../world/level/levelgen/synth/Emboss.cpp | 2 +- .../world/level/levelgen/synth/FastNoise.cpp | 2 +- .../world/level/levelgen/synth/FastNoise.h | 6 + .../level/levelgen/synth/ImprovedNoise.cpp | 4 +- .../level/levelgen/synth/ImprovedNoise.h | 4 + .../level/levelgen/synth/PerlinNoise.cpp | 7 +- .../world/level/levelgen/synth/PerlinNoise.h | 6 + .../levelgen/synth/PerlinSimplexNoise.cpp | 3 +- .../level/levelgen/synth/PerlinSimplexNoise.h | 6 + .../world/level/levelgen/synth/Rotate.cpp | 4 +- .../world/level/levelgen/synth/Scale.cpp | 2 +- .../level/levelgen/synth/SimplexNoise.cpp | 5 +- .../world/level/levelgen/synth/SimplexNoise.h | 4 + .../world/level/levelgen/synth/Synth.cpp | 1 - .../world/level/levelgen/synth/Synth.h | 3 + .../world/level/material/Material.cpp | 2 +- .../minecraft/world/level/material/Material.h | 1 + .../world/level/material/MaterialColor.cpp | 1 - .../world/level/material/MaterialColor.h | 2 + .../level/newbiome/layer/AddIslandLayer.cpp | 11 +- .../level/newbiome/layer/AddIslandLayer.h | 3 + .../newbiome/layer/AddMushroomIslandLayer.cpp | 11 +- .../newbiome/layer/AddMushroomIslandLayer.h | 3 + .../level/newbiome/layer/AddSnowLayer.cpp | 11 +- .../world/level/newbiome/layer/AddSnowLayer.h | 3 + .../level/newbiome/layer/BiomeInitLayer.cpp | 7 +- .../level/newbiome/layer/BiomeInitLayer.h | 5 + .../newbiome/layer/BiomeOverrideLayer.cpp | 11 +- .../level/newbiome/layer/BiomeOverrideLayer.h | 3 + .../level/newbiome/layer/DownfallLayer.cpp | 10 +- .../level/newbiome/layer/DownfallLayer.h | 2 + .../newbiome/layer/DownfallMixerLayer.cpp | 10 +- .../level/newbiome/layer/DownfallMixerLayer.h | 2 + .../world/level/newbiome/layer/FlatLayer.cpp | 7 +- .../level/newbiome/layer/FuzzyZoomLayer.cpp | 11 +- .../level/newbiome/layer/FuzzyZoomLayer.h | 3 + .../layer/GrowMushroomIslandLayer.cpp | 11 +- .../newbiome/layer/GrowMushroomIslandLayer.h | 3 + .../level/newbiome/layer/IslandLayer.cpp | 8 +- .../world/level/newbiome/layer/IslandLayer.h | 2 + .../world/level/newbiome/layer/Layer.cpp | 28 +++- .../world/level/newbiome/layer/Layer.h | 7 +- .../level/newbiome/layer/RegionHillsLayer.cpp | 6 +- .../level/newbiome/layer/RegionHillsLayer.h | 3 + .../level/newbiome/layer/RiverInitLayer.cpp | 9 +- .../level/newbiome/layer/RiverInitLayer.h | 3 + .../world/level/newbiome/layer/RiverLayer.cpp | 11 +- .../world/level/newbiome/layer/RiverLayer.h | 3 + .../level/newbiome/layer/RiverMixerLayer.cpp | 11 +- .../level/newbiome/layer/RiverMixerLayer.h | 3 + .../world/level/newbiome/layer/ShoreLayer.cpp | 11 +- .../world/level/newbiome/layer/ShoreLayer.h | 3 + .../level/newbiome/layer/SmoothLayer.cpp | 9 +- .../world/level/newbiome/layer/SmoothLayer.h | 3 + .../level/newbiome/layer/SmoothZoomLayer.cpp | 11 +- .../level/newbiome/layer/SmoothZoomLayer.h | 3 + .../level/newbiome/layer/SwampRiversLayer.cpp | 6 +- .../level/newbiome/layer/SwampRiversLayer.h | 3 + .../level/newbiome/layer/TemperatureLayer.cpp | 10 +- .../level/newbiome/layer/TemperatureLayer.h | 2 + .../newbiome/layer/TemperatureMixerLayer.cpp | 10 +- .../newbiome/layer/TemperatureMixerLayer.h | 2 + .../level/newbiome/layer/VoronoiZoom.cpp | 11 +- .../world/level/newbiome/layer/VoronoiZoom.h | 3 + .../world/level/newbiome/layer/ZoomLayer.cpp | 11 +- .../world/level/newbiome/layer/ZoomLayer.h | 3 + .../world/level/pathfinder/BinaryHeap.cpp | 9 +- .../world/level/pathfinder/BinaryHeap.h | 6 +- .../minecraft/world/level/pathfinder/Node.cpp | 10 +- .../minecraft/world/level/pathfinder/Node.h | 4 + .../minecraft/world/level/pathfinder/Path.cpp | 6 +- .../minecraft/world/level/pathfinder/Path.h | 9 ++ .../world/level/pathfinder/PathFinder.cpp | 17 ++- .../world/level/pathfinder/PathFinder.h | 7 + .../world/level/redstone/Redstone.cpp | 2 - .../level/saveddata/MapItemSavedData.cpp | 18 ++- .../world/level/saveddata/MapItemSavedData.h | 13 +- .../world/level/saveddata/SavedData.cpp | 5 +- .../world/level/storage/DerivedLevelData.cpp | 6 +- .../world/level/storage/DerivedLevelData.h | 7 + .../level/storage/DirectoryLevelStorage.cpp | 47 ++++-- .../level/storage/DirectoryLevelStorage.h | 11 +- .../storage/DirectoryLevelStorageSource.cpp | 18 ++- .../storage/DirectoryLevelStorageSource.h | 3 + .../world/level/storage/LevelData.cpp | 17 ++- .../minecraft/world/level/storage/LevelData.h | 7 +- .../world/level/storage/LevelStorage.cpp | 2 - .../world/level/storage/LevelStorage.h | 8 +- .../storage/LevelStorageProfilerDecorator.cpp | 10 +- .../storage/LevelStorageProfilerDecorator.h | 2 + .../world/level/storage/LevelStorageSource.h | 2 +- .../world/level/storage/LevelSummary.cpp | 1 - .../world/level/storage/LevelSummary.h | 3 + .../level/storage/McRegionLevelStorage.cpp | 19 ++- .../level/storage/McRegionLevelStorage.h | 5 + .../storage/McRegionLevelStorageSource.cpp | 12 +- .../storage/McRegionLevelStorageSource.h | 5 + .../level/storage/MemoryLevelStorage.cpp | 12 +- .../world/level/storage/MemoryLevelStorage.h | 12 +- .../storage/MemoryLevelStorageSource.cpp | 4 +- .../level/storage/MockedLevelStorage.cpp | 8 +- .../world/level/storage/MockedLevelStorage.h | 5 +- .../world/level/storage/SavedDataStorage.cpp | 28 +++- .../world/level/storage/SavedDataStorage.h | 12 +- .../minecraft/world/level/tile/AirTile.cpp | 3 +- .../net/minecraft/world/level/tile/AirTile.h | 2 +- .../minecraft/world/level/tile/AnvilTile.cpp | 12 +- .../world/level/tile/BaseEntityTile.cpp | 11 +- .../world/level/tile/BaseEntityTile.h | 1 + .../level/tile/BasePressurePlateTile.cpp | 21 +-- .../world/level/tile/BasePressurePlateTile.h | 7 + .../world/level/tile/BaseRailTile.cpp | 14 +- .../minecraft/world/level/tile/BaseRailTile.h | 10 +- .../minecraft/world/level/tile/BeaconTile.cpp | 13 +- .../minecraft/world/level/tile/BedTile.cpp | 14 +- .../world/level/tile/BookshelfTile.cpp | 7 +- .../world/level/tile/BookshelfTile.h | 2 +- .../world/level/tile/BrewingStandTile.cpp | 27 +++- .../world/level/tile/BrewingStandTile.h | 2 + .../minecraft/world/level/tile/ButtonTile.cpp | 23 ++- .../minecraft/world/level/tile/ButtonTile.h | 4 +- .../minecraft/world/level/tile/CactusTile.cpp | 20 ++- .../minecraft/world/level/tile/CactusTile.h | 5 +- .../minecraft/world/level/tile/CakeTile.cpp | 22 ++- .../net/minecraft/world/level/tile/CakeTile.h | 7 +- .../minecraft/world/level/tile/CarrotTile.cpp | 9 +- .../minecraft/world/level/tile/CarrotTile.h | 2 + .../world/level/tile/CauldronTile.cpp | 26 +++- .../minecraft/world/level/tile/CauldronTile.h | 3 + .../minecraft/world/level/tile/ChestTile.cpp | 22 +-- .../minecraft/world/level/tile/ChestTile.h | 2 +- .../minecraft/world/level/tile/ClayTile.cpp | 5 +- .../net/minecraft/world/level/tile/ClayTile.h | 2 +- .../minecraft/world/level/tile/CocoaTile.cpp | 26 +++- .../minecraft/world/level/tile/CocoaTile.h | 6 + .../world/level/tile/ColoredTile.cpp | 10 +- .../minecraft/world/level/tile/ColoredTile.h | 3 + .../world/level/tile/CommandBlock.cpp | 16 +- .../world/level/tile/ComparatorTile.cpp | 23 ++- .../world/level/tile/ComparatorTile.h | 5 + .../minecraft/world/level/tile/CoralTile.cpp | 5 +- .../minecraft/world/level/tile/CoralTile.h | 2 +- .../minecraft/world/level/tile/CropTile.cpp | 18 ++- .../net/minecraft/world/level/tile/CropTile.h | 3 +- .../world/level/tile/DaylightDetectorTile.cpp | 21 ++- .../world/level/tile/DaylightDetectorTile.h | 5 + .../world/level/tile/DeadBushTile.cpp | 15 +- .../world/level/tile/DetectorRailTile.cpp | 29 ++-- .../world/level/tile/DetectorRailTile.h | 1 + .../minecraft/world/level/tile/DiodeTile.cpp | 24 ++- .../minecraft/world/level/tile/DiodeTile.h | 1 + .../world/level/tile/DirectionalTile.cpp | 5 +- .../world/level/tile/DirectionalTile.h | 2 + .../minecraft/world/level/tile/DirtTile.cpp | 3 +- .../world/level/tile/DispenserTile.cpp | 39 +++-- .../world/level/tile/DispenserTile.h | 13 +- .../minecraft/world/level/tile/DoorTile.cpp | 20 ++- .../net/minecraft/world/level/tile/DoorTile.h | 9 +- .../world/level/tile/DropperTile.cpp | 24 ++- .../minecraft/world/level/tile/DropperTile.h | 2 + .../minecraft/world/level/tile/EggTile.cpp | 14 +- .../net/minecraft/world/level/tile/EggTile.h | 2 + .../world/level/tile/EnchantmentTableTile.cpp | 18 ++- .../world/level/tile/EnchantmentTableTile.h | 4 + .../world/level/tile/EnderChestTile.cpp | 23 ++- .../minecraft/world/level/tile/FarmTile.cpp | 20 ++- .../net/minecraft/world/level/tile/FarmTile.h | 4 +- .../world/level/tile/FenceGateTile.cpp | 17 ++- .../world/level/tile/FenceGateTile.h | 2 + .../minecraft/world/level/tile/FenceTile.cpp | 10 +- .../minecraft/world/level/tile/FenceTile.h | 8 +- .../minecraft/world/level/tile/FireTile.cpp | 29 ++-- .../net/minecraft/world/level/tile/FireTile.h | 8 +- .../world/level/tile/FlowerPotTile.cpp | 16 +- .../world/level/tile/FlowerPotTile.h | 3 + .../world/level/tile/FurnaceTile.cpp | 33 ++-- .../minecraft/world/level/tile/FurnaceTile.h | 2 + .../minecraft/world/level/tile/GlassTile.cpp | 6 +- .../minecraft/world/level/tile/GlassTile.h | 1 + .../world/level/tile/GlowstoneTile.cpp | 8 +- .../world/level/tile/GlowstoneTile.h | 1 + .../minecraft/world/level/tile/GrassTile.cpp | 21 ++- .../minecraft/world/level/tile/GrassTile.h | 2 + .../minecraft/world/level/tile/GravelTile.cpp | 5 +- .../world/level/tile/HalfSlabTile.cpp | 12 +- .../minecraft/world/level/tile/HalfSlabTile.h | 4 + .../world/level/tile/HalfTransparentTile.cpp | 8 +- .../world/level/tile/HalfTransparentTile.h | 3 + .../world/level/tile/HayBlockTile.cpp | 7 +- .../minecraft/world/level/tile/HeavyTile.cpp | 8 +- .../minecraft/world/level/tile/HeavyTile.h | 3 + .../minecraft/world/level/tile/HopperTile.cpp | 24 ++- .../minecraft/world/level/tile/HopperTile.h | 7 + .../world/level/tile/HugeMushroomTile.cpp | 8 +- .../world/level/tile/HugeMushroomTile.h | 5 + .../minecraft/world/level/tile/IceTile.cpp | 21 ++- .../world/level/tile/JukeboxTile.cpp | 21 ++- .../minecraft/world/level/tile/JukeboxTile.h | 8 +- .../minecraft/world/level/tile/LadderTile.cpp | 10 +- .../minecraft/world/level/tile/LadderTile.h | 4 +- .../minecraft/world/level/tile/LeafTile.cpp | 12 +- .../minecraft/world/level/tile/LeverTile.cpp | 17 ++- .../minecraft/world/level/tile/LeverTile.h | 4 + .../minecraft/world/level/tile/LiquidTile.cpp | 29 ++-- .../minecraft/world/level/tile/LiquidTile.h | 9 +- .../world/level/tile/LiquidTileDynamic.cpp | 9 +- .../world/level/tile/LiquidTileDynamic.h | 4 + .../world/level/tile/LiquidTileStatic.cpp | 8 +- .../world/level/tile/LiquidTileStatic.h | 2 + .../world/level/tile/LockedChestTile.cpp | 5 +- .../minecraft/world/level/tile/MelonTile.cpp | 12 +- .../minecraft/world/level/tile/MelonTile.h | 2 + .../minecraft/world/level/tile/MetalTile.cpp | 3 +- .../world/level/tile/MobSpawnerTile.cpp | 11 +- .../world/level/tile/MushroomPlantTile.cpp | 10 +- .../world/level/tile/MushroomPlantTile.h | 1 + .../minecraft/world/level/tile/MycelTile.cpp | 14 +- .../minecraft/world/level/tile/MycelTile.h | 2 + .../world/level/tile/NetherWartTile.cpp | 16 +- .../world/level/tile/NetherWartTile.h | 3 + .../world/level/tile/NetherrackTile.cpp | 3 +- .../world/level/tile/NotGateTile.cpp | 14 +- .../minecraft/world/level/tile/NotGateTile.h | 5 + .../world/level/tile/NoteBlockTile.cpp | 14 +- .../world/level/tile/ObsidianTile.cpp | 3 +- .../minecraft/world/level/tile/OreTile.cpp | 9 +- .../minecraft/world/level/tile/PlantTile.cpp | 10 +- .../minecraft/world/level/tile/PlantTile.h | 5 +- .../minecraft/world/level/tile/PortalTile.cpp | 23 ++- .../minecraft/world/level/tile/PortalTile.h | 5 +- .../minecraft/world/level/tile/PotatoTile.cpp | 14 +- .../minecraft/world/level/tile/PotatoTile.h | 2 + .../world/level/tile/PoweredMetalTile.cpp | 4 +- .../world/level/tile/PoweredRailTile.cpp | 9 +- .../world/level/tile/PoweredRailTile.h | 3 + .../world/level/tile/PressurePlateTile.cpp | 18 ++- .../world/level/tile/PressurePlateTile.h | 4 + .../world/level/tile/PumpkinTile.cpp | 23 ++- .../minecraft/world/level/tile/PumpkinTile.h | 3 + .../world/level/tile/QuartzBlockTile.cpp | 12 +- .../minecraft/world/level/tile/RailTile.cpp | 7 +- .../net/minecraft/world/level/tile/RailTile.h | 2 + .../world/level/tile/RedStoneDustTile.cpp | 34 +++-- .../world/level/tile/RedStoneDustTile.h | 8 +- .../world/level/tile/RedStoneOreTile.cpp | 12 +- .../world/level/tile/RedStoneOreTile.h | 1 + .../world/level/tile/RedlightTile.cpp | 10 +- .../minecraft/world/level/tile/ReedTile.cpp | 14 +- .../net/minecraft/world/level/tile/ReedTile.h | 4 +- .../world/level/tile/RepeaterTile.cpp | 15 +- .../world/level/tile/RotatedPillarTile.cpp | 10 +- .../world/level/tile/RotatedPillarTile.h | 3 + .../world/level/tile/SandStoneTile.cpp | 8 +- .../world/level/tile/SaplingPlantTile.cpp | 8 +- .../minecraft/world/level/tile/SignTile.cpp | 18 ++- .../net/minecraft/world/level/tile/SignTile.h | 10 +- .../minecraft/world/level/tile/SkullTile.cpp | 16 +- .../world/level/tile/SmoothStoneBrickTile.cpp | 4 +- .../minecraft/world/level/tile/SnowTile.cpp | 9 +- .../world/level/tile/SoulSandTile.cpp | 10 +- .../minecraft/world/level/tile/SoulSandTile.h | 2 +- .../minecraft/world/level/tile/SpongeTile.cpp | 5 +- .../world/level/tile/StainedGlassBlock.cpp | 11 +- .../world/level/tile/StainedGlassBlock.h | 3 + .../level/tile/StainedGlassPaneBlock.cpp | 11 +- .../world/level/tile/StainedGlassPaneBlock.h | 2 + .../minecraft/world/level/tile/StairTile.cpp | 14 +- .../minecraft/world/level/tile/StairTile.h | 3 + .../minecraft/world/level/tile/StemTile.cpp | 18 ++- .../net/minecraft/world/level/tile/StemTile.h | 7 + .../world/level/tile/StoneButtonTile.cpp | 5 +- .../world/level/tile/StoneMonsterTile.cpp | 6 +- .../world/level/tile/StoneSlabTile.cpp | 8 +- .../minecraft/world/level/tile/StoneTile.cpp | 3 +- .../world/level/tile/TallGrassPlantTile.cpp | 12 +- .../level/tile/TheEndPortalFrameTile.cpp | 17 ++- .../world/level/tile/TheEndPortalFrameTile.h | 4 + .../world/level/tile/ThinFenceTile.cpp | 11 +- .../world/level/tile/ThinFenceTile.h | 8 +- .../net/minecraft/world/level/tile/Tile.cpp | 34 ++--- .../net/minecraft/world/level/tile/Tile.h | 8 +- .../minecraft/world/level/tile/TntTile.cpp | 27 +++- .../net/minecraft/world/level/tile/TntTile.h | 7 + .../world/level/tile/TopSnowTile.cpp | 21 ++- .../minecraft/world/level/tile/TopSnowTile.h | 3 + .../minecraft/world/level/tile/TorchTile.cpp | 14 +- .../minecraft/world/level/tile/TorchTile.h | 5 +- .../world/level/tile/TransparentTile.cpp | 6 +- .../world/level/tile/TransparentTile.h | 2 + .../world/level/tile/TrapDoorTile.cpp | 17 ++- .../minecraft/world/level/tile/TrapDoorTile.h | 4 + .../minecraft/world/level/tile/TreeTile.cpp | 10 +- .../world/level/tile/TripWireSourceTile.cpp | 17 ++- .../world/level/tile/TripWireSourceTile.h | 4 + .../world/level/tile/TripWireTile.cpp | 21 ++- .../minecraft/world/level/tile/TripWireTile.h | 5 + .../minecraft/world/level/tile/VineTile.cpp | 25 ++- .../net/minecraft/world/level/tile/VineTile.h | 5 +- .../minecraft/world/level/tile/WallTile.cpp | 10 +- .../world/level/tile/WaterLilyTile.cpp | 18 ++- .../world/level/tile/WaterLilyTile.h | 3 + .../minecraft/world/level/tile/WebTile.cpp | 12 +- .../level/tile/WeightedPressurePlateTile.cpp | 19 ++- .../level/tile/WeightedPressurePlateTile.h | 4 + .../world/level/tile/WoodButtonTile.cpp | 5 +- .../world/level/tile/WoodSlabTile.cpp | 10 +- .../minecraft/world/level/tile/WoodTile.cpp | 12 +- .../world/level/tile/WoolCarpetTile.cpp | 12 +- .../world/level/tile/WoolCarpetTile.h | 4 + .../world/level/tile/WorkbenchTile.cpp | 14 +- .../world/level/tile/WorkbenchTile.h | 1 + .../level/tile/entity/BeaconTileEntity.cpp | 16 +- .../level/tile/entity/BeaconTileEntity.h | 2 +- .../tile/entity/BrewingStandTileEntity.cpp | 12 +- .../tile/entity/BrewingStandTileEntity.h | 2 +- .../level/tile/entity/ChestTileEntity.cpp | 22 +-- .../world/level/tile/entity/ChestTileEntity.h | 2 +- .../level/tile/entity/CommandBlockEntity.cpp | 14 +- .../level/tile/entity/CommandBlockEntity.h | 9 +- .../tile/entity/ComparatorTileEntity.cpp | 5 +- .../level/tile/entity/ComparatorTileEntity.h | 1 + .../entity/DaylightDetectorTileEntity.cpp | 9 +- .../tile/entity/DaylightDetectorTileEntity.h | 3 + .../level/tile/entity/DispenserTileEntity.cpp | 10 +- .../level/tile/entity/DispenserTileEntity.h | 2 +- .../level/tile/entity/DropperTileEntity.cpp | 2 +- .../entity/EnchantmentTableTileEntity.cpp | 6 +- .../tile/entity/EnderChestTileEntity.cpp | 10 +- .../level/tile/entity/EnderChestTileEntity.h | 5 + .../level/tile/entity/FurnaceTileEntity.cpp | 16 +- .../level/tile/entity/FurnaceTileEntity.h | 4 +- .../world/level/tile/entity/Hopper.h | 2 +- .../level/tile/entity/HopperTileEntity.cpp | 18 +-- .../tile/entity/MobSpawnerTileEntity.cpp | 12 +- .../level/tile/entity/MobSpawnerTileEntity.h | 5 +- .../level/tile/entity/MusicTileEntity.cpp | 14 +- .../world/level/tile/entity/MusicTileEntity.h | 5 + .../tile/entity/PistonMovingTileEntity.cpp | 16 +- .../tile/entity/PistonMovingTileEntity.h | 9 +- .../tile/entity/PistonPieceTileEntity.cpp | 18 ++- .../level/tile/entity/PistonPieceTileEntity.h | 1 + .../level/tile/entity/SignTileEntity.cpp | 18 +-- .../world/level/tile/entity/SignTileEntity.h | 6 + .../level/tile/entity/SkullTileEntity.cpp | 9 +- .../world/level/tile/entity/SkullTileEntity.h | 3 + .../level/tile/entity/TheEndPortalTile.cpp | 23 ++- .../level/tile/entity/TheEndPortalTile.h | 7 +- .../tile/entity/TheEndPortalTileEntity.cpp | 4 +- .../tile/entity/TheEndPortalTileEntity.h | 1 + .../world/level/tile/entity/TileEntity.cpp | 30 +++- .../world/level/tile/entity/TileEntity.h | 9 +- .../tile/net.minecraft.world.level.tile.h | 6 +- .../level/tile/piston/PistonBaseTile.cpp | 30 ++-- .../world/level/tile/piston/PistonBaseTile.h | 9 +- .../level/tile/piston/PistonExtensionTile.cpp | 12 +- .../level/tile/piston/PistonExtensionTile.h | 6 +- .../net.minecraft.world.level.tile.piston.h | 4 +- .../net/minecraft/world/phys/AABB.cpp | 9 +- .../net/minecraft/world/phys/AABB.h | 2 +- .../net/minecraft/world/phys/HitResult.cpp | 4 +- .../net/minecraft/world/phys/HitResult.h | 5 + .../net/minecraft/world/phys/Vec3.cpp | 8 +- .../net/minecraft/world/scores/Objective.cpp | 3 +- .../net/minecraft/world/scores/Objective.h | 2 + .../net/minecraft/world/scores/PlayerTeam.cpp | 4 +- .../net/minecraft/world/scores/PlayerTeam.h | 3 + .../net/minecraft/world/scores/Score.cpp | 8 +- .../net/minecraft/world/scores/Score.h | 5 + .../net/minecraft/world/scores/Scoreboard.cpp | 4 +- .../net/minecraft/world/scores/Scoreboard.h | 8 + .../net/minecraft/world/scores/Team.cpp | 2 - .../net/minecraft/world/scores/Team.h | 2 + .../world/scores/criteria/DummyCriteria.cpp | 3 +- .../world/scores/criteria/DummyCriteria.h | 2 + .../world/scores/criteria/HealthCriteria.cpp | 8 +- .../world/scores/criteria/HealthCriteria.h | 2 + .../scores/criteria/ObjectiveCriteria.cpp | 4 +- .../world/scores/criteria/ObjectiveCriteria.h | 7 + 1404 files changed, 10023 insertions(+), 4292 deletions(-) diff --git a/minecraft/Minecraft.World/ConsoleHelpers/C4JThread.cpp b/minecraft/Minecraft.World/ConsoleHelpers/C4JThread.cpp index 76b99dc33..d1f482465 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/C4JThread.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/C4JThread.cpp @@ -1,17 +1,20 @@ -#include "../Header Files/stdafx.h" - -#include "C4JThread.h" - +#include #include #include #include #include -#include #include #include #include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include #if defined(_WIN32) #include @@ -27,6 +30,8 @@ #endif #include "Minecraft.Client/Common/ShutdownManager.h" +#include "Minecraft.World/ConsoleHelpers/C4JThread.h" +#include "Minecraft.World/ConsoleHelpers/C4JThread.h" thread_local C4JThread* C4JThread::ms_currentThread = nullptr; diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp index 9c277509b..8e6895c51 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp @@ -1,9 +1,9 @@ -#include "../../Header Files/stdafx.h" -#include "../../net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" -#include "../../net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" +#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" #include "ConsoleSaveFileIO.h" #include "ConsoleSaveFileConverter.h" -#include "../../net/minecraft/util/ProgressListener.h" +#include "Minecraft.World/net/minecraft/util/ProgressListener.h" void ConsoleSaveFileConverter::ProcessSimpleFile(ConsoleSaveFile* sourceSave, FileEntry* sourceFileEntry, diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp index 36f0500eb..0e0e43910 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp @@ -1,9 +1,12 @@ -#include "../../Header Files/stdafx.h" +#include +#include +#include -#include "java/File.h" #include "ConsoleSaveFile.h" #include "ConsoleSaveFileInputStream.h" +class ConsoleSavePath; + ConsoleSaveFileInputStream::ConsoleSaveFileInputStream( ConsoleSaveFile* saveFile, const ConsoleSavePath& file) { m_saveFile = saveFile; diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h index f9705ef48..71520bebb 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h @@ -2,8 +2,9 @@ // 4J Stu - Implements the Java InputStream but rather than writing directly to // disc it writes through the save file -#include "java/InputOutputStream/InputStream.h" +#include +#include "java/InputOutputStream/InputStream.h" #include "ConsoleSavePath.h" class ConsoleSaveFile; diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp index ec44dd71c..18cfdac2e 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp @@ -1,21 +1,36 @@ -#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include -#include "../../Header Files/stdafx.h" -#include "../StringHelpers.h" -#include "../../Header Files/PortableFileIO.h" +#include "Minecraft.World/Header Files/PortableFileIO.h" #include "ConsoleSaveFileOriginal.h" #include "java/File.h" -#include -#include -#include "../../Header Files/compression.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" -#include "../../net/minecraft/world/level/net.minecraft.world.level.h" -#include "../../net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" #include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "../../net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" +#include "4J.Common/4J_Compat.h" +#include "4J_Storage.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "compression.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "java/System.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h" +#include "Minecraft.World/x64headers/extraX64.h" #define RESERVE_ALLOCATION MEM_RESERVE #define COMMIT_ALLOCATION MEM_COMMIT diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h index 3109a4e58..d6b7cd8e7 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h @@ -1,9 +1,12 @@ #pragma once #include +#include #include "FileHeader.h" #include "ConsoleSavePath.h" #include "ConsoleSaveFile.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" class ConsoleSaveFileOriginal : public ConsoleSaveFile { private: diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp index 49944f0e1..b5d8dd198 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp @@ -1,9 +1,12 @@ -#include "../../Header Files/stdafx.h" -#include "java/File.h" -#include "ConsoleSaveFileOutputStream.h" +#include +#include +#include +#include "ConsoleSaveFileOutputStream.h" #include "ConsoleSaveFile.h" +class ConsoleSavePath; + // Creates a file output stream to write to the file represented by the // specified File object. A new FileDescriptor object is created to represent // this file connection. First, if there is a security manager, its checkWrite diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h index 3ca2d7c82..bd9cb796f 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h @@ -2,8 +2,9 @@ // 4J Stu - Implements the Java InputStream but rather than writing directly to // disc it writes through the save file -#include "java/InputOutputStream/OutputStream.h" +#include +#include "java/InputOutputStream/OutputStream.h" #include "ConsoleSavePath.h" class ConsoleSaveFile; diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index e71a95302..5476291ff 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -1,20 +1,40 @@ +#include +#include +#include +#include #include #include +#include +#include +#include +#include -#include "../../Header Files/stdafx.h" -#include "../StringHelpers.h" -#include "../../Header Files/PortableFileIO.h" +#include "Minecraft.World/Header Files/PortableFileIO.h" #include "ConsoleSaveFileSplit.h" #include "ConsoleSaveFileConverter.h" #include "java/File.h" -#include "../../Header Files/compression.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" -#include "../../net/minecraft/world/level/net.minecraft.world.level.h" -#include "../../net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" #include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "../../net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" +#include "4J.Common/4J_Compat.h" +#include "4J_Storage.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "compression.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "java/System.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h" +#include "Minecraft.World/x64headers/extraX64.h" + +class ProgressListener; #define RESERVE_ALLOCATION MEM_RESERVE #define COMMIT_ALLOCATION MEM_COMMIT diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.h b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.h index dc42f5564..11678bd3d 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.h +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.h @@ -1,11 +1,18 @@ #pragma once #include +#include +#include +#include +#include #include "FileHeader.h" #include "ConsoleSavePath.h" #include "ConsoleSaveFile.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" class ProgressRenderer; +class ProgressListener; class ConsoleSaveFileSplit : public ConsoleSaveFile { private: diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.cpp index b998ff3f2..e02b16982 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.cpp @@ -1,8 +1,22 @@ -#include "../../Header Files/stdafx.h" -#include "FileHeader.h" // #define _DEBUG_FILE_HEADER +#include +#include +#include +#include +#include +#include +#include +#include + +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/System.h" + extern CConsoleMinecraftApp app; FileHeader::FileHeader() { diff --git a/minecraft/Minecraft.World/ConsoleHelpers/PerformanceTimer.cpp b/minecraft/Minecraft.World/ConsoleHelpers/PerformanceTimer.cpp index 02aed2672..36e036059 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/PerformanceTimer.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/PerformanceTimer.cpp @@ -1,5 +1,10 @@ -#include "../Header Files/stdafx.h" -#include "PerformanceTimer.h" + +#include +#include + +#include "Minecraft.World/ConsoleHelpers/PerformanceTimer.h" +#include "Minecraft.World/ConsoleHelpers/PerformanceTimer.h" +#include "Minecraft.Client/Linux/Linux_App.h" PerformanceTimer::PerformanceTimer() { Reset(); } diff --git a/minecraft/Minecraft.World/ConsoleHelpers/StringHelpers.cpp b/minecraft/Minecraft.World/ConsoleHelpers/StringHelpers.cpp index 2486f4de1..2555bc8b4 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/StringHelpers.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/StringHelpers.cpp @@ -1,4 +1,4 @@ -#include "../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "simdutf.h" std::wstring toLower(const std::wstring& a) { diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ThreadName.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ThreadName.cpp index 32848d3d8..59877b8b7 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ThreadName.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/ThreadName.cpp @@ -1,4 +1,3 @@ -#include "../Header Files/stdafx.h" #include // From Xbox documentation diff --git a/minecraft/Minecraft.World/Header Files/PortableFileIO.h b/minecraft/Minecraft.World/Header Files/PortableFileIO.h index 02a576c45..f9c2c2037 100644 --- a/minecraft/Minecraft.World/Header Files/PortableFileIO.h +++ b/minecraft/Minecraft.World/Header Files/PortableFileIO.h @@ -4,7 +4,7 @@ #include #include -#include "../ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" namespace PortableFileIO { enum class BinaryReadStatus { diff --git a/minecraft/Minecraft.World/Header Files/compression.h b/minecraft/Minecraft.World/Header Files/compression.h index 82cf5b46e..8b3a56576 100644 --- a/minecraft/Minecraft.World/Header Files/compression.h +++ b/minecraft/Minecraft.World/Header Files/compression.h @@ -1,6 +1,6 @@ #pragma once #include -#include "../ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" class Compression { public: diff --git a/minecraft/Minecraft.World/Header Files/stdafx.h b/minecraft/Minecraft.World/Header Files/stdafx.h index 9b2839035..36fd77438 100644 --- a/minecraft/Minecraft.World/Header Files/stdafx.h +++ b/minecraft/Minecraft.World/Header Files/stdafx.h @@ -26,7 +26,7 @@ #include -#include "../x64headers/extraX64.h" +#include "Minecraft.World/x64headers/extraX64.h" #include #include @@ -44,17 +44,17 @@ #include -#include "../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" #include "java/Class.h" #include "java/Exceptions.h" -#include "../net/minecraft/util/Mth.h" -#include "../ConsoleHelpers/StringHelpers.h" -#include "../ConsoleHelpers/ArrayWithLength.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" #include "java/Random.h" -#include "../net/minecraft/world/level/TilePos.h" -#include "../net/minecraft/world/level/ChunkPos.h" -#include "../Header Files/compression.h" -#include "../ConsoleHelpers/PerformanceTimer.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" +#include "Minecraft.World/Header Files/compression.h" +#include "Minecraft.World/ConsoleHelpers/PerformanceTimer.h" #ifdef _FINAL_BUILD #define printf BREAKTHECOMPILE diff --git a/minecraft/Minecraft.World/Source Files/Minecraft.World.cpp b/minecraft/Minecraft.World/Source Files/Minecraft.World.cpp index da9877fb7..b2fafb16f 100644 --- a/minecraft/Minecraft.World/Source Files/Minecraft.World.cpp +++ b/minecraft/Minecraft.World/Source Files/Minecraft.World.cpp @@ -1,23 +1,43 @@ -#include "../Header Files/stdafx.h" - -#include "../net/minecraft/world/item/net.minecraft.world.item.h" -#include "../net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" -#include "../net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h" -#include "../net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" -#include "../net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "../net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" -#include "../net/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h" -#include "../net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "../net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "../net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "../net/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" -#include "../net/minecraft/world/effect/net.minecraft.world.effect.h" - -#include "../Header Files/Minecraft.World.h" +#include "Minecraft.World/Header Files/Minecraft.World.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" - -#include "../net/minecraft/stats/CommonStats.h" +#include "Minecraft.World/net/minecraft/stats/CommonStats.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/stats/Stats.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" +#include "Minecraft.World/net/minecraft/world/entity/MobCategory.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/EnderMan.h" +#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" +#include "Minecraft.World/net/minecraft/world/item/HatchetItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/PickaxeItem.h" +#include "Minecraft.World/net/minecraft/world/item/ShovelItem.h" +#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" +#include "Minecraft.World/net/minecraft/world/level/LevelType.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/BlockReplacements.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/material/MaterialColor.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" void MinecraftWorld_RunStaticCtors() { // The ordering of these static ctors can be important. If they are within diff --git a/minecraft/Minecraft.World/Source Files/compression.cpp b/minecraft/Minecraft.World/Source Files/compression.cpp index a990b0b19..298ef008b 100644 --- a/minecraft/Minecraft.World/Source Files/compression.cpp +++ b/minecraft/Minecraft.World/Source Files/compression.cpp @@ -1,5 +1,13 @@ -#include "../Header Files/stdafx.h" -#include "../Header Files/compression.h" +#include +#include +#include +#include +#include + +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "compression.h" +#include "Minecraft.World/x64headers/extraX64.h" #if defined(_WIN64) || defined(__linux__) // zconf.h defines "typedef unsigned char Byte" which conflicts with the // project's "class Byte" from BasicTypeContainers.h (via stdafx.h). @@ -7,6 +15,7 @@ // under that alias; Bytef (= Byte FAR) will resolve to zlib_Byte as well. #define Byte zlib_Byte #include + #undef Byte #endif diff --git a/minecraft/Minecraft.World/net/minecraft/Direction.cpp b/minecraft/Minecraft.World/net/minecraft/Direction.cpp index ca3ece296..d055be3d1 100644 --- a/minecraft/Minecraft.World/net/minecraft/Direction.cpp +++ b/minecraft/Minecraft.World/net/minecraft/Direction.cpp @@ -1,6 +1,6 @@ -#include "../../Header Files/stdafx.h" #include "Direction.h" #include "Facing.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" const int Direction::STEP_X[] = {0, -1, 0, 1}; diff --git a/minecraft/Minecraft.World/net/minecraft/Direction.h b/minecraft/Minecraft.World/net/minecraft/Direction.h index 9204bb6a8..2fe738673 100644 --- a/minecraft/Minecraft.World/net/minecraft/Direction.h +++ b/minecraft/Minecraft.World/net/minecraft/Direction.h @@ -1,5 +1,7 @@ #pragma once +#include + class Direction { public: static const int UNDEFINED = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/Facing.cpp b/minecraft/Minecraft.World/net/minecraft/Facing.cpp index d5b9f9fc4..7f9a4d1bc 100644 --- a/minecraft/Minecraft.World/net/minecraft/Facing.cpp +++ b/minecraft/Minecraft.World/net/minecraft/Facing.cpp @@ -1,4 +1,3 @@ -#include "../../Header Files/stdafx.h" #include "Facing.h" const int Facing::OPPOSITE_FACING[6] = {UP, DOWN, SOUTH, NORTH, EAST, WEST}; diff --git a/minecraft/Minecraft.World/net/minecraft/Facing.h b/minecraft/Minecraft.World/net/minecraft/Facing.h index 5f4ce831e..71c1e8f37 100644 --- a/minecraft/Minecraft.World/net/minecraft/Facing.h +++ b/minecraft/Minecraft.World/net/minecraft/Facing.h @@ -1,5 +1,7 @@ #pragma once +#include + class Facing { public: static const int DOWN = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/Pos.cpp b/minecraft/Minecraft.World/net/minecraft/Pos.cpp index 181523e6d..567c03f6e 100644 --- a/minecraft/Minecraft.World/net/minecraft/Pos.cpp +++ b/minecraft/Minecraft.World/net/minecraft/Pos.cpp @@ -1,6 +1,9 @@ -#include "../../Header Files/stdafx.h" -#include "Pos.h" + +#include + +#include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.World/net/minecraft/Pos.h" Pos::Pos() { x = y = z = 0; } diff --git a/minecraft/Minecraft.World/net/minecraft/SharedConstants.cpp b/minecraft/Minecraft.World/net/minecraft/SharedConstants.cpp index c75af697d..7b824ecb4 100644 --- a/minecraft/Minecraft.World/net/minecraft/SharedConstants.cpp +++ b/minecraft/Minecraft.World/net/minecraft/SharedConstants.cpp @@ -1,7 +1,8 @@ -#include "../../Header Files/stdafx.h" -#include "java/File.h" -#include "java/InputOutputStream/InputOutputStream.h" -#include "SharedConstants.h" + +#include + +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" const std::wstring SharedConstants::VERSION_STRING = L"1.6.4"; const bool SharedConstants::TEXTURE_LIGHTING = true; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/AdminLogCommand.h b/minecraft/Minecraft.World/net/minecraft/commands/AdminLogCommand.h index eff1abaf2..11d0c81c2 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/AdminLogCommand.h +++ b/minecraft/Minecraft.World/net/minecraft/commands/AdminLogCommand.h @@ -1,6 +1,6 @@ #pragma once -#include "../network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" class CommandSender; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/Command.cpp b/minecraft/Minecraft.World/net/minecraft/commands/Command.cpp index f3fbb64c1..1b530ada2 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/Command.cpp +++ b/minecraft/Minecraft.World/net/minecraft/commands/Command.cpp @@ -1,9 +1,9 @@ -#include "../../../Header Files/stdafx.h" -#include "net.minecraft.commands.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/PlayerList.h" -#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "Command.h" +#include "Minecraft.World/net/minecraft/commands/AdminLogCommand.h" +#include "Minecraft.World/net/minecraft/commands/CommandSender.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" AdminLogCommand* Command::logger; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/Command.h b/minecraft/Minecraft.World/net/minecraft/commands/Command.h index 7b2c87adf..29b6cb5aa 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/Command.h +++ b/minecraft/Minecraft.World/net/minecraft/commands/Command.h @@ -2,8 +2,14 @@ // 4J Stu - Based loosely on the Java versions +#include +#include +#include +#include + #include "CommandsEnum.h" -#include "../network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "4J.Common/4J_Compat.h" class AdminLogCommand; class CommandSender; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.cpp b/minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.cpp index 7f451b2fd..d88c96a21 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.cpp +++ b/minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.cpp @@ -1,6 +1,10 @@ -#include "../../../Header Files/stdafx.h" -#include "net.minecraft.commands.h" +#include +#include + #include "CommandDispatcher.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/commands/Command.h" +#include "Minecraft.World/net/minecraft/commands/CommandSender.h" int CommandDispatcher::performCommand(std::shared_ptr sender, EGameCommand command, diff --git a/minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.h b/minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.h index 44359a21e..21c6c1150 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.h +++ b/minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.h @@ -1,5 +1,13 @@ #pragma once +#include +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" + class Command; class CommandSender; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/CommandSender.h b/minecraft/Minecraft.World/net/minecraft/commands/CommandSender.h index 287f4fe8a..f263bc12e 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/CommandSender.h +++ b/minecraft/Minecraft.World/net/minecraft/commands/CommandSender.h @@ -1,7 +1,7 @@ #pragma once #include "CommandsEnum.h" -#include "../network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" class CommandSender { public: diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.cpp b/minecraft/Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.cpp index 0bb81fad1..456e1bd0a 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.cpp +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.cpp @@ -1,5 +1,5 @@ -#include "../../../../Header Files/stdafx.h" -#include "../net.minecraft.commands.h" +#include + #include "DefaultGameModeCommand.h" EGameCommand DefaultGameModeCommand::getId() { diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.h b/minecraft/Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.h index 76ea4f93d..04f1e49c7 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.h +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "GameModeCommand.h" +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" class GameType; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/EffectCommand.cpp b/minecraft/Minecraft.World/net/minecraft/commands/common/EffectCommand.cpp index 709f08ab0..f65bfd7b0 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/EffectCommand.cpp +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/EffectCommand.cpp @@ -1,6 +1,12 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.commands.common.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" + +#include +#include +#include + +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "Minecraft.World/net/minecraft/commands/common/EffectCommand.h" + +class CommandSender; EGameCommand EffectCommand::getId() { return eGameCommand_Effect; } diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/EffectCommand.h b/minecraft/Minecraft.World/net/minecraft/commands/common/EffectCommand.h index 94c891b16..f7b58640d 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/EffectCommand.h +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/EffectCommand.h @@ -1,6 +1,12 @@ #pragma once -#include "../Command.h" +#include +#include + +#include "Minecraft.World/net/minecraft/commands/Command.h" +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" + +class CommandSender; class EffectCommand : public Command { public: diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.cpp b/minecraft/Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.cpp index 038e3eded..5ac60aa28 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.cpp +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.cpp @@ -1,9 +1,20 @@ -#include "../../../../Header Files/stdafx.h" -#include "../../network/packet/net.minecraft.network.packet.h" -#include "../../world/item/net.minecraft.world.item.h" -#include "../../world/item/enchantment/net.minecraft.world.item.enchantment.h" +#include +#include + #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "EnchantItemCommand.h" +#include "4J.Common/4J_Compat.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/ByteArrayOutputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" EGameCommand EnchantItemCommand::getId() { return eGameCommand_EnchantItem; } diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.h b/minecraft/Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.h index dde988f66..28ecb336c 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.h +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.h @@ -1,8 +1,13 @@ #pragma once -#include "../Command.h" +#include +#include + +#include "Minecraft.World/net/minecraft/commands/Command.h" +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" class GameCommandPacket; +class Player; class EnchantItemCommand : public Command { public: diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/ExperienceCommand.cpp b/minecraft/Minecraft.World/net/minecraft/commands/common/ExperienceCommand.cpp index fad76a451..1251ba271 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/ExperienceCommand.cpp +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/ExperienceCommand.cpp @@ -1,8 +1,5 @@ -#include "../../../../Header Files/stdafx.h" -#include "../net.minecraft.commands.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/server/PlayerList.h" -#include "../../world/level/net.minecraft.world.level.h" +#include + #include "ExperienceCommand.h" EGameCommand ExperienceCommand::getId() { return eGameCommand_Experience; } diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/ExperienceCommand.h b/minecraft/Minecraft.World/net/minecraft/commands/common/ExperienceCommand.h index 6a1a52383..993e88617 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/ExperienceCommand.h +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/ExperienceCommand.h @@ -1,6 +1,9 @@ #pragma once -#include "../Command.h" +#include + +#include "Minecraft.World/net/minecraft/commands/Command.h" +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" class CommandSender; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/GameModeCommand.cpp b/minecraft/Minecraft.World/net/minecraft/commands/common/GameModeCommand.cpp index 8c40c622e..b84990658 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/GameModeCommand.cpp +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/GameModeCommand.cpp @@ -1,7 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include "../net.minecraft.commands.h" #include "GameModeCommand.h" +class CommandSender; + EGameCommand GameModeCommand::getId() { return eGameCommand_GameMode; } int GameModeCommand::getPermissionLevel() { return LEVEL_GAMEMASTERS; } diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/GameModeCommand.h b/minecraft/Minecraft.World/net/minecraft/commands/common/GameModeCommand.h index 552028bf9..02727ad01 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/GameModeCommand.h +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/GameModeCommand.h @@ -1,8 +1,14 @@ #pragma once -#include "../Command.h" +#include +#include +#include + +#include "Minecraft.World/net/minecraft/commands/Command.h" +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" class GameType; +class CommandSender; class GameModeCommand : public Command { public: diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.cpp b/minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.cpp index 46feb8ed0..90bc22cf5 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.cpp +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.cpp @@ -1,10 +1,18 @@ -#include "../../../../Header Files/stdafx.h" -#include "../net.minecraft.commands.h" -#include "../../world/entity/item/net.minecraft.world.entity.item.h" -#include "../../world/item/net.minecraft.world.item.h" -#include "../../network/packet/net.minecraft.network.packet.h" +#include + #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "GiveItemCommand.h" +#include "4J.Common/4J_Compat.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/ByteArrayOutputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" EGameCommand GiveItemCommand::getId() { return eGameCommand_Give; } diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.h b/minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.h index 31158a1b4..5fab7f622 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.h +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.h @@ -1,8 +1,14 @@ #pragma once -#include "../Command.h" +#include +#include +#include + +#include "Minecraft.World/net/minecraft/commands/Command.h" +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" class GameCommandPacket; +class Player; class GiveItemCommand : public Command { public: diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/KillCommand.cpp b/minecraft/Minecraft.World/net/minecraft/commands/common/KillCommand.cpp index d34a086dc..1306b4aa1 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/KillCommand.cpp +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/KillCommand.cpp @@ -1,9 +1,11 @@ -#include "../../../../Header Files/stdafx.h" -#include "../net.minecraft.commands.h" -#include "../../world/entity/player/net.minecraft.world.entity.player.h" -#include "../../world/damageSource/net.minecraft.world.damagesource.h" -#include "KillCommand.h" #include +#include +#include + +#include "KillCommand.h" +#include "Minecraft.World/net/minecraft/commands/CommandSender.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" EGameCommand KillCommand::getId() { return eGameCommand_Kill; } diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/KillCommand.h b/minecraft/Minecraft.World/net/minecraft/commands/common/KillCommand.h index 5480a593a..b9f6e8ae5 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/KillCommand.h +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/KillCommand.h @@ -1,6 +1,9 @@ #pragma once -#include "../Command.h" +#include + +#include "Minecraft.World/net/minecraft/commands/Command.h" +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" class KillCommand : public Command { public: diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/TimeCommand.cpp b/minecraft/Minecraft.World/net/minecraft/commands/common/TimeCommand.cpp index 149585431..6204242c6 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/TimeCommand.cpp +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/TimeCommand.cpp @@ -1,9 +1,16 @@ -#include "../../../../Header Files/stdafx.h" -#include "../net.minecraft.commands.h" +#include +#include + #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" -#include "../../network/packet/net.minecraft.network.packet.h" #include "TimeCommand.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/ByteArrayOutputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" + +class CommandSender; EGameCommand TimeCommand::getId() { return eGameCommand_Time; } diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/TimeCommand.h b/minecraft/Minecraft.World/net/minecraft/commands/common/TimeCommand.h index ba382affc..7905ee44b 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/TimeCommand.h +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/TimeCommand.h @@ -1,6 +1,13 @@ #pragma once -#include "../Command.h" +#include +#include + +#include "Minecraft.World/net/minecraft/commands/Command.h" +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" + +class CommandSender; class TimeCommand : public Command { public: diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.cpp b/minecraft/Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.cpp index 0963cdf9c..cabc05881 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.cpp +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.cpp @@ -1,11 +1,12 @@ -#include "../../../../Header Files/stdafx.h" +#include +#include + #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" -#include "../net.minecraft.commands.h" -#include "../../world/level/net.minecraft.world.level.h" -#include "../../world/level/storage/net.minecraft.world.level.storage.h" -#include "../../network/packet/net.minecraft.network.packet.h" #include "ToggleDownfallCommand.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" EGameCommand ToggleDownfallCommand::getId() { return eGameCommand_ToggleDownfall; diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.h b/minecraft/Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.h index 414f7920a..12cd7af19 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.h +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.h @@ -1,5 +1,9 @@ #pragma once -#include "../Command.h" +#include +#include + +#include "Minecraft.World/net/minecraft/commands/Command.h" +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" class GameCommandPacket; diff --git a/minecraft/Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.cpp b/minecraft/Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.cpp index 7e318e01c..dad13d99b 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.cpp +++ b/minecraft/Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.cpp @@ -1,11 +1,15 @@ -#include "../../../Header Files/stdafx.h" - #include "AbstractProjectileDispenseBehavior.h" -#include "../world/level/tile/DispenserTile.h" -#include "../world/entity/projectile/Projectile.h" -#include "../world/level/Level.h" -#include "../world/level/tile/LevelEvent.h" -#include "../world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Projectile.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/core/BlockSource.h" +#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h" +#include "Minecraft.World/net/minecraft/core/FacingEnum.h" +#include "Minecraft.World/net/minecraft/core/Position.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" std::shared_ptr AbstractProjectileDispenseBehavior::execute( BlockSource* source, std::shared_ptr dispensed, diff --git a/minecraft/Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.h b/minecraft/Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.h index d8f72e940..da61f6193 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.h +++ b/minecraft/Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "DefaultDispenseItemBehavior.h" class Projectile; class Position; +class Level; class AbstractProjectileDispenseBehavior : public DefaultDispenseItemBehavior { public: diff --git a/minecraft/Minecraft.World/net/minecraft/core/BehaviorRegistry.cpp b/minecraft/Minecraft.World/net/minecraft/core/BehaviorRegistry.cpp index ab046e54e..e91d33a07 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/BehaviorRegistry.cpp +++ b/minecraft/Minecraft.World/net/minecraft/core/BehaviorRegistry.cpp @@ -1,6 +1,9 @@ -#include "../../../Header Files/stdafx.h" +#include #include "BehaviorRegistry.h" +#include "Minecraft.World/net/minecraft/core/DispenseItemBehavior.h" + +class Item; BehaviorRegistry::BehaviorRegistry(DispenseItemBehavior* defaultValue) { defaultBehavior = defaultValue; diff --git a/minecraft/Minecraft.World/net/minecraft/core/BehaviorRegistry.h b/minecraft/Minecraft.World/net/minecraft/core/BehaviorRegistry.h index 23b0161bc..8b7b791b8 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/BehaviorRegistry.h +++ b/minecraft/Minecraft.World/net/minecraft/core/BehaviorRegistry.h @@ -1,7 +1,12 @@ #pragma once +#include + #include "DispenseItemBehavior.h" +class DispenseItemBehavior; +class Item; + class BehaviorRegistry { private: std::unordered_map storage; diff --git a/minecraft/Minecraft.World/net/minecraft/core/BlockSourceImpl.cpp b/minecraft/Minecraft.World/net/minecraft/core/BlockSourceImpl.cpp index 5ff0692b7..fa0acdcb9 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/BlockSourceImpl.cpp +++ b/minecraft/Minecraft.World/net/minecraft/core/BlockSourceImpl.cpp @@ -1,8 +1,8 @@ -#include "../../../Header Files/stdafx.h" +#include + #include "BlockSourceImpl.h" -#include "../world/level/net.minecraft.world.level.h" -#include "../world/level/tile/net.minecraft.world.level.tile.h" -#include "../world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" BlockSourceImpl::BlockSourceImpl(Level* world, int x, int y, int z) { this->world = world; diff --git a/minecraft/Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.cpp b/minecraft/Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.cpp index 6ed45fd23..954fea29f 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.cpp +++ b/minecraft/Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.cpp @@ -1,10 +1,12 @@ -#include "../../../Header Files/stdafx.h" -#include "../net.minecraft.h" -#include "net.minecraft.core.h" -#include "../world/level/tile/net.minecraft.world.level.tile.h" -#include "../world/level/net.minecraft.world.level.h" -#include "../world/entity/item/net.minecraft.world.entity.item.h" #include "DefaultDispenseItemBehavior.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/core/BlockSource.h" +#include "Minecraft.World/net/minecraft/core/FacingEnum.h" +#include "Minecraft.World/net/minecraft/core/Position.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" std::shared_ptr DefaultDispenseItemBehavior::dispense( BlockSource* source, std::shared_ptr dispensed) { diff --git a/minecraft/Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h b/minecraft/Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h index aaafd5607..e7ad77b5e 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h +++ b/minecraft/Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h @@ -1,8 +1,13 @@ #pragma once +#include + #include "DispenseItemBehavior.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" class FacingEnum; class Position; +class BlockSource; +class Level; class DefaultDispenseItemBehavior : public DispenseItemBehavior { protected: diff --git a/minecraft/Minecraft.World/net/minecraft/core/DispenseItemBehavior.cpp b/minecraft/Minecraft.World/net/minecraft/core/DispenseItemBehavior.cpp index fb83cde07..01cc72223 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/DispenseItemBehavior.cpp +++ b/minecraft/Minecraft.World/net/minecraft/core/DispenseItemBehavior.cpp @@ -1,5 +1,3 @@ -#include "../../../Header Files/stdafx.h" - #include "DispenseItemBehavior.h" DispenseItemBehavior* DispenseItemBehavior::NOOP = diff --git a/minecraft/Minecraft.World/net/minecraft/core/DispenseItemBehavior.h b/minecraft/Minecraft.World/net/minecraft/core/DispenseItemBehavior.h index af3904631..0b94cfce0 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/DispenseItemBehavior.h +++ b/minecraft/Minecraft.World/net/minecraft/core/DispenseItemBehavior.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "Behavior.h" class ItemInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/core/FacingEnum.cpp b/minecraft/Minecraft.World/net/minecraft/core/FacingEnum.cpp index dde690db3..e5490c05f 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/FacingEnum.cpp +++ b/minecraft/Minecraft.World/net/minecraft/core/FacingEnum.cpp @@ -1,5 +1,3 @@ -#include "../../../Header Files/stdafx.h" - #include "FacingEnum.h" FacingEnum* FacingEnum::DOWN = new FacingEnum(0, 1, 0, -1, 0); diff --git a/minecraft/Minecraft.World/net/minecraft/core/ItemDispenseBehaviors.cpp b/minecraft/Minecraft.World/net/minecraft/core/ItemDispenseBehaviors.cpp index 6e51efc51..8f604e6fa 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/ItemDispenseBehaviors.cpp +++ b/minecraft/Minecraft.World/net/minecraft/core/ItemDispenseBehaviors.cpp @@ -1,11 +1,39 @@ -#include "../../../Header Files/stdafx.h" -#include "../world/entity/item/net.minecraft.world.entity.item.h" -#include "../world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "../world/level/net.minecraft.world.level.h" -#include "../world/level/tile/net.minecraft.world.level.tile.h" -#include "../world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../world/item/net.minecraft.world.item.h" +#include +#include + #include "ItemDispenseBehaviors.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/core/AbstractProjectileDispenseBehavior.h" +#include "Minecraft.World/net/minecraft/core/BlockSource.h" +#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h" +#include "Minecraft.World/net/minecraft/core/FacingEnum.h" +#include "Minecraft.World/net/minecraft/core/Position.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/item/Boat.h" +#include "Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Snowball.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h" +#include "Minecraft.World/net/minecraft/world/item/BucketItem.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/PotionItem.h" +#include "Minecraft.World/net/minecraft/world/item/SpawnEggItem.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" /* Arrow */ diff --git a/minecraft/Minecraft.World/net/minecraft/locale/I18n.cpp b/minecraft/Minecraft.World/net/minecraft/locale/I18n.cpp index e8f6ff6a4..8c7778c08 100644 --- a/minecraft/Minecraft.World/net/minecraft/locale/I18n.cpp +++ b/minecraft/Minecraft.World/net/minecraft/locale/I18n.cpp @@ -1,4 +1,3 @@ -#include "../../../Header Files/stdafx.h" #include "Language.h" #include "I18n.h" diff --git a/minecraft/Minecraft.World/net/minecraft/locale/I18n.h b/minecraft/Minecraft.World/net/minecraft/locale/I18n.h index f995b7be6..71f5fdac2 100644 --- a/minecraft/Minecraft.World/net/minecraft/locale/I18n.h +++ b/minecraft/Minecraft.World/net/minecraft/locale/I18n.h @@ -1,8 +1,13 @@ #pragma once -#include "../../../Header Files/stdafx.h" +#include +#include + +#include "Minecraft.World/Header Files/stdafx.h" #include "Language.h" +class Language; + class I18n { private: static Language* lang; diff --git a/minecraft/Minecraft.World/net/minecraft/locale/Language.cpp b/minecraft/Minecraft.World/net/minecraft/locale/Language.cpp index 47d81ce59..27057a3e2 100644 --- a/minecraft/Minecraft.World/net/minecraft/locale/Language.cpp +++ b/minecraft/Minecraft.World/net/minecraft/locale/Language.cpp @@ -1,7 +1,13 @@ -#include "../../../Header Files/stdafx.h" +#include +#include +#include +#include +#include + #include "Language.h" #include "java/File.h" #include "java/InputOutputStream/FileInputStream.h" +#include "java/InputOutputStream/InputStream.h" // 4J - TODO - properly implement // 4jcraft: done! diff --git a/minecraft/Minecraft.World/net/minecraft/locale/Language.h b/minecraft/Minecraft.World/net/minecraft/locale/Language.h index 7d1526af6..e8e4273b9 100644 --- a/minecraft/Minecraft.World/net/minecraft/locale/Language.h +++ b/minecraft/Minecraft.World/net/minecraft/locale/Language.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + class Language { private: static Language* singleton; diff --git a/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp b/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp index 75a93091b..d0d5d1e83 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp @@ -1,13 +1,25 @@ -#include -#include +#include +#include +#include -#include "../../../Header Files/stdafx.h" -#include "java/InputOutputStream/InputOutputStream.h" #include "Minecraft.Client/Common/Source Files/Network/Socket.h" #include "Connection.h" -#include "../../../ConsoleHelpers/ThreadName.h" -#include "../../../Header Files/compression.h" #include "Minecraft.Client/Common/ShutdownManager.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h" +#include "compression.h" +#include "java/InputOutputStream/BufferedOutputStream.h" +#include "java/InputOutputStream/ByteArrayOutputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "java/System.h" +#include "Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" +#include "Minecraft.World/x64headers/extraX64.h" + +class SocketAddress; // This should always be enabled, except for debugging use #if !defined(_DEBUG) diff --git a/minecraft/Minecraft.World/net/minecraft/network/Connection.h b/minecraft/Minecraft.World/net/minecraft/network/Connection.h index b058e5268..c917cbbab 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/Connection.h +++ b/minecraft/Minecraft.World/net/minecraft/network/Connection.h @@ -1,16 +1,27 @@ #pragma once -#include "../../../Header Files/stdafx.h" +#include #include +#include +#include +#include + +#include "Minecraft.World/Header Files/stdafx.h" #include "java/System.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "packet/net.minecraft.network.packet.h" -#include "../../../ConsoleHelpers/C4JThread.h" - -#include - +#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" +#include "Minecraft.World/ConsoleHelpers/C4JThread.h" #include "Minecraft.Client/Common/Source Files/Network/Socket.h" +#include "Minecraft.World/ConsoleHelpers/C4JThread.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" + +class DataInputStream; +class DataOutputStream; +class Packet; +class PacketListener; +class SocketAddress; // 4J JEV, size of the threads (bytes). #define READ_STACK_SIZE 0 diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.cpp index a3be0ac5b..3d89313ba 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.cpp @@ -1,11 +1,8 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/entity/net.minecraft.world.entity.h" #include "PacketListener.h" #include "AddEntityPacket.h" -#include +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" void AddEntityPacket::_init(std::shared_ptr e, int type, int data, int xp, int yp, int zp, int yRotp, int xRotp) { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h index afe9c2eaf..11a16de0b 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h @@ -1,6 +1,12 @@ #pragma once +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + +class Entity; class AddEntityPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.cpp index 60e2b762b..160916c92 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.cpp @@ -1,8 +1,9 @@ -#include "../../../../Header Files/stdafx.h" -#include "../../world/entity/net.minecraft.world.entity.h" -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "AddExperienceOrbPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" AddExperienceOrbPacket::AddExperienceOrbPacket() { id = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h index 358703251..6c846b02f 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class ExperienceOrb; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.cpp index 680715f55..4673a6a19 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.cpp @@ -1,11 +1,12 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/entity/net.minecraft.world.entity.h" -#include "../../world/entity/global/net.minecraft.world.entity.global.h" +#include + #include "PacketListener.h" #include "AddGlobalEntityPacket.h" +#include "java/Class.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" const int AddGlobalEntityPacket::LIGHTNING = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.h index 839b4190f..0f33fe2a0 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + +class Entity; class AddGlobalEntityPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.cpp index 429459705..22b5fcbdb 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.cpp @@ -1,9 +1,12 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/entity/net.minecraft.world.entity.h" +#include + #include "PacketListener.h" #include "AddMobPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" AddMobPacket::AddMobPacket() { id = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.h index dbe13d3f0..ddd99eec1 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.h @@ -1,7 +1,12 @@ #pragma once +#include +#include +#include + #include "Packet.h" -#include "../../world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class LivingEntity; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.cpp index 3740b4eee..aab5632c9 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.cpp @@ -1,9 +1,8 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/entity/net.minecraft.world.entity.h" #include "PacketListener.h" #include "AddPaintingPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/entity/Painting.h" AddPaintingPacket::AddPaintingPacket() { id = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h index ad55ae9ac..2291023d2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class Painting; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.cpp index 0c24bd87b..be62a5aa5 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.cpp @@ -1,10 +1,14 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/entity/player/net.minecraft.world.entity.player.h" -#include "../../world/item/net.minecraft.world.item.h" +#include + #include "PacketListener.h" #include "AddPlayerPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/x64headers/extraX64.h" AddPlayerPacket::AddPlayerPacket() { id = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h index 0604ebf44..c6a101494 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h @@ -1,9 +1,14 @@ #pragma once #include +#include +#include +#include #include "Packet.h" -#include "../../world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.cpp index 1d71486b8..0104570c8 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.cpp @@ -1,9 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/entity/net.minecraft.world.entity.h" +#include + #include "PacketListener.h" #include "AnimatePacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" AnimatePacket::AnimatePacket() { id = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.h index c0b511415..c4bddffe1 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + +class Entity; class AnimatePacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.cpp index 75f964cbb..bae0ab80c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.cpp @@ -1,8 +1,9 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" +#include + #include "PacketListener.h" #include "AwardStatPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" AwardStatPacket::AwardStatPacket() { this->m_paramData.clear(); diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.h index 88f71045a..f9ca1a202 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.h @@ -1,6 +1,12 @@ #pragma once +#include +#include +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class AwardStatPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.cpp index f069105bd..af969be5b 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.cpp @@ -1,14 +1,15 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/level/net.minecraft.world.level.h" -#include "../../../../Header Files/compression.h" +#include +#include + #include "PacketListener.h" #include "BlockRegionUpdatePacket.h" -#include "../../world/level/chunk/LevelChunk.h" -#include "../../world/level/chunk/DataLayer.h" -#include "../../world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "compression.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" #define BLOCK_REGION_UPDATE_FULLCHUNK 0x01 #define BLOCK_REGION_UPDATE_ZEROHEIGHT \ diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h index c4cf6d876..3dcc7f131 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h @@ -1,6 +1,11 @@ #pragma once +#include +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.cpp index 82cfd7c3c..2af673e75 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.cpp @@ -1,9 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "../../net.minecraft.h" -#include "../../world/entity/player/net.minecraft.world.entity.player.h" #include "PacketListener.h" #include "ChatPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" // longest allowed string is "<" + name + "> " + message const unsigned int ChatPacket::MAX_LENGTH = diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.h index 7a9d1f446..6156c73d2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.h @@ -1,6 +1,11 @@ #pragma once +#include +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class ChatPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.cpp index be319f9da..f7c164a91 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.cpp @@ -1,11 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/level/net.minecraft.world.level.h" -#include "../../world/level/chunk/net.minecraft.world.level.chunk.h" #include "PacketListener.h" #include "ChunkTilesUpdatePacket.h" -#include "../../world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" ChunkTilesUpdatePacket::~ChunkTilesUpdatePacket() { } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h index 00a292313..f7e533641 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h @@ -1,6 +1,12 @@ #pragma once +#include +#include +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp index 827018c75..93a08b456 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp @@ -1,9 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/level/net.minecraft.world.level.h" #include "PacketListener.h" #include "ChunkVisibilityAreaPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" ChunkVisibilityAreaPacket::ChunkVisibilityAreaPacket() { m_minX = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h index 099adf89f..d9d9c9ba2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.cpp index 527be7808..99e5d665c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "ChunkVisibilityPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" ChunkVisibilityPacket::ChunkVisibilityPacket() { this->shouldDelay = false; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h index 7b308053e..9b81a46ad 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h @@ -1,10 +1,12 @@ #pragma once -#include "Packet.h" - -#include "../../../../Header Files/stdafx.h" #include +#include + +#include "Packet.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "PacketListener.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class ChunkVisibilityPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.cpp index fca8b013c..b08c9bed4 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.cpp @@ -1,6 +1,9 @@ -#include "../../../../Header Files/stdafx.h" +#include + #include "PacketListener.h" #include "ClientCommandPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" ClientCommandPacket::ClientCommandPacket() { action = 0; } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h index 26cf80fd8..a058ccaef 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class ClientCommandPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ClientInformationPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ClientInformationPacket.h index fbb376ab2..c23fd50bd 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ClientInformationPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ClientInformationPacket.h @@ -1,5 +1,5 @@ #pragma once -#include "../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" class ClientInformationPacket : public Packet {}; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.cpp index 84fe4b78f..d2ba4eca1 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.cpp @@ -1,8 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" +#include +#include + #include "PacketListener.h" #include "ComplexItemDataPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" ComplexItemDataPacket::~ComplexItemDataPacket() {} diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h index 8fc8cbbe3..e24fcab47 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h @@ -1,6 +1,11 @@ #pragma once +#include +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class ComplexItemDataPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.cpp index 688d6fad4..899e0ffc8 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.cpp @@ -1,8 +1,9 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" +#include + #include "PacketListener.h" #include "ContainerAckPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" ContainerAckPacket::ContainerAckPacket() { containerId = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h index 245439d6e..100b9b36f 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h @@ -1,10 +1,12 @@ #pragma once -#include "Packet.h" - -#include "../../../../Header Files/stdafx.h" #include +#include + +#include "Packet.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "PacketListener.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class ContainerAckPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.cpp index faf2ad6d4..8eeb1194a 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.cpp @@ -1,9 +1,9 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/entity/net.minecraft.world.entity.h" +#include + #include "PacketListener.h" #include "ContainerButtonClickPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" ContainerButtonClickPacket::ContainerButtonClickPacket() {} diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h index 74ac53d93..2f568a5ef 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class ContainerButtonClickPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.cpp index aec7e920e..9030b0b6d 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.cpp @@ -1,9 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/item/net.minecraft.world.item.h" +#include + #include "PacketListener.h" #include "ContainerClickPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" ContainerClickPacket::~ContainerClickPacket() {} diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h index a36c95a3d..8fee5538e 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + +class ItemInstance; class ContainerClickPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.cpp index ea05ed185..7f8b588ec 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.cpp @@ -1,8 +1,9 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" +#include + #include "PacketListener.h" #include "ContainerClosePacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" ContainerClosePacket::ContainerClosePacket() { containerId = 0; } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h index 3e013c090..8c542ca37 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class ContainerClosePacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.cpp index e05cd9857..09d28e249 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "ContainerOpenPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" void ContainerOpenPacket::_init(int containerId, int type, const std::wstring& title, int size, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h index ab0329351..69891296a 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class ContainerOpenPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.cpp index 63d07c7f1..478438fd6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.cpp @@ -1,9 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/item/net.minecraft.world.item.h" +#include + #include "PacketListener.h" #include "ContainerSetContentPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" ContainerSetContentPacket::~ContainerSetContentPacket() {} diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.h index 6a45a8ced..4f70cf57a 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.h @@ -1,6 +1,13 @@ #pragma once +#include +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + +class ItemInstance; class ContainerSetContentPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.cpp index f34bd5ffb..9ebb8947d 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.cpp @@ -1,8 +1,9 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" +#include + #include "PacketListener.h" #include "ContainerSetDataPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" ContainerSetDataPacket::ContainerSetDataPacket() { containerId = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.h index c612ae9bd..113780129 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class ContainerSetDataPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.cpp index 6d6c2c422..5591db87c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.cpp @@ -1,9 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/item/net.minecraft.world.item.h" +#include + #include "PacketListener.h" #include "ContainerSetSlotPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" const int ContainerSetSlotPacket::CONTAINER = 0; const int ContainerSetSlotPacket::WORKBENCH = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h index b7073fdb6..3f985bafc 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + +class ItemInstance; class ContainerSetSlotPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.cpp index d991f7ec2..2328958d6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.cpp @@ -1,9 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/item/net.minecraft.world.item.h" #include "PacketListener.h" #include "CraftItemPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" CraftItemPacket::~CraftItemPacket() {} diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h index 024a63fcb..80372f286 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h @@ -2,7 +2,10 @@ // 4J ADDED THIS PACKET +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class CraftItemPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.cpp index ddeea10cc..b659fece3 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.cpp @@ -1,8 +1,11 @@ -#include "../../../../Header Files/stdafx.h" -#include "java/InputOutputStream/InputOutputStream.h" +#include + #include "PacketListener.h" #include "CustomPayloadPacket.h" -#include +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" // Mojang-defined custom packets const std::wstring CustomPayloadPacket::CUSTOM_BOOK_PACKET = L"MC|BEdit"; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h index bdc8972ad..c9a7356f4 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h @@ -1,6 +1,13 @@ #pragma once +#include +#include +#include +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class CustomPayloadPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.cpp index cd336879c..94b48a7cd 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.cpp @@ -1,9 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/item/net.minecraft.world.item.h" #include "PacketListener.h" #include "DebugOptionsPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" DebugOptionsPacket::~DebugOptionsPacket() {} diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h index 75484b30f..7962657ea 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h @@ -2,7 +2,10 @@ // 4J ADDED THIS PACKET +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class DebugOptionsPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/DisconnectPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/DisconnectPacket.cpp index c307e8629..b8dd1b4b4 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/DisconnectPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/DisconnectPacket.cpp @@ -1,9 +1,11 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../SharedConstants.h" +#include +#include + #include "PacketListener.h" -#include "DisconnectPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" DisconnectPacket::DisconnectPacket() { reason = eDisconnect_None; } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.cpp index 04d0d0369..c9c1b9121 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.cpp @@ -1,9 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/entity/net.minecraft.world.entity.h" +#include + #include "PacketListener.h" #include "EntityActionAtPositionPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" const int EntityActionAtPositionPacket::START_SLEEP = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h index 5fecd3494..9be4f5b4a 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + +class Entity; class EntityActionAtPositionPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.cpp index 5d4bee486..85ce663dd 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "EntityEventPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" EntityEventPacket::EntityEventPacket() { entityId = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.h index eff6e077f..6301a64e0 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class EntityEventPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.cpp index f56a6f4d1..55a8c12f0 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.cpp @@ -1,9 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/level/net.minecraft.world.level.h" +#include + #include "PacketListener.h" #include "ExplodePacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" ExplodePacket::ExplodePacket() { x = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.h index 9ffc077a6..2371f3c14 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.h @@ -1,7 +1,15 @@ #pragma once -#include "../../world/level/TilePos.h" +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" + +class Vec3; class ExplodePacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.cpp index 81b1901e3..6f7b9d8f5 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.cpp @@ -1,8 +1,12 @@ -#include "../../../../Header Files/stdafx.h" -#include "java/InputOutputStream/InputOutputStream.h" +#include + #include "PacketListener.h" #include "GameCommandPacket.h" -#include +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" GameCommandPacket::GameCommandPacket() { length = 0; } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h index 50d4f6f23..ede96b7aa 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h @@ -1,7 +1,13 @@ #pragma once -#include "../../commands/CommandsEnum.h" +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class GameCommandPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/GameEventPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/GameEventPacket.cpp index 86819bb21..8d27fc1da 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/GameEventPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/GameEventPacket.cpp @@ -1,4 +1,4 @@ -#include "../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include #include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.cpp index 8dc8cfcb8..defb8fd12 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.cpp @@ -1,5 +1,3 @@ -#include "../../../../Header Files/stdafx.h" -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "GetInfoPacket.h" diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.h index fada961ea..77f0fd8b1 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class GetInfoPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.cpp index 2e3fc8a7a..6ada0de21 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.cpp @@ -1,8 +1,9 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" +#include + #include "PacketListener.h" #include "InteractPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" const int InteractPacket::INTERACT = 0; const int InteractPacket::ATTACK = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.h index ec94a4e28..88d1dbd03 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class InteractPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.cpp index c18e2b13b..5d7583a89 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "KeepAlivePacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" KeepAlivePacket::KeepAlivePacket() { id = 0; } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h index cc470b66a..cdb63f217 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class KeepAlivePacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.cpp index d588f62a9..f04d12486 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "KickPlayerPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" KickPlayerPacket::KickPlayerPacket() { m_networkSmallId = 0; } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h index 69a169565..71eb885c6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h @@ -1,8 +1,10 @@ #pragma once #include +#include #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class KickPlayerPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.cpp index a0cec82f8..4b9790c19 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "LevelEventPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" LevelEventPacket::LevelEventPacket() { type = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h index 58298c990..b4f373401 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class LevelEventPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.cpp index 2eba51f9f..507bbfc0e 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.cpp @@ -1,6 +1,7 @@ -#include "../../../../Header Files/stdafx.h" #include "PacketListener.h" #include "LevelParticlesPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" LevelParticlesPacket::LevelParticlesPacket() { this->name = L""; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.h index fd07783bd..a2e8e4635 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class LevelParticlesPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.cpp index 2f178170e..1eb507863 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.cpp @@ -1,9 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include "java/InputOutputStream/InputOutputStream.h" -#include "net.minecraft.network.packet.h" -#include "LevelSoundPacket.h" #include +#include "LevelSoundPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" + const float LevelSoundPacket::PITCH_ACCURACY = std::numeric_limits::max() / 2.0; const float LevelSoundPacket::LOCATION_ACCURACY = 8.0f; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h index 463b3b9a2..40b16dfac 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class LevelSoundPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.cpp index 9f5946746..f322b6727 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.cpp @@ -1,11 +1,12 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/entity/player/net.minecraft.world.entity.player.h" #include "PacketListener.h" #include "LoginPacket.h" -#include "../../world/level/LevelType.h" +#include "Minecraft.World/net/minecraft/world/level/LevelType.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "Minecraft.World/x64headers/extraX64.h" LoginPacket::LoginPacket() { this->userName = L""; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.h index f236a1aa5..d11d47bcb 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.h @@ -1,8 +1,13 @@ #pragma once #include +#include +#include #include "Packet.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + class LevelType; class LoginPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.cpp index b67a0e526..9e595bef2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.cpp @@ -1,8 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" +#include + #include "PacketListener.h" #include "MoveEntityPacket.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" MoveEntityPacket::MoveEntityPacket() { hasRot = false; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h index ea6811b3a..0d0588b41 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class MoveEntityPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.cpp index f821228fd..bc7dcc05b 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.cpp @@ -1,8 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" +#include + #include "PacketListener.h" #include "MoveEntityPacketSmall.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" MoveEntityPacketSmall::MoveEntityPacketSmall() { hasRot = false; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h b/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h index 547d5c7b2..2fde72491 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class MoveEntityPacketSmall : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.cpp index ca334ac82..3c55af654 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "MovePlayerPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" MovePlayerPacket::MovePlayerPacket() { x = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h index 64f2c7baf..2e2343a4d 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class MovePlayerPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/Packet.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/Packet.cpp index 1859c4e87..b1ff11713 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/Packet.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/Packet.cpp @@ -1,15 +1,114 @@ -#include "../../../../Header Files/stdafx.h" -#include "java/System.h" -#include "java/InputOutputStream/InputOutputStream.h" -#include "net.minecraft.network.packet.h" -#include "PacketListener.h" -#include "Packet.h" -#include "nbt/com.mojang.nbt.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#if !defined(_CONTENT_PACKAGE) -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" -#endif +#include "java/System.h" +#include "Packet.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/Exceptions.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "nbt/NbtIo.h" +#include "Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AddMobPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AnimatePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AwardStatPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/EntityEventPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ExplodePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/GameEventPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/GetInfoPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/InteractPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/LoginPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h" +#include "Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/RespawnPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetHealthPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetScorePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetTimePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TexturePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TileEventPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/UseItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/XZPacket.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" + +class CompoundTag; void Packet::staticCtor() { // nextPrint = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/Packet.h b/minecraft/Minecraft.World/net/minecraft/network/packet/Packet.h index 10d05b520..13078d82c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/Packet.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/Packet.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "nbt/CompoundTag.h" class Packet; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PacketListener.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/PacketListener.cpp index 88071202a..08d045324 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PacketListener.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PacketListener.cpp @@ -1,6 +1,91 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.network.packet.h" #include "PacketListener.h" +#include "Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AddMobPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AnimatePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AwardStatPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatAutoCompletePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ClientInformationPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ClientProtocolPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/EntityEventPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ExplodePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/GameEventPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/GetInfoPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/InteractPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/LoginPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h" +#include "Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/RespawnPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ServerAuthDataPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetHealthPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetScorePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetTimePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TexturePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TileEventPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/UseItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/XZPacket.h" void PacketListener::handleBlockRegionUpdate( std::shared_ptr packet) {} diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PacketListener.h b/minecraft/Minecraft.World/net/minecraft/network/packet/PacketListener.h index 504cccde4..78c5b1548 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PacketListener.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PacketListener.h @@ -1,7 +1,11 @@ #pragma once -class Packet; +#include +#include "DisconnectPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" + +class Packet; class AddEntityPacket; class AddGlobalEntityPacket; class AddMobPacket; @@ -21,7 +25,6 @@ class ContainerOpenPacket; class ContainerSetContentPacket; class ContainerSetDataPacket; class ContainerSetSlotPacket; -#include "DisconnectPacket.h" class EntityActionAtPositionPacket; class EntityEventPacket; class ExplodePacket; @@ -53,7 +56,6 @@ class TeleportEntityPacket; class TileEventPacket; class TileUpdatePacket; class UseItemPacket; - // 1.8.2 class GetInfoPacket; class UpdateMobEffectPacket; @@ -62,17 +64,13 @@ class PlayerInfoPacket; class SetExperiencePacket; class SetCreativeModeSlotPacket; class AddExperienceOrbPacket; - // 1.0.1 class ContainerButtonClickPacket; class TileEntityDataPacket; - // 1.1 class CustomPayloadPacket; - // 1.2.3 class RotateHeadPacket; - // 1.3.2 class ClientProtocolPacket; class ServerAuthDataPacket; @@ -84,7 +82,6 @@ class LevelSoundPacket; class TileDestructionPacket; class ClientCommandPacket; class LevelChunksPacket; - // 1.6.4 class SetObjectivePacket; class SetScorePacket; @@ -93,7 +90,6 @@ class SetPlayerTeamPacket; class LevelParticlesPacket; class UpdateAttributesPacket; class TileEditorOpenPacket; - // 4J Added class CraftItemPacket; class TradeItemPacket; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.cpp index 212e3ca19..8e79d3c26 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.cpp @@ -1,7 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include "../../world/entity/player/net.minecraft.world.entity.player.h" -#include "net.minecraft.network.packet.h" +#include + #include "PlayerAbilitiesPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" PlayerAbilitiesPacket::PlayerAbilitiesPacket() { invulnerable = false; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h index f4ca84d7d..28d41384c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class Abilities; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.cpp index aeaceb111..47f530715 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "PlayerActionPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" const int PlayerActionPacket::START_DESTROY_BLOCK = 0; const int PlayerActionPacket::ABORT_DESTROY_BLOCK = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h index 42ec5fdf2..32607fa52 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class PlayerActionPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.cpp index 6a8c68c06..c91136637 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.cpp @@ -1,9 +1,8 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" -#include "../../world/entity/net.minecraft.world.entity.h" #include "PlayerCommandPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" const int PlayerCommandPacket::START_SNEAKING = 1; const int PlayerCommandPacket::STOP_SNEAKING = 2; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h index 29b5ed6da..9d3437f6d 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + +class Entity; class PlayerCommandPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.cpp index f6879c823..b34df74c3 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.cpp @@ -1,12 +1,12 @@ -#include "../../../../Header Files/stdafx.h" -#include "../../world/entity/player/net.minecraft.world.entity.player.h" #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" #ifndef __linux__ #include #endif // __linux__ -#include "PacketListener.h" -#include "java/InputOutputStream/InputOutputStream.h" #include "PlayerInfoPacket.h" PlayerInfoPacket::PlayerInfoPacket() { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h index cf91c5c6d..35d7c1ff4 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class ServerPlayer; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.cpp index 4a57d1124..6948d9551 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "PlayerInputPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" PlayerInputPacket::PlayerInputPacket() { xxa = 0.0f; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h index 1abb5ac92..20bae70a3 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class PlayerInputPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.cpp index 26af42fb4..977d3cee2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.cpp @@ -1,10 +1,13 @@ -#include "../../../../Header Files/stdafx.h" #include #include -#include + #include "PacketListener.h" #include "PreLoginPacket.h" -#include "java/InputOutputStream/InputOutputStream.h" +#include "Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerInterface.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" PreLoginPacket::PreLoginPacket() { loginKey = L""; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h index 8d764d0a5..61db780e3 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h @@ -1,8 +1,12 @@ #pragma once #include +#include +#include #include "Packet.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class PreLoginPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.cpp index d1e642ec3..ba9dd8123 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.cpp @@ -1,9 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "../../../../ConsoleHelpers/ArrayWithLength.h" -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "RemoveEntitiesPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" RemoveEntitiesPacket::RemoveEntitiesPacket() {} diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.h index ae1294f83..900f4a61d 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.h @@ -1,7 +1,12 @@ #pragma once #include +#include +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class RemoveEntitiesPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.cpp index 959e859f2..a7ad5f637 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.cpp @@ -1,8 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include "../../world/effect/net.minecraft.world.effect.h" -#include "java/InputOutputStream/InputOutputStream.h" +#include + #include "PacketListener.h" #include "RemoveMobEffectPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" RemoveMobEffectPacket::RemoveMobEffectPacket() {} diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.h index 13a988774..c5cbf3208 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.h @@ -1,8 +1,11 @@ #pragma once -class MobEffectInstance; +#include #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + +class MobEffectInstance; class RemoveMobEffectPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.cpp index f97366b8c..42cf969b5 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.cpp @@ -1,9 +1,13 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" +#include + #include "PacketListener.h" #include "RespawnPacket.h" -#include "../../world/level/LevelType.h" +#include "Minecraft.World/net/minecraft/world/level/LevelType.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" RespawnPacket::RespawnPacket() { this->dimension = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.h index bcbcd8f9e..93edb7e74 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class LevelType; class GameType; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.cpp index f504b5cea..80aabcd4a 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.cpp @@ -1,6 +1,7 @@ -#include "../../../../Header Files/stdafx.h" - #include "RotateHeadPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" RotateHeadPacket::RotateHeadPacket() {} diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h index 822bfd14f..2c4c015b9 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class RotateHeadPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.cpp index 8066ccd0d..15b0cecfc 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.cpp @@ -1,9 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/item/net.minecraft.world.item.h" #include "PacketListener.h" #include "ServerSettingsChangedPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" const int ServerSettingsChangedPacket::HOST_DIFFICULTY = 0; const int ServerSettingsChangedPacket::HOST_OPTIONS = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h index ffe9a597d..04ed57fc2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h @@ -2,7 +2,10 @@ // 4J ADDED THIS PACKET +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class ServerSettingsChangedPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.cpp index c32f59805..26f0967ce 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "SetCarriedItemPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" SetCarriedItemPacket::SetCarriedItemPacket() { slot = 0; } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h index 132466493..68c91ba57 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class SetCarriedItemPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.cpp index 0b2771c58..76cd892d9 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.cpp @@ -1,7 +1,8 @@ -#include "../../../../Header Files/stdafx.h" -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "SetCreativeModeSlotPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" SetCreativeModeSlotPacket::SetCreativeModeSlotPacket() { this->slotNum = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h index 396e158c9..8b8019fa1 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + +class ItemInstance; class SetCreativeModeSlotPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.cpp index be8a491d6..cd699a857 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.cpp @@ -1,7 +1,8 @@ -#include "../../../../Header Files/stdafx.h" #include "PacketListener.h" -#include "../../world/scores/net.minecraft.world.scores.h" #include "SetDisplayObjectivePacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/scores/Objective.h" SetDisplayObjectivePacket::SetDisplayObjectivePacket() { slot = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.h index 3157ffbac..453dcee89 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class Objective; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.cpp index a80f44446..9be66aa67 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.cpp @@ -1,9 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/entity/net.minecraft.world.entity.h" +#include + #include "PacketListener.h" #include "SetEntityDataPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" SetEntityDataPacket::SetEntityDataPacket() { id = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h index 4a6bf3881..49f9e3de5 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h @@ -1,7 +1,11 @@ #pragma once +#include +#include + #include "Packet.h" -#include "../../world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class SetEntityDataPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.cpp index 27b639756..072587434 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.cpp @@ -1,9 +1,8 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" -#include "../../world/entity/net.minecraft.world.entity.h" #include "SetEntityLinkPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" SetEntityLinkPacket::SetEntityLinkPacket() { sourceId = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h index aa25f52b6..667090f3c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + +class Entity; class SetEntityLinkPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.cpp index 225a522b3..ef607aab2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.cpp @@ -1,9 +1,8 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/entity/net.minecraft.world.entity.h" #include "PacketListener.h" #include "SetEntityMotionPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" void SetEntityMotionPacket::_init(int id, double xd, double yd, double zd) { this->id = id; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h index bea97bb05..cfd6aa55a 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + +class Entity; class SetEntityMotionPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.cpp index 0a145b890..95779ee26 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.cpp @@ -1,9 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/item/net.minecraft.world.item.h" #include "PacketListener.h" #include "SetEquippedItemPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" SetEquippedItemPacket::SetEquippedItemPacket() { entity = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h index f366541cc..869b7befb 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" class SetEquippedItemPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.cpp index d505b984b..ed1ed1c2b 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.cpp @@ -1,7 +1,7 @@ -#include "../../../../Header Files/stdafx.h" #include "SetExperiencePacket.h" #include "PacketListener.h" -#include "java/InputOutputStream/InputOutputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" SetExperiencePacket::SetExperiencePacket() { this->experienceProgress = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.h index 8dca39b81..808e22c1d 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class SetExperiencePacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.cpp index 33a03f0a9..8faa1f1ee 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "SetHealthPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" SetHealthPacket::SetHealthPacket() { this->health = 0.0f; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.h index 6dd0f0b65..791868e2a 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.h @@ -4,6 +4,7 @@ #include #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class SetHealthPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.cpp index b567e2065..affc220d9 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.cpp @@ -1,7 +1,8 @@ -#include "../../../../Header Files/stdafx.h" -#include "../../world/scores/net.minecraft.world.scores.h" #include "PacketListener.h" #include "SetObjectivePacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/scores/Objective.h" SetObjectivePacket::SetObjectivePacket() { objectiveName = L""; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.h index d7429be03..29264ebf5 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class Objective; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.cpp index 118666ee0..138ac9f68 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.cpp @@ -1,8 +1,14 @@ -#include "../../../../Header Files/stdafx.h" -#include "../../world/scores/net.minecraft.world.scores.h" -#include "../../world/entity/player/net.minecraft.world.entity.player.h" +#include + #include "PacketListener.h" #include "SetPlayerTeamPacket.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/scores/Objective.h" +#include "Minecraft.World/net/minecraft/world/scores/PlayerTeam.h" SetPlayerTeamPacket::SetPlayerTeamPacket() { name = L""; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.h index 32980f13d..bb028b81d 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.h @@ -1,6 +1,12 @@ #pragma once +#include +#include +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class PlayerTeam; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.cpp index 842b91fc7..338f28adf 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.cpp @@ -1,8 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include "../../world/entity/player/net.minecraft.world.entity.player.h" -#include "../../world/scores/net.minecraft.world.scores.h" #include "PacketListener.h" #include "SetScorePacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/scores/Objective.h" +#include "Minecraft.World/net/minecraft/world/scores/Score.h" SetScorePacket::SetScorePacket() { owner = L""; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.h index 893ffeef9..27bedf743 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class Score; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.cpp index c6ac1470e..ee0214b24 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "SetSpawnPositionPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" SetSpawnPositionPacket::SetSpawnPositionPacket() { x = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.h index e245dae33..35a0d20ca 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class SetSpawnPositionPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.cpp index 741f7b5b4..96ed52a97 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "SetTimePacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" SetTimePacket::SetTimePacket() { gameTime = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.h index 0e3885955..dd9265625 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class SetTimePacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.cpp index 2f7748cbc..3b4716aec 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.cpp @@ -1,9 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" +#include + #include "PacketListener.h" -#include "../../world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "SignUpdatePacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h" SignUpdatePacket::SignUpdatePacket() { shouldDelay = true; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h index 183ce24d9..c9dbc8dd9 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class SignUpdatePacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.cpp index a6f1487f4..d927f6a59 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "TakeItemEntityPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" TakeItemEntityPacket::TakeItemEntityPacket() { itemId = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h index d7792e778..4a202d0ae 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class TakeItemEntityPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.cpp index 6e1bdc75f..d8b7f06e6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.cpp @@ -1,9 +1,9 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/entity/net.minecraft.world.entity.h" #include "PacketListener.h" #include "TeleportEntityPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" TeleportEntityPacket::TeleportEntityPacket() { id = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h index c5e2585ce..221f83850 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h @@ -1,6 +1,12 @@ #pragma once +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + +class Entity; class TeleportEntityPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.cpp index d89d027ce..4c05a7177 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.cpp @@ -1,9 +1,11 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/entity/net.minecraft.world.entity.h" +#include + #include "PacketListener.h" #include "TextureAndGeometryChangePacket.h" +#include "Minecraft.Client/Common/Minecraft_Macros.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" TextureAndGeometryChangePacket::TextureAndGeometryChangePacket() { id = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h index 9f2687f10..d9e7e20b2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h @@ -1,7 +1,12 @@ #pragma once #include +#include +#include #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + +class Entity; class TextureAndGeometryChangePacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.cpp index a625f9e81..7c54a094a 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.cpp @@ -1,8 +1,12 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" +#include +#include + #include "PacketListener.h" #include "TextureAndGeometryPacket.h" +#include "Minecraft.Client/Common/Minecraft_Macros.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" TextureAndGeometryPacket::TextureAndGeometryPacket() { this->textureName = L""; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h index a675c9a82..21ea4cce9 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h @@ -1,9 +1,13 @@ #pragma once #include +#include +#include +#include #include "Packet.h" #include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" #include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class DLCSkinFile; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.cpp index e911b4433..99902c83c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.cpp @@ -1,9 +1,8 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/entity/net.minecraft.world.entity.h" #include "PacketListener.h" #include "TextureChangePacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" TextureChangePacket::TextureChangePacket() { id = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h index b59a42a07..4f749b8e6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h @@ -1,6 +1,12 @@ #pragma once +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + +class Entity; class TextureChangePacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.cpp index b21420b9b..d0e8f39a6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "TexturePacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" TexturePacket::TexturePacket() { this->textureName = L""; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.h index 37919fc1a..4a9d474d1 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.h @@ -1,7 +1,10 @@ #pragma once #include +#include +#include #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class TexturePacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.cpp index c89d52b66..d9a5963d3 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.cpp @@ -1,6 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.network.packet.h" #include "TileDestructionPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" TileDestructionPacket::TileDestructionPacket() { id = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h index 44db0b90a..3f907a93e 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class TileDestructionPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.cpp index c26d8b055..f9a6a623b 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.cpp @@ -1,7 +1,7 @@ -#include "../../../../Header Files/stdafx.h" - #include "PacketListener.h" #include "TileEditorOpenPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" TileEditorOpenPacket::TileEditorOpenPacket() { editorType = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.h index cf8f39239..3b855b51c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class TileEditorOpenPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.cpp index f9d0f5e82..eff6d2c41 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.cpp @@ -1,8 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" +#include + #include "PacketListener.h" #include "TileEntityDataPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "nbt/CompoundTag.h" void TileEntityDataPacket::_init() { x = y = z = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h index 04618a043..36665a335 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.cpp index 3c50f02d9..b294b8ccc 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.cpp @@ -1,9 +1,8 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "TileEventPacket.h" -#include "../../world/level/tile/net.minecraft.world.level.tile.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" TileEventPacket::TileEventPacket() { x = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.h index c0938bbb7..ba22b286e 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class TileEventPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.cpp index 6533fa635..a97daf9fa 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.cpp @@ -1,10 +1,11 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/level/net.minecraft.world.level.h" +#include + #include "PacketListener.h" #include "TileUpdatePacket.h" -#include "../../world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" TileUpdatePacket::TileUpdatePacket() { shouldDelay = true; } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h index 373fa7522..4fdefc18c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" + +class Level; class TileUpdatePacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.cpp index f1df45484..cbb187b0b 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "TradeItemPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" TradeItemPacket::TradeItemPacket() { containerId = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h index 46dfaebe4..2300caa90 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h @@ -2,11 +2,13 @@ // 4J ADDED PACKET -#include "Packet.h" - -#include "../../../../Header Files/stdafx.h" #include +#include + +#include "Packet.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "PacketListener.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class TradeItemPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.cpp index ff1cb0cd4..792968ebd 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.cpp @@ -1,8 +1,11 @@ -#include "../../../../Header Files/stdafx.h" +#include -#include "../../world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" #include "PacketListener.h" #include "UpdateAttributesPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" UpdateAttributesPacket::UpdateAttributesPacket() { entityId = 0; } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h index ba11a4211..231eed350 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h @@ -1,6 +1,11 @@ #pragma once +#include +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" class AttributeModifier; class AttributeInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp index b56f7f0c4..0d75ee21c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp @@ -1,7 +1,9 @@ -#include "../../../../Header Files/stdafx.h" -#include "java/InputOutputStream/InputOutputStream.h" +#include + #include "PacketListener.h" #include "UpdateGameRuleProgressPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" UpdateGameRuleProgressPacket::UpdateGameRuleProgressPacket() { m_messageId = L""; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h index f53bf852e..d0a5e631e 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h @@ -1,6 +1,13 @@ #pragma once +#include +#include +#include +#include + #include "Packet.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class UpdateGameRuleProgressPacket : public Packet, diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.cpp index 9206f4185..5d49102e0 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.cpp @@ -1,11 +1,11 @@ -#include "../../../../Header Files/stdafx.h" -#include "../../world/effect/net.minecraft.world.effect.h" -#include "java/InputOutputStream/InputOutputStream.h" -#include "PacketListener.h" -#include "../../world/level/levelgen/feature/BasicTreeFeature.h" -#include "UpdateMobEffectPacket.h" #include +#include "PacketListener.h" +#include "UpdateMobEffectPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" + UpdateMobEffectPacket::UpdateMobEffectPacket() { entityId = 0; effectId = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h index 326fcd931..e301dcf59 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h @@ -1,7 +1,9 @@ #pragma once #include +#include #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class MobEffectInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.cpp index 23c68e918..6b116af31 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" #include "PacketListener.h" #include "UpdateProgressPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" UpdateProgressPacket::UpdateProgressPacket() { this->m_percentage = 0; } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.h index 6d82f0bad..606cb7c79 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" // 4J Added packet to update clients on the time for the host to finish doing // something diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.cpp index 42c158369..a0e2bfddd 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.cpp @@ -1,9 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/item/net.minecraft.world.item.h" #include "PacketListener.h" #include "UseItemPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" const float UseItemPacket::CLICK_ACCURACY = 16.0f; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.h index c472bb1e2..53250f074 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" class UseItemPacket : public Packet, public std::enable_shared_from_this { diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.cpp index 86eb35174..562f5c8bf 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.cpp @@ -1,9 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../world/item/net.minecraft.world.item.h" #include "PacketListener.h" #include "XZPacket.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" const int XZPacket::STRONGHOLD = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.h index 33111bdf1..d64f0ecc2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.h @@ -2,7 +2,10 @@ // 4J ADDED THIS PACKET +#include + #include "Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" class XZPacket : public Packet, public std::enable_shared_from_this { public: diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Achievement.cpp b/minecraft/Minecraft.World/net/minecraft/stats/Achievement.cpp index 573f59dce..3df1f7d71 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/Achievement.cpp +++ b/minecraft/Minecraft.World/net/minecraft/stats/Achievement.cpp @@ -1,9 +1,14 @@ -#include "../../../Header Files/stdafx.h" -#include "../locale/net.minecraft.locale.h" -#include "../world/item/ItemInstance.h" +#include + #include "Achievements.h" #include "DescFormatter.h" #include "Achievement.h" +#include "Minecraft.World/net/minecraft/locale/I18n.h" +#include "Minecraft.World/net/minecraft/stats/Stat.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" + +class Item; +class Tile; /** * @class Achievement diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Achievement.h b/minecraft/Minecraft.World/net/minecraft/stats/Achievement.h index bfd3c0ec8..913b93886 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/Achievement.h +++ b/minecraft/Minecraft.World/net/minecraft/stats/Achievement.h @@ -1,8 +1,14 @@ #pragma once +#include +#include + #include "Stat.h" class DescFormatter; +class Item; +class ItemInstance; +class Tile; class Achievement : public Stat { public: diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Achievements.cpp b/minecraft/Minecraft.World/net/minecraft/stats/Achievements.cpp index c0959ba0b..05ae5e8bd 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/Achievements.cpp +++ b/minecraft/Minecraft.World/net/minecraft/stats/Achievements.cpp @@ -1,10 +1,14 @@ -#include "../../../Header Files/stdafx.h" -#include "net.minecraft.stats.h" -#include "../world/item/net.minecraft.world.item.h" -#include "../world/level/tile/net.minecraft.world.level.tile.h" #include +#include +#include + #include "Achievement.h" #include "Achievements.h" +#include "Minecraft.Client/Common/Source Files/Console_Awards_enum.h" +#include "Minecraft.World/net/minecraft/world/item/BowItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/PotionItem.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" const int Achievements::ACHIEVEMENT_OFFSET = 0x500000; diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Achievements.h b/minecraft/Minecraft.World/net/minecraft/stats/Achievements.h index 8db1b65b4..687a12ae7 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/Achievements.h +++ b/minecraft/Minecraft.World/net/minecraft/stats/Achievements.h @@ -1,5 +1,7 @@ #pragma once +#include + class Achievement; class Achievements { diff --git a/minecraft/Minecraft.World/net/minecraft/stats/CommonStats.cpp b/minecraft/Minecraft.World/net/minecraft/stats/CommonStats.cpp index eacdeb544..7b59b534a 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/CommonStats.cpp +++ b/minecraft/Minecraft.World/net/minecraft/stats/CommonStats.cpp @@ -1,8 +1,11 @@ -#include "../../../Header Files/stdafx.h" +#include + #include "Achievements.h" -#include "../world/item/Item.h" -#include "../world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "CommonStats.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/stats/Stats.h" Stat* CommonStats::get_stat(int i) { return Stats::get(i); } diff --git a/minecraft/Minecraft.World/net/minecraft/stats/CommonStats.h b/minecraft/Minecraft.World/net/minecraft/stats/CommonStats.h index 685ff1a96..dbcb73d16 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/CommonStats.h +++ b/minecraft/Minecraft.World/net/minecraft/stats/CommonStats.h @@ -1,6 +1,12 @@ #pragma once +#include +#include +#include + #include "GenericStats.h" +#include "Minecraft.Client/Common/Source Files/Console_Awards_enum.h" +#include "java/Class.h" class CommonStats : public GenericStats { protected: diff --git a/minecraft/Minecraft.World/net/minecraft/stats/GeneralStat.cpp b/minecraft/Minecraft.World/net/minecraft/stats/GeneralStat.cpp index 43f2723d0..a85e4d3b0 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/GeneralStat.cpp +++ b/minecraft/Minecraft.World/net/minecraft/stats/GeneralStat.cpp @@ -1,6 +1,10 @@ -#include "../../../Header Files/stdafx.h" -#include "net.minecraft.stats.h" +#include + #include "GeneralStat.h" +#include "Minecraft.World/net/minecraft/stats/Stat.h" +#include "Minecraft.World/net/minecraft/stats/Stats.h" + +class StatFormatter; GeneralStat::GeneralStat(int id, const std::wstring& name, StatFormatter* formatter) diff --git a/minecraft/Minecraft.World/net/minecraft/stats/GeneralStat.h b/minecraft/Minecraft.World/net/minecraft/stats/GeneralStat.h index 6f51072aa..70b9667ec 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/GeneralStat.h +++ b/minecraft/Minecraft.World/net/minecraft/stats/GeneralStat.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "Stat.h" +class StatFormatter; + class GeneralStat : public Stat { public: GeneralStat(int id, const std::wstring& name, StatFormatter* formatter); diff --git a/minecraft/Minecraft.World/net/minecraft/stats/GenericStats.cpp b/minecraft/Minecraft.World/net/minecraft/stats/GenericStats.cpp index 02d912c67..834f247f5 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/GenericStats.cpp +++ b/minecraft/Minecraft.World/net/minecraft/stats/GenericStats.cpp @@ -1,9 +1,11 @@ -#include "../../../Header Files/stdafx.h" - -#include "../world/entity/monster/Monster.h" - #include "GenericStats.h" +class DamageSource; +class ItemInstance; +class Mob; +class Player; +class Stat; + GenericStats* GenericStats::instance = nullptr; Stat* GenericStats::get_walkOneM() { return nullptr; } diff --git a/minecraft/Minecraft.World/net/minecraft/stats/GenericStats.h b/minecraft/Minecraft.World/net/minecraft/stats/GenericStats.h index 61b4facea..1c10f9baf 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/GenericStats.h +++ b/minecraft/Minecraft.World/net/minecraft/stats/GenericStats.h @@ -1,9 +1,22 @@ #pragma once +#include +#include +#include +#include + #include "Stat.h" #include "Stats.h" +#include "Minecraft.Client/Common/Source Files/Console_Awards_enum.h" +#include "java/Class.h" -// #include "../world/damageSource/DamageSource.h" +class DamageSource; +class ItemInstance; +class Mob; +class Player; +class Stat; + +// #include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" // #include "Minecraft.Client/Common/Source Files/Console_Awards_enum.h" diff --git a/minecraft/Minecraft.World/net/minecraft/stats/ItemStat.cpp b/minecraft/Minecraft.World/net/minecraft/stats/ItemStat.cpp index d71d770e2..ecc969373 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/ItemStat.cpp +++ b/minecraft/Minecraft.World/net/minecraft/stats/ItemStat.cpp @@ -1,5 +1,5 @@ -#include "../../../Header Files/stdafx.h" #include "ItemStat.h" +#include "Minecraft.World/net/minecraft/stats/Stat.h" ItemStat::ItemStat(int id, const std::wstring& name, int itemId) : Stat(id, name), itemId(itemId) {} diff --git a/minecraft/Minecraft.World/net/minecraft/stats/ItemStat.h b/minecraft/Minecraft.World/net/minecraft/stats/ItemStat.h index 317302972..1b75426fc 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/ItemStat.h +++ b/minecraft/Minecraft.World/net/minecraft/stats/ItemStat.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "Stat.h" class ItemStat : public Stat { diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Stat.cpp b/minecraft/Minecraft.World/net/minecraft/stats/Stat.cpp index 31ba84efb..322084bd4 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/Stat.cpp +++ b/minecraft/Minecraft.World/net/minecraft/stats/Stat.cpp @@ -1,9 +1,12 @@ -#include "../../../Header Files/stdafx.h" #include +#include +#include + #include "NumberFormatters.h" #include "StatFormatter.h" #include "Stats.h" #include "Stat.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" Stat::DefaultFormat* Stat::defaultFormatter = new DefaultFormat(); Stat::TimeFormatter* Stat::timeFormatter = new TimeFormatter(); diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Stat.h b/minecraft/Minecraft.World/net/minecraft/stats/Stat.h index 8115f0f53..7be68322a 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/Stat.h +++ b/minecraft/Minecraft.World/net/minecraft/stats/Stat.h @@ -1,9 +1,16 @@ #pragma once +#include +#include +#include +#include + #include "StatFormatter.h" #include "GenericStats.h" +#include "Minecraft.Client/Linux/Linux_App.h" class DecimalFormat; +class LocalPlayer; class Stat { public: diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Stats.cpp b/minecraft/Minecraft.World/net/minecraft/stats/Stats.cpp index 8b2124cd0..845194314 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/Stats.cpp +++ b/minecraft/Minecraft.World/net/minecraft/stats/Stats.cpp @@ -1,14 +1,20 @@ -#include "../../../Header Files/stdafx.h" -#include "../locale/net.minecraft.locale.h" -#include "../world/level/tile/net.minecraft.world.level.tile.h" -#include "../world/item/net.minecraft.world.item.h" -#include "../world/entity/item/net.minecraft.world.entity.item.h" -#include "../world/item/crafting/net.minecraft.world.item.crafting.h" +#include +#include + #include "Achievements.h" #include "ItemStat.h" #include "GeneralStat.h" #include "Stats.h" #include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/net/minecraft/stats/Stat.h" +#include "Minecraft.World/net/minecraft/world/item/FishingRodItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/MapItem.h" +#include "Minecraft.World/net/minecraft/world/level/tile/GrassTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class StatFormatter; const int Stats::BLOCKS_MINED_OFFSET = 0x1000000; const int Stats::ITEMS_COLLECTED_OFFSET = 0x1010000; diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Stats.h b/minecraft/Minecraft.World/net/minecraft/stats/Stats.h index d53a7e6df..8e7244abf 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/Stats.h +++ b/minecraft/Minecraft.World/net/minecraft/stats/Stats.h @@ -1,8 +1,12 @@ #pragma once +#include +#include + #include "Stat.h" class ItemStat; +class Stat; class Stats { friend class Stat; diff --git a/minecraft/Minecraft.World/net/minecraft/util/Hasher.cpp b/minecraft/Minecraft.World/net/minecraft/util/Hasher.cpp index ffc770a33..6dfdd383b 100644 --- a/minecraft/Minecraft.World/net/minecraft/util/Hasher.cpp +++ b/minecraft/Minecraft.World/net/minecraft/util/Hasher.cpp @@ -1,14 +1,13 @@ -#include "../../../Header Files/stdafx.h" #if defined(_WIN32) #include #else -#include -#include #include #include #endif // _WIN32 -#include "Hasher.h" #include +#include + +#include "Hasher.h" Hasher::Hasher(std::wstring& salt) { this->salt = salt; } diff --git a/minecraft/Minecraft.World/net/minecraft/util/Hasher.h b/minecraft/Minecraft.World/net/minecraft/util/Hasher.h index c0ac09627..099081124 100644 --- a/minecraft/Minecraft.World/net/minecraft/util/Hasher.h +++ b/minecraft/Minecraft.World/net/minecraft/util/Hasher.h @@ -1,5 +1,7 @@ #pragma once +#include + class Hasher { private: std::wstring salt; diff --git a/minecraft/Minecraft.World/net/minecraft/util/HtmlString.cpp b/minecraft/Minecraft.World/net/minecraft/util/HtmlString.cpp index ccff71259..9b33da0c6 100644 --- a/minecraft/Minecraft.World/net/minecraft/util/HtmlString.cpp +++ b/minecraft/Minecraft.World/net/minecraft/util/HtmlString.cpp @@ -1,6 +1,10 @@ -#include "../../../Header Files/stdafx.h" -#include "HtmlString.h" #include +#include +#include + +#include "HtmlString.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Linux/Linux_App.h" HtmlString::HtmlString(std::wstring text, eMinecraftColour hexColor, bool italics, bool indent) { diff --git a/minecraft/Minecraft.World/net/minecraft/util/HtmlString.h b/minecraft/Minecraft.World/net/minecraft/util/HtmlString.h index 83e67244a..bbce06690 100644 --- a/minecraft/Minecraft.World/net/minecraft/util/HtmlString.h +++ b/minecraft/Minecraft.World/net/minecraft/util/HtmlString.h @@ -1,5 +1,10 @@ #pragma once +#include +#include + +#include "Minecraft.Client/Common/App_enums.h" + // 4J: Simple std::string wrapper that includes basic formatting information class HtmlString { public: diff --git a/minecraft/Minecraft.World/net/minecraft/util/Mth.cpp b/minecraft/Minecraft.World/net/minecraft/util/Mth.cpp index 12be62186..d6c670f48 100644 --- a/minecraft/Minecraft.World/net/minecraft/util/Mth.cpp +++ b/minecraft/Minecraft.World/net/minecraft/util/Mth.cpp @@ -1,10 +1,14 @@ -#include "../../../Header Files/stdafx.h" -#include "Mth.h" -#include "java/Random.h" -#include "../../../ConsoleHelpers/StringHelpers.h" - +#include +#include +#include #include #include +#include +#include + +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" constexpr size_t SIN_TAB_CNT = 65536; constexpr float SIN_SCALE = SIN_TAB_CNT / (std::numbers::pi_v * 2.0f); diff --git a/minecraft/Minecraft.World/net/minecraft/util/SmoothFloat.cpp b/minecraft/Minecraft.World/net/minecraft/util/SmoothFloat.cpp index e4d68cabc..a5e491822 100644 --- a/minecraft/Minecraft.World/net/minecraft/util/SmoothFloat.cpp +++ b/minecraft/Minecraft.World/net/minecraft/util/SmoothFloat.cpp @@ -1,4 +1,3 @@ -#include "../../../Header Files/stdafx.h" #include "SmoothFloat.h" SmoothFloat::SmoothFloat() { diff --git a/minecraft/Minecraft.World/net/minecraft/util/WeighedRandom.cpp b/minecraft/Minecraft.World/net/minecraft/util/WeighedRandom.cpp index a51bfe72e..bcbf1b5ee 100644 --- a/minecraft/Minecraft.World/net/minecraft/util/WeighedRandom.cpp +++ b/minecraft/Minecraft.World/net/minecraft/util/WeighedRandom.cpp @@ -1,5 +1,11 @@ -#include "../../../Header Files/stdafx.h" -#include "WeighedRandom.h" + +#include +#include + +#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" int WeighedRandom::getTotalWeight(std::vector* items) { int totalWeight = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.cpp b/minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.cpp index 521a14f68..bd4a7eabc 100644 --- a/minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.cpp +++ b/minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.cpp @@ -1,8 +1,8 @@ -#include "../../../Header Files/stdafx.h" -#include "../world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../world/item/net.minecraft.world.item.h" -#include "WeighedRandom.h" #include "WeighedTreasure.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" WeighedTreasure::WeighedTreasure(int itemId, int auxValue, int minCount, int maxCount, int weight) diff --git a/minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.h b/minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.h index 49f7d2040..a8cb7b45c 100644 --- a/minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.h +++ b/minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.h @@ -1,6 +1,16 @@ #pragma once +#include +#include +#include + #include "WeighedRandom.h" +#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" + +class Container; +class DispenserTileEntity; +class ItemInstance; +class Random; class WeighedTreasure : public WeighedRandomItem { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/CompoundContainer.cpp b/minecraft/Minecraft.World/net/minecraft/world/CompoundContainer.cpp index 67611a993..cc345a3fb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/CompoundContainer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/CompoundContainer.cpp @@ -1,7 +1,6 @@ -#include "../../../Header Files/stdafx.h" -#include "entity/player/net.minecraft.world.entity.player.h" -#include "../network/packet/ContainerOpenPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h" #include "CompoundContainer.h" +#include "Minecraft.Client/Linux/Linux_App.h" CompoundContainer::CompoundContainer(int name, std::shared_ptr c1, std::shared_ptr c2) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/CompoundContainer.h b/minecraft/Minecraft.World/net/minecraft/world/CompoundContainer.h index 86f8c8afe..b7f24cb66 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/CompoundContainer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/CompoundContainer.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "Container.h" +#include "Minecraft.World/net/minecraft/world/Container.h" class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/world/FlippedIcon.cpp b/minecraft/Minecraft.World/net/minecraft/world/FlippedIcon.cpp index eae05d67b..945d11415 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/FlippedIcon.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/FlippedIcon.cpp @@ -1,6 +1,6 @@ -#include "../../../Header Files/stdafx.h" #include "FlippedIcon.h" -#include "../SharedConstants.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/Icon.h" FlippedIcon::FlippedIcon(Icon* base, bool horizontal, bool vertical) : base(base), horizontal(horizontal), vertical(vertical) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/FlippedIcon.h b/minecraft/Minecraft.World/net/minecraft/world/FlippedIcon.h index 711949ff3..d15edca34 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/FlippedIcon.h +++ b/minecraft/Minecraft.World/net/minecraft/world/FlippedIcon.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "Icon.h" class FlippedIcon : public Icon { diff --git a/minecraft/Minecraft.World/net/minecraft/world/SimpleContainer.cpp b/minecraft/Minecraft.World/net/minecraft/world/SimpleContainer.cpp index 21c8d3f71..f1f0ebc94 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/SimpleContainer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/SimpleContainer.cpp @@ -1,9 +1,9 @@ -#include "../../../Header Files/stdafx.h" +#include #include "net.minecraft.world.ContainerListener.h" -#include "item/net.minecraft.world.item.h" - #include "SimpleContainer.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" SimpleContainer::SimpleContainer(int name, std::wstring stringName, bool customName, int size) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/SimpleContainer.h b/minecraft/Minecraft.World/net/minecraft/world/SimpleContainer.h index 2fcaca85b..b219c81d1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/SimpleContainer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/SimpleContainer.h @@ -1,7 +1,17 @@ #pragma once +#include +#include +#include + #include "Container.h" #include "net.minecraft.world.ContainerListener.h" +#include "Minecraft.World/net/minecraft/world/Container.h" + +class ItemInstance; +namespace net_minecraft_world { +class ContainerListener; +} // namespace net_minecraft_world class SimpleContainer : public Container { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatEntry.cpp b/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatEntry.cpp index a83934d31..3376a81b2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatEntry.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatEntry.cpp @@ -1,8 +1,11 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.world.damagesource.h" -#include "../entity/net.minecraft.world.entity.h" -#include "CombatEntry.h" #include +#include + +#include "CombatEntry.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/damageSource/CombatTracker.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" CombatEntry::CombatEntry(DamageSource* source, int time, float health, float damage, CombatTracker::eLOCATION location, diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatEntry.h b/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatEntry.h index 032f66925..29c61b5d2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatEntry.h +++ b/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatEntry.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "CombatTracker.h" class DamageSource; diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.cpp b/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.cpp index 00591cc99..aa713ba43 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.cpp @@ -1,10 +1,18 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../phys/net.minecraft.world.phys.h" -#include "net.minecraft.world.damagesource.h" +#include + #include "CombatTracker.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/CombatEntry.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" CombatTracker::CombatTracker(LivingEntity* mob) { this->mob = mob; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.h b/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.h index 3fa4a65fa..6b5ab35b2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.h +++ b/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.h @@ -1,10 +1,15 @@ #pragma once -#include "../../SharedConstants.h" +#include +#include + +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" class CombatEntry; class LivingEntity; class ChatPacket; +class DamageSource; class CombatTracker { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.cpp index 9995110a3..19be28935 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.cpp @@ -1,11 +1,19 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../entity/projectile/net.minecraft.world.entity.projectile.h" -#include "../level/net.minecraft.world.level.h" -#include "net.minecraft.world.damagesource.h" -#include "../food/net.minecraft.world.food.h" -#include "../../network/packet/net.minecraft.network.packet.h" + +#include +#include + +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" +#include "Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h" +#include "Minecraft.World/net/minecraft/world/food/FoodConstants.h" +#include "Minecraft.World/net/minecraft/world/level/Explosion.h" + +class Entity; DamageSource* DamageSource::inFire = (new DamageSource(ChatPacket::e_ChatDeathInFire, diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.h b/minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.h index ea3626ced..c2ca5af98 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.h +++ b/minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.h @@ -1,5 +1,9 @@ #pragma once +#include + +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" + class LivingEntity; class Entity; class Arrow; @@ -7,8 +11,6 @@ class Fireball; class Player; class Explosion; -#include "../../network/packet/ChatPacket.h" - class DamageSource { public: static DamageSource* inFire; diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.cpp index ae259ec1f..e6a882eb1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.cpp @@ -1,11 +1,19 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../entity/net.minecraft.world.entity.h" -#include "net.minecraft.world.damagesource.h" -#include "../../network/packet/net.minecraft.network.packet.h" // EntityDamageSource::EntityDamageSource(const wstring &msgId, // shared_ptr entity) : DamageSource(msgId) +#include +#include + +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" + EntityDamageSource::EntityDamageSource( ChatPacket::EChatPacketMessage msgId, ChatPacket::EChatPacketMessage msgWithItemId, diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h b/minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h index 85970ac0a..29a607008 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h +++ b/minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "DamageSource.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" class Entity; class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.cpp index 3e5e2532a..95ba1a84f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.cpp @@ -1,12 +1,19 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../entity/net.minecraft.world.entity.h" -#include "net.minecraft.world.damagesource.h" -#include "../../network/packet/net.minecraft.network.packet.h" // IndirectEntityDamageSource::IndirectEntityDamageSource(const wstring &msgId, // shared_ptr entity, shared_ptr owner) : // EntityDamageSource(msgId, entity) +#include +#include + +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" +#include "Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" + IndirectEntityDamageSource::IndirectEntityDamageSource( ChatPacket::EChatPacketMessage msgId, ChatPacket::EChatPacketMessage msgWithItemId, diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.h b/minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.h index 5ec5f768c..39b332836 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.h +++ b/minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "EntityDamageSource.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" class Entity; class Player; diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/AbsoptionMobEffect.cpp b/minecraft/Minecraft.World/net/minecraft/world/effect/AbsoptionMobEffect.cpp index cfd812332..8c152c872 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/AbsoptionMobEffect.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/effect/AbsoptionMobEffect.cpp @@ -1,7 +1,8 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/net.minecraft.world.entity.h" -#include "net.minecraft.world.effect.h" +#include + #include "AbsoptionMobEffect.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" AbsoptionMobEffect::AbsoptionMobEffect(int id, bool isHarmful, eMinecraftColour color) diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/AbsoptionMobEffect.h b/minecraft/Minecraft.World/net/minecraft/world/effect/AbsoptionMobEffect.h index 4fbb1180e..62a489d47 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/AbsoptionMobEffect.h +++ b/minecraft/Minecraft.World/net/minecraft/world/effect/AbsoptionMobEffect.h @@ -1,8 +1,9 @@ #pragma once -class LivingEntity; - #include "MobEffect.h" +#include "Minecraft.Client/Common/App_enums.h" + +class LivingEntity; class AbsoptionMobEffect : public MobEffect { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/AttackDamageMobEffect.cpp b/minecraft/Minecraft.World/net/minecraft/world/effect/AttackDamageMobEffect.cpp index 1ffad03d1..74d572b1b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/AttackDamageMobEffect.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/effect/AttackDamageMobEffect.cpp @@ -1,6 +1,5 @@ -#include "../../../../Header Files/stdafx.h" - #include "AttackDamageMobEffect.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" AttackDamageMobEffect::AttackDamageMobEffect(int id, bool isHarmful, eMinecraftColour color) diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/AttackDamageMobEffect.h b/minecraft/Minecraft.World/net/minecraft/world/effect/AttackDamageMobEffect.h index a19051716..cba73e474 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/AttackDamageMobEffect.h +++ b/minecraft/Minecraft.World/net/minecraft/world/effect/AttackDamageMobEffect.h @@ -1,6 +1,7 @@ #pragma once #include "MobEffect.h" +#include "Minecraft.Client/Common/App_enums.h" class AttributeModifier; diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/HealthBoostMobEffect.cpp b/minecraft/Minecraft.World/net/minecraft/world/effect/HealthBoostMobEffect.cpp index a829fbc63..a51ddc73c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/HealthBoostMobEffect.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/effect/HealthBoostMobEffect.cpp @@ -1,6 +1,8 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/net.minecraft.world.entity.h" +#include + #include "HealthBoostMobEffect.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" HealthBoostMobEffect::HealthBoostMobEffect(int id, bool isHarmful, eMinecraftColour color) diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/HealthBoostMobEffect.h b/minecraft/Minecraft.World/net/minecraft/world/effect/HealthBoostMobEffect.h index 84f424b4f..dd4ddfeb3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/HealthBoostMobEffect.h +++ b/minecraft/Minecraft.World/net/minecraft/world/effect/HealthBoostMobEffect.h @@ -1,6 +1,7 @@ #pragma once #include "MobEffect.h" +#include "Minecraft.Client/Common/App_enums.h" class LivingEntity; class BaseAttributeMap; diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/InstantaneousMobEffect.cpp b/minecraft/Minecraft.World/net/minecraft/world/effect/InstantaneousMobEffect.cpp index b1161ca72..85ff4a417 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/InstantaneousMobEffect.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/effect/InstantaneousMobEffect.cpp @@ -1,5 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.world.effect.h" + +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.World/net/minecraft/world/effect/InstantaneousMobEffect.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" InstantenousMobEffect::InstantenousMobEffect(int id, bool isHarmful, eMinecraftColour color) diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/InstantaneousMobEffect.h b/minecraft/Minecraft.World/net/minecraft/world/effect/InstantaneousMobEffect.h index 186dff9bb..69a9230ce 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/InstantaneousMobEffect.h +++ b/minecraft/Minecraft.World/net/minecraft/world/effect/InstantaneousMobEffect.h @@ -1,6 +1,7 @@ #pragma once #include "MobEffect.h" +#include "Minecraft.Client/Common/App_enums.h" class InstantenousMobEffect : public MobEffect { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.cpp b/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.cpp index 73c545122..b9799fa2a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.cpp @@ -1,13 +1,13 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../entity/monster/net.minecraft.world.entity.monster.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../level/net.minecraft.world.level.h" -#include "../damageSource/net.minecraft.world.damagesource.h" -#include "../food/net.minecraft.world.food.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" +#include "Minecraft.World/net/minecraft/world/food/net.minecraft.world.food.h" #include "net.minecraft.world.effect.h" -#include "../../SharedConstants.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" MobEffect* MobEffect::effects[NUM_EFFECTS]; diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.h b/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.h index de9794103..9eebb9558 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.h +++ b/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.h @@ -1,6 +1,6 @@ #pragma once -#include "../entity/ai/attributes/AttributeModifier.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" class Mob; class MobEffectInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffectInstance.cpp b/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffectInstance.cpp index 470200ceb..3e8c73696 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffectInstance.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffectInstance.cpp @@ -1,5 +1,14 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.world.effect.h" + +#include +#include +#include + +#include "Minecraft.Client/Linux/Linux_App.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" + +class LivingEntity; void MobEffectInstance::_init(int id, int duration, int amplifier) { this->id = id; diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h b/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h index b37f8711e..ee3e85460 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h +++ b/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h @@ -1,6 +1,11 @@ #pragma once +#include +#include + class Mob; +class CompoundTag; +class LivingEntity; class MobEffectInstance { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/AgeableMob.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/AgeableMob.cpp index 81f7c36ba..a76435e74 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/AgeableMob.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/AgeableMob.cpp @@ -1,11 +1,21 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.world.entity.h" -#include "player/net.minecraft.world.entity.player.h" -#include "../item/net.minecraft.world.item.h" -#include "../level/net.minecraft.world.level.h" +#include + #include "SyncedEntityData.h" -#include "../../stats/GenericStats.h" #include "AgeableMob.h" +#include "java/Class.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/SpawnEggItem.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" + +class Entity; AgableMob::AgableMob(Level* level) : PathfinderMob(level) { registeredBBWidth = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/AgeableMob.h b/minecraft/Minecraft.World/net/minecraft/world/entity/AgeableMob.h index af10b6c25..2f1573cc3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/AgeableMob.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/AgeableMob.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "PathfinderMob.h" +class Level; + class AgableMob : public PathfinderMob { private: static const int DATA_AGE_ID = 12; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Creature.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/Creature.cpp index 6aafa8d30..95878377d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Creature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Creature.cpp @@ -1,2 +1 @@ -#include "../../../../Header Files/stdafx.h" #include "Creature.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/DelayedRelease.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/DelayedRelease.cpp index d31deac4c..1cf02b890 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/DelayedRelease.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/DelayedRelease.cpp @@ -1,6 +1,5 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/net.minecraft.world.level.h" #include "DelayedRelease.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" DelayedRelease::DelayedRelease(Level* level, std::shared_ptr toRelease, int delay) diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/DelayedRelease.h b/minecraft/Minecraft.World/net/minecraft/world/entity/DelayedRelease.h index f1614ec4d..ea5f9e6b2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/DelayedRelease.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/DelayedRelease.h @@ -1,8 +1,13 @@ #pragma once +#include + #include "Entity.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" class DamageSource; +class Level; class DelayedRelease : public Entity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp index a9b4fa411..6c3305737 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp @@ -1,31 +1,52 @@ -#include "../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" -#include "../item/net.minecraft.world.item.h" -#include "../item/enchantment/net.minecraft.world.item.enchantment.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/dimension/net.minecraft.world.level.dimension.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../phys/net.minecraft.world.phys.h" -#include "item/net.minecraft.world.entity.item.h" -#include "../level/material/net.minecraft.world.level.material.h" -#include "../damageSource/net.minecraft.world.damagesource.h" -#include "SyncedEntityData.h" -#include "EntityIO.h" -#include "../../SharedConstants.h" - -#include "../../../../Header Files/ParticleTypes.h" - -#include "EntityPos.h" -#include "Entity.h" -#include "../../../../Header Files/SoundTypes.h" -#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include + +#include "SyncedEntityData.h" +#include "EntityIO.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "EntityPos.h" +#include "Entity.h" +#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "SoundTypes.h" +#include "java/Class.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/DoubleTag.h" +#include "nbt/FloatTag.h" +#include "nbt/ListTag.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "Minecraft.World/x64headers/extraX64.h" thread_local bool Entity::m_tlsUseSmallIds = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.h b/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.h index 5b0a67648..246d6e5e4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.h @@ -1,13 +1,14 @@ #pragma once +#include +#include + #include "nbt/ListTag.h" #include "nbt/DoubleTag.h" #include "nbt/FloatTag.h" -#include "../phys/Vec3.h" -#include "../../../../ConsoleHelpers/Definitions.h" -#include "../phys/AABB.h" -#include -#include +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" class LivingEntity; class LightningBolt; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/EntityIO.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/EntityIO.cpp index c2d7a3350..d221fe19e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/EntityIO.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/EntityIO.cpp @@ -1,18 +1,18 @@ -#include "../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "java/Class.h" #include "Painting.h" #include "java/System.h" #include "Entity.h" -#include "boss/wither/WitherBoss.h" -#include "ambient/net.minecraft.world.entity.ambient.h" -#include "animal/net.minecraft.world.entity.animal.h" -#include "item/net.minecraft.world.entity.item.h" -#include "monster/net.minecraft.world.entity.monster.h" -#include "projectile/net.minecraft.world.entity.projectile.h" -#include "boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "npc/net.minecraft.world.entity.npc.h" +#include "Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h" +#include "Minecraft.World/net/minecraft/world/entity/ambient/net.minecraft.world.entity.ambient.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" +#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" +#include "Minecraft.World/net/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" #include "net.minecraft.world.entity.h" -#include "../level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "nbt/com.mojang.nbt.h" #include "EntityIO.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/EntityPos.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/EntityPos.cpp index 72981740f..0c86bbfdb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/EntityPos.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/EntityPos.cpp @@ -1,6 +1,6 @@ -#include "../../../../Header Files/stdafx.h" -#include "Entity.h" #include "EntityPos.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" EntityPos::EntityPos(double x, double y, double z, float yRot, float xRot) { this->x = x; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/EntityPos.h b/minecraft/Minecraft.World/net/minecraft/world/entity/EntityPos.h index f5df74be1..6ac6d8018 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/EntityPos.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/EntityPos.h @@ -1,5 +1,9 @@ #pragma once +#include + +class Entity; + class EntityPos { public: double x, y, z; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/EntitySelector.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/EntitySelector.cpp index 413fce4bd..dd8683653 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/EntitySelector.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/EntitySelector.cpp @@ -1,6 +1,11 @@ -#include "../../../../Header Files/stdafx.h" -#include "../Container.h" #include "EntitySelector.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" + +class ItemInstance; const EntitySelector* EntitySelector::ENTITY_STILL_ALIVE = new AliveEntitySelector(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/EntitySelector.h b/minecraft/Minecraft.World/net/minecraft/world/entity/EntitySelector.h index 350f73d75..b568ed0c3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/EntitySelector.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/EntitySelector.h @@ -1,5 +1,10 @@ #pragma once +#include + +class Entity; +class ItemInstance; + class EntitySelector { public: static const EntitySelector* ENTITY_STILL_ALIVE; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.cpp index 240928c49..a51fa2fb5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.cpp @@ -1,14 +1,21 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/material/net.minecraft.world.level.material.h" -#include "../phys/net.minecraft.world.phys.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../damageSource/net.minecraft.world.damagesource.h" -#include "nbt/com.mojang.nbt.h" +#include +#include +#include + #include "java/JavaMath.h" -#include "../../SharedConstants.h" #include "ExperienceOrb.h" -#include "../../../../Header Files/SoundTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" const int ExperienceOrb::LIFETIME = 5 * 60 * SharedConstants::TICKS_PER_SECOND; // Five minutes! diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h index 4cd328f68..2c4fb604d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h @@ -1,6 +1,13 @@ #pragma once +#include + #include "Entity.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" + +class Level; +class Player; class ExperienceOrb : public Entity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/FlyingMob.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/FlyingMob.cpp index 8d3213217..fff1b3e34 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/FlyingMob.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/FlyingMob.cpp @@ -1,8 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../phys/net.minecraft.world.phys.h" +#include + #include "FlyingMob.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" FlyingMob::FlyingMob(Level* level) : Mob(level) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/FlyingMob.h b/minecraft/Minecraft.World/net/minecraft/world/entity/FlyingMob.h index 323dd9a35..6a3a41da8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/FlyingMob.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/FlyingMob.h @@ -1,6 +1,7 @@ #pragma once #include "Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/HangingEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/HangingEntity.cpp index 3ed12ec66..5e8757638 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/HangingEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/HangingEntity.cpp @@ -1,11 +1,20 @@ -#include "../../../../Header Files/stdafx.h" -#include "../phys/net.minecraft.world.phys.h" -#include "net.minecraft.world.entity.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../level/net.minecraft.world.level.h" -#include "../damageSource/net.minecraft.world.damagesource.h" -#include "nbt/com.mojang.nbt.h" +#include +#include +#include +#include +#include + #include "HangingEntity.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" void HangingEntity::_init(Level* level) { checkInterval = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/HangingEntity.h b/minecraft/Minecraft.World/net/minecraft/world/entity/HangingEntity.h index 845e0e947..938000276 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/HangingEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/HangingEntity.h @@ -1,7 +1,13 @@ #pragma once +#include + #include "Entity.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" + +class Level; class HangingEntity : public Entity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.cpp index ded3dfd4a..ac1686e55 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.cpp @@ -1,15 +1,20 @@ -#include "../../../../Header Files/stdafx.h" +#include +#include -#include "item/net.minecraft.world.entity.item.h" -#include "../item/net.minecraft.world.item.h" -#include "../phys/net.minecraft.world.phys.h" -#include "../level/net.minecraft.world.level.h" -#include "player/net.minecraft.world.entity.player.h" -#include "net.minecraft.world.entity.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../level/saveddata/net.minecraft.world.level.saveddata.h" -#include "nbt/com.mojang.nbt.h" #include "ItemFrame.h" +#include "Minecraft.World/net/minecraft/world/entity/ItemFrame.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/HangingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/MapItem.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h" // 4J - added for common ctor code void ItemFrame::_init() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.h index b603fb52d..1a625c9e2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.h @@ -1,9 +1,14 @@ #pragma once +#include + #include "Entity.h" #include "HangingEntity.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" class Level; +class Entity; class ItemFrame : public HangingEntity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.cpp index 757ba1daf..a0f80e973 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.cpp @@ -1,9 +1,19 @@ -#include "../../../../Header Files/stdafx.h" -#include "player/net.minecraft.world.entity.player.h" -#include "../item/net.minecraft.world.item.h" -#include "../level/net.minecraft.world.level.h" -#include "../phys/net.minecraft.world.phys.h" +#include +#include + #include "LeashFenceKnotEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/HangingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class CompoundTag; +class Entity; void LeashFenceKnotEntity::_init() { defineSynchedData(); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.h b/minecraft/Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.h index e8b9b411a..01e2abb9a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.h @@ -1,6 +1,13 @@ #pragma once +#include + #include "HangingEntity.h" +#include "java/Class.h" + +class CompoundTag; +class Entity; +class Level; class LeashFenceKnotEntity : public HangingEntity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp index c14248000..14898d007 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp @@ -1,38 +1,72 @@ -#include "../../../../Header Files/stdafx.h" -#include "java/JavaMath.h" -#include "../../util/Mth.h" -#include "../../network/packet/net.minecraft.network.packet.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../phys/net.minecraft.world.phys.h" -#include "net.minecraft.world.entity.h" -#include "ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "ai/control/net.minecraft.world.entity.ai.control.h" -#include "ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "ai/sensing/net.minecraft.world.entity.ai.sensing.h" -#include "player/net.minecraft.world.entity.player.h" -#include "animal/net.minecraft.world.entity.animal.h" -#include "monster/net.minecraft.world.entity.monster.h" -#include "../item/net.minecraft.world.item.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/chunk/net.minecraft.world.level.chunk.h" -#include "../level/material/net.minecraft.world.level.material.h" -#include "../damageSource/net.minecraft.world.damagesource.h" -#include "../effect/net.minecraft.world.effect.h" -#include "../item/alchemy/net.minecraft.world.item.alchemy.h" -#include "../item/enchantment/net.minecraft.world.item.enchantment.h" -#include "../scores/net.minecraft.world.scores.h" -#include "nbt/com.mojang.nbt.h" -#include "LivingEntity.h" +#include +#include #include -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "java/JavaMath.h" +#include "LivingEntity.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "Minecraft.Client/net/minecraft/server/level/EntityTracker.h" -#include "../../../../Header Files/SoundTypes.h" -#include "../../../../Header Files/ParticleTypes.h" -#include "../../stats/GenericStats.h" -#include "item/ItemEntity.h" -#include "../phys/Vec3.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "SoundTypes.h" +#include "java/Class.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/FloatTag.h" +#include "nbt/ListTag.h" +#include "nbt/ShortTag.h" +#include "nbt/Tag.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/network/packet/AnimatePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/CombatTracker.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" +#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/MobType.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Wolf.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "Minecraft.World/net/minecraft/world/level/GameRules.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "Minecraft.World/net/minecraft/world/scores/Team.h" + +class Icon; const double LivingEntity::MIN_MOVEMENT_DISTANCE = 0.005; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.h b/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.h index 4631b1586..3fa36041b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.h @@ -1,10 +1,11 @@ #pragma once #include + #include "Entity.h" #include "MobType.h" -#include "ai/goal/GoalSelector.h" -#include "../../SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" class CombatTracker; class AttributeInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp index 4d7c424cd..1cd5e1a53 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp @@ -1,33 +1,56 @@ -#include "../../../../Header Files/stdafx.h" -#include "java/JavaMath.h" -#include "../../network/packet/net.minecraft.network.packet.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../phys/net.minecraft.world.phys.h" -#include "net.minecraft.world.entity.h" -#include "ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "ai/control/net.minecraft.world.entity.ai.control.h" -#include "ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "ai/sensing/net.minecraft.world.entity.ai.sensing.h" -#include "player/net.minecraft.world.entity.player.h" -#include "animal/net.minecraft.world.entity.animal.h" -#include "monster/net.minecraft.world.entity.monster.h" -#include "../item/net.minecraft.world.item.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/material/net.minecraft.world.level.material.h" -#include "../damageSource/net.minecraft.world.damagesource.h" -#include "../effect/net.minecraft.world.effect.h" -#include "../item/alchemy/net.minecraft.world.item.alchemy.h" -#include "../item/enchantment/net.minecraft.world.item.enchantment.h" -#include "../net.minecraft.world.h" +#include +#include +#include +#include +#include +#include +#include +#include + #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "Minecraft.Client/net/minecraft/server/level/EntityTracker.h" -#include "nbt/com.mojang.nbt.h" -#include "Mob.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "../../../../Header Files/SoundTypes.h" -#include "../../../../Header Files/ParticleTypes.h" -#include "../../stats/GenericStats.h" -#include "item/ItemEntity.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "net/minecraft/world/entity/item/ItemEntity.h" +#include "net/minecraft/world/entity/Mob.h" +#include "ConsoleHelpers/StringHelpers.h" +#include "java/Class.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/FloatTag.h" +#include "nbt/ListTag.h" +#include "net/minecraft/network/packet/SetEntityLinkPacket.h" +#include "net/minecraft/util/Mth.h" +#include "net/minecraft/world/Difficulty.h" +#include "net/minecraft/world/entity/Entity.h" +#include "net/minecraft/world/entity/HangingEntity.h" +#include "net/minecraft/world/entity/LeashFenceKnotEntity.h" +#include "net/minecraft/world/entity/LivingEntity.h" +#include "net/minecraft/world/entity/Mob.h" +#include "net/minecraft/world/entity/SyncedEntityData.h" +#include "net/minecraft/world/entity/TamableAnimal.h" +#include "net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "net/minecraft/world/entity/ai/control/BodyControl.h" +#include "net/minecraft/world/entity/ai/control/JumpControl.h" +#include "net/minecraft/world/entity/ai/control/LookControl.h" +#include "net/minecraft/world/entity/ai/control/MoveControl.h" +#include "net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "net/minecraft/world/entity/ai/sensing/Sensing.h" +#include "net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "net/minecraft/world/entity/player/Abilities.h" +#include "net/minecraft/world/entity/player/Inventory.h" +#include "net/minecraft/world/entity/player/Player.h" +#include "net/minecraft/world/item/ArmorItem.h" +#include "net/minecraft/world/item/Item.h" +#include "net/minecraft/world/item/ItemInstance.h" +#include "net/minecraft/world/item/WeaponItem.h" +#include "net/minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "net/minecraft/world/level/GameRules.h" +#include "net/minecraft/world/level/Level.h" +#include "net/minecraft/world/level/tile/Tile.h" +#include "net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/x64headers/extraX64.h" const float Mob::MAX_WEARING_ARMOR_CHANCE = 0.15f; const float Mob::MAX_PICKUP_LOOT_CHANCE = 0.55f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.h b/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.h index 5761346b2..2fdcbef5e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.h @@ -2,7 +2,7 @@ #include "LivingEntity.h" #include "MobType.h" -#include "ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" class HitResult; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/MobCategory.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/MobCategory.cpp index e9b0cc550..ce02b9ac7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/MobCategory.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/MobCategory.cpp @@ -1,8 +1,6 @@ -#include "../../../../Header Files/stdafx.h" -#include "animal/net.minecraft.world.entity.animal.h" -#include "monster/net.minecraft.world.entity.monster.h" -#include "Creature.h" -#include "../level/material/Material.h" +#include + +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" #include "MobCategory.h" MobCategory* MobCategory::monster = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/MobCategory.h b/minecraft/Minecraft.World/net/minecraft/world/entity/MobCategory.h index a8348c443..c9dc64ab3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/MobCategory.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/MobCategory.h @@ -1,5 +1,10 @@ #pragma once +#include +#include + +#include "java/Class.h" + class Material; class MobCategory { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Painting.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/Painting.cpp index d6c99f61e..c3b355d8b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Painting.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Painting.cpp @@ -1,13 +1,17 @@ -#include "../../../../Header Files/stdafx.h" -#include "../phys/net.minecraft.world.phys.h" -#include "item/net.minecraft.world.entity.item.h" -#include "../item/net.minecraft.world.item.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/material/net.minecraft.world.level.material.h" -#include "../damageSource/net.minecraft.world.damagesource.h" -#include "nbt/com.mojang.nbt.h" +#include +#include +#include + #include "Painting.h" -#include "../level/material/Material.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/HangingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" typedef Painting::Motive _Motive; const _Motive* Painting::Motive::values[] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Painting.h b/minecraft/Minecraft.World/net/minecraft/world/entity/Painting.h index 51d8e24b2..360878229 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Painting.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Painting.h @@ -1,11 +1,15 @@ #pragma once +#include + #include "Entity.h" #include "HangingEntity.h" +#include "java/Class.h" class Level; class CompoundTag; class DamageSource; +class Entity; class Painting : public HangingEntity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.cpp index f7f2809bc..772bbd865 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.cpp @@ -1,15 +1,23 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.world.entity.h" -#include "animal/net.minecraft.world.entity.animal.h" -#include "ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "monster/net.minecraft.world.entity.monster.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/pathfinder/net.minecraft.world.level.pathfinder.h" -#include "../phys/net.minecraft.world.phys.h" -#include "../../SharedConstants.h" +#include + #include "PathfinderMob.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/Goal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/pathfinder/Path.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" AttributeModifier* PathfinderMob::SPEED_MODIFIER_FLEEING = (new AttributeModifier(eModifierId_MOB_FLEEING, 2.0f, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.h b/minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.h index f4d6739bf..8423a4673 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.h @@ -1,9 +1,16 @@ #pragma once +#include + #include "Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" class Level; class Path; +class AttributeModifier; +class Goal; +class Pos; class PathfinderMob : public Mob { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.cpp index e2bcc6492..073bb0697 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.cpp @@ -1,10 +1,12 @@ -#include "../../../../Header Files/stdafx.h" -#include "java/Class.h" -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../net.minecraft.h" -#include "../../network/packet/net.minecraft.network.packet.h" -#include "../item/net.minecraft.world.item.h" +#include +#include + #include "SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" SynchedEntityData::SynchedEntityData() { m_isDirty = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h b/minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h index 8b6a558e0..334526bd7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h @@ -1,6 +1,15 @@ #pragma once +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" + class Pos; +class DataInputStream; +class DataOutputStream; class SynchedEntityData { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp index 72992b5fc..d9f3b07d6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp @@ -1,10 +1,14 @@ -#include "../../../../Header Files/stdafx.h" -#include "ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "net.minecraft.world.entity.h" -#include "../level/net.minecraft.world.level.h" #include "SyncedEntityData.h" -#include "../../../../Header Files/ParticleTypes.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" #include "TamableAnimal.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" TamableAnimal::TamableAnimal(Level* level) : Animal(level) { sitGoal = new SitGoal(this); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.h index 952235668..add4479da 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.h @@ -1,9 +1,15 @@ #pragma once -#include "animal/Animal.h" +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" #include "OwnableEntity.h" class SitGoal; +class Level; +class LivingEntity; class TamableAnimal : public Animal, public OwnableEntity { protected: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.cpp index ad02acdc2..665e0024f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.cpp @@ -1,4 +1,4 @@ -#include "../../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "Attribute.h" const int Attribute::AttributeNames[] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.cpp index b2c455eeb..83cdf78dc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.cpp @@ -1,7 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" +#include +#include #include "AttributeModifier.h" -#include "../../../../util/HtmlString.h" +#include "Minecraft.World/net/minecraft/util/HtmlString.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" void AttributeModifier::_init(eMODIFIER_ID id, const std::wstring name, double amount, int operation) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h index 3db3edcc5..3f97855ba 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h @@ -1,5 +1,8 @@ #pragma once +#include + +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" /* 4J - Both modifier uuid and name have been replaced by an id enum. Note that we have special value "eModifierId_ANONYMOUS" for attribute modifiers that diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.cpp index 0ad423ca9..2310eebe3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.cpp @@ -1,5 +1,3 @@ -#include "../../../../../../Header Files/stdafx.h" - #include "BaseAttribute.h" BaseAttribute::BaseAttribute(eATTRIBUTE_ID id, double defaultValue) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.h index 7fa53f5ab..4d1f3a9bf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.h @@ -1,6 +1,7 @@ #pragma once #include "Attribute.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" class BaseAttribute : public Attribute { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp index 768f3ebae..c697308b0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp @@ -1,6 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.entity.ai.attributes.h" +#include +#include + #include "BaseAttributeMap.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" BaseAttributeMap::~BaseAttributeMap() { for (auto it = attributesById.begin(); it != attributesById.end(); ++it) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h index d468871c1..f89182cf6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h @@ -1,6 +1,14 @@ #pragma once +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" + class ModifiableAttributeInstance; +class AttributeInstance; +class ItemInstance; class BaseAttributeMap { protected: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp index ab44b51b1..8f050ddcc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp @@ -1,6 +1,9 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.entity.ai.attributes.h" +#include +#include + #include "ModifiableAttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" ModifiableAttributeInstance::ModifiableAttributeInstance( BaseAttributeMap* attributeMap, Attribute* attribute) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.h index 2ed250607..34e102143 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.h @@ -1,6 +1,13 @@ #pragma once +#include +#include + #include "AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" + +class Attribute; +class BaseAttributeMap; class ModifiableAttributeInstance : public AttributeInstance { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.cpp index b4c1556cd..40ca3912f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.cpp @@ -1,6 +1,5 @@ -#include "../../../../../../Header Files/stdafx.h" - #include "RangedAttribute.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.h" RangedAttribute::RangedAttribute(eATTRIBUTE_ID id, double defaultValue, double minValue, double maxValue) diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.h index 03c3a330f..e3906ea28 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.h @@ -1,6 +1,7 @@ #pragma once #include "BaseAttribute.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" class RangedAttribute : public BaseAttribute { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp index 901fcc7b2..02b6f94c0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp @@ -1,10 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" +#include +#include +#include -#include "Attribute.h" -#include "RangedAttribute.h" #include "AttributeInstance.h" #include "ModifiableAttributeInstance.h" #include "ServersideAttributeMap.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" AttributeInstance* ServersideAttributeMap::getInstance(Attribute* attribute) { return BaseAttributeMap::getInstance(attribute); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h index 8a2706ef0..fcbdf86f1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "BaseAttributeMap.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" + +class AttributeInstance; class ServersideAttributeMap : public BaseAttributeMap { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/BodyControl.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/BodyControl.cpp index db6da03a5..e1865a174 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/BodyControl.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/BodyControl.cpp @@ -1,7 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.entity.h" -#include "net.minecraft.world.entity.ai.control.h" +#include +#include + #include "BodyControl.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.h" const float BodyControl::maxClampAngle = 75.0f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/BodyControl.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/BodyControl.h index 35981d719..e03be11d0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/BodyControl.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/BodyControl.h @@ -2,6 +2,8 @@ #include "Control.h" +class LivingEntity; + class BodyControl : public Control { private: LivingEntity* mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/JumpControl.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/JumpControl.cpp index fee781cc1..386e618a0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/JumpControl.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/JumpControl.cpp @@ -1,6 +1,5 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.entity.h" #include "JumpControl.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" JumpControl::JumpControl(Mob* mob) { _jump = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.cpp index da6984ef2..32bcbccfa 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.cpp @@ -1,8 +1,14 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../phys/net.minecraft.world.phys.h" +#include +#include + #include "LookControl.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" LookControl::LookControl(Mob* mob) { yMax = xMax = 0.0f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h index 949a647d6..561387322 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "Control.h" class Mob; +class Entity; class LookControl : public Control { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.cpp index 98f408804..4487f36a7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.cpp @@ -1,10 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.entity.h" -#include "../attributes/net.minecraft.world.entity.ai.attributes.h" -#include "net.minecraft.world.entity.ai.control.h" -#include "../../monster/net.minecraft.world.entity.monster.h" -#include "../../../phys/net.minecraft.world.phys.h" +#include +#include + #include "MoveControl.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/JumpControl.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" const float MoveControl::MIN_SPEED = 0.0005f; const float MoveControl::MIN_SPEED_SQR = MIN_SPEED * MIN_SPEED; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp index 39fce93c0..0d01451cf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp @@ -1,14 +1,21 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../sensing/net.minecraft.world.entity.ai.sensing.h" -#include "../util/net.minecraft.world.entity.ai.util.h" -#include "../../net.minecraft.world.entity.h" -#include "../../animal/net.minecraft.world.entity.animal.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../level/pathfinder/net.minecraft.world.level.pathfinder.h" -#include "../../../phys/net.minecraft.world.phys.h" +#include +#include +#include + #include "AvoidPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/pathfinder/Path.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" AvoidPlayerGoalEntitySelector::AvoidPlayerGoalEntitySelector( AvoidPlayerGoal* parent) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h index 238c6f8fe..8b5da1fe5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h @@ -1,12 +1,16 @@ #pragma once +#include +#include + #include "Goal.h" -#include "../../EntitySelector.h" +#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" class PathNavigation; class PathfinderMob; class Path; class AvoidPlayerGoal; +class Entity; class AvoidPlayerGoalEntitySelector : public EntitySelector { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BegGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BegGoal.cpp index 91d5b295f..f18955620 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BegGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BegGoal.cpp @@ -1,10 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../../animal/net.minecraft.world.entity.animal.h" -#include "../../player/net.minecraft.world.entity.player.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../item/net.minecraft.world.item.h" #include "BegGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Wolf.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" BegGoal::BegGoal(Wolf* wolf, float lookDistance) { player = std::weak_ptr(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BegGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BegGoal.h index 42142cba6..1509fecfb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BegGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BegGoal.h @@ -1,8 +1,12 @@ #pragma once +#include + #include "Goal.h" class Wolf; +class Level; +class Player; class BegGoal : public Goal { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp index adcb92346..f7ce66ae5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp @@ -1,10 +1,12 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../level/tile/net.minecraft.world.level.tile.h" -#include "../../../net.minecraft.world.h" -#include "../../../../SharedConstants.h" #include "BreakDoorGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/Difficulty.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.h" +#include "Minecraft.World/net/minecraft/world/level/GameRules.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DoorTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" BreakDoorGoal::BreakDoorGoal(Mob* mob) : DoorInteractGoal(mob) { breakTime = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreakDoorGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreakDoorGoal.h index 43ff82536..0534a276b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreakDoorGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreakDoorGoal.h @@ -1,7 +1,10 @@ #pragma once #include "DoorInteractGoal.h" -#include "../../../../SharedConstants.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" + +class Mob; class BreakDoorGoal : public DoorInteractGoal { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp index 75393f182..b89d9062d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp @@ -1,14 +1,23 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../animal/net.minecraft.world.entity.animal.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../phys/net.minecraft.world.phys.h" -#include "BreedGoal.h" #include -#include "../../ExperienceOrb.h" +#include +#include -#include "../../../../stats/GenericStats.h" +#include "BreedGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/AgeableMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Entity; BreedGoal::BreedGoal(Animal* animal, double speedModifier) { partner = std::weak_ptr(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h index 2cc5436de..f480770c1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "Goal.h" class Animal; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp index 326819505..fd89c53ff 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp @@ -1,12 +1,29 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.entity.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../../player/net.minecraft.world.entity.player.h" -#include "../../../item/net.minecraft.world.item.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../level/tile/net.minecraft.world.level.tile.h" -#include "../../../level/pathfinder/net.minecraft.world.level.pathfinder.h" +#include +#include +#include +#include +#include + #include "ControlledByPlayerGoal.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/JumpControl.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/FishingRodItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/pathfinder/Node.h" +#include "Minecraft.World/net/minecraft/world/level/pathfinder/PathFinder.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" ControlledByPlayerGoal::ControlledByPlayerGoal(Mob* mob, float maxSpeed, float walkSpeed) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h index bd992ea2a..96ded97f2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h @@ -1,7 +1,8 @@ #pragma once #include "Goal.h" -#include "../../../../SharedConstants.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" class Mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.cpp index c153f1af8..62b89d5b7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.cpp @@ -1,10 +1,14 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.entity.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../level/pathfinder/net.minecraft.world.level.pathfinder.h" -#include "../../../level/tile/net.minecraft.world.level.tile.h" +#include + #include "DoorInteractGoal.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/pathfinder/Node.h" +#include "Minecraft.World/net/minecraft/world/level/pathfinder/Path.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DoorTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" DoorInteractGoal::DoorInteractGoal(Mob* mob) { doorX = doorY = doorZ = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.h index 56dcde469..7746441a2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.h @@ -3,6 +3,7 @@ #include "Goal.h" class DoorTile; +class Mob; class DoorInteractGoal : public Goal { protected: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/EatTileGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/EatTileGoal.cpp index 6b2782a26..dff2a377c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/EatTileGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/EatTileGoal.cpp @@ -1,10 +1,16 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../level/tile/net.minecraft.world.level.tile.h" +#include + #include "EatTileGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" EatTileGoal::EatTileGoal(Mob* mob) { eatAnimationTick = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/EatTileGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/EatTileGoal.h index b22aa9394..35c632591 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/EatTileGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/EatTileGoal.h @@ -1,7 +1,11 @@ #pragma once #include "Goal.h" -#include "../../../../SharedConstants.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" + +class Level; +class Mob; // note: Mob should implement handleEntityEvent for client state, also ate to // take action upon eating diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FleeSunGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FleeSunGoal.cpp index 8c7a442b6..4b03e604b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FleeSunGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FleeSunGoal.cpp @@ -1,12 +1,14 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../phys/net.minecraft.world.phys.h" -#include "FleeSunGoal.h" #include +#include "FleeSunGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + FleeSunGoal::FleeSunGoal(PathfinderMob* mob, double speedModifier) { this->mob = mob; this->speedModifier = speedModifier; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FleeSunGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FleeSunGoal.h index b2a7fbb56..e253fb1d3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FleeSunGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FleeSunGoal.h @@ -2,8 +2,12 @@ #include -#include "../../../phys/Vec3.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" #include "Goal.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" + +class Level; +class PathfinderMob; class FleeSunGoal : public Goal { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.cpp index aceda0d62..6f5458d84 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.cpp @@ -1,8 +1,9 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.entity.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" #include "FloatGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/JumpControl.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" FloatGoal::FloatGoal(Mob* mob) { this->mob = mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp index dfcc91b39..606e674c2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp @@ -1,11 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../net.minecraft.world.entity.h" -#include "../../animal/net.minecraft.world.entity.animal.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../phys/net.minecraft.world.phys.h" #include "FollowOwnerGoal.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" FollowOwnerGoal::FollowOwnerGoal(TamableAnimal* tamable, double speedModifier, float startDistance, float stopDistance) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.h index 4ae89fabf..3231a72b6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.h @@ -1,9 +1,13 @@ #pragma once +#include + #include "Goal.h" class PathNavigation; class TamableAnimal; +class Level; +class LivingEntity; class FollowOwnerGoal : public Goal { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.cpp index 1a8dfc4fa..f2b9b8116 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.cpp @@ -1,10 +1,14 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../animal/net.minecraft.world.entity.animal.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../phys/net.minecraft.world.phys.h" -#include "FollowParentGoal.h" #include +#include +#include + +#include "FollowParentGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Entity; FollowParentGoal::FollowParentGoal(Animal* animal, double speedModifier) { timeToRecalcPath = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.h index e2a0700e9..0f3e04c6c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "Goal.h" class Animal; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/Goal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/Goal.cpp index 3e47f4251..013ff5e8b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/Goal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/Goal.cpp @@ -1,4 +1,3 @@ -#include "../../../../../../Header Files/stdafx.h" #include "Goal.h" Goal::Goal() { _requiredControlFlags = 0; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/Goal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/Goal.h index 89e941de1..793b9dae7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/Goal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/Goal.h @@ -1,5 +1,7 @@ #pragma once +class Level; + class Goal { private: int _requiredControlFlags; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.cpp index 62432d92e..e453f1e61 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.cpp @@ -1,6 +1,12 @@ -#include "../../../../../../Header Files/stdafx.h" +#include +#include +#include + #include "Goal.h" -#include "GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" + +class Level; GoalSelector::InternalGoal::InternalGoal(int prio, Goal* goal, bool canDeletePointer) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/InteractGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/InteractGoal.cpp index 4a66753f8..dc7b8824b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/InteractGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/InteractGoal.cpp @@ -1,6 +1,8 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" #include "InteractGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" + +class Mob; InteractGoal::InteractGoal(Mob* mob, const std::type_info& lookAtType, float lookDistance) diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/InteractGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/InteractGoal.h index 5b6011f16..05f858a76 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/InteractGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/InteractGoal.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "LookAtPlayerGoal.h" +class Mob; + class InteractGoal : public LookAtPlayerGoal { public: InteractGoal(Mob* mob, const std::type_info& lookAtType, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp index a00e3cddb..47450e067 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp @@ -1,7 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../../net.minecraft.world.entity.h" +#include + #include "LeapAtTargetGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" LeapAtTargetGoal::LeapAtTargetGoal(Mob* mob, float yd) { target = std::weak_ptr(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h index 88bdeddc2..f79223ebb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h @@ -1,7 +1,12 @@ #pragma once +#include + #include "Goal.h" +class LivingEntity; +class Mob; + class LeapAtTargetGoal : public Goal { private: Mob* mob; // Owner of this goal diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.cpp index e89bd5529..011a390a4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.cpp @@ -1,9 +1,12 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.entity.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../phys/net.minecraft.world.phys.h" #include "LookAtPlayerGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" LookAtPlayerGoal::LookAtPlayerGoal(Mob* mob, const std::type_info& lookAtType, float lookDistance) diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h index 146d55866..ca6f4df1a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h @@ -1,9 +1,13 @@ #pragma once +#include +#include + #include "Goal.h" class Mob; class Level; +class Entity; class LookAtPlayerGoal : public Goal { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp index 78c7e6f1a..67dd88de6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp @@ -1,7 +1,12 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../player/net.minecraft.world.entity.player.h" -#include "../../npc/net.minecraft.world.entity.npc.h" +#include + #include "LookAtTradingPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" + +class Entity; +class Mob; LookAtTradingPlayerGoal::LookAtTradingPlayerGoal(Villager* villager) : LookAtPlayerGoal((Mob*)villager, typeid(Player), 8) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp index 8b541e5bd..939c7a783 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp @@ -1,12 +1,17 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../village/net.minecraft.world.entity.ai.village.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../npc/net.minecraft.world.entity.npc.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../phys/net.minecraft.world.phys.h" #include "MakeLoveGoal.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/Village.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h" +#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" MakeLoveGoal::MakeLoveGoal(Villager* villager) { village = std::weak_ptr(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MakeLoveGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MakeLoveGoal.h index c7ef79910..c61c4d5d9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MakeLoveGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MakeLoveGoal.h @@ -1,9 +1,12 @@ #pragma once +#include + #include "Goal.h" class Villager; class Village; +class Level; class MakeLoveGoal : public Goal { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.cpp index 4aa25fadf..9b15421a3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.cpp @@ -1,13 +1,16 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.entity.h" -#include "../../monster/net.minecraft.world.entity.monster.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../../../level/pathfinder/Path.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../sensing/net.minecraft.world.entity.ai.sensing.h" -#include "../../../phys/net.minecraft.world.phys.h" +#include + +#include "Minecraft.World/net/minecraft/world/level/pathfinder/Path.h" #include "MeleeAttackGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" void MeleeAttackGoal::_init(PathfinderMob* mob, double speedModifier, bool trackTarget) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.h index 7f481e00c..1a9853df6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.h @@ -3,6 +3,7 @@ #include #include "Goal.h" +#include "java/Class.h" class Level; class PathfinderMob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveIndoorsGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveIndoorsGoal.cpp index 64967527c..4da52888b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveIndoorsGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveIndoorsGoal.cpp @@ -1,12 +1,18 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../util/net.minecraft.world.entity.ai.util.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../village/net.minecraft.world.entity.ai.village.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../level/dimension/net.minecraft.world.level.dimension.h" +#include + #include "MoveIndoorsGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/Village.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" MoveIndoorsGoal::MoveIndoorsGoal(PathfinderMob* mob) { insideX = insideZ = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveIndoorsGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveIndoorsGoal.h index d0c55491d..ac20343e4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveIndoorsGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveIndoorsGoal.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "Goal.h" class PathfinderMob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp index 3a4be0632..b52835f8f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp @@ -1,13 +1,19 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../util/net.minecraft.world.entity.ai.util.h" -#include "../village/net.minecraft.world.entity.ai.village.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../level/net.minecraft.world.level.h" -#include "MoveThroughVillageGoal.h" #include -#include "../../../level/pathfinder/Path.h" +#include +#include + +#include "MoveThroughVillageGoal.h" +#include "Minecraft.World/net/minecraft/world/level/pathfinder/Path.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/Village.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" MoveThroughVillageGoal::MoveThroughVillageGoal(PathfinderMob* mob, double speedModifier, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.h index aaa946cf6..71f62b25e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.h @@ -1,10 +1,14 @@ #pragma once +#include +#include + #include "Goal.h" class PathfinderMob; class Path; class DoorInfo; +class Village; class MoveThroughVillageGoal : public Goal { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.cpp index 54401a934..8d2110c49 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.cpp @@ -1,10 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../util/net.minecraft.world.entity.ai.util.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../level/net.minecraft.world.level.h" +#include +#include + #include "MoveTowardsRestrictionGoal.h" +#include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" MoveTowardsRestrictionGoal::MoveTowardsRestrictionGoal(PathfinderMob* mob, double speedModifier) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h index c1922f491..a7146fa4d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h @@ -2,6 +2,8 @@ #include "Goal.h" +class PathfinderMob; + class MoveTowardsRestrictionGoal : public Goal { private: PathfinderMob* mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.cpp index eeb56fa66..0eb4cefab 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.cpp @@ -1,10 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../util/net.minecraft.world.entity.ai.util.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../phys/net.minecraft.world.phys.h" +#include + #include "MoveTowardsTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" MoveTowardsTargetGoal::MoveTowardsTargetGoal(PathfinderMob* mob, double speedModifier, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.h index 7f08cfdaf..327801048 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.h @@ -1,7 +1,12 @@ #pragma once +#include + #include "Goal.h" +class LivingEntity; +class PathfinderMob; + class MoveTowardsTargetGoal : public Goal { private: PathfinderMob* mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.cpp index 7b6152575..53c53ba80 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.cpp @@ -1,10 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../net.minecraft.world.entity.h" -#include "../../animal/net.minecraft.world.entity.animal.h" -#include "../../../phys/net.minecraft.world.phys.h" +#include + #include "OcelotAttackGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" OcelotAttackGoal::OcelotAttackGoal(Mob* mob) { target = std::weak_ptr(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.h index e756a41db..594085579 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.h @@ -1,7 +1,13 @@ #pragma once +#include + #include "Goal.h" +class Level; +class LivingEntity; +class Mob; + class OcelotAttackGoal : public Goal { private: Level* level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp index c4955de36..7c5f478e3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp @@ -1,14 +1,17 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "net.minecraft.world.entity.ai.goal.h" -#include "../../animal/net.minecraft.world.entity.animal.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../level/tile/net.minecraft.world.level.tile.h" -#include "../../../level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "java/Arrays.h" -#include "OcelotSitOnTileGoal.h" #include +#include + +#include "OcelotSitOnTileGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BedTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h" const int OcelotSitOnTileGoal::GIVE_UP_TICKS = 3 * SharedConstants::TICKS_PER_SECOND; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.h index 11d979174..cdbdcf712 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.h @@ -3,6 +3,7 @@ #include "Goal.h" class Ocelot; +class Level; class OcelotSitOnTileGoal : public Goal { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.cpp index 49c367559..954b77131 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.cpp @@ -1,10 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../../npc/net.minecraft.world.entity.npc.h" -#include "../../animal/net.minecraft.world.entity.animal.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../phys/net.minecraft.world.phys.h" #include "OfferFlowerGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h" +#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" OfferFlowerGoal::OfferFlowerGoal(VillagerGolem* golem) { this->golem = golem; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.h index 013f50455..b139befb3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "Goal.h" class VillagerGolem; +class Villager; class OfferFlowerGoal : public Goal { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp index 6c607fee9..769d79d2b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp @@ -1,7 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../level/tile/net.minecraft.world.level.tile.h" #include "OpenDoorGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/DoorInteractGoal.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DoorTile.h" OpenDoorGoal::OpenDoorGoal(Mob* mob, bool closeDoorAfter) : DoorInteractGoal(mob) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OpenDoorGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OpenDoorGoal.h index 794082d52..910ec04c4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OpenDoorGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/OpenDoorGoal.h @@ -2,6 +2,8 @@ #include "DoorInteractGoal.h" +class Mob; + class OpenDoorGoal : public DoorInteractGoal { private: bool closeDoor; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.cpp index ea57ecdd6..c3315ff49 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.cpp @@ -1,10 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../util/net.minecraft.world.entity.ai.util.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../phys/net.minecraft.world.phys.h" +#include +#include + #include "PanicGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" PanicGoal::PanicGoal(PathfinderMob* mob, double speedModifier) { this->mob = mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PlayGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PlayGoal.cpp index 98b2f1ba2..e49b9a263 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PlayGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PlayGoal.cpp @@ -1,13 +1,20 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../util/net.minecraft.world.entity.ai.util.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../npc/net.minecraft.world.entity.npc.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../phys/net.minecraft.world.phys.h" -#include "PlayGoal.h" #include +#include +#include +#include + +#include "PlayGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" +#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" PlayGoal::PlayGoal(Villager* mob, double speedModifier) { followFriend = std::weak_ptr(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PlayGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PlayGoal.h index 9a8142485..1cf82cf4f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PlayGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/PlayGoal.h @@ -1,7 +1,12 @@ #pragma once +#include + #include "Goal.h" +class LivingEntity; +class Villager; + class PlayGoal : public Goal { private: Villager* mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.cpp index 9194e53db..09210488c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.cpp @@ -1,7 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.entity.h" -#include "../control/net.minecraft.world.entity.ai.control.h" +#include +#include + #include "RandomLookAroundGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" RandomLookAroundGoal::RandomLookAroundGoal(Mob* mob) { relX = relZ = 0.0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h index a4d179632..1d5667de0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h @@ -2,6 +2,8 @@ #include "Goal.h" +class Mob; + class RandomLookAroundGoal : public Goal { private: Mob* mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp index f1f4de473..a7ae19df3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp @@ -1,11 +1,14 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.entity.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../util/net.minecraft.world.entity.ai.util.h" -#include "../../../phys/net.minecraft.world.phys.h" -#include "../../../../SharedConstants.h" +#include +#include + #include "RandomStrollGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" RandomStrollGoal::RandomStrollGoal(PathfinderMob* mob, double speedModifier) { this->mob = mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp index 96e196c83..ad80f4787 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp @@ -1,11 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../sensing/net.minecraft.world.entity.ai.sensing.h" -#include "../../net.minecraft.world.entity.h" -#include "../../monster/net.minecraft.world.entity.monster.h" -#include "../../../phys/net.minecraft.world.phys.h" #include "RangedAttackGoal.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/RangedAttackMob.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" void RangedAttackGoal::_init(RangedAttackMob* rangedMob, Mob* mob, double speedModifier, int attackIntervalMin, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.h index 04027cf63..244cd126c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.h @@ -1,8 +1,12 @@ #pragma once +#include + #include "Goal.h" class RangedAttackMob; +class LivingEntity; +class Mob; class RangedAttackGoal : public Goal { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.cpp index 939cb14e5..f9198babb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.cpp @@ -1,9 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../village/net.minecraft.world.entity.ai.village.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../level/net.minecraft.world.level.h" #include "RestrictOpenDoorGoal.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/Village.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" RestrictOpenDoorGoal::RestrictOpenDoorGoal(PathfinderMob* mob) { this->mob = mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.h index 3311dadc7..d8529680d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "Goal.h" class PathfinderMob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictSunGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictSunGoal.cpp index 6bfffa2e3..00a449014 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictSunGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictSunGoal.cpp @@ -1,8 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../level/net.minecraft.world.level.h" #include "RestrictSunGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" RestrictSunGoal::RestrictSunGoal(PathfinderMob* mob) { this->mob = mob; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictSunGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictSunGoal.h index 9ecba9d41..b746a5b66 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictSunGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictSunGoal.h @@ -2,6 +2,8 @@ #include "Goal.h" +class PathfinderMob; + class RestrictSunGoal : public Goal { private: PathfinderMob* mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.cpp index 871d41ccf..4c335433f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.cpp @@ -1,12 +1,20 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.entity.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../../animal/net.minecraft.world.entity.animal.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../player/net.minecraft.world.entity.player.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../util/RandomPos.h" +#include +#include + +#include "Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h" #include "RunAroundLikeCrazyGoal.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" RunAroundLikeCrazyGoal::RunAroundLikeCrazyGoal(EntityHorse* mob, double speedModifier) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.cpp index 240a90941..75d9e3fb7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.cpp @@ -1,10 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "net.minecraft.world.entity.ai.goal.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../net.minecraft.world.entity.h" -#include "../../animal/net.minecraft.world.entity.animal.h" +#include + #include "SitGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" SitGoal::SitGoal(TamableAnimal* mob) { _wantToSit = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.h index 543920bda..cde421ee5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.h @@ -2,6 +2,8 @@ #include "Goal.h" +class TamableAnimal; + class SitGoal : public Goal { private: TamableAnimal* mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SwellGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SwellGoal.cpp index 63edc3a94..3841c5e9e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SwellGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SwellGoal.cpp @@ -1,9 +1,9 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../sensing/net.minecraft.world.entity.ai.sensing.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../monster/net.minecraft.world.entity.monster.h" #include "SwellGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Creeper.h" SwellGoal::SwellGoal(Creeper* creeper) { target = std::weak_ptr(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SwellGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SwellGoal.h index 82fbd0a09..b0973ab84 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SwellGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/SwellGoal.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "Goal.h" class Creeper; +class LivingEntity; class SwellGoal : public Goal { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp index f7690651a..b39e6fdfc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp @@ -1,12 +1,18 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "net.minecraft.world.entity.ai.goal.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../npc/net.minecraft.world.entity.npc.h" -#include "../../animal/net.minecraft.world.entity.animal.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../phys/net.minecraft.world.phys.h" +#include +#include + #include "TakeFlowerGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h" +#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Entity; TakeFlowerGoal::TakeFlowerGoal(Villager* villager) { takeFlower = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TakeFlowerGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TakeFlowerGoal.h index d1c95f619..b7aca8548 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TakeFlowerGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TakeFlowerGoal.h @@ -1,7 +1,12 @@ #pragma once +#include + #include "Goal.h" +class Villager; +class VillagerGolem; + class TakeFlowerGoal : public Goal { private: Villager* villager; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.cpp index 0a0cd5bc5..7c16efd0e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.cpp @@ -1,10 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../player/net.minecraft.world.entity.player.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../level/net.minecraft.world.level.h" +#include + #include "TemptGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/LookControl.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" TemptGoal::TemptGoal(PathfinderMob* mob, double speedModifier, int itemId, bool canScare) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.h index 860d30e64..0451c6b7d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.h @@ -1,7 +1,12 @@ #pragma once +#include + #include "Goal.h" +class PathfinderMob; +class Player; + class TemptGoal : public Goal { private: PathfinderMob* mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp index a0b44fd5a..182051500 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp @@ -1,9 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../npc/net.minecraft.world.entity.npc.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../../inventory/net.minecraft.world.inventory.h" +#include + #include "TradeWithPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/Control.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" TradeWithPlayerGoal::TradeWithPlayerGoal(Villager* mob) { this->mob = mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp index 33de3fa47..a9ab0a3c9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp @@ -1,7 +1,10 @@ -#include "../../../../../../../Header Files/stdafx.h" -#include "../../village/net.minecraft.world.entity.ai.village.h" -#include "../../../animal/net.minecraft.world.entity.animal.h" #include "DefendVillageTargetGoal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/Village.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h" DefendVillageTargetGoal::DefendVillageTargetGoal(VillagerGolem* golem) : TargetGoal(golem, false, true) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.h index ac0b4758a..b0350c238 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "TargetGoal.h" class VillagerGolem; +class LivingEntity; class DefendVillageTargetGoal : public TargetGoal { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp index c192c6e8e..6d0967422 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp @@ -1,8 +1,14 @@ -#include "../../../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.world.entity.h" -#include "../../../../phys/net.minecraft.world.phys.h" -#include "../../../../level/net.minecraft.world.level.h" +#include +#include +#include + #include "HurtByTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Entity; HurtByTargetGoal::HurtByTargetGoal(PathfinderMob* mob, bool alertSameType) : TargetGoal(mob, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h index a58baa11f..53069cd09 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h @@ -2,6 +2,8 @@ #include "TargetGoal.h" +class PathfinderMob; + class HurtByTargetGoal : public TargetGoal { private: bool alertSameType; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp index f65903466..d61198e0b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp @@ -1,8 +1,17 @@ -#include "../../../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.world.entity.h" -#include "../../../../level/net.minecraft.world.level.h" -#include "../../../../phys/net.minecraft.world.phys.h" +#include +#include +#include + #include "NearestAttackableTargetGoal.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" SubselectEntitySelector::SubselectEntitySelector( NearestAttackableTargetGoal* parent, EntitySelector* subselector) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h index be6b1b0ee..b3421bd4b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h @@ -1,9 +1,15 @@ #pragma once +#include +#include + #include "TargetGoal.h" -#include "../../../EntitySelector.h" +#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" class NearestAttackableTargetGoal; +class Entity; +class LivingEntity; +class PathfinderMob; // Anonymous class from NearestAttackableTargetGoal class SubselectEntitySelector : public EntitySelector { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.cpp index 7571df9ee..7bd8ecdc2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.cpp @@ -1,6 +1,6 @@ -#include "../../../../../../../Header Files/stdafx.h" -#include "../../../animal/net.minecraft.world.entity.animal.h" #include "NonTameRandomTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" NonTameRandomTargetGoal::NonTameRandomTargetGoal( TamableAnimal* mob, const std::type_info& targetType, int randomInterval, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h index 431ad7ceb..f0389f20e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "NearestAttackableTargetGoal.h" class TamableAnimal; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.cpp index 9ed01290a..2733d4988 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.cpp @@ -1,7 +1,8 @@ -#include "../../../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.world.entity.h" -#include "../../../animal/net.minecraft.world.entity.animal.h" #include "OwnerHurtByTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h" OwnerHurtByTargetGoal::OwnerHurtByTargetGoal(TamableAnimal* tameAnimal) : TargetGoal(tameAnimal, 32, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.h index 19257c3a6..2976373ff 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "TargetGoal.h" class TamableAnimal; +class LivingEntity; class OwnerHurtByTargetGoal : public TargetGoal { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.cpp index 4cff6e933..f02d44667 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.cpp @@ -1,7 +1,8 @@ -#include "../../../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.world.entity.h" -#include "../../../animal/net.minecraft.world.entity.animal.h" #include "OwnerHurtTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h" OwnerHurtTargetGoal::OwnerHurtTargetGoal(TamableAnimal* tameAnimal) : TargetGoal(tameAnimal, 32, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.h index 60927d987..9d84a7b06 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "TargetGoal.h" class TamableAnimal; +class LivingEntity; class OwnerHurtTargetGoal : public TargetGoal { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.cpp index 7b98248fd..64b878b37 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.cpp @@ -1,14 +1,20 @@ -#include "../../../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.world.entity.h" -#include "../../attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../../navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../sensing/net.minecraft.world.entity.ai.sensing.h" -#include "../../../animal/net.minecraft.world.entity.animal.h" -#include "../../../monster/net.minecraft.world.entity.monster.h" -#include "../../../player/net.minecraft.world.entity.player.h" -#include "../../../../level/pathfinder/net.minecraft.world.level.pathfinder.h" -#include "../../../../phys/net.minecraft.world.phys.h" +#include + #include "TargetGoal.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/OwnableEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/pathfinder/Node.h" +#include "Minecraft.World/net/minecraft/world/level/pathfinder/Path.h" void TargetGoal::_init(PathfinderMob* mob, bool mustSee, bool mustReach) { reachCache = EmptyReachCache; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h index d4957909b..d2bbaceab 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/target/TargetGoal.h @@ -1,8 +1,11 @@ #pragma once -#include "../Goal.h" +#include + +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/Goal.h" class PathfinderMob; +class LivingEntity; class TargetGoal : public Goal { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.cpp index 3d1ff3ab6..0f5f2ee84 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.cpp @@ -1,14 +1,20 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../level/pathfinder/net.minecraft.world.level.pathfinder.h" -#include "../../net.minecraft.world.entity.h" -#include "../attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../control/net.minecraft.world.entity.ai.control.h" -#include "../../monster/net.minecraft.world.entity.monster.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../level/tile/net.minecraft.world.level.tile.h" -#include "../../../phys/net.minecraft.world.phys.h" +#include +#include + #include "PathNavigation.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/pathfinder/Node.h" +#include "Minecraft.World/net/minecraft/world/level/pathfinder/Path.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Entity; PathNavigation::PathNavigation(Mob* mob, Level* level) { this->mob = mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h index 0d5843281..fcce7543b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h @@ -1,8 +1,14 @@ #pragma once +#include + +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" + class Mob; class Level; class Path; +class AttributeInstance; +class Entity; class PathNavigation { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.cpp index b81f73fc9..bef4b54bd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.cpp @@ -1,6 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.entity.h" #include "Sensing.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" + +class Entity; Sensing::Sensing(Mob* mob) { this->mob = mob; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.h index 50ad985d8..d2b5ce868 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/sensing/Sensing.h @@ -1,5 +1,11 @@ #pragma once +#include +#include + +class Entity; +class Mob; + class Sensing { private: Mob* mob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.cpp index a6476c848..b4d71eecd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.cpp @@ -1,9 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../phys/net.minecraft.world.phys.h" -#include "RandomPos.h" #include +#include "RandomPos.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" + Vec3 RandomPos::tempDir = Vec3(0, 0, 0); std::optional RandomPos::getPos( diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h index b7bd8f394..0a77e7b70 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/util/RandomPos.h @@ -1,6 +1,10 @@ #pragma once #include +#include + +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" + class PathfinderMob; class RandomPos { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.cpp index 26d74bf42..33c9a197b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.cpp @@ -1,4 +1,4 @@ -#include "../../../../../../Header Files/stdafx.h" +#include #include "DoorInfo.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.cpp index b76565684..59deefd18 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.cpp @@ -1,13 +1,25 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.entity.ai.village.h" -#include "../../npc/net.minecraft.world.entity.npc.h" -#include "../../animal/net.minecraft.world.entity.animal.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../level/tile/net.minecraft.world.level.tile.h" -#include "../../../phys/net.minecraft.world.phys.h" -#include "Village.h" +#include #include #include +#include +#include +#include + +#include "Village.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h" +#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Entity; Village::Aggressor::Aggressor(std::shared_ptr mob, int timeStamp) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.h index 111d0a349..c8d2becae 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.h @@ -1,6 +1,21 @@ #pragma once #include +#include +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" + +class CompoundTag; +class Level; +class Pos; + class Village { private: Level* level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.cpp index 61413bacb..2ac97a81a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.cpp @@ -1,10 +1,19 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.entity.ai.village.h" -#include "../../net.minecraft.world.entity.h" -#include "../../monster/net.minecraft.world.entity.monster.h" -#include "../../../level/net.minecraft.world.level.h" -#include "VillageSiege.h" +#include #include +#include +#include +#include + +#include "VillageSiege.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.World/net/minecraft/world/entity/MobCategory.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/Village.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Zombie.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/MobSpawner.h" VillageSiege::VillageSiege(Level* level) { hasSetupSiege = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.h index 35456c3aa..a8d75cc2a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.h @@ -1,6 +1,12 @@ #pragma once #include +#include + +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" + +class Level; +class Village; class VillageSiege { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.cpp index 06a7a4fd6..b0d44fe1c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.cpp @@ -1,11 +1,14 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.entity.ai.village.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../level/tile/net.minecraft.world.level.tile.h" -#include "../../../phys/net.minecraft.world.phys.h" -#include "Villages.h" +#include #include +#include "Villages.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DoorTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + const std::wstring Villages::VILLAGE_FILE_ID = L"villages"; Villages::Villages(const std::wstring& id) : SavedData(id) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h index 44197ea0e..0e5d95e5c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h @@ -1,6 +1,18 @@ #pragma once -#include "../../../level/saveddata/SavedData.h" +#include +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/DoorInfo.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/Village.h" +#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" + +class Level; +class Pos; class Villages : public SavedData { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/AmbientCreature.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/AmbientCreature.cpp index 58867f25a..5b1f11a35 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/AmbientCreature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/AmbientCreature.cpp @@ -1,7 +1,9 @@ -#include "../../../../../Header Files/stdafx.h" +#include #include "AmbientCreature.h" +class Level; + AmbientCreature::AmbientCreature(Level* level) : Mob(level) {} bool AmbientCreature::canBeLeashed() { return false; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/AmbientCreature.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/AmbientCreature.h index 05e2b6a22..220edfea5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/AmbientCreature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/AmbientCreature.h @@ -1,7 +1,10 @@ #pragma once -#include "../Mob.h" -#include "../Creature.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/Creature.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" + +class Level; class AmbientCreature : public Mob, public Creature { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.cpp index e38ba3315..30c964df8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.cpp @@ -1,11 +1,22 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.entity.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../monster/net.minecraft.world.entity.monster.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" +#include +#include +#include +#include + #include "Bat.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ambient/AmbientCreature.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/level/Calendar.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" Bat::Bat(Level* level) : AmbientCreature(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.h index a7eedff8f..1271ba66b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ambient/Bat.h @@ -1,6 +1,11 @@ #pragma once #include "AmbientCreature.h" +#include "java/Class.h" + +class Entity; +class Level; +class Pos; class Bat : public AmbientCreature { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.cpp index e8dae6994..ec0b8a9bb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.cpp @@ -1,17 +1,17 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "nbt/com.mojang.nbt.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/storage/net.minecraft.world.level.storage.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../net.minecraft.world.entity.h" -#include "../projectile/net.minecraft.world.entity.projectile.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../monster/net.minecraft.world.entity.monster.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" +#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" #include "java/Random.h" #include "Animal.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.h index 05fa94eea..617004bcb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.h @@ -1,6 +1,6 @@ #pragma once -#include "../AgeableMob.h" -#include "../Creature.h" +#include "Minecraft.World/net/minecraft/world/entity/AgeableMob.h" +#include "Minecraft.World/net/minecraft/world/entity/Creature.h" class Level; class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.cpp index 7aa99a326..b5db3e5bd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.cpp @@ -1,16 +1,24 @@ -#include "../../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "../monster/net.minecraft.world.entity.monster.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../item/net.minecraft.world.item.h" +#include + #include "Chicken.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "../../../../../Header Files/SoundTypes.h" -#include "../MobCategory.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" void Chicken::_init() { sheared = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.h b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.h index cf97c207c..a18ebde63 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.h @@ -1,9 +1,11 @@ #pragma once #include "Animal.h" +#include "java/Class.h" class Level; class CompoundTag; +class Entity; class Chicken : public Animal { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.cpp index 419f1b0c5..964635fc9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.cpp @@ -1,18 +1,28 @@ -#include "../../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../item/net.minecraft.world.item.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../monster/net.minecraft.world.entity.monster.h" -#include "../../../stats/net.minecraft.stats.h" +#include + #include "Cow.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "../MobCategory.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" Cow::Cow(Level* level) : Animal(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.h b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.h index 55a3a3806..78bb0efea 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.h @@ -1,9 +1,11 @@ #pragma once #include "Animal.h" +#include "java/Class.h" class Player; class Level; +class Entity; class Cow : public Animal { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp index bdbde7abe..c15d9981a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp @@ -1,22 +1,56 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.entity.h" -#include "../monster/net.minecraft.world.entity.monster.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "../ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../monster/net.minecraft.world.entity.monster.h" -#include "../../effect/net.minecraft.world.effect.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../inventory/net.minecraft.world.inventory.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "EntityHorse.h" +#include #include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "EntityHorse.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/AgeableMob.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/MobGroupData.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/inventory/AnimalChest.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class EntitySelector; +class Path; const std::wstring EntityHorse::TEX_FOLDER = L"mob/horse/"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h index d26ad017b..9daa71db1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h @@ -1,12 +1,23 @@ #pragma once +#include +#include +#include +#include +#include + #include "Animal.h" -#include "../../net.minecraft.world.ContainerListener.h" -#include "../MobGroupData.h" -#include "../EntitySelector.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.ContainerListener.h" +#include "Minecraft.World/net/minecraft/world/entity/MobGroupData.h" +#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" class Attribute; class AnimalChest; +class Entity; +class ItemInstance; +class Level; class HorseEntitySelector : public EntitySelector { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Golem.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Golem.cpp index 78cc50122..e4ec41612 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Golem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Golem.cpp @@ -1,6 +1,5 @@ -#include "../../../../../Header Files/stdafx.h" - #include "Golem.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" Golem::Golem(Level* level) : PathfinderMob(level) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Golem.h b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Golem.h index 8ab7d22cf..f0ca9ef67 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Golem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Golem.h @@ -1,7 +1,7 @@ #pragma once -#include "../PathfinderMob.h" -#include "../Creature.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/Creature.h" class Level; class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp index 26ef3fd2b..799708a32 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp @@ -1,13 +1,20 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../item/net.minecraft.world.item.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../item/net.minecraft.world.entity.item.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include + #include "MushroomCow.h" -#include "../MobCategory.h" -#include "../../phys/AABB.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Cow.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" MushroomCow::MushroomCow(Level* level) : Cow(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.h b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.h index 1724ee510..851a52bca 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.h @@ -1,6 +1,10 @@ #pragma once #include "Cow.h" +#include "java/Class.h" + +class Entity; +class Level; class MushroomCow : public Cow { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp index 9075ef905..e54648d70 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp @@ -1,24 +1,52 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../ai/control/net.minecraft.world.entity.ai.control.h" -#include "../ai/goal/target/net.minecraft.world.entity.ai.goal.target.h" -#include "../ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "../ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "net.minecraft.world.entity.animal.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../monster/net.minecraft.world.entity.monster.h" -#include "../net.minecraft.world.entity.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../SyncedEntityData.h" -#include "../../../../../ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" #include "Ocelot.h" +#include "4J_Profile.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotAttackGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Chicken.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" const double Ocelot::SNEAK_SPEED_MOD = 0.6; const double Ocelot::WALK_SPEED_MOD = 0.8; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h index f60c51de7..27173c8b9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h @@ -1,8 +1,13 @@ #pragma once -#include "../TamableAnimal.h" +#include + +#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" +#include "java/Class.h" class TemptGoal; +class Entity; +class Level; class Ocelot : public TamableAnimal { friend class OcelotSitOnTileGoal; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.cpp index 7e30faa15..d587da46b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.cpp @@ -1,21 +1,33 @@ -#include "../../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" -#include "../../../stats/net.minecraft.stats.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.entity.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "../ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../item/net.minecraft.world.entity.item.h" -#include "../monster/net.minecraft.world.entity.monster.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../global/net.minecraft.world.entity.global.h" +#include +#include +#include + #include "Pig.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "../MobCategory.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/PigZombie.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" Pig::Pig(Level* level) : Animal(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.h b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.h index b6c4954f8..1430c8d13 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.h @@ -1,10 +1,13 @@ #pragma once #include "Animal.h" +#include "java/Class.h" class Player; class LightningBolt; class ControlledByPlayerGoal; +class Entity; +class Level; class Pig : public Animal { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.cpp index 15baf8b3e..c611bbf8c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.cpp @@ -1,24 +1,41 @@ -#include "../../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../item/crafting/net.minecraft.world.item.crafting.h" -#include "../../inventory/net.minecraft.world.inventory.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "../ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../net.minecraft.world.entity.h" -#include "../item/net.minecraft.world.entity.item.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../global/net.minecraft.world.entity.global.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../monster/net.minecraft.world.entity.monster.h" +#include +#include +#include +#include + #include "Sheep.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "../MobCategory.h" -#include "../../../stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/entity/AgeableMob.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/EatTileGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FollowParentGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/PanicGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/TemptGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/ShearsItem.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" const float Sheep::COLOR[Sheep::COLOR_LENGTH][3] = { {1.0f, 1.0f, 1.0f}, // white diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.h b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.h index 65a0c325a..c0d834def 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.h @@ -1,12 +1,19 @@ #pragma once +#include +#include + +#include "Animal.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" + class Random; class EatTileGoal; class CraftingContainer; - -#include "Animal.h" -#include "../../../SharedConstants.h" -#include "../../inventory/AbstractContainerMenu.h" +class Entity; +class Level; class Sheep : public Animal { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.cpp index 7f8c74d98..f603a3e5a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.cpp @@ -1,20 +1,30 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../level/net.minecraft.world.level.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "../ai/goal/target/net.minecraft.world.entity.ai.goal.target.h" -#include "../ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../monster/net.minecraft.world.entity.monster.h" -#include "../projectile/net.minecraft.world.entity.projectile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../level/biome/net.minecraft.world.level.biome.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../../SharedConstants.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include + #include "SnowMan.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Golem.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Enemy.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Snowball.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" SnowMan::SnowMan(Level* level) : Golem(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.h b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.h index 8e8a9b83c..1a1e83072 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.h @@ -1,7 +1,11 @@ #pragma once #include "Golem.h" -#include "../monster/RangedAttackMob.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/RangedAttackMob.h" +#include "java/Class.h" + +class Entity; +class Level; class SnowMan : public Golem, public RangedAttackMob { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.cpp index 36db47333..9b867c247 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.cpp @@ -1,15 +1,20 @@ -#include "../../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.entity.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../monster/net.minecraft.world.entity.monster.h" -#include "../../../SharedConstants.h" +#include +#include +#include + #include "Squid.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/WaterAnimal.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" void Squid::_init() { xBodyRot = xBodyRotO = 0.0f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.h b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.h index cde993ba3..3130067d4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.h @@ -1,8 +1,11 @@ #pragma once #include "WaterAnimal.h" +#include "java/Class.h" class Player; +class Entity; +class Level; class Squid : public WaterAnimal { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.cpp index 8445636ed..126293313 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.cpp @@ -1,23 +1,43 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../ai/control/net.minecraft.world.entity.ai.control.h" -#include "../ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "../ai/goal/target/net.minecraft.world.entity.ai.goal.target.h" -#include "../ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../ai/village/net.minecraft.world.entity.ai.village.h" -#include "net.minecraft.world.entity.animal.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../monster/net.minecraft.world.entity.monster.h" -#include "../net.minecraft.world.entity.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "../SyncedEntityData.h" +#include + +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" #include "VillagerGolem.h" -#include "../../../../../Header Files/ParticleTypes.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/control/MoveControl.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/OfferFlowerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/Village.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Golem.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Enemy.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" VillagerGolem::VillagerGolem(Level* level) : Golem(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h index d9477ba84..7d0ce6f73 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h @@ -1,9 +1,14 @@ #pragma once +#include +#include + #include "Golem.h" +#include "java/Class.h" class Village; class Level; +class Entity; class VillagerGolem : public Golem { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/WaterAnimal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/WaterAnimal.cpp index a972fb0aa..9e7242c18 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/WaterAnimal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/WaterAnimal.cpp @@ -1,10 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" +#include + #include "WaterAnimal.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" WaterAnimal::WaterAnimal(Level* level) : PathfinderMob(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/WaterAnimal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/WaterAnimal.h index ecf7ba529..7524c42eb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/WaterAnimal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/WaterAnimal.h @@ -1,8 +1,9 @@ #pragma once -#include "../PathfinderMob.h" -#include "../Creature.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/Creature.h" class Player; +class Level; class WaterAnimal : public PathfinderMob, public Creature { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp index e2223b184..f6250c33f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp @@ -1,25 +1,53 @@ -#include "../../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.entity.h" -#include "net.minecraft.world.entity.animal.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "../ai/goal/target/net.minecraft.world.entity.ai.goal.target.h" -#include "../ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../monster/net.minecraft.world.entity.monster.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../projectile/net.minecraft.world.entity.projectile.h" -#include "../../level/pathfinder/net.minecraft.world.level.pathfinder.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../../stats/net.minecraft.stats.h" +#include +#include +#include + #include "Sheep.h" #include "Wolf.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BegGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/SitGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/item/FoodItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ColoredTile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" Wolf::Wolf(Level* level) : TamableAnimal(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.h b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.h index 06aa4c49a..0508a1140 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.h @@ -1,7 +1,16 @@ #pragma once -#include "../TamableAnimal.h" +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/entity/TamableAnimal.h" +#include "java/Class.h" + class DamageSource; +class Entity; +class Level; +class LivingEntity; class Wolf : public TamableAnimal { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMobPart.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMobPart.cpp index d8d7b4b30..c32544ce9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMobPart.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMobPart.cpp @@ -1,5 +1,3 @@ -#include "../../../../../Header Files/stdafx.h" -#include "BossMob.h" #include "MultiEntityMob.h" #include "MultiEntityMobPart.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMobPart.h b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMobPart.h index 0af0a1a5e..75f488ea2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMobPart.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMobPart.h @@ -1,5 +1,10 @@ #pragma once -#include "../Entity.h" +#include +#include + +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" class Level; class MultiEntityMob; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp index 133520cf7..dd61f66df 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp @@ -1,10 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../level/tile/net.minecraft.world.level.tile.h" -#include "../../net.minecraft.world.entity.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" #include "net.minecraft.world.entity.boss.enderdragon.h" #include "EnderCrystal.h" -#include "../../../damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" void EnderCrystal::_init(Level* level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.h index fa53aead2..eb0860d83 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.h @@ -1,6 +1,6 @@ #pragma once -#include "../../Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" class EnderCrystal : public Entity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp index 9eca5109c..305f164e2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp @@ -1,17 +1,17 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../level/tile/net.minecraft.world.level.tile.h" -#include "../../net.minecraft.world.entity.h" -#include "../../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../net.minecraft.world.entity.boss.h" -#include "../../monster/net.minecraft.world.entity.monster.h" -#include "../../projectile/net.minecraft.world.entity.projectile.h" -#include "../../../phys/net.minecraft.world.phys.h" -#include "../../../damageSource/net.minecraft.world.damagesource.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" +#include "Minecraft.World/net/minecraft/world/entity/boss/net.minecraft.world.entity.boss.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" +#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" +#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "net.minecraft.world.entity.boss.enderdragon.h" -#include "../../../level/pathfinder/net.minecraft.world.level.pathfinder.h" -#include "../../../../SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/level/pathfinder/net.minecraft.world.level.pathfinder.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" #include "EnderDragon.h" #include #include diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h index ebed54402..8bd9c8877 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h @@ -1,7 +1,7 @@ #pragma once -#include "../BossMob.h" -#include "../MultiEntityMob.h" -#include "../../monster/Enemy.h" +#include "Minecraft.World/net/minecraft/world/entity/boss/BossMob.h" +#include "Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMob.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Enemy.h" class MultiEntityMobPart; class EnderCrystal; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h index defde300e..cf9e0c1be 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h @@ -2,4 +2,4 @@ #include "EnderCrystal.h" #include "EnderDragon.h" -#include "../../../level/levelgen/feature/NetherSphereFeature.h" \ No newline at end of file +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/NetherSphereFeature.h" \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp index 87a795e03..525780031 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp @@ -1,20 +1,20 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.world.h" -#include "../../../damageSource/net.minecraft.world.damagesource.h" -#include "../../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../../ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "../../ai/goal/target/net.minecraft.world.entity.ai.goal.target.h" -#include "../../ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../../monster/net.minecraft.world.entity.monster.h" -#include "../../projectile/net.minecraft.world.entity.projectile.h" -#include "../../net.minecraft.world.entity.h" -#include "../../../item/net.minecraft.world.item.h" -#include "../../../level/net.minecraft.world.level.h" -#include "../../../level/tile/net.minecraft.world.level.tile.h" -#include "../../../phys/net.minecraft.world.phys.h" -#include "../../../../util/Mth.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" +#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "../../../../../../Header Files/SoundTypes.h" +#include "Minecraft.World/Header Files/SoundTypes.h" #include "WitherBoss.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h index d3d45cc8f..4bca41c35 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h @@ -1,8 +1,8 @@ #pragma once -#include "../../monster/Monster.h" -#include "../../monster/RangedAttackMob.h" -#include "../BossMob.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/RangedAttackMob.h" +#include "Minecraft.World/net/minecraft/world/entity/boss/BossMob.h" class LivingEntitySelector : public EntitySelector { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/global/GlobalEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/global/GlobalEntity.cpp index 66f0556f6..6ce79419d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/global/GlobalEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/global/GlobalEntity.cpp @@ -1,2 +1 @@ -#include "../../../../../Header Files/stdafx.h" #include "GlobalEntity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/global/GlobalEntity.h b/minecraft/Minecraft.World/net/minecraft/world/entity/global/GlobalEntity.h index 2d9381c00..6720390fb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/global/GlobalEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/global/GlobalEntity.h @@ -1,5 +1,6 @@ #pragma once -#include "../Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.cpp index c37812e4f..26ba1d7c0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.cpp @@ -1,12 +1,22 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" +#include +#include +#include +#include + #include "LightningBolt.h" -#include "../../../../../Header Files/SoundTypes.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/PlayerList.h" -#include "../../level/dimension/net.minecraft.world.level.dimension.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/global/GlobalEntity.h" +#include "Minecraft.World/net/minecraft/world/level/GameRules.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/tile/FireTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" LightningBolt::LightningBolt(Level* level, double x, double y, double z) : life(0), seed(0), flashes(0), GlobalEntity(level) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.h b/minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.h index 47b29be24..abcd8704b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/global/LightningBolt.h @@ -1,7 +1,12 @@ #pragma once +#include + #include "GlobalEntity.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "java/Class.h" + +class Level; // class LightningBolt : public GlobalEntity class LightningBolt : public GlobalEntity { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.cpp index b17e24ee1..35ccd511c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.cpp @@ -1,14 +1,24 @@ -#include "../../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" -#include "../net.minecraft.world.entity.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/material/net.minecraft.world.level.material.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" +#include +#include +#include +#include +#include + #include "Boat.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" const double Boat::MAX_SPEED = 0.35; const double Boat::MAX_COLLISION_SPEED = MAX_SPEED * 0.75; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.h b/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.h index 0a6ca3b5e..6c39a0ae7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.h @@ -1,6 +1,10 @@ #pragma once -#include "../Entity.h" +#include + +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" class Player; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.cpp index 5a2f7efe7..a00f1cff2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.cpp @@ -1,10 +1,21 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.entity.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "nbt/com.mojang.nbt.h" +#include +#include +#include +#include +#include +#include + #include "FallingTile.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/Tag.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" // 4J - added for common ctor code void FallingTile::_init() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.h b/minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.h index 3447d93d0..7ec55f333 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.h @@ -1,7 +1,10 @@ #pragma once -#include "../Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" class Level; +class CompoundTag; class FallingTile : public Entity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.cpp index e282b861d..d1a9416bc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.cpp @@ -1,17 +1,26 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include +#include +#include +#include + #include "java/JavaMath.h" -#include "../../../stats/net.minecraft.stats.h" -#include "../net.minecraft.world.entity.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../item/net.minecraft.world.item.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../../level/material/net.minecraft.world.level.material.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "nbt/com.mojang.nbt.h" #include "ItemEntity.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" void ItemEntity::_init() { age = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h b/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h index 2ac4c80ea..a71d27cb2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h @@ -1,8 +1,16 @@ #pragma once -#include "../Entity.h" -#include "../../../SharedConstants.h" +#include +#include + +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" class Player; +class Level; class ItemEntity : public Entity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.cpp index c2dcf48f8..1ce133fd1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.cpp @@ -1,21 +1,42 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../level/dimension/net.minecraft.world.level.dimension.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../net.minecraft.world.entity.h" -#include "net.minecraft.world.entity.item.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../animal/net.minecraft.world.entity.animal.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" -#include "nbt/com.mojang.nbt.h" #include "Minecart.h" -#include -#include -#include "../../../SharedConstants.h" +#include "java/Class.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" +#include "Minecraft.World/net/minecraft/world/entity/item/MinecartChest.h" +#include "Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.h" +#include "Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h" +#include "Minecraft.World/net/minecraft/world/entity/item/MinecartRideable.h" +#include "Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.h" +#include "Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" const int Minecart::EXITS[][2][3] = { // diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.h b/minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.h index 1fc6e2919..a4c1664b6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.h @@ -1,6 +1,7 @@ #pragma once #include -#include "../Entity.h" + +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" class DamageSource; class Tickable; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartChest.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartChest.cpp index b56e8bad1..de3125716 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartChest.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartChest.cpp @@ -1,7 +1,9 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../../network/packet/net.minecraft.network.packet.h" #include "MinecartChest.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ChestTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Level; MinecartChest::MinecartChest(Level* level) : MinecartContainer(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartChest.h b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartChest.h index 8bad82273..cc3080034 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartChest.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartChest.h @@ -1,6 +1,11 @@ #pragma once #include "MinecartContainer.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.h" + +class Entity; +class Level; class MinecartChest : public MinecartContainer { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp index bdfa012f9..68a1ec80b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp @@ -1,9 +1,9 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "net.minecraft.world.entity.item.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../inventory/net.minecraft.world.inventory.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/redstone/net.minecraft.world.level.redstone.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/net.minecraft.world.level.redstone.h" #include "MinecartContainer.h" void MinecartContainer::_init() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.h b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.h index e7555763e..332c090d4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.h @@ -1,7 +1,7 @@ #pragma once #include "Minecart.h" -#include "../../Container.h" +#include "Minecraft.World/net/minecraft/world/Container.h" class MinecartContainer : public Minecart, public virtual Container { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp index fff44c184..749be119c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp @@ -1,11 +1,23 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../net.minecraft.world.entity.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../../network/packet/net.minecraft.network.packet.h" +#include +#include +#include + #include "MinecartFurnace.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" MinecartFurnace::MinecartFurnace(Level* level) : Minecart(level) { defineSynchedData(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.h b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.h index a0d3f2742..482c0594d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.h @@ -1,6 +1,11 @@ #pragma once #include "Minecart.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" + +class Entity; +class Level; class MinecartFurnace : public Minecart { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.cpp index d642f28e6..eb2b5cbe3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.cpp @@ -1,12 +1,23 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.entity.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "net.minecraft.world.entity.item.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "MinecartHopper.h" + +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.h" +#include "Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HopperTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Entity; const int MinecartHopper::MOVE_ITEM_SPEED = HopperTileEntity::MOVE_ITEM_SPEED / 2; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h index 641672f33..b8ba83780 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h @@ -1,7 +1,7 @@ #pragma once #include "MinecartContainer.h" -#include "../../level/tile/entity/Hopper.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/Hopper.h" class MinecartHopper : public MinecartContainer, public Hopper { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartRideable.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartRideable.cpp index 273caf3e3..fa9c475e3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartRideable.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartRideable.cpp @@ -1,8 +1,9 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.entity.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../../level/net.minecraft.world.level.h" +#include + #include "MinecartRideable.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" MinecartRideable::MinecartRideable(Level* level) : Minecart(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartRideable.h b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartRideable.h index 2a88df22e..8633a0cd9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartRideable.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartRideable.h @@ -1,6 +1,11 @@ #pragma once #include "Minecart.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" + +class Entity; +class Level; class MinecartRideable : public Minecart { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.cpp index 96f040ca4..c89eea73e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.cpp @@ -1,7 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" #include "MinecartSpawner.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" MinecartSpawner::MinecartMobSpawner::MinecartMobSpawner( MinecartSpawner* parent) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.h b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.h index 74ffbf86c..d13143c61 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.h @@ -1,7 +1,14 @@ #pragma once +#include + #include "Minecart.h" -#include "../../level/BaseMobSpawner.h" +#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" + +class Entity; +class Level; class MinecartSpawner : public Minecart { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp index 97ee6a9b4..fad0d9867 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp @@ -1,8 +1,17 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" +#include +#include +#include + #include "MinecartTNT.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" void MinecartTNT::_init() { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.h b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.h index 4b9d8f507..8905e3207 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.h @@ -1,6 +1,13 @@ #pragma once +#include + #include "Minecart.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" + +class Entity; +class Level; class MinecartTNT : public Minecart { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.cpp index 989305fb0..17996d3bd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.cpp @@ -1,8 +1,13 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include +#include +#include + #include "java/JavaMath.h" -#include "nbt/com.mojang.nbt.h" -#include "../../level/net.minecraft.world.level.h" #include "PrimedTnt.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" void PrimedTnt::_init() { life = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h b/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h index 46485788a..ddfd653af 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h @@ -1,5 +1,12 @@ #pragma once -#include "../Entity.h" +#include + +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" + +class Level; class PrimedTnt : public Entity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp index eb259fa1d..f691f9e59 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp @@ -1,17 +1,25 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.entity.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "net.minecraft.world.entity.monster.h" -#include "../projectile/net.minecraft.world.entity.projectile.h" -#include "../../../SharedConstants.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include +#include +#include +#include + #include "Blaze.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" Blaze::Blaze(Level* level) : Monster(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.h index 30424f3ab..1141b47ac 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.h @@ -1,6 +1,10 @@ #pragma once #include "Monster.h" +#include "java/Class.h" + +class Entity; +class Level; class Blaze : public Monster { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/CaveSpider.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/CaveSpider.cpp index 5c0fc06de..35a494752 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/CaveSpider.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/CaveSpider.cpp @@ -1,12 +1,16 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../SharedConstants.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "net.minecraft.world.entity.monster.h" -#include "../../effect/net.minecraft.world.effect.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../net.minecraft.world.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include + #include "CaveSpider.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/Difficulty.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Spider.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" CaveSpider::CaveSpider(Level* level) : Spider(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/CaveSpider.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/CaveSpider.h index 9df4510d7..cc96b21b5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/CaveSpider.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/CaveSpider.h @@ -1,6 +1,10 @@ #pragma once #include "Spider.h" +#include "java/Class.h" + +class Entity; +class Level; class CaveSpider : public Spider { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.cpp index fff7da286..c394b7569 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.cpp @@ -1,22 +1,33 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.entity.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "../ai/goal/target/net.minecraft.world.entity.ai.goal.target.h" -#include "../ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../animal/net.minecraft.world.entity.animal.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "net.minecraft.world.entity.monster.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../../stats/GeneralStat.h" -#include "Skeleton.h" +#include +#include +#include + #include "Creeper.h" -#include "../projectile/Arrow.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/SwellGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/GameRules.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" void Creeper::_init() { swell = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.h index 3936e5b86..240fa12a4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Creeper.h @@ -1,9 +1,11 @@ #pragma once #include "Monster.h" +#include "java/Class.h" class Level; class DamageSource; +class Entity; class Creeper : public Monster { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.cpp index 37462ceb7..077c6a4bc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.cpp @@ -1,16 +1,35 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../net.minecraft.world.entity.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "net.minecraft.world.entity.monster.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "nbt/com.mojang.nbt.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include +#include +#include +#include + #include "EnderMan.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" +#include "Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/GameRules.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" AttributeModifier* EnderMan::SPEED_MODIFIER_ATTACKING = (new AttributeModifier(eModifierId_MOB_ENDERMAN_ATTACKSPEED, 6.2f, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.h index cea60740a..8006f82ab 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.h @@ -1,6 +1,14 @@ #pragma once +#include + #include "Monster.h" +#include "java/Class.h" + +class AttributeModifier; +class Entity; +class Level; +class Player; class EnderMan : public Monster { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Enemy.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Enemy.cpp index 759055226..c97bfdf37 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Enemy.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Enemy.cpp @@ -1,5 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" +#include + #include "Enemy.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" + +class EntitySelector; EntitySelector* Enemy::ENEMY_SELECTOR = new Enemy::EnemyEntitySelector(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Enemy.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Enemy.h index 86079fbf1..a8cb0a445 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Enemy.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Enemy.h @@ -1,6 +1,6 @@ #pragma once -#include "../Creature.h" -#include "../EntitySelector.h" +#include "Minecraft.World/net/minecraft/world/entity/Creature.h" +#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" class Enemy : public Creature { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.cpp index 3d06b65f1..51f99552f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.cpp @@ -1,19 +1,31 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../level/net.minecraft.world.level.h" -#include "../net.minecraft.world.entity.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../projectile/net.minecraft.world.entity.projectile.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "net.minecraft.world.entity.monster.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../../stats/net.minecraft.stats.h" +#include +#include +#include +#include +#include + #include "Ghast.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "../../level/tile/LevelEvent.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/Difficulty.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/FlyingMob.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Enemy.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/LargeFireball.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" void Ghast::_init() { explosionPower = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.h index 2a73c42b2..334c019d6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.h @@ -1,10 +1,14 @@ #pragma once -#include "../FlyingMob.h" +#include + +#include "Minecraft.World/net/minecraft/world/entity/FlyingMob.h" #include "Enemy.h" +#include "java/Class.h" class GhastClass; class Level; +class Entity; class Ghast : public FlyingMob, public Enemy { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Giant.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Giant.cpp index 0fe34bac8..06563c93a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Giant.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Giant.cpp @@ -1,9 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../level/net.minecraft.world.level.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "net.minecraft.world.entity.monster.h" #include "Giant.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" Giant::Giant(Level* level) : Monster(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Giant.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Giant.h index 5512a9fd0..711ea687e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Giant.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Giant.h @@ -1,8 +1,10 @@ #pragma once #include "Monster.h" +#include "java/Class.h" class Level; +class Entity; class Giant : public Monster { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.cpp index aa752d8ff..6eb96b77d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.cpp @@ -1,12 +1,15 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../net.minecraft.world.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "net.minecraft.world.entity.monster.h" -#include "../../item/net.minecraft.world.item.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include +#include + #include "LavaSlime.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/Difficulty.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Slime.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" LavaSlime::LavaSlime(Level* level) : Slime(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h index 73cc55ef7..128208ff9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h @@ -1,6 +1,11 @@ #pragma once #include "Slime.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Class.h" + +class Entity; +class Level; class LavaSlime : public Slime { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Monster.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Monster.cpp index f3d9e8a12..012b6a69f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Monster.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Monster.cpp @@ -1,16 +1,27 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../level/net.minecraft.world.level.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "net.minecraft.world.entity.monster.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../effect/net.minecraft.world.effect.h" -#include "../../item/enchantment/net.minecraft.world.item.enchantment.h" -#include "Monster.h" +#include +#include +#include +#include "Monster.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/Difficulty.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Enemy.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" Monster::Monster(Level* level) : PathfinderMob(level) { xpReward = Enemy::XP_REWARD_MEDIUM; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Monster.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Monster.h index fafe5b016..2e9653b90 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Monster.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Monster.h @@ -1,11 +1,13 @@ #pragma once -#include "../PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" #include "Enemy.h" +#include "java/Class.h" class Level; class CompoundTag; class DamageSource; +class Entity; class Monster : public PathfinderMob, public Enemy { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.cpp index 7dfc2dd6e..991897a0f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.cpp @@ -1,18 +1,24 @@ -#include "../../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" -#include "../../net.minecraft.world.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "net.minecraft.world.entity.monster.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../item/enchantment/net.minecraft.world.item.enchantment.h" -#include "../item/net.minecraft.world.entity.item.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" +#include +#include +#include + #include "PigZombie.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/Difficulty.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Zombie.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" AttributeModifier* PigZombie::SPEED_MODIFIER_ATTACKING = (new AttributeModifier(eModifierId_MOB_PIG_ATTACKSPEED, 0.45, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.h index 7d9787d5e..a3b258b8f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/PigZombie.h @@ -1,8 +1,14 @@ #pragma once +#include + #include "Zombie.h" +#include "java/Class.h" class DamageSource; +class AttributeModifier; +class Entity; +class Level; // SKIN BY XaPhobia Chris Beidler class PigZombie : public Zombie { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.cpp index cb22aaa11..56329509e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.cpp @@ -1,7 +1,18 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "SharedMonsterAttributes.h" #include +#include +#include +#include + +#include "SharedMonsterAttributes.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttribute.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.h" Attribute* SharedMonsterAttributes::MAX_HEALTH = (new RangedAttribute(eAttributeId_GENERIC_MAXHEALTH, 20, 0, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h index 7082b90d5..ed5415ac3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h @@ -1,5 +1,12 @@ #pragma once +class Attribute; +class AttributeInstance; +class AttributeModifier; +class BaseAttributeMap; +class CompoundTag; +template class ListTag; + class SharedMonsterAttributes { public: static Attribute* MAX_HEALTH; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.cpp index 74491d707..8c4219989 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.cpp @@ -1,14 +1,23 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "net.minecraft.world.entity.monster.h" -#include "../../../net.minecraft.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include + #include "Silverfish.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/GameRules.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" Silverfish::Silverfish(Level* level) : Monster(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.h index 417cc69d8..239b31d12 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Silverfish.h @@ -1,6 +1,11 @@ #pragma once #include "Monster.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/MobType.h" + +class Entity; +class Level; class Silverfish : public Monster { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.cpp index 8ae6c822d..5859d0ec8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.cpp @@ -1,26 +1,50 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/dimension/net.minecraft.world.level.dimension.h" -#include "../../level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../item/enchantment/net.minecraft.world.item.enchantment.h" -#include "../../effect/net.minecraft.world.effect.h" -#include "../net.minecraft.world.entity.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "../ai/goal/target/net.minecraft.world.entity.ai.goal.target.h" -#include "../ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../projectile/net.minecraft.world.entity.projectile.h" -#include "../item/net.minecraft.world.entity.item.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "net.minecraft.world.entity.monster.h" -#include "../../../stats/net.minecraft.stats.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../../SharedConstants.h" +#include +#include +#include +#include +#include + #include "Skeleton.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FleeSunGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RestrictSunGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" +#include "Minecraft.World/net/minecraft/world/item/BowItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "Minecraft.World/net/minecraft/world/level/Calendar.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/HellDimension.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.h" Skeleton::Skeleton(Level* level) : Monster(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.h index e54779b40..a81481278 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.h @@ -2,9 +2,13 @@ #include "Monster.h" #include "RangedAttackMob.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/MobType.h" class RangedAttackGoal; class MeleeAttackGoal; +class Entity; +class Level; class Skeleton : public Monster, public RangedAttackMob { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp index 8ebf9df81..aec3de3f1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp @@ -1,20 +1,27 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/storage/net.minecraft.world.level.storage.h" -#include "../../level/chunk/net.minecraft.world.level.chunk.h" -#include "../net.minecraft.world.entity.h" -#include "../../item/net.minecraft.world.item.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../item/net.minecraft.world.entity.item.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "net.minecraft.world.entity.monster.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "nbt/com.mojang.nbt.h" +#include +#include +#include +#include + #include "Slime.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/Difficulty.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelType.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" void Slime::_init() { jumpDelay = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.h index 908182f86..dc73af226 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.h @@ -1,8 +1,15 @@ #pragma once -#include "../Mob.h" +#include + +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" #include "Enemy.h" -#include "../../../../../Header Files/ParticleTypes.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" + +class Entity; +class Level; class Slime : public Mob, public Enemy { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.cpp index a746de764..6c471de49 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.cpp @@ -1,18 +1,25 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../item/net.minecraft.world.item.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../item/net.minecraft.world.entity.item.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../../effect/net.minecraft.world.effect.h" -#include "../net.minecraft.world.entity.h" -#include "net.minecraft.world.entity.monster.h" -#include "nbt/com.mojang.nbt.h" -#include "Spider.h" +#include +#include #include -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "../../../../../Header Files/SoundTypes.h" +#include + +#include "Spider.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/Difficulty.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/MobGroupData.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Skeleton.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" Spider::Spider(Level* level) : Monster(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.h index 514b61225..0ef6e0038 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.h @@ -1,7 +1,13 @@ #pragma once #include "Monster.h" -#include "../MobGroupData.h" +#include "Minecraft.World/net/minecraft/world/entity/MobGroupData.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/MobType.h" + +class Entity; +class Level; +class Random; class Spider : public Monster { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp index acec86850..42ac96aa8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp @@ -1,17 +1,39 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../effect/net.minecraft.world.effect.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../net.minecraft.world.entity.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "../ai/goal/target/net.minecraft.world.entity.ai.goal.target.h" -#include "net.minecraft.world.entity.monster.h" -#include "../projectile/net.minecraft.world.entity.projectile.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../item/alchemy/net.minecraft.world.item.alchemy.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../phys/net.minecraft.world.phys.h" +#include +#include +#include + #include "Witch.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RangedAttackGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/PotionItem.h" +#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" AttributeModifier* Witch::SPEED_MODIFIER_DRINKING = (new AttributeModifier(eModifierId_MOB_WITCH_DRINKSPEED, -0.25f, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.h index 6c192e85d..11aeedb4c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.h @@ -1,7 +1,14 @@ #pragma once +#include + #include "Monster.h" #include "RangedAttackMob.h" +#include "java/Class.h" + +class AttributeModifier; +class Entity; +class Level; class Witch : public Monster, public RangedAttackMob { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.cpp index a316c8586..80500540f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.cpp @@ -1,23 +1,53 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../net.minecraft.world.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../effect/net.minecraft.world.effect.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "../ai/goal/target/net.minecraft.world.entity.ai.goal.target.h" -#include "../ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "net.minecraft.world.entity.monster.h" -#include "../npc/net.minecraft.world.entity.npc.h" -#include "../player/net.minecraft.world.entity.player.h" +#include +#include +#include +#include +#include + #include "Zombie.h" -#include "../../../stats/GenericStats.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "../net.minecraft.world.entity.h" -#include "java/JavaMath.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/Difficulty.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/MobGroupData.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/RangedAttribute.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/BreakDoorGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/FloatGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/GoalSelector.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MeleeAttackGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Calendar.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" Attribute* Zombie::SPAWN_REINFORCEMENTS_CHANCE = (new RangedAttribute(eAttributeId_ZOMBIE_SPAWNREINFORCEMENTS, 0, 0, 1)); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.h index 4e88fdf4a..0f104dbec 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.h @@ -1,8 +1,18 @@ #pragma once +#include + #include "Monster.h" -#include "../../../SharedConstants.h" -#include "../MobGroupData.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/MobGroupData.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/MobType.h" + +class Attribute; +class AttributeModifier; +class Entity; +class Level; class Zombie : public Monster { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/ClientSideMerchant.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/ClientSideMerchant.cpp index 6587f7f1d..be881324d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/ClientSideMerchant.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/ClientSideMerchant.cpp @@ -1,7 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../item/trading/net.minecraft.world.item.trading.h" -#include "../../inventory/net.minecraft.world.inventory.h" #include "ClientSideMerchant.h" +#include "Minecraft.World/net/minecraft/world/inventory/MerchantContainer.h" +#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h" +#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.h" + +class Container; +class Player; ClientSideMerchant::ClientSideMerchant(std::shared_ptr source, const std::wstring& name) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/ClientSideMerchant.h b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/ClientSideMerchant.h index 873f32401..d3f97320b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/ClientSideMerchant.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/ClientSideMerchant.h @@ -1,10 +1,15 @@ #pragma once -#include "../../item/trading/Merchant.h" +#include +#include + +#include "Minecraft.World/net/minecraft/world/item/trading/Merchant.h" class MerchantContainer; class MerchantRecipeList; class MerchantRecipe; +class Container; +class Player; class ClientSideMerchant : public Merchant, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Npc.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Npc.cpp index 4b72857e6..b2e5c3b12 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Npc.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Npc.cpp @@ -1,3 +1 @@ -#include "../../../../../Header Files/stdafx.h" - #include "Npc.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Npc.h b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Npc.h index 49073c92e..3c969b35a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Npc.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Npc.h @@ -1,6 +1,6 @@ #pragma once -#include "../Creature.h" +#include "Minecraft.World/net/minecraft/world/entity/Creature.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp index 2b061ccf7..b37b5a084 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp @@ -1,19 +1,19 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "nbt/com.mojang.nbt.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "../ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "../ai/village/net.minecraft.world.entity.ai.village.h" -#include "../monster/net.minecraft.world.entity.monster.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../../effect/net.minecraft.world.effect.h" -#include "../net.minecraft.world.entity.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../item/enchantment/net.minecraft.world.item.enchantment.h" -#include "../../item/trading/net.minecraft.world.item.trading.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" +#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" +#include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "Villager.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.h b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.h index 2544d2706..afd21a21f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.h @@ -1,9 +1,9 @@ #pragma once -#include "../AgeableMob.h" +#include "Minecraft.World/net/minecraft/world/entity/AgeableMob.h" #include "Npc.h" -#include "../../item/trading/Merchant.h" -#include "../../../../../Header Files/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/world/item/trading/Merchant.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" class Level; class Village; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Abilities.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Abilities.cpp index d3798700b..86f5bc635 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Abilities.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Abilities.cpp @@ -1,6 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" +#include + #include "Abilities.h" +#include "nbt/CompoundTag.h" Abilities::Abilities() { invulnerable = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.cpp index 70190392a..4ed9bd7cd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.cpp @@ -1,10 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "nbt/com.mojang.nbt.h" #include "net.minecraft.world.entity.player.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../../stats/net.minecraft.stats.h" -#include "../../level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" #include "Inventory.h" const int Inventory::POP_TIME_DURATION = 5; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.h b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.h index 7e1b308a1..fa0fa91a4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.h @@ -1,7 +1,7 @@ #pragma once -#include "../../Container.h" +#include "Minecraft.World/net/minecraft/world/Container.h" #include "nbt/ListTag.h" -#include "../../item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" class Player; class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp index dae68c840..9535c0fdf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp @@ -7,43 +7,86 @@ // derives from, and not to find the derived class itself (which should own the // virtual GetType function) -#include "../../../../../Header Files/stdafx.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "java/JavaMath.h" -#include "../../../net.minecraft.h" -#include "../../net.minecraft.world.h" -#include "../../../stats/net.minecraft.stats.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/chunk/net.minecraft.world.level.chunk.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../net.minecraft.world.entity.h" -#include "../ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../animal/net.minecraft.world.entity.animal.h" -#include "../boss/net.minecraft.world.entity.boss.h" -#include "../monster/net.minecraft.world.entity.monster.h" -#include "../item/net.minecraft.world.entity.item.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../item/enchantment/net.minecraft.world.item.enchantment.h" -#include "../../level/dimension/net.minecraft.world.level.dimension.h" -#include "../../level/material/net.minecraft.world.level.material.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../../scores/net.minecraft.world.scores.h" -#include "../../scores/criteria/net.minecraft.world.scores.criteria.h" -#include "../projectile/net.minecraft.world.entity.projectile.h" -#include "../../inventory/net.minecraft.world.inventory.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../effect/net.minecraft.world.effect.h" -#include "../../food/net.minecraft.world.food.h" #include "Inventory.h" #include "Player.h" -#include "../../../../../Header Files/ParticleTypes.h" -#include -#include +#include "Minecraft.World/Header Files/ParticleTypes.h" #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "net/minecraft/world/entity/player/Player.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/App_structs.h" +#include "Minecraft.Client/Common/Minecraft_Macros.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "net/minecraft/Direction.h" +#include "net/minecraft/Pos.h" +#include "net/minecraft/SharedConstants.h" +#include "net/minecraft/stats/GenericStats.h" +#include "net/minecraft/util/Mth.h" +#include "net/minecraft/world/Difficulty.h" +#include "net/minecraft/world/damageSource/CombatTracker.h" +#include "net/minecraft/world/damageSource/DamageSource.h" +#include "net/minecraft/world/effect/MobEffect.h" +#include "net/minecraft/world/effect/MobEffectInstance.h" +#include "net/minecraft/world/entity/EntityEvent.h" +#include "net/minecraft/world/entity/SyncedEntityData.h" +#include "net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "net/minecraft/world/entity/animal/Pig.h" +#include "net/minecraft/world/entity/boss/MultiEntityMob.h" +#include "net/minecraft/world/entity/boss/MultiEntityMobPart.h" +#include "net/minecraft/world/entity/item/ItemEntity.h" +#include "net/minecraft/world/entity/item/Minecart.h" +#include "net/minecraft/world/entity/monster/Monster.h" +#include "net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "net/minecraft/world/entity/player/Abilities.h" +#include "net/minecraft/world/entity/projectile/Arrow.h" +#include "net/minecraft/world/food/FoodConstants.h" +#include "net/minecraft/world/food/FoodData.h" +#include "net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "net/minecraft/world/inventory/InventoryMenu.h" +#include "net/minecraft/world/inventory/PlayerEnderChestContainer.h" +#include "net/minecraft/world/item/BowItem.h" +#include "net/minecraft/world/item/FishingRodItem.h" +#include "net/minecraft/world/item/Item.h" +#include "net/minecraft/world/item/UseAnim.h" +#include "net/minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "net/minecraft/world/item/enchantment/ThornsEnchantment.h" +#include "net/minecraft/world/level/GameRules.h" +#include "net/minecraft/world/level/Level.h" +#include "net/minecraft/world/level/chunk/ChunkSource.h" +#include "net/minecraft/world/level/dimension/Dimension.h" +#include "net/minecraft/world/level/material/Material.h" +#include "net/minecraft/world/level/tile/BedTile.h" +#include "net/minecraft/world/level/tile/Tile.h" +#include "net/minecraft/world/phys/AABB.h" +#include "net/minecraft/world/phys/Vec3.h" +#include "net/minecraft/world/scores/PlayerTeam.h" +#include "net/minecraft/world/scores/Score.h" +#include "net/minecraft/world/scores/Scoreboard.h" +#include "net/minecraft/world/scores/Team.h" +#include "net/minecraft/world/scores/criteria/ObjectiveCriteria.h" +#include "Minecraft.World/x64headers/extraX64.h" + +class ModelPart; +class Objective; +class Stat; void Player::_init() { registerAttributes(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.h b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.h index 005c77a79..70fc5a5fe 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.h @@ -1,14 +1,24 @@ #pragma once #include +#include +#include +#include -#include "../LivingEntity.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" #include "Abilities.h" -#include "../../food/FoodData.h" -#include "../../inventory/PlayerEnderChestContainer.h" -#include "../../../commands/CommandSender.h" -#include "../../scores/ScoreHolder.h" +#include "Minecraft.World/net/minecraft/world/food/FoodData.h" +#include "Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.h" +#include "Minecraft.World/net/minecraft/commands/CommandSender.h" +#include "Minecraft.World/net/minecraft/world/scores/ScoreHolder.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" class AbstractContainerMenu; class Stats; @@ -33,6 +43,10 @@ class Merchant; class PlayerEnderChestContainer; class GameType; class Scoreboard; +class Level; +class ModelPart; +class Stat; +class Tile; class Player : public LivingEntity, public CommandSender, public ScoreHolder { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.cpp index 7c4892f2c..5929757ad 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.cpp @@ -1,22 +1,36 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../net.minecraft.world.entity.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../item/enchantment/net.minecraft.world.item.enchantment.h" -#include "../../../network/packet/net.minecraft.network.packet.h" +#include +#include +#include +#include +#include +#include +#include + #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" -#include "nbt/com.mojang.nbt.h" #include "Arrow.h" - -// 4J : WESTY : Added for other award, kill creeper with arrow. -#include "../monster/net.minecraft.world.entity.monster.h" -#include "../../../stats/net.minecraft.stats.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/network/packet/GameEventPacket.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" // base damage, multiplied with velocity const double Arrow::ARROW_BASE_DAMAGE = 2.0f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h index 629fb19f7..ded4df027 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h @@ -1,10 +1,15 @@ #pragma once -#include "../Entity.h" +#include + +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" #include "Projectile.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" class Level; class CompoundTag; +class LivingEntity; class Arrow : public Entity, public Projectile { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.cpp index e1f71bbf4..10ddd7698 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.cpp @@ -1,11 +1,18 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../level/net.minecraft.world.level.h" +#include +#include +#include + #include "java/JavaMath.h" #include "DragonFireball.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" + +class Entity; const double DragonFireball::SPLASH_RANGE = 4.0; const double DragonFireball::SPLASH_RANGE_SQ = diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h index 7adeeddbb..0ba6156fd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h @@ -1,8 +1,15 @@ #pragma once +#include + #include "Fireball.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Class.h" class HitResult; +class Entity; +class Level; +class LivingEntity; class DragonFireball : public Fireball { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp index ca48e20c8..87cbac683 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp @@ -1,12 +1,18 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../item/net.minecraft.world.item.h" -#include "../item/net.minecraft.world.entity.item.h" -#include "../../../SharedConstants.h" +#include +#include +#include + #include "java/JavaMath.h" #include "EyeOfEnderSignal.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" void EyeOfEnderSignal::_init() { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.h index 4026ab834..10479781b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.h @@ -1,6 +1,10 @@ #pragma once -#include "../Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" + +class Level; class EyeOfEnderSignal : public Entity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.cpp index 07e6502f1..ab830d3e9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.cpp @@ -1,14 +1,27 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "nbt/com.mojang.nbt.h" +#include +#include +#include +#include +#include +#include +#include +#include + #include "Fireball.h" -#include "../../level/dimension/net.minecraft.world.level.dimension.h" -#include "../../../SharedConstants.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/DoubleTag.h" +#include "nbt/ListTag.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" // 4J - added common ctor code. void Fireball::_init() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h index 70d034598..daa64c329 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h @@ -1,9 +1,15 @@ #pragma once -#include "../Entity.h" -#include "../../../../../Header Files/ParticleTypes.h" +#include + +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" class HitResult; +class Level; +class LivingEntity; class Fireball : public Entity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.cpp index 3a1458d79..397d73694 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.cpp @@ -1,8 +1,19 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.entity.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../level/net.minecraft.world.level.h" +#include +#include +#include + #include "FireworksRocketEntity.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/item/FireworksItem.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" FireworksRocketEntity::FireworksRocketEntity(Level* level) : Entity(level) { defineSynchedData(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.h index b44dca524..9af9fb0b6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.h @@ -1,6 +1,14 @@ #pragma once -#include "../Entity.h" +#include +#include + +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" + +class ItemInstance; +class Level; class FireworksRocketEntity : public Entity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp index f1b85c879..50d8fc5f7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp @@ -1,16 +1,28 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../stats/net.minecraft.stats.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../player/net.minecraft.world.entity.player.h" -#include "../../item/net.minecraft.world.item.h" -#include "../item/net.minecraft.world.entity.item.h" -#include "../net.minecraft.world.entity.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "nbt/com.mojang.nbt.h" +#include +#include +#include +#include +#include +#include + #include "FishingHook.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/FishingRodItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" // 4J - added common ctor code. void FishingHook::_init() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.h index 2ee6c19f1..1360190ea 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.h @@ -1,8 +1,13 @@ #pragma once -#include "../Entity.h" +#include + +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" class Player; +class Level; class FishingHook : public Entity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/LargeFireball.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/LargeFireball.cpp index 361e22b13..7b550a9b9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/LargeFireball.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/LargeFireball.cpp @@ -1,8 +1,14 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../phys/net.minecraft.world.phys.h" +#include + #include "LargeFireball.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h" +#include "Minecraft.World/net/minecraft/world/level/GameRules.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" LargeFireball::LargeFireball(Level* level) : Fireball(level) { explosionPower = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/LargeFireball.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/LargeFireball.h index 54a53577c..795a2c9cd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/LargeFireball.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/LargeFireball.h @@ -1,6 +1,13 @@ #pragma once +#include + #include "Fireball.h" +#include "java/Class.h" + +class Entity; +class Level; +class LivingEntity; class LargeFireball : public Fireball { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.cpp index 95418faa8..5f3683573 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.cpp @@ -1,10 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../level/net.minecraft.world.level.h" #include "SmallFireball.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" SmallFireball::SmallFireball(Level* level) : Fireball(level) { setSize(5 / 16.0f, 5 / 16.0f); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.h index 8a1fa1634..e82933c68 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/SmallFireball.h @@ -1,8 +1,14 @@ #pragma once +#include + #include "Fireball.h" +#include "java/Class.h" class HitResult; +class Entity; +class Level; +class LivingEntity; class SmallFireball : public Fireball { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.cpp index 3521e0d2f..5f1bd95db 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.cpp @@ -1,9 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../monster/net.minecraft.world.entity.monster.h" #include "Snowball.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" + +class LivingEntity; void Snowball::_init() { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.h index d89f266e9..eb6b29ab4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.h @@ -1,8 +1,14 @@ #pragma once +#include + #include "Throwable.h" +#include "java/Class.h" class HitResult; +class Entity; +class Level; +class LivingEntity; class Snowball : public Throwable { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp index 628d8f2a1..fa4cd41c0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp @@ -1,10 +1,19 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../net.minecraft.world.entity.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "nbt/com.mojang.nbt.h" +#include +#include +#include +#include +#include + #include "Throwable.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Class.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" void Throwable::_throwableInit() { xTile = -1; @@ -254,7 +263,7 @@ float Throwable::getShadowHeightOffs() { return 0; } std::shared_ptr Throwable::getOwner() { if (owner == nullptr && !ownerName.empty()) { - owner = level->getPlayerByName(ownerName); + owner = std::static_pointer_cast(level->getPlayerByName(ownerName)); } return owner; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h index 893112fab..7a2ac7612 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h @@ -1,10 +1,16 @@ #pragma once -#include "../Entity.h" +#include +#include + +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" #include "Projectile.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" class Mob; class HitResult; +class Level; class Throwable : public Entity, public Projectile { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp index b3c298dcc..86ef47e27 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp @@ -1,11 +1,13 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../animal/net.minecraft.world.entity.animal.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "nbt/com.mojang.nbt.h" #include "ThrownEgg.h" -#include "../MobCategory.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Chicken.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" void ThrownEgg::_init() { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.h index f97b1c6b0..97f29f37b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.h @@ -1,8 +1,13 @@ #pragma once +#include + #include "Throwable.h" +#include "java/Class.h" class HitResult; +class Level; +class LivingEntity; class ThrownEgg : public Throwable { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.cpp index 1133057bc..f777bfe02 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.cpp @@ -1,11 +1,14 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../net.minecraft.world.entity.h" -#include "../../level/net.minecraft.world.level.h" #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "ThrownEnderpearl.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" ThrownEnderpearl::ThrownEnderpearl(Level* level) : Throwable(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.h index 7dd19bd60..f1b48a6a7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.h @@ -1,8 +1,14 @@ #pragma once +#include + #include "Throwable.h" +#include "java/Class.h" class HitResult; +class Entity; +class Level; +class LivingEntity; class ThrownEnderpearl : public Throwable { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.cpp index 7efd8537e..56f1534f8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.cpp @@ -1,9 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.entity.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" #include "java/JavaMath.h" #include "ThrownExpBottle.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" + +class LivingEntity; ThrownExpBottle::ThrownExpBottle(Level* level) : Throwable(level) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.h index d3b83502b..27a6fdb99 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.h @@ -1,8 +1,14 @@ #pragma once +#include + #include "Throwable.h" +#include "java/Class.h" class HitResult; +class Entity; +class Level; +class LivingEntity; class ThrownExpBottle : public Throwable { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.cpp index f2f4df693..ad3517115 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.cpp @@ -1,12 +1,25 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../effect/net.minecraft.world.effect.h" -#include "../../../SharedConstants.h" +#include +#include +#include +#include + #include "java/JavaMath.h" #include "ThrownPotion.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/PotionItem.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" + +class Entity; const double ThrownPotion::SPLASH_RANGE = 4.0; const double ThrownPotion::SPLASH_RANGE_SQ = diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h index e7773ddf5..198a85aed 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h @@ -1,8 +1,15 @@ #pragma once +#include + #include "Throwable.h" +#include "java/Class.h" class HitResult; +class Entity; +class ItemInstance; +class Level; +class LivingEntity; class ThrownPotion : public Throwable { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/WitherSkull.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/WitherSkull.cpp index 89ef57fab..52ce588b9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/WitherSkull.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/WitherSkull.cpp @@ -1,12 +1,20 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../effect/net.minecraft.world.effect.h" -#include "../net.minecraft.world.entity.h" -#include "../../level/net.minecraft.world.level.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" +#include +#include + #include "WitherSkull.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/Difficulty.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h" +#include "Minecraft.World/net/minecraft/world/level/GameRules.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" WitherSkull::WitherSkull(Level* level) : Fireball(level) { defineSynchedData(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/WitherSkull.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/WitherSkull.h index d8f9fca8b..37bc41260 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/WitherSkull.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/WitherSkull.h @@ -1,6 +1,13 @@ #pragma once +#include + #include "Fireball.h" +#include "java/Class.h" + +class Entity; +class Level; +class LivingEntity; class WitherSkull : public Fireball { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/food/FoodConstants.cpp b/minecraft/Minecraft.World/net/minecraft/world/food/FoodConstants.cpp index 8a894636c..2db14a4fa 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/food/FoodConstants.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/food/FoodConstants.cpp @@ -1,5 +1,3 @@ -#include "../../../../Header Files/stdafx.h" - #include "FoodConstants.h" const int FoodConstants::MAX_FOOD = 20; diff --git a/minecraft/Minecraft.World/net/minecraft/world/food/FoodData.cpp b/minecraft/Minecraft.World/net/minecraft/world/food/FoodData.cpp index 15b1b0c4d..addaaef13 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/food/FoodData.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/food/FoodData.cpp @@ -1,12 +1,16 @@ -#include "../../../../Header Files/stdafx.h" -#include "../item/net.minecraft.world.item.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../net.minecraft.world.h" -#include "../damageSource/net.minecraft.world.damagesource.h" -#include "nbt/com.mojang.nbt.h" +#include +#include + #include "FoodConstants.h" #include "FoodData.h" +#include "Minecraft.World/net/minecraft/world/food/FoodData.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/Difficulty.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/FoodItem.h" +#include "Minecraft.World/net/minecraft/world/level/GameRules.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" FoodData::FoodData() { exhaustionLevel = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/food/FoodData.h b/minecraft/Minecraft.World/net/minecraft/world/food/FoodData.h index c81e9267a..9341c4fd7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/food/FoodData.h +++ b/minecraft/Minecraft.World/net/minecraft/world/food/FoodData.h @@ -1,5 +1,7 @@ #pragma once +#include + class FoodItem; class Player; class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.cpp index 44b620784..8d2533be0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.cpp @@ -1,9 +1,15 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../item/net.minecraft.world.item.h" -#include "../level/redstone/net.minecraft.world.level.redstone.h" +#include + #include "Slot.h" #include "AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" // 4J Stu - The java does not have ctor here (being an abstract) but we need one // to initialise the member variables diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h index f14d9375a..ca1c3edbf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h @@ -1,7 +1,17 @@ #pragma once -#include "../entity/player/Player.h" +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" #include "net.minecraft.world.inventory.ContainerListener.h" + +namespace net_minecraft_world_inventory { +class ContainerListener; +} // namespace net_minecraft_world_inventory + using net_minecraft_world_inventory::ContainerListener; class Inventory; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.cpp index 483784c4c..83a1c7a20 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.cpp @@ -1,4 +1,4 @@ -#include "../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "AnimalChest.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.h index 7d4fdbe69..7c86e31da 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.h @@ -1,6 +1,6 @@ #pragma once -#include "../SimpleContainer.h" +#include "Minecraft.World/net/minecraft/world/SimpleContainer.h" class AnimalChest : public SimpleContainer { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp index 9f27460cb..a3b6c48f6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp @@ -1,9 +1,9 @@ -#include "../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "net.minecraft.world.inventory.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../item/net.minecraft.world.item.h" -#include "../item/enchantment/net.minecraft.world.item.enchantment.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" #include "AnvilMenu.h" AnvilMenu::AnvilMenu(std::shared_ptr inventory, Level* level, int xt, diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ArmorSlot.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/ArmorSlot.cpp index 722905f37..901cb9df9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/ArmorSlot.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/ArmorSlot.cpp @@ -1,10 +1,9 @@ -#include "../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.h" -#include "../item/net.minecraft.world.item.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "net.minecraft.world.inventory.h" -#include "../item/crafting/net.minecraft.world.item.crafting.h" #include "ArmorSlot.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" ArmorSlot::ArmorSlot(int slotNum, std::shared_ptr container, int id, int x, int y) diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ArmorSlot.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/ArmorSlot.h index cf25af69e..38115c647 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/ArmorSlot.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/ArmorSlot.h @@ -3,6 +3,8 @@ // In InventoryMenu.java they create an anoymous class while creating some slot. // I have moved the content of that anonymous class to here +#include + #include "Slot.h" class Container; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/BeaconMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/BeaconMenu.cpp index 805d77393..74e7f9096 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/BeaconMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/BeaconMenu.cpp @@ -1,7 +1,14 @@ -#include "../../../../Header Files/stdafx.h" -#include "../item/net.minecraft.world.item.h" -#include "../level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include + #include "BeaconMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" + +class Container; BeaconMenu::BeaconMenu(std::shared_ptr inventory, std::shared_ptr beacon) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/BeaconMenu.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/BeaconMenu.h index a49ce7be3..3dfd64d34 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/BeaconMenu.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/BeaconMenu.h @@ -1,9 +1,12 @@ #pragma once +#include + #include "AbstractContainerMenu.h" #include "Slot.h" class BeaconTileEntity; +class Container; class BeaconMenu : public AbstractContainerMenu { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.cpp index 6b2707111..f664b13e9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.cpp @@ -1,10 +1,16 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../item/net.minecraft.world.item.h" -#include "../item/alchemy/net.minecraft.world.item.alchemy.h" -#include "../../stats/net.minecraft.stats.h" +#include + #include "BrewingStandMenu.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h" BrewingStandMenu::BrewingStandMenu( std::shared_ptr inventory, diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h index 082aec757..40e1ca7dc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "AbstractContainerMenu.h" #include "Slot.h" @@ -7,6 +9,7 @@ class BrewingStandTileEntity; class Inventory; class Player; class Container; +class ItemInstance; class BrewingStandMenu : public AbstractContainerMenu { // 4J Stu - Made public so that we can access these from the XUI menus diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ContainerMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/ContainerMenu.cpp index 28ee4877d..fb31cbb7b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/ContainerMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/ContainerMenu.cpp @@ -1,12 +1,16 @@ -#include "../../../../Header Files/stdafx.h" -#include "../Container.h" -#include "../item/net.minecraft.world.item.h" +#include + #include "Slot.h" -#include "../../stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" #include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "ContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" ContainerMenu::ContainerMenu(std::shared_ptr inventory, std::shared_ptr container) diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ContainerMenu.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/ContainerMenu.h index 76415eb45..1aa6a085b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/ContainerMenu.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/ContainerMenu.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "AbstractContainerMenu.h" class Container; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingContainer.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingContainer.cpp index ec78d54ea..782398ed6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingContainer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingContainer.cpp @@ -1,6 +1,5 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../item/net.minecraft.world.item.h" +#include + #include "AbstractContainerMenu.h" #include "CraftingContainer.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h index 732d2bbcd..a0efe0f38 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h @@ -1,6 +1,12 @@ #pragma once -#include "../Container.h" +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" class AbstractContainerMenu; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.cpp index 38fd6772b..64af377d0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.cpp @@ -1,13 +1,18 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../item/net.minecraft.world.item.h" -#include "../item/crafting/net.minecraft.world.item.crafting.h" +#include + #include "CraftingContainer.h" #include "ResultContainer.h" #include "ResultSlot.h" #include "CraftingMenu.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" const int CraftingMenu::RESULT_SLOT = 0; const int CraftingMenu::CRAFT_SLOT_START = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.h index 07f50e199..379083ced 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.h @@ -1,9 +1,13 @@ #pragma once +#include + #include "AbstractContainerMenu.h" class CraftingContainer; class Container; +class Inventory; +class Level; class CraftingMenu : public AbstractContainerMenu { // 4J Stu Made these public for UI menus, perhaps should make friend class? diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentContainer.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentContainer.cpp index 385680ae5..f102079b6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentContainer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentContainer.cpp @@ -1,4 +1,4 @@ -#include "../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "net.minecraft.world.inventory.h" #include "EnchantmentContainer.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentContainer.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentContainer.h index 2c58bdd7f..9cdb40648 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentContainer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentContainer.h @@ -3,7 +3,7 @@ // In EnchantmentMenu.java they create an anoymous class while creating the // container. I have moved the content of that anonymous class to here -#include "../SimpleContainer.h" +#include "Minecraft.World/net/minecraft/world/SimpleContainer.h" class EnchantmentMenu; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.cpp index ff4b8946a..9c9bf2014 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.cpp @@ -1,11 +1,23 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "net.minecraft.world.inventory.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../item/net.minecraft.world.item.h" -#include "../item/enchantment/net.minecraft.world.item.enchantment.h" +#include +#include + #include "EnchantmentMenu.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/EnchantmentContainer.h" +#include "Minecraft.World/net/minecraft/world/inventory/EnchantmentSlot.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" +#include "Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" EnchantmentMenu::EnchantmentMenu(std::shared_ptr inventory, Level* level, int xt, int yt, int zt) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h index 04e7b4fe4..25f400e49 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h @@ -1,7 +1,14 @@ #pragma once +#include +#include + #include "AbstractContainerMenu.h" #include "java/Random.h" +class Container; +class Inventory; +class Level; + class EnchantmentMenu : public AbstractContainerMenu { // 4J Stu Made these public for UI menus, perhaps should make friend class? public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.cpp index c6d0d267b..4d8654cef 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.cpp @@ -1,13 +1,18 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../item/net.minecraft.world.item.h" -#include "../item/crafting/net.minecraft.world.item.crafting.h" +#include + #include "CraftingContainer.h" #include "ResultContainer.h" #include "ResultSlot.h" #include "FireworksMenu.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" FireworksMenu::FireworksMenu(std::shared_ptr inventory, Level* level, int xt, int yt, int zt) diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.h index c6774f46a..699c13bef 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.h @@ -1,9 +1,13 @@ #pragma once +#include + #include "AbstractContainerMenu.h" class CraftingContainer; class Container; +class Inventory; +class Level; class FireworksMenu : public AbstractContainerMenu { // 4J Stu Made these public for UI menus, perhaps should make friend class? diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.cpp index 69fe5d1ad..f87db82aa 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.cpp @@ -1,12 +1,18 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../item/net.minecraft.world.item.h" -#include "../level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include + #include "FurnaceResultSlot.h" #include "Slot.h" -#include "../../stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" #include "FurnaceMenu.h" -#include "../item/crafting/FurnaceRecipes.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" +#include "Minecraft.World/net/minecraft/world/item/CoalItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h" FurnaceMenu::FurnaceMenu(std::shared_ptr inventory, std::shared_ptr furnace) diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.h index 8032215af..33f5966a9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "AbstractContainerMenu.h" class FurnaceTileEntity; +class Inventory; class FurnaceMenu : public AbstractContainerMenu { // 4J Stu Made these public for UI menus, perhaps should make friend class? diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceResultSlot.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceResultSlot.cpp index 23648c429..6a1418b3f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceResultSlot.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceResultSlot.cpp @@ -1,12 +1,18 @@ -#include "../../../../Header Files/stdafx.h" -#include "../../stats/net.minecraft.stats.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../item/crafting/net.minecraft.world.item.crafting.h" -#include "../level/net.minecraft.world.level.h" -#include "../item/net.minecraft.world.item.h" +#include +#include + #include "java/JavaMath.h" #include "FurnaceResultSlot.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" + +class Container; FurnaceResultSlot::FurnaceResultSlot(std::shared_ptr player, std::shared_ptr container, diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceResultSlot.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceResultSlot.h index fabf38e09..32363d0a9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceResultSlot.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/FurnaceResultSlot.h @@ -1,7 +1,12 @@ #pragma once +#include + #include "Slot.h" +class Container; +class Player; + class FurnaceResultSlot : public Slot { private: std::shared_ptr player; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/HopperMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/HopperMenu.cpp index e0ba80eca..1307eca8c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/HopperMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/HopperMenu.cpp @@ -1,6 +1,9 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.world.inventory.h" +#include + #include "HopperMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" HopperMenu::HopperMenu(std::shared_ptr inventory, std::shared_ptr hopper) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/HopperMenu.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/HopperMenu.h index f724685b0..c05681e32 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/HopperMenu.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/HopperMenu.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/Container.h" class HopperMenu : public AbstractContainerMenu { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.cpp index 2beea1759..3c9f9fdea 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.cpp @@ -1,7 +1,12 @@ -#include "../../../../Header Files/stdafx.h" -#include "../item/net.minecraft.world.item.h" -#include "../entity/animal/net.minecraft.world.entity.animal.h" +#include + #include "HorseInventoryMenu.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" HorseSaddleSlot::HorseSaddleSlot(std::shared_ptr horseInventory) : Slot(horseInventory, EntityHorse::INV_SLOT_SADDLE, 8, 18) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.h index 3ed23061e..b1ffb60da 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.h @@ -1,9 +1,13 @@ #pragma once +#include + #include "AbstractContainerMenu.h" #include "Slot.h" +#include "Minecraft.World/net/minecraft/world/Container.h" class HorseInventoryMenu; +class EntityHorse; class HorseSaddleSlot : public Slot { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.cpp index 9ca033ad5..853450d83 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.cpp @@ -1,14 +1,20 @@ -#include "../../../../Header Files/stdafx.h" -#include "../item/net.minecraft.world.item.h" -#include "../item/crafting/net.minecraft.world.item.crafting.h" -#include "../entity/player/net.minecraft.world.entity.player.h" +#include + #include "ResultSlot.h" #include "ArmorSlot.h" #include "CraftingContainer.h" #include "ResultContainer.h" #include "InventoryMenu.h" -#include "../level/tile/Tile.h" -#include "../../stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" const int InventoryMenu::RESULT_SLOT = 0; const int InventoryMenu::CRAFT_SLOT_START = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.h index 5ed51d581..d72197d17 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.h @@ -1,9 +1,13 @@ #pragma once +#include + #include "AbstractContainerMenu.h" class CraftingContainer; class Container; +class Inventory; +class Player; class InventoryMenu : public AbstractContainerMenu { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/MenuBackup.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/MenuBackup.cpp index 3083a37ed..92c730f5d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/MenuBackup.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/MenuBackup.cpp @@ -1,9 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include "../item/net.minecraft.world.item.h" -#include "../entity/player/net.minecraft.world.entity.player.h" +#include + #include "AbstractContainerMenu.h" #include "Slot.h" #include "MenuBackup.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" MenuBackup::MenuBackup(std::shared_ptr inventory, AbstractContainerMenu* menu) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/MenuBackup.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/MenuBackup.h index 0941e7fff..73f10c1ac 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/MenuBackup.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/MenuBackup.h @@ -1,7 +1,12 @@ #pragma once +#include +#include +#include + class AbstractContainerMenu; class Inventory; +class ItemInstance; class MenuBackup { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantContainer.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantContainer.cpp index e466a99bc..38ded1c7d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantContainer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantContainer.cpp @@ -1,7 +1,9 @@ -#include "../../../../Header Files/stdafx.h" -#include "../item/trading/net.minecraft.world.item.trading.h" #include "MerchantMenu.h" #include "MerchantContainer.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/trading/Merchant.h" +#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h" +#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.h" MerchantContainer::~MerchantContainer() {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantContainer.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantContainer.h index 97fd4402a..58996f6af 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantContainer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantContainer.h @@ -1,10 +1,16 @@ #pragma once -#include "../Container.h" +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/Container.h" class Merchant; class Player; class MerchantRecipe; +class ItemInstance; class MerchantContainer : public Container { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantMenu.cpp index 1e0a3ce3f..4e7c5cec2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantMenu.cpp @@ -1,9 +1,14 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "net.minecraft.world.inventory.h" -#include "../item/trading/net.minecraft.world.item.trading.h" -#include "../level/net.minecraft.world.level.h" +#include + #include "MerchantMenu.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/MerchantContainer.h" +#include "Minecraft.World/net/minecraft/world/inventory/MerchantResultSlot.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" MerchantMenu::MerchantMenu(std::shared_ptr inventory, std::shared_ptr merchant, Level* level) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h index a98539c0b..233d7dfa5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h @@ -1,8 +1,13 @@ #pragma once +#include + #include "AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/item/trading/Merchant.h" class MerchantContainer; +class Inventory; +class Level; class MerchantMenu : public AbstractContainerMenu { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantResultSlot.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantResultSlot.cpp index 6e9b44332..60b81482a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantResultSlot.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantResultSlot.cpp @@ -1,7 +1,13 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.world.inventory.h" -#include "../item/trading/net.minecraft.world.item.trading.h" +#include + #include "MerchantResultSlot.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/MerchantContainer.h" +#include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/trading/Merchant.h" +#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h" MerchantResultSlot::MerchantResultSlot(Player* player, std::shared_ptr merchant, diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantResultSlot.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantResultSlot.h index 41c0bd387..44892a921 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantResultSlot.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/MerchantResultSlot.h @@ -1,10 +1,14 @@ #pragma once +#include + #include "Slot.h" class MerchantContainer; class Player; class Merchant; +class ItemInstance; +class MerchantRecipe; class MerchantResultSlot : public Slot { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.cpp index 7e1bcaa28..8da8d71e6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.cpp @@ -1,6 +1,6 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../../network/packet/ContainerOpenPacket.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h" #include "PlayerEnderChestContainer.h" PlayerEnderChestContainer::PlayerEnderChestContainer() diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.h index 3331421dd..c8d98cd21 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.h @@ -1,6 +1,6 @@ #pragma once -#include "../SimpleContainer.h" +#include "Minecraft.World/net/minecraft/world/SimpleContainer.h" class EnderChestTileEntity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairContainer.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairContainer.cpp index 29a180d70..5b73dc0f1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairContainer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairContainer.cpp @@ -1,6 +1,8 @@ -#include "../../../../Header Files/stdafx.h" +#include + #include "AnvilMenu.h" #include "RepairContainer.h" +#include "Minecraft.World/net/minecraft/world/SimpleContainer.h" RepairContainer::RepairContainer(AnvilMenu* menu, int name, bool customName, int size) diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairContainer.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairContainer.h index 66945e73a..cc35792d6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairContainer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairContainer.h @@ -1,6 +1,8 @@ #pragma once -#include "../SimpleContainer.h" +#include + +#include "Minecraft.World/net/minecraft/world/SimpleContainer.h" class AnvilMenu; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairResultSlot.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairResultSlot.cpp index f628fe64d..beea3abc2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairResultSlot.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairResultSlot.cpp @@ -1,9 +1,14 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.world.inventory.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../entity/player/net.minecraft.world.entity.player.h" #include "RepairResultSlot.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/AnvilMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" RepairResultSlot::RepairResultSlot(AnvilMenu* menu, int xt, int yt, int zt, std::shared_ptr container, diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairResultSlot.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairResultSlot.h index 2dc6b5c17..903e140ea 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairResultSlot.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/RepairResultSlot.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "Slot.h" class AnvilMenu; +class Container; class RepairResultSlot : public Slot { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultContainer.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultContainer.cpp index c5aad0465..37e4f2969 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultContainer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultContainer.cpp @@ -1,5 +1,3 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" #include "ResultContainer.h" ResultContainer::ResultContainer() : Container() {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultContainer.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultContainer.h index 1124c0d3a..78a8fe4cc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultContainer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultContainer.h @@ -1,6 +1,12 @@ #pragma once -#include "../Container.h" +#include +#include + +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/Container.h" + +class ItemInstance; class ResultContainer : public Container { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.cpp index 7f46be655..f959129a1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.cpp @@ -1,10 +1,14 @@ -#include "../../../../Header Files/stdafx.h" -#include "../Container.h" -#include "../../stats/net.minecraft.stats.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../item/net.minecraft.world.item.h" -#include "../level/tile/net.minecraft.world.level.tile.h" +#include + #include "ResultSlot.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" ResultSlot::ResultSlot(Player* player, std::shared_ptr craftSlots, std::shared_ptr container, int id, int x, diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.h index 46fecd0b2..54e75bcb2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.h @@ -1,7 +1,12 @@ #pragma once +#include + #include "Slot.h" +class Container; +class Player; + class ResultSlot : public Slot { private: std::shared_ptr craftSlots; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/Slot.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/Slot.cpp index 438f596db..5c22a47b8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/Slot.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/Slot.cpp @@ -1,9 +1,15 @@ -#include "../../../../Header Files/stdafx.h" +#include -#include "../Container.h" -#include "../item/net.minecraft.world.item.h" -#include "../item/crafting/net.minecraft.world.item.crafting.h" #include "Slot.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h" +#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/ArmorDyeRecipe.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" + +class Icon; +class Player; Slot::Slot(std::shared_ptr container, int slot, int x, int y) : container(container), slot(slot) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/Slot.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/Slot.h index 748ac5256..fdb764c88 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/Slot.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/Slot.h @@ -1,6 +1,12 @@ #pragma once +#include + +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" + class Container; +class Icon; +class Player; class Slot { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/TrapMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/TrapMenu.cpp index 1b7f8cd75..e1e23fde4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/TrapMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/TrapMenu.cpp @@ -1,9 +1,11 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../Container.h" +#include + #include "Slot.h" #include "TrapMenu.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" + +class Container; TrapMenu::TrapMenu(std::shared_ptr inventory, std::shared_ptr trap) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/TrapMenu.h b/minecraft/Minecraft.World/net/minecraft/world/inventory/TrapMenu.h index c4f38b626..98d84a768 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/TrapMenu.h +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/TrapMenu.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "AbstractContainerMenu.h" class DispenserTileEntity; +class Container; class TrapMenu : public AbstractContainerMenu { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/AnvilTileItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/AnvilTileItem.cpp index adc75435a..6714a6aa4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/AnvilTileItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/AnvilTileItem.cpp @@ -1,6 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/tile/net.minecraft.world.level.tile.h" #include "AnvilTileItem.h" +#include "Minecraft.World/net/minecraft/world/item/MultiTextureTileItem.h" +#include "Minecraft.World/net/minecraft/world/level/tile/AnvilTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" AnvilTileItem::AnvilTileItem(Tile* tile) : MultiTextureTileItem(tile->id - 256, tile, (int*)AnvilTile::ANVIL_NAMES, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/AnvilTileItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/AnvilTileItem.h index 40c6b7e13..02bbc4ad4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/AnvilTileItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/AnvilTileItem.h @@ -2,6 +2,8 @@ #include "MultiTextureTileItem.h" +class Tile; + class AnvilTileItem : public MultiTextureTileItem { public: AnvilTileItem(Tile* tile); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.cpp index e96d3bb6f..69c226995 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.cpp @@ -1,13 +1,29 @@ -#include "../../../../Header Files/stdafx.h" +#include +#include +#include + #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "../net.minecraft.world.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../phys/net.minecraft.world.phys.h" -#include "../level/net.minecraft.world.level.h" -#include "nbt/com.mojang.nbt.h" #include "ArmorItem.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/Class.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/core/BehaviorRegistry.h" +#include "Minecraft.World/net/minecraft/core/BlockSource.h" +#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h" +#include "Minecraft.World/net/minecraft/core/FacingEnum.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Entity; +class Icon; const int ArmorItem::healthPerSlot[] = {11, 16, 15, 13}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.h index 6bba66850..37e34ddf3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.h @@ -1,7 +1,14 @@ #pragma once +#include +#include + #include "Item.h" -#include "../../core/DefaultDispenseItemBehavior.h" +#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h" +#include "Minecraft.Client/Common/App_enums.h" + +class Icon; +class ItemInstance; class ArmorItem : public Item { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/AuxDataTileItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/AuxDataTileItem.cpp index 48209e31a..3de942463 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/AuxDataTileItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/AuxDataTileItem.cpp @@ -1,6 +1,6 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/tile/net.minecraft.world.level.tile.h" #include "AuxDataTileItem.h" +#include "Minecraft.World/net/minecraft/world/item/TileItem.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" AuxDataTileItem::AuxDataTileItem(int id, Tile* parentTile) : TileItem(id) { this->parentTile = parentTile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BedItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/BedItem.cpp index ed1e1f94c..6b9e6b55d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BedItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/BedItem.cpp @@ -1,12 +1,16 @@ -#include "../../../../Header Files/stdafx.h" -#include "../../net.minecraft.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "net.minecraft.world.item.h" -#include "../../Facing.h" -#include "../../stats/GenericStats.h" +#include + +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" #include "BedItem.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BedTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" BedItem::BedItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BoatItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/BoatItem.cpp index fe46bc6af..7c99a55d8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BoatItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/BoatItem.cpp @@ -1,11 +1,11 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../entity/item/net.minecraft.world.entity.item.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../phys/net.minecraft.world.phys.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" #include "ItemInstance.h" -#include "../phys/Vec3.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" #include "BoatItem.h" BoatItem::BoatItem(int id) : Item(id) { maxStackSize = 1; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BookItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/BookItem.cpp index 23bebfa10..e1a2a13ad 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BookItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/BookItem.cpp @@ -1,6 +1,8 @@ -#include "../../../../Header Files/stdafx.h" +#include #include "BookItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" BookItem::BookItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BottleItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/BottleItem.cpp index 434a9dadd..bd95c7625 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BottleItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/BottleItem.cpp @@ -1,10 +1,14 @@ -#include "../../../../Header Files/stdafx.h" -#include "../phys/net.minecraft.world.phys.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/material/net.minecraft.world.level.material.h" -#include "net.minecraft.world.item.h" +#include + #include "BottleItem.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/PotionItem.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" BottleItem::BottleItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.cpp index 3e89d1c57..a44b0eab0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.cpp @@ -1,12 +1,20 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/net.minecraft.world.level.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../entity/projectile/net.minecraft.world.entity.projectile.h" -#include "../entity/item/net.minecraft.world.entity.item.h" -#include "enchantment/net.minecraft.world.item.enchantment.h" -#include "../net.minecraft.world.h" +#include + #include "BowItem.h" -#include "../../../../Header Files/SoundTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" + +class Icon; const std::wstring BowItem::TEXTURE_PULL[] = {L"bow_pull_0", L"bow_pull_1", L"bow_pull_2"}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.h index 809283ddd..9f575ed0e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.h @@ -1,9 +1,13 @@ #pragma once +#include + #include "Item.h" +#include "Minecraft.World/net/minecraft/world/item/UseAnim.h" class Player; class Level; +class Icon; class BowItem : public Item { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BowlFoodItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/BowlFoodItem.cpp index 5405f226d..76cbe5fa0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BowlFoodItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/BowlFoodItem.cpp @@ -1,7 +1,9 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "ItemInstance.h" +#include + #include "BowlFoodItem.h" +#include "Minecraft.World/net/minecraft/world/item/FoodItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" BowlFoodItem::BowlFoodItem(int id, int nutrition) : FoodItem(id, nutrition, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.cpp index e28b23e3f..9fb7e0266 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.cpp @@ -1,22 +1,28 @@ -#include "../../../../Header Files/stdafx.h" +#include +#include + #include "java/JavaMath.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/dimension/net.minecraft.world.level.dimension.h" -#include "../level/material/net.minecraft.world.level.material.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../phys/net.minecraft.world.phys.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../entity/animal/net.minecraft.world.entity.animal.h" -#include "../../stats/net.minecraft.stats.h" -#include "../level/material/Material.h" -#include "ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" #include "BucketItem.h" -#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" -#include "../../network/packet/ChatPacket.h" -#include "../../../../Header Files/SoundTypes.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" BucketItem::BucketItem(int id, int content) : Item(id) { maxStackSize = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/CarrotOnAStickItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/CarrotOnAStickItem.cpp index 40452c7c1..3902ce8be 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/CarrotOnAStickItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/CarrotOnAStickItem.cpp @@ -1,9 +1,13 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/animal/net.minecraft.world.entity.animal.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../entity/ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "net.minecraft.world.item.h" +#include + #include "CarrotOnAStickItem.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Pig.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/FishingRodItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" CarrotOnAStickItem::CarrotOnAStickItem(int id) : Item(id) { setMaxStackSize(1); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ClockItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/ClockItem.cpp index cc8d2f68c..06e262810 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ClockItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ClockItem.cpp @@ -1,8 +1,12 @@ -#include "../../../../Header Files/stdafx.h" +#include + #include "ClockItem.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" + +class Icon; const std::wstring ClockItem::TEXTURE_PLAYER_ICON[XUSER_MAX_COUNT] = { L"clockP0", L"clockP1", L"clockP2", L"clockP3"}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ClockItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/ClockItem.h index f3022f5dc..82a4009d2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ClockItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ClockItem.h @@ -2,7 +2,12 @@ // 4J Added so that we can override the icon id used to calculate the texture // UV's for each player +#include + #include "Item.h" +#include "4J.Common/4J_Compat.h" + +class Icon; class ClockItem : public Item { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/CoalItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/CoalItem.cpp index 379cee754..a937dc53f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/CoalItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/CoalItem.cpp @@ -1,8 +1,8 @@ -#include "../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "net.minecraft.world.item.h" -#include "../entity/item/net.minecraft.world.entity.item.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "CoalItem.h" CoalItem::CoalItem(int id) : Item(id) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ColoredTileItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/ColoredTileItem.cpp index ca75b9c19..c6d5acf2e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ColoredTileItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ColoredTileItem.cpp @@ -1,6 +1,9 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/tile/net.minecraft.world.level.tile.h" +#include + #include "ColoredTileItem.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/TileItem.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" ColoredTileItem::ColoredTileItem(int id, bool stackedByData) : TileItem(id) { this->colorTile = Tile::tiles[getTileId()]; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ColoredTileItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/ColoredTileItem.h index f1bd89a55..e39a60b9c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ColoredTileItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ColoredTileItem.h @@ -1,8 +1,12 @@ #pragma once +#include +#include + #include "TileItem.h" class ItemInstance; +class Tile; class ColoredTileItem : public TileItem { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/CompassItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/CompassItem.cpp index 02927f7ed..91cbf2431 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/CompassItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/CompassItem.cpp @@ -1,8 +1,12 @@ -#include "../../../../Header Files/stdafx.h" +#include + #include "CompassItem.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" + +class Icon; const std::wstring CompassItem::TEXTURE_PLAYER_ICON[XUSER_MAX_COUNT] = { L"compassP0", L"compassP1", L"compassP2", L"compassP3"}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/CompassItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/CompassItem.h index 96942373f..e3ff5326f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/CompassItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/CompassItem.h @@ -2,7 +2,12 @@ // 4J Added so that we can override the icon id used to calculate the texture // UV's for each player +#include + #include "Item.h" +#include "4J.Common/4J_Compat.h" + +class Icon; class CompassItem : public Item { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ComplexItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/ComplexItem.cpp index e00cb0a92..f8dc808ec 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ComplexItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ComplexItem.cpp @@ -1,8 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include "../../network/packet/net.minecraft.network.packet.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" #include "ComplexItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" + +class ItemInstance; ComplexItem::ComplexItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ComplexItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/ComplexItem.h index 2467ea952..a6557c290 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ComplexItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ComplexItem.h @@ -1,10 +1,13 @@ #pragma once +#include + #include "Item.h" class Player; class Packet; class Level; +class ItemInstance; class ComplexItem : public Item { protected: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/DiggerItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/DiggerItem.cpp index d987a471b..3257c05af 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/DiggerItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/DiggerItem.cpp @@ -1,10 +1,12 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../entity/monster/net.minecraft.world.entity.monster.h" -#include "net.minecraft.world.item.h" -#include "../level/tile/net.minecraft.world.level.tile.h" +#include +#include + #include "DiggerItem.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" DiggerItem::DiggerItem(int id, float attackDamage, const Tier* tier, std::vector* tiles) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/DiggerItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/DiggerItem.h index 05fd30be1..af8778110 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/DiggerItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/DiggerItem.h @@ -1,8 +1,12 @@ #pragma once +#include + #include "Item.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" class Mob; +class Tile; class DiggerItem : public Item { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/DoorItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/DoorItem.cpp index 5802e61f9..bd43ea846 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/DoorItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/DoorItem.cpp @@ -1,15 +1,16 @@ -#include "../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../phys/net.minecraft.world.phys.h" -#include "net.minecraft.world.item.h" -#include "../../Facing.h" -#include "../level/material/Material.h" -#include "../../stats/GenericStats.h" +#include + +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" #include "DoorItem.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" DoorItem::DoorItem(int id, Material* material) : Item(id) { this->material = material; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/DoorItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/DoorItem.h index 3f20fe06b..4573d896d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/DoorItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/DoorItem.h @@ -5,6 +5,7 @@ class Player; class Material; class Level; +class Tile; class DoorItem : public Item { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/DyePowderItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/DyePowderItem.cpp index f485122b3..c2e7775e6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/DyePowderItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/DyePowderItem.cpp @@ -1,16 +1,16 @@ -#include "../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "nbt/com.mojang.nbt.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../phys/net.minecraft.world.phys.h" -#include "../level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "net.minecraft.world.item.h" -#include "../entity/item/net.minecraft.world.entity.item.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../entity/global/net.minecraft.world.entity.global.h" -#include "../entity/animal/net.minecraft.world.entity.animal.h" -#include "../net.minecraft.world.h" -#include "../level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/entity/global/net.minecraft.world.entity.global.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" #include "DyePowderItem.h" DyePowderItem::DyePowderItem(int id) : Item(id) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EggItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/EggItem.cpp index 5c92b5601..696835f05 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EggItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/EggItem.cpp @@ -1,16 +1,15 @@ -#include "../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../phys/net.minecraft.world.phys.h" -#include "../level/net.minecraft.world.level.h" -#include "net.minecraft.world.item.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../entity/item/net.minecraft.world.entity.item.h" -#include "../entity/global/net.minecraft.world.entity.global.h" -#include "../entity/projectile/net.minecraft.world.entity.projectile.h" +#include + #include "EggItem.h" -#include "../../../../Header Files/SoundTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" EggItem::EggItem(int id) : Item(id) { maxStackSize = 16; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EmptyMapItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/EmptyMapItem.cpp index b8041229d..06729ea54 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EmptyMapItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/EmptyMapItem.cpp @@ -1,7 +1,12 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.world.item.h" -#include "../entity/player/net.minecraft.world.entity.player.h" +#include + #include "EmptyMapItem.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/ComplexItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/MapItem.h" EmptyMapItem::EmptyMapItem(int id) : ComplexItem(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.cpp index 7851022bc..e95359658 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.cpp @@ -1,8 +1,15 @@ -#include "../../../../Header Files/stdafx.h" -#include "enchantment/net.minecraft.world.item.enchantment.h" -#include "net.minecraft.world.item.h" -#include "../../util/WeighedTreasure.h" +#include + +#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" #include "EnchantedBookItem.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "Minecraft.World/net/minecraft/util/HtmlString.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/Rarity.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.h" const std::wstring EnchantedBookItem::TAG_STORED_ENCHANTMENTS = L"StoredEnchantments"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h index 7326615d5..7ca060193 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h @@ -1,8 +1,18 @@ #pragma once +#include +#include +#include + #include "Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" class EnchantmentInstance; +class CompoundTag; +class Enchantment; +class Random; +class WeighedTreasure; +template class ListTag; class EnchantedBookItem : public Item { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp index 00f0423fa..2bc6a821e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp @@ -1,13 +1,23 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../level/levelgen/net.minecraft.world.level.levelgen.h" -#include "../level/dimension/net.minecraft.world.level.dimension.h" -#include "../entity/projectile/net.minecraft.world.entity.projectile.h" -#include "../phys/net.minecraft.world.phys.h" +#include + #include "EnderEyeItem.h" -#include "../../../../Header Files/SoundTypes.h" -#include "../level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" EnderEyeItem::EnderEyeItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EnderpearlItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/EnderpearlItem.cpp index d2320f8ef..1bee436d1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EnderpearlItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/EnderpearlItem.cpp @@ -1,9 +1,14 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/net.minecraft.world.level.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../entity/projectile/net.minecraft.world.entity.projectile.h" +#include + #include "EnderpearlItem.h" -#include "../../../../Header Files/SoundTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" EnderpearlItem::EnderpearlItem(int id) : Item(id) { maxStackSize = 16; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ExperienceItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/ExperienceItem.cpp index d08176767..cbc499f19 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ExperienceItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ExperienceItem.cpp @@ -1,10 +1,14 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/net.minecraft.world.level.h" -#include "../entity/projectile/net.minecraft.world.entity.projectile.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "net.minecraft.world.item.h" -#include "../../../../Header Files/SoundTypes.h" +#include + #include "ExperienceItem.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownExpBottle.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" ExperienceItem::ExperienceItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.cpp index 44254e2bd..d5f828f65 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.cpp @@ -1,12 +1,16 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/net.minecraft.world.level.h" -#include "../entity/projectile/net.minecraft.world.entity.projectile.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "net.minecraft.world.item.h" -#include "../net.minecraft.world.h" -#include "../../../../Header Files/SoundTypes.h" +#include +#include + #include "FireChargeItem.h" -#include "../level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" FireChargeItem::FireChargeItem(int id) : Item(id) { m_dragonFireballIcon = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.h index 1efb9c1cc..23c2b9467 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FireChargeItem.h @@ -5,6 +5,7 @@ class ItemInstance; class Player; class Level; +class Icon; class FireChargeItem : public Item { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.cpp index a7d11afb8..6947ed663 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.cpp @@ -1,6 +1,6 @@ -#include "../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "net.minecraft.world.item.h" -#include "../net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "FireworksChargeItem.h" FireworksChargeItem::FireworksChargeItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp index 6ee1978fe..2a5315de6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp @@ -1,8 +1,8 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../entity/projectile/net.minecraft.world.entity.projectile.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" #include "net.minecraft.world.item.h" -#include "../level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "FireworksItem.h" const std::wstring FireworksItem::TAG_FIREWORKS = L"Fireworks"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.cpp index 018cb4c05..6ed9fa6ed 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.cpp @@ -1,17 +1,17 @@ -#include "../../../../Header Files/stdafx.h" -#include "../../network/packet/net.minecraft.network.packet.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/chunk/net.minecraft.world.level.chunk.h" -#include "../level/material/net.minecraft.world.level.material.h" -#include "../level/saveddata/net.minecraft.world.level.saveddata.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../entity/projectile/net.minecraft.world.entity.projectile.h" -#include "../net.minecraft.world.h" -#include "ItemInstance.h" +#include +#include + #include "FishingRodItem.h" -#include "../../../../Header Files/SoundTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" + +class Icon; FishingRodItem::FishingRodItem(int id) : Item(id) { setMaxDamage(64); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.h index e2462d975..2c1afefca 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.h @@ -4,6 +4,7 @@ class Player; class Level; +class Icon; class FishingRodItem : public Item { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FlintAndSteelItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FlintAndSteelItem.cpp index ce1125039..06a4b85d5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FlintAndSteelItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FlintAndSteelItem.cpp @@ -1,13 +1,15 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../phys/net.minecraft.world.phys.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../../stats/net.minecraft.stats.h" -#include "../level/material/Material.h" -#include "ItemInstance.h" +#include + #include "FlintAndSteelItem.h" -#include "../../../../Header Files/SoundTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/PortalTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" FlintAndSteelItem::FlintAndSteelItem(int id) : Item(id) { maxStackSize = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.cpp index 41db2ff45..9f0a0a6de 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.cpp @@ -1,15 +1,14 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../food/net.minecraft.world.food.h" -#include "../level/net.minecraft.world.level.h" -#include "../effect/net.minecraft.world.effect.h" -#include "../../net.minecraft.h" -#include "ItemInstance.h" #include "FoodItem.h" -#include "../../../../Header Files/SoundTypes.h" - -// 4J : WESTY : Other award ... eating cooked pork chop. -#include "../../stats/net.minecraft.stats.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/food/FoodConstants.h" +#include "Minecraft.World/net/minecraft/world/food/FoodData.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" void FoodItem::_init() { // 4J Initialisers diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.h index 35b8cfdac..35087e3ea 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FoodItem.h @@ -1,9 +1,13 @@ #pragma once +#include + #include "Item.h" +#include "Minecraft.World/net/minecraft/world/item/UseAnim.h" class Player; class Level; +class ItemInstance; class FoodItem : public Item { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/GoldenAppleItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/GoldenAppleItem.cpp index cc1b29baf..fa280ebeb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/GoldenAppleItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/GoldenAppleItem.cpp @@ -1,8 +1,8 @@ -#include "../../../../Header Files/stdafx.h" -#include "../effect/net.minecraft.world.effect.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../../SharedConstants.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" #include "GoldenAppleItem.h" GoldenAppleItem::GoldenAppleItem(int id, int nutrition, float saturationMod, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/HangingEntityItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/HangingEntityItem.cpp index f5c3a50e0..6fe98c22c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/HangingEntityItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/HangingEntityItem.cpp @@ -1,15 +1,15 @@ -#include "../../../../Header Files/stdafx.h" -#include "../../net.minecraft.h" -#include "../phys/net.minecraft.world.phys.h" -#include "../damageSource/net.minecraft.world.damagesource.h" -#include "../level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" +#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "net.minecraft.world.item.h" -#include "../level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "HangingEntityItem.h" -#include "../entity/HangingEntity.h" -#include "../entity/Painting.h" -#include "../../stats/GenericStats.h" -#include "../entity/ItemFrame.h" +#include "Minecraft.World/net/minecraft/world/entity/HangingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Painting.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/entity/ItemFrame.h" HangingEntityItem::HangingEntityItem(int id, eINSTANCEOF eClassType) : Item(id) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/HatchetItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/HatchetItem.cpp index 34dbd7b56..e1ba8d0e9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/HatchetItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/HatchetItem.cpp @@ -1,6 +1,12 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/tile/net.minecraft.world.level.tile.h" +#include +#include + #include "HatchetItem.h" +#include "Minecraft.World/net/minecraft/world/item/DiggerItem.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ChestTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" std::vector* HatchetItem::diggables = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/HatchetItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/HatchetItem.h index ccf60d72d..cdaa4f98c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/HatchetItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/HatchetItem.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "DiggerItem.h" +class Tile; + #define HATCHET_DIGGABLES 8 class HatchetItem : public DiggerItem { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/HoeItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/HoeItem.cpp index 76ff7c240..2b11d58f9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/HoeItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/HoeItem.cpp @@ -1,9 +1,11 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "ItemInstance.h" +#include + #include "HoeItem.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" HoeItem::HoeItem(int id, const Tier* tier) : Item(id) { this->tier = tier; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/Item.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/Item.cpp index cfa9bf91e..bd87b82a2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/Item.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/Item.cpp @@ -1,21 +1,21 @@ -#include "../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" -#include "../../locale/net.minecraft.locale.h" -#include "../net.minecraft.world.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../entity/item/net.minecraft.world.entity.item.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "net.minecraft.world.item.h" -#include "alchemy/net.minecraft.world.item.alchemy.h" -#include "../food/net.minecraft.world.food.h" -#include "../effect/net.minecraft.world.effect.h" -#include "../../stats/net.minecraft.stats.h" +#include "Minecraft.World/net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" +#include "Minecraft.World/net/minecraft/world/food/net.minecraft.world.food.h" +#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" +#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" #include "MapItem.h" #include "Item.h" #include "HangingEntityItem.h" -#include "../../util/HtmlString.h" -#include "../phys/Vec3.h" +#include "Minecraft.World/net/minecraft/util/HtmlString.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" typedef Item::Tier _Tier; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/Item.h b/minecraft/Minecraft.World/net/minecraft/world/item/Item.h index d75abd2de..b8cd34e30 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/Item.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/Item.h @@ -1,6 +1,6 @@ #pragma once -#include "../Container.h" +#include "Minecraft.World/net/minecraft/world/Container.h" #include "UseAnim.h" #include "Rarity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp index 6b9c815a4..2b144df74 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp @@ -1,18 +1,38 @@ -#include "../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" -#include "../../locale/net.minecraft.locale.h" -#include "../../stats/net.minecraft.stats.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../entity/monster/net.minecraft.world.entity.monster.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "net.minecraft.world.item.h" -#include "enchantment/net.minecraft.world.item.enchantment.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "Item.h" -#include "ItemInstance.h" -#include "../../util/HtmlString.h" +#include "Minecraft.World/net/minecraft/util/HtmlString.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Common/Potion_Macros.h" +#include "nbt/CompoundTag.h" +#include "nbt/IntTag.h" +#include "nbt/ListTag.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/BowItem.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/MapItem.h" +#include "Minecraft.World/net/minecraft/world/item/UseAnim.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Tag; const std::wstring ItemInstance::ATTRIBUTE_MODIFIER_FORMAT = L"#.###"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.h b/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.h index 4e145f1cb..7366065bf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.h @@ -2,7 +2,7 @@ #include "UseAnim.h" #include "nbt/com.mojang.nbt.h" -#include "../entity/ai/attributes/Attribute.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" class Entity; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/LeafTileItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/LeafTileItem.cpp index b905d4b88..aa179cf1c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/LeafTileItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/LeafTileItem.cpp @@ -1,8 +1,11 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "net.minecraft.world.item.h" +#include + #include "LeafTileItem.h" -#include "../level/FoliageColor.h" +#include "Minecraft.World/net/minecraft/world/level/FoliageColor.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/TileItem.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LeafTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" LeafTileItem::LeafTileItem(int id) : TileItem(id) { setMaxDamage(0); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/LeashItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/LeashItem.cpp index 9c3230e9f..19943eb46 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/LeashItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/LeashItem.cpp @@ -1,10 +1,16 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../level/net.minecraft.world.level.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../phys/net.minecraft.world.phys.h" -#include "../phys/AABB.h" +#include +#include + #include "LeashItem.h" +#include "Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Entity; LeashItem::LeashItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/LeashItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/LeashItem.h index 259e310c2..46f7b1d6c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/LeashItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/LeashItem.h @@ -1,7 +1,12 @@ #pragma once +#include + #include "Item.h" +class Level; +class Player; + class LeashItem : public Item { public: LeashItem(int id); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.cpp index ec566f960..07f528092 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.cpp @@ -1,18 +1,31 @@ -#include "../../../../Header Files/stdafx.h" -#include "../../network/packet/net.minecraft.network.packet.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/chunk/net.minecraft.world.level.chunk.h" -#include "../level/dimension/net.minecraft.world.level.dimension.h" -#include "../level/material/net.minecraft.world.level.material.h" -#include "../level/saveddata/net.minecraft.world.level.saveddata.h" -#include "../level/storage/net.minecraft.world.level.storage.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "net.minecraft.world.item.h" +#include +#include +#include +#include +#include + #include "MapItem.h" -#include "../inventory/net.minecraft.world.inventory.h" #include "java/JavaMath.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/item/ComplexItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/material/MaterialColor.h" +#include "Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class SavedData; MapItem::MapItem(int id) : ComplexItem(id) { setStackedByData(true); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.h index babf038cf..e99d8080a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.h @@ -1,8 +1,13 @@ #pragma once +#include + #include "ComplexItem.h" class MapItemSavedData; +class Entity; +class ItemInstance; +class Level; class MapItem : public ComplexItem { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MilkBucketItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/MilkBucketItem.cpp index f4815f670..b2fe59f31 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/MilkBucketItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/MilkBucketItem.cpp @@ -1,7 +1,11 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/net.minecraft.world.level.h" -#include "../entity/player/net.minecraft.world.entity.player.h" +#include + #include "MilkBucketItem.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" MilkBucketItem::MilkBucketItem(int id) : Item(id) { setMaxStackSize(1); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MilkBucketItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/MilkBucketItem.h index cb4e2f065..a664c7f04 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/MilkBucketItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/MilkBucketItem.h @@ -1,6 +1,7 @@ #pragma once #include "Item.h" +#include "Minecraft.World/net/minecraft/world/item/UseAnim.h" class MilkBucketItem : public Item { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MinecartItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/MinecartItem.cpp index 65f1ab6ae..cefe038bf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/MinecartItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/MinecartItem.cpp @@ -1,10 +1,19 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/item/net.minecraft.world.entity.item.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "ItemInstance.h" +#include +#include + #include "MinecartItem.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/core/BehaviorRegistry.h" +#include "Minecraft.World/net/minecraft/core/BlockSource.h" +#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h" +#include "Minecraft.World/net/minecraft/core/FacingEnum.h" +#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" std::shared_ptr MinecartItem::MinecartDispenseBehavior::execute( BlockSource* source, std::shared_ptr dispensed, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MinecartItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/MinecartItem.h index 7e956cc14..d26691ce9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/MinecartItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/MinecartItem.h @@ -1,7 +1,9 @@ #pragma once #include "Item.h" -#include "../../core/DefaultDispenseItemBehavior.h" +#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h" + +class BlockSource; class MinecartItem : public Item { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MultiTextureTileItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/MultiTextureTileItem.cpp index 34b356178..2f6e160f1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/MultiTextureTileItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/MultiTextureTileItem.cpp @@ -1,7 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/tile/Tile.h" +#include + +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "MultiTextureTileItem.h" -#include "crafting/net.minecraft.world.item.crafting.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/TileItem.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" MultiTextureTileItem::MultiTextureTileItem(int id, Tile* parentTile, int* nameExtensions, int iLength, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/NameTagItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/NameTagItem.cpp index e0a1ed379..5400a579e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/NameTagItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/NameTagItem.cpp @@ -1,6 +1,12 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/net.minecraft.world.entity.h" +#include +#include + #include "NameTagItem.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" NameTagItem::NameTagItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PickaxeItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/PickaxeItem.cpp index 9328f7542..142d15cea 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/PickaxeItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/PickaxeItem.cpp @@ -1,6 +1,11 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/tile/net.minecraft.world.level.tile.h" +#include +#include + #include "PickaxeItem.h" +#include "Minecraft.World/net/minecraft/world/item/DiggerItem.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" std::vector PickaxeItem::diggables; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PickaxeItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/PickaxeItem.h index 76233b498..152223582 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/PickaxeItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/PickaxeItem.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "DiggerItem.h" +class Tile; + #define PICKAXE_DIGGABLES 23 class PickaxeItem : public DiggerItem { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PistonTileItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/PistonTileItem.cpp index 277117f17..12b610ce7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/PistonTileItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/PistonTileItem.cpp @@ -1,7 +1,6 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "net.minecraft.world.item.h" #include "PistonTileItem.h" +#include "Minecraft.World/net/minecraft/world/item/TileItem.h" +#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h" PistonTileItem::PistonTileItem(int id) : TileItem(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.cpp index 20a8a9f2d..a2ac9e729 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.cpp @@ -1,11 +1,16 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "net.minecraft.world.item.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../../net.minecraft.h" +#include + #include "PlanterTileItem.h" -#include "../../stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.h" TilePlanterItem::TilePlanterItem(int id, Tile* tile) : Item(id) { this->tileId = tile->id; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.h index 2ec8bbb03..7326358de 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.h @@ -2,6 +2,8 @@ #include "Item.h" +class Tile; + class TilePlanterItem : public Item { private: int tileId; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp index df82721c4..93946d386 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp @@ -1,17 +1,17 @@ -#include "../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "net.minecraft.world.item.h" -#include "alchemy/net.minecraft.world.item.alchemy.h" -#include "../effect/net.minecraft.world.effect.h" -#include "../level/net.minecraft.world.level.h" -#include "../entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../entity/projectile/net.minecraft.world.entity.projectile.h" -#include "../net.minecraft.world.h" -#include "../effect/MobEffectInstance.h" -#include "../../../../ConsoleHelpers/StringHelpers.h" -#include "../../SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" +#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" #include "PotionItem.h" -#include "../../../../Header Files/SoundTypes.h" +#include "Minecraft.World/Header Files/SoundTypes.h" const std::wstring PotionItem::DEFAULT_ICON = L"potion"; const std::wstring PotionItem::THROWABLE_ICON = L"potion_splash"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/Rarity.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/Rarity.cpp index 1a9576144..72eebb11b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/Rarity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/Rarity.cpp @@ -1,5 +1,3 @@ -#include "../../../../Header Files/stdafx.h" - #include "Rarity.h" const Rarity* Rarity::common = new Rarity(eHTMLColor_f, L"Common"); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/Rarity.h b/minecraft/Minecraft.World/net/minecraft/world/item/Rarity.h index 3fc6158ea..bf1cf24ab 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/Rarity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/Rarity.h @@ -1,5 +1,9 @@ #pragma once +#include + +#include "Minecraft.Client/Common/App_enums.h" + class Rarity { public: static const Rarity* common; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/RecordingItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/RecordingItem.cpp index cce62e64d..b4a636e8b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/RecordingItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/RecordingItem.cpp @@ -1,12 +1,21 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "net.minecraft.world.item.h" -#include "../net.minecraft.world.h" -#include "ItemInstance.h" +#include +#include +#include +#include + #include "RecordingItem.h" -#include "../../stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.World/net/minecraft/util/HtmlString.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/Rarity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" std::unordered_map RecordingItem::BY_NAME; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/RecordingItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/RecordingItem.h index 6207bab53..12f2a5421 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/RecordingItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/RecordingItem.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Item.h" class RecordingItem : public Item { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/RedStoneItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/RedStoneItem.cpp index 5575d0325..f9b19e326 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/RedStoneItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/RedStoneItem.cpp @@ -1,10 +1,13 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "ItemInstance.h" -#include "../../stats/GenericStats.h" +#include + +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" #include "RedStoneItem.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" RedStoneItem::RedStoneItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SaddleItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/SaddleItem.cpp index 55e8e16f9..85b14d4e5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SaddleItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/SaddleItem.cpp @@ -1,8 +1,11 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/animal/net.minecraft.world.entity.animal.h" -#include "net.minecraft.world.item.h" -#include "../entity/net.minecraft.world.entity.h" +#include + #include "SaddleItem.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Pig.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" SaddleItem::SaddleItem(int id) : Item(id) { maxStackSize = 1; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SaplingTileItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/SaplingTileItem.cpp index f3cea6041..ddce53397 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SaplingTileItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/SaplingTileItem.cpp @@ -1,7 +1,10 @@ -#include "../../../../Header Files/stdafx.h" +#include + #include "TileItem.h" -#include "../level/tile/net.minecraft.world.level.tile.h" #include "SaplingTileItem.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" SaplingTileItem::SaplingTileItem(int id) : TileItem(id) { setMaxDamage(0); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SeedFoodItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/SeedFoodItem.cpp index c1ef19e3f..410585413 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SeedFoodItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/SeedFoodItem.cpp @@ -1,8 +1,11 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../../net.minecraft.h" -#include "../level/net.minecraft.world.level.h" +#include + #include "SeedFoodItem.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/FoodItem.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" SeedFoodItem::SeedFoodItem(int id, int nutrition, float saturationMod, int resultId, int targetLand) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SeedItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/SeedItem.cpp index 2e1153dcd..5cdade361 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SeedItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/SeedItem.cpp @@ -1,11 +1,11 @@ -#include "../../../../Header Files/stdafx.h" +#include + #include "Item.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "ItemInstance.h" #include "SeedItem.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" SeedItem::SeedItem(int id, int resultId, int targetLand) : Item(id) { this->resultId = resultId; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ShearsItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/ShearsItem.cpp index d858ca656..5b527c50b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ShearsItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ShearsItem.cpp @@ -1,7 +1,9 @@ -#include "../../../../Header Files/stdafx.h" +#include + #include "ShearsItem.h" -#include "../level/tile/Tile.h" -#include "../entity/net.minecraft.world.entity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" ShearsItem::ShearsItem(int itemId) : Item(itemId) { setMaxStackSize(1); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ShovelItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/ShovelItem.cpp index df4765aba..e75334b3e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ShovelItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ShovelItem.cpp @@ -1,7 +1,10 @@ -#include "../../../../Header Files/stdafx.h" +#include -#include "../level/tile/net.minecraft.world.level.tile.h" #include "ShovelItem.h" +#include "Minecraft.World/net/minecraft/world/item/DiggerItem.h" +#include "Minecraft.World/net/minecraft/world/level/tile/GrassTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/MycelTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" std::vector* ShovelItem::diggables = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ShovelItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/ShovelItem.h index 1dd8f6673..8eac32c36 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ShovelItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ShovelItem.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "DiggerItem.h" +class Tile; + #define SHOVEL_DIGGABLES 10 class ShovelItem : public DiggerItem { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SignItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/SignItem.cpp index 0ec2e5de0..afc3dc251 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SignItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/SignItem.cpp @@ -1,11 +1,15 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "ItemInstance.h" +#include + #include "SignItem.h" -#include "../../stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h" SignItem::SignItem(int id) : Item(id) { // 4J-PB - Changed for TU9 diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SimpleFoiledItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/SimpleFoiledItem.cpp index b3695f7b8..f5f47b0b4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SimpleFoiledItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/SimpleFoiledItem.cpp @@ -1,6 +1,7 @@ -#include "../../../../Header Files/stdafx.h" +#include #include "SimpleFoiledItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" SimpleFoiledItem::SimpleFoiledItem(int id) : Item(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SkullItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/SkullItem.cpp index 526ca07eb..67264a126 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SkullItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/SkullItem.cpp @@ -1,10 +1,10 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/net.minecraft.world.level.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../../net.minecraft.h" -#include "../net.minecraft.world.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "SkullItem.h" const unsigned int SkullItem::NAMES[SKULL_COUNT] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SnowItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/SnowItem.cpp index 857e67c6c..ad92a621f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SnowItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/SnowItem.cpp @@ -1,9 +1,13 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../level/net.minecraft.world.level.h" +#include +#include + #include "SnowItem.h" -#include "../phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/AuxDataTileItem.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.h" SnowItem::SnowItem(int id, Tile* parentTile) : AuxDataTileItem(id, parentTile) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SnowItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/SnowItem.h index b5ee55688..95716c117 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SnowItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/SnowItem.h @@ -2,6 +2,8 @@ #include "AuxDataTileItem.h" +class Tile; + class SnowItem : public AuxDataTileItem { public: SnowItem(int id, Tile* parentTile); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SnowballItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/SnowballItem.cpp index dfba0af77..e2e599fc5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SnowballItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/SnowballItem.cpp @@ -1,10 +1,16 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../entity/projectile/net.minecraft.world.entity.projectile.h" -#include "net.minecraft.world.item.h" -#include "../level/net.minecraft.world.level.h" +#include + #include "SnowballItem.h" -#include "../../../../Header Files/SoundTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Snowball.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" + +class Entity; SnowballItem::SnowballItem(int id) : Item(id) { this->maxStackSize = 16; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp index aac3c6c25..bb13c0539 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp @@ -1,15 +1,15 @@ -#include "../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "../../net.minecraft.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../entity/npc/net.minecraft.world.entity.npc.h" -#include "../net.minecraft.world.h" -#include "../phys/HitResult.h" +#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "Minecraft.World/net/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" #include "SpawnEggItem.h" -#include "../Difficulty.h" +#include "Minecraft.World/net/minecraft/world/Difficulty.h" SpawnEggItem::SpawnEggItem(int id) : Item(id) { setMaxStackSize(16); // 4J-PB brought forward. It is 64 on PC, but we'll diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/StoneSlabTileItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/StoneSlabTileItem.cpp index 2555010eb..e33c97844 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/StoneSlabTileItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/StoneSlabTileItem.cpp @@ -1,12 +1,13 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/item/net.minecraft.world.entity.item.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "net.minecraft.world.item.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../../net.minecraft.h" +#include + #include "StoneSlabTileItem.h" -#include "../phys/AABB.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/TileItem.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" StoneSlabTileItem::StoneSlabTileItem(int id, HalfSlabTile* halfTile, HalfSlabTile* fullTile, bool full) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/StoneSlabTileItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/StoneSlabTileItem.h index e0007ffb6..1568af187 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/StoneSlabTileItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/StoneSlabTileItem.h @@ -1,7 +1,14 @@ #pragma once +#include + #include "TileItem.h" -#include "../level/tile/HalfSlabTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" + +class HalfSlabTile; +class ItemInstance; +class Level; +class Player; class StoneSlabTileItem : public TileItem { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/TileItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/TileItem.cpp index 9fc6d9935..27ac915ba 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/TileItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/TileItem.cpp @@ -1,16 +1,22 @@ -#include "../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "net.minecraft.world.item.h" -#include "../net.minecraft.world.h" -#include "../../stats/net.minecraft.stats.h" +#include + #include "TileItem.h" -#include "../../Facing.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/Icon.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.h" TileItem::TileItem(int id) : Item(id) { this->tileId = id + 256; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/TileItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/TileItem.h index e8f4475a1..aacc0cd1f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/TileItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/TileItem.h @@ -1,9 +1,13 @@ #pragma once +#include + #include "Item.h" class Player; class Level; +class Icon; +class ItemInstance; class TileItem : public Item { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/WaterLilyTileItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/WaterLilyTileItem.cpp index c59a978ef..41bbda124 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/WaterLilyTileItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/WaterLilyTileItem.cpp @@ -1,10 +1,14 @@ -#include "../../../../Header Files/stdafx.h" -#include "../phys/net.minecraft.world.phys.h" -#include "../level/net.minecraft.world.level.h" -#include "../level/tile/net.minecraft.world.level.tile.h" -#include "../level/material/net.minecraft.world.level.material.h" -#include "../entity/player/net.minecraft.world.entity.player.h" +#include + #include "WaterLilyTileItem.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/ColoredTileItem.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" WaterLilyTileItem::WaterLilyTileItem(int id) : ColoredTileItem(id, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/WeaponItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/WeaponItem.cpp index 041dd4b79..6692d1fab 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/WeaponItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/WeaponItem.cpp @@ -1,11 +1,13 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.world.item.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "../entity/monster/net.minecraft.world.entity.monster.h" -#include "../level/tile/net.minecraft.world.level.tile.h" +#include + #include "WeaponItem.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" WeaponItem::WeaponItem(int id, const Tier* tier) : Item(id), tier(tier) { maxStackSize = 1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/WeaponItem.h b/minecraft/Minecraft.World/net/minecraft/world/item/WeaponItem.h index 009b79280..9b23922d8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/WeaponItem.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/WeaponItem.h @@ -1,6 +1,8 @@ #pragma once #include "Item.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.h" +#include "Minecraft.World/net/minecraft/world/item/UseAnim.h" class WeaponItem : public Item { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/WoolTileItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/WoolTileItem.cpp index aa4a54cfa..2298dd748 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/WoolTileItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/WoolTileItem.cpp @@ -1,5 +1,5 @@ -#include "../../../../Header Files/stdafx.h" -#include "../level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "ItemInstance.h" #include "DyePowderItem.h" #include "WoolTileItem.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.cpp index ecff78112..99df735a4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.cpp @@ -1,8 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "../../effect/net.minecraft.world.effect.h" +#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" #include "java/JavaMath.h" -#include "../../../SharedConstants.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" #include "PotionBrewing.h" const int PotionBrewing::DEFAULT_APPEARANCES[] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorDyeRecipe.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorDyeRecipe.cpp index 0fab702b5..dee8ff898 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorDyeRecipe.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorDyeRecipe.cpp @@ -1,9 +1,18 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/animal/net.minecraft.world.entity.animal.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "../net.minecraft.world.item.h" -#include "net.minecraft.world.item.crafting.h" +#include +#include +#include + #include "ArmorDyeRecipe.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Sheep.h" +#include "Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h" +#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ColoredTile.h" bool ArmorDyeRecipe::matches(std::shared_ptr craftSlots, Level* level) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorDyeRecipe.h b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorDyeRecipe.h index fd94efff3..6bef8a76d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorDyeRecipe.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorDyeRecipe.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "Recipy.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" + +class CraftingContainer; class ArmorDyeRecipe : public Recipy { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.cpp index 32c0efb1c..87dcc4b98 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.cpp @@ -1,13 +1,13 @@ // package net.minecraft.world.item.crafting; -// import net.minecraft.world.item.*; -// import net.minecraft.world.level.tile.Tile; -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.item.h" -#include "../../level/tile/Tile.h" -#include "Recipy.h" +#include + #include "Recipes.h" #include "ArmorRecipes.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" // 4J-PB - adding "" on the end of these so we can detect it std::wstring ArmorRecipes::shapes[][4] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.h b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.h index 3ae8db80c..ef044867e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.h @@ -4,6 +4,12 @@ // import net.minecraft.world.level.tile.Tile; #pragma once +#include +#include + +class Object; +class Recipes; + #define MAX_ARMOUR_RECIPES 5 class ArmorRecipes { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ClothDyeRecipes.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ClothDyeRecipes.cpp index 52026e0bf..93a9ef3df 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ClothDyeRecipes.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ClothDyeRecipes.cpp @@ -1,9 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.item.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "Recipy.h" +#include + #include "Recipes.h" #include "ClothDyeRecipes.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ColoredTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" void ClothDyeRecipes::addRecipes(Recipes* r) { // recipes for converting cloth to colored cloth using dye diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ClothDyeRecipes.h b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ClothDyeRecipes.h index d7958367e..f11bd1cef 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ClothDyeRecipes.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ClothDyeRecipes.h @@ -1,5 +1,7 @@ #pragma once +class Recipes; + class ClothDyeRecipes { public: void addRecipes(Recipes* r); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.cpp index b554ccb41..04189fc1e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.cpp @@ -1,6 +1,14 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.item.h" +#include +#include + #include "FireworksRecipe.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/item/FireworksItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" thread_local FireworksRecipe::ThreadStorage* FireworksRecipe::m_tlsStorage = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.h b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.h index ecc61ddcc..ac952e1b3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.h @@ -1,7 +1,12 @@ #pragma once +#include + #include "Recipy.h" +class CraftingContainer; +class ItemInstance; + class FireworksRecipe : public Recipy { private: // std::shared_ptr resultItem; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FoodRecipes.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FoodRecipes.cpp index 501bd5434..414a139ed 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FoodRecipes.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FoodRecipes.cpp @@ -1,10 +1,9 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.item.h" -#include "../DyePowderItem.h" -#include "../../level/tile/Tile.h" -#include "Recipy.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Recipes.h" #include "FoodRecipes.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" void FoodRecipies::addRecipes(Recipes* r) { // 4J-JEV: Bumped up in the list to avoid a colision with the title. diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FoodRecipes.h b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FoodRecipes.h index 5b4fb251a..3187a0a52 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FoodRecipes.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FoodRecipes.h @@ -1,5 +1,7 @@ #pragma once +class Recipes; + class FoodRecipies { public: void addRecipes(Recipes* r); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.cpp index 21e368842..e90a32cd2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.cpp @@ -1,7 +1,11 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.item.h" -#include "../../level/tile/Tile.h" +#include + +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "FurnaceRecipes.h" +#include "Minecraft.World/net/minecraft/world/item/CoalItem.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" FurnaceRecipes* FurnaceRecipes::instance = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.h b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.h index e5cff70b4..69ead0e1b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FurnaceRecipes.h @@ -1,5 +1,9 @@ #pragma once +#include + +class ItemInstance; + class FurnaceRecipes { private: static FurnaceRecipes* instance; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/OreRecipes.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/OreRecipes.cpp index 67d2f1fdd..5b43be201 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/OreRecipes.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/OreRecipes.cpp @@ -1,10 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.item.h" -#include "../DyePowderItem.h" -#include "../../level/tile/Tile.h" -#include "Recipy.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Recipes.h" #include "OreRecipes.h" +#include "Minecraft.World/net/minecraft/world/item/CoalItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" void OreRecipies::_init() { ADD_OBJECT(map[0], Tile::goldBlock); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/OreRecipes.h b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/OreRecipes.h index 3ba1e95db..576ce8f7d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/OreRecipes.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/OreRecipes.h @@ -1,5 +1,10 @@ #pragma once +#include + +class Object; +class Recipes; + #define MAX_ORE_RECIPES 8 class OreRecipies { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipes.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipes.cpp index f0c869513..570092773 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipes.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipes.cpp @@ -1,12 +1,39 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../Container.h" -#include "../../inventory/AbstractContainerMenu.h" -#include "../../inventory/CraftingContainer.h" -#include "../CoalItem.h" -#include "../Item.h" -#include "../ItemInstance.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "net.minecraft.world.item.crafting.h" +#include +#include +#include +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h" +#include "Minecraft.World/net/minecraft/world/item/CoalItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/ArmorRecipes.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/ClothDyeRecipes.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/FoodRecipes.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/OreRecipes.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/ShapelessRecipy.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/StructureRecipes.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/ToolRecipes.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/WeaponRecipes.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HopperTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/WallTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h" + +class Level; Recipes* Recipes::instance = nullptr; ArmorRecipes* Recipes::pArmorRecipes = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipes.h b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipes.h index 2c9c9a655..3bd89dc72 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipes.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipes.h @@ -15,13 +15,23 @@ import net.minecraft.world.level.tile.StoneSlabTile; import net.minecraft.world.level.tile.Tile; */ +#include +#include +#include + #include "Recipy.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" + +class Item; +class Level; +class MapItem; +class Tile; #pragma once class CraftingContainer; class FireTile; - class ArmorRecipes; class ClothDyeRecipes; class FoodRecipies; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipy.h b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipy.h index 62df868ff..760bc2a15 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipy.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/Recipy.h @@ -5,7 +5,7 @@ #pragma once -#include "../../inventory/CraftingContainer.h" +#include "Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h" #define RECIPE_TYPE_2x2 0 #define RECIPE_TYPE_3x3 1 diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.cpp index 9e24b3ee5..0e8c7ac12 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.cpp @@ -3,13 +3,17 @@ // import net.minecraft.world.inventory.CraftingContainer; // import net.minecraft.world.item.ItemInstance; -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.item.h" -#include "../../inventory/net.minecraft.world.inventory.h" -#include "../../level/tile/Tile.h" +#include + #include "Recipy.h" #include "Recipes.h" #include "ShapedRecipy.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" // 4J-PB - for new crafting - Adding group to define type of item that the // recipe produces diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.h b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.h index 97eabd472..5680cde26 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapedRecipy.h @@ -1,5 +1,12 @@ #pragma once +#include + +#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" + +class CraftingContainer; +class ItemInstance; + class ShapedRecipy : public Recipy { private: int width, height, group; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapelessRecipy.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapelessRecipy.cpp index d1cec39d1..0bdf2a2ff 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapelessRecipy.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapelessRecipy.cpp @@ -4,13 +4,18 @@ // // import net.minecraft.world.inventory.CraftingContainer; // import net.minecraft.world.item.ItemInstance; -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.item.h" -#include "../../inventory/net.minecraft.world.inventory.h" -#include "../../level/tile/Tile.h" +#include +#include +#include +#include + #include "Recipy.h" #include "Recipes.h" #include "ShapelessRecipy.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/net/minecraft/world/inventory/CraftingContainer.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" ShapelessRecipy::ShapelessRecipy(ItemInstance* result, std::vector* ingredients, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapelessRecipy.h b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapelessRecipy.h index 1a8bd0cf1..93e0ef45b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapelessRecipy.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ShapelessRecipy.h @@ -1,5 +1,11 @@ #pragma once +#include + +#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" + +class ItemInstance; + class ShapelessRecipy : public Recipy { private: _eGroupType group; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/StructureRecipes.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/StructureRecipes.cpp index 7adb5cc68..1a6c19a01 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/StructureRecipes.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/StructureRecipes.cpp @@ -1,9 +1,14 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.item.h" -#include "../../level/tile/net.minecraft.world.level.tile.h" -#include "Recipy.h" #include "Recipes.h" #include "StructureRecipes.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BeaconTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ChestTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/QuartzBlockTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" void StructureRecipies::addRecipes(Recipes* r) { r->addShapedRecipy(new ItemInstance(Tile::sandStone), // diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/StructureRecipes.h b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/StructureRecipes.h index 106428f3f..2e3db198b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/StructureRecipes.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/StructureRecipes.h @@ -1,5 +1,7 @@ #pragma once +class Recipes; + class StructureRecipies { public: void addRecipes(Recipes* r); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ToolRecipes.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ToolRecipes.cpp index b3b03b49b..fde06ca15 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ToolRecipes.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ToolRecipes.cpp @@ -1,9 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.item.h" -#include "../../level/tile/Tile.h" -#include "Recipy.h" +#include + +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Recipes.h" #include "ToolRecipes.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/ShearsItem.h" // 4J-PB - adding "" on the end of these so we can detect it std::wstring ToolRecipies::shapes[][4] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ToolRecipes.h b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ToolRecipes.h index a29a429e4..4e6ebbcd4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ToolRecipes.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/ToolRecipes.h @@ -4,9 +4,13 @@ // import net.minecraft.world.level.tile.Tile; #pragma once +#include +#include + #define MAX_TOOL_RECIPES 5 class Recipes; +class Object; class ToolRecipies { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/WeaponRecipes.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/WeaponRecipes.cpp index e4a6a9161..399ba042a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/WeaponRecipes.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/WeaponRecipes.cpp @@ -1,10 +1,11 @@ -#include "../../../../../Header Files/stdafx.h" +#include -#include "../net.minecraft.world.item.h" -#include "../../level/tile/Tile.h" -#include "Recipy.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Recipes.h" #include "WeaponRecipes.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" // 4J-PB - adding "" on the end of these so we can detect it std::wstring WeaponRecipies::shapes[][4] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/WeaponRecipes.h b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/WeaponRecipes.h index 126694e47..b1f429c05 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/WeaponRecipes.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/WeaponRecipes.h @@ -5,6 +5,12 @@ #pragma once +#include +#include + +class Object; +class Recipes; + #define MAX_WEAPON_RECIPES 2 class WeaponRecipies { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp index 72592608a..414e17589 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp @@ -1,4 +1,4 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "ArrowDamageEnchantment.h" ArrowDamageEnchantment::ArrowDamageEnchantment(int id, int frequency) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowFireEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowFireEnchantment.cpp index a13ea670e..6e86dadd0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowFireEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowFireEnchantment.cpp @@ -1,4 +1,4 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "ArrowFireEnchantment.h" ArrowFireEnchantment::ArrowFireEnchantment(int id, int frequency) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp index 3fecad4b9..93c4cf632 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp @@ -1,4 +1,4 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "ArrowInfiniteEnchantment.h" ArrowInfiniteEnchantment::ArrowInfiniteEnchantment(int id, int frequency) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp index adda48731..d3a1ea381 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp @@ -1,4 +1,4 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "ArrowKnockbackEnchantment.h" ArrowKnockbackEnchantment::ArrowKnockbackEnchantment(int id, int frequency) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DamageEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DamageEnchantment.cpp index d7ef4e7e2..c263a3aa1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DamageEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DamageEnchantment.cpp @@ -1,6 +1,6 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "../net.minecraft.world.item.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "DamageEnchantment.h" const int DamageEnchantment::names[] = {IDS_ENCHANTMENT_DAMAGE_ALL, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp index 197bd2552..9a5682f95 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp @@ -1,5 +1,5 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.item.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "DigDurabilityEnchantment.h" DigDurabilityEnchantment::DigDurabilityEnchantment(int id, int frequency) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DiggingEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DiggingEnchantment.cpp index 36833fdab..f7fca4af4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DiggingEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DiggingEnchantment.cpp @@ -1,5 +1,5 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.item.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "DiggingEnchantment.h" DiggingEnchantment::DiggingEnchantment(int id, int frequency) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp index e14b0a2f7..c23bc16c3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp @@ -1,6 +1,6 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "net.minecraft.world.item.enchantment.h" -#include "../net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Enchantment.h" // Enchantment *Enchantment::enchantments[256]; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentCategory.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentCategory.cpp index d81844c17..f4f943ea0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentCategory.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentCategory.cpp @@ -1,6 +1,9 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.item.h" #include "EnchantmentCategory.h" +#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" +#include "Minecraft.World/net/minecraft/world/item/BowItem.h" +#include "Minecraft.World/net/minecraft/world/item/DiggerItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/WeaponItem.h" const EnchantmentCategory* EnchantmentCategory::all = new EnchantmentCategory(); const EnchantmentCategory* EnchantmentCategory::armor = diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.cpp index 455b9011b..d4031aa97 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.cpp @@ -1,11 +1,20 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.item.h" -#include "net.minecraft.world.item.enchantment.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../../util/WeighedRandom.h" +#include +#include +#include +#include + #include "EnchantmentHelper.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentCategory.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.h" Random EnchantmentHelper::random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h index 1ff563509..9dfe70d8a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h @@ -1,10 +1,16 @@ #pragma once +#include +#include +#include + class ItemInstance; class Inventory; class DamageSource; class Enchantment; class EnchantmentInstance; +class LivingEntity; +class Random; class EnchantmentHelper { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.cpp index fdae7e150..bc1ee89b0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.cpp @@ -1,6 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.item.enchantment.h" +#include + #include "EnchantmentInstance.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" EnchantmentInstance::EnchantmentInstance(Enchantment* enchantment, int level) : WeighedRandomItem(enchantment->getFrequency()), diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.h b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.h index 344a048cb..215734217 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.h @@ -1,6 +1,9 @@ #pragma once -#include "../../../util/WeighedRandom.h" +#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" +#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" + +class Enchantment; class EnchantmentInstance : public WeighedRandomItem { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/FireAspectEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/FireAspectEnchantment.cpp index dcfc2a4b7..4788d7605 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/FireAspectEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/FireAspectEnchantment.cpp @@ -1,4 +1,4 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "FireAspectEnchantment.h" FireAspectEnchantment::FireAspectEnchantment(int id, int frequency) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/KnockbackEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/KnockbackEnchantment.cpp index 7d5eb9ce8..e48f29317 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/KnockbackEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/KnockbackEnchantment.cpp @@ -1,4 +1,4 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "KnockbackEnchantment.h" KnockbackEnchantment::KnockbackEnchantment(int id, int frequency) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/LootBonusEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/LootBonusEnchantment.cpp index d9c788392..f4aa690b7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/LootBonusEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/LootBonusEnchantment.cpp @@ -1,4 +1,4 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "LootBonusEnchantment.h" LootBonusEnchantment::LootBonusEnchantment(int id, int frequency, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/OxygenEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/OxygenEnchantment.cpp index 764576d89..0726f9ba6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/OxygenEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/OxygenEnchantment.cpp @@ -1,4 +1,4 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "OxygenEnchantment.h" OxygenEnchantment::OxygenEnchantment(int id, int frequency) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.cpp index e3f0a58f6..dc4a45851 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.cpp @@ -1,7 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" #include "net.minecraft.world.item.enchantment.h" -#include "../../entity/net.minecraft.world.entity.h" +#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" #include "ProtectionEnchantment.h" const int ProtectionEnchantment::names[] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.cpp index 9938307e6..4658d3306 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.cpp @@ -1,8 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.item.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "net.minecraft.world.item.enchantment.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" +#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" #include "ThornsEnchantment.h" const float ThornsEnchantment::CHANCE_PER_LEVEl = 0.15f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/UntouchingEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/UntouchingEnchantment.cpp index 27a1e5754..9aed049f6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/UntouchingEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/UntouchingEnchantment.cpp @@ -1,5 +1,5 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.item.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "UntouchingEnchantment.h" UntouchingEnchantment::UntouchingEnchantment(int id, int frequency) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp index 6144308a5..73bb8b710 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp @@ -1,4 +1,4 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "WaterWorkerEnchantment.h" WaterWorkerEnchantment::WaterWorkerEnchantment(int id, int frequency) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h b/minecraft/Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h index 393c6ae1f..e259247fa 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h @@ -58,7 +58,7 @@ // TU9 #include "FireChargeItem.h" -#include "../entity/ItemFrame.h" +#include "Minecraft.World/net/minecraft/world/entity/ItemFrame.h" #include "SpawnEggItem.h" #include "MultiTextureTileItem.h" @@ -84,4 +84,4 @@ // 4J Added #include "ClockItem.h" #include "CompassItem.h" -#include "../../util/HtmlString.h" \ No newline at end of file +#include "Minecraft.World/net/minecraft/util/HtmlString.h" \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.cpp index 3a6ca5320..8ff52891b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.cpp @@ -1,6 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" +#include #include "MerchantRecipe.h" +#include "nbt/CompoundTag.h" + +class Item; +class Tile; void MerchantRecipe::_init(std::shared_ptr buyA, std::shared_ptr buyB, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h b/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h index b9bc3d7eb..5e8c398b6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h @@ -1,5 +1,13 @@ #pragma once +#include + +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" + +class CompoundTag; +class Item; +class Tile; + class MerchantRecipe { private: std::shared_ptr buyA; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.cpp index 5e4464397..338679163 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.cpp @@ -1,6 +1,14 @@ -#include "../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.item.trading.h" +#include +#include + #include "MerchantRecipeList.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h" MerchantRecipeList::MerchantRecipeList() {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.h b/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.h index 8d000e32a..38dc86aef 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.h @@ -1,5 +1,7 @@ #pragma once +#include #include +#include class MerchantRecipe; class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.cpp index 8f7656571..5bc39f4e5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.cpp @@ -1,10 +1,20 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../entity/item/net.minecraft.world.entity.item.h" -#include "net.minecraft.world.level.h" -#include "tile/net.minecraft.world.level.tile.h" -#include "../phys/net.minecraft.world.phys.h" +#include + #include "BaseMobSpawner.h" +#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Class.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "nbt/Tag.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" BaseMobSpawner::BaseMobSpawner() { spawnPotentials = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h b/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h index 85fa2ff74..492f43be3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h @@ -1,6 +1,15 @@ #pragma once -#include "../../util/WeighedRandom.h" +#include +#include +#include + +#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" +#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" + +class CompoundTag; +class Level; class BaseMobSpawner { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/BlockDestructionProgress.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/BlockDestructionProgress.cpp index d8d34c873..36c20e1ef 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/BlockDestructionProgress.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/BlockDestructionProgress.cpp @@ -1,4 +1,3 @@ -#include "../../../../Header Files/stdafx.h" #include "BlockDestructionProgress.h" BlockDestructionProgress::BlockDestructionProgress(int id, int x, int y, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Calendar.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/Calendar.cpp index 08a41a608..59d0a1be1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Calendar.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/Calendar.cpp @@ -1,7 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include "Calendar.h" #include +#include "Calendar.h" + unsigned int Calendar::GetDayOfMonth() { time_t t = time(0); struct tm* now = localtime(&t); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/ChunkPos.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/ChunkPos.cpp index dd452ded2..9fe462106 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/ChunkPos.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/ChunkPos.cpp @@ -1,6 +1,13 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/net.minecraft.world.entity.h" -#include "ChunkPos.h" + +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" ChunkPos::ChunkPos(int x, int z) : x(x), z(z) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp index 7af5a3dbc..c39045b5a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp @@ -1,15 +1,24 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../entity/item/net.minecraft.world.entity.item.h" -#include "../item/enchantment/net.minecraft.world.item.enchantment.h" -#include "net.minecraft.world.level.h" -#include "tile/net.minecraft.world.level.tile.h" -#include "../phys/net.minecraft.world.phys.h" -#include "../damageSource/net.minecraft.world.damagesource.h" -#include "TilePos.h" +#include +#include +#include +#include + #include "Explosion.h" -#include "../../../../Header Files/SoundTypes.h" -#include "../phys/AABB.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/x64headers/extraX64.h" Explosion::Explosion(Level* level, std::shared_ptr source, double x, double y, double z, float r) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.h b/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.h index 3d5d07fd7..7d0dfad1a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.h @@ -1,9 +1,18 @@ #pragma once +#include +#include +#include +#include + #include "TilePos.h" -#include "../entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" class Random; class Level; +class Entity; class Explosion { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/FoliageColor.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/FoliageColor.cpp index 5e0762fb0..79ed6997b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/FoliageColor.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/FoliageColor.cpp @@ -1,6 +1,7 @@ -#include "../../../../Header Files/stdafx.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "FoliageColor.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" // 4J Stu - Don't use this any more // std::vector FoliageColor::pixels; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/GameRules.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/GameRules.cpp index 381af0602..f583d82be 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/GameRules.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/GameRules.cpp @@ -1,6 +1,8 @@ -#include "../../../../Header Files/stdafx.h" +#include #include "GameRules.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" // 4J: GameRules isn't in use anymore, just routes any requests to app game host // options, kept things commented out for context diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/GameRules.h b/minecraft/Minecraft.World/net/minecraft/world/level/GameRules.h index d41080771..4ae7da6fb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/GameRules.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/GameRules.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + class GameRules { private: class GameRule { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/GrassColor.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/GrassColor.cpp index 2b0aa7985..319b0cf55 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/GrassColor.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/GrassColor.cpp @@ -1,4 +1,3 @@ -#include "../../../../Header Files/stdafx.h" #include "GrassColor.h" // 4J Stu - Don't want to do this any more diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp index a396cf04e..b86de3a80 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp @@ -1,51 +1,76 @@ -#include "../../../../Header Files/stdafx.h" -#include "java/System.h" -#include "java/File.h" -#include "../../util/ProgressListener.h" -#include "../../net.minecraft.h" -#include "../net.minecraft.world.h" -#include "../entity/ai/village/net.minecraft.world.entity.ai.village.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../entity/global/net.minecraft.world.entity.global.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "biome/net.minecraft.world.level.biome.h" -#include "chunk/net.minecraft.world.level.chunk.h" -#include "dimension/net.minecraft.world.level.dimension.h" -#include "tile/net.minecraft.world.level.tile.h" -#include "tile/entity/net.minecraft.world.level.tile.entity.h" -#include "net.minecraft.world.level.h" -#include "levelgen/net.minecraft.world.level.levelgen.h" -#include "storage/net.minecraft.world.level.storage.h" -#include "pathfinder/net.minecraft.world.level.pathfinder.h" -#include "redstone/net.minecraft.world.level.redstone.h" -#include "../scores/net.minecraft.world.scores.h" -#include "../phys/net.minecraft.world.phys.h" -#include "Explosion.h" -#include "LevelListener.h" -#include "Level.h" -#include "../../../../ConsoleHelpers/ThreadName.h" -#include "../../util/WeighedRandom.h" - -#include "../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include +#include #include -#include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" -#include "../../../../Header Files/SoundTypes.h" -#include "chunk/SparseLightStorage.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" -#include "Minecraft.Client/Common/ShutdownManager.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/Header Files/FrameProfiler.h" #include #include #include #include +#include +#include -// 4J : WESTY : Added for time played stats. -#include "../../stats/net.minecraft.stats.h" +#include "Explosion.h" +#include "LevelListener.h" +#include "Level.h" +#include "ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" +#include "Minecraft.Client/Header Files/FrameProfiler.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "net/minecraft/Direction.h" +#include "net/minecraft/Facing.h" +#include "net/minecraft/Pos.h" +#include "net/minecraft/SharedConstants.h" +#include "net/minecraft/stats/GenericStats.h" +#include "net/minecraft/util/Mth.h" +#include "net/minecraft/world/Difficulty.h" +#include "net/minecraft/world/entity/Entity.h" +#include "net/minecraft/world/entity/MobCategory.h" +#include "net/minecraft/world/entity/ai/village/VillageSiege.h" +#include "net/minecraft/world/entity/ai/village/Villages.h" +#include "net/minecraft/world/entity/player/Abilities.h" +#include "net/minecraft/world/entity/player/Player.h" +#include "net/minecraft/world/level/LevelType.h" +#include "net/minecraft/world/level/Region.h" +#include "net/minecraft/world/level/biome/Biome.h" +#include "net/minecraft/world/level/biome/BiomeSource.h" +#include "net/minecraft/world/level/chunk/ChunkSource.h" +#include "net/minecraft/world/level/chunk/LevelChunk.h" +#include "net/minecraft/world/level/dimension/Dimension.h" +#include "net/minecraft/world/level/material/Material.h" +#include "net/minecraft/world/level/pathfinder/PathFinder.h" +#include "net/minecraft/world/level/redstone/Redstone.h" +#include "net/minecraft/world/level/storage/LevelData.h" +#include "net/minecraft/world/level/storage/LevelStorage.h" +#include "net/minecraft/world/level/storage/SavedDataStorage.h" +#include "net/minecraft/world/level/tile/ComparatorTile.h" +#include "net/minecraft/world/level/tile/FireTile.h" +#include "net/minecraft/world/level/tile/HalfSlabTile.h" +#include "net/minecraft/world/level/tile/HopperTile.h" +#include "net/minecraft/world/level/tile/LevelEvent.h" +#include "net/minecraft/world/level/tile/LiquidTile.h" +#include "net/minecraft/world/level/tile/NotGateTile.h" +#include "net/minecraft/world/level/tile/StairTile.h" +#include "net/minecraft/world/level/tile/Tile.h" +#include "net/minecraft/world/level/tile/TopSnowTile.h" +#include "net/minecraft/world/level/tile/entity/TileEntity.h" +#include "net/minecraft/world/phys/HitResult.h" +#include "net/minecraft/world/phys/Vec3.h" +#include "net/minecraft/world/scores/Scoreboard.h" +#include "Minecraft.World/x64headers/extraX64.h" + +class CompoundTag; +class ItemInstance; +class TickNextTickData; +class TilePos; // 4J - Caching of lighting data added. This is implemented as a 16x16x16 cache // of ints (ie 16K storage in total). The index of the element to be used in the @@ -59,40 +84,6 @@ // getBlockingCached methods to get and set data (3) Call flushCache, which // writes through any dirty values in cache -#if defined(_LARGE_WORLDS) -// Packing for cache entries in large worlds is as follows ( 64 bits per entry) -// Add the extra x and z data into the top 32 bits, to keep all the masks and -// code for everything else the same -// xxxxxxxxxxxxxxxxzzzzzzzzzzzzzzzzWEBLllllbbbbeeeexxxxxxyyyyzzzzzz -// -// xxxxxx - middle 6 bits of x position -// yyyy - top 4 bits of y position -// zzzzzz - middle 6 bits of z position -// eeee - light emission -// bbbb - light blocking -// llll - light level -// L - light value valid -// B - blocking value valid -// E - emission value valid -// W - lighting value requires write -// xxxxxxxxxxxxxxxx - top 16 bits of x position -// zzzzzzzzzzzzzzzz - top 16 bits of z position -#else -// Packing for cache entries is as follows ( 32 bits per entry) -// WEBLllllbbbbeeeexxxxxxyyyyzzzzzz -// -// xxxxxx - top 6 bits of x position -// yyyy - top 4 bits of y position -// zzzzzz - top 6 bits of z position -// eeee - light emission -// bbbb - light blocking -// llll - light level -// L - light value valid -// B - blocking value valid -// E - emission value valid -// W - lighting value requires write -#endif - thread_local bool Level::m_tlsInstaTick = false; thread_local Level::lightCache_t* Level::m_tlsLightCache = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Level.h b/minecraft/Minecraft.World/net/minecraft/world/level/Level.h index bbb4b5bd7..901b50deb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Level.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/Level.h @@ -1,17 +1,36 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include +#include + #include "LevelSource.h" #include "LightLayer.h" #include "ChunkPos.h" #include "TickNextTickData.h" -#include "saveddata/SavedData.h" -#include "../../../../ConsoleHelpers/Definitions.h" -#include "../../../../Header Files/ParticleTypes.h" -#include "biome/Biome.h" -#include "../../../../ConsoleHelpers/C4JThread.h" -#include -#include -#include +#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/ConsoleHelpers/C4JThread.h" +#include "4J.Common/4J_Compat.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class CompoundTag; +class ItemInstance; +class LevelChunk; +class TickNextTickData; +class Tile; +class TilePos; // 4J Stu - This value should be big enough that we don't get any crashes causes // by memory overwrites, however it does seem way too large for what is actually diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelConflictException.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/LevelConflictException.cpp index ab09ab12d..f06319c87 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/LevelConflictException.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/LevelConflictException.cpp @@ -1,4 +1,4 @@ -#include "../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "LevelConflictException.h" LevelConflictException::LevelConflictException(const std::wstring& msg) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelListener.h b/minecraft/Minecraft.World/net/minecraft/world/level/LevelListener.h index c2ffca054..9c9053f54 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/LevelListener.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/LevelListener.h @@ -1,8 +1,8 @@ #pragma once class TileEntity; -#include "../entity/player/Player.h" -#include "../../../../Header Files/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" class LevelListener { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelSettings.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/LevelSettings.cpp index 8fe650562..e518be00b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/LevelSettings.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/LevelSettings.cpp @@ -1,7 +1,6 @@ -#include "../../../../Header Files/stdafx.h" #include "LevelSettings.h" -#include "storage/net.minecraft.world.level.storage.h" -#include "LevelType.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" GameType* GameType::NOT_SET = nullptr; GameType* GameType::SURVIVAL = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelSettings.h b/minecraft/Minecraft.World/net/minecraft/world/level/LevelSettings.h index 17253196c..f60c82498 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/LevelSettings.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/LevelSettings.h @@ -1,6 +1,8 @@ #pragma once -class LevelType; +#include +#include +class LevelType; class Abilities; class LevelData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelType.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/LevelType.cpp index 46a8c7845..0127bd421 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/LevelType.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/LevelType.cpp @@ -1,5 +1,3 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.h" // public static final LevelType[] levelTypes = new LevelType[16]; // @@ -12,6 +10,10 @@ // private bool selectable; // private bool replacement; +#include + +#include "Minecraft.World/net/minecraft/world/level/LevelType.h" + LevelType* LevelType::levelTypes[16]; // = new LevelType[16]; LevelType* LevelType::lvl_normal = nullptr; // = new LevelType(0, "default", 1).setHasReplacement(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelType.h b/minecraft/Minecraft.World/net/minecraft/world/level/LevelType.h index 527a41489..db9a998b9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/LevelType.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/LevelType.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "net.minecraft.world.level.h" class LevelType { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/MobSpawner.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/MobSpawner.cpp index 876dfb28b..9897e42da 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/MobSpawner.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/MobSpawner.cpp @@ -1,22 +1,26 @@ -#include "../../../../Header Files/stdafx.h" -#include "../../net.minecraft.h" -#include "../entity/net.minecraft.world.entity.h" -#include "../entity/animal/net.minecraft.world.entity.animal.h" -#include "../entity/monster/net.minecraft.world.entity.monster.h" -#include "../entity/player/net.minecraft.world.entity.player.h" -#include "net.minecraft.world.level.h" -#include "biome/net.minecraft.world.level.biome.h" -#include "material/net.minecraft.world.level.material.h" -#include "pathfinder/net.minecraft.world.level.pathfinder.h" -#include "tile/net.minecraft.world.level.tile.h" -#include "../Difficulty.h" -#include "../../util/WeighedRandom.h" +#include +#include + +#include "Minecraft.World/net/minecraft/world/Difficulty.h" #include "Level.h" -#include "ChunkPos.h" -#include "TilePos.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "MobSpawner.h" -#include "dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/MobCategory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class MobGroupData; const int MobSpawner::MIN_SPAWN_DISTANCE = 24; @@ -37,9 +41,6 @@ std::unordered_map const int MobSpawner::tick(ServerLevel* level, bool spawnEnemies, bool spawnFriendlies, bool spawnPersistent) { -#if !defined(_CONTENT_PACKAGE) - -#endif if (!spawnEnemies && !spawnFriendlies && !spawnPersistent) { return 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/MobSpawner.h b/minecraft/Minecraft.World/net/minecraft/world/level/MobSpawner.h index aae97e98b..c63061dc3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/MobSpawner.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/MobSpawner.h @@ -1,9 +1,21 @@ #pragma once -#include "../entity/Mob.h" +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" class Player; class Level; +class Biome; +class ChunkPos; +class MobCategory; +class Random; +class ServerLevel; +struct ChunkPosKeyEq; +struct ChunkPosKeyHash; class MobSpawner { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/PortalForcer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/PortalForcer.cpp index cf0b79721..65489c1b6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/PortalForcer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/PortalForcer.cpp @@ -1,10 +1,17 @@ -#include "../../../../Header Files/stdafx.h" -#include "../entity/net.minecraft.world.entity.h" -#include "net.minecraft.world.level.h" -#include "tile/net.minecraft.world.level.tile.h" -#include "dimension/net.minecraft.world.level.dimension.h" +#include + #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "PortalForcer.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" PortalForcer::PortalPosition::PortalPosition(int x, int y, int z, int64_t time) : Pos(x, y, z) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/PortalForcer.h b/minecraft/Minecraft.World/net/minecraft/world/level/PortalForcer.h index 9b341896c..f1e2b0c73 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/PortalForcer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/PortalForcer.h @@ -1,6 +1,15 @@ #pragma once +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/Pos.h" + class Random; +class Entity; +class ServerLevel; class PortalForcer { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Region.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/Region.cpp index 52a77af9e..9fbf9c2f8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Region.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/Region.cpp @@ -1,13 +1,15 @@ -#include "../../../../Header Files/stdafx.h" -#include "biome/net.minecraft.world.level.biome.h" -#include "chunk/net.minecraft.world.level.chunk.h" -#include "dimension/net.minecraft.world.level.dimension.h" -#include "tile/net.minecraft.world.level.tile.h" -#include "redstone/net.minecraft.world.level.redstone.h" -#include "material/Material.h" -#include "Level.h" +#include +#include +#include +#include +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Level.h" #include "Region.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" Region::~Region() { delete chunks; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Region.h b/minecraft/Minecraft.World/net/minecraft/world/level/Region.h index 22c93043a..477a8992a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Region.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/Region.h @@ -1,10 +1,16 @@ #pragma once +#include + #include "LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" class Material; class TileEntity; class BiomeSource; +class Level; +class LevelChunk; class Region : public LevelSource { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/TickNextTickData.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/TickNextTickData.cpp index 3f3cdc146..5a28b2ae7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/TickNextTickData.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/TickNextTickData.cpp @@ -1,6 +1,7 @@ -#include "../../../../Header Files/stdafx.h" -#include "tile/net.minecraft.world.level.tile.h" +#include + #include "TickNextTickData.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" int64_t TickNextTickData::C = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/TickNextTickData.h b/minecraft/Minecraft.World/net/minecraft/world/level/TickNextTickData.h index 0b88b4d3e..ade7b8be4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/TickNextTickData.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/TickNextTickData.h @@ -1,5 +1,6 @@ #pragma once +#include // 4J Stu - In Java TickNextTickData implements Comparable // We don't need to do that as it is only as helper for the java sdk sorting // operations diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/TileEventData.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/TileEventData.cpp index 719e631e6..c2ccb38ba 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/TileEventData.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/TileEventData.cpp @@ -1,5 +1,3 @@ -#include "../../../../Header Files/stdafx.h" - #include "TileEventData.h" TileEventData::TileEventData(int x, int y, int z, int tile, int paramA, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/TilePos.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/TilePos.cpp index 4fd621617..213539b91 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/TilePos.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/TilePos.cpp @@ -1,7 +1,9 @@ -#include "../../../../Header Files/stdafx.h" -#include "TilePos.h" -#include "../phys/Vec3.h" + +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" TilePos::TilePos(int x, int y, int z) { this->x = x; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/WaterColor.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/WaterColor.cpp index a160c3a4d..8aa5f0315 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/WaterColor.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/WaterColor.cpp @@ -1,5 +1,3 @@ -#include "../../../../Header Files/stdafx.h" - #include "WaterColor.h" // 4J Stu - Not using this any more diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BeachBiome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BeachBiome.cpp index a8825977a..1387105d8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BeachBiome.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BeachBiome.cpp @@ -1,7 +1,9 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../tile/net.minecraft.world.level.tile.h" +#include +#include + #include "BiomeDecorator.h" #include "BeachBiome.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" BeachBiome::BeachBiome(int id) : Biome(id) { // remove default mob spawn settings diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BeachBiome.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BeachBiome.h index c41078124..2147abdbb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BeachBiome.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BeachBiome.h @@ -1,6 +1,7 @@ #pragma once #include "Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" class BeachBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.cpp index cbd7c8a9e..be4252a25 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.cpp @@ -1,14 +1,38 @@ -#include "../../../../../Header Files/stdafx.h" -#include "java/Color.h" +#include +#include +#include +#include + #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "../levelgen/feature/net.minecraft.world.level.levelgen.feature.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "../net.minecraft.world.level.h" -#include "../../entity/animal/net.minecraft.world.entity.animal.h" -#include "../../entity/monster/net.minecraft.world.entity.monster.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "Biome.h" -#include "net.minecraft.world.level.biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/MobCategory.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BeachBiome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h" +#include "Minecraft.World/net/minecraft/world/level/biome/DesertBiome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/ExtremeHillsBiome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/ForestBiome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/HellBiome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/IceBiome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/JungleBiome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/MushroomIslandBiome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/OceanBiome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/RiverBiome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/SwampBiome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/TaigaBiome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/TheEndBiome.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/TallGrassFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Level; // public static final Biome[] biomes = new Biome[256]; Biome* Biome::biomes[256]; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.h index bab5cac84..ae48c3b6e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.h @@ -1,8 +1,8 @@ #pragma once -#include "../LevelSource.h" -#include "../../entity/Mob.h" -#include "../../../util/WeighedRandom.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" class Feature; class MobCategory; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeCache.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeCache.cpp index c4712bed9..c5af61e8a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeCache.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeCache.cpp @@ -1,9 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" +#include -#include "Biome.h" #include "BiomeSource.h" #include "BiomeCache.h" -#include "java/System.h" +#include "Minecraft.Client/Linux/Linux_App.h" BiomeCache::Block::Block(int x, int z, BiomeCache* parent) { // temps = std::vector(ZONE_SIZE * ZONE_SIZE, false); // MGH - diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeCache.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeCache.h index 44b11a0bb..df843a957 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeCache.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeCache.h @@ -1,6 +1,14 @@ #pragma once +#include #include +#include +#include +#include + #include "java/JavaIntHash.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" + +class BiomeSource; class BiomeCache { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.cpp index f03251fa1..510450851 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.cpp @@ -1,8 +1,24 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "../levelgen/feature/net.minecraft.world.level.levelgen.feature.h" -#include "net.minecraft.world.level.biome.h" + +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h" +#include "Minecraft.World/net/minecraft/world/level/biome/WaterlilyFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/CactusFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/ClayFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/DeadBushFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HugeMushroomFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/PumpkinFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/x64headers/extraX64.h" BiomeDecorator::BiomeDecorator(Biome* biome) { _init(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.cpp index c9a947508..520372473 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.cpp @@ -1,8 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../storage/net.minecraft.world.level.storage.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" #include "net.minecraft.world.level.biome.h" -#include "../newbiome/layer/net.minecraft.world.level.newbiome.layer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h" #include "java/System.h" #include "BiomeSource.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h index 10b3d5d5d..8f953e6d0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h @@ -2,7 +2,7 @@ #include "Biome.h" #include "BiomeSource.h" #include "BiomeCache.h" -#include "../levelgen/synth/net.minecraft.world.level.levelgen.synth.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/net.minecraft.world.level.levelgen.synth.h" class ChunkPos; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/DesertBiome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/DesertBiome.cpp index 396eb946f..8f0cce41d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/DesertBiome.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/DesertBiome.cpp @@ -1,8 +1,15 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../levelgen/feature/net.minecraft.world.level.levelgen.feature.h" -#include "../net.minecraft.world.level.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "net.minecraft.world.level.biome.h" + +#include +#include + +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h" +#include "Minecraft.World/net/minecraft/world/level/biome/DesertBiome.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/DesertWellFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" DesertBiome::DesertBiome(int id) : Biome(id) { // remove default mob spawn settings diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/DesertBiome.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/DesertBiome.h index 2fd0680e7..d1a7f5362 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/DesertBiome.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/DesertBiome.h @@ -1,6 +1,7 @@ #pragma once #include "Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" class DesertBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/ExtremeHillsBiome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/ExtremeHillsBiome.cpp index 3204c15c9..618c6bdb4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/ExtremeHillsBiome.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/ExtremeHillsBiome.cpp @@ -1,8 +1,11 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "../levelgen/feature/net.minecraft.world.level.levelgen.feature.h" +#include + #include "ExtremeHillsBiome.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" ExtremeHillsBiome::ExtremeHillsBiome(int id) : Biome(id) { silverfishFeature = new OreFeature(Tile::monsterStoneEgg_Id, 8); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/ExtremeHillsBiome.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/ExtremeHillsBiome.h index 39e11e6ce..bfbd896ee 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/ExtremeHillsBiome.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/ExtremeHillsBiome.h @@ -1,6 +1,9 @@ #pragma once #include "Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" + +class Feature; class ExtremeHillsBiome : public Biome { friend class Biome; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.cpp index 448f896e8..3da76b78d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.cpp @@ -1,6 +1,11 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include + #include "java/Arrays.h" #include "FixedBiomeSource.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" FixedBiomeSource::FixedBiomeSource(Biome* fixed, float temperature, float downfall) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.h index 06b5239e4..e84470afe 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.h @@ -1,6 +1,11 @@ #pragma once +#include +#include + #include "BiomeSource.h" +class Biome; + class FixedBiomeSource : public BiomeSource { private: Biome* biome; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/ForestBiome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/ForestBiome.cpp index 23795a040..e025b4579 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/ForestBiome.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/ForestBiome.cpp @@ -1,9 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../levelgen/feature/net.minecraft.world.level.levelgen.feature.h" -#include "net.minecraft.world.level.biome.h" -#include "../../entity/animal/net.minecraft.world.entity.animal.h" -#include "../../entity/net.minecraft.world.entity.h" +#include + #include "ForestBiome.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/BirchFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.h" ForestBiome::ForestBiome(int id) : Biome(id) { friendlies_wolf.push_back(new MobSpawnerData( diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/ForestBiome.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/ForestBiome.h index 310f456b2..f36fa8fcb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/ForestBiome.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/ForestBiome.h @@ -1,5 +1,6 @@ #pragma once #include "Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" class ForestBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/HellBiome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/HellBiome.cpp index 76d31110c..cebb5df56 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/HellBiome.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/HellBiome.cpp @@ -1,6 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/monster/net.minecraft.world.entity.monster.h" +#include + #include "HellBiome.h" +#include "java/Class.h" HellBiome::HellBiome(int id) : Biome(id) { enemies.clear(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/HellBiome.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/HellBiome.h index b26964f84..41f152a45 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/HellBiome.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/HellBiome.h @@ -1,5 +1,6 @@ #pragma once #include "Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" class HellBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/IceBiome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/IceBiome.cpp index 1b6cd0c9e..ea2f7f89d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/IceBiome.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/IceBiome.cpp @@ -1,4 +1,3 @@ -#include "../../../../../Header Files/stdafx.h" #include "IceBiome.h" IceBiome::IceBiome(int id) : Biome(id) {}; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/IceBiome.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/IceBiome.h index 4fab90038..2f5739c2d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/IceBiome.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/IceBiome.h @@ -1,5 +1,6 @@ #pragma once #include "Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" class IceBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.cpp index a338ec163..61c5be15d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.cpp @@ -1,10 +1,21 @@ -#include "../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.biome.h" -#include "../levelgen/feature/net.minecraft.world.level.levelgen.feature.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "../net.minecraft.world.level.h" -#include "../../entity/animal/net.minecraft.world.entity.animal.h" +#include + #include "JungleBiome.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/TallGrassFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/VinesFeature.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LeafTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" +#include "Minecraft.World/x64headers/extraX64.h" JungleBiome::JungleBiome(int id) : Biome(id) { decorator->treeCount = 50; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.h index 4b094df90..eb9ba107f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.h @@ -1,6 +1,7 @@ #pragma once #include "Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" class JungleBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/MushroomIslandBiome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/MushroomIslandBiome.cpp index aecf73f59..d84e85bec 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/MushroomIslandBiome.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/MushroomIslandBiome.cpp @@ -1,8 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include + #include "MushroomIslandBiome.h" #include "BiomeDecorator.h" -#include "../../entity/animal/net.minecraft.world.entity.animal.h" -#include "../tile/net.minecraft.world.level.tile.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" MushroomIslandBiome::MushroomIslandBiome(int id) : Biome(id) { decorator->treeCount = -100; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/MushroomIslandBiome.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/MushroomIslandBiome.h index 23c0d8e2f..da94357ed 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/MushroomIslandBiome.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/MushroomIslandBiome.h @@ -1,5 +1,6 @@ #pragma once #include "Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" class MushroomIslandBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.cpp index fbb0f548c..99c14771f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.cpp @@ -1,5 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.biome.h" + +#include + +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h" +#include "Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.h" PlainsBiome::PlainsBiome(int id) : Biome(id) { friendlies.push_back(new MobSpawnerData(eTYPE_HORSE, 5, 2, 6)); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.h index 90388a885..df670789b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/PlainsBiome.h @@ -1,6 +1,7 @@ #pragma once #include "Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" class PlainsBiome : public Biome { friend class Biome; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/RainforestBiome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/RainforestBiome.cpp index 4c6bfaa6b..6c0567edd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/RainforestBiome.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/RainforestBiome.cpp @@ -1,6 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" #include "RainforestBiome.h" -#include "../levelgen/feature/net.minecraft.world.level.levelgen.feature.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.h" RainforestBiome::RainforestBiome(int id) : Biome(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/RainforestBiome.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/RainforestBiome.h index d59c01957..d6aacae99 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/RainforestBiome.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/RainforestBiome.h @@ -1,5 +1,6 @@ #pragma once #include "Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" class RainforestBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/SwampBiome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/SwampBiome.cpp index 42d5a35da..d937c158d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/SwampBiome.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/SwampBiome.cpp @@ -1,7 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "net.minecraft.world.level.biome.h" -#include "../levelgen/feature/SwampTreeFeature.h" +#include + +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h" +#include "Minecraft.World/net/minecraft/world/level/biome/SwampBiome.h" SwampBiome::SwampBiome(int id) : Biome(id) { decorator->treeCount = 2; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/SwampBiome.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/SwampBiome.h index 2546a0944..88b114604 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/SwampBiome.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/SwampBiome.h @@ -1,5 +1,7 @@ #pragma once #include "Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" + class LevelSource; class SwampBiome : public Biome { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TaigaBiome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/TaigaBiome.cpp index b12672cc1..ec00b5b9a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TaigaBiome.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/TaigaBiome.cpp @@ -1,8 +1,11 @@ -#include "../../../../../Header Files/stdafx.h" +#include + #include "TaigaBiome.h" -#include "../../entity/animal/net.minecraft.world.entity.animal.h" -#include "../levelgen/feature/net.minecraft.world.level.levelgen.feature.h" -#include "net.minecraft.world.level.biome.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/PineFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/SpruceFeature.h" TaigaBiome::TaigaBiome(int id) : Biome(id) { friendlies_wolf.push_back(new MobSpawnerData( diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TaigaBiome.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/TaigaBiome.h index 62c707036..4bce01833 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TaigaBiome.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/TaigaBiome.h @@ -1,5 +1,6 @@ #pragma once #include "Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" class TaigaBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiome.cpp index bf1a1ead9..7b9c8e5f3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiome.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiome.cpp @@ -1,8 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include + #include "TheEndBiome.h" #include "TheEndBiomeDecorator.h" -#include "../../entity/monster/net.minecraft.world.entity.monster.h" -#include "../tile/net.minecraft.world.level.tile.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" TheEndBiome::TheEndBiome(int id) : Biome(id) { enemies.clear(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiome.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiome.h index 52d5a1bf0..939999990 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiome.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiome.h @@ -1,5 +1,6 @@ #pragma once #include "Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" class TheEndBiome : public Biome { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiomeDecorator.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiomeDecorator.cpp index f33f99c98..1e7e9f1fc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiomeDecorator.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiomeDecorator.cpp @@ -1,9 +1,9 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "TheEndBiomeDecorator.h" -#include "../net.minecraft.world.level.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "../levelgen/feature/net.minecraft.world.level.levelgen.feature.h" -#include "../../entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h" +#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" // Spike centre positions, calculated using // for(int i=0;i<8;i++) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/WaterlilyFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/WaterlilyFeature.cpp index afd7799b9..cd2247e48 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/WaterlilyFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/WaterlilyFeature.cpp @@ -1,7 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" #include "WaterlilyFeature.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "../net.minecraft.world.level.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" bool WaterlilyFeature::place(Level* level, Random* random, int x, int y, int z) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/WaterlilyFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/WaterlilyFeature.h index b1d303c00..48643ed26 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/WaterlilyFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/WaterlilyFeature.h @@ -1,5 +1,5 @@ #pragma once -#include "../levelgen/feature/Feature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" class WaterlilyFeature : public Feature { virtual bool place(Level* level, Random* random, int x, int y, int z); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h b/minecraft/Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h index a47131d79..248c0c2bb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h @@ -11,7 +11,7 @@ #include "WaterlilyFeature.h" #include "SwampBiome.h" #include "TaigaBiome.h" -#include "../LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" #include "BiomeSource.h" #include "FixedBiomeSource.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/BlockReplacements.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/BlockReplacements.cpp index e58dc70d9..ecf4a7ba3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/BlockReplacements.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/BlockReplacements.cpp @@ -1,6 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" +#include + #include "BlockReplacements.h" -#include "../tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" std::vector BlockReplacements::replacements = std::vector(256); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/BlockReplacements.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/BlockReplacements.h index 481787814..73a9ce4f3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/BlockReplacements.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/BlockReplacements.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + class BlockReplacements { public: static void staticCtor(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h index 2ed5cde91..ddaafc79e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h @@ -1,6 +1,6 @@ #pragma once -#include "../biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" class ProgressListener; class TilePos; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp index 5126fe8c8..67d769e8e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp @@ -1,5 +1,15 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include +#include +#include + #include "CompressedTileStorage.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "java/System.h" +#include "Minecraft.World/x64headers/extraX64.h" // Note: See header for an overview of this class diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h index a4fd03376..9ff68e52c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h @@ -1,5 +1,11 @@ #pragma once +#include #include +#include + +class DataInputStream; +class DataOutputStream; +template class XLockFreeStack; #if !defined(__linux__) #include "../../../../../x64headers/xmcore.h" #endif @@ -74,6 +80,7 @@ // #define BLOCK_COMPRESSION_STATS class TileCompressData_SPU; + class CompressedTileStorage { friend class TileCompressData_SPU; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/DataLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/DataLayer.cpp index f90ab5b9b..9d7f33a7f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/DataLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/DataLayer.cpp @@ -1,4 +1,3 @@ -#include "../../../../../Header Files/stdafx.h" #include "DataLayer.h" DataLayer::DataLayer(int length, int depthBits) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/DataLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/DataLayer.h index 1c96af9ce..1ae6659e0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/DataLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/DataLayer.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + class DataLayer { public: std::vector data; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.cpp index 7b9fb695f..780832622 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.cpp @@ -1,8 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" #include "java/Arrays.h" -#include "../net.minecraft.world.level.h" -#include "../../phys/net.minecraft.world.phys.h" #include "EmptyLevelChunk.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Entity; +class EntitySelector; EmptyLevelChunk::EmptyLevelChunk(Level* level, int x, int z) : LevelChunk(level, x, z) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h index 1a025aacc..4ce3ce5a1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h @@ -1,8 +1,17 @@ #pragma once +#include +#include +#include +#include + #include "LevelChunk.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" +#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" class Level; +class AABB; +class Entity; +class EntitySelector; class EmptyLevelChunk : public LevelChunk { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.cpp index 65b09a58f..9871d36eb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.cpp @@ -1,25 +1,52 @@ -#include "../../../../../Header Files/stdafx.h" -#include "java/System.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "../net.minecraft.world.level.h" -#include "../dimension/net.minecraft.world.level.dimension.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../biome/net.minecraft.world.level.biome.h" -#include "../../entity/monster/net.minecraft.world.entity.monster.h" -#include "DataLayer.h" -#include "SparseLightStorage.h" -#include "BlockReplacements.h" -#include "LevelChunk.h" +#include #include +#include +#include +#include +#include + +#include "java/System.h" +#include "SparseLightStorage.h" +#include "LevelChunk.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h" #include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" -#include "../../entity/item/ItemEntity.h" -#include "../../entity/item/Minecart.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Class.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" +#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Zombie.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ChestTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/EntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/x64headers/extraX64.h" -#include +class DataInputStream; +class DataOutputStream; #if defined(SHARING_ENABLED) std::recursive_mutex LevelChunk::m_csSharing; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h index bd183c9ef..ad697ed4f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h @@ -1,20 +1,38 @@ #pragma once +#include #include +#include +#include +#include +#include +#include + +#include "SparseLightStorage.h" +#include "CompressedTileStorage.h" +#include "SparseDataStorage.h" +#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" class DataLayer; class TileEntity; class Random; class ChunkSource; class EntitySelector; - -#include "SparseLightStorage.h" -#include "CompressedTileStorage.h" -#include "SparseDataStorage.h" - -#include "../LightLayer.h" -#include "../../entity/Entity.h" -#include "../Level.h" +class AABB; +class Biome; +class BiomeSource; +class ChunkPos; +class CompoundTag; +class CompressedTileStorage; +class DataInputStream; +class DataOutputStream; +class Entity; +class SparseDataStorage; +class SparseLightStorage; #define SHARING_ENABLED class TileCompressData_SPU; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp index 3674abc8a..bbefc2547 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp @@ -1,7 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" #include "ReadOnlyChunkCache.h" -#include "../biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorage.h" ReadOnlyChunkCache::ReadOnlyChunkCache(Level* level, ChunkStorage* storage) { chunks = std::vector(LEN * LEN); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ReadOnlyChunkCache.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ReadOnlyChunkCache.h index f6eff229c..ac0a51564 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ReadOnlyChunkCache.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/ReadOnlyChunkCache.h @@ -1,10 +1,19 @@ #pragma once +#include +#include +#include + #include "ChunkSource.h" #include "LevelChunk.h" #include "EmptyLevelChunk.h" -#include "storage/ChunkStorage.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorage.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" class ProgressListener; +class ChunkStorage; +class Level; +class LevelChunk; class ReadOnlyChunkCache : public ChunkSource { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.cpp index e58ac5574..da0b4b332 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.cpp @@ -1,5 +1,13 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include +#include +#include + #include "SparseDataStorage.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/x64headers/extraX64.h" // Note: See header for an overview of this class diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h index ca720969f..185b0b253 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h @@ -1,4 +1,6 @@ #pragma once +#include +#include #if !defined(__linux__) #include "../../../../../x64headers/xmcore.h" #endif @@ -56,6 +58,9 @@ // #define DATA_COMPRESSION_STATS class TileCompressData_SPU; +class DataInputStream; +class DataOutputStream; +template class XLockFreeStack; class SparseDataStorage { friend class TileCompressData_SPU; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.cpp index c550102f4..eabc8246b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.cpp @@ -1,5 +1,13 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include +#include +#include + #include "SparseLightStorage.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/x64headers/extraX64.h" // Note: See header for an overview of this class diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h index 0e594ef54..6c1873bd7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h @@ -1,4 +1,6 @@ #pragma once +#include +#include #if !defined(__linux__) #include "../../../../../x64headers/xmcore.h" #endif @@ -58,6 +60,9 @@ // #define LIGHT_COMPRESSION_STATS class TileCompressData_SPU; +class DataInputStream; +class DataOutputStream; +template class XLockFreeStack; class SparseLightStorage { friend class TileCompressData_SPU; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.cpp index 1f302e1ed..53745ac69 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.cpp @@ -1,9 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "java/Arrays.h" -#include "../net.minecraft.world.level.h" -#include "../../phys/net.minecraft.world.phys.h" #include "WaterLevelChunk.h" -#include "../biome/net.minecraft.world.level.biome.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Entity; WaterLevelChunk::WaterLevelChunk(Level* level, std::vector& blocks, int x, int z) : LevelChunk(level, blocks, x, z) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.h index b8148f654..24a05e4ec 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.h @@ -1,8 +1,16 @@ #pragma once +#include +#include +#include +#include + #include "LevelChunk.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" +#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" class Level; +class AABB; +class Entity; class WaterLevelChunk : public LevelChunk { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp index 3d2b520f8..04a686cbd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp @@ -1,6 +1,9 @@ -#include "../../../../../../Header Files/stdafx.h" +#include + #include "java/System.h" #include "ChunkStorageProfileDecorator.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorage.h" ChunkStorageProfilerDecorator::ChunkStorageProfilerDecorator( ChunkStorage* capsulated) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.h index 678d0ce99..e388d19c3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "ChunkStorage.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp index 8bab14780..d74924c64 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp @@ -1,13 +1,37 @@ +#include +#include #include #include #include +#include -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileIO.h" -#include "../../../../../../ConsoleHelpers/ThreadName.h" -#include "../../storage/LevelData.h" +#include "Minecraft.World/ConsoleHelpers/ThreadName.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" #include "McRegionChunkStorage.h" +#include "4J_Profile.h" +#include "Minecraft.World/ConsoleHelpers/C4JThread.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" +#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "compression.h" +#include "java/InputOutputStream/BufferedOutputStream.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/ByteArrayOutputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "nbt/CompoundTag.h" +#include "nbt/NbtIo.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h" +#include "Minecraft.World/x64headers/extraX64.h" + +class DataInput; std::mutex McRegionChunkStorage::cs_memory; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.h index 8a800830c..a5cce185a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.h @@ -1,14 +1,24 @@ #pragma once +#include #include +#include +#include +#include +#include +#include #include "ChunkStorage.h" -#include "../LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" #include "RegionFileCache.h" #include "nbt/com.mojang.nbt.h" #include "OldChunkStorage.h" class ConsoleSaveFile; +class C4JThread; +class DataOutputStream; +class Level; +class LevelChunk; class McRegionChunkStorage : public ChunkStorage { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp index f3cfd2330..66b8b133e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp @@ -1,6 +1,6 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../net.minecraft.world.level.chunk.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" #include "MemoryChunkStorage.h" LevelChunk* MemoryChunkStorage::load(Level* level, int x, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/MemoryChunkStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/MemoryChunkStorage.h index 01bfca74e..867ef85d8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/MemoryChunkStorage.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/MemoryChunkStorage.h @@ -1,6 +1,6 @@ #pragma once -#include "../ChunkSource.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" class MemoryChunkStorage : public ChunkStorage { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/NbtSlotFile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/NbtSlotFile.cpp index 4eb1eb358..ed0696511 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/NbtSlotFile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/NbtSlotFile.cpp @@ -1,4 +1,4 @@ -#include "../../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "java/File.h" #include "NbtSlotFile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp index e0cea9a5b..2fdea8f62 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp @@ -1,14 +1,35 @@ -#include "../../../../../../Header Files/stdafx.h" +#include +#include #include +#include +#include +#include +#include +#include + #include "java/File.h" -#include "java/InputOutputStream/InputOutputStream.h" -#include "../../../entity/net.minecraft.world.entity.h" -#include "../../net.minecraft.world.level.h" -#include "../net.minecraft.world.level.chunk.h" -#include "../../tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../../storage/net.minecraft.world.level.storage.h" -#include "../../../../../../ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" #include "OldChunkStorage.h" +#include "4J_Profile.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" +#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "java/InputOutputStream/FileInputStream.h" +#include "java/InputOutputStream/FileOutputStream.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "nbt/NbtIo.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/TickNextTickData.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "Minecraft.World/x64headers/extraX64.h" thread_local OldChunkStorage::ThreadStorage* OldChunkStorage::m_tlsStorage = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h index d6eb993a3..18b4da9d7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h @@ -1,12 +1,18 @@ #pragma once +#include +#include + #include "ChunkStorage.h" -#include "../LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" #include "java/File.h" #include "nbt/CompoundTag.h" #include "nbt/com.mojang.nbt.h" -#include class Level; +class CompoundTag; +class DataInputStream; +class DataOutputStream; +class LevelChunk; class OldChunkStorage : public ChunkStorage { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp index d4e4c07c1..7d986157c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp @@ -1,10 +1,19 @@ -#include "../../../../../../Header Files/stdafx.h" +#include +#include +#include +#include + #include "java/System.h" -#include "java/InputOutputStream/InputOutputStream.h" #include "java/File.h" #include "RegionFile.h" - -#include "../../../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "compression.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.World/x64headers/extraX64.h" std::vector RegionFile::emptySector(SECTOR_BYTES); @@ -314,13 +323,6 @@ void RegionFile::write(int x, int z, std::uint8_t* data, #endif if (sectorNumber != 0 && sectorsAllocated == sectorsNeeded) { - /* we can simply overwrite the old sectors */ -// debug("SAVE", x, z, length, "rewrite"); -#ifndef _CONTENT_PACKAGE - // wprintf(L"Writing chunk (%d,%d) in %ls from current sector %d to - // %d\n", x,z, fileEntry->data.filename, sectorNumber, sectorNumber - // + sectorsNeeded - 1); -#endif write(sectorNumber, compData, length, compLength); } else { /* we need to allocate new sectors */ @@ -363,11 +365,6 @@ void RegionFile::write(int x, int z, std::uint8_t* data, // debug("SAVE", x, z, length, "reuse"); sectorNumber = runStart; setOffset(x, z, (sectorNumber << 8) | sectorsNeeded); -#ifndef _CONTENT_PACKAGE - // wprintf(L"Writing chunk (%d,%d) in %ls from old sector %d to - // %d\n", x,z, fileEntry->data.filename, sectorNumber, - // sectorNumber + sectorsNeeded - 1); -#endif for (int i = 0; i < sectorsNeeded; ++i) { sectorFree->at(sectorNumber + i) = false; } @@ -385,11 +382,6 @@ void RegionFile::write(int x, int z, std::uint8_t* data, SaveFileSeekOrigin::End); sectorNumber = (int)sectorFree->size(); -#ifndef _CONTENT_PACAKGE - // wprintf(L"Writing chunk (%d,%d) in %ls from new sector %d to - // %d\n", x,z, fileEntry->data.filename, sectorNumber, - // sectorNumber + sectorsNeeded - 1); -#endif unsigned int numberOfBytesWritten = 0; for (int i = 0; i < sectorsNeeded; ++i) { // WriteFile(file,emptySector.data(),SECTOR_BYTES,&numberOfBytesWritten,nullptr); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h index f565221b7..8cb825786 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h @@ -1,9 +1,17 @@ #pragma once -#include "../../../../../../Header Files/compression.h" +#include +#include +#include + +#include "Minecraft.World/Header Files/compression.h" #include "java/InputOutputStream/InputOutputStream.h" +#include "java/InputOutputStream/ByteArrayOutputStream.h" class FileEntry; class ConsoleSaveFile; +class DataInputStream; +class DataOutputStream; +class File; class RegionFile { // 4J Stu TEMP FOR TESTING diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.cpp index 94bda67dd..6a739e13a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.cpp @@ -1,7 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" +#include + #include "java/File.h" #include "RegionFileCache.h" -#include "../../../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileIO.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h" + +class DataInputStream; +class DataOutputStream; RegionFileCache RegionFileCache::s_defaultCache; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h index ab83e6d05..9f106dbae 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h @@ -1,7 +1,16 @@ #pragma once +#include +#include + #include "RegionFile.h" #include "java/Reference.h" #include "java/File.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" + +class ConsoleSaveFile; +class DataInputStream; +class DataOutputStream; +class RegionFile; class RegionFileCache { friend class ConsoleSaveFileOriginal; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZoneFile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZoneFile.cpp index 813eb1855..cf92e7b86 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZoneFile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZoneFile.cpp @@ -1,4 +1,4 @@ -#include "../../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "java/ByteBuffer.h" #include "java/File.h" #include "ZoneFile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZoneIo.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZoneIo.cpp index c95b9adac..ad3f21f14 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZoneIo.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZoneIo.cpp @@ -1,4 +1,4 @@ -#include "../../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "java/ByteBuffer.h" #include "ZoneIo.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp index fe6e4863f..19084957f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp @@ -1,11 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include #include "java/File.h" #include "java/ByteBuffer.h" -#include "../../../entity/net.minecraft.world.entity.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../net.minecraft.world.level.chunk.h" +#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" #include "ZonedChunkStorage.h" #include "ZoneFile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZonedChunkStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZonedChunkStorage.h index a9529ca81..dc09a00b4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZonedChunkStorage.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/ZonedChunkStorage.h @@ -1,7 +1,7 @@ #pragma once #include "java/File.h" #include "ChunkStorage.h" -#include "../LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" // 4J Stu - There are changes to this class for 1.8.2, but since we never use it // anyway lets not worry about it diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.cpp index 93eb1ee40..3ef5dd5f7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.cpp @@ -1,18 +1,30 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../levelgen/flat/net.minecraft.world.level.levelgen.flat.h" -#include "../levelgen/net.minecraft.world.level.levelgen.h" -#include "../net.minecraft.world.level.h" -#include "../storage/net.minecraft.world.level.storage.h" +#include +#include + #include "Dimension.h" -#include "../biome/BiomeSource.h" -#include "../biome/FixedBiomeSource.h" -#include "../chunk/storage/OldChunkStorage.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" +#include "Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" #include "HellDimension.h" #include "NormalDimension.h" #include "TheEndDimension.h" -#include "../tile/net.minecraft.world.level.tile.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelType.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Pos; const float Dimension::MOON_BRIGHTNESS_PER_PHASE[8] = { 1.0f, 0.75f, 0.5f, 0.25f, 0, 0.25f, 0.5f, 0.75f}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.h b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.h index 97f1f20cd..ac3739951 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.h @@ -1,13 +1,19 @@ #pragma once +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "Minecraft.World/net/minecraft/Pos.h" +#include "java/File.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" + class BiomeSource; class ChunkSource; class ChunkStorage; class Level; class LevelType; - -#include "../material/Material.h" -#include "../../phys/Vec3.h" -#include "../../../Pos.h" +class Pos; class Dimension { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.cpp index dc9beaa26..b5c0b7724 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.cpp @@ -1,12 +1,20 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../storage/net.minecraft.world.level.storage.h" +#include + #include "HellDimension.h" -#include "../levelgen/net.minecraft.world.level.levelgen.h" -#include "../biome/net.minecraft.world.level.biome.h" -#include "../tile/net.minecraft.world.level.tile.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelType.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" void HellDimension::init() { biomeSource = new FixedBiomeSource(Biome::hell, 1, 0); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.h b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.h index caa6ff55f..85d4b1ee4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "Dimension.h" class HellDimension : public Dimension { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.cpp index 16d5349b2..654b3389e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.cpp @@ -1,11 +1,18 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include + #include "TheEndDimension.h" -#include "../biome/FixedBiomeSource.h" -#include "../levelgen/net.minecraft.world.level.levelgen.h" -#include "../net.minecraft.world.level.h" -#include "../tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" void TheEndDimension::init() { biomeSource = new FixedBiomeSource(Biome::sky, 0.5f, 0); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.h b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.h index 304974106..10edd5769 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "Dimension.h" class TheEndDimension : public Dimension { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.cpp index 938c550df..af5b5e039 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.cpp @@ -1,8 +1,14 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" +#include +#include + #include "CanyonFeature.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "../biome/net.minecraft.world.level.biome.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" void CanyonFeature::addTunnel(int64_t seed, int xOffs, int zOffs, std::vector& blocks, double xCave, double yCave, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.h index 9209bed98..bedb5ee9a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.h @@ -1,5 +1,9 @@ #pragma once +#include +#include + #include "LargeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.cpp index 6d4fff859..f348ba280 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.cpp @@ -1,14 +1,29 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../biome/net.minecraft.world.level.biome.h" -#include "net.minecraft.world.level.levelgen.h" -#include "feature/net.minecraft.world.level.levelgen.feature.h" -#include "structure/net.minecraft.world.level.levelgen.structure.h" -#include "synth/net.minecraft.world.level.levelgen.synth.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "../storage/net.minecraft.world.level.storage.h" -#include "../../entity/net.minecraft.world.entity.h" +#include +#include + #include "CustomLevelSource.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/MobCategory.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/MobSpawner.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/x64headers/extraX64.h" const double CustomLevelSource::SNOW_SCALE = 0.3; const double CustomLevelSource::SNOW_CUTOFF = 0.5; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.h index 521d2d0d9..281d2d08f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.h @@ -1,6 +1,17 @@ #pragma once -#include "../chunk/ChunkSource.h" +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" + +class Level; +class PerlinNoise; +class Random; #ifndef _CONTENT_PACKAGE #define _OVERRIDE_HEIGHTMAP diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/DungeonFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/DungeonFeature.cpp index fae7bbb13..2e2736e68 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/DungeonFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/DungeonFeature.cpp @@ -1,7 +1,11 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" +#include +#include + #include "DungeonFeature.h" -#include "../tile/net.minecraft.world.level.tile.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" void DungeonFeature::addRoom(int xOffs, int zOffs, std::vector& blocks, double xRoom, double yRoom, double zRoom) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/DungeonFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/DungeonFeature.h index bd59c2f77..eb5440575 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/DungeonFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/DungeonFeature.h @@ -1,5 +1,9 @@ #pragma once +#include +#include + #include "LargeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.cpp index 6dfbf757a..2953aeb72 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.cpp @@ -1,12 +1,15 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "net.minecraft.world.level.levelgen.h" -#include "feature/net.minecraft.world.level.levelgen.feature.h" -#include "structure/net.minecraft.world.level.levelgen.structure.h" -#include "synth/net.minecraft.world.level.levelgen.synth.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "../storage/net.minecraft.world.level.storage.h" +#include + #include "FlatLevelSource.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/x64headers/extraX64.h" // FlatLevelSource::villageFeature = new VillageFeature(1); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.h index 7e0c4a840..3ebdaec56 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.h @@ -1,6 +1,12 @@ #pragma once -#include "../chunk/ChunkSource.h" +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" class ProgressListener; class LargeFeature; @@ -8,6 +14,8 @@ class StrongholdFeature; class VillageFeature; class MineShaftFeature; class PerlinNoise; +class Level; +class Random; class FlatLevelSource : public ChunkSource { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.cpp index 6d0eb17a9..a0fe53766 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.cpp @@ -1,8 +1,18 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "../storage/net.minecraft.world.level.storage.h" +#include +#include + #include "HellFlatLevelSource.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/x64headers/extraX64.h" HellFlatLevelSource::HellFlatLevelSource(Level* level, int64_t seed) { int xzSize = level->getLevelData()->getXZSize(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.h index 2e15625bb..89a31b5ef 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.h @@ -1,16 +1,24 @@ #pragma once -#include "../chunk/ChunkSource.h" -#include "synth/PerlinNoise.h" +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h" #include "LargeFeature.h" #include "LargeHellCaveFeature.h" -#include "../chunk/LevelChunk.h" -#include "feature/HellFireFeature.h" -#include "feature/LightGemFeature.h" -#include "feature/HellPortalFeature.h" -#include "feature/FlowerFeature.h" -#include "feature/HellSpringFeature.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellPortalFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellSpringFeature.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" class ProgressListener; +class Level; +class Random; class HellFlatLevelSource : public ChunkSource { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.cpp index e903d77b3..28b3c45c2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.cpp @@ -1,11 +1,28 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "feature/net.minecraft.world.level.levelgen.feature.h" -#include "../storage/net.minecraft.world.level.storage.h" -#include "../biome/BiomeSource.h" +#include +#include +#include + #include "HellRandomLevelSource.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/MobCategory.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeHellCaveFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellPortalFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellSpringFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/x64headers/extraX64.h" HellRandomLevelSource::HellRandomLevelSource(Level* level, int64_t seed) { int xzSize = level->getLevelData()->getXZSize(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.h index 90087ceea..d71180291 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.h @@ -1,17 +1,29 @@ #pragma once -#include "../chunk/ChunkSource.h" -#include "synth/PerlinNoise.h" +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h" #include "LargeFeature.h" #include "LargeHellCaveFeature.h" -#include "../chunk/LevelChunk.h" -#include "feature/HellFireFeature.h" -#include "feature/LightGemFeature.h" -#include "feature/HellPortalFeature.h" -#include "feature/FlowerFeature.h" -#include "feature/HellSpringFeature.h" -#include "structure/NetherBridgeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellPortalFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HellSpringFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" class ProgressListener; +class LargeFeature; +class Level; +class NetherBridgeFeature; +class PerlinNoise; +class Random; class HellRandomLevelSource : public ChunkSource { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.cpp index 3a4b4a452..2cea3bdff 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.cpp @@ -1,8 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "../biome/net.minecraft.world.level.biome.h" +#include +#include + #include "LargeCaveFeature.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" void LargeCaveFeature::addRoom(int64_t seed, int xOffs, int zOffs, std::vector& blocks, double xRoom, double yRoom, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.h index 789470684..4373aea7c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "LargeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" class LargeCaveFeature : public LargeFeature { protected: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.cpp index 72d1a466c..77a45b6d2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.cpp @@ -1,6 +1,14 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" + +#include +#include +#include + #include "LargeFeature.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" + +class ChunkSource; const std::wstring LargeFeature::STRONGHOLD = L"StrongHold"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h index f4b43ea68..8af3cfa0e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h @@ -1,5 +1,5 @@ #pragma once -#include "../chunk/ChunkSource.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeHellCaveFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeHellCaveFeature.cpp index 975a6ef64..8b6874932 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeHellCaveFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeHellCaveFeature.cpp @@ -1,7 +1,11 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" +#include +#include + #include "LargeHellCaveFeature.h" -#include "../tile/net.minecraft.world.level.tile.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" void LargeHellCaveFeature::addRoom(int64_t seed, int xOffs, int zOffs, std::vector& blocks, double xRoom, double yRoom, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeHellCaveFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeHellCaveFeature.h index 8b2b4f7d4..6f3822103 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeHellCaveFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/LargeHellCaveFeature.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "LargeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" class LargeHellCaveFeature : public LargeFeature { protected: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp index 60d0cd8ff..ab01cf67b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp @@ -1,14 +1,29 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../biome/net.minecraft.world.level.biome.h" -#include "net.minecraft.world.level.levelgen.h" -#include "feature/net.minecraft.world.level.levelgen.feature.h" -#include "structure/net.minecraft.world.level.levelgen.structure.h" -#include "synth/net.minecraft.world.level.levelgen.synth.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "../storage/net.minecraft.world.level.storage.h" -#include "../../entity/net.minecraft.world.entity.h" #include "RandomLevelSource.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/MobCategory.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/MobSpawner.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/CanyonFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeCaveFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "Minecraft.World/x64headers/extraX64.h" const double RandomLevelSource::SNOW_SCALE = 0.3; const double RandomLevelSource::SNOW_CUTOFF = 0.5; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.h index 2118de68c..45ed61b92 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.h @@ -1,6 +1,13 @@ #pragma once -#include "../chunk/ChunkSource.h" +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" class ProgressListener; class LargeFeature; @@ -9,6 +16,8 @@ class VillageFeature; class MineShaftFeature; class PerlinNoise; class RandomScatteredLargeFeature; +class Level; +class Random; class RandomLevelSource : public ChunkSource { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp index 7edaf4dbe..4c76a4e99 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp @@ -1,13 +1,16 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../biome/net.minecraft.world.level.biome.h" -#include "net.minecraft.world.level.levelgen.h" -#include "feature/net.minecraft.world.level.levelgen.feature.h" -#include "structure/net.minecraft.world.level.levelgen.structure.h" -#include "synth/net.minecraft.world.level.levelgen.synth.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "../storage/net.minecraft.world.level.storage.h" +#include + #include "TheEndLevelRandomLevelSource.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/x64headers/extraX64.h" TheEndLevelRandomLevelSource::TheEndLevelRandomLevelSource(Level* level, int64_t seed) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h index d4217c816..39a22ec93 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h @@ -1,7 +1,17 @@ #pragma once -#include "../chunk/ChunkSource.h" +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" + class PerlinNoise; +class Level; +class Random; class TheEndLevelRandomLevelSource : public ChunkSource { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp index 59e988dbb..3262191c7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp @@ -1,7 +1,17 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include +#include +#include + #include "BasicTreeFeature.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" +#include "Minecraft.World/x64headers/extraX64.h" uint8_t BasicTree::axisConversionArray[] = {2, 0, 0, 1, 2, 1}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.h index f69426bd2..946528baa 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.h @@ -1,7 +1,10 @@ #pragma once +#include + #include "Feature.h" class Level; +class Random; class BasicTree : public Feature { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BirchFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BirchFeature.cpp index 0dc4c10ae..ef800b933 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BirchFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BirchFeature.cpp @@ -1,7 +1,14 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" +#include + #include "BirchFeature.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LeafTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" BirchFeature::BirchFeature(bool doUpdate) : Feature(doUpdate) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp index 3eda0b207..c868749c8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp @@ -1,10 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" +#include + #include "BonusChestFeature.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" -#include "../../tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../../../../util/WeighedTreasure.h" -#include "../structure/StructurePiece.h" +#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h" BonusChestFeature::BonusChestFeature(std::vector& treasureList, int numRolls) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BonusChestFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BonusChestFeature.h index e546a0e4e..624fc7a7f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BonusChestFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BonusChestFeature.h @@ -1,8 +1,12 @@ #pragma once +#include +#include + #include "Feature.h" class Random; class Level; +class WeighedTreasure; class BonusChestFeature : public Feature { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CactusFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CactusFeature.cpp index 57e0dcc3d..3a74f0f2a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CactusFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CactusFeature.cpp @@ -1,7 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" #include "CactusFeature.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" bool CactusFeature::place(Level* level, Random* random, int x, int y, int z) { for (int i = 0; i < 10; i++) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.cpp index 4605f4c1c..80b62212c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.cpp @@ -1,7 +1,16 @@ -#include "../../../../../../Header Files/stdafx.h" +#include +#include +#include + #include "CaveFeature.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" bool CaveFeature::place(Level* level, Random* random, int x, int y, int z) { float dir = random->nextFloat() * std::numbers::pi; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.h index f6577ec8c..1dbd78923 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.h @@ -1,6 +1,6 @@ #pragma once #include "Feature.h" -#include "../../material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ClayFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ClayFeature.cpp index e20b4dd77..b8f52b5fe 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ClayFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ClayFeature.cpp @@ -1,8 +1,8 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../material/net.minecraft.world.level.material.h" #include "ClayFeature.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" ClayFeature::ClayFeature(int radius) { this->tile = Tile::clay_Id; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ClayFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ClayFeature.h index 10c5f1b5a..230e3c6b5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ClayFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ClayFeature.h @@ -1,6 +1,6 @@ #pragma once #include "Feature.h" -#include "../../material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DeadBushFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DeadBushFeature.cpp index a4261afa0..2c3d427d8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DeadBushFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DeadBushFeature.cpp @@ -1,7 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" #include "DeadBushFeature.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" DeadBushFeature::DeadBushFeature(int tile) { this->tile = tile; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp index 149fbbdc5..158acfbe0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp @@ -1,7 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" #include "DesertWellFeature.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" bool DesertWellFeature::place(Level* level, Random* random, int x, int y, int z) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp index a24590b2b..4c7d121c8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp @@ -1,7 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../../entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "EndPodiumFeature.h" EndPodiumFeature::EndPodiumFeature(int tile) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.cpp index 168966ef8..1dd0cdd70 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.cpp @@ -1,7 +1,8 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" #include "Feature.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Random; Feature::Feature() { this->doUpdate = false; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h index 94e3b4c31..bae9a41ce 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h @@ -1,6 +1,7 @@ #pragma once class Level; +class Random; class Feature { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.cpp index 358cc6651..915344845 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.cpp @@ -1,8 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../dimension/net.minecraft.world.level.dimension.h" #include "FlowerFeature.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" FlowerFeature::FlowerFeature(int tile) { this->tile = tile; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp index 3452178c9..3b52384b3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp @@ -1,7 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include + #include "GroundBushFeature.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/x64headers/extraX64.h" GroundBushFeature::GroundBushFeature(int trunkType, int leafType) { trunkTileType = trunkType; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.cpp index e4ae8155b..1b04eef99 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellFireFeature.cpp @@ -1,7 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" #include "HellFireFeature.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" bool HellFireFeature::place(Level* level, Random* random, int x, int y, int z) { for (int i = 0; i < 64; i++) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellPortalFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellPortalFeature.cpp index f0f3bdd0b..5629db618 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellPortalFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellPortalFeature.cpp @@ -1,7 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" #include "HellPortalFeature.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" bool HellPortalFeature::place(Level* level, Random* random, int x, int y, int z) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellSpringFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellSpringFeature.cpp index 5b7164d17..f1ac14ee7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellSpringFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HellSpringFeature.cpp @@ -1,7 +1,6 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" #include "HellSpringFeature.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" HellSpringFeature::HellSpringFeature(int tile, bool insideRock) { this->tile = tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.cpp index b91ec81c0..b7b17e6d1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.cpp @@ -1,9 +1,12 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" +#include + #include "HouseFeature.h" -#include "../../tile/net.minecraft.world.level.tile.h" -#include "../../../entity/monster/net.minecraft.world.entity.monster.h" -#include "../../../item/net.minecraft.world.item.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/PigZombie.h" +#include "Minecraft.World/net/minecraft/world/item/DoorItem.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" bool HouseFeature::place(Level* level, Random* random, int x, int y, int z) { while (y > 0 && !level->getMaterial(x, y - 1, z)->blocksMotion()) y--; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.h index d16795b4e..b491ff057 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.h @@ -1,6 +1,6 @@ #pragma once #include "Feature.h" -#include "../../material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" class HouseFeature : public Feature { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp index 7b9812533..0be72a93f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp @@ -1,7 +1,8 @@ -#include "../../../../../../Header Files/stdafx.h" #include "HugeMushroomFeature.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" HugeMushroomFeature::HugeMushroomFeature(int forcedType) : Feature(true) { this->forcedType = forcedType; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.cpp index 20c1c3495..926c915cb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.cpp @@ -1,8 +1,12 @@ -#include "../../../../../../Header Files/stdafx.h" #include "LakeFeature.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" -#include "../../biome/net.minecraft.world.level.biome.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" LakeFeature::LakeFeature(int tile) { this->tile = tile; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.h index f466c2f3e..70c8d7b73 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.h @@ -1,6 +1,6 @@ #pragma once #include "Feature.h" -#include "../../material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" class LakeFeature : public Feature { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.cpp index b055bd456..60e1cb60f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LightGemFeature.cpp @@ -1,7 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" #include "LightGemFeature.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" bool LightGemFeature::place(Level* level, Random* random, int x, int y, int z) { if (!level->isEmptyTile(x, y, z)) return false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp index f5a670074..10876a902 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp @@ -1,7 +1,15 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include + #include "MegaTreeFeature.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/VineTile.h" +#include "Minecraft.World/x64headers/extraX64.h" MegaTreeFeature::MegaTreeFeature(bool doUpdate, int baseHeight, int trunkType, int leafType) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.h index c64e26eb0..a5a433758 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.h @@ -2,6 +2,9 @@ #include "Feature.h" +class Level; +class Random; + class MegaTreeFeature : public Feature { private: const int baseHeight; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp index 3595058f7..d8bb45af4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp @@ -1,11 +1,17 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../material/net.minecraft.world.level.material.h" -#include "../../tile/net.minecraft.world.level.tile.h" -#include "../../tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../../../item/net.minecraft.world.item.h" -#include "../../../../util/WeighedTreasure.h" +#include +#include + +#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" #include "MonsterRoomFeature.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" WeighedTreasure* MonsterRoomFeature::monsterRoomTreasure [MonsterRoomFeature::TREASURE_ITEMS_COUNT] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h index 2a796e519..d008dec0e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "Feature.h" -#include "../../material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" class WeighedTreasure; +class Random; class MonsterRoomFeature : public Feature { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp index e9bfc3da6..b4f051c42 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp @@ -1,6 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" #include "NetherSphereFeature.h" +class Level; + NetherSphere::NetherSphere(Level* level) : Entity(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to // ensure that the derived version of the function is called diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/NetherSphereFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/NetherSphereFeature.h index 95e116226..c052c48b1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/NetherSphereFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/NetherSphereFeature.h @@ -1,6 +1,10 @@ #pragma once -#include "../../../entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" + +class Level; class NetherSphere : public Entity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.cpp index 59c7af7b9..1f40f062a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.cpp @@ -1,7 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include + #include "OreFeature.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/x64headers/extraX64.h" void OreFeature::_init(int tile, int count, int targetTile) { this->tile = tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PineFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PineFeature.cpp index bf7309668..1f468fc1d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PineFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PineFeature.cpp @@ -1,7 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include + #include "PineFeature.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LeafTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" bool PineFeature::place(Level* level, Random* random, int x, int y, int z) { // pines can be quite tall diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PumpkinFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PumpkinFeature.cpp index f15815371..a40930d00 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PumpkinFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PumpkinFeature.cpp @@ -1,7 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" #include "PumpkinFeature.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" bool PumpkinFeature::place(Level* level, Random* random, int x, int y, int z) { for (int i = 0; i < 64; i++) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.cpp index a8846c391..924be68c8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.cpp @@ -1,7 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" #include "ReedsFeature.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" bool ReedsFeature::place(Level* level, Random* random, int x, int y, int z) { for (int i = 0; i < 20; i++) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.h index ed720f58c..8cbe45545 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.h @@ -1,6 +1,6 @@ #pragma once #include "Feature.h" -#include "../../material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" class ReedsFeature : public Feature { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.cpp index 75d21c35c..80aa858cd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.cpp @@ -1,7 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" #include "SandFeature.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" SandFeature::SandFeature(int radius, int tile) { this->tile = tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.h index bbfcd71d2..5cbedf167 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.h @@ -1,5 +1,6 @@ #pragma once #include "Feature.h" + class Random; class SandFeature : public Feature { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpikeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpikeFeature.cpp index 2a9213620..a7cd66906 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpikeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpikeFeature.cpp @@ -1,7 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../../entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "SpikeFeature.h" SpikeFeature::SpikeFeature(int tile) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.cpp index 57ed3809d..15c2d12c5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.cpp @@ -1,7 +1,8 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" #include "SpringFeature.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" SpringFeature::SpringFeature(int tile) { this->tile = tile; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpruceFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpruceFeature.cpp index 0aa4e531a..311456011 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpruceFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpruceFeature.cpp @@ -1,7 +1,14 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include + #include "SpruceFeature.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LeafTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" SpruceFeature::SpruceFeature(bool doUpdate) : Feature(doUpdate) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp index 3fdabef77..1792e4b29 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp @@ -1,8 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" +#include + #include "SwampTreeFeature.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" -#include "java/JavaMath.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/VineTile.h" bool SwampTreeFeature::place(Level* level, Random* random, int x, int y, int z) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.h index b5fdcd1fc..116436098 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.h @@ -1,6 +1,8 @@ #pragma once #include "Feature.h" + class Random; +class Level; class SwampTreeFeature : public Feature { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TallGrassFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TallGrassFeature.cpp index 7759847ee..c25d13b12 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TallGrassFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TallGrassFeature.cpp @@ -1,7 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" #include "TallGrassFeature.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" TallGrassFeature::TallGrassFeature(int tile, int type) { this->tile = tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.cpp index 0f26410ee..7659ffe22 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.cpp @@ -1,7 +1,15 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" +#include + #include "TreeFeature.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/VineTile.h" +#include "Minecraft.World/x64headers/extraX64.h" TreeFeature::TreeFeature(bool doUpdate) : Feature(doUpdate), diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.h index 3d99e0a0b..7d599a288 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.h @@ -1,6 +1,8 @@ #pragma once #include "Feature.h" +class Level; + class TreeFeature : public Feature { private: const int baseHeight; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/VinesFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/VinesFeature.cpp index 99b41cbe6..6b0d52b87 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/VinesFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/VinesFeature.cpp @@ -1,8 +1,9 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" -#include "../../../../net.minecraft.h" #include "VinesFeature.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" VinesFeature::VinesFeature() {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp index 419936550..f6e8ca718 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp @@ -1,8 +1,8 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../../../../../ConsoleHelpers/StringHelpers.h" -#include "net.minecraft.world.level.levelgen.flat.h" -#include "../../tile/net.minecraft.world.level.tile.h" #include "FlatGeneratorInfo.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" const std::wstring FlatGeneratorInfo::STRUCTURE_VILLAGE = L"village"; const std::wstring FlatGeneratorInfo::STRUCTURE_BIOME_SPECIFIC = L"biome_1"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.h index be90b6ab4..9d7afb9cc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + class FlatLayerInfo; class FlatGeneratorInfo { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp index 756797d8a..fcb85bf4e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp @@ -1,6 +1,5 @@ -#include "../../../../../../Header Files/stdafx.h" - #include "FlatLayerInfo.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" void FlatLayerInfo::_init(int height, int id) { this->height = height; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.h index 01007cce5..dd74925e6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.h @@ -1,5 +1,7 @@ #pragma once +#include + class FlatLayerInfo { private: int height; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp index 2a3e15912..a8919505c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp @@ -1,7 +1,9 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../../../net.minecraft.h" -#include "../../net.minecraft.world.level.h" +#include + #include "BlockGenMethods.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" void BlockGenMethods::generateBox(Level* level, std::vector& blocks, int sx, int sy, int sz, int ex, int ey, int ez, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.h index b9e3fafa5..9ff56429e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.h @@ -1,7 +1,10 @@ #pragma once #include +#include -#include "../../../../../../ConsoleHelpers/ArrayWithLength.h" +#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" + +class Level; class BlockGenMethods { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.cpp index 9822ef066..a353469ee 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.cpp @@ -1,7 +1,14 @@ -#include "../../../../../../Header Files/stdafx.h" +#include +#include +#include +#include + #include "BoundingBox.h" -#include "../../../../Direction.h" +#include "Minecraft.World/net/minecraft/Direction.h" #include "java/JavaMath.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "nbt/IntArrayTag.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" BoundingBox::BoundingBox() { // 4J added initialisers diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h index 07dfbae29..b88ab7593 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../../../../ConsoleHelpers/ArrayWithLength.h" +#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" class BoundingBox { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp index aa922aa05..763bdc3bd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp @@ -1,7 +1,17 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.levelgen.structure.h" -#include "java/JavaMath.h" -#include "../../../../util/Mth.h" + +#include +#include +#include +#include +#include + +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.h" const std::wstring MineShaftFeature::OPTION_CHANCE = L"chance"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.h index 1172f1b5e..6a1f73402 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "StructureFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" class MineShaftFeature : public StructureFeature { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp index b2650d530..6ffa44945 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp @@ -1,13 +1,28 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../../entity/item/net.minecraft.world.entity.item.h" -#include "net.minecraft.world.level.levelgen.structure.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" -#include "../../tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../../../item/net.minecraft.world.item.h" -#include "java/JavaMath.h" -#include "../../../../util/WeighedTreasure.h" +#include +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" #include "MineShaftPieces.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/IntArrayTag.h" +#include "nbt/ListTag.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/world/entity/item/MinecartChest.h" +#include "Minecraft.World/net/minecraft/world/item/CoalItem.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/RailTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" std::vector MineShaftPieces::smallTreasureItems; ; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.h index 40e7bb7f0..f3be51c3f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.h @@ -1,6 +1,15 @@ #pragma once +#include +#include + #include "StructurePiece.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" + +class BoundingBox; +class Random; +class WeighedTreasure; class MineShaftPieces { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.cpp index eadba49dc..4947aa4fe 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.cpp @@ -1,5 +1,12 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.levelgen.structure.h" + +#include + +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h" + +class Level; +class Random; MineShaftStart::MineShaftStart() { // for reflection diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.h index 625b1b1d2..1a2907535 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.h @@ -1,6 +1,10 @@ #pragma once #include "StructureStart.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" + +class Level; +class Random; class MineShaftStart : public StructureStart { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp index 8edcf49b1..87bd2df2f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp @@ -1,11 +1,17 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../biome/Biome.h" +#include +#include + #include "NetherBridgeFeature.h" #include "NetherBridgePieces.h" -#include "../../MobSpawner.h" -#include "../../../entity/monster/net.minecraft.world.entity.monster.h" -#include "../../net.minecraft.world.level.h" -#include "../../dimension/net.minecraft.world.level.dimension.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h" NetherBridgeFeature::NetherBridgeFeature() : StructureFeature() { bridgeEnemies.push_back(new Biome::MobSpawnerData(eTYPE_BLAZE, 10, 2, 3)); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h index 25956a2b9..0169eadf9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h @@ -1,8 +1,18 @@ #pragma once +#include +#include +#include + #include "StructureFeature.h" #include "StructureStart.h" -#include "../../biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" + class Random; +class ChunkPos; +class Level; class NetherBridgeFeature : public StructureFeature { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp index 0b91e947a..45e8d16f3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp @@ -1,14 +1,20 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../../item/net.minecraft.world.item.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" -#include "../../tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../net.minecraft.world.level.levelgen.h" -#include "../../storage/net.minecraft.world.level.storage.h" -#include "net.minecraft.world.level.levelgen.structure.h" -#include "../../../../util/WeighedTreasure.h" +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" #include "NetherBridgePieces.h" -#include "../../../../Direction.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" void NetherBridgePieces::loadStatic() { StructureFeatureIO::setPieceId(eStructurePiece_BridgeCrossing, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.h index 1dfd9b8bf..fd71b507d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.h @@ -1,5 +1,15 @@ #pragma once +#include +#include + #include "StructurePiece.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" + +class BoundingBox; +class Level; +class Random; +class WeighedTreasure; class NetherBridgePieces { private: @@ -54,6 +64,7 @@ private: private: class NetherBridgePiece; + static NetherBridgePiece* findAndCreateBridgePieceFactory( NetherBridgePieces::PieceWeight* piece, std::list* pieces, Random* random, int footX, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp index 2cd240be8..5e6352fc3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp @@ -1,9 +1,17 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../../biome/net.minecraft.world.level.biome.h" -#include "net.minecraft.world.level.levelgen.structure.h" +#include +#include + #include "ScatteredFeaturePieces.h" #include "RandomScatteredLargeFeature.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h" const std::wstring RandomScatteredLargeFeature::OPTION_SPACING = L"distance"; std::vector RandomScatteredLargeFeature::allowedBiomes; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h index 41f07fec0..d9469279d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h @@ -1,7 +1,18 @@ #pragma once +#include +#include +#include +#include + #include "StructureFeature.h" #include "StructureStart.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" + +class Level; +class Random; class RandomScatteredLargeFeature : public StructureFeature { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp index b420daf21..93ef38a83 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp @@ -1,13 +1,34 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../../../net.minecraft.h" -#include "../../../entity/monster/net.minecraft.world.entity.monster.h" -#include "../../../item/net.minecraft.world.item.h" -#include "../../dimension/net.minecraft.world.level.dimension.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" -#include "net.minecraft.world.level.levelgen.structure.h" -#include "../../../../util/WeighedTreasure.h" +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" #include "ScatteredFeaturePieces.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Witch.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LeverTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/StairTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TripWireTile.h" void ScatteredFeaturePieces::loadStatic() { StructureFeatureIO::setPieceId(eStructurePiece_DesertPyramidPiece, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h index 9828f5675..4b5bca9e0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h @@ -1,6 +1,13 @@ #pragma once #include "StructurePiece.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" + +class BoundingBox; +class Level; +class Random; +class WeighedTreasure; class ScatteredFeaturePieces { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp index 29d251a71..850030be1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp @@ -1,9 +1,9 @@ -#include "../../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "SkyIslandDimension.h" -#include "../../net.minecraft.world.level.h" -#include "../../biome/net.minecraft.world.level.biome.h" -#include "../../tile/net.minecraft.world.level.tile.h" -#include "../net.minecraft.world.level.levelgen.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h" void SkyIslandDimension::init() { biomeSource = new FixedBiomeSource(Biome::sky, 0.5f, 0); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp index eff320037..da190638f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp @@ -1,12 +1,28 @@ -#include "../../../../../../Header Files/stdafx.h" +#include +#include +#include +#include +#include +#include + #include "StrongholdFeature.h" #include "StrongholdPieces.h" -#include "../../net.minecraft.world.level.h" -#include "../../biome/net.minecraft.world.level.biome.h" -#include "../../dimension/net.minecraft.world.level.dimension.h" -#include "../../../../util/Mth.h" -#include "../../../../../../ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" #include "java/JavaMath.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h" const std::wstring StrongholdFeature::OPTION_DISTANCE = L"distance"; const std::wstring StrongholdFeature::OPTION_COUNT = L"count"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h index 83847734f..daada0f79 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h @@ -1,11 +1,20 @@ #pragma once -class Biome; +#include +#include +#include + #include "StructureFeature.h" - #include "StructureStart.h" +#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" -#include "../../ChunkPos.h" +class Biome; +class ChunkPos; +class Level; +class Random; +class TilePos; // 4J Stu Added // We can get away with a few more attempts on new-gen consoles diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp index 6a96b9dcc..e0274ede7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp @@ -1,15 +1,32 @@ -#include "../../../../../../Header Files/stdafx.h" +#include +#include +#include +#include + #include "StrongholdPieces.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" -#include "../../tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../../storage/net.minecraft.world.level.storage.h" -#include "../net.minecraft.world.level.levelgen.h" -#include "net.minecraft.world.level.levelgen.structure.h" -#include "../../../item/net.minecraft.world.item.h" -#include "../../../../util/WeighedTreasure.h" -#include "../../../../../../ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" -#include "../../../../Facing.h" +#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/world/item/CoalItem.h" +#include "Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DoorTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" int StrongholdPieces::totalWeight = 0; std::list StrongholdPieces::currentPieces; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.h index 1718d2db6..2715baaf9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.h @@ -1,5 +1,15 @@ #pragma once +#include +#include + #include "StructurePiece.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" + +class BoundingBox; +class Level; +class Random; +class WeighedTreasure; class StrongholdPieces { private: @@ -76,6 +86,7 @@ public: private: class StrongholdPiece; + static bool updatePieceWeight(); static StrongholdPiece* findAndCreatePieceFactory( EPieceClass pieceClass, std::list* pieces, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.cpp index d68807c07..e3e9902cf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.cpp @@ -1,11 +1,22 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "StructureFeature.h" +#include +#include +#include +#include +#include +#include +#include + #include "StructureStart.h" -#include "StructurePiece.h" -#include "../../ChunkPos.h" -#include "BoundingBox.h" -#include "../../net.minecraft.world.level.h" -#include "../../storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelType.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" StructureFeature::StructureFeature() { #ifdef ENABLE_STRUCTURE_SAVING diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h index 16a407cce..8e6245163 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h @@ -1,5 +1,5 @@ #pragma once -#include "../LargeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/LargeFeature.h" #include "StructureFeatureSavedData.h" class StructureStart; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp index f303546d7..cc44e25c9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp @@ -1,6 +1,25 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.levelgen.structure.h" +#include +#include +#include + #include "StructureFeatureIO.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftStart.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgePieces.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.h" + +class Level; std::unordered_map StructureFeatureIO::startIdClassMap; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp index e4b657c20..6075799a3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp @@ -1,6 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" +#include #include "StructureFeatureSavedData.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h" +#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" std::wstring StructureFeatureSavedData::TAG_FEATURES = L"Features"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h index 595e1c5dd..cf645fa0b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h @@ -1,6 +1,6 @@ #pragma once -#include "../../saveddata/SavedData.h" +#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" class StructureFeatureSavedData : public SavedData { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.cpp index 26a3d7777..83196ec77 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.cpp @@ -1,17 +1,30 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.levelgen.structure.h" -#include "../../net.minecraft.world.level.h" -#include "../../tile/net.minecraft.world.level.tile.h" -#include "../../material/net.minecraft.world.level.material.h" -#include "../../tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../../../entity/net.minecraft.world.entity.h" -#include "../../../../util/WeighedTreasure.h" -#include "StructurePiece.h" -#include "BoundingBox.h" -#include "../../../../Direction.h" +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" +#include "Minecraft.World/net/minecraft/Direction.h" #include "java/JavaMath.h" -#include "../../../../Facing.h" -#include "../../../item/DoorItem.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/item/DoorItem.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/IntArrayTag.h" +#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ChestTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" /** * diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h index 28dcc7f89..cf01815ab 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h @@ -1,5 +1,5 @@ #pragma once -#include "../../../../util/WeighedRandom.h" +#include "Minecraft.World/net/minecraft/util/WeighedRandom.h" #include "BoundingBox.h" #include "StructureFeatureIO.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.cpp index 099733c0e..60b670338 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.cpp @@ -1,9 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "net.minecraft.world.level.levelgen.structure.h" +#include + #include "StructureStart.h" -#include "StructurePiece.h" -#include "BoundingBox.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/IntArrayTag.h" +#include "nbt/ListTag.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" StructureStart::StructureStart() { chunkX = chunkZ = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h index e2f9baf56..dbf002908 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h @@ -1,8 +1,14 @@ #pragma once -class StructurePiece; -class BoundingBox; +#include #include "StructureFeatureIO.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" + +class StructurePiece; +class BoundingBox; +class CompoundTag; +class Level; +class Random; class StructureStart { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.cpp index 18303d3a7..5e809a7b2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.cpp @@ -1,9 +1,22 @@ -#include "../../../../../../Header Files/stdafx.h" +#include +#include +#include + #include "VillageFeature.h" #include "VillagePieces.h" -#include "../../net.minecraft.world.level.h" -#include "../../biome/net.minecraft.world.level.biome.h" -#include "../../dimension/net.minecraft.world.level.dimension.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureStart.h" const std::wstring VillageFeature::OPTION_SIZE_MODIFIER = L"size"; const std::wstring VillageFeature::OPTION_SPACING = L"distance"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h index a89bf7ef4..fb99efaf4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h @@ -1,7 +1,16 @@ #pragma once +#include +#include +#include + #include "StructureFeature.h" #include "StructureStart.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" + class Biome; +class Level; +class Random; class VillageFeature : public StructureFeature { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.cpp index b9a0dc586..ad0906eb2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.cpp @@ -1,19 +1,25 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../../../net.minecraft.h" -#include "../../net.minecraft.world.level.h" -#include "../../storage/net.minecraft.world.level.storage.h" -#include "../../tile/net.minecraft.world.level.tile.h" -#include "../net.minecraft.world.level.levelgen.h" -#include "net.minecraft.world.level.levelgen.structure.h" -#include "../../../item/net.minecraft.world.item.h" -#include "../../dimension/net.minecraft.world.level.dimension.h" -#include "../../../entity/npc/net.minecraft.world.entity.npc.h" -#include "../../../../util/WeighedTreasure.h" +#include +#include +#include + +#include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" #include "VillagePieces.h" #include "VillageFeature.h" -#include "../../../../Direction.h" +#include "Minecraft.World/net/minecraft/Direction.h" #include "java/JavaMath.h" -#include "../../biome/BiomeSource.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" std::vector VillagePieces::Smithy::treasureItems; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.h index 4c0f8614b..a2e7ac883 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillagePieces.h @@ -1,7 +1,17 @@ #pragma once +#include +#include +#include + #include "StructurePiece.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" class BiomeSource; +class BoundingBox; +class Level; +class Random; +class WeighedTreasure; class VillagePieces { private: @@ -53,6 +63,7 @@ public: private: class VillagePiece; + static int updatePieceWeight( std::list* currentPieces); // 4J = was array list static VillagePiece* findAndCreatePieceFactory( diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Distort.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Distort.cpp index 5353abe45..75fa3ddd7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Distort.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Distort.cpp @@ -1,5 +1,5 @@ -#include "../../../../../../Header Files/stdafx.h" #include "Distort.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.h" Distort::Distort(Synth* source, Synth* distort) { this->source = source; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Emboss.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Emboss.cpp index c7ef816ec..de4153011 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Emboss.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Emboss.cpp @@ -1,5 +1,5 @@ -#include "../../../../../../Header Files/stdafx.h" #include "Emboss.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.h" Emboss::Emboss(Synth* synth) { this->synth = synth; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/FastNoise.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/FastNoise.cpp index d84909170..d1d73f28c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/FastNoise.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/FastNoise.cpp @@ -1,5 +1,5 @@ -#include "../../../../../../Header Files/stdafx.h" #include "FastNoise.h" +#include "java/Random.h" FastNoise::FastNoise(int levels) { Random random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/FastNoise.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/FastNoise.h index fe8c36621..24505c146 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/FastNoise.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/FastNoise.h @@ -1,5 +1,11 @@ #pragma once +#include +#include +#include + +class Random; + class FastNoise { private: uint8_t** noiseMaps; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp index 6089fa764..d55617739 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp @@ -1,5 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" +#include + #include "ImprovedNoise.h" +#include "java/Random.h" ImprovedNoise::ImprovedNoise() { Random random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/ImprovedNoise.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/ImprovedNoise.h index a012950b5..433efba06 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/ImprovedNoise.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/ImprovedNoise.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "Synth.h" +class Random; + class ImprovedNoise : public Synth { friend class PerlinNoise_SPU; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.cpp index c0adc5f2a..d946c5687 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.cpp @@ -1,6 +1,9 @@ -#include "../../../../../../Header Files/stdafx.h" +#include + #include "PerlinNoise.h" -#include "../../../../util/Mth.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/ImprovedNoise.h" PerlinNoise::PerlinNoise(int levels) { Random random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h index 824400cb2..db1101831 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h @@ -1,7 +1,13 @@ #pragma once +#include +#include + #include "Synth.h" #include "ImprovedNoise.h" +class ImprovedNoise; +class Random; + class PerlinNoise : public Synth { friend class PerlinNoise_SPU; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp index e4a52b62f..e12f7d2ff 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp @@ -1,5 +1,6 @@ -#include "../../../../../../Header Files/stdafx.h" #include "PerlinSimplexNoise.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/SimplexNoise.h" PerlinSimplexNoise::PerlinSimplexNoise(int levels) { Random random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.h index 539c67640..4a0131673 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.h @@ -1,7 +1,13 @@ #pragma once +#include +#include + #include "Synth.h" #include "SimplexNoise.h" +class Random; +class SimplexNoise; + class PerlinSimplexNoise : public Synth { private: SimplexNoise** noiseLevels; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Rotate.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Rotate.cpp index 4490f5268..8cb869c7d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Rotate.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Rotate.cpp @@ -1,5 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" +#include + #include "Rotate.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.h" Rotate::Rotate(Synth* synth, float angle) { this->synth = synth; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Scale.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Scale.cpp index 582536e6a..d23006794 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Scale.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Scale.cpp @@ -1,5 +1,5 @@ -#include "../../../../../../Header Files/stdafx.h" #include "Scale.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.h" Scale::Scale(Synth* synth, double xScale, double yScale) { this->synth = synth; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/SimplexNoise.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/SimplexNoise.cpp index b4b9317ba..c1f298b03 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/SimplexNoise.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/SimplexNoise.cpp @@ -1,5 +1,8 @@ -#include "../../../../../../Header Files/stdafx.h" +#include +#include + #include "SimplexNoise.h" +#include "java/Random.h" int SimplexNoise::grad3[12][3] = { {1, 1, 0}, {-1, 1, 0}, {1, -1, 0}, {-1, -1, 0}, {1, 0, 1}, {-1, 0, 1}, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/SimplexNoise.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/SimplexNoise.h index 6f177174b..d85d4f389 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/SimplexNoise.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/SimplexNoise.h @@ -1,5 +1,9 @@ #pragma once +#include + +class Random; + class SimplexNoise { private: static int grad3[12][3]; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.cpp index 4d1e9867b..1577fb5d7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.cpp @@ -1,4 +1,3 @@ -#include "../../../../../../Header Files/stdafx.h" #include "Synth.h" std::vector Synth::create(int width, int height) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.h index 1e4bc85ad..e0f4bc314 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/synth/Synth.h @@ -1,4 +1,7 @@ #pragma once +#include +#include + class Synth { public: virtual double getValue(double x, double y) = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/material/Material.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/material/Material.cpp index 5b5a63f73..a8a928339 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/material/Material.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/material/Material.cpp @@ -1,10 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" #include "Material.h" #include "DecorationMaterial.h" #include "GasMaterial.h" #include "LiquidMaterial.h" #include "PortalMaterial.h" #include "WebMaterial.h" // 4J added, Java version just does a local alteration when instantiating the Material for webs to get the same thing +#include "Minecraft.World/net/minecraft/world/level/material/MaterialColor.h" Material* Material::air = nullptr; Material* Material::grass = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/material/Material.h b/minecraft/Minecraft.World/net/minecraft/world/level/material/Material.h index 452b4fed2..0630b71d5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/material/Material.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/material/Material.h @@ -2,6 +2,7 @@ #include "MaterialColor.h" class ChunkRebuildData; +class MaterialColor; class Material { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/material/MaterialColor.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/material/MaterialColor.cpp index fcf15b261..dea06c044 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/material/MaterialColor.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/material/MaterialColor.cpp @@ -1,4 +1,3 @@ -#include "../../../../../Header Files/stdafx.h" #include "MaterialColor.h" MaterialColor** MaterialColor::colors; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/material/MaterialColor.h b/minecraft/Minecraft.World/net/minecraft/world/level/material/MaterialColor.h index 213b4744e..79bb7a18d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/material/MaterialColor.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/material/MaterialColor.h @@ -1,5 +1,7 @@ #pragma once +#include "Minecraft.Client/Common/App_enums.h" + class MaterialColor { public: static MaterialColor** colors; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.cpp index 441cf2057..802e56efc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.cpp @@ -1,6 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.newbiome.layer.h" -#include "../../biome/net.minecraft.world.level.biome.h" + +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" AddIslandLayer::AddIslandLayer(int64_t seedMixup, std::shared_ptr parent) : Layer(seedMixup) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.h index 16dd5f833..d289c3716 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Layer.h" class AddIslandLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.cpp index 6840644b9..2ced9668d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.cpp @@ -1,6 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.newbiome.layer.h" -#include "../../biome/net.minecraft.world.level.biome.h" + +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" AddMushroomIslandLayer::AddMushroomIslandLayer(int64_t seedMixup, std::shared_ptr parent) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h index 902d32211..be5f0f539 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h @@ -1,4 +1,7 @@ #pragma once +#include +#include + #include "Layer.h" class AddMushroomIslandLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.cpp index 0927dbf19..435c12ed1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.cpp @@ -1,6 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.newbiome.layer.h" -#include "../../biome/net.minecraft.world.level.biome.h" + +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" AddSnowLayer::AddSnowLayer(int64_t seedMixup, std::shared_ptr parent) : Layer(seedMixup) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.h index 4f2747e78..ec68d1e04 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.h @@ -1,4 +1,7 @@ #pragma once +#include +#include + #include "Layer.h" class AddSnowLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.cpp index 8afda17b9..a310687df 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.cpp @@ -1,8 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../biome/net.minecraft.world.level.biome.h" -#include "net.minecraft.world.level.newbiome.layer.h" -#include "../../net.minecraft.world.level.h" #include "BiomeInitLayer.h" +#include "Minecraft.World/net/minecraft/world/level/LevelType.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" BiomeInitLayer::~BiomeInitLayer() {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.h index 2a335aedf..df665e174 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.h @@ -1,8 +1,13 @@ #pragma once +#include +#include +#include + #include "Layer.h" class LevelType; +class Biome; class BiomeInitLayer : public Layer { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp index d4de95d12..cffbec98d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp @@ -1,8 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../biome/net.minecraft.world.level.biome.h" -#include "net.minecraft.world.level.newbiome.layer.h" -#include "../../net.minecraft.world.level.h" +#include +#include + #include "BiomeOverrideLayer.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" BiomeOverrideLayer::BiomeOverrideLayer(int seedMixup) : Layer(seedMixup) { m_biomeOverride = std::vector(width * height); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h index 8db0586e4..e7133f034 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Layer.h" class LevelType; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallLayer.cpp index 6b6632a04..37fe31d36 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallLayer.cpp @@ -1,6 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../biome/net.minecraft.world.level.biome.h" -#include "net.minecraft.world.level.newbiome.layer.h" + +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" DownfallLayer::DownfallLayer(std::shared_ptr parent) : Layer(0) { this->parent = parent; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallLayer.h index 9eb55aa98..292f7f5fd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallLayer.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "Layer.h" class DownfallLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallMixerLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallMixerLayer.cpp index 51c9875be..63d45c519 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallMixerLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallMixerLayer.cpp @@ -1,6 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../biome/net.minecraft.world.level.biome.h" -#include "net.minecraft.world.level.newbiome.layer.h" + +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallMixerLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" DownfallMixerLayer::DownfallMixerLayer(std::shared_ptr downfall, std::shared_ptr parent, int layer) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallMixerLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallMixerLayer.h index e1a5ec797..7af9a904e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallMixerLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/DownfallMixerLayer.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "Layer.h" class DownfallMixerLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FlatLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FlatLayer.cpp index a96c73222..485e24bd2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FlatLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FlatLayer.cpp @@ -1,5 +1,8 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.newbiome.layer.h" + +#include + +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/FlatLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" FlatLayer::FlatLayer(int val) : Layer(0) { this->val = val; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp index d474108d3..40b1ba46c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp @@ -1,6 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "java/System.h" -#include "net.minecraft.world.level.newbiome.layer.h" + +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" FuzzyZoomLayer::FuzzyZoomLayer(int64_t seedMixup, std::shared_ptr parent) : Layer(seedMixup) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h index 0636cae35..b655c5e2c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Layer.h" class FuzzyZoomLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.cpp index 1f93dbb83..1032ce701 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.cpp @@ -1,6 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.newbiome.layer.h" -#include "../../biome/net.minecraft.world.level.biome.h" + +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" GrowMushroomIslandLayer::GrowMushroomIslandLayer(int64_t seedMixup, std::shared_ptr parent) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h index 95d9052af..a7489f0d0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h @@ -1,4 +1,7 @@ #pragma once +#include +#include + #include "Layer.h" class GrowMushroomIslandLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.cpp index a5cb5788a..006c8671f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.cpp @@ -1,5 +1,9 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.newbiome.layer.h" + +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" IslandLayer::IslandLayer(int64_t seedMixup) : Layer(seedMixup) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.h index 689c66e65..30173c53b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "Layer.h" class IslandLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.cpp index feb70e362..bc7200e24 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.cpp @@ -1,7 +1,29 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.newbiome.layer.h" -#include "../../net.minecraft.world.level.h" +#include +#include +#include + #include "BiomeOverrideLayer.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/level/LevelType.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/AddSnowLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/BiomeInitLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/IslandLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/SwampRiversLayer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.h" std::vector> Layer::getDefaultLayers(int64_t seed, LevelType* levelType) { // 4J - Some changes moved here from 1.2.3. Temperature & downfall layers diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h index 1fee001ab..23ef0d4fb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h @@ -1,6 +1,11 @@ #pragma once -#include "../../../../../../ConsoleHelpers/ArrayWithLength.h" +#include +#include +#include +#include + +#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" class LevelType; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.cpp index 769aed71e..3471de52c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.cpp @@ -1,6 +1,8 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../biome/net.minecraft.world.level.biome.h" +#include + #include "RegionHillsLayer.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" RegionHillsLayer::RegionHillsLayer(int64_t seed, std::shared_ptr parent) : Layer(seed) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.h index 58416459b..076d1cad1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RegionHillsLayer.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Layer.h" class RegionHillsLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.cpp index 8d2139cdf..15043bfc5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.cpp @@ -1,5 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.newbiome.layer.h" + +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.h" RiverInitLayer::RiverInitLayer(int64_t seed, std::shared_ptr parent) : Layer(seed) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.h index 4c15a4ac3..4e8def837 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverInitLayer.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Layer.h" class RiverInitLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.cpp index 2434a45e2..d81aac2ea 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.cpp @@ -1,6 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../biome/net.minecraft.world.level.biome.h" -#include "net.minecraft.world.level.newbiome.layer.h" + +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.h" RiverLayer::RiverLayer(int64_t seedMixup, std::shared_ptr parent) : Layer(seedMixup) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.h index 0fad7c474..f4aed11bc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverLayer.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Layer.h" class RiverLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp index 1da83289b..0b4edb586 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp @@ -1,6 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../biome/net.minecraft.world.level.biome.h" -#include "net.minecraft.world.level.newbiome.layer.h" + +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.h" RiverMixerLayer::RiverMixerLayer(int64_t seed, std::shared_ptr biomes, std::shared_ptr rivers) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.h index 6152fd1e0..b972fc322 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/RiverMixerLayer.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Layer.h" class RiverMixerLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.cpp index 50438d20e..7f06e22c4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.cpp @@ -1,6 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.newbiome.layer.h" -#include "../../biome/net.minecraft.world.level.biome.h" + +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.h" ShoreLayer::ShoreLayer(int64_t seed, std::shared_ptr parent) : Layer(seed) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.h index 1ca7c6159..df1e1dc8c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ShoreLayer.h @@ -1,4 +1,7 @@ #pragma once +#include +#include + #include "Layer.h" class ShoreLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.cpp index 0931c62a1..8463eba85 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.cpp @@ -1,5 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.newbiome.layer.h" + +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.h" SmoothLayer::SmoothLayer(int64_t seedMixup, std::shared_ptr parent) : Layer(seedMixup) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.h index e74ab5fad..7dc2974e1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothLayer.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Layer.h" class SmoothLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp index c8c719bff..50c220988 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp @@ -1,6 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.newbiome.layer.h" -#include "java/System.h" + +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.h" SmoothZoomLayer::SmoothZoomLayer(int64_t seedMixup, std::shared_ptr parent) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.h index 154010207..e6ddf6073 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Layer.h" class SmoothZoomLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SwampRiversLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SwampRiversLayer.cpp index c14d9393a..b1ff030e5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SwampRiversLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SwampRiversLayer.cpp @@ -1,6 +1,8 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../biome/net.minecraft.world.level.biome.h" +#include + #include "SwampRiversLayer.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" SwampRiversLayer::SwampRiversLayer(int64_t seed, std::shared_ptr parent) : Layer(seed) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SwampRiversLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SwampRiversLayer.h index 8dff449bf..1051f997b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SwampRiversLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SwampRiversLayer.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Layer.h" class SwampRiversLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureLayer.cpp index 20f95a1f8..6dd064f78 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureLayer.cpp @@ -1,6 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../biome/net.minecraft.world.level.biome.h" -#include "net.minecraft.world.level.newbiome.layer.h" + +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureLayer.h" TemperatureLayer::TemperatureLayer(std::shared_ptr parent) : Layer(0) { this->parent = parent; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureLayer.h index f0d7cf45c..fe1429d1e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureLayer.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "Layer.h" class TemperatureLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.cpp index 0c180ebe5..1a3726545 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.cpp @@ -1,6 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../biome/net.minecraft.world.level.biome.h" -#include "net.minecraft.world.level.newbiome.layer.h" + +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.h" TemperatureMixerLayer::TemperatureMixerLayer(std::shared_ptr temp, std::shared_ptr parent, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.h index 3eb67481e..cff25ff9e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "Layer.h" class TemperatureMixerLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp index f84be32c2..8401d8961 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp @@ -1,6 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.newbiome.layer.h" -#include "java/System.h" + +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.h" VoronoiZoom::VoronoiZoom(int64_t seedMixup, std::shared_ptr parent) : Layer(seedMixup) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.h index a7d6322cf..138aa3d9d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/VoronoiZoom.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Layer.h" class VoronoiZoom : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.cpp index 9fe2d02e2..1930e6cee 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.cpp @@ -1,6 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.level.newbiome.layer.h" -#include "java/System.h" + +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h" +#include "Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.h" ZoomLayer::ZoomLayer(int64_t seedMixup, std::shared_ptr parent) : Layer(seedMixup) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.h index 3bf3518f1..9503533c4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Layer.h" class ZoomLayer : public Layer { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/BinaryHeap.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/BinaryHeap.cpp index 13ad2adab..16a94a60e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/BinaryHeap.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/BinaryHeap.cpp @@ -1,9 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" -#include "Node.h" -#include "java/System.h" -#include "BinaryHeap.h" - #include +#include + +#include "Node.h" +#include "BinaryHeap.h" // 4J Jev, add common ctor code. void BinaryHeap::_init() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/BinaryHeap.h b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/BinaryHeap.h index 726250b0e..f0cb3c94b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/BinaryHeap.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/BinaryHeap.h @@ -1,9 +1,13 @@ #pragma once -#include "../../../../../Header Files/stdafx.h" +#include + +#include "Minecraft.World/Header Files/stdafx.h" #include "Node.h" #include "java/System.h" +class Node; + class BinaryHeap { private: std::vector heap; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.cpp index a7f5f643f..c69a9c7e2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.cpp @@ -1,9 +1,13 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "net.minecraft.world.level.pathfinder.h" // 4J - added for common ctor code // Do all the default initialisations done in the java class +#include +#include + +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/pathfinder/Node.h" + void Node::_init() { heapIdx = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.h b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.h index 23ebda360..a419393d1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.h @@ -1,5 +1,9 @@ #pragma once +#include + +#include "java/Class.h" + class Node { // 4J Jev, these classes were accessing protected members. friend class BinaryHeap; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Path.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Path.cpp index 6498e125f..82a279d3d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Path.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Path.cpp @@ -1,7 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "net.minecraft.world.level.pathfinder.h" +#include + #include "Path.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" Path::~Path() { for (size_t i = 0; i < nodes.size(); i++) delete nodes[i]; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Path.h b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Path.h index fc458f9e1..261ba6d5b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Path.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Path.h @@ -1,5 +1,14 @@ #pragma once +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/pathfinder/Node.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" + +class Entity; + class Path { friend class PathFinder; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/PathFinder.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/PathFinder.cpp index 7711314c3..0dd6c9a33 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/PathFinder.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/PathFinder.cpp @@ -1,13 +1,18 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "../net.minecraft.world.level.h" -#include "../material/net.minecraft.world.level.material.h" -#include "../tile/net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" +#include +#include +#include + #include "BinaryHeap.h" #include "Node.h" #include "Path.h" #include "PathFinder.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" PathFinder::PathFinder(LevelSource* level, bool canPassDoors, bool canOpenDoors, bool avoidWater, bool canFloat) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/PathFinder.h b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/PathFinder.h index 337d99007..f2cde8633 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/PathFinder.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/PathFinder.h @@ -1,7 +1,14 @@ #pragma once +#include +#include + #include "java/JavaIntHash.h" +#include "Minecraft.World/net/minecraft/world/level/pathfinder/BinaryHeap.h" class LevelSource; +class Entity; +class Node; +class Path; class PathFinder { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/redstone/Redstone.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/redstone/Redstone.cpp index cc071871c..24d4588da 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/redstone/Redstone.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/redstone/Redstone.cpp @@ -1,5 +1,3 @@ -#include "../../../../../Header Files/stdafx.h" - #include "Redstone.h" // 4J-JEV: Because whiny Ps4 compiler. diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.cpp index ddfa5ab73..029b24b83 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.cpp @@ -1,14 +1,18 @@ -#include "../../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../../item/net.minecraft.world.item.h" +#include +#include +#include + #include "MapItemSavedData.h" #include "Minecraft.Client/net/minecraft/server/PlayerList.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" -#include "../net.minecraft.world.level.h" -#include "../storage/net.minecraft.world.level.storage.h" -#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/entity/ItemFrame.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/MapItem.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" const int MapItemSavedData::END_PORTAL_DECORATION_KEY = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h b/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h index 59b1a7163..fe1d6087f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h @@ -1,7 +1,18 @@ #pragma once -#include "../../entity/player/Player.h" +#include +#include +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" #include "SavedData.h" +#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" + +class ItemInstance; +class Level; class MapItemSavedData : public SavedData { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/SavedData.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/SavedData.cpp index b31b0be7e..bab4ec669 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/SavedData.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/SavedData.cpp @@ -1,5 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" + +#include + #include "SavedData.h" +#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" SavedData::SavedData(const std::wstring& id) : id(id) { dirty = false; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DerivedLevelData.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DerivedLevelData.cpp index e89e4acf3..2a5d1566f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DerivedLevelData.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DerivedLevelData.cpp @@ -1,6 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" - #include "DerivedLevelData.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" + +class CompoundTag; +class Player; DerivedLevelData::DerivedLevelData(LevelData* wrapped) { this->wrapped = wrapped; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DerivedLevelData.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DerivedLevelData.h index d6c5838af..80ded27d8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DerivedLevelData.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DerivedLevelData.h @@ -1,8 +1,15 @@ #pragma once +#include +#include +#include +#include + #include "LevelData.h" class GameRules; +class CompoundTag; +class Player; class DerivedLevelData : public LevelData { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp index 261242e07..e55591dfa 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp @@ -1,16 +1,44 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include +#include +#include +#include +#include +#include + #include "java/System.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../net.minecraft.world.level.h" -#include "../chunk/storage/net.minecraft.world.level.chunk.storage.h" -#include "../dimension/net.minecraft.world.level.dimension.h" -#include "nbt/com.mojang.nbt.h" #include "java/File.h" #include "java/InputOutputStream/DataInputStream.h" -#include "java/InputOutputStream/FileInputStream.h" #include "LevelData.h" #include "DirectoryLevelStorage.h" -#include "../../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileIO.h" +#include "4J_Profile.h" +#include "4J_Storage.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/ByteArrayOutputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "java/InputOutputStream/FileOutputStream.h" +#include "nbt/CompoundTag.h" +#include "nbt/DoubleTag.h" +#include "nbt/ListTag.h" +#include "nbt/NbtIo.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/HellDimension.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h" +#include "Minecraft.World/net/minecraft/world/level/storage/PlayerIO.h" +#include "Minecraft.World/x64headers/extraX64.h" const std::wstring DirectoryLevelStorage::sc_szPlayerDir(L"players/"); @@ -176,9 +204,6 @@ DirectoryLevelStorage::~DirectoryLevelStorage() { ++it) { delete it->second; } - -#if defined(_LARGE_WORLDS) -#endif } void DirectoryLevelStorage::initiateSession() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h index dd5c3691b..300f83db7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h @@ -25,12 +25,21 @@ // The save file version in which we added the End dimension map mappings #define END_DIMENSION_MAP_MAPPINGS_SAVE_VERSION 5 +#include +#include +#include +#include + #include "java/File.h" #include "LevelStorage.h" #include "PlayerIO.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "4J.Common/4J_Compat.h" -#include "../../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" class ConsoleSaveFile; +class ByteArrayOutputStream; +class DataInputStream; +class DataOutputStream; // 4J Stu - Added this which we will write out as a file. Map id's are stored in // itemInstances as the auxValue, so we can have at most 65536 maps. As we diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp index f87295b54..e993b3a74 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp @@ -1,15 +1,17 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include + #include "java/File.h" #include "LevelData.h" -#include "LevelSummary.h" -#include "nbt/com.mojang.nbt.h" #include "DirectoryLevelStorage.h" #include "DirectoryLevelStorageSource.h" - -#include "../../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileIO.h" -#include "../../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h" - -class LevelStorage; +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "nbt/CompoundTag.h" +#include "nbt/NbtIo.h" DirectoryLevelStorageSource::DirectoryLevelStorageSource(const File dir) : baseDir(dir) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.h index 7b97630dc..4c4deecad 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "LevelStorageSource.h" #include "java/File.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.cpp index 36d6cb29a..f70cc1bc5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.cpp @@ -1,10 +1,17 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include +#include + #include "java/System.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "nbt/com.mojang.nbt.h" #include "LevelData.h" -#include "../LevelType.h" -#include "../LevelSettings.h" +#include "Minecraft.World/net/minecraft/world/level/LevelType.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" +#include "Minecraft.Client/Common/App_Defines.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/level/GameRules.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" LevelData::LevelData() {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.h index ff11166f3..78ae54a83 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.h @@ -1,6 +1,11 @@ #pragma once -#include "../GameRules.h" +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/GameRules.h" class Player; class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.cpp index 3e494ac9d..5e5996da5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.cpp @@ -1,5 +1,3 @@ -#include "../../../../../Header Files/stdafx.h" - #include "LevelStorage.h" const std::wstring LevelStorage::NETHER_FOLDER = L"DIM-1"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h index bfbe31fc7..43d562b2a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h @@ -1,6 +1,11 @@ #pragma once -#include "../../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" +#include +#include +#include + +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "4J.Common/4J_Compat.h" class PlayerIO; class Dimension; @@ -8,7 +13,6 @@ class ChunkStorage; class LevelData; class Player; class File; - class ConsoleSaveFile; class LevelStorage { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp index d0e11ff52..8430a5a58 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp @@ -1,11 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../net.minecraft.world.level.h" -#include "../chunk/storage/net.minecraft.world.level.chunk.storage.h" -#include "../dimension/net.minecraft.world.level.dimension.h" #include "LevelStorageProfilerDecorator.h" - -#include "../../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileIO.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h" LevelStorageProfilerDecorator::LevelStorageProfilerDecorator( LevelStorage* capsulated) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.h index 7eb76a3f6..3f6ddb2d4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "LevelStorage.h" class ConsoleSaveFile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.h index a42b80590..fa330bc72 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" class LevelSummary; class ProgressListener; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelSummary.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelSummary.cpp index a4deabdeb..24547f044 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelSummary.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelSummary.cpp @@ -1,4 +1,3 @@ -#include "../../../../../Header Files/stdafx.h" #include "LevelSummary.h" LevelSummary::LevelSummary(const std::wstring& levelId, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelSummary.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelSummary.h index 05a1daf8b..89dafa817 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelSummary.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelSummary.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + class GameType; class LevelSummary { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.cpp index efbe4cfd2..ee22cf277 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.cpp @@ -1,11 +1,20 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../chunk/storage/net.minecraft.world.level.chunk.storage.h" -#include "../dimension/net.minecraft.world.level.dimension.h" -#include "../../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileIO.h" +#include +#include +#include + #include "LevelData.h" #include "java/File.h" #include "McRegionLevelStorage.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/HellDimension.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.h" +#include "Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h" McRegionLevelStorage::McRegionLevelStorage(ConsoleSaveFile* saveFile, File dir, const std::wstring& levelName, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.h index 9ba264ff5..7f9efd429 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "DirectoryLevelStorage.h" +#include "java/File.h" + +class ConsoleSaveFile; class McRegionLevelStorage : public DirectoryLevelStorage { // private static final Logger logger = Logger.getLogger("Minecraft"); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorageSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorageSource.cpp index f2a18db4b..809e57464 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorageSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorageSource.cpp @@ -1,15 +1,13 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include + #include "java/JavaMath.h" -#include "../../../util/ProgressListener.h" -#include "../chunk/storage/net.minecraft.world.level.chunk.storage.h" -#include "../chunk/net.minecraft.world.level.chunk.h" -#include "LevelSummary.h" +#include "Minecraft.World/net/minecraft/util/ProgressListener.h" #include "McRegionLevelStorage.h" #include "java/File.h" #include "LevelData.h" #include "McRegionLevelStorageSource.h" - -#include "../../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileIO.h" +#include "Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.h" McRegionLevelStorageSource::McRegionLevelStorageSource(File dir) : DirectoryLevelStorageSource(dir) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorageSource.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorageSource.h index 37a05473e..8bf6566b2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorageSource.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorageSource.h @@ -1,8 +1,13 @@ #pragma once +#include +#include +#include + #include "DirectoryLevelStorageSource.h" #include "java/FileFilter.h" #include "java/FilenameFilter.h" +#include "java/File.h" class ProgressListener; class LevelStorage; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.cpp index 52542e55f..75a171ecf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.cpp @@ -1,12 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../net.minecraft.world.level.h" -#include "../chunk/storage/net.minecraft.world.level.chunk.storage.h" -#include "../dimension/net.minecraft.world.level.dimension.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" #include "nbt/com.mojang.nbt.h" #include "MemoryLevelStorage.h" -#include "../../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileIO.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileIO.h" MemoryLevelStorage::MemoryLevelStorage() {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.h index a2ae75edf..ac944f957 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.h @@ -3,14 +3,14 @@ #include "LevelStorage.h" #include "PlayerIO.h" -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../net.minecraft.world.level.h" -#include "../chunk/storage/net.minecraft.world.level.chunk.storage.h" -#include "../dimension/net.minecraft.world.level.dimension.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" #include "nbt/com.mojang.nbt.h" -#include "../../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" class MemoryLevelStorage : public LevelStorage, public PlayerIO { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorageSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorageSource.cpp index 0c1f48ac5..22be8b0a1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorageSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorageSource.cpp @@ -1,5 +1,5 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../chunk/storage/net.minecraft.world.level.chunk.storage.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" #include "MemoryLevelStorage.h" #include "LevelSummary.h" #include "MemoryLevelStorageSource.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.cpp index 403f3a2bc..25e48cfd9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.cpp @@ -1,11 +1,5 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../net.minecraft.world.level.h" -#include "../chunk/storage/net.minecraft.world.level.chunk.storage.h" -#include "../dimension/net.minecraft.world.level.dimension.h" #include "MockedLevelStorage.h" - -#include "../../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileIO.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" LevelData* MockedLevelStorage::prepareLevel() { return nullptr; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.h index 4e44b3fd8..694ffcf9f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.h @@ -1,8 +1,9 @@ #pragma once -#include "LevelStorage.h" +#include -#include "../../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "LevelStorage.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" class MockedLevelStorage : public LevelStorage { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.cpp index 395906dd4..9e3096669 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.cpp @@ -1,12 +1,24 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../saveddata/net.minecraft.world.level.saveddata.h" -#include "net.minecraft.world.level.storage.h" -#include "../../entity/ai/village/net.minecraft.world.entity.ai.village.h" -#include "nbt/com.mojang.nbt.h" -#include "java/File.h" -#include "SavedDataStorage.h" +#include +#include +#include -#include "../../../../../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileIO.h" +#include "SavedDataStorage.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" +#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "nbt/CompoundTag.h" +#include "nbt/NbtIo.h" +#include "nbt/ShortTag.h" +#include "nbt/Tag.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/village/Villages.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h" +#include "Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h" +#include "Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h" SavedDataStorage::SavedDataStorage(LevelStorage* levelStorage) { /* diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.h index cbb87f8b2..6a9569af1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.h @@ -1,7 +1,17 @@ #pragma once +#include +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" + class ConsoleSaveFile; -#include "../saveddata/SavedData.h" +class LevelStorage; class SavedDataStorage { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/AirTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/AirTile.cpp index ff10c8b82..f56d45a53 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/AirTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/AirTile.cpp @@ -1,4 +1,5 @@ -#include "../../../../../Header Files/stdafx.h" #include "AirTile.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" AirTile::AirTile(int id) : Tile(id, Material::air) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/AirTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/AirTile.h index a628bfbf7..4c44b95a0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/AirTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/AirTile.h @@ -1,6 +1,6 @@ #pragma once #include "Tile.h" -#include "../material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" class AirTile : public Tile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/AnvilTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/AnvilTile.cpp index 04dd3d24b..7672b4e7c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/AnvilTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/AnvilTile.cpp @@ -1,10 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" -#include "../net.minecraft.world.level.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "net.minecraft.world.level.tile.h" -#include "../../net.minecraft.world.h" -#include "../../../net.minecraft.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/net.minecraft.h" #include "AnvilTile.h" const unsigned int AnvilTile::ANVIL_NAMES[ANVIL_NAMES_LENGTH] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.cpp index 3fcc70c67..6ae9fc338 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.cpp @@ -1,8 +1,11 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "entity/TileEntity.h" +#include + +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" #include "BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Material; BaseEntityTile::BaseEntityTile(int id, Material* material, bool isSolidRender /*= true*/) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h index e8fe9a49b..9da7dd0fb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h @@ -3,6 +3,7 @@ #include "EntityTile.h" class TileEntity; +class Material; class BaseEntityTile : public Tile, public EntityTile { protected: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.cpp index 8e5571c84..be46ebe62 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.cpp @@ -1,13 +1,16 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../redstone/net.minecraft.world.level.redstone.h" -#include "net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../../net.minecraft.h" -#include "../../net.minecraft.world.h" -#include "BasePressurePlateTile.h" #include -#include "../../phys/AABB.h" + +#include "BasePressurePlateTile.h" +#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/FenceTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" BasePressurePlateTile::BasePressurePlateTile(int id, const std::wstring& tex, Material* material) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.h index 254f72e1d..4688462fe 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.h @@ -1,6 +1,13 @@ #pragma once +#include +#include + #include "Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Level; +class Material; class BasePressurePlateTile : public Tile { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.cpp index 9a46020cb..dc4221764 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.cpp @@ -1,10 +1,14 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../net.minecraft.world.level.h" -#include "../../net.minecraft.world.h" -#include "BaseRailTile.h" #include +#include "BaseRailTile.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + BaseRailTile::Rail::Rail(Level* level, int x, int y, int z) { this->level = level; this->x = x; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h index d0527a1ce..45725d833 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h @@ -1,11 +1,17 @@ #pragma once +#include +#include + #include "Tile.h" -#include "../TilePos.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" class Random; class HitResult; class ChunkRebuildData; +class Icon; +class Level; +class TilePos; class BaseRailTile : public Tile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BeaconTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BeaconTile.cpp index 237c00ab7..d7c22f051 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BeaconTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BeaconTile.cpp @@ -1,8 +1,13 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../net.minecraft.world.level.h" -#include "entity/net.minecraft.world.level.tile.entity.h" +#include +#include + #include "BeaconTile.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" BeaconTile::BeaconTile(int id) : BaseEntityTile(id, Material::glass, false) { setDestroyTime(3.0f); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BedTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BedTile.cpp index 50cc4e900..8c90ff456 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BedTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BedTile.cpp @@ -1,10 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../dimension/Dimension.h" -#include "../../../net.minecraft.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.level.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "BedTile.h" int BedTile::HEAD_DIRECTION_OFFSETS[4][2] = {{0, 1}, {-1, 0}, {0, -1}, {1, 0}}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BookshelfTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BookshelfTile.cpp index ebeeab986..016ed46b7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BookshelfTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BookshelfTile.cpp @@ -1,7 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" #include "BookshelfTile.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../../net.minecraft.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" BookshelfTile::BookshelfTile(int id) : Tile(id, Material::wood) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BookshelfTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BookshelfTile.h index 969ae8a83..5091864f4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BookshelfTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BookshelfTile.h @@ -1,6 +1,6 @@ #pragma once #include "Tile.h" -#include "../material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp index 2dd6e1c48..87a0050f0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp @@ -1,11 +1,24 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include + #include "BrewingStandTile.h" -#include "entity/BrewingStandTileEntity.h" -#include "../net.minecraft.world.level.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" -#include "../../net.minecraft.world.h" -#include "../../inventory/net.minecraft.world.inventory.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" + +class Icon; BrewingStandTile::BrewingStandTile(int id) : BaseEntityTile(id, Material::metal, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.h index 418593057..3cb606a51 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.h @@ -3,6 +3,8 @@ class IconRegister; class ChunkRebuildData; +class Icon; +class Random; class BrewingStandTile : public BaseEntityTile { friend ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.cpp index fd625b758..e213d3577 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.cpp @@ -1,12 +1,19 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/projectile/net.minecraft.world.entity.projectile.h" -#include "../net.minecraft.world.level.h" -#include "../redstone/net.minecraft.world.level.redstone.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../../net.minecraft.h" -#include "ButtonTile.h" #include -#include "../../../../../Header Files/SoundTypes.h" +#include +#include + +#include "ButtonTile.h" +#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Entity; ButtonTile::ButtonTile(int id, bool sensitive) : Tile(id, Material::decoration, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.h index 7ab9b2819..3f2530c3d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.h @@ -1,6 +1,8 @@ #pragma once +#include + #include "Tile.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" class Player; class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.cpp index 9950a3489..a2110f011 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.cpp @@ -1,12 +1,16 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../material/net.minecraft.world.level.material.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../damageSource/net.minecraft.world.damagesource.h" -#include "../../../net.minecraft.h" -#include "../../net.minecraft.world.h" +#include +#include +#include + #include "CactusTile.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" CactusTile::CactusTile(int id) : Tile(id, Material::cactus, false) { setTicking(true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.h index b2df17eff..3525c34de 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.h @@ -1,11 +1,12 @@ #pragma once #include "Tile.h" -#include "../material/Material.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" class Random; class Level; class ChunkRebuildData; +class Icon; class CactusTile : public Tile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.cpp index a3464c3d9..47a4b0905 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.cpp @@ -1,12 +1,18 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../../food/net.minecraft.world.food.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../net.minecraft.world.h" -#include "../../../net.minecraft.h" +#include +#include + #include "CakeTile.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/food/FoodConstants.h" +#include "Minecraft.World/net/minecraft/world/food/FoodData.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" CakeTile::CakeTile(int id) : Tile(id, Material::cake, false) { setTicking(true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.h index 3932cc847..c12a1b248 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.h @@ -1,12 +1,15 @@ #pragma once +#include + #include "Tile.h" -#include "../material/Material.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" class Player; class Random; class Level; class ChunkRebuildData; +class Icon; class CakeTile : public Tile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.cpp index 3f7e71e9b..bab472dc2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.cpp @@ -1,7 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.h" -#include "../../item/net.minecraft.world.item.h" +#include + #include "CarrotTile.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/tile/CropTile.h" CarrotTile::CarrotTile(int id) : CropTile(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.h index 4fa96b732..4415d3348 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.h @@ -2,6 +2,8 @@ #include "CropTile.h" +class Icon; + class CarrotTile : public CropTile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CauldronTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CauldronTile.cpp index 71f07c622..e204fa473 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CauldronTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CauldronTile.cpp @@ -1,12 +1,24 @@ -#include "../../../../../Header Files/stdafx.h" +#include + #include "CauldronTile.h" -#include "../../../Facing.h" -#include "../net.minecraft.world.level.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/PotionItem.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Icon; const std::wstring CauldronTile::TEXTURE_INSIDE = L"cauldron_inner"; const std::wstring CauldronTile::TEXTURE_BOTTOM = L"cauldron_bottom"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CauldronTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CauldronTile.h index 43ca060e8..4af09747b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CauldronTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CauldronTile.h @@ -1,7 +1,10 @@ #pragma once +#include + #include "Tile.h" class IconRegister; +class Icon; class CauldronTile : public Tile { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.cpp index df6a70845..a6dbd9393 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.cpp @@ -1,15 +1,15 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.h" -#include "../net.minecraft.world.level.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" -#include "../../entity/animal/net.minecraft.world.entity.animal.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../../item/net.minecraft.world.item.h" -#include "../redstone/net.minecraft.world.level.redstone.h" -#include "entity/net.minecraft.world.level.tile.entity.h" -#include "../../phys/net.minecraft.world.phys.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/net.minecraft.world.level.redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" #include "ChestTile.h" -#include "../../../Facing.h" +#include "Minecraft.World/net/minecraft/Facing.h" ChestTile::ChestTile(int id, int type) : BaseEntityTile(id, Material::wood, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.h index f9b998fb2..a25502287 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.h @@ -1,6 +1,6 @@ #pragma once #include "BaseEntityTile.h" -#include "../material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" class Player; class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ClayTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ClayTile.cpp index c2a6ff020..a98ab9a4a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ClayTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ClayTile.cpp @@ -1,6 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" #include "ClayTile.h" -#include "../../item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" ClayTile::ClayTile(int id) : Tile(id, Material::clay) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ClayTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ClayTile.h index 83855f0c6..21646d567 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ClayTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ClayTile.h @@ -1,6 +1,6 @@ #pragma once #include "Tile.h" -#include "../material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.cpp index 2ab3a4081..dcd8ea980 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.cpp @@ -1,11 +1,23 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.level.h" -#include "net.minecraft.world.level.tile.h" -#include "../../net.minecraft.world.h" -#include "../../../net.minecraft.h" +#include + #include "CocoaTile.h" -#include "../../phys/AABB.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Icon; const std::wstring CocoaTile::TEXTURE_AGES[] = {L"cocoa_0", L"cocoa_1", L"cocoa_2"}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.h index ff8c02c6f..e6665261d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.h @@ -1,6 +1,12 @@ #pragma once +#include +#include + #include "DirectionalTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Icon; class CocoaTile : public DirectionalTile { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ColoredTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ColoredTile.cpp index 506a9d99f..18b875712 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ColoredTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ColoredTile.cpp @@ -1,7 +1,11 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.h" -#include "../../item/net.minecraft.world.item.h" +#include + #include "ColoredTile.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Material; ColoredTile::ColoredTile(int id, Material* material) : Tile(id, material) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ColoredTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ColoredTile.h index 3f7e14dce..bf6f14e82 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ColoredTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ColoredTile.h @@ -2,6 +2,9 @@ #include "Tile.h" +class Icon; +class Material; + class ColoredTile : public Tile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CommandBlock.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CommandBlock.cpp index e3bf2f200..762d7747c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CommandBlock.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CommandBlock.cpp @@ -1,8 +1,16 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../redstone/net.minecraft.world.level.redstone.h" -#include "entity/net.minecraft.world.level.tile.entity.h" +#include +#include + #include "CommandBlock.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" CommandBlock::CommandBlock(int id) : BaseEntityTile(id, Material::metal, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.cpp index 7958c2388..b5b3524ed 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.cpp @@ -1,11 +1,20 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.level.h" -#include "../redstone/net.minecraft.world.level.redstone.h" -#include "net.minecraft.world.level.tile.h" -#include "entity/net.minecraft.world.level.tile.entity.h" -#include "../../../net.minecraft.h" +#include + #include "ComparatorTile.h" +#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DiodeTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" + +class Random; ComparatorTile::ComparatorTile(int id, bool on) : DiodeTile(id, on) { _isEntityTile = true; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.h index 135b71a47..bfa9d796f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.h @@ -1,9 +1,14 @@ #pragma once +#include + #include "DiodeTile.h" #include "EntityTile.h" class ComparatorTileEntity; +class Level; +class LevelSource; +class Random; class ComparatorTile : public DiodeTile, public EntityTile { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CoralTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CoralTile.cpp index 2277ebf79..9a9c935be 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CoralTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CoralTile.cpp @@ -1,5 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" +#include + #include "CoralTile.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.h" CoralTile::CoralTile(int id) : HalfTransparentTile(id, L"coral", Material::coral, true) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CoralTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CoralTile.h index 7e965bda8..8aea08ee0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CoralTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CoralTile.h @@ -1,6 +1,6 @@ #pragma once #include "HalfTransparentTile.h" -#include "../material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" class CoralTile : public HalfTransparentTile { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.cpp index 727dffc13..c9235eb3c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.cpp @@ -1,9 +1,17 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../net.minecraft.world.h" +#include +#include + #include "CropTile.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Icon; CropTile::CropTile(int id) : Bush(id) { setTicking(true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.h index 61e83513c..831ac6bc5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.h @@ -1,10 +1,11 @@ #pragma once #include "PlantTile.h" -#include "../material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" class Random; class Level; class ChunkRebuildData; +class Icon; class CropTile : public Bush { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.cpp index f46f97053..545cf5700 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.cpp @@ -1,12 +1,19 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.h" -#include "../dimension/net.minecraft.world.level.dimension.h" -#include "../net.minecraft.world.level.h" -#include "../redstone/net.minecraft.world.level.redstone.h" -#include "entity/net.minecraft.world.level.tile.entity.h" -#include "../../net.minecraft.world.h" +#include +#include +#include + #include "java/JavaMath.h" #include "DaylightDetectorTile.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h" DaylightDetectorTile::DaylightDetectorTile(int id) : BaseEntityTile(id, Material::wood, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.h index a602abd36..3728cd0f9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.h @@ -1,7 +1,12 @@ #pragma once +#include + #include "BaseEntityTile.h" +class Icon; +class Level; + class DaylightDetectorTile : public BaseEntityTile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DeadBushTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DeadBushTile.cpp index 9f2ae079c..859ab3795 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DeadBushTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DeadBushTile.cpp @@ -1,9 +1,14 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../stats/net.minecraft.stats.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.level.h" +#include + #include "DeadBushTile.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" DeadBushTile::DeadBushTile(int id) : Bush(id, Material::replaceable_plant) { updateDefaultShape(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DetectorRailTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DetectorRailTile.cpp index ad13b3944..632b1a0c1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DetectorRailTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DetectorRailTile.cpp @@ -1,13 +1,24 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../inventory/net.minecraft.world.inventory.h" -#include "../net.minecraft.world.level.h" -#include "../redstone/net.minecraft.world.level.redstone.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../net.minecraft.world.h" +#include +#include +#include +#include + #include "DetectorRailTile.h" -#include "../../../net.minecraft.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/EntitySelector.h" +#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Icon; DetectorRailTile::DetectorRailTile(int id) : BaseRailTile(id, true) { setTicking(true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DetectorRailTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DetectorRailTile.h index 11836b29d..b53828ea4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DetectorRailTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DetectorRailTile.h @@ -5,6 +5,7 @@ class Entity; class Random; class Level; class ChunkRebuildData; +class Icon; class DetectorRailTile : public BaseRailTile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DiodeTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DiodeTile.cpp index 474608bdf..fa2f6baa6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DiodeTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DiodeTile.cpp @@ -1,12 +1,20 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.h" -#include "../redstone/net.minecraft.world.level.redstone.h" -#include "../net.minecraft.world.level.h" -#include "net.minecraft.world.level.tile.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "../../net.minecraft.world.h" +#include +#include + #include "DiodeTile.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" DiodeTile::DiodeTile(int id, bool on) : DirectionalTile(id, Material::decoration, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DiodeTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DiodeTile.h index 733d62b4e..1181d7842 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DiodeTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DiodeTile.h @@ -4,6 +4,7 @@ class Player; class Random; class Level; +class LevelSource; class DiodeTile : public DirectionalTile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.cpp index fc5a8e1c1..1115ba8ef 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.cpp @@ -1,6 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" - #include "DirectionalTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Material; DirectionalTile::DirectionalTile(int id, Material* material, bool isSolidRender) : Tile(id, material, isSolidRender) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h index 1132f4fc6..eb6309b0b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h @@ -2,6 +2,8 @@ #include "Tile.h" +class Material; + class DirectionalTile : public Tile { public: static const int DIRECTION_MASK = 0x3; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirtTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirtTile.cpp index 515d88e6f..54a642b7a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirtTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DirtTile.cpp @@ -1,4 +1,5 @@ -#include "../../../../../Header Files/stdafx.h" #include "DirtTile.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" DirtTile::DirtTile(int id) : Tile(id, Material::dirt) {} \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.cpp index 532fbaabc..dc1a9cf49 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.cpp @@ -1,16 +1,31 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../../entity/projectile/net.minecraft.world.entity.projectile.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../inventory/net.minecraft.world.inventory.h" -#include "../net.minecraft.world.level.h" -#include "net.minecraft.world.level.tile.h" -#include "entity/net.minecraft.world.level.tile.entity.h" -#include "../../net.minecraft.world.h" +#include + #include "DispenserTile.h" -#include "../../../net.minecraft.h" -#include "../../entity/Mob.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/core/BehaviorRegistry.h" +#include "Minecraft.World/net/minecraft/core/BlockSource.h" +#include "Minecraft.World/net/minecraft/core/BlockSourceImpl.h" +#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h" +#include "Minecraft.World/net/minecraft/core/DispenseItemBehavior.h" +#include "Minecraft.World/net/minecraft/core/FacingEnum.h" +#include "Minecraft.World/net/minecraft/core/PositionImpl.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h" + +class Position; BehaviorRegistry DispenserTile::REGISTRY = BehaviorRegistry(new DefaultDispenseItemBehavior()); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h index 95c3ee0ad..2e63e5441 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h @@ -1,10 +1,21 @@ #pragma once +#include + #include "BaseEntityTile.h" -#include "../../../core/net.minecraft.core.h" +#include "Minecraft.World/net/minecraft/core/net.minecraft.core.h" class Player; class Mob; class ChunkRebuildData; +class BehaviorRegistry; +class BlockSource; +class DispenseItemBehavior; +class FacingEnum; +class Icon; +class ItemInstance; +class Level; +class Position; +class Random; class DispenserTile : public BaseEntityTile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.cpp index 3f5bc1d00..acda11ed1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.cpp @@ -1,12 +1,18 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../../phys/net.minecraft.world.phys.h" +#include + #include "DoorTile.h" #include "LevelEvent.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../../net.minecraft.world.h" -#include "../../../net.minecraft.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/FlippedIcon.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" const std::wstring DoorTile::TEXTURES[] = { L"doorWood_lower", L"doorWood_upper", L"doorIron_lower", L"doorIron_upper"}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.h index 245a7f1b4..2ec116712 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.h @@ -1,10 +1,17 @@ #pragma once +#include +#include + #include "Tile.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" class Player; class HitResult; class ChunkRebuildData; +class Icon; +class Level; +class LevelSource; +class Material; class DoorTile : public Tile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.cpp index 11559852f..c882f60c7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.cpp @@ -1,11 +1,21 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "net.minecraft.world.level.tile.h" -#include "entity/net.minecraft.world.level.tile.entity.h" -#include "../../../net.minecraft.h" -#include "../../net.minecraft.world.h" -#include "../../../core/net.minecraft.core.h" +#include +#include + #include "DropperTile.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/core/BlockSourceImpl.h" +#include "Minecraft.World/net/minecraft/core/DefaultDispenseItemBehavior.h" +#include "Minecraft.World/net/minecraft/core/DispenseItemBehavior.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DispenserTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h" + +class Container; DropperTile::DropperTile(int id) : DispenserTile(id) { DISPENSE_BEHAVIOUR = new DefaultDispenseItemBehavior(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.h index 01af4a3b8..16aa8004e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.h @@ -2,6 +2,8 @@ #include "DispenserTile.h" +class DispenseItemBehavior; + class DropperTile : public DispenserTile { private: DispenseItemBehavior* DISPENSE_BEHAVIOUR; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.cpp index 39494bcda..e4f4b55f2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.cpp @@ -1,8 +1,14 @@ -#include "../../../../../Header Files/stdafx.h" +#include + #include "EggTile.h" -#include "../net.minecraft.world.level.h" -#include "net.minecraft.world.level.tile.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/item/FallingTile.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" EggTile::EggTile(int id) : Tile(id, Material::egg, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.h index 873ef6267..6f0d07446 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.h @@ -1,6 +1,8 @@ #pragma once #include "Tile.h" +class Level; + class EggTile : public Tile { public: EggTile(int id); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp index 5e8fee7b5..fe1fca4f2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp @@ -1,9 +1,17 @@ -#include "../../../../../Header Files/stdafx.h" +#include + #include "EnchantmentTableTile.h" -#include "entity/EnchantmentTableTileEntity.h" -#include "../net.minecraft.world.level.h" -#include "../../../net.minecraft.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" const std::wstring EnchantmentTableTile::TEXTURE_SIDE = L"enchantment_side"; const std::wstring EnchantmentTableTile::TEXTURE_TOP = L"enchantment_top"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.h index ee61cd48f..f3c3f8b05 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "BaseEntityTile.h" class ChunkRebuildData; +class Icon; + class EnchantmentTableTile : public BaseEntityTile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp index 39e4f2b04..20974b0db 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp @@ -1,11 +1,20 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../net.minecraft.world.level.h" -#include "entity/net.minecraft.world.level.tile.entity.h" -#include "../../net.minecraft.world.h" -#include "../../../net.minecraft.h" +#include +#include + #include "EnderChestTile.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.h" EnderChestTile::EnderChestTile(int id) : BaseEntityTile(id, Material::stone, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.cpp index 19b18ae8e..844c354f5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.cpp @@ -1,9 +1,19 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../../net.minecraft.h" -#include "../../net.minecraft.world.h" +#include +#include +#include + #include "FarmTile.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/GameRules.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" FarmTile::FarmTile(int id) : Tile(id, Material::dirt, false) { iconWet = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.h index cfa9f9a4f..9801e0136 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.h @@ -1,9 +1,11 @@ #pragma once #include "Tile.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" class Random; class ChunkRebuildData; +class Icon; +class Level; class FarmTile : public Tile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceGateTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceGateTile.cpp index 5cc32d7af..66f89b9e3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceGateTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceGateTile.cpp @@ -1,10 +1,17 @@ -#include "../../../../../Header Files/stdafx.h" +#include + #include "FenceGateTile.h" -#include "../../phys/AABB.h" -#include "../net.minecraft.world.level.h" -#include "../../../net.minecraft.h" #include "LevelEvent.h" -#include "../../../Direction.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" FenceGateTile::FenceGateTile(int id) : DirectionalTile(id, Material::wood, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceGateTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceGateTile.h index c43b41416..e8fc9f6ee 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceGateTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceGateTile.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "DirectionalTile.h" class FenceGateTile : public DirectionalTile { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.cpp index 3051baf76..020f7aae5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.cpp @@ -1,8 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.level.h" -#include "../../net.minecraft.world.h" #include "FenceTile.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/item/LeashItem.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" FenceTile::FenceTile(int id, const std::wstring& texture, Material* material) : Tile(id, material, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.h index 64ff18b72..2313bc5a8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.h @@ -1,6 +1,12 @@ #pragma once +#include +#include + #include "Tile.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" + +class LevelSource; +class Material; class FenceTile : public Tile { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.cpp index 06d8e9e9a..ec82a3f61 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.cpp @@ -1,17 +1,26 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../dimension/net.minecraft.world.level.dimension.h" -#include "../../net.minecraft.world.h" -#include "net.minecraft.world.level.tile.h" +#include +#include + #include "FireTile.h" -#include "../../../../../Header Files/SoundTypes.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/PlayerList.h" -#include "../../phys/AABB.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/level/GameRules.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/PortalTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TntTile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -// AP - added for Vita to set Alpha Cut out -#include "java/IntBuffer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +class Icon; const std::wstring FireTile::TEXTURE_FIRST = L"fire_0"; const std::wstring FireTile::TEXTURE_SECOND = L"fire_1"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.h index a120d4e03..20e7d6a23 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.h @@ -1,9 +1,15 @@ #pragma once +#include + #include "Tile.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" class Random; class ChunkRebuildData; +class Icon; +class Level; +class LevelSource; + class FireTile : public Tile { friend class Tile; friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.cpp index acb790fe2..1d13f38ff 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.cpp @@ -1,9 +1,15 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.level.h" -#include "net.minecraft.world.level.tile.h" #include "FlowerPotTile.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DeadBushTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" FlowerPotTile::FlowerPotTile(int id) : Tile(id, Material::decoration, false) { updateDefaultShape(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.h index e303690ed..ed73c0b5e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Tile.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" class FlowerPotTile : public Tile { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp index f44e4460b..72fc2309e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp @@ -1,14 +1,27 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../inventory/net.minecraft.world.inventory.h" -#include "entity/net.minecraft.world.level.tile.entity.h" -#include "../../net.minecraft.world.h" +#include +#include +#include + #include "FurnaceTile.h" -#include "../../entity/Mob.h" -#include "../../../Facing.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "FurnaceTile.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" bool FurnaceTile::noDrop = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.h index 9ca91c1bf..c5c63f299 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.h @@ -5,6 +5,8 @@ class Mob; class Player; class Random; class ChunkRebuildData; +class Icon; +class Level; class FurnaceTile : public BaseEntityTile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlassTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlassTile.cpp index a9fe80f22..fd8403970 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlassTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlassTile.cpp @@ -1,5 +1,9 @@ -#include "../../../../../Header Files/stdafx.h" +#include + #include "GlassTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.h" + +class Material; GlassTile::GlassTile(int id, Material* material, bool allowSame) : HalfTransparentTile(id, L"glass", material, allowSame) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlassTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlassTile.h index 2f84734b1..1e506ca2e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlassTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlassTile.h @@ -2,6 +2,7 @@ #include "HalfTransparentTile.h" class Random; +class Material; class GlassTile : public HalfTransparentTile { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlowstoneTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlowstoneTile.cpp index 6c30adfb3..151c1742f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlowstoneTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlowstoneTile.cpp @@ -1,6 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" #include "GlowstoneTile.h" -#include "../../item/net.minecraft.world.item.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Material; Glowstonetile::Glowstonetile(int id, Material* material) : Tile(id, material) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlowstoneTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlowstoneTile.h index 373c63dd4..676222217 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlowstoneTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/GlowstoneTile.h @@ -2,6 +2,7 @@ #include "Tile.h" class Random; +class Material; class Glowstonetile : public Tile { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.cpp index 489bed889..bb968015f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.cpp @@ -1,14 +1,19 @@ -#include "../../../../../Header Files/stdafx.h" +#include + #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "GrassTile.h" -#include "../net.minecraft.world.level.h" -#include "../biome/net.minecraft.world.level.biome.h" -#include "../../../net.minecraft.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -// AP - included for PSVita Alpha cut out optimisation -#include "java/IntBuffer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +class Icon; GrassTile::GrassTile(int id) : Tile(id, Material::grass) { iconTop = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.h index 2913051d0..8dd813f95 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.h @@ -3,6 +3,8 @@ class Level; class ChunkRebuildData; +class Icon; + class GrassTile : public Tile { friend class Tile; friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GravelTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/GravelTile.cpp index de74e19a8..212116f9c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GravelTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/GravelTile.cpp @@ -1,6 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" #include "GravelTile.h" -#include "../../item/net.minecraft.world.item.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" GravelTile::GravelTile(int type) : HeavyTile(type) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.cpp index 18b9d6fed..45e2e963c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.cpp @@ -1,10 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" #include "HalfSlabTile.h" -#include "../net.minecraft.world.level.h" -#include "../biome/net.minecraft.world.level.biome.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../../stats/net.minecraft.stats.h" -#include "../../../Facing.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Material; HalfSlabTile::HalfSlabTile(int id, bool fullSize, Material* material) : Tile(id, material, fullSize) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h index a54027a48..b8c8381bf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "Tile.h" +class Material; + class HalfSlabTile : public Tile { public: static const int TYPE_MASK = 7; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.cpp index 3dbb25dd3..bce4f2746 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.cpp @@ -1,7 +1,9 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../../net.minecraft.world.h" #include "HalfTransparentTile.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Material; HalfTransparentTile::HalfTransparentTile(int id, const std::wstring& tex, Material* material, bool allowSame) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.h index bb0a5550b..d07290bfc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.h @@ -1,7 +1,10 @@ #pragma once +#include + #include "Tile.h" class ChunkRebuildData; +class Material; class HalfTransparentTile : public Tile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HayBlockTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HayBlockTile.cpp index 626c30243..6be05ee8e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HayBlockTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HayBlockTile.cpp @@ -1,6 +1,9 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.h" +#include + #include "HayBlockTile.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/RotatedPillarTile.h" HayBlockTile::HayBlockTile(int id) : RotatedPillarTile(id, Material::grass) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HeavyTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HeavyTile.cpp index 4008aec6a..7f770d189 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HeavyTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HeavyTile.cpp @@ -1,8 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" #include "HeavyTile.h" -#include "FireTile.h" +#include "Minecraft.World/net/minecraft/world/entity/item/FallingTile.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" bool HeavyTile::instaFall = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h index 1c68de588..affa5c06f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h @@ -1,9 +1,12 @@ #pragma once +#include + #include "Tile.h" class Random; class Level; class FallingTile; +class Material; class HeavyTile : public Tile { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.cpp index 224215bcc..678f45942 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.cpp @@ -1,12 +1,20 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../inventory/net.minecraft.world.inventory.h" -#include "../net.minecraft.world.level.h" -#include "entity/net.minecraft.world.level.tile.entity.h" -#include "../../net.minecraft.world.h" #include "HopperTile.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h" + +class Icon; const std::wstring HopperTile::TEXTURE_OUTSIDE = L"hopper_outside"; const std::wstring HopperTile::TEXTURE_INSIDE = L"hopper_inside"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.h index 96220dded..ced60675e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.h @@ -1,8 +1,15 @@ #pragma once +#include +#include + #include "BaseEntityTile.h" +#include "java/Random.h" class HopperTileEntity; +class Icon; +class Level; +class LevelSource; class HopperTile : public BaseEntityTile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HugeMushroomTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HugeMushroomTile.cpp index dd4b7f16d..54ec7557d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HugeMushroomTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HugeMushroomTile.cpp @@ -1,6 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.h" #include "HugeMushroomTile.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Icon; +class Material; const std::wstring HugeMushroomTile::TEXTURE_STEM = L"skin_stem"; const std::wstring HugeMushroomTile::TEXTURE_INSIDE = L"inside"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HugeMushroomTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HugeMushroomTile.h index 5cb449008..8038ca55a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HugeMushroomTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HugeMushroomTile.h @@ -1,7 +1,12 @@ #pragma once +#include + #include "Tile.h" class ChunkRebuildData; +class Icon; +class Material; + class HugeMushroomTile : public Tile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/IceTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/IceTile.cpp index f478a4f9b..e258ecc24 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/IceTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/IceTile.cpp @@ -1,10 +1,19 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../dimension/net.minecraft.world.level.dimension.h" -#include "../../item/enchantment/net.minecraft.world.item.enchantment.h" -#include "../../food/net.minecraft.world.food.h" -#include "../../../stats/net.minecraft.stats.h" +#include +#include + #include "IceTile.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/food/FoodConstants.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class ItemInstance; IceTile::IceTile(int id) : HalfTransparentTile(id, L"ice", Material::ice, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.cpp index 0879396c5..d8b0c98f2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.cpp @@ -1,12 +1,19 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../redstone/net.minecraft.world.level.redstone.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.level.h" -#include "../../../net.minecraft.h" -#include "../../net.minecraft.world.h" +#include + #include "JukeboxTile.h" #include "LevelEvent.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" JukeboxTile::Entity::Entity() : TileEntity() { record = nullptr; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.h index 9925b6fff..33b212951 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.h @@ -1,11 +1,17 @@ #pragma once +#include + #include "BaseEntityTile.h" #include "nbt/CompoundTag.h" -#include "entity/TileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" class CompoundTag; class ChunkRebuildData; +class Icon; +class Level; class JukeboxTile : public BaseEntityTile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.cpp index de2952e10..c63a5a752 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.cpp @@ -1,7 +1,11 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" +#include + #include "LadderTile.h" -#include "../../phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" LadderTile::LadderTile(int id) : Tile(id, Material::decoration, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.h index 327dce1f2..f7396aaed 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.h @@ -1,6 +1,8 @@ #pragma once +#include + #include "Tile.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp index 4de69f6e2..5f158e107 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp @@ -1,11 +1,11 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "LeafTile.h" -#include "../net.minecraft.world.level.h" -#include "../biome/net.minecraft.world.level.biome.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../../stats/net.minecraft.stats.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" const unsigned int LeafTile::LEAF_NAMES[LEAF_NAMES_LENGTH] = { IDS_TILE_LEAVES_OAK, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.cpp index 0f1deb65e..00a77ff8d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.cpp @@ -1,9 +1,16 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../redstone/net.minecraft.world.level.redstone.h" -#include "../../../net.minecraft.h" +#include + #include "LeverTile.h" -#include "../../phys/AABB.h" +#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" LeverTile::LeverTile(int id) : Tile(id, Material::decoration, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.h index 7f27ba4a4..c89c970fa 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeverTile.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "Tile.h" +class Level; + class LeverTile : public Tile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.cpp index 76f3683ba..7808c2ea2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.cpp @@ -1,15 +1,24 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include +#include +#include + #include "java/JavaMath.h" -#include "../net.minecraft.world.level.h" -#include "../dimension/net.minecraft.world.level.dimension.h" -#include "../biome/net.minecraft.world.level.biome.h" -#include "../../net.minecraft.world.h" #include "LiquidTile.h" -#include -#include "../../../Facing.h" -#include "../../../../../Header Files/SoundTypes.h" -#include "../material/Material.h" -#include "../../phys/AABB.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Icon; const std::wstring LiquidTile::TEXTURE_LAVA_STILL = L"lava"; const std::wstring LiquidTile::TEXTURE_WATER_STILL = L"water"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h index 4b5d96dda..b00a56c2e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h @@ -1,10 +1,17 @@ #pragma once #include +#include + #include "Tile.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" class Random; class ChunkRebuildData; +class Icon; +class Level; +class LevelSource; +class Material; class LiquidTile : public Tile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileDynamic.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileDynamic.cpp index cc36098b3..26b1bed54 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileDynamic.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileDynamic.cpp @@ -1,7 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" #include "LiquidTileDynamic.h" -#include "../dimension/net.minecraft.world.level.dimension.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" LiquidTileDynamic::LiquidTileDynamic(int id, Material* material) : LiquidTile(id, material) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileDynamic.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileDynamic.h index 48e769829..c320aabe6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileDynamic.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileDynamic.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "LiquidTile.h" class Random; +class Level; +class Material; class LiquidTileDynamic : public LiquidTile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileStatic.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileStatic.cpp index 4cd5d5bc8..55bc59778 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileStatic.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileStatic.cpp @@ -1,7 +1,9 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" #include "LiquidTileStatic.h" -#include "FireTile.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" LiquidTileStatic::LiquidTileStatic(int id, Material* material) : LiquidTile(id, material) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileStatic.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileStatic.h index c6ea3e9b8..d35cd94e8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileStatic.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTileStatic.h @@ -2,6 +2,8 @@ #include "LiquidTile.h" class Random; +class Level; +class Material; class LiquidTileStatic : public LiquidTile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LockedChestTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LockedChestTile.cpp index 6a1213c3f..330f024a0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LockedChestTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LockedChestTile.cpp @@ -1,6 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" #include "LockedChestTile.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" LockedChestTile::LockedChestTile(int id) : Tile(id, Material::wood) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MelonTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MelonTile.cpp index d4583e8b1..e209b8470 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MelonTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MelonTile.cpp @@ -1,8 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" +#include + #include "MelonTile.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../net.minecraft.world.h" -#include "../../../Facing.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" MelonTile::MelonTile(int id) : Tile(id, Material::vegetable) { iconTop = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MelonTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MelonTile.h index 6dd957bd0..6f7990333 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MelonTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MelonTile.h @@ -2,6 +2,8 @@ #include "Tile.h" class ChunkRebuildData; +class Icon; + class MelonTile : public Tile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MetalTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MetalTile.cpp index c5d5a82aa..7e30ceb26 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MetalTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MetalTile.cpp @@ -1,4 +1,5 @@ -#include "../../../../../Header Files/stdafx.h" #include "MetalTile.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" MetalTile::MetalTile(int id) : Tile(id, Material::metal) {} \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MobSpawnerTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MobSpawnerTile.cpp index 152393047..c99a19670 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MobSpawnerTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MobSpawnerTile.cpp @@ -1,7 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "entity/net.minecraft.world.level.tile.entity.h" +#include + #include "MobSpawnerTile.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" MobSpawnerTile::MobSpawnerTile(int id) : BaseEntityTile(id, Material::stone, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MushroomPlantTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MushroomPlantTile.cpp index 87fb47a9a..24074b799 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MushroomPlantTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MushroomPlantTile.cpp @@ -1,8 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../levelgen/feature/net.minecraft.world.level.levelgen.feature.h" -#include "../../net.minecraft.world.h" #include "MushroomPlantTile.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/HugeMushroomFeature.h" +#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" Mushroom::Mushroom(int id) : Bush(id) { this->updateDefaultShape(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MushroomPlantTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MushroomPlantTile.h index ebc270b0a..01b591a24 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MushroomPlantTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MushroomPlantTile.h @@ -2,6 +2,7 @@ #include "PlantTile.h" class Random; +class Level; class Mushroom : public Bush { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.cpp index a77379874..c59072f1c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.cpp @@ -1,8 +1,14 @@ -#include "../../../../../Header Files/stdafx.h" +#include + #include "MycelTile.h" -#include "../net.minecraft.world.level.h" -#include "../../../net.minecraft.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" MycelTile::MycelTile(int id) : Tile(id, Material::grass) { iconTop = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.h index 8025deb10..2929e993c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.h @@ -2,6 +2,8 @@ #include "Tile.h" class ChunkRebuildData; +class Icon; + class MycelTile : public Tile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.cpp index 532196a74..b2e300d11 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.cpp @@ -1,9 +1,15 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include + #include "NetherWartTile.h" -#include "../net.minecraft.world.level.h" -#include "../biome/net.minecraft.world.level.biome.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" NetherWartTile::NetherWartTile(int id) : Bush(id) { setTicking(true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.h index 8eeddc8cc..08668de0c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.h @@ -2,6 +2,9 @@ #include "PlantTile.h" class ChunkRebuildData; +class Icon; +class Level; + class NetherWartTile : public Bush { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherrackTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherrackTile.cpp index f0d339b4e..259219eeb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherrackTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherrackTile.cpp @@ -1,4 +1,5 @@ -#include "../../../../../Header Files/stdafx.h" #include "NetherrackTile.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" NetherrackTile::NetherrackTile(int id) : Tile(id, Material::stone) {} \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.cpp index 8681dd4bd..eeca14bf4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.cpp @@ -1,9 +1,13 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../redstone/net.minecraft.world.level.redstone.h" #include "NotGateTile.h" -#include "../../../../../Header Files/SoundTypes.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TorchTile.h" std::unordered_map*> NotGateTile::recentToggles = diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.h index ac378bf8c..05bc54d0f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.h @@ -1,7 +1,12 @@ #pragma once +#include +#include +#include + #include "TorchTile.h" class Random; +class Level; class NotGateTile : public TorchTile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp index ec2a7f62d..ae7406be5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp @@ -1,8 +1,14 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "entity/net.minecraft.world.level.tile.entity.h" +#include +#include + #include "NoteBlockTile.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.h" NoteBlockTile::NoteBlockTile(int id) : BaseEntityTile(id, Material::wood) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ObsidianTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ObsidianTile.cpp index f18a72251..dce545f93 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ObsidianTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ObsidianTile.cpp @@ -1,5 +1,6 @@ -#include "../../../../../Header Files/stdafx.h" #include "ObsidianTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/StoneTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" ObsidianTile::ObsidianTile(int id) : StoneTile(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/OreTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/OreTile.cpp index ba7983c50..10f45b46e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/OreTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/OreTile.cpp @@ -1,7 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" #include "OreTile.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.level.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" OreTile::OreTile(int id) : Tile(id, Material::stone) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.cpp index 9e9f0f404..86c0287c0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.cpp @@ -1,8 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "GrassTile.h" +#include + #include "PlantTile.h" -#include "../../phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" void Bush::_init() { setTicking(true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.h index b840efbaa..60a10fbda 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.h @@ -1,10 +1,11 @@ #pragma once #include "Tile.h" -#include "../material/Material.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" class Random; class Level; +class Material; class Bush : public Tile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.cpp index 94538e474..6e30b4102 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.cpp @@ -1,13 +1,20 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "../net.minecraft.world.level.h" -#include "../dimension/net.minecraft.world.level.dimension.h" -#include "../../item/net.minecraft.world.item.h" -#include "PortalTile.h" #include +#include -#include "../../phys/AABB.h" -#include "FireTile.h" +#include "PortalTile.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "SoundTypes.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/item/SpawnEggItem.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" PortalTile::PortalTile(int id) : HalfTransparentTile(id, L"portal", Material::portal, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.h index dcc1b2e0a..8387fd160 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.h @@ -1,9 +1,12 @@ #pragma once #include +#include + #include "HalfTransparentTile.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" class Random; +class Level; class PortalTile : public HalfTransparentTile { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.cpp index 2f7f96890..21f5c2be4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.cpp @@ -1,8 +1,14 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.level.h" -#include "../../net.minecraft.world.h" +#include +#include + #include "PotatoTile.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/CropTile.h" PotatoTile::PotatoTile(int id) : CropTile(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.h index 341bae497..b3bd4abb7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.h @@ -2,6 +2,8 @@ #include "CropTile.h" +class Icon; + class PotatoTile : public CropTile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredMetalTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredMetalTile.cpp index 326196ae4..0eaf7604a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredMetalTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredMetalTile.cpp @@ -1,6 +1,6 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../redstone/net.minecraft.world.level.redstone.h" #include "PoweredMetalTile.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/MetalTile.h" PoweredMetalTile::PoweredMetalTile(int id) : MetalTile(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredRailTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredRailTile.cpp index e434c9ead..766e425a0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredRailTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredRailTile.cpp @@ -1,7 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.h" -#include "../net.minecraft.world.level.h" +#include + #include "PoweredRailTile.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" PoweredRailTile::PoweredRailTile(int id) : BaseRailTile(id, true) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredRailTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredRailTile.h index 841be6105..3620001e5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredRailTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PoweredRailTile.h @@ -2,6 +2,9 @@ #include "BaseRailTile.h" +class Icon; +class Level; + class PoweredRailTile : public BaseRailTile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PressurePlateTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PressurePlateTile.cpp index d3c96a1a1..59e1d09de 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PressurePlateTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PressurePlateTile.cpp @@ -1,8 +1,18 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../redstone/net.minecraft.world.level.redstone.h" +#include +#include +#include + #include "PressurePlateTile.h" -#include "../../phys/AABB.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Material; PressurePlateTile::PressurePlateTile(int id, const std::wstring& tex, Material* material, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PressurePlateTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PressurePlateTile.h index 796b62181..85f4a2e0e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PressurePlateTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PressurePlateTile.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "BasePressurePlateTile.h" +class Material; + class PressurePlateTile : public BasePressurePlateTile { public: enum Sensitivity { everything, mobs, players }; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp index 8c7809d88..1a43e1deb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp @@ -1,12 +1,19 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/animal/net.minecraft.world.entity.animal.h" -#include "../net.minecraft.world.level.h" -#include "../../../net.minecraft.h" -#include "../../net.minecraft.world.h" +#include + #include "PumpkinTile.h" -#include "../../entity/Mob.h" -#include "../../entity/animal/SnowMan.h" -#include "../../entity/MobCategory.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/SnowMan.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" const std::wstring PumpkinTile::TEXTURE_FACE = L"pumpkin_face"; const std::wstring PumpkinTile::TEXTURE_LANTERN = L"pumpkin_jack"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.h index 40c484b21..5a7e6628b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "DirectionalTile.h" class Mob; class ChunkRebuildData; +class Icon; class PumpkinTile : public DirectionalTile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/QuartzBlockTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/QuartzBlockTile.cpp index 41ddbb5e7..503f3a4f9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/QuartzBlockTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/QuartzBlockTile.cpp @@ -1,12 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "QuartzBlockTile.h" // 4J Added -#include "../Level.h" -#include "piston/PistonBaseTile.h" -#include "../../entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" int QuartzBlockTile::BLOCK_NAMES[QUARTZ_BLOCK_NAMES] = { IDS_TILE_QUARTZ_BLOCK, IDS_TILE_QUARTZ_BLOCK_CHISELED, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RailTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RailTile.cpp index cf673e5b6..ccec8f4fb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RailTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RailTile.cpp @@ -1,6 +1,9 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.h" +#include + #include "RailTile.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" RailTile::RailTile(int id) : BaseRailTile(id, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RailTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RailTile.h index b4a06cce8..3d6016fdc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RailTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RailTile.h @@ -2,6 +2,8 @@ #include "BaseRailTile.h" +class Icon; + class RailTile : public BaseRailTile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.cpp index c7debfa79..979e9e31e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.cpp @@ -1,21 +1,27 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include +#include + #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "RedStoneDustTile.h" -#include -#include -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.level.h" -#include "../redstone/net.minecraft.world.level.redstone.h" -#include "net.minecraft.world.level.tile.h" -#include "../../net.minecraft.world.h" -#include "../../../net.minecraft.h" -#include "../../../Direction.h" +#include "Minecraft.World/net/minecraft/Direction.h" #include "DiodeTile.h" -#include "../../phys/AABB.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" -// AP - added for Vita to set Alpha Cut out -#include "java/IntBuffer.h" -#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +class Icon; const std::wstring RedStoneDustTile::TEXTURE_CROSS = L"_cross"; const std::wstring RedStoneDustTile::TEXTURE_LINE = L"_line"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.h index 7b8922a42..a84b988b7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.h @@ -1,11 +1,17 @@ #pragma once #include +#include +#include + #include "Tile.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" class Random; class Level; class ChunkRebuildData; +class Icon; +class LevelSource; class RedStoneDustTile : public Tile { friend ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp index b3fecfc44..34eb6150a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp @@ -1,7 +1,13 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" +#include + #include "RedStoneOreTile.h" -#include "../../item/net.minecraft.world.item.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" RedStoneOreTile::RedStoneOreTile(int id, bool lit) : Tile(id, Material::stone) { if (lit) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.h index f6d578c72..ad76bd100 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.h @@ -3,6 +3,7 @@ class Player; class Random; +class Level; class RedStoneOreTile : public Tile { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedlightTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedlightTile.cpp index 9a11aa1e0..5e35d575e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedlightTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedlightTile.cpp @@ -1,8 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "net.minecraft.world.level.tile.h" -#include "../../net.minecraft.world.h" +#include + #include "RedlightTile.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" RedlightTile::RedlightTile(int id, bool isLit) : Tile(id, Material::buildable_glass) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.cpp index aba9c321f..d9a941741 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.cpp @@ -1,12 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "GrassTile.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.level.h" -#include "../material/net.minecraft.world.level.material.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "ReedTile.h" #include +#include "ReedTile.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + ReedTile::ReedTile(int id) : Tile(id, Material::plant, false) { this->updateDefaultShape(); this->setTicking(true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.h index fb1667066..2d436d820 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.h @@ -1,10 +1,12 @@ #pragma once #include + #include "Tile.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" class Random; +class Level; class ReedTile : public Tile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.cpp index a2d8054cd..8b1bee8c1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.cpp @@ -1,9 +1,14 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.level.h" -#include "../redstone/net.minecraft.world.level.redstone.h" +#include + #include "RepeaterTile.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DiodeTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" const double RepeaterTile::DELAY_RENDER_OFFSETS[4] = { -1.0f / 16.0f, 1.0f / 16.0f, 3.0f / 16.0f, 5.0f / 16.0f}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RotatedPillarTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RotatedPillarTile.cpp index 7c55f68f7..197b4b6f7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RotatedPillarTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RotatedPillarTile.cpp @@ -1,6 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.h" +#include + #include "RotatedPillarTile.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Icon; +class Material; RotatedPillarTile::RotatedPillarTile(int id, Material* material) : Tile(id, material) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RotatedPillarTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RotatedPillarTile.h index 75207acbf..5c62dc3fa 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RotatedPillarTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RotatedPillarTile.h @@ -2,6 +2,9 @@ #include "Tile.h" +class Icon; +class Material; + class RotatedPillarTile : public Tile { public: static const int MASK_TYPE = 0x3; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.cpp index e36126463..b0fa3f0a3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.cpp @@ -1,7 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.h" -#include "../material/net.minecraft.world.level.material.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "Minecraft.World/net/minecraft/world/level/material/net.minecraft.world.level.material.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "SandStoneTile.h" const std::wstring SandStoneTile::TEXTURE_TOP = L"sandstone_top"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.cpp index ba9ccd744..40884a039 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.cpp @@ -1,8 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "net.minecraft.world.level.tile.h" -#include "../levelgen/feature/net.minecraft.world.level.levelgen.feature.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "SaplingPlantTile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.cpp index 2884fb56c..059547485 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.cpp @@ -1,13 +1,15 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../../item/net.minecraft.world.item.h" -#include "../material/Material.h" -#include "entity/SignTileEntity.h" -#include "SignTile.h" -#include "../../phys/AABB.h" - #include +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h" +#include "SignTile.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + SignTile::SignTile(int id, eINSTANCEOF clas, bool onGround) : BaseEntityTile(id, Material::wood, false) { this->onGround = onGround; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.h index 930715b2a..c04c728f2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.h @@ -1,11 +1,13 @@ #pragma once #include -#include "BaseEntityTile.h" -#include "entity/TileEntity.h" +#include -#include "../../../../../Header Files/stdafx.h" -#include "../material/Material.h" +#include "BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "java/Class.h" class SignTile : public BaseEntityTile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.cpp index fc1864c5d..78398c88e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.cpp @@ -1,11 +1,11 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.level.h" -#include "entity/net.minecraft.world.level.tile.entity.h" -#include "../../entity/boss/wither/WitherBoss.h" -#include "../../../net.minecraft.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h" +#include "Minecraft.World/net/minecraft/net.minecraft.h" #include "SkullTile.h" SkullTile::SkullTile(int id) : BaseEntityTile(id, Material::decoration, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.cpp index 18177e0b5..489ad9582 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.cpp @@ -1,6 +1,6 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "SmoothStoneBrickTile.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" const std::wstring SmoothStoneBrickTile::TEXTURE_NAMES[] = { L"", L"mossy", L"cracked", L"carved"}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SnowTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SnowTile.cpp index e7bfdc31a..120c1ce5f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SnowTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SnowTile.cpp @@ -1,8 +1,9 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" - -#include "../../item/net.minecraft.world.item.h" #include "SnowTile.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" SnowTile::SnowTile(int id) : Tile(id, Material::snow) { setTicking(true); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.cpp index 070baf708..d2819655d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.cpp @@ -1,7 +1,11 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "../../phys/net.minecraft.world.phys.h" +#include +#include + #include "SoulSandTile.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" SoulSandTile::SoulSandTile(int id) : Tile(id, Material::sand) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.h index 6a19d52e5..0f33d471a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.h @@ -1,6 +1,6 @@ #pragma once #include "Tile.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" class SoulSandTile : public Tile { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SpongeTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SpongeTile.cpp index bec292e18..e09ff23c0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SpongeTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SpongeTile.cpp @@ -1,7 +1,6 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" - #include "SpongeTile.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" const int RANGE = 2; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassBlock.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassBlock.cpp index 7fe2a4475..6a61d13a3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassBlock.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassBlock.cpp @@ -1,7 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../net.minecraft.world.h" +#include + #include "StainedGlassBlock.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HalfTransparentTile.h" + +class Icon; +class Material; Icon* StainedGlassBlock::ICONS[StainedGlassBlock::ICONS_LENGTH]; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassBlock.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassBlock.h index d12f240cf..dc078da78 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassBlock.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassBlock.h @@ -2,6 +2,9 @@ #include "HalfTransparentTile.h" +class Icon; +class Material; + class StainedGlassBlock : public HalfTransparentTile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassPaneBlock.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassPaneBlock.cpp index 79b083262..32037d899 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassPaneBlock.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassPaneBlock.cpp @@ -1,7 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.h" -#include "../../item/net.minecraft.world.item.h" +#include + #include "StainedGlassPaneBlock.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.h" + +class Icon; Icon* StainedGlassPaneBlock::ICONS[StainedGlassPaneBlock::ICONS_COUNT]; Icon* StainedGlassPaneBlock::EDGE_ICONS[StainedGlassPaneBlock::ICONS_COUNT]; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassPaneBlock.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassPaneBlock.h index a5902cfab..3cdb74978 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassPaneBlock.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StainedGlassPaneBlock.h @@ -2,6 +2,8 @@ #include "ThinFenceTile.h" +class Icon; + class StainedGlassPaneBlock : public ThinFenceTile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StairTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StairTile.cpp index 646ecc310..0a0a69e19 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StairTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StairTile.cpp @@ -1,9 +1,13 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../net.minecraft.world.level.h" -#include "../../../net.minecraft.h" #include "StairTile.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" int StairTile::DEAD_SPACES[8][2] = {{2, 6}, {3, 7}, {2, 3}, {6, 7}, {0, 4}, {1, 5}, {0, 1}, {4, 5}}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StairTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StairTile.h index bad39f7b5..73ae69061 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StairTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StairTile.h @@ -1,9 +1,12 @@ #pragma once +#include + #include "Tile.h" class Mob; class Player; +class LevelSource; class StairTile : public Tile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.cpp index 9681d316a..7c806ccf8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.cpp @@ -1,11 +1,19 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" -#include "../net.minecraft.world.level.h" -#include "../../net.minecraft.world.h" +#include + #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" #include "StemTile.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Icon; const std::wstring StemTile::TEXTURE_ANGLED = L"stem_bent"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.h index c5ec05b07..8ade02a28 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.h @@ -1,8 +1,15 @@ #pragma once +#include +#include + #include "Tile.h" #include "PlantTile.h" class ChunkRebuildData; +class Icon; +class Level; +class LevelSource; + class StemTile : public Bush { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneButtonTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneButtonTile.cpp index 4e8090573..8a0446201 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneButtonTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneButtonTile.cpp @@ -1,6 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.h" #include "StoneButtonTile.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ButtonTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" StoneButtonTile::StoneButtonTile(int id) : ButtonTile(id, false) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp index 9c1b3ea52..810357283 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp @@ -1,6 +1,6 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/monster/net.minecraft.world.entity.monster.h" -#include "../net.minecraft.world.level.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "net.minecraft.world.level.tile.h" #include "StoneMonsterTile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.cpp index 5f33d7314..ac2e28b9a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.cpp @@ -1,8 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.h" -#include "../net.minecraft.world.level.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "net.minecraft.world.level.tile.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "StoneSlabTile.h" const unsigned int StoneSlabTile::SLAB_NAMES[SLAB_NAMES_LENGTH] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneTile.cpp index 8cc313703..06a7b8a8a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneTile.cpp @@ -1,5 +1,6 @@ -#include "../../../../../Header Files/stdafx.h" #include "StoneTile.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" StoneTile::StoneTile(int id) : Tile(id, Material::stone) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.cpp index b4b680078..a69310d8d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.cpp @@ -1,10 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.level.h" -#include "../biome/net.minecraft.world.level.biome.h" -#include "../../../stats/net.minecraft.stats.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h" +#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "TallGrassPlantTile.h" const unsigned int diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.cpp index e75e7a0fb..615604606 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.cpp @@ -1,9 +1,16 @@ -#include "../../../../../Header Files/stdafx.h" +#include + #include "TheEndPortalFrameTile.h" -#include "../net.minecraft.world.level.h" -#include "../redstone/net.minecraft.world.level.redstone.h" -#include "../../net.minecraft.world.h" -#include "../../../Facing.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Icon; const std::wstring TheEndPortalFrameTile::TEXTURE_EYE = L"endframe_eye"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.h index 72fa3beaa..0260894bb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "Tile.h" +class Icon; + class TheEndPortalFrameTile : public Tile { public: static const int EYE_BIT = 4; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.cpp index a4388c41e..ff9741056 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.cpp @@ -1,7 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" #include "ThinFenceTile.h" -#include "../net.minecraft.world.level.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Icon; ThinFenceTile::ThinFenceTile(int id, const std::wstring& tex, const std::wstring& edgeTex, Material* material, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.h index 0d3ab9717..4cf8a79a8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.h @@ -1,6 +1,12 @@ #pragma once +#include +#include + #include "Tile.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" + +class Icon; +class Material; class ThinFenceTile : public Tile { private: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp index 31989b650..ca19934d1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp @@ -1,21 +1,21 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../stats/net.minecraft.stats.h" -#include "../../../locale/net.minecraft.locale.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../item/enchantment/net.minecraft.world.item.enchantment.h" -#include "../material/net.minecraft.world.level.material.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" +#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" +#include "Minecraft.World/net/minecraft/world/level/material/net.minecraft.world.level.material.h" #include "net.minecraft.world.level.tile.h" -#include "entity/net.minecraft.world.level.tile.entity.h" -#include "../net.minecraft.world.level.h" -#include "../redstone/net.minecraft.world.level.redstone.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../food/net.minecraft.world.food.h" -#include "../../net.minecraft.world.h" -#include "../../../net.minecraft.h" -#include "../../phys/Vec3.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/net.minecraft.world.level.redstone.h" +#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" +#include "Minecraft.World/net/minecraft/world/food/net.minecraft.world.food.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" #include "Tile.h" #include diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h index c83e9bda6..5579d4a21 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h @@ -1,8 +1,8 @@ #pragma once -#include "../material/Material.h" -#include "../../phys/Vec3.h" -#include "../../../../../ConsoleHelpers/Definitions.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" +#include "Minecraft.World/Header Files/SoundTypes.h" #include #include diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.cpp index 914419cc4..6fa68f11f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.cpp @@ -1,13 +1,24 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" -#include "../../entity/projectile/net.minecraft.world.entity.projectile.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../net.minecraft.world.h" -#include "../../../net.minecraft.h" +#include #include "TntTile.h" -#include "../../../../../Header Files/SoundTypes.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "SoundTypes.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Explosion.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" TntTile::TntTile(int id) : Tile(id, Material::explosive) { iconTop = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.h index 97afe195f..295131668 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TntTile.h @@ -1,7 +1,14 @@ #pragma once +#include + #include "Tile.h" + class ChunkRebuildData; +class Icon; +class Level; +class LivingEntity; + class TntTile : public Tile { friend class ChunkRebuildData; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.cpp index e31c2008a..44d142f29 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.cpp @@ -1,12 +1,17 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../stats/net.minecraft.stats.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.level.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../net.minecraft.world.h" +#include +#include + #include "TopSnowTile.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" const int TopSnowTile::MAX_HEIGHT = 6; const int TopSnowTile::HEIGHT_MASK = 7; // max 8 steps diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.h index bfa529d76..33130db90 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "Tile.h" class Player; +class Level; class TopSnowTile : public Tile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.cpp index ac6bba5f1..b72fb19e2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.cpp @@ -1,10 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../net.minecraft.world.level.h" -#include "net.minecraft.world.level.tile.h" -#include "TorchTile.h" #include -#include "../../phys/AABB.h" + +#include "TorchTile.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" TorchTile::TorchTile(int id) : Tile(id, Material::decoration, false) { this->setTicking(true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.h index b8312881e..65f876e7e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.h @@ -1,9 +1,12 @@ #pragma once +#include + #include "Tile.h" -#include "../../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" class Random; class HitResult; +class Level; class TorchTile : public Tile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TransparentTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TransparentTile.cpp index 55ce7283f..24674078c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TransparentTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TransparentTile.cpp @@ -1,6 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" #include "TransparentTile.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Material; TransparentTile::TransparentTile(int id, Material* material, bool allowSame, bool isSolidRender) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TransparentTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TransparentTile.h index fb1c9d15a..f3ae52aae 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TransparentTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TransparentTile.h @@ -1,6 +1,8 @@ #pragma once #include "Tile.h" +class Material; + class TransparentTile : public Tile { protected: bool allowSame; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TrapDoorTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TrapDoorTile.cpp index 7ad5c5161..ae2988c8d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TrapDoorTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TrapDoorTile.cpp @@ -1,10 +1,15 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "net.minecraft.world.level.tile.h" -#include "../../../net.minecraft.h" +#include + #include "TrapDoorTile.h" -#include "../../phys/AABB.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/level/tile/StairTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" TrapDoorTile::TrapDoorTile(int id, Material* material) : Tile(id, material, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TrapDoorTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TrapDoorTile.h index 8ef150568..f0977f1db 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TrapDoorTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TrapDoorTile.h @@ -1,9 +1,13 @@ #pragma once +#include + #include "Tile.h" class Player; class HitResult; +class Level; +class Material; class TrapDoorTile : public Tile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TreeTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TreeTile.cpp index ba3937938..e911ed4a9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TreeTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TreeTile.cpp @@ -1,8 +1,8 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" -#include "piston/net.minecraft.world.level.tile.piston.h" -#include "../../../net.minecraft.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h" +#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "LeafTile.h" #include "TreeTile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.cpp index f3524c2e0..6466096c9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.cpp @@ -1,11 +1,16 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.h" -#include "../net.minecraft.world.level.h" -#include "net.minecraft.world.level.tile.h" -#include "../redstone/net.minecraft.world.level.redstone.h" #include "TripWireSourceTile.h" #include "optional" -#include "../../phys/AABB.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TripWireTile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" TripWireSourceTile::TripWireSourceTile(int id) : Tile(id, Material::decoration, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.h index e23c61feb..c4cfa304a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "Tile.h" +class Level; + class TripWireSourceTile : public Tile { public: using Tile::getTickDelay; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireTile.cpp index adccc308c..5ec4e7ecd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireTile.cpp @@ -1,10 +1,19 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../item/net.minecraft.world.item.h" -#include "../net.minecraft.world.level.h" -#include "net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "TripWireTile.h" #include +#include +#include + +#include "TripWireTile.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" TripWireTile::TripWireTile(int id) : Tile(id, Material::decoration, false) { setShape(0, 0, 0, 1, 2.5f / 16.0f, 1); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireTile.h index 6963d0305..47e9ec680 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TripWireTile.h @@ -1,7 +1,12 @@ #pragma once +#include + #include "Tile.h" +class Level; +class LevelSource; + class TripWireTile : public Tile { using Tile::getTickDelay; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.cpp index b00af2841..bd9b49dda 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.cpp @@ -1,13 +1,22 @@ -#include "../../../../../Header Files/stdafx.h" +#include + #include "VineTile.h" -#include "../material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" #include "java/JavaMath.h" -#include "../../../Facing.h" -#include "../net.minecraft.world.level.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../../stats/net.minecraft.stats.h" -#include "../biome/net.minecraft.world.level.biome.h" -#include "../../phys/AABB.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/ShearsItem.h" +#include "Minecraft.World/net/minecraft/world/level/FoliageColor.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" VineTile::VineTile(int id) : Tile(id, Material::replaceable_plant, false) { setTicking(true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.h index 3a09402b9..66edbe43f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Tile.h" -#include "../../../Direction.h" +#include "Minecraft.World/net/minecraft/Direction.h" + class Level; class LevelSource; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WallTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WallTile.cpp index 80407daa3..d21d35239 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WallTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WallTile.cpp @@ -1,9 +1,9 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../net.minecraft.world.level.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "net.minecraft.world.level.tile.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../../net.minecraft.world.h" -#include "../../../net.minecraft.h" +#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/net.minecraft.h" #include "WallTile.h" const float WallTile::WALL_WIDTH = 3.0f / 16.0f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.cpp index 7dc75862a..c2ac9684d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.cpp @@ -1,9 +1,19 @@ -#include "../../../../../Header Files/stdafx.h" +#include +#include + #include "WaterLilyTile.h" -#include "../net.minecraft.world.level.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "../../phys/AABB.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Random; WaterlilyTile::WaterlilyTile(int id) : Bush(id) { this->updateDefaultShape(); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.h index 532693c2a..e35d7b419 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.h @@ -1,6 +1,9 @@ #pragma once #include "PlantTile.h" +class Level; +class Random; + class WaterlilyTile : public Bush { private: // static const int col = 0x208030; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WebTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WebTile.cpp index 14046bb92..3dbce838e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WebTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WebTile.cpp @@ -1,8 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/net.minecraft.world.entity.h" -#include "../../item/net.minecraft.world.item.h" +#include +#include + #include "WebTile.h" -#include "../../phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" WebTile::WebTile(int id) : Tile(id, Material::web) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WeightedPressurePlateTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WeightedPressurePlateTile.cpp index 18a429aec..9124a729c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WeightedPressurePlateTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WeightedPressurePlateTile.cpp @@ -1,11 +1,16 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/item/net.minecraft.world.entity.item.h" -#include "../net.minecraft.world.level.h" -#include "../redstone/net.minecraft.world.level.redstone.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../entity/Entity.h" +#include +#include + #include "WeightedPressurePlateTile.h" -#include "../../phys/AABB.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/redstone/Redstone.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BasePressurePlateTile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + +class Material; WeightedPressurePlateTile::WeightedPressurePlateTile(int id, const std::wstring& tex, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WeightedPressurePlateTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WeightedPressurePlateTile.h index 12009d7fa..60ce95414 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WeightedPressurePlateTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WeightedPressurePlateTile.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "BasePressurePlateTile.h" +class Material; + class WeightedPressurePlateTile : public BasePressurePlateTile { private: int maxWeight; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodButtonTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodButtonTile.cpp index ad691b2e9..05c94ef2f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodButtonTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodButtonTile.cpp @@ -1,6 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../../net.minecraft.h" #include "WoodButtonTile.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ButtonTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" WoodButtonTile::WoodButtonTile(int id) : ButtonTile(id, true) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodSlabTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodSlabTile.cpp index 242a5c46d..31c490893 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodSlabTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodSlabTile.cpp @@ -1,11 +1,11 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "WoodSlabTile.h" #include "WoodTile.h" #include "TreeTile.h" -#include "../net.minecraft.world.level.h" -#include "../biome/net.minecraft.world.level.biome.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../../stats/net.minecraft.stats.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" const unsigned int WoodSlabTile::SLAB_NAMES[SLAB_NAMES_LENGTH] = { IDS_TILE_STONESLAB_OAK, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodTile.cpp index c6a1dec3b..336b536a1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodTile.cpp @@ -1,11 +1,11 @@ -#include "../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "WoodTile.h" #include "TreeTile.h" -#include "../net.minecraft.world.level.h" -#include "../biome/net.minecraft.world.level.biome.h" -#include "../../item/net.minecraft.world.item.h" -#include "../../../stats/net.minecraft.stats.h" -#include "../../net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" const unsigned int WoodTile::WOOD_NAMES[WOOD_NAMES_LENGTH] = { IDS_TILE_OAKWOOD_PLANKS, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoolCarpetTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoolCarpetTile.cpp index 525e42ee3..a20c8e43e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoolCarpetTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoolCarpetTile.cpp @@ -1,8 +1,12 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../phys/net.minecraft.world.phys.h" -#include "../net.minecraft.world.level.h" -#include "../../../SharedConstants.h" +#include + #include "WoolCarpetTile.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" WoolCarpetTile::WoolCarpetTile(int id) : Tile(id, Material::clothDecoration, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoolCarpetTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoolCarpetTile.h index cb473c2f1..e2e7c4cf0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoolCarpetTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoolCarpetTile.h @@ -1,8 +1,12 @@ #pragma once #include +#include + #include "Tile.h" +class Level; + class WoolCarpetTile : public Tile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WorkbenchTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WorkbenchTile.cpp index cadbcc8f3..23ba46db3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WorkbenchTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WorkbenchTile.cpp @@ -1,9 +1,13 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" -#include "../net.minecraft.world.level.h" -#include "../../net.minecraft.world.h" -#include "../../../net.minecraft.h" +#include +#include + #include "WorkbenchTile.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" WorkbenchTile::WorkbenchTile(int id) : Tile(id, Material::wood) { iconTop = nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WorkbenchTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WorkbenchTile.h index 4a8e6d40a..7dfe08e42 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WorkbenchTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WorkbenchTile.h @@ -4,6 +4,7 @@ class Player; class ChunkRebuildData; +class Icon; class WorkbenchTile : public Tile { friend class Tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp index 2b3a03672..82c9d2b38 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp @@ -1,11 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../../../network/packet/net.minecraft.network.packet.h" -#include "../../../effect/net.minecraft.world.effect.h" -#include "../../../entity/player/net.minecraft.world.entity.player.h" -#include "../../../item/net.minecraft.world.item.h" -#include "../../net.minecraft.world.level.h" -#include "../net.minecraft.world.level.tile.h" -#include "../../../phys/net.minecraft.world.phys.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" +#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" #include "BeaconTileEntity.h" std::shared_ptr BeaconTileEntity::clone() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h index d5c4ea070..e0f1a6732 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h @@ -1,6 +1,6 @@ #pragma once #include "TileEntity.h" -#include "../../../Container.h" +#include "Minecraft.World/net/minecraft/world/Container.h" class BeaconTileEntity : public TileEntity, public Container { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp index c05fd32b9..d3bf29855 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp @@ -1,11 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "nbt/com.mojang.nbt.h" #include "BrewingStandTileEntity.h" -#include "../../../../SharedConstants.h" -#include "../../../../net.minecraft.h" -#include "../../net.minecraft.world.level.h" -#include "../../../item/net.minecraft.world.item.h" -#include "../../../item/alchemy/net.minecraft.world.item.alchemy.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" int slotsForUp[] = {BrewingStandTileEntity::INGREDIENT_SLOT}; int slotsForOtherFaces[] = {0, 1, 2}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h index b385a4d1e..6d6c38c56 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h @@ -1,6 +1,6 @@ #pragma once #include "TileEntity.h" -#include "../../../WorldlyContainer.h" +#include "Minecraft.World/net/minecraft/world/WorldlyContainer.h" class BrewingStandTileEntity : public TileEntity, public WorldlyContainer { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp index 57f910f91..71ad65233 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp @@ -1,17 +1,17 @@ -#include "../../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "nbt/com.mojang.nbt.h" -#include "../../../net.minecraft.world.h" -#include "../../net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "TileEntity.h" -#include "../../../entity/item/net.minecraft.world.entity.item.h" -#include "../../../entity/player/net.minecraft.world.entity.player.h" -#include "../../../item/net.minecraft.world.item.h" -#include "../../../inventory/net.minecraft.world.inventory.h" -#include "../net.minecraft.world.level.tile.h" -#include "../../../phys/net.minecraft.world.phys.h" +#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" #include "ChestTileEntity.h" -#include "../../../../network/packet/ContainerOpenPacket.h" -#include "../../../../../../Header Files/SoundTypes.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h" +#include "Minecraft.World/Header Files/SoundTypes.h" int ChestTileEntity::getContainerType() { if (isBonusChest) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h index 2410e1f80..b1d81ad3f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h @@ -1,7 +1,7 @@ #pragma once #include "TileEntity.h" -#include "../../../Container.h" +#include "Minecraft.World/net/minecraft/world/Container.h" #include "nbt/ListTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.cpp index 8c1fd2318..786749342 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.cpp @@ -1,9 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../../../network/packet/net.minecraft.network.packet.h" -#include "../../net.minecraft.world.level.h" -#include "../../../../commands/net.minecraft.commands.h" -#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include +#include + #include "CommandBlockEntity.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" + +class Level; CommandBlockEntity::CommandBlockEntity() { successCount = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h index 4727809e5..8b3497e63 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h @@ -1,9 +1,16 @@ #pragma once +#include + #include "TileEntity.h" -#include "../../../../commands/CommandSender.h" +#include "Minecraft.World/net/minecraft/commands/CommandSender.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" class ChatMessageComponent; +class Level; +class Pos; class CommandBlockEntity : public TileEntity, public CommandSender { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp index 98132c9ac..626fe3661 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp @@ -1,6 +1,9 @@ -#include "../../../../../../Header Files/stdafx.h" +#include +#include #include "ComparatorTileEntity.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" void ComparatorTileEntity::save(CompoundTag* tag) { TileEntity::save(tag); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.h index 13f3bda82..9b287d8b7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.h @@ -1,6 +1,7 @@ #pragma once #include "TileEntity.h" +#include "java/Class.h" class ComparatorTileEntity : public TileEntity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp index d52c64140..b4efdde79 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp @@ -1,7 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../net.minecraft.world.level.tile.h" +#include + #include "DaylightDetectorTileEntity.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DaylightDetectorTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" DaylightDetectorTileEntity::DaylightDetectorTileEntity() {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h index 29a377b2e..48e759eae 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h @@ -1,5 +1,8 @@ #pragma once +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" + class DaylightDetectorTileEntity : public TileEntity { public: eINSTANCEOF GetType() { return eTYPE_DAYLIGHTDETECTORTILEENTITY; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp index ee1a73793..11a93efc5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp @@ -1,10 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "nbt/com.mojang.nbt.h" #include "TileEntity.h" -#include "../../net.minecraft.world.level.h" -#include "../../../entity/item/net.minecraft.world.entity.item.h" -#include "../../../entity/player/net.minecraft.world.entity.player.h" -#include "../../../item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "DispenserTileEntity.h" DispenserTileEntity::DispenserTileEntity() : TileEntity() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h index 5c3a8b823..f30455465 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h @@ -2,7 +2,7 @@ #include "nbt/com.mojang.nbt.h" #include "TileEntity.h" -#include "../../../Container.h" +#include "Minecraft.World/net/minecraft/world/Container.h" class Player; class Random; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp index 9a09f0cb9..d05d07862 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp @@ -1,4 +1,4 @@ -#include "../../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "DropperTileEntity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp index 2fb3fd423..6be70627f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp @@ -1,7 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "EnchantmentTableTileEntity.h" -#include "../../../entity/player/net.minecraft.world.entity.player.h" -#include "../../net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" EnchantmentTableEntity::EnchantmentTableEntity() { random = new Random(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp index 53e770018..95ec43007 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp @@ -1,7 +1,11 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../net.minecraft.world.level.h" -#include "../net.minecraft.world.level.tile.h" #include "EnderChestTileEntity.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ChestTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" EnderChestTileEntity::EnderChestTileEntity() { openness = oOpenness = 0.0f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.h index 7f2c987fd..c6b674a17 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "TileEntity.h" +#include "java/Class.h" + +class Player; class EnderChestTileEntity : public TileEntity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp index ea8b5b3a3..25235d3d7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp @@ -1,12 +1,12 @@ -#include "../../../../../../Header Files/stdafx.h" +#include "Minecraft.World/Header Files/stdafx.h" #include "nbt/com.mojang.nbt.h" -#include "../../../../net.minecraft.h" -#include "../../../entity/player/net.minecraft.world.entity.player.h" -#include "../../../item/net.minecraft.world.item.h" -#include "../../../item/crafting/net.minecraft.world.item.crafting.h" -#include "../../net.minecraft.world.level.h" -#include "../net.minecraft.world.level.tile.h" -#include "../../material/Material.h" +#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" #include "FurnaceTileEntity.h" int furnaceSlotsForUp[] = {FurnaceTileEntity::SLOT_INPUT}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h index 7e43a2886..db0476f53 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h @@ -1,8 +1,8 @@ #pragma once -#include "../FurnaceTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.h" #include "TileEntity.h" -#include "../../../WorldlyContainer.h" +#include "Minecraft.World/net/minecraft/world/WorldlyContainer.h" class Player; class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/Hopper.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/Hopper.h index 2edd010c4..7b4dd77d5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/Hopper.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/Hopper.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Container.h" +#include "Minecraft.World/net/minecraft/world/Container.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp index 62456fbe4..0b636c6bf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp @@ -1,13 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../../../net.minecraft.h" -#include "../../../entity/net.minecraft.world.entity.h" -#include "../../../entity/item/net.minecraft.world.entity.item.h" -#include "../../../entity/player/net.minecraft.world.entity.player.h" -#include "../../net.minecraft.world.level.h" -#include "../net.minecraft.world.level.tile.h" +#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" +#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "net.minecraft.world.level.tile.entity.h" -#include "../../../phys/net.minecraft.world.phys.h" -#include "../../../net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" +#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "HopperTileEntity.h" HopperTileEntity::HopperTileEntity() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp index 032a49550..f9228c8a2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp @@ -1,8 +1,12 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../../../network/packet/net.minecraft.network.packet.h" -#include "../../net.minecraft.world.level.h" -#include "../net.minecraft.world.level.tile.h" +#include + #include "MobSpawnerTileEntity.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h" +#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" MobSpawnerTileEntity::TileEntityMobSpawner::TileEntityMobSpawner( MobSpawnerTileEntity* parent) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h index 09d3af09f..f5b655b63 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h @@ -1,7 +1,10 @@ #pragma once +#include + #include "TileEntity.h" -#include "../../BaseMobSpawner.h" +#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" +#include "java/Class.h" class Packet; class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.cpp index 9c700af24..c474d2faa 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.cpp @@ -1,12 +1,12 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" -#include "../../../entity/player/net.minecraft.world.entity.player.h" -#include "../../../item/net.minecraft.world.item.h" -#include "../../net.minecraft.world.level.h" -#include "../../material/net.minecraft.world.level.material.h" -#include "../net.minecraft.world.level.tile.h" +#include +#include #include "MusicTileEntity.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" MusicTileEntity::MusicTileEntity() : TileEntity() { note = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.h index 123130530..290d1c1f0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "TileEntity.h" +#include "java/Class.h" + +class Level; class MusicTileEntity : public TileEntity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp index bb1904e85..5f7953917 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp @@ -1,11 +1,15 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "PistonMovingTileEntity.h" #include +#include + +#include "PistonMovingTileEntity.h" #include "PistonPieceTileEntity.h" -#include "../../net.minecraft.world.level.h" -#include "../../../net.minecraft.world.h" -#include "../../../../Facing.h" -#include "../../../phys/AABB.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" PistonMovingPiece::PistonMovingPiece(int id) : BaseEntityTile(id, Material::piston, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.h index 7a25bdd35..0ac1933e9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.h @@ -1,7 +1,14 @@ #pragma once -#include "../BaseEntityTile.h" +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" class PistonPieceEntity; +class Level; +class LevelSource; class PistonMovingPiece : public BaseEntityTile { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp index 985123e67..3db8a4688 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp @@ -1,11 +1,17 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" +#include +#include +#include +#include +#include + #include "PistonPieceTileEntity.h" #include "PistonMovingTileEntity.h" -#include "../../net.minecraft.world.level.h" -#include "../../../../Facing.h" -#include "../Tile.h" -#include "../../../phys/AABB.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" PistonPieceEntity::PistonPieceEntity() { // for the tile entity loader diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.h index f70328f97..55196e727 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.h @@ -1,5 +1,6 @@ #pragma once #include "TileEntity.h" +#include "java/Class.h" class PistonPieceEntity : public TileEntity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.cpp index 0067e45ac..4c2772e65 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.cpp @@ -1,17 +1,13 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" -#include "../../net.minecraft.world.level.h" -#include "../../../entity/item/net.minecraft.world.entity.item.h" -#include "../../../entity/player/net.minecraft.world.entity.player.h" -#include "../../../item/net.minecraft.world.item.h" -#include "../../../entity/net.minecraft.world.entity.h" -#include "../../../phys/net.minecraft.world.phys.h" -#include "../../../../network/packet/net.minecraft.network.packet.h" +#include + #include "SignTileEntity.h" -#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" -#include "../../Level.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" const int SignTileEntity::MAX_LINE_LENGTH = 15; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h index 38eeb1903..23374fda2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h @@ -1,6 +1,12 @@ #pragma once +#include +#include + #include "TileEntity.h" +#include "4J_Input.h" +#include "java/Class.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" #define MAX_SIGN_LINES 4 diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.cpp index f8c09e625..7a4dbbce2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.cpp @@ -1,7 +1,10 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "nbt/com.mojang.nbt.h" -#include "../../../../network/packet/net.minecraft.network.packet.h" +#include +#include + #include "SkullTileEntity.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" SkullTileEntity::SkullTileEntity() { skullType = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.h index 901b289a7..60265fe9a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "TileEntity.h" +#include "java/Class.h" class SkullTileEntity : public TileEntity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp index 27050e4fc..f917ea083 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp @@ -1,13 +1,20 @@ -#include "../../../../../../Header Files/stdafx.h" +#include + #include "TheEndPortalTile.h" #include "TheEndPortalTileEntity.h" -#include "../../net.minecraft.world.level.h" -#include "../../dimension/net.minecraft.world.level.dimension.h" -#include "../../storage/net.minecraft.world.level.storage.h" -#include "../../../entity/net.minecraft.world.entity.h" -#include "../../../entity/player/net.minecraft.world.entity.player.h" -#include "../../../net.minecraft.world.h" -#include +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" + +class Material; thread_local bool TheEndPortal::m_tlsAllowAnywhere = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.h index 65551b02b..e77411012 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.h @@ -1,9 +1,12 @@ #pragma once -#include "../EntityTile.h" -#include "../BaseEntityTile.h" #include +#include + +#include "Minecraft.World/net/minecraft/world/level/tile/EntityTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BaseEntityTile.h" class IconRegister; +class Material; class TheEndPortal : public BaseEntityTile { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp index 43d1306e1..f5f82d410 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp @@ -1,5 +1,7 @@ -#include "../../../../../../Header Files/stdafx.h" +#include + #include "TheEndPortalTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" // 4J Added std::shared_ptr TheEndPortalTileEntity::clone() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h index 198431609..097221234 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h @@ -1,5 +1,6 @@ #pragma once #include "TileEntity.h" +#include "java/Class.h" class TheEndPortalTileEntity : public TileEntity { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.cpp index 836f5c613..6b9c4f001 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.cpp @@ -1,10 +1,30 @@ -#include "../../../../../../Header Files/stdafx.h" -#include "../../../../network/packet/net.minecraft.network.packet.h" -#include "../../net.minecraft.world.level.h" -#include "../net.minecraft.world.level.tile.h" -#include "net.minecraft.world.level.tile.entity.h" +#include + #include "TileEntity.h" #include "PistonPieceTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h" TileEntity::idToCreateMapType TileEntity::idCreateMap = std::unordered_map(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h index 06c229f8b..81c8f8a57 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h @@ -1,11 +1,18 @@ #pragma once -#include "../../../../../../ConsoleHelpers/HashExtension.h" +#include +#include +#include + +#include "Minecraft.World/ConsoleHelpers/HashExtension.h" #include "java/JavaIntHash.h" +#include "java/Class.h" class Level; class Packet; class CompoundTag; +class Tile; +class TileEntity; typedef TileEntity* (*tileEntityCreateFn)(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h index 0c0859d25..594f59ad3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h @@ -74,8 +74,8 @@ #include "NotGateTile.h" #include "ObsidianTile.h" #include "OreTile.h" -#include "piston/PistonBaseTile.h" -#include "piston/PistonExtensionTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.h" #include "PortalTile.h" #include "PotatoTile.h" #include "PoweredMetalTile.h" @@ -107,7 +107,7 @@ #include "StoneSlabTile.h" #include "StoneTile.h" #include "TallGrassPlantTile.h" -#include "entity/TheEndPortalTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.h" #include "TheEndPortalFrameTile.h" #include "ThinFenceTile.h" #include "TntTile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp index 0c039c1c2..ec038fb88 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp @@ -1,19 +1,29 @@ -#include "../../../../../../Header Files/stdafx.h" -#include #include + #include "PistonBaseTile.h" -#include "../entity/PistonMovingTileEntity.h" -#include "../entity/PistonPieceTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.h" #include "PistonExtensionTile.h" -#include "../../../../Facing.h" -#include "../../net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "../../../net.minecraft.world.h" -#include "../../chunk/LevelChunk.h" -#include "../../dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "SoundTypes.h" +#include "java/Random.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/x64headers/extraX64.h" -#include "../../../phys/AABB.h" +class Icon; const std::wstring PistonBaseTile::EDGE_TEX = L"piston_side"; const std::wstring PistonBaseTile::PLATFORM_TEX = L"piston_top"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h index 0e6657702..7869e8ec9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h @@ -1,7 +1,14 @@ #pragma once -#include "../Tile.h" #include #include +#include +#include + +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Icon; +class Level; +class LivingEntity; class PistonBaseTile : public Tile { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.cpp index fc018bdbb..319abdd6e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.cpp @@ -1,8 +1,14 @@ -#include "../../../../../../Header Files/stdafx.h" #include "PistonExtensionTile.h" #include "PistonBaseTile.h" -#include "../../../../Facing.h" -#include "../../net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Icon; PistonExtensionTile::PistonExtensionTile(int id) : Tile(id, Material::piston, false) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.h index 35888829a..6e3b92b5c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.h @@ -1,5 +1,9 @@ #pragma once -#include "../Tile.h" +#include + +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Icon; class PistonExtensionTile : public Tile { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h index 478ddc456..31634eb17 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h @@ -2,5 +2,5 @@ #include "PistonBaseTile.h" #include "PistonExtensionTile.h" -#include "../entity/PistonMovingTileEntity.h" -#include "../entity/PistonPieceTileEntity.h" \ No newline at end of file +#include "Minecraft.World/net/minecraft/world/level/tile/entity/PistonMovingTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.h" \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/phys/AABB.cpp b/minecraft/Minecraft.World/net/minecraft/world/phys/AABB.cpp index ea2e44acd..5c1fc4293 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/phys/AABB.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/phys/AABB.cpp @@ -5,12 +5,15 @@ // TODO: use brace initialization everywhere -#include "../../../../Header Files/stdafx.h" -#include "AABB.h" #include #include +#include +#include + #include "HitResult.h" -#include "Vec3.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" AABB::AABB(double x0, double y0, double z0, double x1, double y1, double z1) { this->x0 = x0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/phys/AABB.h b/minecraft/Minecraft.World/net/minecraft/world/phys/AABB.h index e148367f2..27b089d75 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/phys/AABB.h +++ b/minecraft/Minecraft.World/net/minecraft/world/phys/AABB.h @@ -1,7 +1,7 @@ #pragma once #include "Vec3.h" -#include "../../../../ConsoleHelpers/Definitions.h" +#include "Minecraft.World/ConsoleHelpers/Definitions.h" class HitResult; diff --git a/minecraft/Minecraft.World/net/minecraft/world/phys/HitResult.cpp b/minecraft/Minecraft.World/net/minecraft/world/phys/HitResult.cpp index 503fb05a6..03fcb0505 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/phys/HitResult.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/phys/HitResult.cpp @@ -1,7 +1,5 @@ -#include "../../../../Header Files/stdafx.h" - -#include "../entity/net.minecraft.world.entity.h" #include "HitResult.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" HitResult::HitResult(int x, int y, int z, int f, const Vec3& pos) { type = TILE; diff --git a/minecraft/Minecraft.World/net/minecraft/world/phys/HitResult.h b/minecraft/Minecraft.World/net/minecraft/world/phys/HitResult.h index 83934fc6f..2117721f7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/phys/HitResult.h +++ b/minecraft/Minecraft.World/net/minecraft/world/phys/HitResult.h @@ -1,5 +1,10 @@ #pragma once +#include + #include "Vec3.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" + +class Entity; class HitResult { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/phys/Vec3.cpp b/minecraft/Minecraft.World/net/minecraft/world/phys/Vec3.cpp index 8119ae772..7f06d91fd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/phys/Vec3.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/phys/Vec3.cpp @@ -1,9 +1,11 @@ -#include "Vec3.h" - #include #include +#include +#include -#include "AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" Vec3 Vec3::vectorTo(const Vec3& p) const { return {p.x - x, p.y - y, p.z - z}; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/Objective.cpp b/minecraft/Minecraft.World/net/minecraft/world/scores/Objective.cpp index d784e7c71..60c5c4845 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/Objective.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/scores/Objective.cpp @@ -1,6 +1,5 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.world.scores.h" #include "Objective.h" +#include "Minecraft.World/net/minecraft/world/scores/Scoreboard.h" Objective::Objective(Scoreboard* scoreboard, const std::wstring& name, ObjectiveCriteria* criteria) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/Objective.h b/minecraft/Minecraft.World/net/minecraft/world/scores/Objective.h index 3593d27b3..4f2bb797a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/Objective.h +++ b/minecraft/Minecraft.World/net/minecraft/world/scores/Objective.h @@ -1,5 +1,7 @@ #pragma once +#include + class Scoreboard; class ObjectiveCriteria; diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/PlayerTeam.cpp b/minecraft/Minecraft.World/net/minecraft/world/scores/PlayerTeam.cpp index 8df62ae3b..79cec7fe1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/PlayerTeam.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/scores/PlayerTeam.cpp @@ -1,6 +1,6 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.world.scores.h" #include "PlayerTeam.h" +#include "Minecraft.World/net/minecraft/world/scores/Scoreboard.h" +#include "Minecraft.World/net/minecraft/world/scores/Team.h" PlayerTeam::PlayerTeam(Scoreboard* scoreboard, const std::wstring& name) { this->scoreboard = scoreboard; diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/PlayerTeam.h b/minecraft/Minecraft.World/net/minecraft/world/scores/PlayerTeam.h index 0d08ffcdb..2178b19f5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/PlayerTeam.h +++ b/minecraft/Minecraft.World/net/minecraft/world/scores/PlayerTeam.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Team.h" class Scoreboard; diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/Score.cpp b/minecraft/Minecraft.World/net/minecraft/world/scores/Score.cpp index a13f39cd9..534d64dd3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/Score.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/scores/Score.cpp @@ -1,7 +1,9 @@ -#include "../../../../Header Files/stdafx.h" -#include "net.minecraft.world.scores.h" -#include "criteria/net.minecraft.world.scores.criteria.h" #include "Score.h" +#include "Minecraft.World/net/minecraft/world/scores/Objective.h" +#include "Minecraft.World/net/minecraft/world/scores/Scoreboard.h" +#include "Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.h" + +class Player; Score::Score(Scoreboard* scoreboard, Objective* objective, const std::wstring& owner) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/Score.h b/minecraft/Minecraft.World/net/minecraft/world/scores/Score.h index 1dc2be4e2..ed03e04e1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/Score.h +++ b/minecraft/Minecraft.World/net/minecraft/world/scores/Score.h @@ -1,7 +1,12 @@ #pragma once +#include +#include +#include + class Scoreboard; class Objective; +class Player; class Score { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/Scoreboard.cpp b/minecraft/Minecraft.World/net/minecraft/world/scores/Scoreboard.cpp index 1a29b1a83..46e68ec0a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/Scoreboard.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/scores/Scoreboard.cpp @@ -1,7 +1,7 @@ -#include "../../../../Header Files/stdafx.h" - #include "Scoreboard.h" +class Player; + Objective* Scoreboard::getObjective(const std::wstring& name) { return nullptr; // return objectivesByName.find(name)->second; diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/Scoreboard.h b/minecraft/Minecraft.World/net/minecraft/world/scores/Scoreboard.h index 3cd54c45f..a9b955de2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/Scoreboard.h +++ b/minecraft/Minecraft.World/net/minecraft/world/scores/Scoreboard.h @@ -1,5 +1,13 @@ #pragma once +#include +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" + class Objective; class ObjectiveCriteria; class PlayerTeam; diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/Team.cpp b/minecraft/Minecraft.World/net/minecraft/world/scores/Team.cpp index 71b3e590b..494c1b181 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/Team.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/scores/Team.cpp @@ -1,5 +1,3 @@ -#include "../../../../Header Files/stdafx.h" - #include "Team.h" bool Team::isAlliedTo(Team* other) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/Team.h b/minecraft/Minecraft.World/net/minecraft/world/scores/Team.h index b9ca1c3cd..f2ce3c037 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/Team.h +++ b/minecraft/Minecraft.World/net/minecraft/world/scores/Team.h @@ -1,5 +1,7 @@ #pragma once +#include + class Team { public: virtual bool isAlliedTo(Team* other); diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.cpp b/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.cpp index 464c076f5..bdd9123a1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.cpp @@ -1,6 +1,7 @@ -#include "../../../../../Header Files/stdafx.h" +#include #include "DummyCriteria.h" +#include "Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.h" DummyCriteria::DummyCriteria(const std::wstring& name) { this->name = name; diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.h b/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.h index 0acfab007..b1b5a59b2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.h +++ b/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "ObjectiveCriteria.h" class DummyCriteria : public ObjectiveCriteria { diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/HealthCriteria.cpp b/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/HealthCriteria.cpp index bfb427622..fae24f2e9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/HealthCriteria.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/HealthCriteria.cpp @@ -1,6 +1,10 @@ -#include "../../../../../Header Files/stdafx.h" -#include "../../entity/player/net.minecraft.world.entity.player.h" +#include +#include + #include "HealthCriteria.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.h" HealthCriteria::HealthCriteria(const std::wstring& id) : DummyCriteria(id) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/HealthCriteria.h b/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/HealthCriteria.h index a41709dc7..6c6825bf4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/HealthCriteria.h +++ b/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/HealthCriteria.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "DummyCriteria.h" class HealthCriteria : public DummyCriteria { diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.cpp b/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.cpp index 79cbdac23..6f9c358f5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.cpp @@ -1,6 +1,6 @@ -#include "../../../../../Header Files/stdafx.h" -#include "net.minecraft.world.scores.criteria.h" #include "ObjectiveCriteria.h" +#include "Minecraft.World/net/minecraft/world/scores/criteria/DummyCriteria.h" +#include "Minecraft.World/net/minecraft/world/scores/criteria/HealthCriteria.h" std::unordered_map ObjectiveCriteria::CRITERIA_BY_NAME; diff --git a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.h b/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.h index d3f0ab773..798765b65 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.h +++ b/minecraft/Minecraft.World/net/minecraft/world/scores/criteria/ObjectiveCriteria.h @@ -1,5 +1,12 @@ #pragma once +#include +#include +#include +#include + +class Player; + class ObjectiveCriteria { public: static std::unordered_map