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

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

1 files changed, 13 insertions, 0 deletions

diff --git a/Minecraft.Client/BeaconRenderer.h b/Minecraft.Client/BeaconRenderer.h
new file mode 100644
index 00000000..0626b374
--- /dev/null
+++ b/Minecraft.Client/BeaconRenderer.h
@@ -0,0 +1,13 @@
+#pragma once
+#include "TileEntityRenderer.h"
+
+class BeaconTileEntity;
+
+class BeaconRenderer : public TileEntityRenderer
+{
+private:
+    static ResourceLocation BEAM_LOCATION;
+
+public:
+    virtual void render(shared_ptr<TileEntity> _beacon, double x, double y, double z, float a, bool setColor, float alpha, bool useCompiled);
+};