Skip to content

Fix flight revoke incompatibility with other mods #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JordanPlayz158 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix flight revoke incompatibility with other mods #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9af8443
Allow gradle to run without CURSEFORGE_TOKEN environment variable pop…
JordanPlayz158 Jan 19, 2026
71c5332
Default amount of ram was not sufficient for root project so added th…
JordanPlayz158 Jan 19, 2026
aabdf66
Fix for Identity interfering with other mods ability to allow the pla…
JordanPlayz158 Jan 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions common/src/main/java/draylar/identity/mixin/player/PlayerEntityTickMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,21 @@ private void serverTick(CallbackInfo info) {
PlayerAbilities.setCooldown(player, Math.max(0, data.getAbilityCooldown() - 1));
PlayerAbilities.sync(player);

// Sync flight abilities with identity state
boolean shouldAllowFlight = Identity.hasFlyingPermissions(player);
if (shouldAllowFlight != player.getAbilities().allowFlying) {
if (shouldAllowFlight) {
FlightHelper.grantFlightTo(player);
player.getAbilities().setFlySpeed(IdentityConfig.getInstance().flySpeed());
} else {
FlightHelper.revokeFlight(player);
player.getAbilities().setFlySpeed(0.05f);
// Only sync flight state if the player is currently morphed
// to not conflict with other mods that may modify flight state
if (identity != null) {
// Sync flight abilities with identity state
boolean shouldAllowFlight = Identity.hasFlyingPermissions(player);
if (shouldAllowFlight != player.getAbilities().allowFlying) {
if (shouldAllowFlight) {
FlightHelper.grantFlightTo(player);
player.getAbilities().setFlySpeed(IdentityConfig.getInstance().flySpeed());
} else {
FlightHelper.revokeFlight(player);
player.getAbilities().setFlySpeed(0.05f);
}
player.sendAbilitiesUpdate();
}
player.sendAbilitiesUpdate();
}

// Validate villager profession bindings periodically
Expand Down
29 changes: 17 additions & 12 deletions fabric/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,22 @@ modrinth {
}
uploadFile = file("build/libs/${archivesBaseName}-${version}-fabric.jar")
}
curseforge {
apiKey = System.getenv("CURSEFORGE_TOKEN")

project {
id = "1238155"
changelog = rootProject.file("IdentityChangeLog.md")
releaseType = "release" // options: alpha, beta, release
addGameVersion "1.20.1"
addGameVersion "Fabric"
mainArtifact(file("build/libs/${archivesBaseName}-${version}-fabric.jar")) {
displayName = "Fabric-${version}"

var curseforgeToken = System.getenv("CURSEFORGE_TOKEN")

if (curseforgeToken) {
curseforge {
apiKey = curseforgeToken

project {
id = "1238155"
changelog = rootProject.file("IdentityChangeLog.md")
releaseType = "release" // options: alpha, beta, release
addGameVersion "1.20.1"
addGameVersion "Fabric"
mainArtifact(file("build/libs/${archivesBaseName}-${version}-fabric.jar")) {
displayName = "Fabric-${version}"
}
}
}
}
}
29 changes: 17 additions & 12 deletions forge/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,22 @@ modrinth {
}
uploadFile = file("build/libs/${archivesBaseName}-${version}-forge.jar")
}
curseforge {
apiKey = System.getenv("CURSEFORGE_TOKEN")

project {
id = "1238155"
changelog = rootProject.file("IdentityChangeLog.md")
releaseType = "release" // options: alpha, beta, release
addGameVersion "1.20.1"
addGameVersion "Forge"
mainArtifact(file("build/libs/${archivesBaseName}-${version}-forge.jar")) {
displayName = "Forge-${version}"

var curseforgeToken = System.getenv("CURSEFORGE_TOKEN")

if (curseforgeToken) {
curseforge {
apiKey = System.getenv("CURSEFORGE_TOKEN")

project {
id = "1238155"
changelog = rootProject.file("IdentityChangeLog.md")
releaseType = "release" // options: alpha, beta, release
addGameVersion "1.20.1"
addGameVersion "Forge"
mainArtifact(file("build/libs/${archivesBaseName}-${version}-forge.jar")) {
displayName = "Forge-${version}"
}
}
}
}
}
3 changes: 3 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx4G

# Base Versions
minecraft_version=1.20.1
archives_base_name=identity
Expand Down