diff --git a/.github/workflows/publish_all.yml b/.github/workflows/publish_all.yml index 2409fdba..bb60af32 100644 --- a/.github/workflows/publish_all.yml +++ b/.github/workflows/publish_all.yml @@ -40,6 +40,20 @@ jobs: game_vers: | 1.20 1.20.1 + java_vers: 17 + GITHUB_REF: ${{ github.ref }} + secrets: + CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} + MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} + PUBLISH_MAVEN_USERNAME: ${{ secrets.PUBLISH_MAVEN_USERNAME }} + PUBLISH_MAVEN_PASSWORD: ${{ secrets.PUBLISH_MAVEN_PASSWORD }} + + deploy_1_20_2: + needs: deploy_1_20 + uses: enjarai/do-a-barrel-roll/.github/workflows/publish.yml@1.20.2/dev + with: + branch: 1.20.2/dev + game_vers: | 1.20.2 java_vers: 17 GITHUB_REF: ${{ github.ref }} diff --git a/CHANGELOG.md b/CHANGELOG.md index ea3feadb..c7a703ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,3 +2,4 @@ This does not apply to normal servers. - Changed the default toggle keybind to I to avoid conflicting with the advancements button. - Fixed an incompatibility with Keybind Fix. +- Separated 1.20 and 1.20.2 support into separate jars. \ No newline at end of file diff --git a/build.gradle b/build.gradle index d704fa9e..51dc49e0 100644 --- a/build.gradle +++ b/build.gradle @@ -100,7 +100,7 @@ dependencies { modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}" // Mixin Extras for extra compatibility. - include(implementation("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}")) + implementation("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}") annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}") clientAnnotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}") diff --git a/gradle.properties b/gradle.properties index 8b76e03c..1c36cb56 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx4096M minecraft_version=1.19.4 archives_base_name=do-a-barrel-roll -mod_version=3.3.6 +mod_version=3.3.7 maven_group=nl.enjarai yarn_version=1.19.4+build.1 @@ -11,7 +11,7 @@ yarn_version=1.19.4+build.1 loader_version=0.14.24 fabric_version=0.75.3+1.19.4 -cicada_version=0.4.6 +cicada_version=0.5.0+1.20.1-minus # https://modrinth.com/mod/modmenu/versions#all-versions modmenu_version=6.1.0-beta.3 # https://github.com/isXander/YetAnotherConfigLib/releases diff --git a/src/client/java/nl/enjarai/doabarrelroll/DoABarrelRollClient.java b/src/client/java/nl/enjarai/doabarrelroll/DoABarrelRollClient.java index df93cdc9..ec7353f2 100644 --- a/src/client/java/nl/enjarai/doabarrelroll/DoABarrelRollClient.java +++ b/src/client/java/nl/enjarai/doabarrelroll/DoABarrelRollClient.java @@ -115,6 +115,6 @@ public static boolean isFallFlying() { } public static boolean isConnectedToRealms() { - return false; + return false; // We are not connected to realms. } } diff --git a/src/main/java/nl/enjarai/doabarrelroll/DoABarrelRoll.java b/src/main/java/nl/enjarai/doabarrelroll/DoABarrelRoll.java index 627a721d..b2af3124 100644 --- a/src/main/java/nl/enjarai/doabarrelroll/DoABarrelRoll.java +++ b/src/main/java/nl/enjarai/doabarrelroll/DoABarrelRoll.java @@ -37,7 +37,7 @@ public static void init() { @Override public void registerConversations(ConversationManager conversationManager) { conversationManager.registerSource( - JsonSource.fromUrl("https://raw.githubusercontent.com/enjarai/do-a-barrel-roll/1.20/dev/src/main/resources/cicada/do-a-barrel-roll/conversations.json") + JsonSource.fromUrl("https://raw.githubusercontent.com/enjarai/do-a-barrel-roll/1.20.2/dev/src/main/resources/cicada/do-a-barrel-roll/conversations.json") .or(JsonSource.fromResource("cicada/do-a-barrel-roll/conversations.json")), LOGGER::info );