Fix some minor things

Author: ninXout

.gitignore

@@ -1 +1,2 @@
-build/
+build/
+.DS_store

about.md

@@ -1,5 +1,5 @@
 # Crystal
-The **biggest** mod client for Mac. Comes with a very accurate macro bot called **Amethyst** and 80+ new mods and features, all organized in an easy to use dropdown GUI. 
+The **biggest** mod client for Mac and Windows. Comes with a very accurate macro bot called **Amethyst** and 90+ new mods and features, all organized in an easy to use dropdown GUI. 
 
 Click TAB to open and close the mod menu.
 
@@ -9,7 +9,7 @@ If you need any help with Crystal, want to suggest some upcoming features, or wa
 ## Special Thanks
 **Nosu:** contributed a lot of her ideas and mods.
 **Isakube:** for being the best accidental admin of my server.
-**Mat (matcool/mat.4):** for providing the code for some mods, and for the ImGui library.
+**Mat (matcool/mat.4):** for providing the code for some mods, for fixing the client for windows, and for the ImGui library.
 **Camila (camila314):** for being amazing and very helpful.
 **YourInnerDemons**, for making a lot of the logos and art and the trailer.
 **Seaze/SeazeIsCool, InkZie, tallen_suired, nomn, and nadire/Zen1th**, for beta testing.

mod.json

@@ -1,10 +1,10 @@
 {
 	"geode": "1.0.0",
-	"version": "v4.0.0",
+	"version": "v4.0.1",
 	"id": "ninxout.crystalclient",
 	"name": "Crystal Client",
 	"developer": "ninXout",
-	"description": "Premium MacOS Modded Client",
+	"description": "Premium Cross-Platform Modded Client",
 	"resources": {
         "files": [
             "resources/Lexend.ttf"

src/CrystalClient/CrystalClient.cpp

@@ -29,6 +29,22 @@ void CrystalClient::ImToggleable(const char* str_id, bool* v, std::string toolti
 	ImVec2 p = ImGui::GetCursorScreenPos();
 	ImDrawList* draw_list = ImGui::GetWindowDrawList();
 
+	bool no_win = (tooltip == "This mod is not available for Windows");
+
+	ImVec4 regularColor;
+	if (no_win) {
+		regularColor = ImVec4(0.85f, 0.85f, 0.85f, 0.1f);
+	} else {
+		regularColor = *v ? colors[ImGuiCol_Button] : ImVec4(0.85f, 0.85f, 0.85f, 1.0f);
+	}
+
+	ImVec4 activeColor;
+	if (no_win) {
+		activeColor = ImVec4(0.85f, 0.85f, 0.85f, 0.1f);
+	} else {
+		activeColor = *v ? colors[ImGuiCol_ButtonActive] : ImVec4(0.78f, 0.78f, 0.78f, 1.0f);
+	}
+
 	float height = ImGui::GetFrameHeight();
 	float width = height * 1.55f;
 	float radius = height * 0.50f;
@@ -38,22 +54,18 @@ void CrystalClient::ImToggleable(const char* str_id, bool* v, std::string toolti
 	ImGui::SetItemAllowOverlap();
 	ImGui::SameLine();
 	ImGui::SetCursorScreenPos(ImVec2(p.x + 10, p.y));
-	ImGui::TextColored(*v ? colors[ImGuiCol_Button] : ImVec4(0.85f, 0.85f, 0.85f, 1.0f), "%s", str_id);
-	if (ImGui::IsItemClicked()) *v = !*v;
+	ImGui::TextColored(regularColor, "%s", str_id);
+	if (ImGui::IsItemClicked() && !no_win) *v = !*v;
 	ImGuiContext& gg = *GImGui;
 	float ANIM_SPEED = 0.085f;
 	if (gg.LastActiveId == gg.CurrentWindow->GetID(str_id))// && g.LastActiveIdTimer < ANIM_SPEED)
 		float t_anim = ImSaturate(gg.LastActiveIdTimer / ANIM_SPEED);
 	if (ImGui::IsItemHovered()) {
 		if (tooltip != "N/A") ImGui::SetTooltip("%s", tooltip.c_str());
-		draw_list->AddRectFilled(p, ImVec2(p.x + width * 0.1, p.y + height), ImGui::GetColorU32(*v ? colors[ImGuiCol_ButtonActive] : ImVec4(0.78f, 0.78f, 0.78f, 1.0f)), height * rounding);
+		draw_list->AddRectFilled(p, ImVec2(p.x + width * 0.1, p.y + height), ImGui::GetColorU32(activeColor), height * rounding);
 	} else {
-		draw_list->AddRectFilled(p, ImVec2(p.x + width * 0.1, p.y + height), ImGui::GetColorU32(*v ? colors[ImGuiCol_Button] : ImVec4(0.85f, 0.85f, 0.85f, 1.0f)), height * rounding);
+		draw_list->AddRectFilled(p, ImVec2(p.x + width * 0.1, p.y + height), ImGui::GetColorU32(regularColor), height * rounding);
 	}
-	
-	ImVec2 center = ImVec2(radius + (*v ? 1 : 0) * (width - radius * 2.0f), radius);
-	//draw_list->AddRectFilled(ImVec2((p.x + center.x) - 9.0f, p.y + 1.5f),
-		//ImVec2((p.x + (width / 2) + center.x) - 9.0f, p.y + height - 1.5f), IM_COL32(255, 255, 255, 255), height * rounding);
 }
 
 void CrystalClient::ImExtendedToggleable(const char* str_id, bool* v, std::string tooltip) {

src/CrystalProfile.hpp

@@ -53,7 +53,9 @@ inline std::map<std::string, std::string> modsMapS = {};
 
 inline std::map<std::string, bool> TEMPmodsMapB = {};
 inline std::map<std::string, int> TEMPmodsMapI = {};
-inline std::map<std::string, float> TEMPmodsMapF = {};
+inline std::map<std::string, float> TEMPmodsMapF = {
+    {"target_DT", 0.01666666666f}
+};
 
 template <typename T>
 T getVar(std::string const& key);

src/main.cpp

@@ -354,7 +354,7 @@ void CrystalClient::drawGUI() {
 	}
 	CrystalClient::ImToggleable("Window Borders", setVar<bool>("border"));
 	CrystalClient::ImToggleable("Force Manual Positioning", setVar<bool>("manual_positioning"), "Stops rearranging the windows whenever you open the game");
-	if (ImGui::Button("Rearrange Windows")) *setTempVar<int>("should-sort-windows") = 3;
+	//if (ImGui::Button("Rearrange Windows")) *setTempVar<int>("should-sort-windows") = 3;
     windowPreEnd();
 	ImGui::End();
     windowPreBegin(sortIndex);
@@ -490,6 +490,7 @@ void CrystalClient::drawGUI() {
 	}
     windowPreEnd();
 	ImGui::End();
+	/*
 	windowPreBegin(sortIndex);
 	ImGui::Begin("Internal Renderer", NULL, window_flags);
 	CrystalClient::ImToggleable("Render Recording", setVar<bool>("AT_render"));
@@ -503,6 +504,7 @@ void CrystalClient::drawGUI() {
 	windowPreEnd();
 	ImGui::End();
 	windowPreBegin(sortIndex);
+	*/
 	ImGui::Begin("Screenshots", NULL, window_flags);
 	//CrystalClient::ImToggleable("Include Players", setVar<bool>("SS_players"));
 	CrystalClient::ImToggleable("Include Displays", setVar<bool>("SS_displays"), "Include Display texts in your Screenshot");
@@ -591,13 +593,6 @@ class $modify(MenuLayer) {
 			ghc::filesystem::create_directory(betterBG);
 		}
 
-#ifdef GEODE_IS_MACOS
-		std::string renderInit = "chmod +x " + geode::Mod::get()->getConfigDir() / "Amethyst" / "Renderer" / "ffmpeg".string();
-		system(renderInit.c_str());
-		std::string pathInit = "export PATH='" + Mod::get()->getConfigDir() / "Amethyst" / "Renderer".string() + ":${PATH}'";
-		system(pathInit.c_str());
-#endif
-
 		if (!MenuLayer::init()) return false;
 
 		std::fstream input(geode::Mod::get()->getConfigDir().append("Config").append("GH_config-01.json"));