GH-2209 Fix sounds in old (pre-1.6) versions

This commit is contained in:
Petr Mrázek
2019-02-19 01:00:03 +01:00
parent 0a99d037c4
commit 9c82adaee5
8 changed files with 210 additions and 26 deletions

View File

@ -0,0 +1,36 @@
/* Copyright 2013-2019 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "ReconstructAssets.h"
#include "minecraft/MinecraftInstance.h"
#include "minecraft/ComponentList.h"
#include "minecraft/AssetsUtils.h"
#include "launch/LaunchTask.h"
void ReconstructAssets::executeTask()
{
auto instance = m_parent->instance();
std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
auto components = minecraftInstance->getComponentList();
auto profile = components->getProfile();
auto assets = profile->getMinecraftAssets();
if(!AssetsUtils::reconstructAssets(assets->id, minecraftInstance->resourcesDir()))
{
emit logLine("Failed to reconstruct Minecraft assets.", MessageLevel::Error);
}
emitSucceeded();
}

View File

@ -0,0 +1,33 @@
/* Copyright 2013-2019 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#pragma once
#include <launch/LaunchStep.h>
#include <memory>
class ReconstructAssets: public LaunchStep
{
Q_OBJECT
public:
explicit ReconstructAssets(LaunchTask *parent) : LaunchStep(parent){};
virtual ~ReconstructAssets(){};
void executeTask() override;
bool canAbort() const override
{
return false;
}
};