the issue was proguard not knowing what obfuscated minecraft looks like.
Some checks failed
/ Build BaseBand DSM & Broadway (push) Failing after 2m9s
Some checks failed
/ Build BaseBand DSM & Broadway (push) Failing after 2m9s
This commit is contained in:
parent
be888848c2
commit
710eb72dd8
6 changed files with 23 additions and 24 deletions
|
@ -26,7 +26,9 @@ jobs:
|
||||||
run: ./gradlew Client:build
|
run: ./gradlew Client:build
|
||||||
- name: Obfuscate Broadway
|
- name: Obfuscate Broadway
|
||||||
if: github.ref == 'refs/heads/release'
|
if: github.ref == 'refs/heads/release'
|
||||||
run: bash mobf.sh Client/build/libs/BaseBand-Broadway.jar
|
run: |
|
||||||
|
./gradlew Client:proguardRelease
|
||||||
|
bash mobf.sh Client/build/proguard/BaseBand-Broadway.jar
|
||||||
|
|
||||||
- name: Upload DSM
|
- name: Upload DSM
|
||||||
uses: forgejo/upload-artifact@v4
|
uses: forgejo/upload-artifact@v4
|
||||||
|
@ -38,7 +40,7 @@ jobs:
|
||||||
uses: forgejo/upload-artifact@v4
|
uses: forgejo/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: BaseBand-Broadway.jar
|
name: BaseBand-Broadway.jar
|
||||||
path: Client/build/libs/BaseBand-Broadway.jar
|
path: Client/build/proguard/BaseBand-Broadway.jar
|
||||||
- name: Release to server
|
- name: Release to server
|
||||||
if: github.ref == 'refs/heads/release'
|
if: github.ref == 'refs/heads/release'
|
||||||
env:
|
env:
|
||||||
|
@ -47,5 +49,5 @@ jobs:
|
||||||
BB_HOST: ${{ vars.BB_HOST }}
|
BB_HOST: ${{ vars.BB_HOST }}
|
||||||
BB_PORT: ${{ vars.BB_PORT }}
|
BB_PORT: ${{ vars.BB_PORT }}
|
||||||
BB_PATH: ${{ vars.BB_PATH }}
|
BB_PATH: ${{ vars.BB_PATH }}
|
||||||
run: bash push_file.sh Client/build/libs/BaseBand-Broadway.jar 3849
|
run: bash push_file.sh Client/build/proguard/BaseBand-Broadway.jar 3849
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,8 @@
|
||||||
<option name="taskNames">
|
<option name="taskNames">
|
||||||
<list>
|
<list>
|
||||||
<option value="build" />
|
<option value="build" />
|
||||||
<option value="Loader:proguard" />
|
<option value="proguard" />
|
||||||
|
<option value="proguardRelease" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
<option name="vmOptions" />
|
<option name="vmOptions" />
|
||||||
|
|
|
@ -174,7 +174,11 @@ tasks.register('proguard', ProGuardTask) {
|
||||||
injars jar.archiveFile
|
injars jar.archiveFile
|
||||||
outjars "${proguardBuildDir}/BaseBand-${devName}.jar"
|
outjars "${proguardBuildDir}/BaseBand-${devName}.jar"
|
||||||
libraryjars "${proguardDir}/rt.jar"
|
libraryjars "${proguardDir}/rt.jar"
|
||||||
libraryjars configurations.compileClasspath
|
libraryjars configurations.compileClasspath.resolve().collect() {
|
||||||
|
if(it.getName().contains("mapped_stable")) {
|
||||||
|
return new File("build/fg_cache/net/minecraftforge/forge/1.12.2-14.23.5.2860/forge-1.12.2-14.23.5.2860-mci.jar")
|
||||||
|
} else return it;
|
||||||
|
}
|
||||||
dump "${proguardBuildDir}/dump-${devName}.txt"
|
dump "${proguardBuildDir}/dump-${devName}.txt"
|
||||||
printmapping "${proguardBuildDir}/mapping-${devName}.txt"
|
printmapping "${proguardBuildDir}/mapping-${devName}.txt"
|
||||||
printconfiguration "${proguardBuildDir}/configuration.txt"
|
printconfiguration "${proguardBuildDir}/configuration.txt"
|
||||||
|
@ -188,7 +192,11 @@ tasks.register('proguardRelease', ProGuardTask) {
|
||||||
injars tasks.releaseJar.archiveFile
|
injars tasks.releaseJar.archiveFile
|
||||||
outjars "${proguardBuildDir}/BaseBand-${releaseName}.jar"
|
outjars "${proguardBuildDir}/BaseBand-${releaseName}.jar"
|
||||||
libraryjars "${proguardDir}/rt.jar"
|
libraryjars "${proguardDir}/rt.jar"
|
||||||
libraryjars configurations.compileClasspath
|
libraryjars configurations.compileClasspath.resolve().collect() {
|
||||||
|
if(it.getName().contains("mapped_stable")) {
|
||||||
|
return new File("build/fg_cache/net/minecraftforge/forge/1.12.2-14.23.5.2860/forge-1.12.2-14.23.5.2860-mci.jar")
|
||||||
|
} else return it;
|
||||||
|
}
|
||||||
dump "${proguardBuildDir}/dump-${releaseName}.txt"
|
dump "${proguardBuildDir}/dump-${releaseName}.txt"
|
||||||
printmapping "${proguardBuildDir}/mapping-${releaseName}.txt"
|
printmapping "${proguardBuildDir}/mapping-${releaseName}.txt"
|
||||||
printconfiguration "${proguardBuildDir}/configuration.txt"
|
printconfiguration "${proguardBuildDir}/configuration.txt"
|
||||||
|
|
|
@ -16,8 +16,6 @@
|
||||||
-ignorewarnings
|
-ignorewarnings
|
||||||
#-overloadaggressively
|
#-overloadaggressively
|
||||||
|
|
||||||
-keep @interface ** { *; }
|
|
||||||
|
|
||||||
# keep things meant to exist in prod
|
# keep things meant to exist in prod
|
||||||
-keep class com.baseband.prod.** { *; }
|
-keep class com.baseband.prod.** { *; }
|
||||||
-keep class com.baseband.client.mixin.** { *; }
|
-keep class com.baseband.client.mixin.** { *; }
|
||||||
|
@ -29,21 +27,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
# jna
|
# jna
|
||||||
-keep class com.sun.** { *; }
|
-keep class !com.baseband.**,!de.tudbut.security { *; }
|
||||||
-keep class oshi.** { *; }
|
|
||||||
|
|
||||||
# spongepowered
|
|
||||||
-keep class org.** { *; }
|
|
||||||
|
|
||||||
#tuddo
|
|
||||||
-keep class de.** { *; }
|
|
||||||
|
|
||||||
# javassist
|
|
||||||
-keep class javassist.** { *; }
|
|
||||||
|
|
||||||
# javassist
|
|
||||||
-keep class net.** { *; }
|
|
||||||
|
|
||||||
# Also keep - Enumerations. Keep the special static methods that are required in
|
# Also keep - Enumerations. Keep the special static methods that are required in
|
||||||
# enumeration classes.
|
# enumeration classes.
|
||||||
-keepclassmembers enum ** { *; }
|
-keepclassmembers enum * { *; }
|
||||||
|
|
|
@ -39,6 +39,7 @@ public class GuiRewrite extends GuiScreen {
|
||||||
}
|
}
|
||||||
|
|
||||||
// The initiator; this can, for some reason, not be in the constructor
|
// The initiator; this can, for some reason, not be in the constructor
|
||||||
|
@Override
|
||||||
public void initGui() {
|
public void initGui() {
|
||||||
|
|
||||||
// Minecraft wants this
|
// Minecraft wants this
|
||||||
|
@ -86,6 +87,8 @@ public class GuiRewrite extends GuiScreen {
|
||||||
// When ESC is pressed
|
// When ESC is pressed
|
||||||
@Override
|
@Override
|
||||||
public void onGuiClosed() {
|
public void onGuiClosed() {
|
||||||
|
BaseBand.LOGGER.info("Hiding GUI");
|
||||||
|
|
||||||
super.onGuiClosed();
|
super.onGuiClosed();
|
||||||
Features.getFeature(ClickGUI.class).setEnabled(false);
|
Features.getFeature(ClickGUI.class).setEnabled(false);
|
||||||
for (Category category : categories) {
|
for (Category category : categories) {
|
||||||
|
|
|
@ -10,5 +10,5 @@ if [ "$BB_PATH" = '' ] ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
bash push_file.sh Server/build/libs/BaseBand-Server.jar
|
bash push_file.sh Server/build/libs/BaseBand-Server.jar
|
||||||
bash push_file.sh Client/build/libs/BaseBand-Broadway.jar
|
bash push_file.sh Client/build/proguard/BaseBand-Broadway.jar
|
||||||
bash push_file.sh Loader/build/proguard/BaseBand-Loader.jar
|
bash push_file.sh Loader/build/proguard/BaseBand-Loader.jar
|
Loading…
Add table
Reference in a new issue