diff --git a/src/Player.php b/src/Player.php index fe910f36..68f2d78b 100755 --- a/src/Player.php +++ b/src/Player.php @@ -2707,25 +2707,19 @@ class Player{ public function tryCraft(){ if(count($this->toCraft) <= 0 || count($this->craftingItems) <= 0) return; - if(count($this->toCraft) > 1){ - $this->toCraft = []; - $this->craftingItems = []; - safe_var_dump($this->toCraft); - ConsoleAPI::warn("Trying to craft more than 1 item, not supported for now."); - return false; - } + $results = []; foreach($this->toCraft as $i => $slotz){ - $toCraft = [$i >> 8, $i & 0xff, array_sum($slotz)]; + $results[$i >> 16] = [$i >> 16, $i & 0xffff, array_sum($slotz)]; } $ingridients = []; foreach($this->craftingItems as $i => $slotz){ - $ingridients[$i >> 8] = [$i >> 8, $i & 0xff, array_sum($slotz)]; + $ingridients[$i >> 16] = [$i >> 16, $i & 0xffff, array_sum($slotz)]; } - $cc = CraftingRecipes::canCraft($toCraft, $ingridients, $this->craftingType); + $cc = CraftingRecipes::canCraft($results, $ingridients, $this->craftingType); if(!is_array($cc) && $this->craftingType == CraftingRecipes::TYPE_CRAFTIGTABLE){ - $cc = CraftingRecipes::canCraft($toCraft, $ingridients, CraftingRecipes::TYPE_INVENTORY); + $cc = CraftingRecipes::canCraft($results, $ingridients, CraftingRecipes::TYPE_INVENTORY); if(!is_array($cc)){ return; //recipe not found } @@ -2738,8 +2732,8 @@ class Player{ } foreach($this->craftingItems as $i => $slotz){ - $id = $i >> 8; - $meta = $i & 0xff; + $id = $i >> 16; + $meta = $i & 0xffff; foreach($slotz as $slot => $count){ $slt = $this->getSlot($slot); if($slt->getID() == $id && $slt->getMetadata() == $meta){ @@ -2752,8 +2746,8 @@ class Player{ } foreach($this->toCraft as $i => $slotz){ - $id = $i >> 8; - $meta = $i & 0xff; + $id = $i >> 16; + $meta = $i & 0xffff; $this->checkCraftAchievements($id); foreach($slotz as $slot => $count){ if($slot < 0){ //drop item @@ -2788,25 +2782,31 @@ class Player{ } public function addCraftingResult($slot, $id, $meta, $count){ - $index = ($id << 8) | $meta; + $id &= 0xffff; + $meta &= 0xffff; + + $index = ($id << 16) | $meta; if(!isset($this->toCraft[$index])) $this->toCraft[$index] = []; if(!isset($this->toCraft[$index][$slot])) $this->toCraft[$index][$slot] = 0; $this->toCraft[$index][$slot] += $count; - console("Result: $id, $meta, $count into $slot"); + //console("Result: $id, $meta, $count into $slot"); if($this->tryCraft() === false){ $this->sendInventory(); } } public function addCraftingIngridient($slot, $id, $meta, $count){ - $index = ($id << 8) | $meta; + $id &= 0xffff; + $meta &= 0xffff; + + $index = ($id << 16) | $meta; if(!isset($this->craftingItems[$index])) $this->craftingItems[$index] = []; if(!isset($this->craftingItems[$index][$slot])) $this->craftingItems[$index][$slot] = 0; $this->craftingItems[$index][$slot] += $count; - console("Ingridient: $id, $meta, $count into $slot"); + //console("Ingridient: $id, $meta, $count into $slot"); if($this->tryCraft() === false){ $this->sendInventory(); } diff --git a/src/recipes/CraftingRecipes.php b/src/recipes/CraftingRecipes.php index d9a838b3..d4678234 100644 --- a/src/recipes/CraftingRecipes.php +++ b/src/recipes/CraftingRecipes.php @@ -135,7 +135,7 @@ class CraftingRecipes{ "BEETROOT:?x4,BOWL:?x1=>BEETROOT_SOUP:0x1", "WOODEN_PLANKS:?x3=>BOWL:0x4", "WHEAT:?x3=>BREAD:0x1", - "WHEAT:?x3,BUCKET:1x3,EGG:?x1,SUGAR:?x2=>CAKE:0x1", + "WHEAT:?x3,BUCKET:1x3,EGG:?x1,SUGAR:?x2=>CAKE:0x1,BUCKET:0x3", "DIAMOND:?x4=>DIAMOND_BOOTS:0x1", "DIAMOND:?x8=>DIAMOND_CHESTPLATE:0x1", "DIAMOND:?x5=>DIAMOND_HELMET:0x1", @@ -200,6 +200,13 @@ class CraftingRecipes{ "COBBLESTONE:?x6=>COBBLESTONE_STAIRS:0x4", ]; + /** + * Each element structure: + * * 0 - ingridients
+ * * 1 - results
+ * * 2 - recipe string
+ * @var array[] + */ private static $recipes = []; public static function init(){ @@ -230,9 +237,9 @@ class CraftingRecipes{ } private static function parseRecipe($recipe){ - $recipe = explode("=>", $recipe); + [$ingridients, $results] = explode("=>", $recipe); $recipeItems = []; - foreach(explode(",", $recipe[0]) as $item){ + foreach(explode(",", $ingridients) as $item){ $item = explode("x", $item); $id = explode(":", $item[0]); $meta = array_pop($id); @@ -249,31 +256,53 @@ class CraftingRecipes{ } } ksort($recipeItems); - $item = explode("x", $recipe[1]); - $id = explode(":", $item[0]); - $meta = array_pop($id); - $id = $id[0]; - - $it = BlockAPI::fromString($id); - - $craftItem = [$it->getID(), intval($meta) & 0xFFFF, intval($item[1])]; + + $craftItems = []; + foreach(explode(",", $results) as $item){ + $item = explode("x", $item); + $id = explode(":", $item[0]); + $meta = array_pop($id); + $id = $id[0]; + $it = BlockAPI::fromString($id); + if(!isset($craftItems[$it->getID()])){ + $craftItems[$it->getID()] = [$it->getID(), intval($meta) & 0xffff, intval($item[1])]; + }else{ + if($it->getMetadata() !== $craftItems[$it->getID()][1]){ + $craftItems[$it->getID()][1] = false; + } + $craftItems[$it->getID()][2] += $it->count; + } + } + ksort($craftItems); $recipeString = ""; + $resultString = ""; foreach($recipeItems as $item){ - $recipeString .= $item[0] . "x" . $item[2] . ","; + $recipeString .= "{$item[0]}x{$item[2]},"; } - $recipeString = substr($recipeString, 0, -1) . "=>" . $craftItem[0] . "x" . $craftItem[2]; + foreach($craftItems as $item){ + $resultString .= "{$item[0]}x{$item[2]},"; + } + + $recipeString = substr($recipeString, 0, -1) . "=>" . substr($resultString, 0, -1); - return [$recipeItems, $craftItem, $recipeString]; + return [$recipeItems, $craftItems, $recipeString]; } - public static function canCraft(array $craftItem, array $recipeItems, $type){ + public static function canCraft(array $craftItems, array $recipeItems, $type){ ksort($recipeItems); + ksort($craftItems); + $recipeString = ""; + $resultString = ""; foreach($recipeItems as $item){ $recipeString .= $item[0] . "x" . $item[2] . ","; } - $recipeString = substr($recipeString, 0, -1) . "=>" . $craftItem[0] . "x" . $craftItem[2]; + foreach($craftItems as $item){ + $resultString .= "{$item[0]}x{$item[2]},"; + } + + $recipeString = substr($recipeString, 0, -1) . "=>" . substr($resultString, 0, -1); $server = ServerAPI::request(); $result = $server->query("SELECT id FROM recipes WHERE type == " . $type . " AND recipe == '" . $recipeString . "';"); if($result instanceof SQLite3Result){ @@ -281,7 +310,7 @@ class CraftingRecipes{ while(($r = $result->fetchArray(SQLITE3_NUM)) !== false){ $continue = true; $recipe = CraftingRecipes::$recipes[$r[0]]; - foreach($recipe[0] as $item){ + foreach($recipe[0] as $item){ //check ingridients if(!isset($recipeItems[$item[0]])){ $continue = false; break; @@ -293,7 +322,23 @@ class CraftingRecipes{ break; } } - if($continue === false or $craftItem[0] !== $recipe[1][0]){ + if($continue === false){ + $continue = false; + continue; + } + foreach($recipe[1] as $item){ //check results + if(!isset($craftItems[$item[0]])){ + $continue = false; + break; + } + $oitem = $craftItems[$item[0]]; + + if(($oitem[1] !== $item[1] and $item[1] !== false) or $oitem[2] !== $item[2]){ + $continue = false; + break; + } + } + if($continue === false){ $continue = false; continue; }