Skip to content
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

Update to 1.20.4 #7

Merged
merged 1 commit into from
Jan 13, 2024
Merged

Update to 1.20.4 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Common/src/main/java/einstein/improved_animations/animations/entity/PlayerPartAnimator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public void tick(LivingEntity livingEntity, EntityAnimationData entityAnimationD
// Begin sprint jump timers
// Ticks after hitting ground
float previousTicksAfterHittingGround = entityAnimationData.get(TICKS_AFTER_HITTING_GROUND).get();
float ticksAfterHittingGround = livingEntity.isOnGround() ? previousTicksAfterHittingGround + 1 : 0;
float ticksAfterHittingGround = livingEntity.onGround() ? previousTicksAfterHittingGround + 1 : 0;
entityAnimationData.setValue(TICKS_AFTER_HITTING_GROUND, ticksAfterHittingGround);

boolean shouldResetJumpTimer =
Expand All @@ -173,7 +173,7 @@ public void tick(LivingEntity livingEntity, EntityAnimationData entityAnimationD

// Sprint jump weight
boolean isJumping =
(ticksAfterHittingGround < 1 || !livingEntity.isOnGround())
(ticksAfterHittingGround < 1 || !livingEntity.onGround())
&& entityAnimationData.getValue(DELTA_Y) != 0
&& ticksAfterSwitchingLegs < 15;
entityAnimationData.incrementInTicksFromCondition(JUMP_WEIGHT, isJumping, 3, 4);
Expand All @@ -189,7 +189,7 @@ public void tick(LivingEntity livingEntity, EntityAnimationData entityAnimationD
entityAnimationData.incrementInTicksFromCondition(FAST_FALL_WEIGHT, livingEntity.fallDistance > 2, 24, 2);
entityAnimationData.incrementInFramesOrResetFromCondition(FALL_IMPACT_TIMER, entityAnimationData.getValue(FAST_FALL_WEIGHT) > 0, 20);

entityAnimationData.incrementInTicksFromCondition(ON_GROUND_WEIGHT, livingEntity.isOnGround(), 6, 6);
entityAnimationData.incrementInTicksFromCondition(ON_GROUND_WEIGHT, livingEntity.onGround(), 6, 6);

//setAnimationTimer("vertical_blocks_per_second", (float) (livingEntity.getY() - livingEntity.yo) * 20);
entityAnimationData.incrementInTicksFromCondition(CLIMBING_UP_WEIGHT, livingEntity.onClimbable() && entityAnimationData.getValue(DELTA_Y) >= 0, 8, 8);
Expand Down
6 changes: 5 additions & 1 deletion Fabric/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ version = "${mod_v}"
group = "${mod_group}"
archivesBaseName = "${mod_name}-fabric-${mc_v}"

repositories {
maven { url "https://maven.terraformersmc.com/releases/" }
}

dependencies {
minecraft "com.mojang:minecraft:${mc_v}"
mappings loom.officialMojangMappings()
Expand All @@ -17,7 +21,7 @@ dependencies {
implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
implementation project(":Common")

modImplementation("curse.maven:modmenu-308702:${modmenu_v}")
modImplementation "com.terraformersmc:modmenu:${modmenu_v}"
}

loom {
Expand Down
2 changes: 1 addition & 1 deletion Forge/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.0.+', changing: true
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '[6.0.16,6.2)', changing: true
classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
}
}
Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

# Common
mc_v=1.19.3
mc_v=1.20.4

# Forge
forge_v=44.1.0
catalogue_v=4171025
configured_v=4166861
forge_v=49.0.19
catalogue_v=4766090
configured_v=4462894

# Fabric
fabric_v=0.14.12
fabric_api_v=0.70.0
modmenu_v=4159524
fabric_v=0.15.3
fabric_api_v=0.93.1
modmenu_v=9.0.0

# Mod Options
mod_name=Improved Animations
Expand Down
Loading