Skip to content

Commit

Permalink
0.6.16b
Browse files Browse the repository at this point in the history 
Fixed value layers bugging out in some cases
  • Loading branch information
@tom5454
tom5454 committed Apr 2, 2024
1 parent 3221e85 commit e0708d4
Show file tree
Hide file tree
Showing 39 changed files with 167 additions and 123 deletions.
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.10/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.12/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.14/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.15/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.16/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.17/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.18/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.19.3/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.19.4/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.19/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.2/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
project_type=forge
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.20.2/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ mod_name=Customizable Player Models
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=MIT License
# The mod version. See https://semver.org/
mod_version=0.6.16a
mod_version=0.6.16b
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
Expand Down
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.20.4/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ mod_name=Customizable Player Models
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=MIT License
# The mod version. See https://semver.org/
mod_version=0.6.16a
mod_version=0.6.16b
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
Expand Down
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.20/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.4/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
project_type=forge
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.5/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
project_type=forge
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.6/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
project_type=forge
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.7/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
project_type=forge
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.8/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b

project_type=forge
2 changes: 1 addition & 1 deletion CustomPlayerModels-Bukkit/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
2 changes: 1 addition & 1 deletion CustomPlayerModels-b1.7.3/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
project_type=fabric

# Fabric Properties
Expand Down
8 changes: 4 additions & 4 deletions CustomPlayerModels/src/shared/java/com/tom/cpm/shared/animation/AnimationEngine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,13 +234,13 @@ public String getName(I18n gui, String display) {
}

@Override
public long getTime(AnimationState state, long time) {
public long getTime(AnimationState state, long animTime) {
if (state.gestureData.length > id) {
float val = Byte.toUnsignedInt(state.gestureData[id]) / 256f;
if (state.prevGestureData != null && state.prevGestureData.length == state.gestureData.length) {
long time = MinecraftClientAccess.get().getPlayerRenderManager().getAnimationEngine().getTime();
if (state.prevGestureData != null && state.prevGestureData.length == state.gestureData.length && state.lastGestureReceiveTime + 50 >= time) {
float prev = Byte.toUnsignedInt(state.prevGestureData[id]) / 256f;
float partial = MinecraftClientAccess.get().getPlayerRenderManager().getAnimationEngine().partial;
val = MathHelper.lerp(partial, prev, val);
val = MathHelper.lerp((time - state.lastGestureReceiveTime) / 50f, prev, val);
}
return (long) (val * VanillaPose.DYNAMIC_DURATION_MUL);
} else
Expand Down
3 changes: 3 additions & 0 deletions CustomPlayerModels/src/shared/java/com/tom/cpm/shared/animation/AnimationState.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.tom.cpl.nbt.NBTTagCompound;
import com.tom.cpl.util.Hand;
import com.tom.cpl.util.HandAnimation;
import com.tom.cpm.shared.MinecraftClientAccess;
import com.tom.cpm.shared.animation.AnimationEngine.AnimationMode;
import com.tom.cpm.shared.model.render.PlayerModelSetup.ArmPose;
import com.tom.cpm.shared.network.ModelEventType;
Expand All @@ -35,6 +36,7 @@ public class AnimationState {
public boolean parrotLeft, parrotRight, isFreezing, isBurning, isOnLadder, isClimbing, inGui, firstPersonMod, voiceMuted, invisible;
public byte[] gestureData;
public byte[] prevGestureData;
public long lastGestureReceiveTime;
public VRState vrState;
public AnimationMode animationMode;
public long dayTime;
Expand Down Expand Up @@ -184,6 +186,7 @@ public void receiveEvent(NBTTagCompound tag, boolean isClient) {
if(tag.hasKey(NetworkUtil.GESTURE)) {
prevGestureData = gestureData;
gestureData = tag.getByteArray(NetworkUtil.GESTURE);
lastGestureReceiveTime = MinecraftClientAccess.get().getPlayerRenderManager().getAnimationEngine().getTime();
}
}

Expand Down
2 changes: 1 addition & 1 deletion CustomPlayerModelsFabric-1.14/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ loader_version=0.14.18
fabric_version=0.28.5+1.14

# Mod Properties
mod_version=0.6.16a
mod_version=0.6.16b
maven_group = com.tom
archives_base_name = CustomPlayerModels-Fabric-1.14
2 changes: 1 addition & 1 deletion CustomPlayerModelsFabric-1.15/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ loader_version=0.14.18
fabric_version=0.28.5+1.15

# Mod Properties
mod_version=0.6.16a
mod_version=0.6.16b
maven_group = com.tom
archives_base_name = CustomPlayerModels-Fabric-1.15
2 changes: 1 addition & 1 deletion CustomPlayerModelsFabric-1.16/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ loader_version=0.14.18
fabric_version=0.42.0+1.16

# Mod Properties
mod_version=0.6.16a
mod_version=0.6.16b
maven_group = com.tom
archives_base_name = CustomPlayerModels-Fabric-1.16
2 changes: 1 addition & 1 deletion CustomPlayerModelsFabric-1.17/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ loader_version=0.14.18
fabric_version=0.46.1+1.17

# Mod Properties
mod_version=0.6.16a
mod_version=0.6.16b
maven_group = com.tom
archives_base_name = CustomPlayerModels-Fabric-1.17
2 changes: 1 addition & 1 deletion CustomPlayerModelsFabric-1.18/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ loader_version=0.15.7
fabric_version=0.77.0+1.18.2

# Mod Properties
mod_version=0.6.16a
mod_version=0.6.16b
maven_group = com.tom
archives_base_name = CustomPlayerModels-Fabric-1.18
2 changes: 1 addition & 1 deletion CustomPlayerModelsFabric-1.19.3/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ loader_version=0.14.24
fabric_version=0.76.1+1.19.3

# Mod Properties
mod_version=0.6.16a
mod_version=0.6.16b
maven_group = com.tom
archives_base_name = CustomPlayerModels-Fabric-1.19.3
2 changes: 1 addition & 1 deletion CustomPlayerModelsFabric-1.19.4/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ loader_version=0.14.17
fabric_version=0.75.3+1.19.4

# Mod Properties
mod_version=0.6.16a
mod_version=0.6.16b
maven_group = com.tom
archives_base_name = CustomPlayerModels-Fabric-1.19.4
2 changes: 1 addition & 1 deletion CustomPlayerModelsFabric-1.19/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ loader_version=0.14.21
fabric_version=0.75.1+1.19.2

# Mod Properties
mod_version=0.6.16a
mod_version=0.6.16b
maven_group = com.tom
archives_base_name = CustomPlayerModels-Fabric-1.19
2 changes: 1 addition & 1 deletion CustomPlayerModelsFabric-1.20.2/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ loader_version=0.14.22
fabric_version=0.89.0+1.20.2

# Mod Properties
mod_version=0.6.16a
mod_version=0.6.16b
maven_group = com.tom
archives_base_name = CustomPlayerModels-Fabric-1.20.2
2 changes: 1 addition & 1 deletion CustomPlayerModelsFabric-1.20.4/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ loader_version=0.15.7
fabric_version=0.96.11+1.20.4

# Mod Properties
mod_version=0.6.16a
mod_version=0.6.16b
maven_group = com.tom
archives_base_name = CustomPlayerModels-Fabric-1.20.4
2 changes: 1 addition & 1 deletion CustomPlayerModelsFabric-1.20.5/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ loader_version=0.15.7
fabric_version=0.96.13+1.20.5

# Mod Properties
mod_version=0.6.16a
mod_version=0.6.16b
maven_group = com.tom
archives_base_name = CustomPlayerModels-Fabric-1.20.5
2 changes: 1 addition & 1 deletion CustomPlayerModelsFabric-1.20/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ loader_version=0.15.7
fabric_version=0.92.0+1.20.1

# Mod Properties
mod_version=0.6.16a
mod_version=0.6.16b
maven_group = com.tom
archives_base_name = CustomPlayerModels-Fabric-1.20
2 changes: 1 addition & 1 deletion CustomPlayerModelsLexForge-1.20.2/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
2 changes: 1 addition & 1 deletion CustomPlayerModelsLexForge-1.20.4/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.16a
mod_version=0.6.16b
2 changes: 1 addition & 1 deletion CustomPlayerModelsQuilt-1.20/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
org.gradle.jvmargs=-Xmx1G

# Mod Properties
mod_version=0.6.16a
mod_version=0.6.16b
maven_group = com.tom
archives_base_name = CustomPlayerModels-Quilt-1.20

Expand Down
Loading

0 comments on commit e0708d4

Please sign in to comment.