Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 11:39:11 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Фикс runtime для работы с новыми опциональными модами

Browse source
This commit is contained in:
Gravit 2019-01-22 12:29:57 +07:00
parent 8e2e9d4aee
commit 97f9f034e7
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Launcher/runtime/dialog/overlay/options/options.js
View file

@ -98,14 +98,19 @@ var options = {
var profile = profilesList[serverHolder.old];
var list = profile.getOptional();
var checkBoxList = new java.util.ArrayList;
var dModsIds = [];
list.forEach(function(modFile) {
dModsIds.push(modFile.string);
var modName = modFile.name, modDescription = "", subLevel = 1;
if(!modFile.isVisible || !((loginData.permissions & modFile.permissions) != 0))
if(!modFile.isVisible)
{
LogHelper.debug("optionalMod %s hidden",modFile.name);
return;
}
if(modFile.permissions != 0 && ((loginData.permissions.toLong() & modFile.permissions) != 0))
{
LogHelper.debug("optionalMod %s permissions deny",modFile.name);
return;
}
if(modFile.info != null) //Есть ли описание?
modDescription = modFile.info;
if(modFile.subTreeLevel != null && modFile.subTreeLevel > 1)//Это суб-модификация?

1
libLauncher/src/main/java/ru/gravit/launcher/ClientPermissions.java
View file

@ -46,6 +46,7 @@ public ClientPermissions(long data) {
canUSR3 = (data & (1 << 4)) != 0;
canBot = (data & (1 << 5)) != 0;
}
@LauncherAPI
public long toLong()
{
long result = 0;

2
libLauncher/src/main/java/ru/gravit/launcher/profiles/optional/OptionalFile.java
View file

@ -17,7 +17,7 @@ public class OptionalFile {
@LauncherAPI
public boolean mark;
@LauncherAPI
public boolean visible;
public boolean visible = true;
@LauncherAPI
public String name;
@LauncherAPI