Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 16 insertions, 0 deletions

diff --git a/Minecraft.World/NoteBlockTile.h b/Minecraft.World/NoteBlockTile.h
new file mode 100644
index 00000000..e072b5e6
--- /dev/null
+++ b/Minecraft.World/NoteBlockTile.h
@@ -0,0 +1,16 @@
+#pragma once
+#include "BaseEntityTile.h"
+
+class Player;
+
+class NoteBlockTile : public BaseEntityTile
+{
+public:
+	NoteBlockTile(int id);
+	virtual void neighborChanged(Level *level, int x, int y, int z, int type);
+	virtual bool TestUse();
+	virtual bool use(Level *level, int x, int y, int z, shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly = false); // 4J added soundOnly param
+	virtual void attack(Level *level, int x, int y, int z, shared_ptr<Player> player);
+	virtual shared_ptr<TileEntity> newTileEntity(Level *level);
+	virtual bool triggerEvent(Level *level, int x, int y, int z, int i, int note);
+};
\ No newline at end of file