From a1c0f4dbb467a63a7e0042e788fc33eb7225b656 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Thu, 11 Oct 2018 11:10:59 -0700 Subject: [PATCH] keep baritone provider properly --- scripts/build.sh | 2 +- scripts/proguard.pro | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 7c0f83cb..94b02ebf 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -10,7 +10,7 @@ echo "-injars 'baritone-$VERSION.jar'" >> api.pro # insert current version cat ../../scripts/proguard.pro | grep -v "this is the rt jar" | grep -v "\-injars" >> api.pro # remove default rt jar and injar lines echo "-libraryjars '$(java -verbose 2>/dev/null | sed -ne '1 s/\[Opened \(.*\)\]/\1/p')'" >> api.pro # insert correct rt.jar location tail api.pro # debug, print out what the previous two commands generated -cat api.pro | grep -v "\-keep class baritone.api" > standalone.pro # standalone doesn't keep baritone api +cat api.pro | grep -v "this is the keep api" > standalone.pro # standalone doesn't keep baritone api #instead of downloading these jars from my dropbox in a zip, just assume gradle's already got them for us mkdir -p tempLibraries diff --git a/scripts/proguard.pro b/scripts/proguard.pro index 410fcc33..6d865fec 100644 --- a/scripts/proguard.pro +++ b/scripts/proguard.pro @@ -16,8 +16,9 @@ -flattenpackagehierarchy -repackageclasses 'baritone' --keep class baritone.api.** { *; } +-keep class baritone.api.** { *; } # this is the keep api -keep class baritone.BaritoneProvider +-keep class baritone.api.IBaritoneProvider # setting names are reflected from field names, so keep field names -keepclassmembers class baritone.api.Settings {