diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/JAConfigurator.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/JAConfigurator.java index 38bc828b..0991f291 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/JAConfigurator.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/JAConfigurator.java @@ -29,12 +29,12 @@ public JAConfigurator(String configclass, MainBuildTask jarLauncherBinary) throw } 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(" = new "); moduleBody.append(fullName); 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++; diff --git a/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/proguard.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/proguard.cfg index b2e34d42..0f109a1d 100644 --- a/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/proguard.cfg +++ b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/proguard.cfg @@ -14,39 +14,39 @@ -forceprocessing -overloadaggressively --repackageclasses 'ru.gravit.launcher' +-repackageclasses 'pro.gravit.launcher' -keepattributes SourceFile,LineNumberTable,*Annotation* -renamesourcefileattribute SourceFile -keepattributes Signature -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 ** { ; ; } --keepclassmembers @ru.gravit.launcher.LauncherNetworkAPI class ** { +-keepclassmembers @pro.gravit.launcher.LauncherNetworkAPI class ** { ; ; } -keepclassmembers class ** { - @ru.gravit.launcher.LauncherAPI + @pro.gravit.launcher.LauncherAPI ; - @ru.gravit.launcher.LauncherAPI + @pro.gravit.launcher.LauncherAPI ; } -keepclassmembers class ** { - @ru.gravit.launcher.LauncherNetworkAPI + @pro.gravit.launcher.LauncherNetworkAPI ; - @ru.gravit.launcher.LauncherNetworkAPI + @pro.gravit.launcher.LauncherNetworkAPI ; } diff --git a/Launcher/build.gradle b/Launcher/build.gradle index 8ef59cac..6e1553e9 100644 --- a/Launcher/build.gradle +++ b/Launcher/build.gradle @@ -30,8 +30,8 @@ shadowJar { classifier = null - relocate 'org.objectweb.asm', 'ru.gravit.repackage.org.objectweb.asm' - relocate 'io.netty', 'ru.gravit.repackage.io.netty' + relocate 'org.objectweb.asm', 'pro.gravit.repackage.org.objectweb.asm' + relocate 'io.netty', 'pro.gravit.repackage.io.netty' configurations = [project.configurations.pack] exclude 'module-info.class' } diff --git a/ServerWrapper/build.gradle b/ServerWrapper/build.gradle index 011c3ad9..62795a88 100644 --- a/ServerWrapper/build.gradle +++ b/ServerWrapper/build.gradle @@ -34,7 +34,7 @@ pack project(':LauncherAuthlib') shadowJar { classifier = null - relocate 'io.netty', 'ru.gravit.repackage.io.netty' + relocate 'io.netty', 'pro.gravit.repackage.io.netty' configurations = [project.configurations.pack] exclude 'module-info.class' } diff --git a/build.gradle b/build.gradle index a14b4905..9180f813 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'eclipse' apply plugin: 'java' - group = 'ru.gravit' + group = 'pro.gravit' repositories { mavenCentral() diff --git a/compat/LaunchWrapper.patch b/compat/LaunchWrapper.patch index 6e533e9b..81059396 100644 --- a/compat/LaunchWrapper.patch +++ b/compat/LaunchWrapper.patch @@ -7,7 +7,7 @@ index f4e83af..d3a6d7f 100644 addClassLoaderExclusion("net.minecraft.launchwrapper."); + // classloader launcher exclusions -+ addClassLoaderExclusion("ru.gravit.launcher."); ++ addClassLoaderExclusion("pro.gravit.launcher."); + addClassLoaderExclusion("com.mojang."); + addClassLoaderExclusion("com.google.gson."); + addClassLoaderExclusion("org.json.");