Skip to content

Commit

Permalink
Nice
Browse files Browse the repository at this point in the history
  • Loading branch information
enjarai committed Jan 3, 2024
1 parent 0be501d commit c291ba0
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 14 deletions.
20 changes: 18 additions & 2 deletions .github/workflows/publish_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
PUBLISH_MAVEN_PASSWORD: ${{ secrets.PUBLISH_MAVEN_PASSWORD }}

deploy_1_20:
needs: deploy_1_19_4
# needs: deploy_1_19_4
uses: enjarai/do-a-barrel-roll/.github/workflows/publish.yml@1.20/dev
with:
branch: 1.20/dev
Expand All @@ -49,7 +49,7 @@ jobs:
PUBLISH_MAVEN_PASSWORD: ${{ secrets.PUBLISH_MAVEN_PASSWORD }}

deploy_1_20_2:
needs: deploy_1_20
# needs: deploy_1_20
uses: enjarai/do-a-barrel-roll/.github/workflows/publish.yml@1.20.2/dev
with:
branch: 1.20.2/dev
Expand All @@ -62,3 +62,19 @@ jobs:
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
PUBLISH_MAVEN_USERNAME: ${{ secrets.PUBLISH_MAVEN_USERNAME }}
PUBLISH_MAVEN_PASSWORD: ${{ secrets.PUBLISH_MAVEN_PASSWORD }}

deploy_1_20_4:
# needs: deploy_1_20_2
uses: enjarai/do-a-barrel-roll/.github/workflows/publish.yml@1.20.4/dev
with:
branch: 1.20.4/dev
game_vers: |
1.20.3
1.20.4
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 }}
6 changes: 1 addition & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
- As an exception to existing limitations, thrusting will now be allowed when the player is an operator on a Realm.
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.
- Added support for 1.20.4
2 changes: 1 addition & 1 deletion src/main/java/nl/enjarai/doabarrelroll/DoABarrelRoll.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.2/dev/src/main/resources/cicada/do-a-barrel-roll/conversations.json")
JsonSource.fromUrl("https://raw.githubusercontent.com/enjarai/do-a-barrel-roll/1.20.4/dev/src/main/resources/cicada/do-a-barrel-roll/conversations.json")
.or(JsonSource.fromResource("cicada/do-a-barrel-roll/conversations.json")),
LOGGER::info
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ public boolean shouldCancel(List<String> targetClassNames, String mixinClassName
DoABarrelRoll.LOGGER.warn("If the author of Equipment Compare is reading this: see #31 on your github. Once the issue is resolved, you can set the priority of this mixin to anything other than 1000 to stop it being disabled.");
return true;
}
if (mixinClassName.equals("me.fzzyhmstrs.keybind_fix.mixins.KeybindingMixin") && MixinAnnotationReader.getPriority(mixinClassName) == 1000) {
DoABarrelRoll.LOGGER.warn("Keybind Fix detected, disabling their overly invasive keybinding mixin (Ironic, I know). Report any relevant issues to them.");
DoABarrelRoll.LOGGER.warn("If the author of Keybind Fix is reading this: please don't use unconditionally cancelled injects... try looking into MixinExtras! Once the issue is resolved, you can set the priority of this mixin to anything other than 1000 to stop it being disabled.");
return true;
}
// if (mixinClassName.equals("me.fzzyhmstrs.keybind_fix.mixins.KeybindingMixin") && MixinAnnotationReader.getPriority(mixinClassName) == 1000) {
// DoABarrelRoll.LOGGER.warn("Keybind Fix detected, disabling their overly invasive keybinding mixin (Ironic, I know). Report any relevant issues to them.");
// DoABarrelRoll.LOGGER.warn("If the author of Keybind Fix is reading this: please don't use unconditionally cancelled injects... try looking into MixinExtras! Once the issue is resolved, you can set the priority of this mixin to anything other than 1000 to stop it being disabled.");
// return true;
// }
return false;
}
}
3 changes: 2 additions & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
"depends": {
"minecraft": ">=1.20.3- <=1.20.4",
"fabric-api": "*",
"cicada": "*"
"cicada": "*",
"fabricloader": ">=0.15"
},
"breaks": {
"optifabric": "*"
Expand Down

0 comments on commit c291ba0

Please sign in to comment.