sync furnace recipes

This commit is contained in:
DrPerkyLegit 2026-04-24 12:01:14 -04:00
parent dd6bc32821
commit 02b01e4e75
2 changed files with 67 additions and 29 deletions

View file

@ -17,30 +17,7 @@ FurnaceRecipes *FurnaceRecipes::getInstance()
FurnaceRecipes::FurnaceRecipes()
{
addFurnaceRecipy(Tile::ironOre_Id, new ItemInstance(Item::ironIngot), .7f);
addFurnaceRecipy(Tile::goldOre_Id, new ItemInstance(Item::goldIngot), 1);
addFurnaceRecipy(Tile::diamondOre_Id, new ItemInstance(Item::diamond), 1);
addFurnaceRecipy(Tile::sand_Id, new ItemInstance(Tile::glass), .1f);
addFurnaceRecipy(Item::porkChop_raw_Id, new ItemInstance(Item::porkChop_cooked), .35f);
addFurnaceRecipy(Item::beef_raw_Id, new ItemInstance(Item::beef_cooked), .35f);
addFurnaceRecipy(Item::chicken_raw_Id, new ItemInstance(Item::chicken_cooked), .35f);
addFurnaceRecipy(Item::fish_raw_Id, new ItemInstance(Item::fish_cooked), .35f);
addFurnaceRecipy(Tile::cobblestone_Id, new ItemInstance(Tile::stone), .1f);
addFurnaceRecipy(Item::clay_Id, new ItemInstance(Item::brick), .3f);
addFurnaceRecipy(Tile::clay_Id, new ItemInstance(Tile::clayHardened), .35f);
addFurnaceRecipy(Tile::cactus_Id, new ItemInstance(Item::dye_powder, 1, DyePowderItem::GREEN), .2f);
addFurnaceRecipy(Tile::treeTrunk_Id, new ItemInstance(Item::coal, 1, CoalItem::CHAR_COAL), .15f);
addFurnaceRecipy(Tile::emeraldOre_Id, new ItemInstance(Item::emerald), 1);
addFurnaceRecipy(Item::potato_Id, new ItemInstance(Item::potatoBaked), .35f);
addFurnaceRecipy(Tile::netherRack_Id, new ItemInstance(Item::netherbrick), .1f);
// special silk touch related recipes:
addFurnaceRecipy(Tile::coalOre_Id, new ItemInstance(Item::coal), .1f);
addFurnaceRecipy(Tile::redStoneOre_Id, new ItemInstance(Item::redStone), .7f);
addFurnaceRecipy(Tile::lapisOre_Id, new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), .2f);
addFurnaceRecipy(Tile::netherQuartz_Id, new ItemInstance(Item::netherQuartz), .2f);
this->rebuildRecipeArray();
}
void FurnaceRecipes::addFurnaceRecipy(int itemId, ItemInstance *result, float value)
@ -79,4 +56,41 @@ float FurnaceRecipes::getRecipeValue(int itemId)
return it->second;
}
return 0.0f;
}
void FurnaceRecipes::rebuildRecipeArray() {
this->clearAllRecipies();
addFurnaceRecipy(Tile::ironOre_Id, new ItemInstance(Item::ironIngot), .7f);
addFurnaceRecipy(Tile::goldOre_Id, new ItemInstance(Item::goldIngot), 1);
addFurnaceRecipy(Tile::diamondOre_Id, new ItemInstance(Item::diamond), 1);
addFurnaceRecipy(Tile::sand_Id, new ItemInstance(Tile::glass), .1f);
addFurnaceRecipy(Item::porkChop_raw_Id, new ItemInstance(Item::porkChop_cooked), .35f);
addFurnaceRecipy(Item::beef_raw_Id, new ItemInstance(Item::beef_cooked), .35f);
addFurnaceRecipy(Item::chicken_raw_Id, new ItemInstance(Item::chicken_cooked), .35f);
addFurnaceRecipy(Item::fish_raw_Id, new ItemInstance(Item::fish_cooked), .35f);
addFurnaceRecipy(Tile::cobblestone_Id, new ItemInstance(Tile::stone), .1f);
addFurnaceRecipy(Item::clay_Id, new ItemInstance(Item::brick), .3f);
addFurnaceRecipy(Tile::clay_Id, new ItemInstance(Tile::clayHardened), .35f);
addFurnaceRecipy(Tile::cactus_Id, new ItemInstance(Item::dye_powder, 1, DyePowderItem::GREEN), .2f);
addFurnaceRecipy(Tile::treeTrunk_Id, new ItemInstance(Item::coal, 1, CoalItem::CHAR_COAL), .15f);
addFurnaceRecipy(Tile::emeraldOre_Id, new ItemInstance(Item::emerald), 1);
addFurnaceRecipy(Item::potato_Id, new ItemInstance(Item::potatoBaked), .35f);
addFurnaceRecipy(Tile::netherRack_Id, new ItemInstance(Item::netherbrick), .1f);
// special silk touch related recipes:
addFurnaceRecipy(Tile::coalOre_Id, new ItemInstance(Item::coal), .1f);
addFurnaceRecipy(Tile::redStoneOre_Id, new ItemInstance(Item::redStone), .7f);
addFurnaceRecipy(Tile::lapisOre_Id, new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), .2f);
addFurnaceRecipy(Tile::netherQuartz_Id, new ItemInstance(Item::netherQuartz), .2f);
}
void FurnaceRecipes::clearAllRecipies()
{
for (auto &pair : recipies) {
delete pair.second;
}
recipies.clear();
recipeValue.clear();
}

View file

@ -1,3 +1,4 @@
#include "FurnaceRecipes.h"
#include "Recipes.h"
#include "Recipes.h"
#include "Recipes.h"
@ -1457,17 +1458,20 @@ inline ItemInstance* Recipes::parseItemInstance(DataInputStream* dis) {
void Recipes::rebuildRecipeArray() {
deleteAllRecipes();
loadAllRecipes();
FurnaceRecipes::getInstance()->rebuildRecipeArray();
}
void Recipes::rebuildRecipeArray(std::shared_ptr<CustomPayloadPacket> packet) {
deleteAllRecipes();
FurnaceRecipes::getInstance()->clearAllRecipies();
ByteArrayInputStream bais(packet->data);
DataInputStream input(&bais);
_init();
int recipeCount = input.readInt();
for (int i = 0; i < recipeCount; i++) {
int iCraftingRecipeC = input.readInt();
for (int i = 0; i < iCraftingRecipeC; i++) {
unsigned char recipeHeader = input.readByte();
int recipeType = recipeHeader & 0x0F;
@ -1504,17 +1508,26 @@ void Recipes::rebuildRecipeArray(std::shared_ptr<CustomPayloadPacket> packet) {
}
}
int iFurnaceRecipesC = input.readInt();
for (int i = 0; i < iFurnaceRecipesC; i++) {
int inputId = input.readInt();
float recipeValue = input.readFloat();
ItemInstance* result = parseItemInstance(&input);
FurnaceRecipes::getInstance()->addFurnaceRecipy(inputId, result, recipeValue);
}
buildRecipeIngredientsArray(); //we manually add recipes so we need to build the ingredients array
}
byteArray Recipes::buildSyncedRecipeArray() {
int iRecipeC = static_cast<int>(recipies->size());
ByteArrayOutputStream baos;
DataOutputStream dos(&baos);
dos.writeInt(iRecipeC);
for (int i = 0; i < iRecipeC; i++) {
int iCraftingRecipeC = static_cast<int>(recipies->size());
dos.writeInt(iCraftingRecipeC);
for (int i = 0; i < iCraftingRecipeC; i++) {
Recipy* recipe = (*recipies)[i];
bool isShapeless = dynamic_cast<ShapelessRecipy*>(recipe) != nullptr;
dos.writeByte((recipe->getGroup() << 4) | ((isShapeless ? 0 : 1) & 0x0F));
@ -1548,5 +1561,16 @@ byteArray Recipes::buildSyncedRecipeArray() {
serializeItemInstance(&dos, const_cast<ItemInstance*>(recipe->getResultItem()));
}
unordered_map<int, ItemInstance*>* furnaceRecipes = FurnaceRecipes::getInstance()->getRecipies();
int iFurnaceRecipesC = static_cast<int>(furnaceRecipes->size());
dos.writeInt(iFurnaceRecipesC);
for (auto& pair : *furnaceRecipes) {
dos.writeInt(pair.first);
dos.writeFloat(FurnaceRecipes::getInstance()->getRecipeValue(pair.first));
serializeItemInstance(&dos, pair.second);
}
return baos.toByteArray();
}