chore: format Minecraft.World

2026-05-26 19:45:29 +00:00 · 2026-03-13 17:06:56 -05:00
parent bd6284025d
commit 33d0737d1d
1511 changed files with 108661 additions and 115521 deletions
--- a/Minecraft.World/Containers/FurnaceMenu.cpp
+++ b/Minecraft.World/Containers/FurnaceMenu.cpp
@@ -8,171 +8,154 @@
 #include "FurnaceMenu.h"
 #include "../Recipes/FurnaceRecipes.h"

-FurnaceMenu::FurnaceMenu(std::shared_ptr<Inventory> inventory, std::shared_ptr<FurnaceTileEntity> furnace) : AbstractContainerMenu()
-{
-	tc = 0;
-	lt = 0;
-	ld = 0;
+FurnaceMenu::FurnaceMenu(std::shared_ptr<Inventory> inventory,
+                         std::shared_ptr<FurnaceTileEntity> furnace)
+    : AbstractContainerMenu() {
+    tc = 0;
+    lt = 0;
+    ld = 0;

-	this->furnace = furnace;
+    this->furnace = furnace;

-	addSlot(new Slot(furnace, 0, 52 + 4, 13 + 4));
-	addSlot(new Slot(furnace, 1, 52 + 4, 49 + 4));
-	addSlot(new FurnaceResultSlot( std::dynamic_pointer_cast<Player>( inventory->player->shared_from_this() ), furnace, 2, 112 + 4, 31 + 4));
+    addSlot(new Slot(furnace, 0, 52 + 4, 13 + 4));
+    addSlot(new Slot(furnace, 1, 52 + 4, 49 + 4));
+    addSlot(new FurnaceResultSlot(std::dynamic_pointer_cast<Player>(
+                                      inventory->player->shared_from_this()),
+                                  furnace, 2, 112 + 4, 31 + 4));

-	for (int y = 0; y < 3; y++)
-	{
-		for (int x = 0; x < 9; x++)
-		{
-			addSlot(new Slot(inventory, x + y * 9 + 9, 8 + x * 18, 84 + y * 18));
-		}
-	}
-	for (int x = 0; x < 9; x++)
-	{
-		addSlot(new Slot(inventory, x, 8 + x * 18, 142));
-	}
+    for (int y = 0; y < 3; y++) {
+        for (int x = 0; x < 9; x++) {
+            addSlot(
+                new Slot(inventory, x + y * 9 + 9, 8 + x * 18, 84 + y * 18));
+        }
+    }
+    for (int x = 0; x < 9; x++) {
+        addSlot(new Slot(inventory, x, 8 + x * 18, 142));
+    }
 }

-void FurnaceMenu::addSlotListener(ContainerListener *listener)
-{
-	AbstractContainerMenu::addSlotListener(listener);
-	listener->setContainerData(this, 0, furnace->tickCount);
-	listener->setContainerData(this, 1, furnace->litTime);
-	listener->setContainerData(this, 2, furnace->litDuration);
+void FurnaceMenu::addSlotListener(ContainerListener* listener) {
+    AbstractContainerMenu::addSlotListener(listener);
+    listener->setContainerData(this, 0, furnace->tickCount);
+    listener->setContainerData(this, 1, furnace->litTime);
+    listener->setContainerData(this, 2, furnace->litDuration);
 }

-void FurnaceMenu::broadcastChanges()
-{
-	AbstractContainerMenu::broadcastChanges();
-	
-	AUTO_VAR(itEnd, containerListeners->end());
-	for (AUTO_VAR(it, containerListeners->begin()); it != itEnd; it++)
-	{
-		ContainerListener *listener = *it; //containerListeners->at(i);
-		if (tc != furnace->tickCount) 
-		{
-			listener->setContainerData(this, 0, furnace->tickCount);
-		}
-		if (lt != furnace->litTime)
-		{
-			listener->setContainerData(this, 1, furnace->litTime);
-		}
-		if (ld != furnace->litDuration) 
-		{
-			listener->setContainerData(this, 2, furnace->litDuration);
-		}
-	}
+void FurnaceMenu::broadcastChanges() {
+    AbstractContainerMenu::broadcastChanges();

-	tc = furnace->tickCount;
-	lt = furnace->litTime;
-	ld = furnace->litDuration;
+    AUTO_VAR(itEnd, containerListeners->end());
+    for (AUTO_VAR(it, containerListeners->begin()); it != itEnd; it++) {
+        ContainerListener* listener = *it;  // containerListeners->at(i);
+        if (tc != furnace->tickCount) {
+            listener->setContainerData(this, 0, furnace->tickCount);
+        }
+        if (lt != furnace->litTime) {
+            listener->setContainerData(this, 1, furnace->litTime);
+        }
+        if (ld != furnace->litDuration) {
+            listener->setContainerData(this, 2, furnace->litDuration);
+        }
+    }
+
+    tc = furnace->tickCount;
+    lt = furnace->litTime;
+    ld = furnace->litDuration;
 }

-void FurnaceMenu::setData(int id, int value)
-{
-	if (id == 0) furnace->tickCount = value;
-	if (id == 1) furnace->litTime = value;
-	if (id == 2) furnace->litDuration = value;
+void FurnaceMenu::setData(int id, int value) {
+    if (id == 0) furnace->tickCount = value;
+    if (id == 1) furnace->litTime = value;
+    if (id == 2) furnace->litDuration = value;
 }

-bool FurnaceMenu::stillValid(std::shared_ptr<Player> player)
-{
-	return furnace->stillValid(player);
+bool FurnaceMenu::stillValid(std::shared_ptr<Player> player) {
+    return furnace->stillValid(player);
 }

-std::shared_ptr<ItemInstance> FurnaceMenu::quickMoveStack(std::shared_ptr<Player> player, int slotIndex)
-{
-	std::shared_ptr<ItemInstance> clicked = nullptr;
-	Slot *slot = slots->at(slotIndex);
-	//Slot *IngredientSlot = slots->at(INGREDIENT_SLOT);
+std::shared_ptr<ItemInstance> FurnaceMenu::quickMoveStack(
+    std::shared_ptr<Player> player, int slotIndex) {
+    std::shared_ptr<ItemInstance> clicked = nullptr;
+    Slot* slot = slots->at(slotIndex);
+    // Slot *IngredientSlot = slots->at(INGREDIENT_SLOT);

-	bool charcoalUsed = furnace->wasCharcoalUsed();
+    bool charcoalUsed = furnace->wasCharcoalUsed();

-	if (slot != NULL && slot->hasItem())
-	{
-		std::shared_ptr<ItemInstance> stack = slot->getItem();
-		clicked = stack->copy();
+    if (slot != NULL && slot->hasItem()) {
+        std::shared_ptr<ItemInstance> stack = slot->getItem();
+        clicked = stack->copy();

-		if (slotIndex == RESULT_SLOT)
-		{
-			if (!moveItemStackTo(stack, INV_SLOT_START, USE_ROW_SLOT_END, true))
-			{
-				return nullptr;
-			}
-			slot->onQuickCraft(stack, clicked);
+        if (slotIndex == RESULT_SLOT) {
+            if (!moveItemStackTo(stack, INV_SLOT_START, USE_ROW_SLOT_END,
+                                 true)) {
+                return nullptr;
+            }
+            slot->onQuickCraft(stack, clicked);

-			// 4J-JEV, hook for Durango achievement 'Renewable Energy'.
+            // 4J-JEV, hook for Durango achievement 'Renewable Energy'.
 #ifdef _EXTENDED_ACHIEVEMENTS
-			if ( charcoalUsed && stack->getItem()->id == Item::coal_Id && stack->getAuxValue() == CoalItem::CHAR_COAL)
-				player->awardStat(GenericStats::renewableEnergy(),GenericStats::param_renewableEnergy());
+            if (charcoalUsed && stack->getItem()->id == Item::coal_Id &&
+                stack->getAuxValue() == CoalItem::CHAR_COAL)
+                player->awardStat(GenericStats::renewableEnergy(),
+                                  GenericStats::param_renewableEnergy());
 #endif
-		}
-		else if (slotIndex == FUEL_SLOT || slotIndex == INGREDIENT_SLOT)
-		{
-			if (!moveItemStackTo(stack, INV_SLOT_START, USE_ROW_SLOT_END, false))
-			{
-				return nullptr;
-			}
-		}
-		else if (FurnaceRecipes::getInstance()->getResult(stack->getItem()->id) != NULL)
-		{
-			if (!moveItemStackTo(stack, INGREDIENT_SLOT, INGREDIENT_SLOT + 1, false))
-			{
-				return nullptr;
-			}
-		}
-		else if (FurnaceTileEntity::isFuel(stack))
-		{
-			if (!moveItemStackTo(stack, FUEL_SLOT, FUEL_SLOT + 1, false))
-			{
-				return nullptr;
-			}
-		} else if (slotIndex >= INV_SLOT_START && slotIndex < INV_SLOT_END)
-		{
-			if (!moveItemStackTo(stack, USE_ROW_SLOT_START, USE_ROW_SLOT_END, false))
-			{
-				return nullptr;
-			}
-		} else if (slotIndex >= USE_ROW_SLOT_START && slotIndex < USE_ROW_SLOT_END)
-		{
-			if (!moveItemStackTo(stack, INV_SLOT_START, INV_SLOT_END, false))
-			{
-				return nullptr;
-			}
-		}
-		if (stack->count == 0)
-		{
-			slot->set(nullptr);
-		}
-		else
-		{
-			slot->setChanged();
-		}
-		if (stack->count == clicked->count)
-		{
-			return nullptr;
-		}
-		else
-		{
-			slot->onTake(player, stack);
-		}
-	}
-	return clicked;
+        } else if (slotIndex == FUEL_SLOT || slotIndex == INGREDIENT_SLOT) {
+            if (!moveItemStackTo(stack, INV_SLOT_START, USE_ROW_SLOT_END,
+                                 false)) {
+                return nullptr;
+            }
+        } else if (FurnaceRecipes::getInstance()->getResult(
+                       stack->getItem()->id) != NULL) {
+            if (!moveItemStackTo(stack, INGREDIENT_SLOT, INGREDIENT_SLOT + 1,
+                                 false)) {
+                return nullptr;
+            }
+        } else if (FurnaceTileEntity::isFuel(stack)) {
+            if (!moveItemStackTo(stack, FUEL_SLOT, FUEL_SLOT + 1, false)) {
+                return nullptr;
+            }
+        } else if (slotIndex >= INV_SLOT_START && slotIndex < INV_SLOT_END) {
+            if (!moveItemStackTo(stack, USE_ROW_SLOT_START, USE_ROW_SLOT_END,
+                                 false)) {
+                return nullptr;
+            }
+        } else if (slotIndex >= USE_ROW_SLOT_START &&
+                   slotIndex < USE_ROW_SLOT_END) {
+            if (!moveItemStackTo(stack, INV_SLOT_START, INV_SLOT_END, false)) {
+                return nullptr;
+            }
+        }
+        if (stack->count == 0) {
+            slot->set(nullptr);
+        } else {
+            slot->setChanged();
+        }
+        if (stack->count == clicked->count) {
+            return nullptr;
+        } else {
+            slot->onTake(player, stack);
+        }
+    }
+    return clicked;
 }

-std::shared_ptr<ItemInstance> FurnaceMenu::clicked(int slotIndex, int buttonNum, int clickType, std::shared_ptr<Player> player)
-{
-	bool charcoalUsed = furnace->wasCharcoalUsed();
+std::shared_ptr<ItemInstance> FurnaceMenu::clicked(
+    int slotIndex, int buttonNum, int clickType,
+    std::shared_ptr<Player> player) {
+    bool charcoalUsed = furnace->wasCharcoalUsed();

-	std::shared_ptr<ItemInstance> out = AbstractContainerMenu::clicked(slotIndex, buttonNum, clickType, player);
+    std::shared_ptr<ItemInstance> out =
+        AbstractContainerMenu::clicked(slotIndex, buttonNum, clickType, player);

 #ifdef _EXTENDED_ACHIEVEMENTS
-	if ( charcoalUsed && (out!=nullptr) && (buttonNum==0 || buttonNum==1) && clickType==CLICK_PICKUP
-		&& out->getItem()->id == Item::coal_Id && out->getAuxValue() == CoalItem::CHAR_COAL	)
-	{
-		player->awardStat(GenericStats::renewableEnergy(),GenericStats::param_renewableEnergy());
-	}
+    if (charcoalUsed && (out != nullptr) &&
+        (buttonNum == 0 || buttonNum == 1) && clickType == CLICK_PICKUP &&
+        out->getItem()->id == Item::coal_Id &&
+        out->getAuxValue() == CoalItem::CHAR_COAL) {
+        player->awardStat(GenericStats::renewableEnergy(),
+                          GenericStats::param_renewableEnergy());
+    }
 #endif

-	return out;
+    return out;
 }