Skip to content
This repository has been archived by the owner on Feb 8, 2019. It is now read-only.

Commit

Permalink
Merge pull request #14 from VectorNetworkProject/develop
Browse files Browse the repository at this point in the history
Release v0.0.8-BETA
  • Loading branch information
InkoHX authored Dec 13, 2018
2 parents 2d3a7ea + 2539e70 commit 4343c33
Show file tree
Hide file tree
Showing 44 changed files with 306 additions and 64 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ composer.phar
# JetBrains IDE
.idea/workspace.xml
.idea/dictionaries/

# VS Code
.vscode
1 change: 1 addition & 0 deletions .idea/TheMix.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .poggit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ projects:
- src: fuyutsuki/libform/libform
version: 0.4.0
- src: InkoHX/LeveLibrary/LeveLibrary
version: 0.0.3
version: 0.0.4
- src: InkoHX/GoldLibrary/GoldLibrary
version: 0.0.2
version: 0.0.3
...
Empty file removed .vscode/settings.json
Empty file.
8 changes: 5 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "vectornetworkproject/themix",
"description": "Original game of VectorNetwork",
"homepage": "https://www.vector-network.tk",
"type": "project",
"license": "MIT",
Expand Down Expand Up @@ -48,16 +49,17 @@
"ext-zip": "*",
"ext-zlib": ">=1.2.11",
"mdanter/ecc": "^0.5.0",
"pocketmine/pocketmine-mp": "^3.3.4",
"pocketmine/pocketmine-mp": "^3.5.0",
"pocketmine/raklib": "^0.12.0",
"pocketmine/spl": "^0.3.0",
"pocketmine/binaryutils": "^0.1.0",
"pocketmine/nbt": "^0.2.1",
"pocketmine/math": "^0.2.0",
"pocketmine/snooze": "^0.1.0",
"fuyutsuki/libform": "^0.4.0",
"inkohx/levelibrary": "^0.0.3",
"inkohx/goldlibrary": "^0.0.2"
"inkohx/levelibrary": "^0.0.4",
"inkohx/goldlibrary": "^0.0.3",
"daverandom/callback-validator": "dev-master"
},
"autoload": {
"psr-4": {
Expand Down
87 changes: 65 additions & 22 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ softdepend:

description: "Original game of VectorNetwork"
website: "https://vector-network.tk"
version: 0.0.7-BETA
version: 0.0.8-BETA
authors:
- InkoHX
- MazaiCrafty
Expand Down
21 changes: 20 additions & 1 deletion resources/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,27 @@
version: 7
# It is a setting file of VectorNetwork's original game "The Mix".
#
# GitHub: https://github.com/VectorNetworkProject/TheMix
# Website: https://www.vector-network.tk
# Discord: https://discord.gg/EF2G5dh

# Config version
version: 8
# You can set whether to enable developer mode.
# Note: Do not forget to disable developer mode when publishing server.
dev-mode: true
# Please enter the name of the map.
stage-world-name: stage
# Please set the time the event will come. By default, it is held every 30 minutes.
# This function will be implemented in the future.
event-time: 30
# Please set the time zone.
timezone: Asia/Tokyo
# Please enter the block ID which can participate in the game when touching the block.
join-block-id: 247
# Please configure server address and port.
ip: play.vector-network.tk
port: 19132

red:
spawn1:
x: 1
Expand Down
2 changes: 1 addition & 1 deletion src/VectorNetworkProject/TheMix/TheMix.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

class TheMix extends PluginBase
{
public const VERSION = 7;
public const VERSION = 8;

/* @var TheMix $instance */
private static $instance = null;
Expand Down
3 changes: 3 additions & 0 deletions src/VectorNetworkProject/TheMix/command/Permissions.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ class Permissions
public const USER = 'the.mix.commands.user.';
public const ADMIN = 'the.mix.commands.admin.';

/**
* @return void
*/
public static function registerPermissions(): void
{
PermissionManager::getInstance()->addPermission(new Permission(self::USER.'ping', '応答速度を計測します。', Permission::DEFAULT_TRUE));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function __construct(Plugin $owner)
*/
public function execute(CommandSender $sender, string $commandLabel, array $args)
{
$sender->sendMessage('Discord: https://discord.gg/EF2G5dh');
$sender->sendMessage('§9Discord: https://discord.gg/EF2G5dh');

return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@

class BlockReGeneratorEvent implements Listener
{
/**
* @param BlockBreakEvent $event
*/
public function event(BlockBreakEvent $event): void
{
$block = $event->getBlock();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@

class TheBlockBreakEvent implements Listener
{
/**
* @param BlockBreakEvent $event
*
* @throws \ReflectionException
*/
public function event(BlockBreakEvent $event)
{
$player = $event->getPlayer();
Expand Down Expand Up @@ -58,7 +63,7 @@ public function event(BlockBreakEvent $event)
Server::getInstance()->getLogger()->info("{$player->getNameTag()}§fが§cRED§fのコアを破壊している!");
$block->getLevel()->broadcastLevelSoundEvent($block->asVector3(), LevelSoundEventPacket::SOUND_RANDOM_ANVIL_USE);
foreach (Server::getInstance()->getOnlinePlayers() as $player) {
LevelSounds::NotePiano($player, 20);
LevelSounds::NotePiano($player);
}
} elseif (BlueCoreManager::isCore($block)) {
$event->setCancelled();
Expand All @@ -78,7 +83,7 @@ public function event(BlockBreakEvent $event)
Server::getInstance()->getLogger()->info("{$player->getNameTag()}§fが§cRED§fのコアを破壊している!");
$block->getLevel()->broadcastLevelSoundEvent($block->asVector3(), LevelSoundEventPacket::SOUND_RANDOM_ANVIL_USE);
foreach (Server::getInstance()->getOnlinePlayers() as $player) {
LevelSounds::NotePiano($player, 20);
LevelSounds::NotePiano($player);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

class TheBlockPlaceEvent implements Listener
{
/**
* @param BlockPlaceEvent $event
*/
public function event(BlockPlaceEvent $event)
{
$player = $event->getPlayer();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@

class TheEntityDamageEvent implements Listener
{
/**
* @param EntityDamageEvent $event
*
* @throws \ReflectionException
*/
public function event(EntityDamageEvent $event)
{
$entity = $event->getEntity();
Expand Down
Loading

0 comments on commit 4343c33

Please sign in to comment.