From bdebed57308a96e6e6e01a3f21e0c93751999ede Mon Sep 17 00:00:00 2001 From: oliik2013 <131269027+oliik2013@users.noreply.github.com> Date: Mon, 15 Jul 2024 10:09:42 +0200 Subject: [PATCH 1/8] Update CapeConfig.kt --- src/main/kotlin/me/cael/capes/CapeConfig.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/me/cael/capes/CapeConfig.kt b/src/main/kotlin/me/cael/capes/CapeConfig.kt index ba24dd6..249e98d 100644 --- a/src/main/kotlin/me/cael/capes/CapeConfig.kt +++ b/src/main/kotlin/me/cael/capes/CapeConfig.kt @@ -10,8 +10,9 @@ class CapeConfig : Config { var enableMinecraftCapesMod = false var enableCosmetica = false var enableCloaksPlus = false + var enableAdvancedCapes = false var enableElytraTexture = true override fun getName(): String = "capes" override fun getExtension(): String = "json5" -} \ No newline at end of file +} From bd150d7e722bb301b2f66cd2d5b5b34a9c986fd6 Mon Sep 17 00:00:00 2001 From: oliik2013 <131269027+oliik2013@users.noreply.github.com> Date: Mon, 15 Jul 2024 10:12:37 +0200 Subject: [PATCH 2/8] Update CapeType.kt --- src/main/kotlin/me/cael/capes/CapeType.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/me/cael/capes/CapeType.kt b/src/main/kotlin/me/cael/capes/CapeType.kt index 07e64ff..f19a021 100644 --- a/src/main/kotlin/me/cael/capes/CapeType.kt +++ b/src/main/kotlin/me/cael/capes/CapeType.kt @@ -5,7 +5,7 @@ import net.minecraft.screen.ScreenTexts import net.minecraft.text.Text enum class CapeType(val stylized: String) { - MINECRAFT("Minecraft"), OPTIFINE("OptiFine"), LABYMOD("LabyMod"), WYNNTILS("Wynntils"), MINECRAFTCAPES("MinecraftCapes"), COSMETICA("Cosmetica"), CLOAKSPLUS("Cloaks+"); + MINECRAFT("Minecraft"), OPTIFINE("OptiFine"), LABYMOD("LabyMod"), WYNNTILS("Wynntils"), MINECRAFTCAPES("MinecraftCapes"), COSMETICA("Cosmetica"), CLOAKSPLUS("Cloaks+"), ADVANCEDCAPES("AdvancedCapes"); fun cycle() = when(this) { MINECRAFT -> OPTIFINE @@ -14,7 +14,8 @@ enum class CapeType(val stylized: String) { WYNNTILS -> COSMETICA COSMETICA -> MINECRAFTCAPES MINECRAFTCAPES -> CLOAKSPLUS - CLOAKSPLUS -> MINECRAFT + CLOAKSPLUS -> ADVANCEDCAPES + ADVANCEDCAPES -> MINECRAFT } fun getURL(profile: GameProfile): String? { @@ -26,6 +27,7 @@ enum class CapeType(val stylized: String) { COSMETICA -> if(config.enableCosmetica) "https://api.cosmetica.cc/get/cloak?username=${profile.name}&uuid=${profile.id}¬hirdparty" else null MINECRAFTCAPES -> if(config.enableMinecraftCapesMod) "https://minecraftcapes.net/profile/${profile.id.toString().replace("-", "")}" else null CLOAKSPLUS -> if(config.enableCloaksPlus) "http://161.35.130.99/capes/${profile.name}.png" else null + ADVANCEDCAPES -> if(config.enableAdvancedCapes) "https://advancedcapes.nl/cape/${profile.name}" else null MINECRAFT -> null } } From be5a5a501095d5766472a6b9f274756853645d11 Mon Sep 17 00:00:00 2001 From: oliik2013 <131269027+oliik2013@users.noreply.github.com> Date: Mon, 15 Jul 2024 10:21:03 +0200 Subject: [PATCH 3/8] Update ToggleMenu.kt --- src/main/kotlin/me/cael/capes/menu/ToggleMenu.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/me/cael/capes/menu/ToggleMenu.kt b/src/main/kotlin/me/cael/capes/menu/ToggleMenu.kt index 4b7b115..d555722 100644 --- a/src/main/kotlin/me/cael/capes/menu/ToggleMenu.kt +++ b/src/main/kotlin/me/cael/capes/menu/ToggleMenu.kt @@ -51,6 +51,12 @@ class ToggleMenu(parent: Screen, gameOptions: GameOptions) : MainMenu(parent, ga it.message = CapeType.CLOAKSPLUS.getToggleText(config.enableCloaksPlus) }.position(width / 2 - 155 + 160, height / 7 + 3 * 24).size(150, 20).build()) + addDrawableChild(ButtonWidget.builder(CapeType.ADVANCEDCAPES.getToggleText(config.enableAdvancedCapes)) { + config.enableCloaksPlus = !config.enableAdvancedCapes + config.save() + it.message = CapeType.ADVANCEDCAPES.getToggleText(config.enableAdvancedCapes) + }.position(width / 2 - 155, height / 7 + 3 * 24).size(150, 20).build()) + addDrawableChild(ButtonWidget.builder(elytraMessage(config.enableElytraTexture)) { config.enableElytraTexture = !config.enableElytraTexture config.save() @@ -59,10 +65,10 @@ class ToggleMenu(parent: Screen, gameOptions: GameOptions) : MainMenu(parent, ga addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE) { client!!.setScreen(parent) - }.position((width/2) - (200 / 2), height / 7 + 5 * 24).size(200, 20).build()) + }.position((width/2) - (200 / 2), height / 7 + 6 * 24).size(200, 20).build()) } private fun elytraMessage(enabled: Boolean) = ScreenTexts.composeToggleText(Text.translatable("options.capes.elytra"), enabled) -} \ No newline at end of file +} From b63809264b18b9e7fd7973520c190383dd9fc84f Mon Sep 17 00:00:00 2001 From: oliik2013 <131269027+oliik2013@users.noreply.github.com> Date: Mon, 15 Jul 2024 10:42:24 +0200 Subject: [PATCH 4/8] Update release.yml --- .github/workflows/release.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6e125c5..a31d16d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,8 +15,7 @@ jobs: - uses: actions/checkout@v2.2.0 - run: | chmod +x ./gradlew - ./gradlew build github curseforge modrinth --stacktrace + ./gradlew build github --stacktrace env: - CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }} GITHUB_TOKEN: ${{ secrets.GH_API_KEY }} - MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} \ No newline at end of file + From 0702023df84616e4273c32aa769b07a5c0534587 Mon Sep 17 00:00:00 2001 From: oliik2013 <131269027+oliik2013@users.noreply.github.com> Date: Mon, 15 Jul 2024 10:53:20 +0200 Subject: [PATCH 5/8] Update release.yml --- .github/workflows/release.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a31d16d..d26cc37 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,17 +5,13 @@ on: [workflow_dispatch] jobs: release: - runs-on: ubuntu-latest - - container: - image: openjdk:17-jdk - options: --user root + runs-on: windows-latest steps: - uses: actions/checkout@v2.2.0 - run: | - chmod +x ./gradlew - ./gradlew build github --stacktrace + gradlew.bat + gradlew.bat build github --stacktrace env: GITHUB_TOKEN: ${{ secrets.GH_API_KEY }} From b847048f248e90d535316905acb4ad0f39a97e17 Mon Sep 17 00:00:00 2001 From: oliik2013 <131269027+oliik2013@users.noreply.github.com> Date: Mon, 15 Jul 2024 10:54:34 +0200 Subject: [PATCH 6/8] Update release.yml --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d26cc37..e1ec001 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,8 +10,8 @@ jobs: steps: - uses: actions/checkout@v2.2.0 - run: | - gradlew.bat - gradlew.bat build github --stacktrace + ./gradlew.bat + ./gradlew.bat build github --stacktrace env: GITHUB_TOKEN: ${{ secrets.GH_API_KEY }} From 058e580ef66ea32a73b926cb83bb36d0e28fe43d Mon Sep 17 00:00:00 2001 From: oliik2013 <131269027+oliik2013@users.noreply.github.com> Date: Mon, 15 Jul 2024 11:07:43 +0200 Subject: [PATCH 7/8] Update release.yml --- .github/workflows/release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e1ec001..0a67ccc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,6 +10,12 @@ jobs: steps: - uses: actions/checkout@v2.2.0 - run: | + $java17Url = "https://download.oracle.com/java/17/latest/jdk-17_windows-x64_bin.exe" + $installer = "$env:TEMP\jdk-17_windows-x64_bin.exe" + Invoke-WebRequest -Uri $java17Url -OutFile $installer + Start-Process -FilePath $installer -ArgumentList "/s" -Wait + Remove-Item $installer + setx JAVA_HOME "C:\Program Files\Java\jdk-17\" ./gradlew.bat ./gradlew.bat build github --stacktrace env: From 1cb71aa07b7a499b884eaedbbeb42714c3249b44 Mon Sep 17 00:00:00 2001 From: oliik2013 <131269027+oliik2013@users.noreply.github.com> Date: Mon, 15 Jul 2024 11:12:25 +0200 Subject: [PATCH 8/8] restore --- .github/workflows/release.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a67ccc..e2c7c8d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,19 +5,19 @@ on: [workflow_dispatch] jobs: release: - runs-on: windows-latest + runs-on: ubuntu-latest + + container: + image: openjdk:17-jdk + options: --user root steps: - uses: actions/checkout@v2.2.0 - run: | - $java17Url = "https://download.oracle.com/java/17/latest/jdk-17_windows-x64_bin.exe" - $installer = "$env:TEMP\jdk-17_windows-x64_bin.exe" - Invoke-WebRequest -Uri $java17Url -OutFile $installer - Start-Process -FilePath $installer -ArgumentList "/s" -Wait - Remove-Item $installer - setx JAVA_HOME "C:\Program Files\Java\jdk-17\" - ./gradlew.bat - ./gradlew.bat build github --stacktrace + chmod +x ./gradlew + ./gradlew build github curseforge modrinth --stacktrace env: + CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }} GITHUB_TOKEN: ${{ secrets.GH_API_KEY }} + MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}