RRemove panorama on mac temporarily

Alphalaneous · Nov 26, 2024 · 2005033 · 2005033
1 parent 858b185
commit 2005033
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/ui/hooks/LoadingLayer.h b/src/ui/hooks/LoadingLayer.h
@@ -62,14 +62,15 @@ class $modify(MyLoadingLayer, LoadingLayer){
 		}
 	}
 
-#ifdef GEODE_IS_WINDOWS
-
 	bool init(bool p0){
 
 		if(!LoadingLayer::init(p0)){
 			return false;
 		}
 
+		auto searchPath = dirs::getModRuntimeDir() / Mod::get()->getID() / "resources";
+		CCFileUtils::get()->addSearchPath(searchPath.string().c_str());
+
 		MyLoadingLayer* myself = static_cast<MyLoadingLayer*>(this);
 
 		#ifdef GEODE_IS_WINDOWS
@@ -133,14 +134,14 @@ class $modify(MyLoadingLayer, LoadingLayer){
 		loadingBar->setID("loading-bar"_spr);
 		this->addChild(loadingBar);
 
-		CCSprite* titleSprite = Utils::createSprite("/geode/unzipped/zalphalaneous.minecraft/resources/zalphalaneous.minecraft/mojangstudios.png");
+		CCSprite* titleSprite = Utils::createSprite("mojangstudios.png"_spr);
 
 		titleSprite->setPosition({winSize.width/2, winSize.height/2});
 		titleSprite->setScale(titleSprite->getScale()*0.3f);
 
 		this->addChild(titleSprite);
 
-		MCLabel* loadingText = MCLabel::create("", "/geode/unzipped/zalphalaneous.minecraft/resources/zalphalaneous.minecraft/minecraft.fnt");
+		MCLabel* loadingText = MCLabel::create("", "minecraft.fnt"_spr);
 		loadingText->setScale(0.4f);
 		loadingText->setPosition({winSize.width/2, 30});
 
@@ -151,7 +152,4 @@ class $modify(MyLoadingLayer, LoadingLayer){
 
 		return true;
 	}
-
-#endif
-
 };
diff --git a/src/ui/hooks/MenuLayer.h b/src/ui/hooks/MenuLayer.h
@@ -65,10 +65,12 @@ class $modify(MyMenuLayer, MenuLayer) {
 
         float scale = CCDirector::sharedDirector()->getContentScaleFactor()/4;
 
+		#ifndef GEODE_IS_MACOS
 		Panorama* panorama = Panorama::create();
 		panorama->setID("minecraft-panorama"_spr);
 
 		this->addChild(panorama);
+		#endif
 
 		Utils::getNodeSafe(this, "main-menu")->setVisible(false);
 		Utils::getNodeSafe(this, "profile-menu")->setVisible(false);
@@ -272,9 +274,6 @@ class $modify(MyMenuLayer, MenuLayer) {
 		}
 
 		CCMenu* menu = typeinfo_cast<CCMenu*>(this->getChildByID("minecraft-menu"_spr));
-
-		Panorama* panorama = typeinfo_cast<Panorama*>(this->getChildByIDRecursive("minecraft-panorama"_spr));
-
 		CCSprite* title = typeinfo_cast<CCSprite*>(this->getChildByIDRecursive("minecraft-title"_spr));
 		CCSprite* subtitle = typeinfo_cast<CCSprite*>(this->getChildByIDRecursive("minecraft-subtitle"_spr));
 		CCLabelBMFont* splash = typeinfo_cast<CCLabelBMFont*>(this->getChildByIDRecursive("splash-text"_spr));