flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Added check for item damage (#4681)

Browse Source 
* Added check for item damage

Co-authored-by: Mattes D <github@xoft.cz>
This commit is contained in:
Lukas Pioch 2020-04-19 18:36:31 +02:00 committed by GitHub
parent 2976cec4c0
commit cb64e99377
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 73 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Server/furnace.txt
View File

@ -8,7 +8,10 @@
# #
# **** Item Definition **** # **** Item Definition ****
# An Item is defined by an Item Type, an amount (and damage) # An Item is defined by an Item Type, an amount (and damage)
# The damage is optional, and if not specified it's assumed to be 0 # The damage is optional, and if not specified it's assumed to be 0.
# If a damage of -1 is specified, then the damage won't be checked when matching recipes.
# Note that when specifying items using names from items.ini, those already contain the damage value in them,
# so the damage value doesn't need to be specified here.
# #
# Cactus Green example: # Cactus Green example:
# 351 : 2 ( , 1 ) # 351 : 2 ( , 1 )
@ -25,7 +28,7 @@
# Cobble : 0 , 1 @ 200 = 1 : 1 , 1 $ 10 # Cobble : 0 , 1 @ 200 = 1 : 1 , 1 $ 10
# ItemType : Damage , Amount @ ticks = ItemType : Damage , Amount $ Experience # ItemType : Damage , Amount @ ticks = ItemType : Damage , Amount $ Experience
# #
# If the experience paramater isn't included, experience reward will default to zero. # If the experience parameter isn't included, experience reward will default to zero.
# #
# **** Fuel **** # **** Fuel ****
# #
@ -48,10 +51,10 @@ BlackTerracotta = BlackGlazedTerracotta $ 0.1
BlueTerracotta = BlueGlazedTerracotta $ 0.1 BlueTerracotta = BlueGlazedTerracotta $ 0.1
BrownTerracotta = BrownGlazedTerracotta $ 0.10 BrownTerracotta = BrownGlazedTerracotta $ 0.10
Cactus = CactusGreen $ 0.2 Cactus = CactusGreen $ 0.2
ChainmailBoots = IronNugget $ 0.1 ChainmailBoots:-1 = IronNugget $ 0.1
ChainmailChestplate = IronNugget $ 0.1 ChainmailChestplate:-1 = IronNugget $ 0.1
ChainmailHelmet = IronNugget $ 0.1 ChainmailHelmet:-1 = IronNugget $ 0.1
ChainmailLeggings = IronNugget $ 0.1 ChainmailLeggings:-1 = IronNugget $ 0.1
Chicken = CookedChicken $ 0.35 Chicken = CookedChicken $ 0.35
ChorusFruit = PoppedChorusFruit $ 0.1 ChorusFruit = PoppedChorusFruit $ 0.1
Clay = Brick $ 0.3 Clay = Brick $ 0.3
@ -63,29 +66,29 @@ DiamondOre = Diamond $ 1.0
EmeraldOre = Emerald $ 1.0 EmeraldOre = Emerald $ 1.0
Fish = CookedFish $ 0.35 Fish = CookedFish $ 0.35
GoldOre = GoldIngot $ 1.0 GoldOre = GoldIngot $ 1.0
GoldAxe = GoldNugget $ 0.1 GoldAxe:-1 = GoldNugget $ 0.1
GoldBoots = GoldNugget $ 0.1 GoldBoots:-1 = GoldNugget $ 0.1
GoldChestplate = GoldNugget $ 0.1 GoldChestplate:-1 = GoldNugget $ 0.1
GoldHorseArmor = GoldNugget $ 0.1 GoldHorseArmor:-1 = GoldNugget $ 0.1
GoldHelmet = GoldNugget $ 0.1 GoldHelmet:-1 = GoldNugget $ 0.1
GoldHoe = GoldNugget $ 0.1 GoldHoe:-1 = GoldNugget $ 0.1
GoldPants = GoldNugget $ 0.1 GoldPants:-1 = GoldNugget $ 0.1
GoldPickaxe = GoldNugget $ 0.1 GoldPickaxe:-1 = GoldNugget $ 0.1
GoldShovel = GoldNugget $ 0.1 GoldShovel:-1 = GoldNugget $ 0.1
GoldSword = GoldNugget $ 0.1 GoldSword:-1 = GoldNugget $ 0.1
GrayTerracotta = GrayGlazedTerracotta $ 0.1 GrayTerracotta = GrayGlazedTerracotta $ 0.1
GreenTerracotta = GreenGlazedTerracotta $ 0.1 GreenTerracotta = GreenGlazedTerracotta $ 0.1
IronOre = IronIngot $ 0.7 IronOre = IronIngot $ 0.7
IronAxe = IronNugget $ 0.1 IronAxe:-1 = IronNugget $ 0.1
IronBoots = IronNugget $ 0.1 IronBoots:-1 = IronNugget $ 0.1
IronChestplate = IronNugget $ 0.1 IronChestplate:-1 = IronNugget $ 0.1
IronHorseArmor = IronNugget $ 0.1 IronHorseArmor:-1 = IronNugget $ 0.1
IronHelmet = IronNugget $ 0.1 IronHelmet:-1 = IronNugget $ 0.1
IronHoe = IronNugget $ 0.1 IronHoe:-1 = IronNugget $ 0.1
IronLeggings = IronNugget $ 0.1 IronLeggings:-1 = IronNugget $ 0.1
IronPickaxe = IronNugget $ 0.1 IronPickaxe:-1 = IronNugget $ 0.1
IronShovel = IronNugget $ 0.1 IronShovel:-1 = IronNugget $ 0.1
IronSword = IronNugget $ 0.1 IronSword:-1 = IronNugget $ 0.1
LapisOre = LapisLazuli $ 0.2 LapisOre = LapisLazuli $ 0.2
LightBlueTerracotta = LightBlueGlazedTerracotta $ 0.1 LightBlueTerracotta = LightBlueGlazedTerracotta $ 0.1
LightGrayTerracotta = LightGrayGlazedTerracotta $ 0.1 LightGrayTerracotta = LightGrayGlazedTerracotta $ 0.1

3
src/FurnaceRecipe.cpp
View File

@ -290,7 +290,7 @@ const cFurnaceRecipe::cRecipe * cFurnaceRecipe::GetRecipeFrom(const cItem & a_In
{ {
continue; continue;
} }
else else if ((Recipe.In->m_ItemDamage == -1) || (Recipe.In->m_ItemDamage == a_Ingredient.m_ItemDamage))
{ {
BestRecipe = &Recipe; BestRecipe = &Recipe;
} }
@ -342,4 +342,3 @@ int cFurnaceRecipe::GetBurnTime(const cItem & a_Fuel) const