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

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

1 files changed, 19 insertions, 0 deletions

diff --git a/Minecraft.Client/SkiModel.h b/Minecraft.Client/SkiModel.h
new file mode 100644
index 00000000..0a7d879b
--- /dev/null
+++ b/Minecraft.Client/SkiModel.h
@@ -0,0 +1,19 @@
+#pragma once
+#include "Model.h"
+#include "ModelPart.h"
+
+class SkiModel : public Model 
+{
+public:
+    ModelPartArray cubes;
+    
+private:
+	bool leftSki;
+
+public:
+	SkiModel(); // 4J added
+    SkiModel(bool leftSki);
+	void _init(bool leftSki); // 4J added
+	virtual void render(shared_ptr<Entity> entity, float time, float r, float bob, float yRot, float xRot, float scale, bool usecompiled);
+    virtual void setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, shared_ptr<Entity> entity);
+};
\ No newline at end of file