mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 09:56:06 +00:00
Code Issues Projects Releases Wiki Activity

Standardise SNAKE_CASE for surrogate enums

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-02-20 11:14:07 +00:00
parent 36e9db4c07
commit 2c8a065b94
14 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/item/Bow.php
View File

@ -49,7 +49,7 @@ class Bow extends Tool{
public function onReleaseUsing(Player $player) : ItemUseResult{
if($player->isSurvival() and !$player->getInventory()->contains(ItemFactory::get(Item::ARROW, 0, 1))){
return ItemUseResult::fail();
return ItemUseResult::FAIL();
}
$nbt = EntityFactory::createBaseNBT(
@ -92,7 +92,7 @@ class Bow extends Tool{
if($ev->isCancelled()){
$entity->flagForDespawn();
return ItemUseResult::fail();
return ItemUseResult::FAIL();
}
$entity->setMotion($entity->getMotion()->multiply($ev->getForce()));
@ -102,7 +102,7 @@ class Bow extends Tool{
$projectileEv->call();
if($projectileEv->isCancelled()){
$ev->getProjectile()->flagForDespawn();
return ItemUseResult::fail();
return ItemUseResult::FAIL();
}
$ev->getProjectile()->spawnToAll();
@ -118,6 +118,6 @@ class Bow extends Tool{
$this->applyDamage(1);
}
return ItemUseResult::success();
return ItemUseResult::SUCCESS();
}
}

6
src/pocketmine/item/Bucket.php
View File

@ -58,12 +58,12 @@ class Bucket extends Item{
}else{
$player->getInventory()->addItem($ev->getItem());
}
return ItemUseResult::success();
return ItemUseResult::SUCCESS();
}
return ItemUseResult::fail();
return ItemUseResult::FAIL();
}
return ItemUseResult::none();
return ItemUseResult::NONE();
}
}

4
src/pocketmine/item/FlintSteel.php
View File

@ -44,10 +44,10 @@ class FlintSteel extends Tool{
$this->applyDamage(1);
return ItemUseResult::success();
return ItemUseResult::SUCCESS();
}
return ItemUseResult::none();
return ItemUseResult::NONE();
}
public function getMaxDurability() : int{

6
src/pocketmine/item/Item.php
View File

@ -738,7 +738,7 @@ class Item implements ItemIds, \JsonSerializable{
* @return ItemUseResult
*/
public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{
return ItemUseResult::none();
return ItemUseResult::NONE();
}
/**
@ -751,7 +751,7 @@ class Item implements ItemIds, \JsonSerializable{
* @return ItemUseResult
*/
public function onClickAir(Player $player, Vector3 $directionVector) : ItemUseResult{
return ItemUseResult::none();
return ItemUseResult::NONE();
}
/**
@ -763,7 +763,7 @@ class Item implements ItemIds, \JsonSerializable{
* @return ItemUseResult
*/
public function onReleaseUsing(Player $player) : ItemUseResult{
return ItemUseResult::none();
return ItemUseResult::NONE();
}
/**

6
src/pocketmine/item/ItemUseResult.php
View File

@ -36,7 +36,7 @@ final class ItemUseResult{
*
* @return ItemUseResult
*/
public static function none() : ItemUseResult{
public static function NONE() : ItemUseResult{
return self::$NONE ?? (self::$NONE = new self());
}
@ -46,7 +46,7 @@ final class ItemUseResult{
*
* @return ItemUseResult
*/
public static function fail() : ItemUseResult{
public static function FAIL() : ItemUseResult{
return self::$FAILED ?? (self::$FAILED = new self());
}
@ -55,7 +55,7 @@ final class ItemUseResult{
*
* @return ItemUseResult
*/
public static function success() : ItemUseResult{
public static function SUCCESS() : ItemUseResult{
return self::$SUCCEEDED ?? (self::$SUCCEEDED = new self());
}

8
src/pocketmine/item/LiquidBucket.php
View File

@ -54,7 +54,7 @@ class LiquidBucket extends Item{
public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{
if(!$blockReplace->canBeReplaced()){
return ItemUseResult::none();
return ItemUseResult::NONE();
}
//TODO: move this to generic placement logic
@ -69,12 +69,12 @@ class LiquidBucket extends Item{
if($player->isSurvival()){
$player->getInventory()->setItemInHand($ev->getItem());
}
return ItemUseResult::success();
return ItemUseResult::SUCCESS();
}
return ItemUseResult::fail();
return ItemUseResult::FAIL();
}
return ItemUseResult::none();
return ItemUseResult::NONE();
}
}

8
src/pocketmine/item/PaintingItem.php
View File

@ -40,7 +40,7 @@ class PaintingItem extends Item{
public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{
if(Facing::axis($face) === Facing::AXIS_Y){
return ItemUseResult::none();
return ItemUseResult::NONE();
}
$motives = [];
@ -68,7 +68,7 @@ class PaintingItem extends Item{
}
if(empty($motives)){ //No space available
return ItemUseResult::none();
return ItemUseResult::NONE();
}
/** @var PaintingMotive $motive */
@ -83,7 +83,7 @@ class PaintingItem extends Item{
$direction = $directions[$face] ?? -1;
if($direction === -1){
return ItemUseResult::none();
return ItemUseResult::NONE();
}
$nbt = EntityFactory::createBaseNBT($blockReplace, null, $direction * 90, 0);
@ -99,6 +99,6 @@ class PaintingItem extends Item{
$entity->spawnToAll();
$player->getLevel()->broadcastLevelEvent($blockReplace->add(0.5, 0.5, 0.5), LevelEventPacket::EVENT_SOUND_ITEMFRAME_PLACE); //item frame and painting have the same sound
return ItemUseResult::success();
return ItemUseResult::SUCCESS();
}
}

4
src/pocketmine/item/ProjectileItem.php
View File

@ -68,7 +68,7 @@ abstract class ProjectileItem extends Item{
$projectileEv->call();
if($projectileEv->isCancelled()){
$projectile->flagForDespawn();
return ItemUseResult::fail();
return ItemUseResult::FAIL();
}
$projectile->spawnToAll();
@ -77,6 +77,6 @@ abstract class ProjectileItem extends Item{
$this->pop();
return ItemUseResult::success();
return ItemUseResult::SUCCESS();
}
}

2
src/pocketmine/item/SpawnEgg.php
View File

@ -61,6 +61,6 @@ class SpawnEgg extends Item{
$this->pop();
$entity->spawnToAll();
//TODO: what if the entity was marked for deletion?
return ItemUseResult::success();
return ItemUseResult::SUCCESS();
}
}