diff --git a/build.gradle b/build.gradle index 7e4ffa7..3c70ee0 100644 --- a/build.gradle +++ b/build.gradle @@ -30,6 +30,38 @@ subprojects { apply plugin: 'maven-publish' archivesBaseName = project.name + + task ('proguard', type: proguard.gradle.ProGuardTask) { + configuration '../proguard.conf' + verbose + injars 'build/libs/' + archivesBaseName + "-" + project.mod_version + "-" + project.minecraft_version + ".jar" + outjars '/build/libs/' + archivesBaseName + "-min-" + project.mod_version + "-" + project.minecraft_version + ".jar" + printmapping 'out.map' + keepparameternames + renamesourcefileattribute 'SourceFile' + keepattributes 'Signature,Exceptions,InnerClasses,PermittedSubclasses,EnclosingMethod,Deprecated,SourceFile,LineNumberTable' + keepattributes '*Annotation*' + keep 'public class * { \ + public protected *; \ + }' + keepclassmembernames 'class * { \ + java.lang.Class class$(java.lang.String); \ + java.lang.Class class$(java.lang.String, boolean); \ + }' + + keepclassmembers 'class draylar.omegaconfig.mixin.* {\ + ;\ + ();\ + ;\ + }' + } + + // Task for building base jars in all modules + task buildJar(type: Jar) { + archivesBaseName += "-" + project.mod_version + "-" + project.minecraft_version + } + + buildJar.finalizedBy(proguard) } allprojects { @@ -94,12 +126,6 @@ allprojects { } } - // Task for building base jars in all modules - task buildJar(type: Jar) { - archivesBaseName += "-" + project.mod_version + "-" + project.minecraft_version - from project(":omega-config-gui").sourceSets.main.java.srcDirs - } - // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task // if it is present. // If you remove this task, sources will not be generated. @@ -109,6 +135,11 @@ allprojects { } } +// base build task +task buildJar(type: Jar) { + archivesBaseName += "-" + project.mod_version + "-" + project.minecraft_version +} + dependencies { compile project(":omega-config-base") compile project(":omega-config-gui") @@ -146,29 +177,4 @@ publishing { tasks.withType(net.fabricmc.loom.task.AbstractRunTask) { classpath += sourceSets.testmod.runtimeClasspath classpath += sourceSets.testmod.output -} - -task ('proguard', type: proguard.gradle.ProGuardTask) { - configuration 'proguard.conf' - verbose - injars 'build/libs/omega-config-1.0.0.jar' - outjars 'build/libs/out.jar' - printmapping 'out.map' - keepparameternames - renamesourcefileattribute 'SourceFile' - keepattributes 'Signature,Exceptions,InnerClasses,PermittedSubclasses,EnclosingMethod,Deprecated,SourceFile,LineNumberTable' - keepattributes '*Annotation*' - keep 'public class * { \ - public protected *; \ - }' - keepclassmembernames 'class * { \ - java.lang.Class class$(java.lang.String); \ - java.lang.Class class$(java.lang.String, boolean); \ - }' - - keepclassmembers 'class draylar.omegaconfig.mixin.* {\ - ;\ - ();\ - ;\ - }' -} +} \ No newline at end of file diff --git a/omega-config-base/out.map b/omega-config-base/out.map new file mode 100644 index 0000000..ed655ad --- /dev/null +++ b/omega-config-base/out.map @@ -0,0 +1,53 @@ +draylar.omegaconfig.OmegaConfig -> draylar.omegaconfig.OmegaConfig: + org.apache.logging.log4j.Logger LOGGER -> a + java.util.List REGISTERED_CONFIGURATIONS -> b + com.google.gson.Gson GSON -> GSON + net.minecraft.class_2960 CONFIG_SYNC_PACKET -> CONFIG_SYNC_PACKET + com.google.gson.Gson SYNC_ONLY_GSON -> SYNC_ONLY_GSON + 30:30:void () -> + 41:63:void onInitialize() -> onInitialize + 68:98:draylar.omegaconfig.api.Config register(java.lang.Class) -> register + 104:153:void writeConfig(java.lang.Class,draylar.omegaconfig.api.Config) -> writeConfig + 156:166:void addFieldComments(java.lang.reflect.Field,java.util.Map) -> a + 180:195:java.lang.String getStartingWhitespace(java.lang.String) -> a + 200:200:java.nio.file.Path getConfigPath(draylar.omegaconfig.api.Config) -> getConfigPath + 204:204:boolean configExists(draylar.omegaconfig.api.Config) -> configExists + 208:208:java.util.List getRegisteredConfigurations() -> getRegisteredConfigurations + 145:145:void lambda$writeConfig$4(java.lang.StringBuilder,java.lang.String) -> a + 81:81:boolean lambda$register$3(java.lang.String) -> b + 42:62:void lambda$onInitialize$2(net.minecraft.class_3244,net.fabricmc.fabric.api.networking.v1.PacketSender,net.minecraft.server.MinecraftServer) -> a + 43:61:void lambda$null$1(net.minecraft.class_3244) -> a + 52:55:void lambda$null$0(net.minecraft.class_2499,draylar.omegaconfig.api.Config) -> a + 32:37:void () -> +draylar.omegaconfig.api.Comment -> draylar.omegaconfig.api.Comment: + java.lang.String value() -> value +draylar.omegaconfig.api.Config -> draylar.omegaconfig.api.Config: + 16:17:void save() -> save + 20:36:net.minecraft.class_2487 writeSyncingTag() -> writeSyncingTag + 43:45:boolean hasAnySyncable() -> hasAnySyncable + java.lang.String getName() -> getName + 78:78:java.lang.String getModid() -> getModid + 82:82:boolean hasMenu() -> hasMenu + 44:44:boolean lambda$hasAnySyncable$3(java.lang.annotation.Annotation) -> a + 43:43:boolean lambda$hasAnySyncable$2(java.lang.reflect.Field) -> a + 43:43:boolean lambda$null$1(java.lang.annotation.Annotation) -> b + 24:24:boolean lambda$writeSyncingTag$0(java.lang.annotation.Annotation) -> c +draylar.omegaconfig.api.Syncing -> draylar.omegaconfig.api.Syncing: +draylar.omegaconfig.exception.NoValidConstructorException -> draylar.omegaconfig.exception.NoValidConstructorException: + 3:3:void () -> +draylar.omegaconfig.gson.SyncableExclusionStrategy -> draylar.omegaconfig.gson.SyncableExclusionStrategy: + 7:7:void () -> + 11:11:boolean shouldSkipField(com.google.gson.FieldAttributes) -> shouldSkipField + 16:16:boolean shouldSkipClass(java.lang.Class) -> shouldSkipClass + 11:11:boolean lambda$shouldSkipField$0(java.lang.annotation.Annotation) -> a +draylar.omegaconfig.mixin.ClientMixin -> draylar.omegaconfig.mixin.ClientMixin: + java.util.List savedClientConfig -> savedClientConfig + 25:27:void () -> + 34:77:void onReturn(net.minecraft.class_542,org.spongepowered.asm.mixin.injection.callback.CallbackInfo) -> onReturn + 83:105:void restoreConfigurations(net.minecraft.class_437,org.spongepowered.asm.mixin.injection.callback.CallbackInfo) -> restoreConfigurations + 90:90:boolean lambda$restoreConfigurations$5(java.lang.annotation.Annotation) -> lambda$restoreConfigurations$5 + 86:86:boolean lambda$restoreConfigurations$4(java.lang.annotation.Annotation) -> lambda$restoreConfigurations$4 + 35:76:void lambda$onReturn$3(net.fabricmc.fabric.api.network.PacketContext,net.minecraft.class_2540) -> lambda$onReturn$3 + 39:75:void lambda$null$2(net.minecraft.class_2487) -> lambda$null$2 + 42:73:void lambda$null$1(net.minecraft.class_2520) -> lambda$null$1 + 59:59:boolean lambda$null$0(java.lang.annotation.Annotation) -> lambda$null$0 diff --git a/omega-config-gui/out.map b/omega-config-gui/out.map new file mode 100644 index 0000000..2a888aa --- /dev/null +++ b/omega-config-gui/out.map @@ -0,0 +1,72 @@ +draylar.omegaconfiggui.OmegaConfigGui -> draylar.omegaconfiggui.OmegaConfigGui: + 11:11:void () -> + 19:22:void registerConfigScreen(draylar.omegaconfig.api.Config) -> registerConfigScreen + 20:20:draylar.omegaconfiggui.api.screen.OmegaConfigScreen lambda$registerConfigScreen$0(draylar.omegaconfig.api.Config,net.minecraft.class_437) -> a +draylar.omegaconfiggui.api.screen.ModMenuHelper -> draylar.omegaconfiggui.api.screen.ModMenuHelper: + 14:14:void () -> + 18:23:void injectScreen(draylar.omegaconfig.api.Config,draylar.omegaconfiggui.api.screen.OmegaConfigScreenSupplier) -> injectScreen +draylar.omegaconfiggui.api.screen.OmegaConfigScreen -> draylar.omegaconfiggui.api.screen.OmegaConfigScreen: + java.util.List validClasses -> a + draylar.omegaconfig.api.Config config -> b + net.minecraft.class_437 parent -> c + java.util.Map fieldWidgets -> d + 35:41:void (draylar.omegaconfig.api.Config,net.minecraft.class_437) -> + 45:97:void method_25426() -> method_25426 + 101:112:void method_25394(net.minecraft.class_4587,int,int,float) -> method_25394 + 116:117:void method_25419() -> method_25419 + 123:126:void method_25420(net.minecraft.class_4587) -> method_25420 + 129:140:void renderCustomBackgroundTexture(int,int,int,int,int,int,int,int) -> renderCustomBackgroundTexture + 85:94:void lambda$init$3(net.minecraft.class_4185) -> a + 87:91:void lambda$null$2(java.lang.reflect.Field,net.minecraft.class_3545) -> a + 83:83:void lambda$init$1(net.minecraft.class_4185) -> b + 50:50:boolean lambda$init$0(java.lang.reflect.Field) -> a + 32:32:void () -> +draylar.omegaconfiggui.api.screen.OmegaConfigScreenSupplier -> draylar.omegaconfiggui.api.screen.OmegaConfigScreenSupplier: + draylar.omegaconfiggui.api.screen.OmegaConfigScreen get(net.minecraft.class_437) -> get +draylar.omegaconfiggui.api.screen.widget.BaseTextFieldWidget -> draylar.omegaconfiggui.api.screen.widget.BaseTextFieldWidget: + net.minecraft.class_437 parent -> parent + 15:17:void (net.minecraft.class_437,net.minecraft.class_327,int,int,int,int,net.minecraft.class_2561) -> + 22:29:void method_1876(boolean) -> method_1876 + 23:26:void lambda$setTextFieldFocused$0(net.minecraft.class_364) -> a +draylar.omegaconfiggui.api.screen.widget.DoubleFieldWidget -> draylar.omegaconfiggui.api.screen.widget.DoubleFieldWidget: + 10:11:void (net.minecraft.class_437,net.minecraft.class_327,int,int,int,int,net.minecraft.class_2561) -> + 16:26:void method_1867(java.lang.String) -> method_1867 +draylar.omegaconfiggui.api.screen.widget.LabelWidget -> draylar.omegaconfiggui.api.screen.widget.LabelWidget: + int x -> a + int y -> b + net.minecraft.class_2561 message -> c + 16:20:void (int,int,net.minecraft.class_2561) -> + 24:25:void method_25394(net.minecraft.class_4587,int,int,float) -> method_25394 +draylar.omegaconfiggui.api.screen.widget.TypeWidgets -> draylar.omegaconfiggui.api.screen.widget.TypeWidgets: + java.util.Map CLASS_WIDGETS -> CLASS_WIDGETS + java.util.Map PRIMITIVE_TO_BOXED -> PRIMITIVE_TO_BOXED + 35:35:draylar.omegaconfiggui.api.screen.widget.WidgetSupplier get(java.lang.Class) -> get + 39:39:java.lang.Class unbox(java.lang.Class) -> unbox + 42:44:void () -> + 13:31:void () -> +draylar.omegaconfiggui.api.screen.widget.WidgetSupplier -> draylar.omegaconfiggui.api.screen.widget.WidgetSupplier: + net.minecraft.class_339 create(net.minecraft.class_437,int,int,int,int,net.minecraft.class_2585,java.lang.Object) -> create + java.lang.Object get(net.minecraft.class_339) -> get +draylar.omegaconfiggui.api.screen.widget.supplier.BooleanWidgetSupplier -> draylar.omegaconfiggui.api.screen.widget.supplier.BooleanWidgetSupplier: + 8:8:void () -> + 12:12:net.minecraft.class_4286 create(net.minecraft.class_437,int,int,int,int,net.minecraft.class_2585,java.lang.Boolean) -> create + 17:17:java.lang.Boolean get(net.minecraft.class_4286) -> get + 8:8:java.lang.Object get(net.minecraft.class_339) -> get + 8:8:net.minecraft.class_339 create(net.minecraft.class_437,int,int,int,int,net.minecraft.class_2585,java.lang.Object) -> create +draylar.omegaconfiggui.api.screen.widget.supplier.DoubleWidgetSupplier -> draylar.omegaconfiggui.api.screen.widget.supplier.DoubleWidgetSupplier: + 9:9:void () -> + 13:16:draylar.omegaconfiggui.api.screen.widget.DoubleFieldWidget create(net.minecraft.class_437,int,int,int,int,net.minecraft.class_2585,java.lang.Double) -> create + 21:33:java.lang.Double get(draylar.omegaconfiggui.api.screen.widget.DoubleFieldWidget) -> get + 9:9:java.lang.Object get(net.minecraft.class_339) -> get + 9:9:net.minecraft.class_339 create(net.minecraft.class_437,int,int,int,int,net.minecraft.class_2585,java.lang.Object) -> create +draylar.omegaconfiggui.api.screen.widget.supplier.StringWidgetSupplier -> draylar.omegaconfiggui.api.screen.widget.supplier.StringWidgetSupplier: + 11:11:void () -> + 15:18:net.minecraft.class_342 create(net.minecraft.class_437,int,int,int,int,net.minecraft.class_2585,java.lang.String) -> create + 23:23:java.lang.String get(net.minecraft.class_342) -> get + 11:11:java.lang.Object get(net.minecraft.class_339) -> get + 11:11:net.minecraft.class_339 create(net.minecraft.class_437,int,int,int,int,net.minecraft.class_2585,java.lang.Object) -> create +draylar.omegaconfiggui.mixin.AbstractButtonWidgetAccessor -> draylar.omegaconfiggui.mixin.AbstractButtonWidgetAccessor: + void callSetFocused(boolean) -> callSetFocused +draylar.omegaconfiggui.mixin.ModMenuAccessor -> draylar.omegaconfiggui.mixin.ModMenuAccessor: + 13:13:com.google.common.collect.ImmutableMap getConfigScreenFactories() -> getConfigScreenFactories + 18:18:void setConfigScreenFactories(com.google.common.collect.ImmutableMap) -> setConfigScreenFactories