From df75cf941a9700d013ddca54de6c2326dafc726c Mon Sep 17 00:00:00 2001 From: ArkQuark <74979909+ArkQuark@users.noreply.github.com> Date: Tue, 8 Mar 2022 16:23:48 +0300 Subject: [PATCH] Fixing --- src/API/ChatAPI.php | 4 ++-- src/constants/ItemIDs.php | 5 +++++ src/recipes/CraftingRecipes.php | 18 +++++++++--------- src/recipes/SmeltingData.php | 4 ---- src/world/Entity.php | 8 ++++---- .../generator/object/tree/SmallTreeObject.php | 5 +++-- 6 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/API/ChatAPI.php b/src/API/ChatAPI.php index 00764699..21deac0d 100644 --- a/src/API/ChatAPI.php +++ b/src/API/ChatAPI.php @@ -92,12 +92,12 @@ class ChatAPI{ } } $mes = implode(" ", $params); - $output .= "You're whispering to ".$target." ".$mes."\n"; + $output .= "You're whispering to ".$target.": ".$mes."\n"; if($target !== "Console" and $target !== "Rcon"){ $this->sendTo(false, $sender." whispers to you: ".$mes, $target); } if($target === "Console" or $sender === "Console"){ - console("[INFO] ".$sender." whispers to ".$target." : ".$mes); + console("[INFO] ".$sender." whispers to ".$target.": ".$mes); } break; } diff --git a/src/constants/ItemIDs.php b/src/constants/ItemIDs.php index 7595ba60..da594060 100755 --- a/src/constants/ItemIDs.php +++ b/src/constants/ItemIDs.php @@ -86,9 +86,13 @@ define("DIAMOND_CHESTPLATE", 311); define("DIAMOND_LEGGINGS", 312); define("DIAMOND_BOOTS", 313); define("GOLD_HELMET", 314); +define("GOLDEN_HELMET", 314); define("GOLD_CHESTPLATE", 315); +define("GOLDEN_CHESTPLATE", 315); define("GOLD_LEGGINGS", 316); +define("GOLDEN_LEGGINGS", 316); define("GOLD_BOOTS", 317); +define("GOLDEN_BOOTS", 317); define("FLINT", 318); define("RAW_PORKCHOP", 319); define("COOKED_PORKCHOP", 320); @@ -133,6 +137,7 @@ define("MELON", 360); define("MELON_SLICE", 360); define("PUMPKIN_SEEDS", 361); define("MELON_SEEDS", 362); +define("RAW_BEEF", 363); define("BEEF", 363); define("STEAK", 364); define("COOKED_BEEF", 364); diff --git a/src/recipes/CraftingRecipes.php b/src/recipes/CraftingRecipes.php index 53ed47c8..b5aca009 100644 --- a/src/recipes/CraftingRecipes.php +++ b/src/recipes/CraftingRecipes.php @@ -122,11 +122,11 @@ class CraftingRecipes{ "DIAMOND:?x3,STICK:?x2=>DIAMOND_PICKAXE:0x1", "DIAMOND:?x1,STICK:?x2=>DIAMOND_SHOVEL:0x1", "DIAMOND:?x2,STICK:?x1=>DIAMOND_SWORD:0x1", - "GOLD_INGOT:?x3,STICK:?x2=>GOLD_AXE:0x1", - "GOLD_INGOT:?x2,STICK:?x2=>GOLD_HOE:0x1", - "GOLD_INGOT:?x3,STICK:?x2=>GOLD_PICKAXE:0x1", - "GOLD_INGOT:?x1,STICK:?x2=>GOLD_SHOVEL:0x1", - "GOLD_INGOT:?x2,STICK:?x1=>GOLD_SWORD:0x1", + "GOLD_INGOT:?x3,STICK:?x2=>GOLDEN_AXE:0x1", + "GOLD_INGOT:?x2,STICK:?x2=>GOLDEN_HOE:0x1", + "GOLD_INGOT:?x3,STICK:?x2=>GOLDEN_PICKAXE:0x1", + "GOLD_INGOT:?x1,STICK:?x2=>GOLDEN_SHOVEL:0x1", + "GOLD_INGOT:?x2,STICK:?x1=>GOLDEN_SWORD:0x1", "IRON_INGOT:?x3,STICK:?x2=>IRON_AXE:0x1", "IRON_INGOT:?x2,STICK:?x2=>IRON_HOE:0x1", "IRON_INGOT:?x3,STICK:?x2=>IRON_PICKAXE:0x1", @@ -155,10 +155,10 @@ class CraftingRecipes{ "DIAMOND:?x8=>DIAMOND_CHESTPLATE:0x1", "DIAMOND:?x5=>DIAMOND_HELMET:0x1", "DIAMOND:?x7=>DIAMOND_LEGGINGS:0x1", - "GOLD_INGOT:?x4=>GOLD_BOOTS:0x1", - "GOLD_INGOT:?x8=>GOLD_CHESTPLATE:0x1", - "GOLD_INGOT:?x5=>GOLD_HELMET:0x1", - "GOLD_INGOT:?x7=>GOLD_LEGGINGS:0x1", + "GOLD_INGOT:?x4=>GOLDEN_BOOTS:0x1", + "GOLD_INGOT:?x8=>GOLDEN_CHESTPLATE:0x1", + "GOLD_INGOT:?x5=>GOLDEN_HELMET:0x1", + "GOLD_INGOT:?x7=>GOLDEN_LEGGINGS:0x1", "IRON_INGOT:?x4=>IRON_BOOTS:0x1", "IRON_INGOT:?x8=>IRON_CHESTPLATE:0x1", "IRON_INGOT:?x5=>IRON_HELMET:0x1", diff --git a/src/recipes/SmeltingData.php b/src/recipes/SmeltingData.php index cbf3454f..a08b12c5 100644 --- a/src/recipes/SmeltingData.php +++ b/src/recipes/SmeltingData.php @@ -30,16 +30,12 @@ class SmeltingData{ NETHERRACK => array(NETHER_BRICK, 0), RAW_PORKCHOP => array(COOKED_PORKCHOP, 0), CLAY => array(BRICK, 0), - //RAW_FISH => array(COOKED_FISH, 0), CACTUS => array(DYE, 2), RED_MUSHROOM => array(DYE, 1), RAW_BEEF => array(STEAK, 0), RAW_CHICKEN => array(COOKED_CHICKEN, 0), RED_MUSHROOM => array(DYE, 1), POTATO => array(BAKED_POTATO, 0), - BEETROOT => array(DYE, 1), - COAL => array(DYE, 0), - STONE_BRICKS => array(STONE_BRICKS, 2), ); diff --git a/src/world/Entity.php b/src/world/Entity.php index 9186f485..7ca39b24 100644 --- a/src/world/Entity.php +++ b/src/world/Entity.php @@ -964,10 +964,10 @@ class Entity extends Position{ CHAIN_CHESTPLATE => 5, CHAIN_LEGGINGS => 4, CHAIN_BOOTS => 1, - GOLD_HELMET => 1, - GOLD_CHESTPLATE => 5, - GOLD_LEGGINGS => 3, - GOLD_BOOTS => 1, + GOLDEN_HELMET => 1, + GOLDEN_CHESTPLATE => 5, + GOLDEN_LEGGINGS => 3, + GOLDEN_BOOTS => 1, IRON_HELMET => 2, IRON_CHESTPLATE => 6, IRON_LEGGINGS => 5, diff --git a/src/world/generator/object/tree/SmallTreeObject.php b/src/world/generator/object/tree/SmallTreeObject.php index cd7b1610..72fc9394 100644 --- a/src/world/generator/object/tree/SmallTreeObject.php +++ b/src/world/generator/object/tree/SmallTreeObject.php @@ -70,13 +70,13 @@ class SmallTreeObject extends TreeObject{ // Now build the tree (from the top down) $leaflevel = 0; - for( $yy = ($this->trunkHeight + 1); $yy >= 0; --$yy ) + for( $yy = ($this->trunkHeight); $yy >= 0; --$yy ) { if( $leaflevel < self::$leavesHeight ) { // The size is a slight variation on the trunkheight $radius = self::$leafRadii[ $leaflevel ] + $leafPre; - $bRadius = 3; + $bRadius = 2; for( $xx = -$bRadius; $xx <= $bRadius; ++ $xx ) { for( $zz = -$bRadius; $zz <= $bRadius; ++ $zz ) @@ -99,6 +99,7 @@ class SmallTreeObject extends TreeObject{ $trunkpos = new Vector3( $pos->x, $pos->y + $yy, $pos->z ); $level->setBlockRaw($trunkpos, new WoodBlock( $this->type ) ); } + } } } \ No newline at end of file