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

[ANY] Исправлегия конфигурации ProGuard, Gradle, патчей и прочих констант

Browse source
This commit is contained in:
Gravit 2019-06-02 09:08:35 +07:00
parent 62fa95a5b3
commit 3d07b88adc
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
6 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
LaunchServer/src/main/java/pro/gravit/launchserver/binary/JAConfigurator.java
View file

@ -29,12 +29,12 @@ public JAConfigurator(String configclass, MainBuildTask jarLauncherBinary) throw
} }
public void addModuleClass(String fullName) { public void addModuleClass(String fullName) {
moduleBody.append("ru.gravit.launcher.modules.Module mod"); moduleBody.append("pro.gravit.launcher.modules.Module mod");
moduleBody.append(autoincrement); moduleBody.append(autoincrement);
moduleBody.append(" = new "); moduleBody.append(" = new ");
moduleBody.append(fullName); moduleBody.append(fullName);
moduleBody.append("();"); moduleBody.append("();");
moduleBody.append("ru.gravit.launcher.Launcher.modulesManager.registerModule( mod"); moduleBody.append("pro.gravit.launcher.Launcher.modulesManager.registerModule( mod");
moduleBody.append(autoincrement); moduleBody.append(autoincrement);
moduleBody.append(");"); moduleBody.append(");");
autoincrement++; autoincrement++;

18
LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/proguard.cfg
View file

@ -14,39 +14,39 @@
-forceprocessing -forceprocessing
-overloadaggressively -overloadaggressively
-repackageclasses 'ru.gravit.launcher' -repackageclasses 'pro.gravit.launcher'
-keepattributes SourceFile,LineNumberTable,*Annotation* -keepattributes SourceFile,LineNumberTable,*Annotation*
-renamesourcefileattribute SourceFile -renamesourcefileattribute SourceFile
-keepattributes Signature -keepattributes Signature
-adaptresourcefilecontents META-INF/MANIFEST.MF -adaptresourcefilecontents META-INF/MANIFEST.MF
-keeppackagenames com.mojang.**,net.minecraftforge.fml.**,cpw.mods.fml.**,com.google.gson.**,ru.gravit.repackage.**,org.fusesource.** -keeppackagenames com.mojang.**,net.minecraftforge.fml.**,cpw.mods.fml.**,com.google.gson.**,pro.gravit.repackage.**,org.fusesource.**
-keep class com.mojang.**,net.minecraftforge.fml.**,cpw.mods.fml.**,com.google.gson.**,ru.gravit.repackage.**,org.fusesource.** { -keep class com.mojang.**,net.minecraftforge.fml.**,cpw.mods.fml.**,com.google.gson.**,pro.gravit.repackage.**,org.fusesource.** {
*; *;
} }
-keepclassmembers @ru.gravit.launcher.LauncherAPI class ** { -keepclassmembers @pro.gravit.launcher.LauncherAPI class ** {
<fields>; <fields>;
<methods>; <methods>;
} }
-keepclassmembers @ru.gravit.launcher.LauncherNetworkAPI class ** { -keepclassmembers @pro.gravit.launcher.LauncherNetworkAPI class ** {
<fields>; <fields>;
<methods>; <methods>;
} }
-keepclassmembers class ** { -keepclassmembers class ** {
@ru.gravit.launcher.LauncherAPI @pro.gravit.launcher.LauncherAPI
<fields>; <fields>;
@ru.gravit.launcher.LauncherAPI @pro.gravit.launcher.LauncherAPI
<methods>; <methods>;
} }
-keepclassmembers class ** { -keepclassmembers class ** {
@ru.gravit.launcher.LauncherNetworkAPI @pro.gravit.launcher.LauncherNetworkAPI
<fields>; <fields>;
@ru.gravit.launcher.LauncherNetworkAPI @pro.gravit.launcher.LauncherNetworkAPI
<methods>; <methods>;
} }

4
Launcher/build.gradle
View file

@ -30,8 +30,8 @@
shadowJar { shadowJar {
classifier = null classifier = null
relocate 'org.objectweb.asm', 'ru.gravit.repackage.org.objectweb.asm' relocate 'org.objectweb.asm', 'pro.gravit.repackage.org.objectweb.asm'
relocate 'io.netty', 'ru.gravit.repackage.io.netty' relocate 'io.netty', 'pro.gravit.repackage.io.netty'
configurations = [project.configurations.pack] configurations = [project.configurations.pack]
exclude 'module-info.class' exclude 'module-info.class'
} }

2
ServerWrapper/build.gradle
View file

@ -34,7 +34,7 @@ pack project(':LauncherAuthlib')
shadowJar { shadowJar {
classifier = null classifier = null
relocate 'io.netty', 'ru.gravit.repackage.io.netty' relocate 'io.netty', 'pro.gravit.repackage.io.netty'
configurations = [project.configurations.pack] configurations = [project.configurations.pack]
exclude 'module-info.class' exclude 'module-info.class'
} }

2
build.gradle
View file

@ -7,7 +7,7 @@
apply plugin: 'eclipse' apply plugin: 'eclipse'
apply plugin: 'java' apply plugin: 'java'
group = 'ru.gravit' group = 'pro.gravit'
repositories { repositories {
mavenCentral() mavenCentral()

2
compat/LaunchWrapper.patch
View file

@ -7,7 +7,7 @@ index f4e83af..d3a6d7f 100644
addClassLoaderExclusion("net.minecraft.launchwrapper."); addClassLoaderExclusion("net.minecraft.launchwrapper.");
+ // classloader launcher exclusions + // classloader launcher exclusions
+ addClassLoaderExclusion("ru.gravit.launcher."); + addClassLoaderExclusion("pro.gravit.launcher.");
+ addClassLoaderExclusion("com.mojang."); + addClassLoaderExclusion("com.mojang.");
+ addClassLoaderExclusion("com.google.gson."); + addClassLoaderExclusion("com.google.gson.");
+ addClassLoaderExclusion("org.json."); + addClassLoaderExclusion("org.json.");