NotEvil/TiedUp-
4
2
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

WIP: create TiedUpRigConstants, replace EpicFightMod/SharedConstants refs

Browse Source 
- Nouveau TiedUpRigConstants.java : centralise MODID/LOGGER/identifier/prefix,
  constantes runtime (IS_DEV_ENV, A_TICK, GENERAL_ANIMATION_TRANSITION_TIME,
  MAX_JOINTS), factory ANIMATOR_PROVIDER (client/server split) + helpers
  stacktraceIfDevSide/logAndStacktraceIfDevSide.

- sed global : EpicFightMod.* → TiedUpRigConstants.*
- sed global : EpicFightSharedConstants.* → TiedUpRigConstants.*
- sed global : EpicFightRenderTypes → TiedUpRenderTypes (class rename upstream)
- Fix package declarations : Armature.java + TiedUpRenderTypes.java

Résidus yesman.epicfight : 115 → 86 (-29)
Reste : gameasset/physics/network/world/config/skill (combat deps à strip) +
combat mode refs dans patch/LocalPlayerPatch + ClientPlayerPatch (Phase 2).
This commit is contained in:
notevil
2026-04-22 00:33:39 +02:00
parent cbf61906e0
commit 324e7fb984
70 changed files with 320 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/tiedup/remake/rig/anim/AnimationClip.java
View File

@@ -137,4 +137,4 @@ public class AnimationClip {
public float getClipTime() {
return this.clipTime;
}
}
}

25
src/main/java/com/tiedup/remake/rig/anim/AnimationManager.java
View File

@@ -62,8 +62,7 @@ import com.tiedup.remake.rig.util.InstantiateInvoker;
import com.tiedup.remake.rig.util.MutableBoolean;
import yesman.epicfight.gameasset.Animations;
import yesman.epicfight.gameasset.Armatures;
import yesman.epicfight.main.EpicFightMod;
import yesman.epicfight.main.EpicFightSharedConstants;
import com.tiedup.remake.rig.TiedUpRigConstants;
import yesman.epicfight.network.EpicFightNetworkManager;
import yesman.epicfight.network.client.CPCheckAnimationRegistryMatches;
import yesman.epicfight.network.server.SPDatapackSync;
@@ -87,9 +86,9 @@ public class AnimationManager extends SimplePreparableReloadListener<List<Resour
public static boolean checkNull(AssetAccessor<? extends StaticAnimation> animation) {
if (animation == null || animation.isEmpty()) {
if (animation != null) {
EpicFightMod.stacktraceIfDevSide("Empty animation accessor: " + animation.registryName(), NoSuchElementException::new);
TiedUpRigConstants.stacktraceIfDevSide("Empty animation accessor: " + animation.registryName(), NoSuchElementException::new);
} else {
EpicFightMod.stacktraceIfDevSide("Null animation accessor", NoSuchElementException::new);
TiedUpRigConstants.stacktraceIfDevSide("Null animation accessor", NoSuchElementException::new);
}
return true;
@@ -151,7 +150,7 @@ public class AnimationManager extends SimplePreparableReloadListener<List<Resour
@Override
protected List<ResourceLocation> prepare(ResourceManager resourceManager, ProfilerFiller profilerIn) {
if (!EpicFightSharedConstants.isPhysicalClient() && serverResourceManager == null) {
if (!TiedUpRigConstants.isPhysicalClient() && serverResourceManager == null) {
serverResourceManager = resourceManager;
}
@@ -206,9 +205,9 @@ public class AnimationManager extends SimplePreparableReloadListener<List<Resour
JsonElement jsonelement = GsonHelper.fromJson(GSON, reader, JsonElement.class);
this.readResourcepackAnimation(animId, jsonelement.getAsJsonObject());
} catch (IOException | JsonParseException | IllegalArgumentException resourceReadException) {
EpicFightMod.LOGGER.error("Couldn't parse animation data from {}", animId, resourceReadException);
TiedUpRigConstants.LOGGER.error("Couldn't parse animation data from {}", animId, resourceReadException);
} catch (Exception e) {
EpicFightMod.LOGGER.error("Failed at constructing {}", animId, e);
TiedUpRigConstants.LOGGER.error("Failed at constructing {}", animId, e);
}
});
@@ -221,13 +220,13 @@ public class AnimationManager extends SimplePreparableReloadListener<List<Resour
MutableBoolean init = new MutableBoolean(true);
if (entry.getValue() == null || entry.getValue().getAccessor() == null) {
EpicFightMod.logAndStacktraceIfDevSide(Logger::error, "Invalid animation implementation: " + entry.getKey(), AssetLoadingException::new);
TiedUpRigConstants.logAndStacktraceIfDevSide(Logger::error, "Invalid animation implementation: " + entry.getKey(), AssetLoadingException::new);
init.set(false);
}
entry.getValue().getSubAnimations().forEach((subAnimation) -> {
if (subAnimation == null || subAnimation.get() == null) {
EpicFightMod.logAndStacktraceIfDevSide(Logger::error, "Invalid sub animation implementation: " + entry.getKey(), AssetLoadingException::new);
TiedUpRigConstants.logAndStacktraceIfDevSide(Logger::error, "Invalid sub animation implementation: " + entry.getKey(), AssetLoadingException::new);
init.set(false);
}
});
@@ -247,7 +246,7 @@ public class AnimationManager extends SimplePreparableReloadListener<List<Resour
.forEach(accessor -> {
accessor.doOrThrow(StaticAnimation::postInit);
if (EpicFightSharedConstants.isPhysicalClient()) {
if (TiedUpRigConstants.isPhysicalClient()) {
AnimationManager.readAnimationProperties(accessor.get());
}
});
@@ -278,7 +277,7 @@ public class AnimationManager extends SimplePreparableReloadListener<List<Resour
}
public static ResourceManager getAnimationResourceManager() {
return EpicFightSharedConstants.isPhysicalClient() ? Minecraft.getInstance().getResourceManager() : serverResourceManager;
return TiedUpRigConstants.isPhysicalClient() ? Minecraft.getInstance().getResourceManager() : serverResourceManager;
}
public int getResourcepackAnimationCount() {
@@ -317,7 +316,7 @@ public class AnimationManager extends SimplePreparableReloadListener<List<Resour
try {
return InstantiateInvoker.invoke(invocationCommand, StaticAnimation.class).getResult();
} catch (Exception e) {
EpicFightMod.LOGGER.warn("Failed at creating animation from server resource pack");
TiedUpRigConstants.LOGGER.warn("Failed at creating animation from server resource pack");
e.printStackTrace();
return Animations.EMPTY_ANIMATION;
}
@@ -401,7 +400,7 @@ public class AnimationManager extends SimplePreparableReloadListener<List<Resour
if (NO_WARNING_MODID.contains(rl.getNamespace())) {
return;
} else {
EpicFightMod.logAndStacktraceIfDevSide(
TiedUpRigConstants.logAndStacktraceIfDevSide(
Logger::error
, "Datapack animation reading failed: No constructor information has provided: " + rl
, IllegalStateException::new

6
src/main/java/com/tiedup/remake/rig/anim/AnimationPlayer.java
View File

@@ -15,7 +15,7 @@ import com.tiedup.remake.rig.anim.types.DynamicAnimation;
import com.tiedup.remake.rig.anim.types.StaticAnimation;
import com.tiedup.remake.rig.asset.AssetAccessor;
import yesman.epicfight.gameasset.Animations;
import yesman.epicfight.main.EpicFightSharedConstants;
import com.tiedup.remake.rig.TiedUpRigConstants;
import com.tiedup.remake.rig.patch.LivingEntityPatch;
public class AnimationPlayer {
@@ -42,7 +42,7 @@ public class AnimationPlayer {
playbackSpeed = playSpeedModifier.modify(currentPlay, entitypatch, playbackSpeed, this.prevElapsedTime, this.elapsedTime);
}
this.elapsedTime += EpicFightSharedConstants.A_TICK * playbackSpeed * (this.isReversed() && currentPlay.canBePlayedReverse() ? -1.0F : 1.0F);
this.elapsedTime += TiedUpRigConstants.A_TICK * playbackSpeed * (this.isReversed() && currentPlay.canBePlayedReverse() ? -1.0F : 1.0F);
PlaybackTimeModifier playTimeModifier = currentPlayStatic.getProperty(StaticAnimationProperty.ELAPSED_TIME_MODIFIER).orElse(null);
if (playTimeModifier != null) {
@@ -159,4 +159,4 @@ public class AnimationPlayer {
public String toString() {
return this.getAnimation() + " " + this.prevElapsedTime + " " + this.elapsedTime;
}
}
}

6
src/main/java/com/tiedup/remake/rig/anim/Animator.java
View File

@@ -22,7 +22,7 @@ import com.tiedup.remake.rig.anim.types.StaticAnimation;
import com.tiedup.remake.rig.asset.AssetAccessor;
import com.tiedup.remake.rig.event.InitAnimatorEvent;
import yesman.epicfight.gameasset.Animations;
import yesman.epicfight.main.EpicFightMod;
import com.tiedup.remake.rig.TiedUpRigConstants;
import com.tiedup.remake.rig.patch.LivingEntityPatch;
public abstract class Animator {
@@ -116,7 +116,7 @@ public abstract class Animator {
public void addLivingAnimation(LivingMotion livingMotion, AssetAccessor<? extends StaticAnimation> animation) {
if (AnimationManager.checkNull(animation)) {
EpicFightMod.LOGGER.warn("Unable to put an empty animation for " + livingMotion);
TiedUpRigConstants.LOGGER.warn("Unable to put an empty animation for " + livingMotion);
return;
}
@@ -142,4 +142,4 @@ public abstract class Animator {
public void resetLivingAnimations() {
this.livingAnimations.clear();
}
}
}

2
src/main/java/com/tiedup/remake/rig/anim/Keyframe.java
View File

@@ -44,4 +44,4 @@ public class Keyframe {
public static Keyframe empty() {
return new Keyframe(0.0F, JointTransform.empty());
}
}
}

2
src/main/java/com/tiedup/remake/rig/anim/LivingMotion.java
View File

@@ -21,4 +21,4 @@ public interface LivingMotion extends ExtendableEnum {
return this == livingMotion;
}
}
}

2
src/main/java/com/tiedup/remake/rig/anim/LivingMotions.java
View File

@@ -20,4 +20,4 @@ public enum LivingMotions implements LivingMotion {
public int universalOrdinal() {
return this.id;
}
}
}

2
src/main/java/com/tiedup/remake/rig/anim/Pose.java
View File

@@ -110,4 +110,4 @@ public class Pose {
public enum LoadOperation {
SET, OVERWRITE, APPEND_ABSENT
}
}
}

2
src/main/java/com/tiedup/remake/rig/anim/ServerAnimator.java
View File

@@ -157,4 +157,4 @@ public class ServerAnimator extends Animator {
public void setHardPause(boolean paused) {
this.hardPaused = paused;
}
}
}

6
src/main/java/com/tiedup/remake/rig/anim/SynchedAnimationVariableKey.java
View File

@@ -21,7 +21,7 @@ import com.tiedup.remake.rig.anim.types.StaticAnimation;
import com.tiedup.remake.rig.asset.AssetAccessor;
import com.tiedup.remake.rig.util.PacketBufferCodec;
import com.tiedup.remake.rig.util.datastruct.ClearableIdMapper;
import yesman.epicfight.main.EpicFightMod;
import com.tiedup.remake.rig.TiedUpRigConstants;
import yesman.epicfight.network.EpicFightNetworkManager;
import yesman.epicfight.network.client.CPAnimationVariablePacket;
import yesman.epicfight.network.common.AnimationVariablePacket;
@@ -37,7 +37,7 @@ public interface SynchedAnimationVariableKey<T> {
return new SynchedIndependentAnimationVariableKey<> (defaultValueSupplier, mutable, codec);
}
public static final ResourceLocation BY_ID_REGISTRY = EpicFightMod.identifier("variablekeytoid");
public static final ResourceLocation BY_ID_REGISTRY = TiedUpRigConstants.identifier("variablekeytoid");
public static class SynchedAnimationVariableKeyCallbacks implements IForgeRegistry.BakeCallback<SynchedAnimationVariableKey<?>>, IForgeRegistry.CreateCallback<SynchedAnimationVariableKey<?>>, IForgeRegistry.ClearCallback<SynchedAnimationVariableKey<?>> {
private static final SynchedAnimationVariableKeyCallbacks INSTANCE = new SynchedAnimationVariableKeyCallbacks();
@@ -127,4 +127,4 @@ public interface SynchedAnimationVariableKey<T> {
return this.packetBufferCodec;
}
}
}
}

4
src/main/java/com/tiedup/remake/rig/anim/SynchedAnimationVariableKeys.java
View File

@@ -16,12 +16,12 @@ import net.minecraftforge.registries.RegistryBuilder;
import net.minecraftforge.registries.RegistryObject;
import com.tiedup.remake.rig.anim.SynchedAnimationVariableKey.SynchedIndependentAnimationVariableKey;
import com.tiedup.remake.rig.util.PacketBufferCodec;
import yesman.epicfight.main.EpicFightMod;
import com.tiedup.remake.rig.TiedUpRigConstants;
public class SynchedAnimationVariableKeys {
private static final Supplier<RegistryBuilder<SynchedAnimationVariableKey<?>>> BUILDER = () -> new RegistryBuilder<SynchedAnimationVariableKey<?>>().addCallback(SynchedAnimationVariableKey.getRegistryCallback());
public static final DeferredRegister<SynchedAnimationVariableKey<?>> SYNCHED_ANIMATION_VARIABLE_KEYS = DeferredRegister.create(EpicFightMod.identifier("synched_animation_variable_keys"), EpicFightMod.MODID);
public static final DeferredRegister<SynchedAnimationVariableKey<?>> SYNCHED_ANIMATION_VARIABLE_KEYS = DeferredRegister.create(TiedUpRigConstants.identifier("synched_animation_variable_keys"), TiedUpRigConstants.MODID);
public static final Supplier<IForgeRegistry<SynchedAnimationVariableKey<?>>> REGISTRY = SYNCHED_ANIMATION_VARIABLE_KEYS.makeRegistry(BUILDER);
public static final RegistryObject<SynchedIndependentAnimationVariableKey<Vec3>> DESTINATION = SYNCHED_ANIMATION_VARIABLE_KEYS.register("destination", () ->

2
src/main/java/com/tiedup/remake/rig/anim/TransformSheet.java
View File

@@ -351,4 +351,4 @@ public class TransformSheet {
public static record InterpolationInfo(int prev, int next, float delta) {
public static final InterpolationInfo INVALID = new InterpolationInfo(-1, -1, -1.0F);
}
}
}

6
src/main/java/com/tiedup/remake/rig/anim/client/AnimationSubFileReader.java
View File

@@ -45,7 +45,7 @@ import com.tiedup.remake.rig.anim.client.property.LayerInfo;
import com.tiedup.remake.rig.anim.client.property.TrailInfo;
import com.tiedup.remake.rig.exception.AssetLoadingException;
import com.tiedup.remake.rig.util.ParseUtil;
import yesman.epicfight.main.EpicFightMod;
import com.tiedup.remake.rig.TiedUpRigConstants;
import com.tiedup.remake.rig.patch.LivingEntityPatch;
public class AnimationSubFileReader {
@@ -66,7 +66,7 @@ public class AnimationSubFileReader {
try {
subFileType.apply(inputstream, animation);
} catch (JsonParseException e) {
EpicFightMod.LOGGER.warn("Can't read sub file " + subFileType.directory + " for " + animation);
TiedUpRigConstants.LOGGER.warn("Can't read sub file " + subFileType.directory + " for " + animation);
e.printStackTrace();
}
}
@@ -175,7 +175,7 @@ public class AnimationSubFileReader {
String type = GsonHelper.getAsString(jointMaskEntry, "type");
if (!type.contains(":")) {
type = (new StringBuilder(EpicFightMod.MODID)).append(":").append(type).toString();
type = (new StringBuilder(TiedUpRigConstants.MODID)).append(":").append(type).toString();
}
if (livingMotionName.equals("ALL")) {

6
src/main/java/com/tiedup/remake/rig/anim/client/ClientAnimator.java
View File

@@ -45,7 +45,7 @@ import com.tiedup.remake.rig.anim.client.property.JointMask.JointMaskSet;
import com.tiedup.remake.rig.anim.client.property.JointMaskEntry;
import com.tiedup.remake.rig.util.datastruct.TypeFlexibleHashMap;
import yesman.epicfight.gameasset.Animations;
import yesman.epicfight.main.EpicFightMod;
import com.tiedup.remake.rig.TiedUpRigConstants;
import yesman.epicfight.network.common.AnimatorControlPacket;
import com.tiedup.remake.rig.patch.LivingEntityPatch;
@@ -141,7 +141,7 @@ public class ClientAnimator extends Animator {
@Override
public void addLivingAnimation(LivingMotion livingMotion, AssetAccessor<? extends StaticAnimation> animation) {
if (AnimationManager.checkNull(animation)) {
EpicFightMod.LOGGER.warn("Unable to put an empty animation for " + livingMotion);
TiedUpRigConstants.LOGGER.warn("Unable to put an empty animation for " + livingMotion);
return;
}
@@ -608,4 +608,4 @@ public class ClientAnimator extends Animator {
return new EntityState(stateMap);
}
}
}

2
src/main/java/com/tiedup/remake/rig/anim/client/Layer.java
View File

@@ -356,4 +356,4 @@ public class Layer {
return this.ordinal() >= priority.ordinal();
}
}
}
}

2
src/main/java/com/tiedup/remake/rig/anim/client/property/ClientAnimationProperties.java
View File

@@ -48,4 +48,4 @@ public class ClientAnimationProperties {
* Multilayer for living animations (e.g. Greatsword holding animation should be played simultaneously with jumping animation)
*/
public static final StaticAnimationProperty<DirectStaticAnimation> MULTILAYER_ANIMATION = new StaticAnimationProperty<DirectStaticAnimation> ();
}
}

2
src/main/java/com/tiedup/remake/rig/anim/client/property/JointMask.java
View File

@@ -101,4 +101,4 @@ public class JointMask {
return jointMaskSet;
}
}
}
}

2
src/main/java/com/tiedup/remake/rig/anim/client/property/JointMaskEntry.java
View File

@@ -106,4 +106,4 @@ public class JointMaskEntry {
return new JointMaskEntry(this.defaultMask, this.masks);
}
}
}
}

6
src/main/java/com/tiedup/remake/rig/anim/client/property/JointMaskReloadListener.java
View File

@@ -24,12 +24,12 @@ import net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener;
import net.minecraft.util.profiling.ProfilerFiller;
import com.tiedup.remake.rig.anim.client.property.JointMask.BindModifier;
import com.tiedup.remake.rig.anim.client.property.JointMask.JointMaskSet;
import yesman.epicfight.main.EpicFightMod;
import com.tiedup.remake.rig.TiedUpRigConstants;
public class JointMaskReloadListener extends SimpleJsonResourceReloadListener {
private static final BiMap<ResourceLocation, JointMaskSet> JOINT_MASKS = HashBiMap.create();
private static final Map<String, JointMask.BindModifier> BIND_MODIFIERS = Maps.newHashMap();
private static final ResourceLocation NONE_MASK = EpicFightMod.identifier("none");
private static final ResourceLocation NONE_MASK = TiedUpRigConstants.identifier("none");
static {
BIND_MODIFIERS.put("keep_child_locrot", JointMask.KEEP_CHILD_LOCROT);
@@ -84,4 +84,4 @@ public class JointMaskReloadListener extends SimpleJsonResourceReloadListener {
JOINT_MASKS.put(key, JointMaskSet.of(masks));
}
}
}
}

2
src/main/java/com/tiedup/remake/rig/anim/client/property/LayerInfo.java
View File

@@ -18,4 +18,4 @@ public class LayerInfo {
this.priority = priority;
this.layerType = layerType;
}
}
}

2
src/main/java/com/tiedup/remake/rig/anim/property/AnimationEvent.java
View File

@@ -241,4 +241,4 @@ public abstract class AnimationEvent<EVENT extends AnimationEvent.Event<?, ?, ?,
public interface E10<A, B, C, D, E, F, G, H, I, J> extends Event<A, B, C, D, E, F, G, H, I, J> {
void fire(LivingEntityPatch<?> entitypatch, AssetAccessor<? extends StaticAnimation> animation, AnimationParameters<A, B, C, D, E, F, G, H, I, J> params);
}
}
}

6
src/main/java/com/tiedup/remake/rig/anim/property/AnimationProperty.java
View File

@@ -41,7 +41,7 @@ import yesman.epicfight.api.physics.ik.InverseKinematicsSimulator.InverseKinemat
import com.tiedup.remake.rig.util.HitEntityList.Priority;
import com.tiedup.remake.rig.util.TimePairList;
import com.tiedup.remake.rig.math.ValueModifier;
import yesman.epicfight.main.EpicFightMod;
import com.tiedup.remake.rig.TiedUpRigConstants;
import yesman.epicfight.particle.HitParticleType;
import yesman.epicfight.skill.BasicAttack;
import com.tiedup.remake.rig.patch.LivingEntityPatch;
@@ -82,7 +82,7 @@ public abstract class AnimationProperty<T> {
}
public T parseFrom(JsonElement e) {
return this.codecs.parse(JsonOps.INSTANCE, e).resultOrPartial((errm) -> EpicFightMod.LOGGER.warn("Failed to parse property " + this.name + " because of " + errm)).orElseThrow();
return this.codecs.parse(JsonOps.INSTANCE, e).resultOrPartial((errm) -> TiedUpRigConstants.LOGGER.warn("Failed to parse property " + this.name + " because of " + errm)).orElseThrow();
}
public Codec<T> getCodecs() {
@@ -378,4 +378,4 @@ public abstract class AnimationProperty<T> {
public interface YRotProvider {
float get(DynamicAnimation self, LivingEntityPatch<?> entitypatch);
}
}
}

2
src/main/java/com/tiedup/remake/rig/anim/property/MoveCoordFunctions.java
View File

@@ -472,4 +472,4 @@ public class MoveCoordFunctions {
}
}
};
}
}

6
src/main/java/com/tiedup/remake/rig/anim/types/ActionAnimation.java
View File

@@ -43,7 +43,7 @@ import com.tiedup.remake.rig.math.MathUtils;
import com.tiedup.remake.rig.math.OpenMatrix4f;
import com.tiedup.remake.rig.math.Vec3f;
import com.tiedup.remake.rig.patch.LocalPlayerPatch;
import yesman.epicfight.main.EpicFightSharedConstants;
import com.tiedup.remake.rig.TiedUpRigConstants;
import yesman.epicfight.network.EpicFightNetworkManager;
import yesman.epicfight.network.client.CPSyncPlayerAnimationPosition;
import yesman.epicfight.network.server.SPSyncAnimationPosition;
@@ -237,7 +237,7 @@ public class ActionAnimation extends MainFrameAnimation {
playTime = playSpeedModifier.modify(this, entitypatch, playTime, 0.0F, playTime);
}
playTime = Math.abs(playTime) * EpicFightSharedConstants.A_TICK;
playTime = Math.abs(playTime) * TiedUpRigConstants.A_TICK;
float linkTime = (transitionTimeModifier > 0.0F) ? transitionTimeModifier + this.transitionTime : this.transitionTime;
float totalTime = playTime * (int)Math.ceil(linkTime / playTime);
@@ -402,4 +402,4 @@ public class ActionAnimation extends MainFrameAnimation {
public boolean shouldPlayerMove(LocalPlayerPatch playerpatch) {
return playerpatch.isLogicalClient();
}
}
}

4
src/main/java/com/tiedup/remake/rig/anim/types/AttackAnimation.java
View File

@@ -51,7 +51,7 @@ import com.tiedup.remake.rig.util.AttackResult;
import com.tiedup.remake.rig.util.HitEntityList;
import com.tiedup.remake.rig.math.MathUtils;
import com.tiedup.remake.rig.math.ValueModifier;
import yesman.epicfight.main.EpicFightSharedConstants;
import com.tiedup.remake.rig.TiedUpRigConstants;
import yesman.epicfight.particle.HitParticleType;
import com.tiedup.remake.rig.patch.HumanoidMobPatch;
import com.tiedup.remake.rig.patch.LivingEntityPatch;
@@ -426,7 +426,7 @@ public class AttackAnimation extends ActionAnimation {
@Override
public Object getModifiedLinkState(StateFactor<?> factor, Object val, LivingEntityPatch<?> entitypatch, float elapsedTime) {
if (factor == EntityState.ATTACKING && elapsedTime < this.getPlaySpeed(entitypatch, this) * EpicFightSharedConstants.A_TICK) {
if (factor == EntityState.ATTACKING && elapsedTime < this.getPlaySpeed(entitypatch, this) * TiedUpRigConstants.A_TICK) {
return false;
}

2
src/main/java/com/tiedup/remake/rig/anim/types/ConcurrentLinkAnimation.java
View File

@@ -176,4 +176,4 @@ public class ConcurrentLinkAnimation extends DynamicAnimation implements Animati
public boolean inRegistry() {
return false;
}
}
}

9
src/main/java/com/tiedup/remake/rig/anim/types/DynamicAnimation.java
View File

@@ -27,8 +27,7 @@ import com.tiedup.remake.rig.anim.types.EntityState.StateFactor;
import com.tiedup.remake.rig.asset.AssetAccessor;
import com.tiedup.remake.rig.anim.client.property.JointMaskEntry;
import com.tiedup.remake.rig.util.datastruct.TypeFlexibleHashMap;
import yesman.epicfight.main.EpicFightMod;
import yesman.epicfight.main.EpicFightSharedConstants;
import com.tiedup.remake.rig.TiedUpRigConstants;
import com.tiedup.remake.rig.patch.LivingEntityPatch;
public abstract class DynamicAnimation {
@@ -37,7 +36,7 @@ public abstract class DynamicAnimation {
protected AnimationClip animationClip;
public DynamicAnimation() {
this(EpicFightSharedConstants.GENERAL_ANIMATION_TRANSITION_TIME, false);
this(TiedUpRigConstants.GENERAL_ANIMATION_TRANSITION_TIME, false);
}
public DynamicAnimation(float transitionTime, boolean isRepeat) {
@@ -148,7 +147,7 @@ public abstract class DynamicAnimation {
}
public ResourceLocation getRegistryName() {
return EpicFightMod.identifier("");
return TiedUpRigConstants.identifier("");
}
public int getId() {
@@ -197,4 +196,4 @@ public abstract class DynamicAnimation {
@OnlyIn(Dist.CLIENT)
public void renderDebugging(PoseStack poseStack, MultiBufferSource buffer, LivingEntityPatch<?> entitypatch, float playTime, float partialTicks) {
}
}
}

2
src/main/java/com/tiedup/remake/rig/anim/types/EntityState.java
View File

@@ -143,4 +143,4 @@ public class EntityState {
public String toString() {
return this.stateMap.toString();
}
}
}

2
src/main/java/com/tiedup/remake/rig/anim/types/LayerOffAnimation.java
View File

@@ -121,4 +121,4 @@ public class LayerOffAnimation extends DynamicAnimation implements AnimationAcce
public boolean inRegistry() {
return false;
}
}
}

2
src/main/java/com/tiedup/remake/rig/anim/types/LinkAnimation.java
View File

@@ -241,4 +241,4 @@ public class LinkAnimation extends DynamicAnimation implements AnimationAccessor
public boolean inRegistry() {
return false;
}
}
}

2
src/main/java/com/tiedup/remake/rig/anim/types/MainFrameAnimation.java
View File

@@ -90,4 +90,4 @@ public class MainFrameAnimation extends StaticAnimation {
public Layer.Priority getPriority() {
return this.getProperty(ClientAnimationProperties.PRIORITY).orElse(Layer.Priority.HIGHEST);
}
}
}

6
src/main/java/com/tiedup/remake/rig/anim/types/MovementAnimation.java
View File

@@ -9,12 +9,12 @@ package com.tiedup.remake.rig.anim.types;
import com.tiedup.remake.rig.anim.AnimationManager.AnimationAccessor;
import com.tiedup.remake.rig.asset.AssetAccessor;
import com.tiedup.remake.rig.armature.Armature;
import yesman.epicfight.main.EpicFightSharedConstants;
import com.tiedup.remake.rig.TiedUpRigConstants;
import com.tiedup.remake.rig.patch.LivingEntityPatch;
public class MovementAnimation extends StaticAnimation {
public MovementAnimation(boolean isRepeat, AnimationAccessor<? extends MovementAnimation> accessor, AssetAccessor<? extends Armature> armature) {
super(EpicFightSharedConstants.GENERAL_ANIMATION_TRANSITION_TIME, isRepeat, accessor, armature);
super(TiedUpRigConstants.GENERAL_ANIMATION_TRANSITION_TIME, isRepeat, accessor, armature);
}
public MovementAnimation(float transitionTime, boolean isRepeat, AnimationAccessor<? extends MovementAnimation> accessor, AssetAccessor<? extends Armature> armature) {
@@ -47,4 +47,4 @@ public class MovementAnimation extends StaticAnimation {
public boolean canBePlayedReverse() {
return true;
}
}
}

13
src/main/java/com/tiedup/remake/rig/anim/types/StaticAnimation.java
View File

@@ -65,8 +65,7 @@ import com.tiedup.remake.rig.render.TiedUpRenderTypes;
import yesman.epicfight.client.renderer.RenderingTool;
import com.tiedup.remake.rig.render.item.RenderItemBase;
import yesman.epicfight.gameasset.Animations;
import yesman.epicfight.main.EpicFightMod;
import yesman.epicfight.main.EpicFightSharedConstants;
import com.tiedup.remake.rig.TiedUpRigConstants;
import com.tiedup.remake.rig.patch.LivingEntityPatch;
import com.tiedup.remake.rig.patch.PlayerPatch;
import yesman.epicfight.world.entity.eventlistener.AnimationBeginEvent;
@@ -104,13 +103,13 @@ public class StaticAnimation extends DynamicAnimation implements InverseKinemati
public StaticAnimation() {
super(0.0F, true);
this.resourceLocation = EpicFightMod.identifier("emtpy");
this.resourceLocation = TiedUpRigConstants.identifier("emtpy");
this.armature = null;
this.filehash = StringUtil.EMPTY_STRING;
}
public StaticAnimation(boolean isRepeat, AnimationAccessor<? extends StaticAnimation> accessor, AssetAccessor<? extends Armature> armature) {
this(EpicFightSharedConstants.GENERAL_ANIMATION_TRANSITION_TIME, isRepeat, accessor, armature);
this(TiedUpRigConstants.GENERAL_ANIMATION_TRANSITION_TIME, isRepeat, accessor, armature);
}
public StaticAnimation(float transitionTime, boolean isRepeat, AnimationAccessor<? extends StaticAnimation> accessor, AssetAccessor<? extends Armature> armature) {
@@ -193,7 +192,7 @@ public class StaticAnimation extends DynamicAnimation implements InverseKinemati
}
playTime = Math.abs(playTime);
playTime *= EpicFightSharedConstants.A_TICK;
playTime *= TiedUpRigConstants.A_TICK;
float linkTime = transitionTimeModifier > 0.0F ? transitionTimeModifier + this.transitionTime : this.transitionTime;
float totalTime = playTime * (int)Math.ceil(linkTime / playTime);
@@ -620,7 +619,7 @@ public class StaticAnimation extends DynamicAnimation implements InverseKinemati
for (BakedInverseKinematicsDefinition bakedIKInfo : this.getProperty(StaticAnimationProperty.BAKED_IK_DEFINITION).orElse(null)) {
ikSimulatable.getIKSimulator().getRunningObject(bakedIKInfo.endJoint()).ifPresent((ikObjet) -> {
VertexConsumer vertexBuilder = buffer.getBuffer(EpicFightRenderTypes.debugQuads());
VertexConsumer vertexBuilder = buffer.getBuffer(TiedUpRenderTypes.debugQuads());
Vec3f worldtargetpos = ikObjet.getDestination();
Vec3f modeltargetpos = OpenMatrix4f.transform3v(toModelPos, worldtargetpos, null).multiply(-1.0F, 1.0F, -1.0F);
RenderingTool.drawQuad(poseStack, vertexBuilder, modeltargetpos, 0.5F, 1.0F, 0.0F, 0.0F);
@@ -643,4 +642,4 @@ public class StaticAnimation extends DynamicAnimation implements InverseKinemati
public InverseKinematicsObject createSimulationData(InverseKinematicsProvider provider, InverseKinematicsSimulatable simOwner, InverseKinematicsSimulator.InverseKinematicsBuilder simBuilder) {
return new InverseKinematicsObject(simBuilder);
}
}
}