From 9d46fa6ae9718f51f9031111c4f28ffd7e6ecc0f Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 22 Sep 2013 18:18:04 +0100 Subject: Changed to SetBlockMeta --- source/Blocks/BlockComparator.cpp | 2 +- source/Blocks/BlockLever.cpp | 2 +- source/Blocks/BlockRedstoneRepeater.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source') diff --git a/source/Blocks/BlockComparator.cpp b/source/Blocks/BlockComparator.cpp index e6fa64e2c..87a10dc88 100644 --- a/source/Blocks/BlockComparator.cpp +++ b/source/Blocks/BlockComparator.cpp @@ -32,7 +32,7 @@ void cBlockComparatorHandler::OnUse(cWorld *a_World, cPlayer *a_Player, int a_Bl { NIBBLETYPE Meta = a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ); Meta ^= 0x04; // Toggle 3rd (addition/subtraction) bit with XOR - a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, m_BlockType, Meta); + a_World->SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta); } diff --git a/source/Blocks/BlockLever.cpp b/source/Blocks/BlockLever.cpp index f2ca1805a..bd70cfd1b 100644 --- a/source/Blocks/BlockLever.cpp +++ b/source/Blocks/BlockLever.cpp @@ -23,7 +23,7 @@ void cBlockLeverHandler::OnUse(cWorld *a_World, cPlayer *a_Player, int a_BlockX, { // Flip the ON bit on/off. Using XOR bitwise operation to turn it on/off. NIBBLETYPE Meta = ((a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) ^ 0x08) & 0x0f); - a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, m_BlockType, Meta); + a_World->SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta); if (Meta & 0x08) { a_World->BroadcastSoundEffect("random.click", a_BlockX * 8, a_BlockY * 8, a_BlockZ * 8, 0.5f, 0.6f); diff --git a/source/Blocks/BlockRedstoneRepeater.cpp b/source/Blocks/BlockRedstoneRepeater.cpp index 5e491ee5a..8cfb48f4d 100644 --- a/source/Blocks/BlockRedstoneRepeater.cpp +++ b/source/Blocks/BlockRedstoneRepeater.cpp @@ -30,7 +30,7 @@ void cBlockRedstoneRepeaterHandler::OnDestroyed(cWorld *a_World, int a_BlockX, i void cBlockRedstoneRepeaterHandler::OnUse(cWorld *a_World, cPlayer *a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) { - a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, m_BlockType, ((a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) + 0x04) & 0x0f)); + a_World->SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, ((a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) + 0x04) & 0x0f)); } -- cgit v1.2.3 From 5d2831ddb9c85c4ffc9782c351ea75508d18a22b Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 22 Sep 2013 18:19:51 +0100 Subject: Increase piston delay to a second Another fix for #57 --- source/Piston.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source') diff --git a/source/Piston.cpp b/source/Piston.cpp index b5fda1600..136100922 100644 --- a/source/Piston.cpp +++ b/source/Piston.cpp @@ -21,7 +21,7 @@ extern bool g_BlockPistonBreakable[]; /// Number of ticks that the piston extending / retracting waits before setting the block -const int PISTON_TICK_DELAY = 10; +const int PISTON_TICK_DELAY = 20; -- cgit v1.2.3 From 5c22a9f5f0e1e072eb9034a79e3bfc465822deab Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 22 Sep 2013 19:16:56 +0100 Subject: Removed OnDigging for Redstone devices --- source/Blocks/BlockComparator.cpp | 9 --------- source/Blocks/BlockComparator.h | 1 - source/Blocks/BlockLever.cpp | 10 +--------- source/Blocks/BlockLever.h | 1 - source/Blocks/BlockRedstoneRepeater.cpp | 9 --------- source/Blocks/BlockRedstoneRepeater.h | 1 - 6 files changed, 1 insertion(+), 30 deletions(-) (limited to 'source') diff --git a/source/Blocks/BlockComparator.cpp b/source/Blocks/BlockComparator.cpp index 87a10dc88..72453a816 100644 --- a/source/Blocks/BlockComparator.cpp +++ b/source/Blocks/BlockComparator.cpp @@ -38,15 +38,6 @@ void cBlockComparatorHandler::OnUse(cWorld *a_World, cPlayer *a_Player, int a_Bl - -void cBlockComparatorHandler::OnDigging(cWorld *a_World, cPlayer *a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) -{ - OnUse(a_World, a_Player, a_BlockX, a_BlockY, a_BlockZ, BLOCK_FACE_NONE, 8, 8, 8); -} - - - - bool cBlockComparatorHandler::GetPlacementBlockTypeMeta( cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, diff --git a/source/Blocks/BlockComparator.h b/source/Blocks/BlockComparator.h index 208727107..b80c9c72c 100644 --- a/source/Blocks/BlockComparator.h +++ b/source/Blocks/BlockComparator.h @@ -15,7 +15,6 @@ public: cBlockComparatorHandler(BLOCKTYPE a_BlockType); virtual void OnDestroyed(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ) override; - virtual void OnDigging(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override; virtual void OnUse(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override; diff --git a/source/Blocks/BlockLever.cpp b/source/Blocks/BlockLever.cpp index bd70cfd1b..96b5fc368 100644 --- a/source/Blocks/BlockLever.cpp +++ b/source/Blocks/BlockLever.cpp @@ -23,6 +23,7 @@ void cBlockLeverHandler::OnUse(cWorld *a_World, cPlayer *a_Player, int a_BlockX, { // Flip the ON bit on/off. Using XOR bitwise operation to turn it on/off. NIBBLETYPE Meta = ((a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) ^ 0x08) & 0x0f); + a_World->SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta); if (Meta & 0x08) { @@ -37,12 +38,3 @@ void cBlockLeverHandler::OnUse(cWorld *a_World, cPlayer *a_Player, int a_BlockX, - -void cBlockLeverHandler::OnDigging(cWorld *a_World, cPlayer *a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) -{ - OnUse(a_World, a_Player, a_BlockX, a_BlockY, a_BlockZ, BLOCK_FACE_NONE, 8, 8, 8); -} - - - - diff --git a/source/Blocks/BlockLever.h b/source/Blocks/BlockLever.h index ddf48297c..416d7685f 100644 --- a/source/Blocks/BlockLever.h +++ b/source/Blocks/BlockLever.h @@ -14,7 +14,6 @@ class cBlockLeverHandler : public: cBlockLeverHandler(BLOCKTYPE a_BlockType); - virtual void OnDigging(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override; virtual void OnUse(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override; diff --git a/source/Blocks/BlockRedstoneRepeater.cpp b/source/Blocks/BlockRedstoneRepeater.cpp index 8cfb48f4d..672fdf55a 100644 --- a/source/Blocks/BlockRedstoneRepeater.cpp +++ b/source/Blocks/BlockRedstoneRepeater.cpp @@ -36,15 +36,6 @@ void cBlockRedstoneRepeaterHandler::OnUse(cWorld *a_World, cPlayer *a_Player, in - -void cBlockRedstoneRepeaterHandler::OnDigging(cWorld *a_World, cPlayer *a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) -{ - OnUse(a_World, a_Player, a_BlockX, a_BlockY, a_BlockZ, BLOCK_FACE_NONE, 8, 8, 8); -} - - - - bool cBlockRedstoneRepeaterHandler::GetPlacementBlockTypeMeta( cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, diff --git a/source/Blocks/BlockRedstoneRepeater.h b/source/Blocks/BlockRedstoneRepeater.h index 21f227332..01d9de96d 100644 --- a/source/Blocks/BlockRedstoneRepeater.h +++ b/source/Blocks/BlockRedstoneRepeater.h @@ -15,7 +15,6 @@ public: cBlockRedstoneRepeaterHandler(BLOCKTYPE a_BlockType); virtual void OnDestroyed(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ) override; - virtual void OnDigging(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override; virtual void OnUse(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override; -- cgit v1.2.3 From a8a45a4afc615926a705eee482c27ef166f2f9ec Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 22 Sep 2013 19:34:42 +0100 Subject: Added button placement handler Also removed an unneeded variable in the stair handler --- source/Blocks/BlockButton.cpp | 40 ++++++++++++++++++++++++ source/Blocks/BlockButton.h | 69 ++++++++++++++++++++++++++++++++++++++++++ source/Blocks/BlockHandler.cpp | 3 ++ source/Blocks/BlockStairs.h | 1 - 4 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 source/Blocks/BlockButton.cpp create mode 100644 source/Blocks/BlockButton.h (limited to 'source') diff --git a/source/Blocks/BlockButton.cpp b/source/Blocks/BlockButton.cpp new file mode 100644 index 000000000..8df399cf0 --- /dev/null +++ b/source/Blocks/BlockButton.cpp @@ -0,0 +1,40 @@ + +#include "Globals.h" +#include "BlockButton.h" +#include "../Simulator/RedstoneSimulator.h" + + + + + +cBlockButtonHandler::cBlockButtonHandler(BLOCKTYPE a_BlockType) + : cBlockHandler(a_BlockType) +{ +} + + + + + +void cBlockButtonHandler::OnUse(cWorld *a_World, cPlayer *a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) +{ + // Flip the ON bit on/off. Using XOR bitwise operation to turn it on/off. + NIBBLETYPE Meta = ((a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) ^ 0x08) & 0x0f); + a_World->SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta); + + if (Meta & 0x08) + { + a_World->BroadcastSoundEffect("random.click", a_BlockX * 8, a_BlockY * 8, a_BlockZ * 8, 0.5f, 0.6f); + } + else + { + a_World->BroadcastSoundEffect("random.click", a_BlockX * 8, a_BlockY * 8, a_BlockZ * 8, 0.5f, 0.5f); + } + + // Queue a button reset (unpress), with a GetBlock to prevent duplication of buttons (press, break, wait for reset) + a_World->QueueSetBlock(a_BlockX, a_BlockY, a_BlockZ, a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ), ((a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) ^ 0x08) & 0x0f), m_BlockType == E_BLOCK_STONE_BUTTON ? 20 : 25); +} + + + + diff --git a/source/Blocks/BlockButton.h b/source/Blocks/BlockButton.h new file mode 100644 index 000000000..e3f655bfa --- /dev/null +++ b/source/Blocks/BlockButton.h @@ -0,0 +1,69 @@ +#pragma once + +#include "BlockHandler.h" + + + + + +class cBlockButtonHandler : + public cBlockHandler +{ +public: + cBlockButtonHandler(BLOCKTYPE a_BlockType); + + virtual void OnUse(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override; + + + virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override + { + // Reset meta to 0 + a_Pickups.push_back(cItem(m_BlockType == E_BLOCK_WOODEN_BUTTON ? E_BLOCK_WOODEN_BUTTON : E_BLOCK_STONE_BUTTON, 1, 0)); + } + + + virtual bool IsUseable(void) override + { + return true; + } + + + virtual bool GetPlacementBlockTypeMeta( + cWorld * a_World, cPlayer * a_Player, + int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, + int a_CursorX, int a_CursorY, int a_CursorZ, + BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta + ) override + { + a_BlockType = m_BlockType; + a_BlockMeta = BlockFaceToMetaData(a_BlockFace); + return true; + } + + + virtual const char * GetStepSound(void) override + { + return m_BlockType == E_BLOCK_WOODEN_BUTTON ? "step.wood" : "step.stone"; + } + + + inline static NIBBLETYPE BlockFaceToMetaData(char a_BlockFace) + { + switch (a_BlockFace) + { + case BLOCK_FACE_ZP: { return 0x4; } + case BLOCK_FACE_ZM: { return 0x3; } + case BLOCK_FACE_XP: { return 0x2; } + case BLOCK_FACE_XM: { return 0x1; } + default: + { + ASSERT(!"Unhandled block face!"); + return 0x0; // No idea, give a special meta (button in centre of block) + } + } + } +} ; + + + + diff --git a/source/Blocks/BlockHandler.cpp b/source/Blocks/BlockHandler.cpp index b06171119..e59fee8ee 100644 --- a/source/Blocks/BlockHandler.cpp +++ b/source/Blocks/BlockHandler.cpp @@ -7,6 +7,7 @@ #include "../PluginManager.h" #include "BlockBed.h" #include "BlockBrewingStand.h" +#include "BlockButton.h" #include "BlockCactus.h" #include "BlockCarpet.h" #include "BlockCauldron.h" @@ -185,6 +186,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType) case E_BLOCK_STICKY_PISTON: return new cBlockPistonHandler (a_BlockType); case E_BLOCK_STONE: return new cBlockStoneHandler (a_BlockType); case E_BLOCK_STONE_BRICK_STAIRS: return new cBlockStairsHandler (a_BlockType); + case E_BLOCK_STONE_BUTTON: return new cBlockButtonHandler (a_BlockType); case E_BLOCK_STONE_SLAB: return new cBlockSlabHandler (a_BlockType); case E_BLOCK_SUGARCANE: return new cBlockSugarcaneHandler (a_BlockType); case E_BLOCK_TALL_GRASS: return new cBlockTallGrassHandler (a_BlockType); @@ -192,6 +194,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType) case E_BLOCK_VINES: return new cBlockVineHandler (a_BlockType); case E_BLOCK_WALLSIGN: return new cBlockSignHandler (a_BlockType); case E_BLOCK_WATER: return new cBlockFluidHandler (a_BlockType); + case E_BLOCK_WOODEN_BUTTON: return new cBlockButtonHandler (a_BlockType); case E_BLOCK_WOODEN_DOOR: return new cBlockDoorHandler (a_BlockType); case E_BLOCK_WOODEN_SLAB: return new cBlockSlabHandler (a_BlockType); case E_BLOCK_WOODEN_STAIRS: return new cBlockStairsHandler (a_BlockType); diff --git a/source/Blocks/BlockStairs.h b/source/Blocks/BlockStairs.h index 485ebda1a..8d259eee3 100644 --- a/source/Blocks/BlockStairs.h +++ b/source/Blocks/BlockStairs.h @@ -53,7 +53,6 @@ public: static NIBBLETYPE RotationToMetaData(double a_Rotation) { a_Rotation += 90 + 45; // So its not aligned with axis - NIBBLETYPE result = 0x0; if (a_Rotation > 360) { a_Rotation -= 360; -- cgit v1.2.3 From 0fcbaca0ed6f63cef7e5d6e834d832094590bcff Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 22 Sep 2013 19:35:35 +0100 Subject: Changed a comment Was a remnant of my TypeType minecarts :D --- source/ClientHandle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source') diff --git a/source/ClientHandle.cpp b/source/ClientHandle.cpp index 1806ce8e6..074b50bad 100644 --- a/source/ClientHandle.cpp +++ b/source/ClientHandle.cpp @@ -1917,7 +1917,7 @@ void cClientHandle::SendSpawnObject(const cEntity & a_Entity, char a_ObjectType, -void cClientHandle::SendSpawnVehicle(const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType) // VehicleTypeType is specific to Minecarts +void cClientHandle::SendSpawnVehicle(const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType) // VehicleSubType is specific to Minecarts { m_Protocol->SendSpawnVehicle(a_Vehicle, a_VehicleType, a_VehicleSubType); } -- cgit v1.2.3 From dad3648102c5861ed691ac90bd265bcc5667e787 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 22 Sep 2013 19:48:59 +0100 Subject: Removed some unneeded includes --- source/Blocks/BlockButton.cpp | 1 - source/Blocks/BlockComparator.cpp | 2 -- source/Blocks/BlockComparator.h | 1 - source/Blocks/BlockLever.cpp | 2 -- source/Blocks/BlockLever.h | 1 - source/Blocks/BlockRedstoneRepeater.cpp | 2 -- source/Blocks/BlockRedstoneRepeater.h | 1 - source/Entities/Boat.h | 1 - source/Entities/Minecart.h | 1 - 9 files changed, 12 deletions(-) (limited to 'source') diff --git a/source/Blocks/BlockButton.cpp b/source/Blocks/BlockButton.cpp index 8df399cf0..1011f9351 100644 --- a/source/Blocks/BlockButton.cpp +++ b/source/Blocks/BlockButton.cpp @@ -1,7 +1,6 @@ #include "Globals.h" #include "BlockButton.h" -#include "../Simulator/RedstoneSimulator.h" diff --git a/source/Blocks/BlockComparator.cpp b/source/Blocks/BlockComparator.cpp index 72453a816..b4e5a55d0 100644 --- a/source/Blocks/BlockComparator.cpp +++ b/source/Blocks/BlockComparator.cpp @@ -1,8 +1,6 @@ #include "Globals.h" #include "BlockComparator.h" -#include "../Item.h" -#include "../World.h" #include "../Simulator/RedstoneSimulator.h" #include "../Entities/Player.h" diff --git a/source/Blocks/BlockComparator.h b/source/Blocks/BlockComparator.h index b80c9c72c..cb2941d3c 100644 --- a/source/Blocks/BlockComparator.h +++ b/source/Blocks/BlockComparator.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" diff --git a/source/Blocks/BlockLever.cpp b/source/Blocks/BlockLever.cpp index 96b5fc368..a9bd6c990 100644 --- a/source/Blocks/BlockLever.cpp +++ b/source/Blocks/BlockLever.cpp @@ -1,8 +1,6 @@ #include "Globals.h" #include "BlockLever.h" -#include "../Item.h" -#include "../World.h" #include "../Entities/Player.h" #include "../Simulator/RedstoneSimulator.h" diff --git a/source/Blocks/BlockLever.h b/source/Blocks/BlockLever.h index 416d7685f..5553170e2 100644 --- a/source/Blocks/BlockLever.h +++ b/source/Blocks/BlockLever.h @@ -1,7 +1,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" #include "../Simulator/RedstoneSimulator.h" diff --git a/source/Blocks/BlockRedstoneRepeater.cpp b/source/Blocks/BlockRedstoneRepeater.cpp index 672fdf55a..72ea21012 100644 --- a/source/Blocks/BlockRedstoneRepeater.cpp +++ b/source/Blocks/BlockRedstoneRepeater.cpp @@ -1,8 +1,6 @@ #include "Globals.h" #include "BlockRedstoneRepeater.h" -#include "../Item.h" -#include "../World.h" #include "../Simulator/RedstoneSimulator.h" #include "../Entities/Player.h" diff --git a/source/Blocks/BlockRedstoneRepeater.h b/source/Blocks/BlockRedstoneRepeater.h index 01d9de96d..958841a34 100644 --- a/source/Blocks/BlockRedstoneRepeater.h +++ b/source/Blocks/BlockRedstoneRepeater.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" diff --git a/source/Entities/Boat.h b/source/Entities/Boat.h index 734ebda83..8c51ab86c 100644 --- a/source/Entities/Boat.h +++ b/source/Entities/Boat.h @@ -10,7 +10,6 @@ #pragma once #include "Entity.h" -#include "../Item.h" diff --git a/source/Entities/Minecart.h b/source/Entities/Minecart.h index 0ca6586db..0152f5dfc 100644 --- a/source/Entities/Minecart.h +++ b/source/Entities/Minecart.h @@ -10,7 +10,6 @@ #pragma once #include "Entity.h" -#include "../Item.h" -- cgit v1.2.3