diff options
| -rw-r--r-- | .gitmodules | 18 | ||||
| m--------- | Server/Plugins/ChunkWorx | 0 | ||||
| -rw-r--r-- | Server/Plugins/DiamondMover/DiamondMover.lua | 85 | ||||
| m--------- | Server/Plugins/Handy | 0 | ||||
| m--------- | Server/Plugins/MagicCarpet | 0 | ||||
| m--------- | Server/Plugins/TransAPI | 0 | ||||
| -rw-r--r-- | src/Bindings/PluginManager.cpp | 2 |
7 files changed, 3 insertions, 102 deletions
diff --git a/.gitmodules b/.gitmodules index 34cdcaf16..aebe6ea3c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,24 +1,12 @@ -[submodule "MCServer/Plugins/Core"] +[submodule "Server/Plugins/Core"] path = Server/Plugins/Core url = https://github.com/cuberite/Core.git -[submodule "MCServer/Plugins/ProtectionAreas"] +[submodule "Server/Plugins/ProtectionAreas"] path = Server/Plugins/ProtectionAreas url = https://github.com/cuberite/ProtectionAreas.git -[submodule "MCServer/Plugins/TransAPI"] - path = Server/Plugins/TransAPI - url = https://github.com/cuberite/transapi.git -[submodule "MCServer/Plugins/ChunkWorx"] - path = Server/Plugins/ChunkWorx - url = https://github.com/cuberite/ChunkWorx.git -[submodule "MCServer/Plugins/ChatLog"] +[submodule "Server/Plugins/ChatLog"] path = Server/Plugins/ChatLog url = https://github.com/cuberite/ChatLog.git -[submodule "MCServer/Plugins/Handy"] - path = Server/Plugins/Handy - url = https://github.com/cuberite/Handy.git -[submodule "MCServer/Plugins/MagicCarpet"] - path = Server/Plugins/MagicCarpet - url = https://github.com/cuberite/MagicCarpet.git [submodule "lib/polarssl"] path = lib/polarssl url = https://github.com/cuberite/polarssl.git diff --git a/Server/Plugins/ChunkWorx b/Server/Plugins/ChunkWorx deleted file mode 160000 -Subproject 894c7e32049e9d2a1e736f7d721aaacd1ae29e5 diff --git a/Server/Plugins/DiamondMover/DiamondMover.lua b/Server/Plugins/DiamondMover/DiamondMover.lua deleted file mode 100644 index d3e70acfc..000000000 --- a/Server/Plugins/DiamondMover/DiamondMover.lua +++ /dev/null @@ -1,85 +0,0 @@ - --- DiamondMover.lua - --- An example Lua plugin using the cBlockArea object --- When a player rclks with a diamond in their hand, an area around the clicked block is moved in the direction the player is facing - - - - - --- Global variables -MOVER_SIZE_X = 4; -MOVER_SIZE_Y = 4; -MOVER_SIZE_Z = 4; - - - - - -function Initialize(Plugin) - Plugin:SetName("DiamondMover"); - Plugin:SetVersion(1); - - cPluginManager.AddHook(cPluginManager.HOOK_PLAYER_USED_ITEM, OnPlayerUsedItem); - - LOG("Initialized " .. Plugin:GetName() .. " v." .. Plugin:GetVersion()); - return true; -end - - - - - -function OnPlayerUsedItem(Player, BlockX, BlockY, BlockZ, BlockFace, CursorX, CursorY, CursorZ) - - -- Don't check if the direction is in the air - if (BlockFace == -1) then - return false; - end; - - if (not Player:HasPermission("diamondmover.move")) then - return false; - end; - - -- Rclk with a diamond to push in the direction the player is facing - if (Player:GetEquippedItem().m_ItemType == E_ITEM_DIAMOND) then - local Area = cBlockArea(); - Area:Read(Player:GetWorld(), - BlockX - MOVER_SIZE_X, BlockX + MOVER_SIZE_X, - BlockY - MOVER_SIZE_Y, BlockY + MOVER_SIZE_Y, - BlockZ - MOVER_SIZE_Z, BlockZ + MOVER_SIZE_Z - ); - - local PlayerPitch = Player:GetPitch(); - if (PlayerPitch < -70) then -- looking up - BlockY = BlockY + 1; - else - if (PlayerPitch > 70) then -- looking down - BlockY = BlockY - 1; - else - local PlayerRot = Player:GetYaw() + 180; -- Convert [-180, 180] into [0, 360] for simpler conditions - if ((PlayerRot < 45) or (PlayerRot > 315)) then - BlockZ = BlockZ - 1; - else - if (PlayerRot < 135) then - BlockX = BlockX + 1; - else - if (PlayerRot < 225) then - BlockZ = BlockZ + 1; - else - BlockX = BlockX - 1; - end; - end; - end; - end; - end; - - Area:Write(Player:GetWorld(), BlockX - MOVER_SIZE_X, BlockY - MOVER_SIZE_Y, BlockZ - MOVER_SIZE_Z); - return false; - end -end - - - - diff --git a/Server/Plugins/Handy b/Server/Plugins/Handy deleted file mode 160000 -Subproject e64a04be39ac7790abcb09de3d4c7d8fc2a2a1e diff --git a/Server/Plugins/MagicCarpet b/Server/Plugins/MagicCarpet deleted file mode 160000 -Subproject 94da343b62f0498a5843247f36d6ee00cbeb8f2 diff --git a/Server/Plugins/TransAPI b/Server/Plugins/TransAPI deleted file mode 160000 -Subproject be15597bf3d976310a59e3aa8661cce413441c1 diff --git a/src/Bindings/PluginManager.cpp b/src/Bindings/PluginManager.cpp index 714fa03f6..aa2b5fbfc 100644 --- a/src/Bindings/PluginManager.cpp +++ b/src/Bindings/PluginManager.cpp @@ -163,10 +163,8 @@ void cPluginManager::InsertDefaultPlugins(cSettingsRepositoryInterface & a_Setti a_Settings.AddKeyName("Plugins"); a_Settings.AddKeyComment("Plugins", " Plugin=Debuggers"); a_Settings.AddKeyComment("Plugins", " Plugin=HookNotify"); - a_Settings.AddKeyComment("Plugins", " Plugin=ChunkWorx"); a_Settings.AddKeyComment("Plugins", " Plugin=APIDump"); a_Settings.AddValue("Plugins", "Plugin", "Core"); - a_Settings.AddValue("Plugins", "Plugin", "TransAPI"); a_Settings.AddValue("Plugins", "Plugin", "ChatLog"); } |