LegacyConsoleArchive/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-09-26 20:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: begin unglobbing std::vector

Browse Source
This commit is contained in:
Tropical
2026-03-08 22:43:43 +01:00
committed by JuiceyDev
parent d2e8a0f9f5
commit 5fad08b9fd
286 changed files with 738 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/Containers/AbstractContainerMenu.cpp
+6 -6
View File
@@ -8,14 +8,14 @@
// TODO Make sure all derived classes also call this
AbstractContainerMenu::AbstractContainerMenu()
{
lastSlots = new vector<std::shared_ptr<ItemInstance> >();
slots = new vector<Slot *>();
lastSlots = new std::vector<std::shared_ptr<ItemInstance> >();
slots = new std::vector<Slot *>();
containerId = 0;
changeUid = 0;
m_bNeedsRendered = false;
containerListeners = new vector<ContainerListener *>();
containerListeners = new std::vector<ContainerListener *>();
}
AbstractContainerMenu::~AbstractContainerMenu()
@@ -49,15 +49,15 @@ void AbstractContainerMenu::addSlotListener(ContainerListener *listener)
containerListeners->push_back(listener);
vector<std::shared_ptr<ItemInstance> > *items = getItems();
std::vector<std::shared_ptr<ItemInstance> > *items = getItems();
listener->refreshContainer(this, items);
delete items;
broadcastChanges();
}
vector<std::shared_ptr<ItemInstance> > *AbstractContainerMenu::getItems()
std::vector<std::shared_ptr<ItemInstance> > *AbstractContainerMenu::getItems()
{
vector<std::shared_ptr<ItemInstance> > *items = new vector<std::shared_ptr<ItemInstance> >();
std::vector<std::shared_ptr<ItemInstance> > *items = new std::vector<std::shared_ptr<ItemInstance> >();
AUTO_VAR(itEnd, slots->end());
for (AUTO_VAR(it, slots->begin()); it != itEnd; it++)
{
Minecraft.World/Containers/AbstractContainerMenu.h
+4 -4
View File
@@ -26,8 +26,8 @@ public:
static const int CONTAINER_ID_INVENTORY = 0;
static const int CONTAINER_ID_CREATIVE = -2;
vector<std::shared_ptr<ItemInstance> > *lastSlots;
vector<Slot *> *slots;
std::vector<std::shared_ptr<ItemInstance> > *lastSlots;
std::vector<Slot *> *slots;
int containerId;
private:
@@ -35,7 +35,7 @@ private:
bool m_bNeedsRendered; // 4J added
protected:
vector<ContainerListener *> *containerListeners;
std::vector<ContainerListener *> *containerListeners;
// 4J Stu - The java does not have ctor here (being an abstract) but we need one to initialise the member variables
// TODO Make sure all derived classes also call this
@@ -46,7 +46,7 @@ protected:
public:
virtual ~AbstractContainerMenu();
virtual void addSlotListener(ContainerListener *listener);
vector<std::shared_ptr<ItemInstance> > *getItems();
std::vector<std::shared_ptr<ItemInstance> > *getItems();
void sendData(int id, int value);
virtual void broadcastChanges();
virtual bool needsRendered();
Minecraft.World/Containers/EnchantmentMenu.cpp
+1 -1
View File
@@ -159,7 +159,7 @@ bool EnchantmentMenu::clickMenuButton(std::shared_ptr<Player> player, int i)
{
bool isBook = item->id == Item::book_Id;
vector<EnchantmentInstance *> *newEnchantment = EnchantmentHelper::selectEnchantment(&random, item, costs[i]);
std::vector<EnchantmentInstance *> *newEnchantment = EnchantmentHelper::selectEnchantment(&random, item, costs[i]);
if (newEnchantment != NULL)
{
player->withdrawExperienceLevels(costs[i]);
Minecraft.World/Containers/SimpleContainer.cpp
+3 -3
View File
@@ -16,7 +16,7 @@ SimpleContainer::SimpleContainer(int name, int size)
void SimpleContainer::addListener(net_minecraft_world::ContainerListener *listener)
{
if (listeners == NULL) listeners = new vector<net_minecraft_world::ContainerListener *>();
if (listeners == NULL) listeners = new std::vector<net_minecraft_world::ContainerListener *>();
listeners->push_back(listener);
}
@@ -25,8 +25,8 @@ void SimpleContainer::removeListener(net_minecraft_world::ContainerListener *lis
// 4J Java has a remove function on lists that will find the first occurence of
// an object and remove it. We need to replicate that ourselves
vector<net_minecraft_world::ContainerListener *>::iterator it = listeners->begin();
vector<net_minecraft_world::ContainerListener *>::iterator itEnd = listeners->end();
std::vector<net_minecraft_world::ContainerListener *>::iterator it = listeners->begin();
std::vector<net_minecraft_world::ContainerListener *>::iterator itEnd = listeners->end();
while( it != itEnd && *it != listener )
it++;
Minecraft.World/Containers/SimpleContainer.h
+1 -1
View File
@@ -10,7 +10,7 @@ private:
int name;
int size;
ItemInstanceArray *items;
vector<net_minecraft_world::ContainerListener *> *listeners;
std::vector<net_minecraft_world::ContainerListener *> *listeners;
public:
SimpleContainer(int name, int size);