backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-26 21:52:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move Potion_Macros to world

Browse source
This commit is contained in:
Tropical 2026-04-01 10:02:46 -05:00
parent 5572846d25
commit 2b16d89d5d
8 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp
View file

@ -13,7 +13,7 @@
#include "Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h"
#include "FullTutorial.h"
#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h"
#include "Minecraft.Client/Common/Potion_Macros.h"
#include "Minecraft.World/include/Potion_Macros.h"
FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
: Tutorial(iPad, true) {

2
minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp
View file

@ -14,7 +14,7 @@
#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 "Minecraft.World/include/Potion_Macros.h"
#include "java/JavaMath.h"
#include "4J.Common/4J_InputActions.h"

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

@ -85,7 +85,7 @@
#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
#include "Minecraft.Client/Common/src/ConsoleGameMode.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "Minecraft.Client/Common/Potion_Macros.h"
#include "Minecraft.World/include/Potion_Macros.h"
#include "Minecraft.Client/Common/Minecraft_Macros.h"
#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
#include "4J_Input.h"

0
minecraft/Minecraft.Client/Common/Potion_Macros.h → minecraft/Minecraft.World/include/Potion_Macros.h
View file

2
minecraft/Minecraft.World/include/stdafx.h
View file

@ -7,7 +7,5 @@
#ifdef _WINDOWS64
#include "Minecraft.Client/Windows64/Windows64_App.h"
#else
// Use the Linux runtime path with supported metadata/config headers only.
#include "Minecraft.Client/Linux/Linux_App.h"
// #include "Minecraft.Client/Linux/Stubs/LinuxStubs.h"
#endif

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

@ -12,7 +12,7 @@
#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 "Minecraft.World/include/Potion_Macros.h"
#include "nbt/CompoundTag.h"
#include "nbt/IntTag.h"
#include "nbt/ListTag.h"

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

@ -13,7 +13,7 @@
#include "Minecraft.World/net/minecraft/SharedConstants.h"
#include "PotionItem.h"
#include "Minecraft.World/include/SoundTypes.h"
#include "Minecraft.Client/Common/Potion_Macros.h"
#include "Minecraft.World/include/Potion_Macros.h"
const std::wstring PotionItem::DEFAULT_ICON = L"potion";
const std::wstring PotionItem::THROWABLE_ICON = L"potion_splash";

2
minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp
View file

@ -7,7 +7,7 @@
#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"
#include "Minecraft.Client/Common/Potion_Macros.h"
#include "Minecraft.World/include/Potion_Macros.h"
int slotsForUp[] = {BrewingStandTileEntity::INGREDIENT_SLOT};
int slotsForOtherFaces[] = {0, 1, 2};