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

Separated effects' MCPE ID registration from VanillaEffects

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-10-24 18:52:20 +01:00
parent cf7f50af06
commit 3f254bd49c
10 changed files with 217 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/data/bedrock/EffectIdMap.php Normal file
View File

@ -0,0 +1,97 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
declare(strict_types=1);
namespace pocketmine\data\bedrock;
use pocketmine\entity\effect\Effect;
use pocketmine\entity\effect\VanillaEffects;
use pocketmine\utils\SingletonTrait;
use function array_key_exists;
final class EffectIdMap{
use SingletonTrait;
/**
* @var Effect[]
* @phpstan-var array<int, Effect>
*/
private $idToEffect = [];
/**
* @var int[]
* @phpstan-var array<int, int>
*/
private $effectToId = [];
private function __construct(){
$this->register(EffectIds::SPEED, VanillaEffects::SPEED());
$this->register(EffectIds::SLOWNESS, VanillaEffects::SLOWNESS());
$this->register(EffectIds::HASTE, VanillaEffects::HASTE());
$this->register(EffectIds::MINING_FATIGUE, VanillaEffects::MINING_FATIGUE());
$this->register(EffectIds::STRENGTH, VanillaEffects::STRENGTH());
$this->register(EffectIds::INSTANT_HEALTH, VanillaEffects::INSTANT_HEALTH());
$this->register(EffectIds::INSTANT_DAMAGE, VanillaEffects::INSTANT_DAMAGE());
$this->register(EffectIds::JUMP_BOOST, VanillaEffects::JUMP_BOOST());
$this->register(EffectIds::NAUSEA, VanillaEffects::NAUSEA());
$this->register(EffectIds::REGENERATION, VanillaEffects::REGENERATION());
$this->register(EffectIds::RESISTANCE, VanillaEffects::RESISTANCE());
$this->register(EffectIds::FIRE_RESISTANCE, VanillaEffects::FIRE_RESISTANCE());
$this->register(EffectIds::WATER_BREATHING, VanillaEffects::WATER_BREATHING());
$this->register(EffectIds::INVISIBILITY, VanillaEffects::INVISIBILITY());
$this->register(EffectIds::BLINDNESS, VanillaEffects::BLINDNESS());
$this->register(EffectIds::NIGHT_VISION, VanillaEffects::NIGHT_VISION());
$this->register(EffectIds::HUNGER, VanillaEffects::HUNGER());
$this->register(EffectIds::WEAKNESS, VanillaEffects::WEAKNESS());
$this->register(EffectIds::POISON, VanillaEffects::POISON());
$this->register(EffectIds::WITHER, VanillaEffects::WITHER());
$this->register(EffectIds::HEALTH_BOOST, VanillaEffects::HEALTH_BOOST());
$this->register(EffectIds::ABSORPTION, VanillaEffects::ABSORPTION());
$this->register(EffectIds::SATURATION, VanillaEffects::SATURATION());
$this->register(EffectIds::LEVITATION, VanillaEffects::LEVITATION());
$this->register(EffectIds::FATAL_POISON, VanillaEffects::FATAL_POISON());
$this->register(EffectIds::CONDUIT_POWER, VanillaEffects::CONDUIT_POWER());
//TODO: SLOW_FALLING
//TODO: BAD_OMEN
//TODO: VILLAGE_HERO
}
//TODO: not a big fan of the code duplication here :(
public function register(int $mcpeId, Effect $effect) : void{
$this->idToEffect[$mcpeId] = $effect;
$this->effectToId[$effect->getRuntimeId()] = $mcpeId;
}
public function fromId(int $id) : ?Effect{
//we might not have all the effect IDs registered
return $this->idToEffect[$id] ?? null;
}
public function toId(Effect $effect) : int{
if(!array_key_exists($effect->getRuntimeId(), $this->effectToId)){
//this should never happen, so we treat it as an exceptional condition
throw new \InvalidArgumentException("Effect does not have a mapped ID");
}
return $this->effectToId[$effect->getRuntimeId()];
}
}

61
src/data/bedrock/EffectIds.php Normal file
View File

@ -0,0 +1,61 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
declare(strict_types=1);
namespace pocketmine\data\bedrock;
final class EffectIds{
private function __construct(){
//NOOP
}
public const SPEED = 1;
public const SLOWNESS = 2;
public const HASTE = 3;
public const MINING_FATIGUE = 4;
public const STRENGTH = 5;
public const INSTANT_HEALTH = 6;
public const INSTANT_DAMAGE = 7;
public const JUMP_BOOST = 8;
public const NAUSEA = 9;
public const REGENERATION = 10;
public const RESISTANCE = 11;
public const FIRE_RESISTANCE = 12;
public const WATER_BREATHING = 13;
public const INVISIBILITY = 14;
public const BLINDNESS = 15;
public const NIGHT_VISION = 16;
public const HUNGER = 17;
public const WEAKNESS = 18;
public const POISON = 19;
public const WITHER = 20;
public const HEALTH_BOOST = 21;
public const ABSORPTION = 22;
public const SATURATION = 23;
public const LEVITATION = 24;
public const FATAL_POISON = 25;
public const CONDUIT_POWER = 26;
public const SLOW_FALLING = 27;
public const BAD_OMEN = 28;
public const VILLAGE_HERO = 29;
}