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

PhpStorm automated formatting (#11)

Browse Source 
* PhpStorm reformatting

* Tuned PhpStorm reformatting

* Improved ItemIds and BlockIds formatting

* Tuned more PhpStorm reformatting

* Improved string concatenation
This commit is contained in:
SOFe
2016-10-03 19:05:48 +08:00
committed by GitHub
parent 2b6d058760
commit 58ff381557
77 changed files with 266 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/block/ActivatorRail.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class ActivatorRail extends Solid {
class ActivatorRail extends Solid{
protected $id = self::ACTIVATOR_RAIL;

118
src/pocketmine/block/BlockIds.php
View File

@ -27,9 +27,9 @@ interface BlockIds{
const STONE = 1;
const GRASS = 2;
const DIRT = 3;
const COBBLESTONE = 4; const COBBLE = 4;
const PLANK = 5; const PLANKS = 5; const WOODEN_PLANK = 5; const WOODEN_PLANKS = 5;
const SAPLING = 6; const SAPLINGS = 6;
const COBBLESTONE = 4, COBBLE = 4;
const PLANK = 5, PLANKS = 5, WOODEN_PLANK = 5, WOODEN_PLANKS = 5;
const SAPLING = 6, SAPLINGS = 6;
const BEDROCK = 7;
const WATER = 8;
const STILL_WATER = 9;
@ -40,7 +40,7 @@ interface BlockIds{
const GOLD_ORE = 14;
const IRON_ORE = 15;
const COAL_ORE = 16;
const LOG = 17; const WOOD = 17; const TRUNK = 17;
const LOG = 17, WOOD = 17, TRUNK = 17;
const LEAVES = 18;
const SPONGE = 19;
const GLASS = 20;
@ -48,130 +48,130 @@ interface BlockIds{
const LAPIS_BLOCK = 22;
const DISPENSER = 23;
const SANDSTONE = 24;
const NOTE_BLOCK = 25; const NOTEBLOCK = 25;
const NOTE_BLOCK = 25, NOTEBLOCK = 25;
const BED_BLOCK = 26;
const POWERED_RAIL = 27;
const DETECTOR_RAIL = 28;
const STICKY_PISTON = 29;
const COBWEB = 30;
const TALL_GRASS = 31;
const BUSH = 32; const DEAD_BUSH = 32;
const BUSH = 32, DEAD_BUSH = 32;
const PISTON = 33;
const PISTON_HEAD = 34;
const WOOL = 35;
const DANDELION = 37;
const POPPY = 38; const ROSE = 38; const RED_FLOWER = 38;
const POPPY = 38, ROSE = 38, RED_FLOWER = 38;
const BROWN_MUSHROOM = 39;
const RED_MUSHROOM = 40;
const GOLD_BLOCK = 41;
const IRON_BLOCK = 42;
const DOUBLE_SLAB = 43; const DOUBLE_SLABS = 43;
const SLAB = 44; const SLABS = 44; const STONE_SLAB = 44;
const BRICKS = 45; const BRICKS_BLOCK = 45;
const DOUBLE_SLAB = 43, DOUBLE_SLABS = 43;
const SLAB = 44, SLABS = 44, STONE_SLAB = 44;
const BRICKS = 45, BRICKS_BLOCK = 45;
const TNT = 46;
const BOOKSHELF = 47;
const MOSS_STONE = 48; const MOSSY_STONE = 48;
const MOSS_STONE = 48, MOSSY_STONE = 48;
const OBSIDIAN = 49;
const TORCH = 50;
const FIRE = 51;
const MONSTER_SPAWNER = 52;
const WOOD_STAIRS = 53; const WOODEN_STAIRS = 53; const OAK_WOOD_STAIRS = 53; const OAK_WOODEN_STAIRS = 53;
const WOOD_STAIRS = 53, WOODEN_STAIRS = 53, OAK_WOOD_STAIRS = 53, OAK_WOODEN_STAIRS = 53;
const CHEST = 54;
const REDSTONE_WIRE = 55;
const DIAMOND_ORE = 56;
const DIAMOND_BLOCK = 57;
const CRAFTING_TABLE = 58; const WORKBENCH = 58;
const CRAFTING_TABLE = 58, WORKBENCH = 58;
const WHEAT_BLOCK = 59;
const FARMLAND = 60;
const FURNACE = 61;
const BURNING_FURNACE = 62; const LIT_FURNACE = 62;
const BURNING_FURNACE = 62, LIT_FURNACE = 62;
const SIGN_POST = 63;
const DOOR_BLOCK = 64; const WOODEN_DOOR_BLOCK = 64; const WOOD_DOOR_BLOCK = 64;
const DOOR_BLOCK = 64, WOODEN_DOOR_BLOCK = 64, WOOD_DOOR_BLOCK = 64;
const LADDER = 65;
const RAIL = 66;
const COBBLESTONE_STAIRS = 67; const COBBLE_STAIRS = 67;
const COBBLESTONE_STAIRS = 67, COBBLE_STAIRS = 67;
const WALL_SIGN = 68;
const LEVER = 69;
const STONE_PRESSURE_PLATE = 70;
const IRON_DOOR_BLOCK = 71;
const WOODEN_PRESSURE_PLATE = 72;
const REDSTONE_ORE = 73;
const GLOWING_REDSTONE_ORE = 74; const LIT_REDSTONE_ORE = 74;
const GLOWING_REDSTONE_ORE = 74, LIT_REDSTONE_ORE = 74;
const UNLIT_REDSTONE_TORCH = 75;
const REDSTONE_TORCH = 76; const LIT_REDSTONE_TORCH = 76;
const REDSTONE_TORCH = 76, LIT_REDSTONE_TORCH = 76;
const STONE_BUTTON = 77;
const SNOW = 78; const SNOW_LAYER = 78;
const SNOW = 78, SNOW_LAYER = 78;
const ICE = 79;
const SNOW_BLOCK = 80;
const CACTUS = 81;
const CLAY_BLOCK = 82;
const REEDS = 83; const SUGARCANE_BLOCK = 83;
const REEDS = 83, SUGARCANE_BLOCK = 83;
const FENCE = 85;
const PUMPKIN = 86;
const NETHERRACK = 87;
const SOUL_SAND = 88;
const GLOWSTONE = 89; const GLOWSTONE_BLOCK = 89;
const PORTAL_BLOCK = 90; const PORTAL = 90;
const JACK_O_LANTERN = 91; const LIT_PUMPKIN = 91;
const GLOWSTONE = 89, GLOWSTONE_BLOCK = 89;
const PORTAL_BLOCK = 90, PORTAL = 90;
const JACK_O_LANTERN = 91, LIT_PUMPKIN = 91;
const CAKE_BLOCK = 92;
const REPEATER_BLOCK = 93; const UNPOWERED_REPEATER_BLOCK = 93;
const REPEATER_BLOCK = 93, UNPOWERED_REPEATER_BLOCK = 93;
const POWERED_REPEATER_BLOCK = 94;
const INVISIBLE_BEDROCK = 95;
const TRAPDOOR = 96; const WOODEN_TRAPDOOR = 96;
const TRAPDOOR = 96, WOODEN_TRAPDOOR = 96;
const MONSTER_EGG_BLOCK = 97;
const STONE_BRICKS = 98; const STONE_BRICK = 98;
const STONE_BRICKS = 98, STONE_BRICK = 98;
const BROWN_MUSHROOM_BLOCK = 99;
const RED_MUSHROOM_BLOCK = 100;
const IRON_BARS = 101; const IRON_BAR = 101;
const GLASS_PANE = 102; const GLASS_PANEL = 102;
const IRON_BARS = 101, IRON_BAR = 101;
const GLASS_PANE = 102, GLASS_PANEL = 102;
const MELON_BLOCK = 103;
const PUMPKIN_STEM = 104;
const MELON_STEM = 105;
const VINES = 106; const VINE = 106;
const FENCE_GATE = 107; const OAK_FENCE_GATE = 107;
const VINES = 106, VINE = 106;
const FENCE_GATE = 107, OAK_FENCE_GATE = 107;
const BRICK_STAIRS = 108;
const STONE_BRICK_STAIRS = 109;
const MYCELIUM = 110;
const LILY_PAD = 111; const WATER_LILY = 111;
const NETHER_BRICKS = 112; const NETHER_BRICK_BLOCK = 112;
const LILY_PAD = 111, WATER_LILY = 111;
const NETHER_BRICKS = 112, NETHER_BRICK_BLOCK = 112;
const NETHER_BRICK_FENCE = 113;
const NETHER_BRICK_STAIRS = 114; const NETHER_BRICKS_STAIRS = 114;
const NETHER_BRICK_STAIRS = 114, NETHER_BRICKS_STAIRS = 114;
const NETHER_WART_BLOCK = 115;
const ENCHANTING_TABLE = 116; const ENCHANT_TABLE = 116; const ENCHANTMENT_TABLE = 116;
const ENCHANTING_TABLE = 116, ENCHANT_TABLE = 116, ENCHANTMENT_TABLE = 116;
const BREWING_STAND_BLOCK = 117;
const CAULDRON_BLOCK = 118;
const END_PORTAL_FRAME = 120; const END_PORTAL = 120;
const END_PORTAL_FRAME = 120, END_PORTAL = 120;
const END_STONE = 121;
const REDSTONE_LAMP = 123; const INACTIVE_REDSTONE_LAMP = 123;
const LIT_REDSTONE_LAMP = 124; const ACTIVE_REDSTONE_LAMP = 124;
const REDSTONE_LAMP = 123, INACTIVE_REDSTONE_LAMP = 123;
const LIT_REDSTONE_LAMP = 124, ACTIVE_REDSTONE_LAMP = 124;
const DROPPER = 125;
const ACTIVATOR_RAIL = 126;
const COCOA_BLOCK = 127; const COCOA_PODS = 127;
const COCOA_BLOCK = 127, COCOA_PODS = 127;
const SANDSTONE_STAIRS = 128;
const EMERALD_ORE = 129;
const TRIPWIRE_HOOK = 131;
const TRIPWIRE = 132;
const EMERALD_BLOCK = 133;
const SPRUCE_WOOD_STAIRS = 134; const SPRUCE_WOODEN_STAIRS = 134;
const BIRCH_WOOD_STAIRS = 135; const BIRCH_WOODEN_STAIRS = 135;
const JUNGLE_WOOD_STAIRS = 136; const JUNGLE_WOODEN_STAIRS = 136;
const SPRUCE_WOOD_STAIRS = 134, SPRUCE_WOODEN_STAIRS = 134;
const BIRCH_WOOD_STAIRS = 135, BIRCH_WOODEN_STAIRS = 135;
const JUNGLE_WOOD_STAIRS = 136, JUNGLE_WOODEN_STAIRS = 136;
const COBBLESTONE_WALL = 139; const COBBLE_WALL = 139; const STONE_WALL = 139;
const COBBLESTONE_WALL = 139, COBBLE_WALL = 139, STONE_WALL = 139;
const FLOWER_POT_BLOCK = 140;
const CARROT_BLOCK = 141;
const POTATO_BLOCK = 142;
const WOODEN_BUTTON = 143;
const MOB_HEAD_BLOCK = 144; const SKULL_BLOCK = 144;
const MOB_HEAD_BLOCK = 144, SKULL_BLOCK = 144;
const ANVIL = 145;
const TRAPPED_CHEST = 146;
const WEIGHTED_PRESSURE_PLATE_LIGHT = 147; const LIGHT_WEIGHTED_PRESSURE_PLATE = 147; const GOLD_PRESSURE_PLATE = 147;
const WEIGHTED_PRESSURE_PLATE_HEAVY = 148; const HEAVY_WEIGHTED_PRESSURE_PLATE = 148; const IRON_PRESSURE_PLATE = 148;
const COMPARATOR_BLOCK = 149; const UNPOWERED_COMPARATOR_BLOCK = 149;
const WEIGHTED_PRESSURE_PLATE_LIGHT = 147, LIGHT_WEIGHTED_PRESSURE_PLATE = 147, GOLD_PRESSURE_PLATE = 147;
const WEIGHTED_PRESSURE_PLATE_HEAVY = 148, HEAVY_WEIGHTED_PRESSURE_PLATE = 148, IRON_PRESSURE_PLATE = 148;
const COMPARATOR_BLOCK = 149, UNPOWERED_COMPARATOR_BLOCK = 149;
const POWERED_COMPARATOR_BLOCK = 150;
const DAYLIGHT_SENSOR = 151;
const REDSTONE_BLOCK = 152;
@ -179,14 +179,14 @@ interface BlockIds{
const HOPPER_BLOCK = 154;
const QUARTZ_BLOCK = 155;
const QUARTZ_STAIRS = 156;
const DOUBLE_WOOD_SLAB = 157; const DOUBLE_WOODEN_SLAB = 157; const DOUBLE_WOOD_SLABS = 157; const DOUBLE_WOODEN_SLABS = 157;
const WOOD_SLAB = 158; const WOODEN_SLAB = 158; const WOOD_SLABS = 158; const WOODEN_SLABS = 158;
const STAINED_CLAY = 159; const STAINED_HARDENED_CLAY = 159;
const DOUBLE_WOOD_SLAB = 157, DOUBLE_WOODEN_SLAB = 157, DOUBLE_WOOD_SLABS = 157, DOUBLE_WOODEN_SLABS = 157;
const WOOD_SLAB = 158, WOODEN_SLAB = 158, WOOD_SLABS = 158, WOODEN_SLABS = 158;
const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159;
const LEAVES2 = 161;
const WOOD2 = 162; const TRUNK2 = 162; const LOG2 = 162;
const ACACIA_WOOD_STAIRS = 163; const ACACIA_WOODEN_STAIRS = 163;
const DARK_OAK_WOOD_STAIRS = 164; const DARK_OAK_WOODEN_STAIRS = 164;
const WOOD2 = 162, TRUNK2 = 162, LOG2 = 162;
const ACACIA_WOOD_STAIRS = 163, ACACIA_WOODEN_STAIRS = 163;
const DARK_OAK_WOOD_STAIRS = 164, DARK_OAK_WOODEN_STAIRS = 164;
const SLIME_BLOCK = 165;
const IRON_TRAPDOOR = 167;
@ -198,16 +198,16 @@ interface BlockIds{
const PACKED_ICE = 174;
const DOUBLE_PLANT = 175;
const INVERTED_DAYLIGHT_SENSOR = 178; const DAYLIGHT_SENSOR_INVERTED = 178;
const INVERTED_DAYLIGHT_SENSOR = 178, DAYLIGHT_SENSOR_INVERTED = 178;
const RED_SANDSTONE = 179;
const RED_SANDSTONE_STAIRS = 180;
const DOUBLE_RED_SANDSTONE_SLAB = 181;
const RED_SANDSTONE_SLAB = 182;
const SPRUCE_FENCE_GATE = 183; const FENCE_GATE_SPRUCE = 183;
const BIRCH_FENCE_GATE = 184; const FENCE_GATE_BIRCH = 184;
const JUNGLE_FENCE_GATE = 185; const FENCE_GATE_JUNGLE = 185;
const DARK_OAK_FENCE_GATE = 186; const FENCE_GATE_DARK_OAK = 186;
const ACACIA_FENCE_GATE = 187; const FENCE_GATE_ACACIA = 187;
const SPRUCE_FENCE_GATE = 183, FENCE_GATE_SPRUCE = 183;
const BIRCH_FENCE_GATE = 184, FENCE_GATE_BIRCH = 184;
const JUNGLE_FENCE_GATE = 185, FENCE_GATE_JUNGLE = 185;
const DARK_OAK_FENCE_GATE = 186, FENCE_GATE_DARK_OAK = 186;
const ACACIA_FENCE_GATE = 187, FENCE_GATE_ACACIA = 187;
const SPRUCE_DOOR_BLOCK = 193;
const BIRCH_DOOR_BLOCK = 194;
@ -227,4 +227,4 @@ interface BlockIds{
const BLOCK_MOVED_BY_PISTON = 250;
const OBSERVER = 251;
const INFO_RESERVED6 = 255;
}
}

2
src/pocketmine/block/CocoaBlock.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class CocoaBlock extends Solid {
class CocoaBlock extends Solid{
protected $id = self::COCOA_BLOCK;

2
src/pocketmine/block/DaylightSensor.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class DaylightSensor extends Solid {
class DaylightSensor extends Solid{
protected $id = self::DAYLIGHT_SENSOR;

2
src/pocketmine/block/DetectorRail.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class DetectorRail extends Solid {
class DetectorRail extends Solid{
protected $id = self::DETECTOR_RAIL;

2
src/pocketmine/block/Fence.php
View File

@ -26,7 +26,7 @@ use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Vector3;
class Fence extends Transparent{
const FENCE_OAK = 0;
const FENCE_OAK = 0;
const FENCE_SPRUCE = 1;
const FENCE_BIRCH = 2;
const FENCE_JUNGLE = 3;

10
src/pocketmine/block/FlowerPot.php
View File

@ -54,12 +54,12 @@ class FlowerPot extends Flowable{
public function getBoundingBox(){
return new AxisAlignedBB(
$this->x + (5/16),
$this->x + (5 / 16),
$this->y,
$this->z + (5/16),
$this->x + (11/16),
$this->y + (6/16),
$this->z + (11/16)
$this->z + (5 / 16),
$this->x + (11 / 16),
$this->y + (6 / 16),
$this->z + (11 / 16)
);
}

2
src/pocketmine/block/Lever.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class Lever extends Solid {
class Lever extends Solid{
protected $id = self::LEVER;

2
src/pocketmine/block/LitRedstoneLamp.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class LitRedstoneLamp extends Solid {
class LitRedstoneLamp extends Solid{
protected $id = self::LIT_REDSTONE_LAMP;

2
src/pocketmine/block/LitRedstoneTorch.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class LitRedstoneTorch extends Solid {
class LitRedstoneTorch extends Solid{
protected $id = self::REDSTONE_TORCH;

2
src/pocketmine/block/MobHead.php
View File

@ -61,7 +61,7 @@ class MobHead extends Solid{
$nbt = new CompoundTag("", [
new StringTag("id", Tile::SKULL),
new ByteTag("SkullType", $item->getDamage()),
new ByteTag("Rot", $rot),
new ByteTag("Rot", $rot),
new IntTag("x", (int) $this->x),
new IntTag("y", (int) $this->y),
new IntTag("z", (int) $this->z)

9
src/pocketmine/block/NetherBrickFence.php
View File

@ -23,7 +23,7 @@ namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\Tool;
class NetherBrickFence extends Transparent {
class NetherBrickFence extends Transparent{
protected $id = self::NETHER_BRICK_FENCE;
@ -32,11 +32,10 @@ class NetherBrickFence extends Transparent {
}
public function getBreakTime(Item $item){
if ($item instanceof Air){
if($item instanceof Air){
//Breaking by hand
return 10;
}
else{
}else{
// Other breaktimes are equal to woodfences.
return parent::getBreakTime($item);
}
@ -67,5 +66,5 @@ class NetherBrickFence extends Transparent {
}else{
return [];
}
}
}
}

2
src/pocketmine/block/NoteBlock.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class NoteBlock extends Solid {
class NoteBlock extends Solid{
protected $id = self::NOTE_BLOCK;

2
src/pocketmine/block/PoweredRail.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class PoweredRail extends Solid {
class PoweredRail extends Solid{
protected $id = self::POWERED_RAIL;
public function __construct($meta = 0){

2
src/pocketmine/block/Rail.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class Rail extends Solid {
class Rail extends Solid{
protected $id = self::RAIL;

2
src/pocketmine/block/RedstoneLamp.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class RedstoneLamp extends Solid {
class RedstoneLamp extends Solid{
protected $id = self::REDSTONE_LAMP;

2
src/pocketmine/block/RedstoneTorch.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class RedstoneTorch extends Solid {
class RedstoneTorch extends Solid{
protected $id = self::REDSTONE_TORCH;

1
src/pocketmine/block/Slab.php
View File

@ -143,7 +143,6 @@ class Slab extends Transparent{
}
public function getToolType(){
return Tool::TYPE_PICKAXE;
}

2
src/pocketmine/block/StoneButton.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class StoneButton extends Solid {
class StoneButton extends Solid{
protected $id = self::STONE_BUTTON;

2
src/pocketmine/block/StonePressurePlate.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class StonePressurePlate extends Solid {
class StonePressurePlate extends Solid{
protected $id = self::STONE_PRESSURE_PLATE;

2
src/pocketmine/block/Tripwire.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class Tripwire extends Solid {
class Tripwire extends Solid{
protected $id = self::TRIPWIRE;

2
src/pocketmine/block/TripwireHook.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class TripwireHook extends Solid {
class TripwireHook extends Solid{
protected $id = self::TRIPWIRE_HOOK;

4
src/pocketmine/block/WallSign.php
View File

@ -39,8 +39,8 @@ class WallSign extends SignPost{
5 => 4,
];
if($type === Level::BLOCK_UPDATE_NORMAL){
if(isset($faces[$this->meta])) {
if ($this->getSide($faces[$this->meta])->getId() === self::AIR) {
if(isset($faces[$this->meta])){
if($this->getSide($faces[$this->meta])->getId() === self::AIR){
$this->getLevel()->useBreakOn($this);
}
return Level::BLOCK_UPDATE_NORMAL;

2
src/pocketmine/block/WeightedPressurePlateHeavy.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class WeightedPressurePlateHeavy extends Solid {
class WeightedPressurePlateHeavy extends Solid{
protected $id = self::WEIGHTED_PRESSURE_PLATE_HEAVY;

2
src/pocketmine/block/WeightedPressurePlateLight.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class WeightedPressurePlateLight extends Solid {
class WeightedPressurePlateLight extends Solid{
protected $id = self::WEIGHTED_PRESSURE_PLATE_LIGHT;

2
src/pocketmine/block/WoodenButton.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\block;
class WoodenButton extends Solid {
class WoodenButton extends Solid{
protected $id = self::WOODEN_BUTTON;

2
src/pocketmine/block/WoodenPressurePlate.php
View File

@ -25,7 +25,7 @@ class WoodenPressurePlate extends Solid{
protected $id = self::WOODEN_PRESSURE_PLATE;
public function __construct($meta = 0) {
public function __construct($meta = 0){
$this->meta = $meta;
}