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

fix a whole lot of missing includes

Browse source
This commit is contained in:
Tropical 2026-03-31 21:23:57 -05:00
parent 4271e562a6
commit 251ec595e8
131 changed files with 305 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
minecraft/Minecraft.Client/Common/Consoles_App.cpp
View file

@ -50,6 +50,7 @@
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h"
#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "4J_Input.h"
#include "Minecraft.Client/net/minecraft/client/gui/Gui.h"

2
minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.h
View file

@ -8,7 +8,7 @@ using namespace std;
#include <string>
#include "Minecraft.World/Header Files/SoundTypes.h"
#include "./miniaudio.h"
#include "miniaudio.h"
#include "Minecraft.Client/Common/App_Defines.h"
#include "Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h"
#include "Minecraft.Client/Linux/Iggy/include/rrCore.h"

2
minecraft/Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h
View file

@ -1,6 +1,6 @@
#pragma once
// #include "
#include "java/InputOutputStream/DataOutputStream.h"
class ConsoleGameRules {
public:

7
minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp
View file

@ -1,9 +1,9 @@
#include <fstream>
#include <filesystem>
#include <unordered_set>
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "Minecraft.World/net/minecraft/Pos.h"
#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h"
@ -13,6 +13,9 @@
#include "LevelGenerationOptions.h"
#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h"
#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "4J_Storage.h"
JustGrSource::JustGrSource() {
m_displayName = L"Default_DisplayName";

1
minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp
View file

@ -12,6 +12,7 @@
#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/tile/Tile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer() {
m_tile = Tile::chest_Id;

1
minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/InputConstraint.cpp
View file

@ -1,5 +1,6 @@
#include "InputConstraint.h"
#include "4J_Input.h"
#include "4J.Common/4J_InputActions.h"
#include "Minecraft.Client/Common/App_enums.h"
bool InputConstraint::isMappingConstrained(int iPad, int mapping) {

7
minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.cpp
View file

@ -1,4 +1,5 @@
#include "Minecraft.World/Header Files/stdafx.h"
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.World/ConsoleHelpers/PlatformTime.h"
#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h"
#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
@ -20,6 +21,8 @@
#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHints.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "4J.Common/4J_InputActions.h"
std::vector<int> Tutorial::s_completableTasks;
int Tutorial::m_iTutorialHintDelayTime = 14000;
@ -1940,7 +1943,7 @@ Tutorial::~Tutorial() {
void Tutorial::debugResetPlayerSavedProgress(int iPad) {
GAME_SETTINGS* pGameSettings =
(GAME_SETTINGS*)ProfileManager.GetGameDefinedProfileData(iPad);
ZeroMemory(pGameSettings->ucTutorialCompletion,
memset(pGameSettings->ucTutorialCompletion, 0,
TUTORIAL_PROFILE_STORAGE_BYTES);
pGameSettings->uiSpecialTutorialBitmask = 0;
}

7
minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp
View file

@ -1,4 +1,6 @@
#include <cmath>
#include "Minecraft.Client/Header Files/stdafx.h"
#include "IUIScene_AbstractContainerMenu.h"
@ -8,7 +10,12 @@
#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h"
#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h"
#include "4J_Input.h"
#include "4J.Common/4J_InputActions.h"
IUIScene_AbstractContainerMenu::IUIScene_AbstractContainerMenu() {
m_menu = nullptr;

1
minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.cpp
View file

@ -1,3 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "IUIScene_AnvilMenu.h"
#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"

2
minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.cpp
View file

@ -1,13 +1,13 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "4J.Common/4J_InputActions.h"
#include "Minecraft.World/net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.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.Client/net/minecraft/client/player/LocalPlayer.h"
#include "IUIScene_CraftingMenu.h"
#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
Recipy::_eGroupType IUIScene_CraftingMenu::m_GroupTypeMapping4GridA
[IUIScene_CraftingMenu::m_iMaxGroup2x2] = {

5
minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.cpp
View file

@ -1,3 +1,6 @@
#include <cmath>
#include "Minecraft.Client/Header Files/stdafx.h"
#include "IUIScene_CreativeMenu.h"
@ -10,8 +13,10 @@
#include "Minecraft.World/net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h"
#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h"
#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
#include "Minecraft.Client/Common/Potion_Macros.h"
#include "java/JavaMath.h"
#include "4J.Common/4J_InputActions.h"
// 4J JEV - Images for each tab.
IUIScene_CreativeMenu::TabSpec** IUIScene_CreativeMenu::specs = nullptr;

6
minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.h
View file

@ -1,5 +1,11 @@
#pragma once
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
#include "4J_Storage.h"
#include "4J_Profile.h"
class IUIScene_PauseMenu {
protected:
DLCPack* m_pDLCPack;

6
minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.cpp
View file

@ -1,12 +1,18 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h"
#include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h"
#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
#include "IUIScene_TradingMenu.h"
#include "4J.Common/4J_InputActions.h"
IUIScene_TradingMenu::IUIScene_TradingMenu() {
m_validOffersCount = 0;
m_selectedSlot = 0;

1
minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.h
View file

@ -10,6 +10,7 @@
#include "Minecraft.Client/Common/Source Files/UI/UIString.h"
#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
#include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
#include "4J.Common/4J_InputActions.h"
class UILayer;

2
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.cpp
View file

@ -6,6 +6,8 @@
#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "4J.Common/4J_InputActions.h"
class UILayer;
const wchar_t*

2
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h
View file

@ -1,6 +1,8 @@
#pragma once
#include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h"
class UIScene_DLCOffersMenu : public UIScene {
private:

4
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.h
View file

@ -1,5 +1,9 @@
#pragma once
#include <string>
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h"
#include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
class UIScene_EULA : public UIScene {

1
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h
View file

@ -2,6 +2,7 @@
#include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h"
class UIScene_LeaderboardsMenu : public UIScene,
public LeaderboardReadListener {

7
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h
View file

@ -1,7 +1,14 @@
#pragma once
#include <vector>
#include <string>
#include "java/File.h"
#include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h"
#include "4J_Storage.h"
class LevelGenerationOptions;

1
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp
View file

@ -7,6 +7,7 @@
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "Minecraft.Client/net/minecraft/client/gui/Font.h"
#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include "UIScene_MainMenu.h"

2
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h
View file

@ -1,6 +1,8 @@
#pragma once
#include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h"
class UIScene_NewUpdateMessage : public UIScene {
private:

1
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.h
View file

@ -1,6 +1,7 @@
#pragma once
#include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h"
class UIScene_HowToPlay : public UIScene {
public:

1
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h
View file

@ -2,6 +2,7 @@
#include "UIScene_AbstractContainerMenu.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h"
#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.h"
class UIScene_BeaconMenu : public UIScene_AbstractContainerMenu,

1
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h
View file

@ -3,6 +3,7 @@
#include "UIScene_AbstractContainerMenu.h"
#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_EnchantingMenu.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.h"
class InventoryMenu;

1
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp
View file

@ -1,3 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"

2
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp
View file

@ -5,6 +5,8 @@
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include "UIScene_FurnaceMenu.h"
#include "4J_Profile.h"
UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void* _initData,
UILayer* parentLayer)
: UIScene_AbstractContainerMenu(iPad, parentLayer) {

1
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h
View file

@ -2,6 +2,7 @@
#include "UIScene_AbstractContainerMenu.h"
#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_InventoryMenu.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.h"
#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h"

1
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp
View file

@ -5,6 +5,7 @@
#include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h"
#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include "UIScene_TradingMenu.h"

1
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h
View file

@ -4,6 +4,7 @@
#include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h"
class UIScene_InGameInfoMenu : public UIScene {
private:

1
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h
View file

@ -4,6 +4,7 @@
#include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h"
class UIScene_TeleportMenu : public UIScene {
private:

4
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.cpp
View file

@ -1,7 +1,11 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_Keyboard.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#define KEYBOARD_DONE_TIMER_ID 0
#define KEYBOARD_DONE_TIMER_TIME 100

1
minecraft/Minecraft.Client/Common/Source Files/UI/UIController.cpp
View file

@ -4,6 +4,7 @@
#include "UI.h"
#include "UIScene.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "Minecraft.Client/Header Files/BufferedImage.h"
#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"

1
minecraft/Minecraft.Client/Header Files/BufferedImage.h
View file

@ -1,5 +1,6 @@
#pragma once
#include <cstdint>
#include <string>
#include <vector>
class Graphics;

2
minecraft/Minecraft.Client/Header Files/stubs.h
View file

@ -157,6 +157,7 @@ void glActiveTexture(int);
#endif
#ifdef __linux__
#include "java/File.h"
class GL11 {
public:
@ -217,7 +218,6 @@ public:
class ZipEntry {};
class InputStream;
class File;
class ZipFile {
public:
ZipFile(File* file) {}

2
minecraft/Minecraft.Client/Linux/LinuxGL.cpp
View file

@ -1,5 +1,7 @@
#ifdef __linux__
#include <cstring>
#include "4J.Render/4J_Render.h"
#include "java/IntBuffer.h"
#include "java/FloatBuffer.h"

4
minecraft/Minecraft.Client/Linux/Stubs/winapi_stubs.h
View file

@ -5,10 +5,14 @@
#include <cassert>
#include <cstdarg>
#include <cerrno>
#include <cstdio>
#include <cwchar>
#include <fcntl.h>
#include <unistd.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/time.h>
#define TRUE true
#define FALSE false

3
minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp
View file

@ -4,6 +4,9 @@
#include <stdlib.h>
#include <string.h>
#include <sys/time.h>
#include <pthread.h>
#include "4J.Common/4J_Compat.h"
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
#include "Minecraft.World/x64headers/extraX64.h"

4
minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp
View file

@ -6,9 +6,7 @@
#include "Camera.h"
#include "MemoryTracker.h"
#include "Minecraft.World/net/minecraft/world/level/TilePos.h"
#include "Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMath.h"
#include "Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMathConvert.inl"
#include "Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMathMatrix.inl"
#include "Minecraft.Client/Linux/Stubs/d3d11_stubs.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"

1
minecraft/Minecraft.Client/net/minecraft/client/User.h
View file

@ -2,6 +2,7 @@
#include <format>
#include <string>
#include <vector>
class Tile;

2
minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp
View file

@ -35,7 +35,9 @@
#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h"
#include "Minecraft.Client/net/minecraft/client/ClientConstants.h"
#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
#include "Minecraft.Client/net/minecraft/client/gui/Font.h"
#include "Minecraft.World/net/minecraft/util/Mth.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "4J.Common/4J_Compat.h"
ResourceLocation Gui::PUMPKIN_BLUR_LOCATION =

1
minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp
View file

@ -4,6 +4,7 @@
#include "Minecraft.World/Header Files/SoundTypes.h"
#include "Minecraft.Client/net/minecraft/client/gui/Screen.h"
#include "4J_Profile.h"
#include "4J_Input.h"
#include "Minecraft.Client/Common/App_enums.h"
#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h"
#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"

1
minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h
View file

@ -1,6 +1,7 @@
#pragma once
#include <stdint.h>
#include <format>
#include <vector>
class Button;
class Tesselator;

8
minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.cpp
View file

@ -129,13 +129,13 @@ void SpiderModel::setupAnim(float time, float r, float bob, float yRot,
-((float)cosf(time * 0.6662f * 2 + std::numbers::pi * 2 * 3 / 4.0f) * 0.4f) * r;
float s0 =
abs((float)sinf(time * 0.6662f + std::numbers::pi * 2 * 0 / 4.0f) * 0.4f) * r;
std::abs((float)sinf(time * 0.6662f + std::numbers::pi * 2 * 0 / 4.0f) * 0.4f) * r;
float s1 =
abs((float)sinf(time * 0.6662f + std::numbers::pi * 2 * 2 / 4.0f) * 0.4f) * r;
std::abs((float)sinf(time * 0.6662f + std::numbers::pi * 2 * 2 / 4.0f) * 0.4f) * r;
float s2 =
abs((float)sinf(time * 0.6662f + std::numbers::pi * 2 * 1 / 4.0f) * 0.4f) * r;
std::abs((float)sinf(time * 0.6662f + std::numbers::pi * 2 * 1 / 4.0f) * 0.4f) * r;
float s3 =
abs((float)sinf(time * 0.6662f + std::numbers::pi * 2 * 3 / 4.0f) * 0.4f) * r;
std::abs((float)sinf(time * 0.6662f + std::numbers::pi * 2 * 3 / 4.0f) * 0.4f) * r;
leg0->yRot += +c0;
leg1->yRot += -c0;

2
minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.cpp
View file

@ -86,6 +86,6 @@ void VillagerGolemModel::prepareMobModel(std::shared_ptr<LivingEntity> mob,
}
float VillagerGolemModel::triangleWave(float bob, float period) {
return (abs(fmod(bob, period) - period * 0.5f) - period * 0.25f) /
return (std::abs(fmod(bob, period) - period * 0.5f) - period * 0.25f) /
(period * 0.25f);
}

1
minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp
View file

@ -1,3 +1,4 @@
#include <cmath>
#include "WitherBossModel.h"
#include "Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h"

1
minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.h
View file

@ -3,6 +3,7 @@
#include <float.h>
#include <cstdint>
#include <format>
#include <vector>
class ChunkRebuildData;
class IntBuffer;

5
minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp
View file

@ -1,6 +1,7 @@
#include <GL/gl.h>
#include <assert.h>
#include <string.h>
#include <string>
#include <cstring>
#include <cstdint>
#include <utility>
@ -460,7 +461,7 @@ void Textures::bindTextureLayers(ResourceLocation* resource) {
continue;
}
wstring resourceName = wstring(preLoaded[textureName]) + L".png";
std::wstring resourceName = std::wstring(preLoaded[textureName]) + L".png";
BufferedImage* image = readImage(textureName, resourceName);
if (image == nullptr) {
continue;

1
minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp
View file

@ -1,3 +1,4 @@
#include <cmath>
#include "Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.h"
#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"

1
minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp
View file

@ -1,3 +1,4 @@
#include <cmath>
#include "Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.h"
#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"

1
minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp
View file

@ -1,3 +1,4 @@
#include <cmath>
#include "WitherBossRenderer.h"
#include "Minecraft.Client/net/minecraft/client/model/WitherBossModel.h"

1
minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.h
View file

@ -1,5 +1,6 @@
#pragma once
#include <vector>
#include <format>
#include <string>

1
minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h
View file

@ -3,6 +3,7 @@
#include <GL/gl.h>
#include <format>
#include <string>
#include <vector>
class Rect2i;
class ByteBuffer;

6
minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.h
View file

@ -1,6 +1,12 @@
#pragma once
#include "Minecraft.Client/Header Files/stdafx.h"
#include "AbstractTexturePack.h"
#include "java/InputOutputStream/InputStream.h"
#include "strings.h"
class DefaultTexturePack : public AbstractTexturePack {
public:
DefaultTexturePack();

7
minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp
View file

@ -1,3 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "TexturePackRepository.h"
#include "DefaultTexturePack.h"
@ -8,6 +9,12 @@
#include "java/File.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "Minecraft.Client/net/minecraft/client/gui/Minimap.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h"
#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
#include "4J_Input.h"
#include "strings.h"
TexturePack* TexturePackRepository::DEFAULT_TEXTURE_PACK = nullptr;

3
minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h
View file

@ -1,5 +1,8 @@
#pragma once
#include <unordered_map>
#include "TexturePack.h"
#include "java/File.h"
class Minecraft;

5
minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp
View file

@ -1,5 +1,4 @@
// #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include "Minecraft.Client/Header Files/stdafx.h"
#include <ctime>
#include <thread>
@ -52,6 +51,8 @@
#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h"
#include "4J_Input.h"
#include "Minecraft.World/net/minecraft/world/level/Level.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h"
#define DEBUG_SERVER_DONT_SPAWN_MOBS 0

6
minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp
View file

@ -1,5 +1,8 @@
#include <cstdint>
#include <cmath>
#include "Minecraft.Client/Header Files/stdafx.h"
#include "PlayerList.h"
#include "Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h"
#include "MinecraftServer.h"
@ -28,6 +31,7 @@
#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
// 4J - this class is fairly substantially altered as there didn't seem any
// point in porting code for banning, whitelisting, ops etc.

8
minecraft/Minecraft.Client/net/minecraft/server/PlayerList.h
View file

@ -2,7 +2,11 @@
#include <cstdint>
#include <deque>
#include <mutex>
#include <vector>
#include <memory>
#include <unordered_map>
#include "nbt/CompoundTag.h"
#include "4J.Common/4J_Compat.h"
class ServerPlayer;
@ -18,6 +22,10 @@ class GameType;
class LoginPacket;
class Connection;
class ServerScoreboard;
class Entity;
class Pos;
class Player;
class Level;
class PlayerList {
private:

3
minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp
View file

@ -2,6 +2,7 @@
#include <chrono>
#include <mutex>
#include "Minecraft.Client/Header Files/stdafx.h"
#include "ServerLevel.h"
#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
@ -45,6 +46,8 @@
#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h"
#include "4J_Input.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"
std::vector<WeighedTreasure*> ServerLevel::RANDOM_BONUS_ITEMS;

5
minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp
View file

@ -1,4 +1,5 @@
#include <cfloat>
#include <cmath>
#include "ServerPlayer.h"
#include "ServerPlayerGameMode.h"
@ -28,6 +29,10 @@
#include "Minecraft.World/net/minecraft/world/scores/criteria/net.minecraft.world.scores.criteria.h"
#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h"
#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"
#include "4J_Input.h"
#include "Minecraft.World/net/minecraft/Pos.h"
#include "java/Random.h"

2
minecraft/Minecraft.World/ConsoleHelpers/C4JThread.cpp
View file

@ -1,4 +1,4 @@
#include <bits/cpu-set.h>
#include <sched.h>
#include <bit>
#include <cassert>
#include <cerrno>

3
minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h
View file

@ -1,5 +1,8 @@
#pragma once
#include <string>
#include "java/File.h"
#include "FileHeader.h"
#include "ConsoleSavePath.h"

1
minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
View file

@ -33,6 +33,7 @@
#include "java/InputOutputStream/DataInputStream.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "java/System.h"
#include "java/File.h"
#include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "platform/PlatformServices.h"

2
minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h
View file

@ -1,5 +1,7 @@
#pragma once
#include <string>
class ConsoleSavePath {
private:
std::wstring path;

1
minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h
View file

@ -4,6 +4,7 @@
#include "Minecraft.World/ConsoleHelpers/Definitions.h"
#include <cstring>
#include <string>
// The first 4 bytes is the location of the header (the header itself is at the
// end of the file) Then 4 bytes for the size of the header Then 2 bytes for the

5
minecraft/Minecraft.World/ConsoleHelpers/StringHelpers.cpp
View file

@ -1,5 +1,10 @@
#include "simdutf.h"
#include <algorithm>
#include <cassert>
#include <vector>
#include <sstream>
std::wstring toLower(const std::wstring& a) {
std::wstring out = std::wstring(a);
std::transform(out.begin(), out.end(), out.begin(), ::tolower);

1
minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.h
View file

@ -3,6 +3,7 @@
#include <stdint.h>
#include <format>
#include <memory>
#include <vector>
#include <unordered_map>
#include <unordered_set>

2
minecraft/Minecraft.World/net/minecraft/stats/NumberFormatters.h
View file

@ -1,5 +1,7 @@
#pragma once
#include <string>
// 4J Stu - The java formated numbers based on a local passed in, but I am just
// going for a constant format here
class NumberFormat {

1
minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.h
View file

@ -4,6 +4,7 @@
#include "Minecraft.Client/Common/App_enums.h"
#include <unordered_map>
#include <memory>
class Mob;
class MobEffectInstance;

6
minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.cpp
View file

@ -319,9 +319,9 @@ void PathfinderMob::tickLeash() {
double dy = (leashHolder->y - y) / _distanceTo;
double dz = (leashHolder->z - z) / _distanceTo;
xd += dx * abs(dx) * .4;
yd += dy * abs(dy) * .4;
zd += dz * abs(dz) * .4;
xd += dx * std::abs(dx) * .4;
yd += dy * std::abs(dy) * .4;
zd += dz * std::abs(dz) * .4;
}
if (_distanceTo > 10) {
dropLeash(true, true);

1
minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp
View file

@ -3,6 +3,7 @@
#include "TamableAnimal.h"
#include "java/Random.h"
#include "nbt/CompoundTag.h"
#include "Minecraft.World/net/minecraft/world/entity/player/Player.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"

2
minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.cpp
View file

@ -1,5 +1,7 @@
#include "Attribute.h"
#include "strings.h"
const int Attribute::AttributeNames[] = {
IDS_ATTRIBUTE_NAME_GENERIC_MAXHEALTH,
IDS_ATTRIBUTE_NAME_GENERIC_FOLLOWRANGE,

1
minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h
View file

@ -1,6 +1,7 @@
#pragma once
#include <format>
#include <vector>
#include <memory>
#include <unordered_map>

2
minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.cpp
View file

@ -1,3 +1,4 @@
#include <cmath>
#include "nbt/com.mojang.nbt.h"
#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
@ -11,6 +12,7 @@
#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 "Minecraft.World/net/minecraft/util/Mth.h"
#include "java/Random.h"
#include "Animal.h"

1
minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp
View file

@ -4,6 +4,7 @@
#include "net.minecraft.world.entity.boss.enderdragon.h"
#include "EnderCrystal.h"
#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h"
#include "Minecraft.World/net/minecraft/util/Mth.h"
void EnderCrystal::_init(Level* level) {
// 4J Stu - This function call had to be moved here from the Entity ctor to

4
minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp
View file

@ -13,9 +13,11 @@
#include "net.minecraft.world.entity.boss.enderdragon.h"
#include "Minecraft.World/net/minecraft/world/level/pathfinder/net.minecraft.world.level.pathfinder.h"
#include "Minecraft.World/net/minecraft/SharedConstants.h"
#include "Minecraft.World/net/minecraft/util/Mth.h"
#include "EnderDragon.h"
#include <limits>
#include <optional>
#include <cmath>
#define PRINT_DRAGON_STATE_CHANGE_MESSAGES 1
@ -919,7 +921,7 @@ void EnderDragon::findNewTarget() {
// More likely to strafe a player if they are close to the egg,
// or there are not many crystals remaining
else if (playerNearestToEgg != nullptr &&
(random->nextInt(abs(dist) + 2) == 0 ||
(random->nextInt(std::abs(dist) + 2) == 0 ||
random->nextInt(m_remainingCrystalsCount + 2) == 0)) {
setSynchedAction(e_EnderdragonAction_StrafePlayer);
#if PRINT_DRAGON_STATE_CHANGE_MESSAGES

2
minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp
View file

@ -1,3 +1,5 @@
#include "Minecraft.World/Header Files/stdafx.h"
#include "nbt/com.mojang.nbt.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"

3
minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp
View file

@ -9,6 +9,7 @@
#include "java/Class.h"
#include "java/Random.h"
#include "nbt/CompoundTag.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/Tile.h"
#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
@ -263,7 +264,7 @@ float Throwable::getShadowHeightOffs() { return 0; }
std::shared_ptr<LivingEntity> Throwable::getOwner() {
if (owner == nullptr && !ownerName.empty()) {
owner = std::dynamic_pointer_cast<LivingEntity>(level->getPlayerByName(ownerName));
owner = level->getPlayerByName(ownerName);
}
return owner;
}

3
minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.cpp
View file

@ -1,6 +1,7 @@
#include "AnimalChest.h"
#include "strings.h"
AnimalChest::AnimalChest(const std::wstring& name, int size)
: SimpleContainer(IDS_CONTAINER_ANIMAL, name, false, size) {}

2
minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp
View file

@ -1,3 +1,5 @@
#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"

2
minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp
View file

@ -1,3 +1,5 @@
#include "Minecraft.World/Header Files/stdafx.h"
#include "net.minecraft.world.item.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"

4
minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp
View file

@ -1,3 +1,5 @@
#include "Minecraft.World/Header Files/stdafx.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include "Minecraft.World/net/minecraft/net.minecraft.h"
#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
@ -12,6 +14,8 @@
#include "Minecraft.World/net/minecraft/util/Mth.h"
#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
SpawnEggItem::SpawnEggItem(int id) : Item(id) {
setMaxStackSize(16); // 4J-PB brought forward. It is 64 on PC, but we'll
// never be able to place that many

2
minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp
View file

@ -1,5 +1,7 @@
#include "ArrowDamageEnchantment.h"
#include "strings.h"
ArrowDamageEnchantment::ArrowDamageEnchantment(int id, int frequency)
: Enchantment(id, frequency, EnchantmentCategory::bow) {
setDescriptionId(IDS_ENCHANTMENT_ARROW_DAMAGE);

2
minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp
View file

@ -1,5 +1,7 @@
#include "ArrowInfiniteEnchantment.h"
#include "strings.h"
ArrowInfiniteEnchantment::ArrowInfiniteEnchantment(int id, int frequency)
: Enchantment(id, frequency, EnchantmentCategory::bow) {
setDescriptionId(IDS_ENCHANTMENT_ARROW_INFINITE);

2
minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp
View file

@ -1,5 +1,7 @@
#include "ArrowKnockbackEnchantment.h"
#include "strings.h"
ArrowKnockbackEnchantment::ArrowKnockbackEnchantment(int id, int frequency)
: Enchantment(id, frequency, EnchantmentCategory::bow) {
setDescriptionId(IDS_ENCHANTMENT_ARROW_KNOCKBACK);

2
minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DamageEnchantment.cpp
View file

@ -2,6 +2,8 @@
#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
#include "DamageEnchantment.h"
#include "strings.h"
const int DamageEnchantment::names[] = {IDS_ENCHANTMENT_DAMAGE_ALL,
IDS_ENCHANTMENT_DAMAGE_UNDEAD,
IDS_ENCHANTMENT_DAMAGE_ARTHROPODS};

3
minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp
View file

@ -1,8 +1,9 @@
#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
#include "DigDurabilityEnchantment.h"
#include "java/Random.h"
#include "strings.h"
DigDurabilityEnchantment::DigDurabilityEnchantment(int id, int frequency)
: Enchantment(id, frequency, EnchantmentCategory::digger) {
setDescriptionId(IDS_ENCHANTMENT_DURABILITY);

2
minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DiggingEnchantment.cpp
View file

@ -1,6 +1,8 @@
#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
#include "DiggingEnchantment.h"
#include "strings.h"
DiggingEnchantment::DiggingEnchantment(int id, int frequency)
: Enchantment(id, frequency, EnchantmentCategory::digger) {
setDescriptionId(IDS_ENCHANTMENT_DIGGING);

2
minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp
View file

@ -4,6 +4,8 @@
#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
#include "Enchantment.h"
#include "strings.h"
// Enchantment *Enchantment::enchantments[256];
std::vector<Enchantment*> Enchantment::enchantments = std::vector<Enchantment*>(256);
std::vector<Enchantment*> Enchantment::validEnchantments;

2
minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.cpp
View file

@ -3,6 +3,8 @@
#include "EnchantmentInstance.h"
#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h"
#include "strings.h"
EnchantmentInstance::EnchantmentInstance(Enchantment* enchantment, int level)
: WeighedRandomItem(enchantment->getFrequency()),
enchantment(enchantment),

2
minecraft/Minecraft.World/net/minecraft/world/item/enchantment/FireAspectEnchantment.cpp
View file

@ -1,5 +1,7 @@
#include "FireAspectEnchantment.h"
#include "strings.h"
FireAspectEnchantment::FireAspectEnchantment(int id, int frequency)
: Enchantment(id, frequency, EnchantmentCategory::weapon) {
setDescriptionId(IDS_ENCHANTMENT_FIRE);

2
minecraft/Minecraft.World/net/minecraft/world/item/enchantment/LootBonusEnchantment.cpp
View file

@ -1,5 +1,7 @@
#include "LootBonusEnchantment.h"
#include "strings.h"
LootBonusEnchantment::LootBonusEnchantment(int id, int frequency,
const EnchantmentCategory* cat)
: Enchantment(id, frequency, cat) {

2
minecraft/Minecraft.World/net/minecraft/world/item/enchantment/OxygenEnchantment.cpp
View file

@ -1,5 +1,7 @@
#include "OxygenEnchantment.h"
#include "strings.h"
OxygenEnchantment::OxygenEnchantment(int id, int frequency)
: Enchantment(id, frequency, EnchantmentCategory::armor_head) {
setDescriptionId(IDS_ENCHANTMENT_OXYGEN);

2
minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.cpp
View file

@ -4,6 +4,8 @@
#include "Minecraft.World/net/minecraft/util/Mth.h"
#include "ProtectionEnchantment.h"
#include "strings.h"
const int ProtectionEnchantment::names[] = {
IDS_ENCHANTMENT_PROTECT_ALL, IDS_ENCHANTMENT_PROTECT_FIRE,
IDS_ENCHANTMENT_PROTECT_FALL, IDS_ENCHANTMENT_PROTECT_EXPLOSION,

2
minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.cpp
View file

@ -4,6 +4,8 @@
#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h"
#include "ThornsEnchantment.h"
#include "strings.h"
const float ThornsEnchantment::CHANCE_PER_LEVEl = 0.15f;
ThornsEnchantment::ThornsEnchantment(int id, int freq)

2
minecraft/Minecraft.World/net/minecraft/world/item/enchantment/UntouchingEnchantment.cpp
View file

@ -1,6 +1,8 @@
#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
#include "UntouchingEnchantment.h"
#include "strings.h"
UntouchingEnchantment::UntouchingEnchantment(int id, int frequency)
: Enchantment(id, frequency, EnchantmentCategory::digger) {
setDescriptionId(IDS_ENCHANTMENT_UNTOUCHING);

2
minecraft/Minecraft.World/net/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp
View file

@ -1,5 +1,7 @@
#include "WaterWorkerEnchantment.h"
#include "strings.h"
WaterWorkerEnchantment::WaterWorkerEnchantment(int id, int frequency)
: Enchantment(id, frequency, EnchantmentCategory::armor_head) {
setDescriptionId(IDS_ENCHANTMENT_WATER_WORKER);

4
minecraft/Minecraft.World/net/minecraft/world/item/trading/Merchant.h
View file

@ -1,8 +1,12 @@
#pragma once
#include <memory>
#include <string>
class MerchantRecipeList;
class MerchantRecipe;
class Player;
class ItemInstance;
class Merchant {
public:

2
minecraft/Minecraft.World/net/minecraft/world/level/Level.h
View file

@ -1,7 +1,7 @@
#pragma once
#include <cstdint>
#include <mutex>
// #include <mutex>
#include <unordered_set>
#include <format>
#include <memory>

2
minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp
View file

@ -1,3 +1,5 @@
#include <cmath>
#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"

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