diff --git a/src/main/java/com/tiedup/remake/rig/TiedUpRigConstants.java b/src/main/java/com/tiedup/remake/rig/TiedUpRigConstants.java new file mode 100644 index 0000000..2e30a5f --- /dev/null +++ b/src/main/java/com/tiedup/remake/rig/TiedUpRigConstants.java @@ -0,0 +1,114 @@ +/* + * Derived from Epic Fight (https://github.com/Epic-Fight/epicfight) + * by the Epic Fight Team, licensed under GPLv3. + * Modifications © 2026 TiedUp! Remake Contributors, distributed under GPLv3. + */ + +package com.tiedup.remake.rig; + +import com.mojang.logging.LogUtils; +import com.tiedup.remake.core.TiedUpMod; +import com.tiedup.remake.rig.anim.Animator; +import com.tiedup.remake.rig.anim.ServerAnimator; +import com.tiedup.remake.rig.patch.LivingEntityPatch; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.fml.loading.FMLEnvironment; +import org.slf4j.Logger; + +import java.util.function.Function; + +/** + * Remplace {@code yesman.epicfight.main.EpicFightMod} + {@code EpicFightSharedConstants} + * du fork upstream. Expose les singletons nécessaires au runtime RIG : + * + * + * + *

Pattern lazy method-ref : {@code ClientAnimator::getAnimator} n'est chargé + * que si {@link #isPhysicalClient()} est true. Sur serveur dedié, la classe + * client n'est jamais référencée, donc jamais chargée → pas de + * {@code NoClassDefFoundError}.

+ */ +public final class TiedUpRigConstants { + + public static final String MODID = TiedUpMod.MOD_ID; + public static final Logger LOGGER = LogUtils.getLogger(); + + /** Détection dev env (Gradle runClient) — utilisé pour les logs debug EF. */ + public static final boolean IS_DEV_ENV = !FMLEnvironment.production; + + /** Durée d'un tick MC en secondes (20 TPS). */ + public static final float A_TICK = 1.0F / 20.0F; + + /** Durée de transition inter-animation par défaut (en ticks). */ + public static final int GENERAL_ANIMATION_TRANSITION_TIME = 6; + + /** Nombre max de joints supportés par une armature (limite matrice pool). */ + public static final int MAX_JOINTS = 128; + + /** + * Factory lazy : crée un Animator approprié au side runtime courant. + * Client → ClientAnimator (à créer Phase 2) + * Server → ServerAnimator (forké verbatim EF) + * + *

Note Phase 0 : ClientAnimator n'est pas encore forké/créé + * (Phase 2). Tant que c'est le cas, on retourne ServerAnimator des deux + * côtés. Remplacer par {@code ClientAnimator::getAnimator} quand + * disponible.

+ */ + public static final Function, Animator> ANIMATOR_PROVIDER = + isPhysicalClient() + ? ServerAnimator::getAnimator // TODO Phase 2 : ClientAnimator::getAnimator + : ServerAnimator::getAnimator; + + private TiedUpRigConstants() {} + + public static ResourceLocation identifier(String path) { + return ResourceLocation.fromNamespaceAndPath(MODID, path); + } + + /** Alias d'{@link #identifier(String)} — équivalent TiedUpRigConstants.prefix upstream. */ + public static ResourceLocation prefix(String path) { + return identifier(path); + } + + public static boolean isPhysicalClient() { + return FMLEnvironment.dist == Dist.CLIENT; + } + + /** + * En dev env : log un message + throw l'exception fournie. + * En prod : log WARN seulement. Équivalent EF {@code TiedUpRigConstants.stacktraceIfDevSide}. + */ + public static void stacktraceIfDevSide( + String message, + java.util.function.Function exceptionFactory + ) { + if (IS_DEV_ENV) { + throw exceptionFactory.apply(message); + } else { + LOGGER.warn(message); + } + } + + /** + * En dev env : log via le consumer + throw l'exception. + * En prod : log seulement. Équivalent EF {@code TiedUpRigConstants.logAndStacktraceIfDevSide}. + */ + public static void logAndStacktraceIfDevSide( + java.util.function.BiConsumer logAction, + String message, + java.util.function.Function exceptionFactory + ) { + logAction.accept(LOGGER, message); + if (IS_DEV_ENV) { + throw exceptionFactory.apply(message); + } + } +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/AnimationClip.java b/src/main/java/com/tiedup/remake/rig/anim/AnimationClip.java index 54a6ec9..66c622d 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/AnimationClip.java +++ b/src/main/java/com/tiedup/remake/rig/anim/AnimationClip.java @@ -137,4 +137,4 @@ public class AnimationClip { public float getClipTime() { return this.clipTime; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/AnimationManager.java b/src/main/java/com/tiedup/remake/rig/anim/AnimationManager.java index 0151aa7..1b2d49b 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/AnimationManager.java +++ b/src/main/java/com/tiedup/remake/rig/anim/AnimationManager.java @@ -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 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 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 { 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 { accessor.doOrThrow(StaticAnimation::postInit); - if (EpicFightSharedConstants.isPhysicalClient()) { + if (TiedUpRigConstants.isPhysicalClient()) { AnimationManager.readAnimationProperties(accessor.get()); } }); @@ -278,7 +277,7 @@ public class AnimationManager extends SimplePreparableReloadListener 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(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/Keyframe.java b/src/main/java/com/tiedup/remake/rig/anim/Keyframe.java index 9c92023..afe17cc 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/Keyframe.java +++ b/src/main/java/com/tiedup/remake/rig/anim/Keyframe.java @@ -44,4 +44,4 @@ public class Keyframe { public static Keyframe empty() { return new Keyframe(0.0F, JointTransform.empty()); } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/LivingMotion.java b/src/main/java/com/tiedup/remake/rig/anim/LivingMotion.java index b93a172..e55c2c9 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/LivingMotion.java +++ b/src/main/java/com/tiedup/remake/rig/anim/LivingMotion.java @@ -21,4 +21,4 @@ public interface LivingMotion extends ExtendableEnum { return this == livingMotion; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/LivingMotions.java b/src/main/java/com/tiedup/remake/rig/anim/LivingMotions.java index 767156b..b57686e 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/LivingMotions.java +++ b/src/main/java/com/tiedup/remake/rig/anim/LivingMotions.java @@ -20,4 +20,4 @@ public enum LivingMotions implements LivingMotion { public int universalOrdinal() { return this.id; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/Pose.java b/src/main/java/com/tiedup/remake/rig/anim/Pose.java index 93eb1b4..a05bb6b 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/Pose.java +++ b/src/main/java/com/tiedup/remake/rig/anim/Pose.java @@ -110,4 +110,4 @@ public class Pose { public enum LoadOperation { SET, OVERWRITE, APPEND_ABSENT } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/ServerAnimator.java b/src/main/java/com/tiedup/remake/rig/anim/ServerAnimator.java index 10c7d0b..219308d 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/ServerAnimator.java +++ b/src/main/java/com/tiedup/remake/rig/anim/ServerAnimator.java @@ -157,4 +157,4 @@ public class ServerAnimator extends Animator { public void setHardPause(boolean paused) { this.hardPaused = paused; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/SynchedAnimationVariableKey.java b/src/main/java/com/tiedup/remake/rig/anim/SynchedAnimationVariableKey.java index d9c88bb..8c8e38b 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/SynchedAnimationVariableKey.java +++ b/src/main/java/com/tiedup/remake/rig/anim/SynchedAnimationVariableKey.java @@ -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 { 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>, IForgeRegistry.CreateCallback>, IForgeRegistry.ClearCallback> { private static final SynchedAnimationVariableKeyCallbacks INSTANCE = new SynchedAnimationVariableKeyCallbacks(); @@ -127,4 +127,4 @@ public interface SynchedAnimationVariableKey { return this.packetBufferCodec; } } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/SynchedAnimationVariableKeys.java b/src/main/java/com/tiedup/remake/rig/anim/SynchedAnimationVariableKeys.java index 7fe87d2..2ee8ded 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/SynchedAnimationVariableKeys.java +++ b/src/main/java/com/tiedup/remake/rig/anim/SynchedAnimationVariableKeys.java @@ -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>> BUILDER = () -> new RegistryBuilder>().addCallback(SynchedAnimationVariableKey.getRegistryCallback()); - public static final DeferredRegister> SYNCHED_ANIMATION_VARIABLE_KEYS = DeferredRegister.create(EpicFightMod.identifier("synched_animation_variable_keys"), EpicFightMod.MODID); + public static final DeferredRegister> SYNCHED_ANIMATION_VARIABLE_KEYS = DeferredRegister.create(TiedUpRigConstants.identifier("synched_animation_variable_keys"), TiedUpRigConstants.MODID); public static final Supplier>> REGISTRY = SYNCHED_ANIMATION_VARIABLE_KEYS.makeRegistry(BUILDER); public static final RegistryObject> DESTINATION = SYNCHED_ANIMATION_VARIABLE_KEYS.register("destination", () -> diff --git a/src/main/java/com/tiedup/remake/rig/anim/TransformSheet.java b/src/main/java/com/tiedup/remake/rig/anim/TransformSheet.java index 180a81b..17a792c 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/TransformSheet.java +++ b/src/main/java/com/tiedup/remake/rig/anim/TransformSheet.java @@ -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); } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/client/AnimationSubFileReader.java b/src/main/java/com/tiedup/remake/rig/anim/client/AnimationSubFileReader.java index e3eb0dd..b6431ab 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/client/AnimationSubFileReader.java +++ b/src/main/java/com/tiedup/remake/rig/anim/client/AnimationSubFileReader.java @@ -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")) { diff --git a/src/main/java/com/tiedup/remake/rig/anim/client/ClientAnimator.java b/src/main/java/com/tiedup/remake/rig/anim/client/ClientAnimator.java index 4d397bc..bc28d68 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/client/ClientAnimator.java +++ b/src/main/java/com/tiedup/remake/rig/anim/client/ClientAnimator.java @@ -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 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); } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/client/Layer.java b/src/main/java/com/tiedup/remake/rig/anim/client/Layer.java index 32af2c4..9784bbf 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/client/Layer.java +++ b/src/main/java/com/tiedup/remake/rig/anim/client/Layer.java @@ -356,4 +356,4 @@ public class Layer { return this.ordinal() >= priority.ordinal(); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/client/property/ClientAnimationProperties.java b/src/main/java/com/tiedup/remake/rig/anim/client/property/ClientAnimationProperties.java index 8f99781..373ab00 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/client/property/ClientAnimationProperties.java +++ b/src/main/java/com/tiedup/remake/rig/anim/client/property/ClientAnimationProperties.java @@ -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 MULTILAYER_ANIMATION = new StaticAnimationProperty (); -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/client/property/JointMask.java b/src/main/java/com/tiedup/remake/rig/anim/client/property/JointMask.java index ed141db..e55caa6 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/client/property/JointMask.java +++ b/src/main/java/com/tiedup/remake/rig/anim/client/property/JointMask.java @@ -101,4 +101,4 @@ public class JointMask { return jointMaskSet; } } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/client/property/JointMaskEntry.java b/src/main/java/com/tiedup/remake/rig/anim/client/property/JointMaskEntry.java index 3fa8a22..a82e7bf 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/client/property/JointMaskEntry.java +++ b/src/main/java/com/tiedup/remake/rig/anim/client/property/JointMaskEntry.java @@ -106,4 +106,4 @@ public class JointMaskEntry { return new JointMaskEntry(this.defaultMask, this.masks); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/client/property/JointMaskReloadListener.java b/src/main/java/com/tiedup/remake/rig/anim/client/property/JointMaskReloadListener.java index 4c4d9e0..aa70601 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/client/property/JointMaskReloadListener.java +++ b/src/main/java/com/tiedup/remake/rig/anim/client/property/JointMaskReloadListener.java @@ -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 JOINT_MASKS = HashBiMap.create(); private static final Map 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)); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/client/property/LayerInfo.java b/src/main/java/com/tiedup/remake/rig/anim/client/property/LayerInfo.java index 79ee16a..c23e32e 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/client/property/LayerInfo.java +++ b/src/main/java/com/tiedup/remake/rig/anim/client/property/LayerInfo.java @@ -18,4 +18,4 @@ public class LayerInfo { this.priority = priority; this.layerType = layerType; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/property/AnimationEvent.java b/src/main/java/com/tiedup/remake/rig/anim/property/AnimationEvent.java index c2841f2..b403192 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/property/AnimationEvent.java +++ b/src/main/java/com/tiedup/remake/rig/anim/property/AnimationEvent.java @@ -241,4 +241,4 @@ public abstract class AnimationEvent extends Event { void fire(LivingEntityPatch entitypatch, AssetAccessor animation, AnimationParameters params); } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/property/AnimationProperty.java b/src/main/java/com/tiedup/remake/rig/anim/property/AnimationProperty.java index cd9e07c..f52c26e 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/property/AnimationProperty.java +++ b/src/main/java/com/tiedup/remake/rig/anim/property/AnimationProperty.java @@ -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 { } 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 getCodecs() { @@ -378,4 +378,4 @@ public abstract class AnimationProperty { public interface YRotProvider { float get(DynamicAnimation self, LivingEntityPatch entitypatch); } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/property/MoveCoordFunctions.java b/src/main/java/com/tiedup/remake/rig/anim/property/MoveCoordFunctions.java index 8ffd9c6..0d068cf 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/property/MoveCoordFunctions.java +++ b/src/main/java/com/tiedup/remake/rig/anim/property/MoveCoordFunctions.java @@ -472,4 +472,4 @@ public class MoveCoordFunctions { } } }; -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/types/ActionAnimation.java b/src/main/java/com/tiedup/remake/rig/anim/types/ActionAnimation.java index 9888c5a..e1b613c 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/types/ActionAnimation.java +++ b/src/main/java/com/tiedup/remake/rig/anim/types/ActionAnimation.java @@ -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(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/types/AttackAnimation.java b/src/main/java/com/tiedup/remake/rig/anim/types/AttackAnimation.java index abe50f5..c1bc7d5 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/types/AttackAnimation.java +++ b/src/main/java/com/tiedup/remake/rig/anim/types/AttackAnimation.java @@ -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; } diff --git a/src/main/java/com/tiedup/remake/rig/anim/types/ConcurrentLinkAnimation.java b/src/main/java/com/tiedup/remake/rig/anim/types/ConcurrentLinkAnimation.java index aed93ea..719b770 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/types/ConcurrentLinkAnimation.java +++ b/src/main/java/com/tiedup/remake/rig/anim/types/ConcurrentLinkAnimation.java @@ -176,4 +176,4 @@ public class ConcurrentLinkAnimation extends DynamicAnimation implements Animati public boolean inRegistry() { return false; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/types/DynamicAnimation.java b/src/main/java/com/tiedup/remake/rig/anim/types/DynamicAnimation.java index 806fe00..b7a20da 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/types/DynamicAnimation.java +++ b/src/main/java/com/tiedup/remake/rig/anim/types/DynamicAnimation.java @@ -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) { } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/types/EntityState.java b/src/main/java/com/tiedup/remake/rig/anim/types/EntityState.java index 47c5f81..4b44ce3 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/types/EntityState.java +++ b/src/main/java/com/tiedup/remake/rig/anim/types/EntityState.java @@ -143,4 +143,4 @@ public class EntityState { public String toString() { return this.stateMap.toString(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/types/LayerOffAnimation.java b/src/main/java/com/tiedup/remake/rig/anim/types/LayerOffAnimation.java index 83211a7..854d29a 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/types/LayerOffAnimation.java +++ b/src/main/java/com/tiedup/remake/rig/anim/types/LayerOffAnimation.java @@ -121,4 +121,4 @@ public class LayerOffAnimation extends DynamicAnimation implements AnimationAcce public boolean inRegistry() { return false; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/types/LinkAnimation.java b/src/main/java/com/tiedup/remake/rig/anim/types/LinkAnimation.java index 3650a7a..e3e6c43 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/types/LinkAnimation.java +++ b/src/main/java/com/tiedup/remake/rig/anim/types/LinkAnimation.java @@ -241,4 +241,4 @@ public class LinkAnimation extends DynamicAnimation implements AnimationAccessor public boolean inRegistry() { return false; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/types/MainFrameAnimation.java b/src/main/java/com/tiedup/remake/rig/anim/types/MainFrameAnimation.java index 4dbde36..56cadcf 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/types/MainFrameAnimation.java +++ b/src/main/java/com/tiedup/remake/rig/anim/types/MainFrameAnimation.java @@ -90,4 +90,4 @@ public class MainFrameAnimation extends StaticAnimation { public Layer.Priority getPriority() { return this.getProperty(ClientAnimationProperties.PRIORITY).orElse(Layer.Priority.HIGHEST); } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/types/MovementAnimation.java b/src/main/java/com/tiedup/remake/rig/anim/types/MovementAnimation.java index b3dc92c..fab84e1 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/types/MovementAnimation.java +++ b/src/main/java/com/tiedup/remake/rig/anim/types/MovementAnimation.java @@ -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 accessor, AssetAccessor 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 accessor, AssetAccessor armature) { @@ -47,4 +47,4 @@ public class MovementAnimation extends StaticAnimation { public boolean canBePlayedReverse() { return true; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/anim/types/StaticAnimation.java b/src/main/java/com/tiedup/remake/rig/anim/types/StaticAnimation.java index a3b13b1..6e369c1 100644 --- a/src/main/java/com/tiedup/remake/rig/anim/types/StaticAnimation.java +++ b/src/main/java/com/tiedup/remake/rig/anim/types/StaticAnimation.java @@ -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 accessor, AssetAccessor 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 accessor, AssetAccessor 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); } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/armature/Armature.java b/src/main/java/com/tiedup/remake/rig/armature/Armature.java index f988e40..ae0d022 100644 --- a/src/main/java/com/tiedup/remake/rig/armature/Armature.java +++ b/src/main/java/com/tiedup/remake/rig/armature/Armature.java @@ -23,8 +23,7 @@ import com.tiedup.remake.rig.armature.JointTransform; import com.tiedup.remake.rig.anim.Pose; import com.tiedup.remake.rig.asset.JsonAssetLoader; import com.tiedup.remake.rig.math.OpenMatrix4f; -import yesman.epicfight.main.EpicFightMod; -import yesman.epicfight.main.EpicFightSharedConstants; +import com.tiedup.remake.rig.TiedUpRigConstants; public class Armature { private final String name; @@ -52,8 +51,8 @@ public class Armature { protected Joint getOrLogException(Map jointMap, String name) { if (!jointMap.containsKey(name)) { - if (EpicFightSharedConstants.IS_DEV_ENV) { - EpicFightMod.LOGGER.debug("Cannot find the joint named " + name + " in " + this.getClass().getCanonicalName()); + if (TiedUpRigConstants.IS_DEV_ENV) { + TiedUpRigConstants.LOGGER.debug("Cannot find the joint named " + name + " in " + this.getClass().getCanonicalName()); } return Joint.EMPTY; diff --git a/src/main/java/com/tiedup/remake/rig/armature/HumanoidArmature.java b/src/main/java/com/tiedup/remake/rig/armature/HumanoidArmature.java index b3418be..7cd4602 100644 --- a/src/main/java/com/tiedup/remake/rig/armature/HumanoidArmature.java +++ b/src/main/java/com/tiedup/remake/rig/armature/HumanoidArmature.java @@ -116,4 +116,4 @@ public class HumanoidArmature extends Armature implements HumanLikeArmature { public Joint headJoint() { return this.head; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/armature/JointTransform.java b/src/main/java/com/tiedup/remake/rig/armature/JointTransform.java index a8a0f5b..294b55a 100644 --- a/src/main/java/com/tiedup/remake/rig/armature/JointTransform.java +++ b/src/main/java/com/tiedup/remake/rig/armature/JointTransform.java @@ -212,4 +212,4 @@ public class JointTransform { public static JointTransform empty() { return new JointTransform(new Vec3f(0.0F, 0.0F, 0.0F), new Quaternionf(0.0F, 0.0F, 0.0F, 1.0F), new Vec3f(1.0F, 1.0F, 1.0F)); } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/asset/AssetAccessor.java b/src/main/java/com/tiedup/remake/rig/asset/AssetAccessor.java index 57e3d49..b9a6504 100644 --- a/src/main/java/com/tiedup/remake/rig/asset/AssetAccessor.java +++ b/src/main/java/com/tiedup/remake/rig/asset/AssetAccessor.java @@ -66,4 +66,4 @@ public interface AssetAccessor extends Supplier { throw new NoSuchElementException("No asset " + this.registryName()); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/asset/JsonAssetLoader.java b/src/main/java/com/tiedup/remake/rig/asset/JsonAssetLoader.java index 24d83bd..a0e07bc 100644 --- a/src/main/java/com/tiedup/remake/rig/asset/JsonAssetLoader.java +++ b/src/main/java/com/tiedup/remake/rig/asset/JsonAssetLoader.java @@ -71,8 +71,7 @@ import com.tiedup.remake.rig.math.OpenMatrix4f; import com.tiedup.remake.rig.math.Vec3f; import com.tiedup.remake.rig.math.Vec4f; import yesman.epicfight.gameasset.Armatures.ArmatureContructor; -import yesman.epicfight.main.EpicFightMod; -import yesman.epicfight.main.EpicFightSharedConstants; +import com.tiedup.remake.rig.TiedUpRigConstants; public class JsonAssetLoader { public static final OpenMatrix4f BLENDER_TO_MINECRAFT_COORD = OpenMatrix4f.createRotatorDeg(-90.0F, Vec3f.X_AXIS); @@ -111,7 +110,7 @@ public class JsonAssetLoader { InputStream inputStream = modClass.getResourceAsStream("/assets/" + resourceLocation.getNamespace() + "/" + resourceLocation.getPath()); if (inputStream == null) { - modClass = ModList.get().getModObjectById(EpicFightMod.MODID).get().getClass(); + modClass = ModList.get().getModObjectById(TiedUpRigConstants.MODID).get().getClass(); inputStream = modClass.getResourceAsStream("/assets/" + resourceLocation.getNamespace() + "/" + resourceLocation.getPath()); } @@ -576,7 +575,7 @@ public class JsonAssetLoader { } if (animation.getArmature() == null) { - EpicFightMod.LOGGER.error("Animation " + animation + " doesn't have an armature."); + TiedUpRigConstants.LOGGER.error("Animation " + animation + " doesn't have an armature."); } TransformFormat format = getAsTransformFormatOrDefault(this.rootJson, "format"); @@ -625,7 +624,7 @@ public class JsonAssetLoader { root = false; continue; } else { - EpicFightMod.LOGGER.debug("[EpicFightMod] No joint named " + name + " in " + animation); + TiedUpRigConstants.LOGGER.debug("[EpicFightMod] No joint named " + name + " in " + animation); continue; } } @@ -654,7 +653,7 @@ public class JsonAssetLoader { boolean root = true; if (animation.getArmature() == null) { - EpicFightMod.LOGGER.error("Animation " + animation + " doesn't have an armature."); + TiedUpRigConstants.LOGGER.error("Animation " + animation + " doesn't have an armature."); } Armature armature = animation.getArmature().get(); @@ -666,8 +665,8 @@ public class JsonAssetLoader { Joint joint = armature.searchJointByName(name); if (joint == null) { - if (EpicFightSharedConstants.IS_DEV_ENV) { - EpicFightMod.LOGGER.debug(animation.getRegistryName() + ": No joint named " + name + " in armature"); + if (TiedUpRigConstants.IS_DEV_ENV) { + TiedUpRigConstants.LOGGER.debug(animation.getRegistryName() + ": No joint named " + name + " in armature"); } continue; @@ -830,4 +829,4 @@ public class JsonAssetLoader { public enum TransformFormat { MATRIX, ATTRIBUTES } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/cloth/AbstractSimulator.java b/src/main/java/com/tiedup/remake/rig/cloth/AbstractSimulator.java index 5a6726c..5fc5534 100644 --- a/src/main/java/com/tiedup/remake/rig/cloth/AbstractSimulator.java +++ b/src/main/java/com/tiedup/remake/rig/cloth/AbstractSimulator.java @@ -132,4 +132,4 @@ public abstract class AbstractSimulator { - public static final ResourceLocation PLAYER_CLOAK = EpicFightMod.identifier("ingame_cloak"); - public static final ResourceLocation MODELPREVIEWER_CLOAK = EpicFightMod.identifier("previewer_cloak"); + public static final ResourceLocation PLAYER_CLOAK = TiedUpRigConstants.identifier("ingame_cloak"); + public static final ResourceLocation MODELPREVIEWER_CLOAK = TiedUpRigConstants.identifier("previewer_cloak"); private static final float SPATIAL_HASH_SPACING = 0.05F; public static class ClothObjectBuilder extends SimulationObject.SimulationObjectBuilder { @@ -99,7 +98,7 @@ public class ClothSimulator extends AbstractSimulator getRenderer() { return this.renderer; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/event/RegisterResourceLayersEvent.java b/src/main/java/com/tiedup/remake/rig/event/RegisterResourceLayersEvent.java index 96d6dd9..cb69913 100644 --- a/src/main/java/com/tiedup/remake/rig/event/RegisterResourceLayersEvent.java +++ b/src/main/java/com/tiedup/remake/rig/event/RegisterResourceLayersEvent.java @@ -27,4 +27,4 @@ public class RegisterResourceLayersEvent layerAdder) { this.layersbyid.put(rl, layerAdder); } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/math/AnimationTransformEntry.java b/src/main/java/com/tiedup/remake/rig/math/AnimationTransformEntry.java index 22dd11f..c5c4b10 100644 --- a/src/main/java/com/tiedup/remake/rig/math/AnimationTransformEntry.java +++ b/src/main/java/com/tiedup/remake/rig/math/AnimationTransformEntry.java @@ -43,4 +43,4 @@ public class AnimationTransformEntry { return result; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/math/MathUtils.java b/src/main/java/com/tiedup/remake/rig/math/MathUtils.java index e4e4657..347402e 100644 --- a/src/main/java/com/tiedup/remake/rig/math/MathUtils.java +++ b/src/main/java/com/tiedup/remake/rig/math/MathUtils.java @@ -596,4 +596,4 @@ public class MathUtils { } private MathUtils() {} -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/math/MatrixOperation.java b/src/main/java/com/tiedup/remake/rig/math/MatrixOperation.java index 8cf46b6..46e9c6e 100644 --- a/src/main/java/com/tiedup/remake/rig/math/MatrixOperation.java +++ b/src/main/java/com/tiedup/remake/rig/math/MatrixOperation.java @@ -9,4 +9,4 @@ package com.tiedup.remake.rig.math; @FunctionalInterface public interface MatrixOperation { OpenMatrix4f mul(OpenMatrix4f left, OpenMatrix4f right, OpenMatrix4f dest); -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/math/OpenMatrix4f.java b/src/main/java/com/tiedup/remake/rig/math/OpenMatrix4f.java index 5343c6e..4775fc0 100644 --- a/src/main/java/com/tiedup/remake/rig/math/OpenMatrix4f.java +++ b/src/main/java/com/tiedup/remake/rig/math/OpenMatrix4f.java @@ -950,4 +950,4 @@ public class OpenMatrix4f { return matrixArray; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/math/QuaternionUtils.java b/src/main/java/com/tiedup/remake/rig/math/QuaternionUtils.java index 310653c..3d452e1 100644 --- a/src/main/java/com/tiedup/remake/rig/math/QuaternionUtils.java +++ b/src/main/java/com/tiedup/remake/rig/math/QuaternionUtils.java @@ -43,4 +43,4 @@ public class QuaternionUtils { return QuaternionUtils.rotationDegrees(axis, degrees); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/math/ValueModifier.java b/src/main/java/com/tiedup/remake/rig/math/ValueModifier.java index dcf05a7..99d5e42 100644 --- a/src/main/java/com/tiedup/remake/rig/math/ValueModifier.java +++ b/src/main/java/com/tiedup/remake/rig/math/ValueModifier.java @@ -136,4 +136,4 @@ public interface ValueModifier { return result; } } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/math/Vec2f.java b/src/main/java/com/tiedup/remake/rig/math/Vec2f.java index 031950d..36c1f6d 100644 --- a/src/main/java/com/tiedup/remake/rig/math/Vec2f.java +++ b/src/main/java/com/tiedup/remake/rig/math/Vec2f.java @@ -30,4 +30,4 @@ public class Vec2f { public String toString() { return "Vec2f[" + this.x + ", " + this.y + ", " + "]"; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/math/Vec3f.java b/src/main/java/com/tiedup/remake/rig/math/Vec3f.java index 6a037fc..fea6005 100644 --- a/src/main/java/com/tiedup/remake/rig/math/Vec3f.java +++ b/src/main/java/com/tiedup/remake/rig/math/Vec3f.java @@ -13,7 +13,7 @@ import org.joml.Quaternionf; import org.joml.Vector3f; import net.minecraft.world.phys.Vec3; -import yesman.epicfight.main.EpicFightMod; +import com.tiedup.remake.rig.TiedUpRigConstants; public class Vec3f extends Vec2f { public static final Vec3f X_AXIS = new Vec3f(1.0F, 0.0F, 0.0F); @@ -238,7 +238,7 @@ public class Vec3f extends Vec2f { float dotDivLength = Vec3f.dot(a, b) / (a.length() * b.length()); if (!Float.isFinite(dotDivLength)) { - EpicFightMod.LOGGER.info("Warning : given vector's length is zero"); + TiedUpRigConstants.LOGGER.info("Warning : given vector's length is zero"); (new IllegalArgumentException()).printStackTrace(); dotDivLength = 1.0F; } @@ -470,4 +470,4 @@ public class Vec3f extends Vec2f { OpenMatrix4f.transform3v(DEST, this, this); return this; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/math/Vec4f.java b/src/main/java/com/tiedup/remake/rig/math/Vec4f.java index 1fd42dc..c63dde5 100644 --- a/src/main/java/com/tiedup/remake/rig/math/Vec4f.java +++ b/src/main/java/com/tiedup/remake/rig/math/Vec4f.java @@ -72,4 +72,4 @@ public class Vec4f extends Vec3f { public String toString() { return "Vec4f[" + this.x + ", " + this.y + ", " + this.z + ", " + this.w + "]"; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/mesh/ClassicMesh.java b/src/main/java/com/tiedup/remake/rig/mesh/ClassicMesh.java index 27e1e81..de5433e 100644 --- a/src/main/java/com/tiedup/remake/rig/mesh/ClassicMesh.java +++ b/src/main/java/com/tiedup/remake/rig/mesh/ClassicMesh.java @@ -24,7 +24,7 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import com.tiedup.remake.rig.mesh.ClassicMesh.ClassicMeshPart; import com.tiedup.remake.rig.armature.Armature; import com.tiedup.remake.rig.math.OpenMatrix4f; -import yesman.epicfight.main.EpicFightMod; +import com.tiedup.remake.rig.TiedUpRigConstants; public class ClassicMesh extends StaticMesh { public ClassicMesh(Map arrayMap, Map> partBuilders, ClassicMesh parent, RenderProperties properties) { @@ -45,7 +45,7 @@ public class ClassicMesh extends StaticMesh { @Override protected ClassicMeshPart getOrLogException(Map parts, String name) { if (!parts.containsKey(name)) { - EpicFightMod.LOGGER.debug("Can not find the mesh part named " + name + " in " + this.getClass().getCanonicalName()); + TiedUpRigConstants.LOGGER.debug("Can not find the mesh part named " + name + " in " + this.getClass().getCanonicalName()); return null; } @@ -101,4 +101,4 @@ public class ClassicMesh extends StaticMesh { poseStack.popPose(); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/mesh/CompositeMesh.java b/src/main/java/com/tiedup/remake/rig/mesh/CompositeMesh.java index f747ee3..6860b7f 100644 --- a/src/main/java/com/tiedup/remake/rig/mesh/CompositeMesh.java +++ b/src/main/java/com/tiedup/remake/rig/mesh/CompositeMesh.java @@ -74,4 +74,4 @@ public class CompositeMesh implements Mesh, SoftBodyTranslatable { public Map getSoftBodySimulationInfo() { return this.softBodyMesh.getSoftBodySimulationInfo(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/mesh/HumanoidMesh.java b/src/main/java/com/tiedup/remake/rig/mesh/HumanoidMesh.java index 95270f1..e36409c 100644 --- a/src/main/java/com/tiedup/remake/rig/mesh/HumanoidMesh.java +++ b/src/main/java/com/tiedup/remake/rig/mesh/HumanoidMesh.java @@ -62,4 +62,4 @@ public class HumanoidMesh extends SkinnedMesh { return null; } } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/mesh/Mesh.java b/src/main/java/com/tiedup/remake/rig/mesh/Mesh.java index 6b7f143..6ee6342 100644 --- a/src/main/java/com/tiedup/remake/rig/mesh/Mesh.java +++ b/src/main/java/com/tiedup/remake/rig/mesh/Mesh.java @@ -45,7 +45,7 @@ public interface Mesh { /* Universal method */ default void draw(PoseStack poseStack, MultiBufferSource bufferSources, RenderType renderType, Mesh.DrawingFunction drawingFunction, int packedLight, float r, float g, float b, float a, int overlay, @Nullable Armature armature, OpenMatrix4f[] poses) { - this.drawPosed(poseStack, bufferSources.getBuffer(EpicFightRenderTypes.getTriangulated(renderType)), drawingFunction, packedLight, r, g, b, a, overlay, armature, poses); + this.drawPosed(poseStack, bufferSources.getBuffer(TiedUpRenderTypes.getTriangulated(renderType)), drawingFunction, packedLight, r, g, b, a, overlay, armature, poses); } public static record RenderProperties(ResourceLocation customTexturePath, Vec3f customColor, boolean isTransparent) { @@ -211,4 +211,4 @@ public interface Mesh { } } } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/mesh/MeshPart.java b/src/main/java/com/tiedup/remake/rig/mesh/MeshPart.java index 5373af6..d4ded76 100644 --- a/src/main/java/com/tiedup/remake/rig/mesh/MeshPart.java +++ b/src/main/java/com/tiedup/remake/rig/mesh/MeshPart.java @@ -57,7 +57,7 @@ public abstract class MeshPart { public VertexConsumer getBufferBuilder(RenderType renderType, MultiBufferSource bufferSource) { if (this.renderProperties.customTexturePath() != null) { - return bufferSource.getBuffer(EpicFightRenderTypes.replaceTexture(this.renderProperties.customTexturePath(), renderType)); + return bufferSource.getBuffer(TiedUpRenderTypes.replaceTexture(this.renderProperties.customTexturePath(), renderType)); } return bufferSource.getBuffer(renderType); @@ -86,4 +86,4 @@ public abstract class MeshPart { return COLOR; } } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/mesh/MeshPartDefinition.java b/src/main/java/com/tiedup/remake/rig/mesh/MeshPartDefinition.java index 8f3ecbf..6a28f0d 100644 --- a/src/main/java/com/tiedup/remake/rig/mesh/MeshPartDefinition.java +++ b/src/main/java/com/tiedup/remake/rig/mesh/MeshPartDefinition.java @@ -14,4 +14,4 @@ public interface MeshPartDefinition { String partName(); Mesh.RenderProperties renderProperties(); Supplier getModelPartAnimationProvider(); -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/mesh/Meshes.java b/src/main/java/com/tiedup/remake/rig/mesh/Meshes.java index 886f314..d307bc1 100644 --- a/src/main/java/com/tiedup/remake/rig/mesh/Meshes.java +++ b/src/main/java/com/tiedup/remake/rig/mesh/Meshes.java @@ -40,7 +40,7 @@ import com.tiedup.remake.rig.mesh.SpiderMesh; import com.tiedup.remake.rig.mesh.VexMesh; import com.tiedup.remake.rig.mesh.VillagerMesh; import com.tiedup.remake.rig.mesh.WitherMesh; -import yesman.epicfight.main.EpicFightMod; +import com.tiedup.remake.rig.TiedUpRigConstants; public class Meshes implements PreparableReloadListener { private static final Map> ACCESSORS = Maps.newHashMap(); @@ -51,40 +51,40 @@ public class Meshes implements PreparableReloadListener { public static final Meshes INSTANCE = new Meshes(); // Entities - public static final MeshAccessor ALEX = MeshAccessor.create(EpicFightMod.MODID, "entity/biped_slim_arm", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(HumanoidMesh::new)); - public static final MeshAccessor BIPED = MeshAccessor.create(EpicFightMod.MODID, "entity/biped", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(HumanoidMesh::new)); - public static final MeshAccessor BIPED_OLD_TEX = MeshAccessor.create(EpicFightMod.MODID, "entity/biped_old_texture", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(HumanoidMesh::new)); - public static final MeshAccessor BIPED_OUTLAYER = MeshAccessor.create(EpicFightMod.MODID, "entity/biped_outlayer", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(HumanoidMesh::new)); - public static final MeshAccessor VILLAGER_ZOMBIE = MeshAccessor.create(EpicFightMod.MODID, "entity/zombie_villager", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(VillagerMesh::new)); - public static final MeshAccessor CREEPER = MeshAccessor.create(EpicFightMod.MODID, "entity/creeper", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(CreeperMesh::new)); - public static final MeshAccessor ENDERMAN = MeshAccessor.create(EpicFightMod.MODID, "entity/enderman", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(EndermanMesh::new)); - public static final MeshAccessor SKELETON = MeshAccessor.create(EpicFightMod.MODID, "entity/skeleton", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(HumanoidMesh::new)); - public static final MeshAccessor SPIDER = MeshAccessor.create(EpicFightMod.MODID, "entity/spider", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(SpiderMesh::new)); - public static final MeshAccessor IRON_GOLEM = MeshAccessor.create(EpicFightMod.MODID, "entity/iron_golem", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(IronGolemMesh::new)); - public static final MeshAccessor ILLAGER = MeshAccessor.create(EpicFightMod.MODID, "entity/illager", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(VillagerMesh::new)); - public static final MeshAccessor WITCH = MeshAccessor.create(EpicFightMod.MODID, "entity/witch", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(VillagerMesh::new)); - public static final MeshAccessor RAVAGER = MeshAccessor.create(EpicFightMod.MODID, "entity/ravager",(jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(RavagerMesh::new)); - public static final MeshAccessor VEX = MeshAccessor.create(EpicFightMod.MODID, "entity/vex", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(VexMesh::new)); - public static final MeshAccessor PIGLIN = MeshAccessor.create(EpicFightMod.MODID, "entity/piglin", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(PiglinMesh::new)); - public static final MeshAccessor HOGLIN = MeshAccessor.create(EpicFightMod.MODID, "entity/hoglin", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(HoglinMesh::new)); - public static final MeshAccessor DRAGON = MeshAccessor.create(EpicFightMod.MODID, "entity/dragon", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(DragonMesh::new)); - public static final MeshAccessor WITHER = MeshAccessor.create(EpicFightMod.MODID, "entity/wither", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(WitherMesh::new)); + public static final MeshAccessor ALEX = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/biped_slim_arm", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(HumanoidMesh::new)); + public static final MeshAccessor BIPED = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/biped", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(HumanoidMesh::new)); + public static final MeshAccessor BIPED_OLD_TEX = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/biped_old_texture", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(HumanoidMesh::new)); + public static final MeshAccessor BIPED_OUTLAYER = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/biped_outlayer", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(HumanoidMesh::new)); + public static final MeshAccessor VILLAGER_ZOMBIE = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/zombie_villager", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(VillagerMesh::new)); + public static final MeshAccessor CREEPER = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/creeper", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(CreeperMesh::new)); + public static final MeshAccessor ENDERMAN = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/enderman", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(EndermanMesh::new)); + public static final MeshAccessor SKELETON = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/skeleton", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(HumanoidMesh::new)); + public static final MeshAccessor SPIDER = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/spider", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(SpiderMesh::new)); + public static final MeshAccessor IRON_GOLEM = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/iron_golem", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(IronGolemMesh::new)); + public static final MeshAccessor ILLAGER = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/illager", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(VillagerMesh::new)); + public static final MeshAccessor WITCH = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/witch", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(VillagerMesh::new)); + public static final MeshAccessor RAVAGER = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/ravager",(jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(RavagerMesh::new)); + public static final MeshAccessor VEX = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/vex", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(VexMesh::new)); + public static final MeshAccessor PIGLIN = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/piglin", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(PiglinMesh::new)); + public static final MeshAccessor HOGLIN = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/hoglin", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(HoglinMesh::new)); + public static final MeshAccessor DRAGON = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/dragon", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(DragonMesh::new)); + public static final MeshAccessor WITHER = MeshAccessor.create(TiedUpRigConstants.MODID, "entity/wither", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(WitherMesh::new)); // Armors - public static final MeshAccessor HELMET = MeshAccessor.create(EpicFightMod.MODID, "armor/helmet", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(SkinnedMesh::new)); - public static final MeshAccessor HELMET_PIGLIN = MeshAccessor.create(EpicFightMod.MODID, "armor/piglin_helmet", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(SkinnedMesh::new)); - public static final MeshAccessor HELMET_VILLAGER = MeshAccessor.create(EpicFightMod.MODID, "armor/villager_helmet", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(SkinnedMesh::new)); - public static final MeshAccessor CHESTPLATE = MeshAccessor.create(EpicFightMod.MODID, "armor/chestplate", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(SkinnedMesh::new)); - public static final MeshAccessor LEGGINS = MeshAccessor.create(EpicFightMod.MODID, "armor/leggins", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(SkinnedMesh::new)); - public static final MeshAccessor BOOTS = MeshAccessor.create(EpicFightMod.MODID, "armor/boots", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(SkinnedMesh::new)); + public static final MeshAccessor HELMET = MeshAccessor.create(TiedUpRigConstants.MODID, "armor/helmet", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(SkinnedMesh::new)); + public static final MeshAccessor HELMET_PIGLIN = MeshAccessor.create(TiedUpRigConstants.MODID, "armor/piglin_helmet", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(SkinnedMesh::new)); + public static final MeshAccessor HELMET_VILLAGER = MeshAccessor.create(TiedUpRigConstants.MODID, "armor/villager_helmet", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(SkinnedMesh::new)); + public static final MeshAccessor CHESTPLATE = MeshAccessor.create(TiedUpRigConstants.MODID, "armor/chestplate", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(SkinnedMesh::new)); + public static final MeshAccessor LEGGINS = MeshAccessor.create(TiedUpRigConstants.MODID, "armor/leggins", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(SkinnedMesh::new)); + public static final MeshAccessor BOOTS = MeshAccessor.create(TiedUpRigConstants.MODID, "armor/boots", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(SkinnedMesh::new)); // Particles - public static final MeshAccessor AIR_BURST = MeshAccessor.create(EpicFightMod.MODID, "particle/air_burst", (jsonModelLoader) -> jsonModelLoader.loadClassicMesh(ClassicMesh::new)); - public static final MeshAccessor FORCE_FIELD = MeshAccessor.create(EpicFightMod.MODID, "particle/force_field", (jsonModelLoader) -> jsonModelLoader.loadClassicMesh(ClassicMesh::new)); - public static final MeshAccessor LASER = MeshAccessor.create(EpicFightMod.MODID, "particle/laser", (jsonModelLoader) -> jsonModelLoader.loadClassicMesh(ClassicMesh::new)); + public static final MeshAccessor AIR_BURST = MeshAccessor.create(TiedUpRigConstants.MODID, "particle/air_burst", (jsonModelLoader) -> jsonModelLoader.loadClassicMesh(ClassicMesh::new)); + public static final MeshAccessor FORCE_FIELD = MeshAccessor.create(TiedUpRigConstants.MODID, "particle/force_field", (jsonModelLoader) -> jsonModelLoader.loadClassicMesh(ClassicMesh::new)); + public static final MeshAccessor LASER = MeshAccessor.create(TiedUpRigConstants.MODID, "particle/laser", (jsonModelLoader) -> jsonModelLoader.loadClassicMesh(ClassicMesh::new)); // Layers - public static final MeshAccessor CAPE_DEFAULT = MeshAccessor.create(EpicFightMod.MODID, "layer/default_cape", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(SkinnedMesh::new)); + public static final MeshAccessor CAPE_DEFAULT = MeshAccessor.create(TiedUpRigConstants.MODID, "layer/default_cape", (jsonModelLoader) -> jsonModelLoader.loadSkinnedMesh(SkinnedMesh::new)); public static void reload(ResourceManager resourceManager) { Meshes.resourceManager = resourceManager; @@ -222,4 +222,4 @@ public class Meshes implements PreparableReloadListener { } } } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/mesh/SingleGroupVertexBuilder.java b/src/main/java/com/tiedup/remake/rig/mesh/SingleGroupVertexBuilder.java index b964209..f7036e9 100644 --- a/src/main/java/com/tiedup/remake/rig/mesh/SingleGroupVertexBuilder.java +++ b/src/main/java/com/tiedup/remake/rig/mesh/SingleGroupVertexBuilder.java @@ -154,4 +154,4 @@ public class SingleGroupVertexBuilder { public enum State { EMPTY, EQUAL, DIFFERENT } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/mesh/SkinnedMesh.java b/src/main/java/com/tiedup/remake/rig/mesh/SkinnedMesh.java index 6de8ef4..27fe633 100644 --- a/src/main/java/com/tiedup/remake/rig/mesh/SkinnedMesh.java +++ b/src/main/java/com/tiedup/remake/rig/mesh/SkinnedMesh.java @@ -37,8 +37,7 @@ import com.tiedup.remake.rig.render.TiedUpRenderTypes; import yesman.epicfight.client.renderer.shader.compute.ComputeShaderSetup; import yesman.epicfight.client.renderer.shader.compute.loader.ComputeShaderProvider; import yesman.epicfight.config.ClientConfig; -import yesman.epicfight.main.EpicFightMod; -import yesman.epicfight.main.EpicFightSharedConstants; +import com.tiedup.remake.rig.TiedUpRigConstants; public class SkinnedMesh extends StaticMesh { protected final float[] weights; @@ -133,8 +132,8 @@ public class SkinnedMesh extends StaticMesh { @Override protected SkinnedMeshPart getOrLogException(Map parts, String name) { if (!parts.containsKey(name)) { - if (EpicFightSharedConstants.IS_DEV_ENV) { - EpicFightMod.LOGGER.debug("Cannot find the mesh part named " + name + " in " + this.getClass().getCanonicalName()); + if (TiedUpRigConstants.IS_DEV_ENV) { + TiedUpRigConstants.LOGGER.debug("Cannot find the mesh part named " + name + " in " + this.getClass().getCanonicalName()); } return null; @@ -248,9 +247,9 @@ public class SkinnedMesh extends StaticMesh { @Override public void draw(PoseStack poseStack, MultiBufferSource bufferSources, RenderType renderType, Mesh.DrawingFunction drawingFunction, int packedLight, float r, float g, float b, float a, int overlay, @Nullable Armature armature, OpenMatrix4f[] poses) { if (ClientConfig.activateComputeShader && this.computerShaderSetup != null) { - this.computerShaderSetup.drawWithShader(this, poseStack, bufferSources, EpicFightRenderTypes.getTriangulated(renderType), packedLight, r, g, b, a, overlay, armature, poses); + this.computerShaderSetup.drawWithShader(this, poseStack, bufferSources, TiedUpRenderTypes.getTriangulated(renderType), packedLight, r, g, b, a, overlay, armature, poses); } else { - this.drawPosed(poseStack, bufferSources.getBuffer(EpicFightRenderTypes.getTriangulated(renderType)), drawingFunction, packedLight, r, g, b, a, overlay, armature, poses); + this.drawPosed(poseStack, bufferSources.getBuffer(TiedUpRenderTypes.getTriangulated(renderType)), drawingFunction, packedLight, r, g, b, a, overlay, armature, poses); } } diff --git a/src/main/java/com/tiedup/remake/rig/mesh/StaticMesh.java b/src/main/java/com/tiedup/remake/rig/mesh/StaticMesh.java index ec06507..afd925a 100644 --- a/src/main/java/com/tiedup/remake/rig/mesh/StaticMesh.java +++ b/src/main/java/com/tiedup/remake/rig/mesh/StaticMesh.java @@ -147,4 +147,4 @@ public abstract class StaticMesh

implements Mesh, SoftBodyTr public ClothSimulator.ClothObject createSimulationData(@Nullable SoftBodyTranslatable provider, ClothSimulatable simObject, ClothSimulator.ClothObjectBuilder simBuilder) { return new ClothObject(simBuilder, provider == null ? this : provider, (Map)this.parts, this.positions); } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/mesh/VertexBuilder.java b/src/main/java/com/tiedup/remake/rig/mesh/VertexBuilder.java index 65e406d..0e55955 100644 --- a/src/main/java/com/tiedup/remake/rig/mesh/VertexBuilder.java +++ b/src/main/java/com/tiedup/remake/rig/mesh/VertexBuilder.java @@ -59,4 +59,4 @@ public class VertexBuilder { return result; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/patch/LocalPlayerPatch.java b/src/main/java/com/tiedup/remake/rig/patch/LocalPlayerPatch.java index 9d7131a..d09b780 100644 --- a/src/main/java/com/tiedup/remake/rig/patch/LocalPlayerPatch.java +++ b/src/main/java/com/tiedup/remake/rig/patch/LocalPlayerPatch.java @@ -48,7 +48,7 @@ import yesman.epicfight.client.events.engine.RenderEngine; import yesman.epicfight.client.gui.screen.SkillBookScreen; import yesman.epicfight.config.ClientConfig; import yesman.epicfight.gameasset.Animations; -import yesman.epicfight.main.EpicFightSharedConstants; +import com.tiedup.remake.rig.TiedUpRigConstants; import yesman.epicfight.network.EpicFightNetworkManager; import yesman.epicfight.network.client.CPAnimatorControl; import yesman.epicfight.network.client.CPChangePlayerMode; @@ -537,7 +537,7 @@ public class LocalPlayerPatch extends AbstractClientPlayerPatch { if (LocalPlayerPatch.this.povSettings != null && LocalPlayerPatch.this.povSettings.cameraTransform() != null) { this.linkCameraTransform.getKeyframes()[0].transform().copyFrom(LocalPlayerPatch.this.povSettings.cameraTransform().getInterpolatedTransform(this.animationPlayer.getElapsedTime())); this.linkCameraTransform.getKeyframes()[1].transform().copyFrom(JointTransform.empty()); - this.linkCameraTransform.getKeyframes()[1].setTime(EpicFightSharedConstants.GENERAL_ANIMATION_TRANSITION_TIME); + this.linkCameraTransform.getKeyframes()[1].setTime(TiedUpRigConstants.GENERAL_ANIMATION_TRANSITION_TIME); } super.off(LocalPlayerPatch.this); @@ -576,4 +576,4 @@ public class LocalPlayerPatch extends AbstractClientPlayerPatch { public void toggleLockOn() { this.setLockOn(!EpicFightCameraAPI.getInstance().isLockingOnTarget()); } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/render/TiedUpRenderTypes.java b/src/main/java/com/tiedup/remake/rig/render/TiedUpRenderTypes.java index 7b4d5ee..ea42c6f 100644 --- a/src/main/java/com/tiedup/remake/rig/render/TiedUpRenderTypes.java +++ b/src/main/java/com/tiedup/remake/rig/render/TiedUpRenderTypes.java @@ -30,9 +30,9 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.Entity; import net.minecraft.world.inventory.InventoryMenu; -import yesman.epicfight.main.EpicFightMod; +import com.tiedup.remake.rig.TiedUpRigConstants; -public final class EpicFightRenderTypes extends RenderType { +public final class TiedUpRenderTypes extends RenderType { public static RenderType makeTriangulated(RenderType renderType) { if (renderType.mode() == VertexFormat.Mode.TRIANGLES) { return renderType; @@ -48,7 +48,7 @@ public final class EpicFightRenderTypes extends RenderType { private static final BiFunction TRIANGULATED_OUTLINE = Util.memoize((texLocation, cullStateShard) -> { return RenderType.create( - EpicFightMod.prefix("outline"), + TiedUpRigConstants.prefix("outline"), DefaultVertexFormat.POSITION_COLOR_TEX, VertexFormat.Mode.TRIANGLES, 256, @@ -177,8 +177,8 @@ public final class EpicFightRenderTypes extends RenderType { this.shaderColorState.setColor(r, g, b, a); } - public static EpicFightRenderTypes.MutableCompositeState.MutableCompositeStateBuilder mutableStateBuilder() { - return new EpicFightRenderTypes.MutableCompositeState.MutableCompositeStateBuilder(); + public static TiedUpRenderTypes.MutableCompositeState.MutableCompositeStateBuilder mutableStateBuilder() { + return new TiedUpRenderTypes.MutableCompositeState.MutableCompositeStateBuilder(); } public static class MutableCompositeStateBuilder { @@ -196,77 +196,77 @@ public final class EpicFightRenderTypes extends RenderType { private RenderStateShard.LineStateShard lineState = RenderStateShard.DEFAULT_LINE; private RenderStateShard.ColorLogicStateShard colorLogicState = RenderStateShard.NO_COLOR_LOGIC; - public EpicFightRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setTextureState(RenderStateShard.EmptyTextureStateShard pTextureState) { + public TiedUpRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setTextureState(RenderStateShard.EmptyTextureStateShard pTextureState) { this.textureState = pTextureState; return this; } - public EpicFightRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setShaderState(RenderStateShard.ShaderStateShard pShaderState) { + public TiedUpRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setShaderState(RenderStateShard.ShaderStateShard pShaderState) { this.shaderState = pShaderState; return this; } - public EpicFightRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setTransparencyState(RenderStateShard.TransparencyStateShard pTransparencyState) { + public TiedUpRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setTransparencyState(RenderStateShard.TransparencyStateShard pTransparencyState) { this.transparencyState = pTransparencyState; return this; } - public EpicFightRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setDepthTestState(RenderStateShard.DepthTestStateShard pDepthTestState) { + public TiedUpRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setDepthTestState(RenderStateShard.DepthTestStateShard pDepthTestState) { this.depthTestState = pDepthTestState; return this; } - public EpicFightRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setCullState(RenderStateShard.CullStateShard pCullState) { + public TiedUpRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setCullState(RenderStateShard.CullStateShard pCullState) { this.cullState = pCullState; return this; } - public EpicFightRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setLightmapState(RenderStateShard.LightmapStateShard pLightmapState) { + public TiedUpRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setLightmapState(RenderStateShard.LightmapStateShard pLightmapState) { this.lightmapState = pLightmapState; return this; } - public EpicFightRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setOverlayState(RenderStateShard.OverlayStateShard pOverlayState) { + public TiedUpRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setOverlayState(RenderStateShard.OverlayStateShard pOverlayState) { this.overlayState = pOverlayState; return this; } - public EpicFightRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setLayeringState(RenderStateShard.LayeringStateShard pLayerState) { + public TiedUpRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setLayeringState(RenderStateShard.LayeringStateShard pLayerState) { this.layeringState = pLayerState; return this; } - public EpicFightRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setOutputState(RenderStateShard.OutputStateShard pOutputState) { + public TiedUpRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setOutputState(RenderStateShard.OutputStateShard pOutputState) { this.outputState = pOutputState; return this; } - public EpicFightRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setTexturingState(RenderStateShard.TexturingStateShard pTexturingState) { + public TiedUpRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setTexturingState(RenderStateShard.TexturingStateShard pTexturingState) { this.texturingState = pTexturingState; return this; } - public EpicFightRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setWriteMaskState(RenderStateShard.WriteMaskStateShard pWriteMaskState) { + public TiedUpRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setWriteMaskState(RenderStateShard.WriteMaskStateShard pWriteMaskState) { this.writeMaskState = pWriteMaskState; return this; } - public EpicFightRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setLineState(RenderStateShard.LineStateShard pLineState) { + public TiedUpRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setLineState(RenderStateShard.LineStateShard pLineState) { this.lineState = pLineState; return this; } - public EpicFightRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setColorLogicState(RenderStateShard.ColorLogicStateShard pColorLogicState) { + public TiedUpRenderTypes.MutableCompositeState.MutableCompositeStateBuilder setColorLogicState(RenderStateShard.ColorLogicStateShard pColorLogicState) { this.colorLogicState = pColorLogicState; return this; } - public EpicFightRenderTypes.MutableCompositeState createCompositeState(boolean pOutline) { + public TiedUpRenderTypes.MutableCompositeState createCompositeState(boolean pOutline) { return this.createCompositeState(pOutline ? RenderType.OutlineProperty.AFFECTS_OUTLINE : RenderType.OutlineProperty.NONE); } - public EpicFightRenderTypes.MutableCompositeState createCompositeState(RenderType.OutlineProperty pOutlineState) { - return new EpicFightRenderTypes.MutableCompositeState( + public TiedUpRenderTypes.MutableCompositeState createCompositeState(RenderType.OutlineProperty pOutlineState) { + return new TiedUpRenderTypes.MutableCompositeState( this.textureState, this.shaderState, this.transparencyState, @@ -288,7 +288,7 @@ public final class EpicFightRenderTypes extends RenderType { private static final RenderType ENTITY_UI_COLORED = create( - EpicFightMod.prefix("ui_color") + TiedUpRigConstants.prefix("ui_color") , DefaultVertexFormat.POSITION_COLOR , VertexFormat.Mode.QUADS , 256 @@ -304,7 +304,7 @@ public final class EpicFightRenderTypes extends RenderType { private static final Function ENTITY_UI_TEXTURE = Util.memoize( (textureLocation) -> create( - EpicFightMod.prefix("ui_texture") + TiedUpRigConstants.prefix("ui_texture") , DefaultVertexFormat.POSITION_TEX , VertexFormat.Mode.QUADS , 256 @@ -321,7 +321,7 @@ public final class EpicFightRenderTypes extends RenderType { ); private static final RenderType OBB = create( - EpicFightMod.prefix("debug_collider") + TiedUpRigConstants.prefix("debug_collider") , DefaultVertexFormat.POSITION_COLOR_NORMAL , VertexFormat.Mode.LINE_STRIP , 256 @@ -339,7 +339,7 @@ public final class EpicFightRenderTypes extends RenderType { ); private static final RenderType DEBUG_QUADS = create( - EpicFightMod.prefix("debug_quad") + TiedUpRigConstants.prefix("debug_quad") , DefaultVertexFormat.POSITION_COLOR , VertexFormat.Mode.QUADS , 256 @@ -355,7 +355,7 @@ public final class EpicFightRenderTypes extends RenderType { ); private static final RenderType GUI_TRIANGLE = create( - EpicFightMod.prefix("gui_triangle") + TiedUpRigConstants.prefix("gui_triangle") , DefaultVertexFormat.POSITION_COLOR , VertexFormat.Mode.TRIANGLES , 256 @@ -370,7 +370,7 @@ public final class EpicFightRenderTypes extends RenderType { private static final Function OVERLAY_MODEL = Util.memoize(texLocation -> { return create( - EpicFightMod.prefix("overlay_model"), + TiedUpRigConstants.prefix("overlay_model"), DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.TRIANGLES, 256, @@ -391,7 +391,7 @@ public final class EpicFightRenderTypes extends RenderType { private static final RenderType ENTITY_AFTERIMAGE_WHITE = create( - EpicFightMod.prefix("entity_afterimage"), + TiedUpRigConstants.prefix("entity_afterimage"), DefaultVertexFormat.PARTICLE, VertexFormat.Mode.TRIANGLES, 256, @@ -399,7 +399,7 @@ public final class EpicFightRenderTypes extends RenderType { true, RenderType.CompositeState.builder() .setShaderState(PARTICLE_SHADER) - .setTextureState(new RenderStateShard.TextureStateShard(EpicFightMod.identifier("textures/common/white.png"), false, false)) + .setTextureState(new RenderStateShard.TextureStateShard(TiedUpRigConstants.identifier("textures/common/white.png"), false, false)) .setCullState(NO_CULL) .setWriteMaskState(COLOR_WRITE) .setDepthTestState(EQUAL_DEPTH_TEST) @@ -410,7 +410,7 @@ public final class EpicFightRenderTypes extends RenderType { private static final RenderType ITEM_AFTERIMAGE_WHITE = create( - EpicFightMod.prefix("item_afterimage"), + TiedUpRigConstants.prefix("item_afterimage"), DefaultVertexFormat.PARTICLE, VertexFormat.Mode.QUADS, 256, @@ -418,7 +418,7 @@ public final class EpicFightRenderTypes extends RenderType { true, RenderType.CompositeState.builder() .setShaderState(PARTICLE_SHADER) - .setTextureState(new RenderStateShard.TextureStateShard(EpicFightMod.identifier("textures/common/white.png"), false, false)) + .setTextureState(new RenderStateShard.TextureStateShard(TiedUpRigConstants.identifier("textures/common/white.png"), false, false)) .setCullState(NO_CULL) .setWriteMaskState(COLOR_WRITE) .setDepthTestState(EQUAL_DEPTH_TEST) @@ -429,7 +429,7 @@ public final class EpicFightRenderTypes extends RenderType { private static final Function ENTITY_PARTICLE = Util.memoize(texLocation -> { return create( - EpicFightMod.prefix("entity_particle"), + TiedUpRigConstants.prefix("entity_particle"), DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.TRIANGLES, 256, @@ -449,7 +449,7 @@ public final class EpicFightRenderTypes extends RenderType { private static final RenderType ITEM_PARTICLE = create( - EpicFightMod.prefix("item_particle"), + TiedUpRigConstants.prefix("item_particle"), DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS, 256, @@ -468,7 +468,7 @@ public final class EpicFightRenderTypes extends RenderType { private static final Function ENTITY_PARTICLE_STENCIL = Util.memoize(texLocation -> { return create( - EpicFightMod.prefix("entity_particle_stencil"), + TiedUpRigConstants.prefix("entity_particle_stencil"), DefaultVertexFormat.POSITION_TEX, VertexFormat.Mode.TRIANGLES, 256, @@ -484,7 +484,7 @@ public final class EpicFightRenderTypes extends RenderType { private static final RenderType ITEM_PARTICLE_STENCIL = create( - EpicFightMod.prefix("item_particle_stencil"), + TiedUpRigConstants.prefix("item_particle_stencil"), DefaultVertexFormat.POSITION_TEX, VertexFormat.Mode.QUADS, 256, @@ -499,14 +499,14 @@ public final class EpicFightRenderTypes extends RenderType { private static final RenderType.CompositeRenderType BLOCK_HIGHLIGHT = create( - EpicFightMod.prefix("block_highlight"), + TiedUpRigConstants.prefix("block_highlight"), DefaultVertexFormat.BLOCK, VertexFormat.Mode.QUADS, 256, false, true, RenderType.CompositeState.builder() - .setTextureState(new RenderStateShard.TextureStateShard(EpicFightMod.identifier("textures/common/white.png"), false, false)) + .setTextureState(new RenderStateShard.TextureStateShard(TiedUpRigConstants.identifier("textures/common/white.png"), false, false)) .setLightmapState(LIGHTMAP) .setShaderState(RENDERTYPE_TRANSLUCENT_SHADER) .setTransparencyState(TRANSLUCENT_TRANSPARENCY) @@ -627,15 +627,15 @@ public final class EpicFightRenderTypes extends RenderType { CompositeRenderType glintRenderType = WORLD_RENDERTYPES_COLORED_GLINT.computeIfAbsent( owner, k -> create( - EpicFightMod.prefix("colored_glint"), + TiedUpRigConstants.prefix("colored_glint"), DefaultVertexFormat.POSITION_TEX, VertexFormat.Mode.TRIANGLES, 256, false, false, - EpicFightRenderTypes.MutableCompositeState.mutableStateBuilder() + TiedUpRenderTypes.MutableCompositeState.mutableStateBuilder() .setShaderState(RENDERTYPE_ARMOR_ENTITY_GLINT_SHADER) - .setTextureState(new RenderStateShard.TextureStateShard(EpicFightMod.identifier("textures/entity/overlay/glint_white.png"), true, false)) + .setTextureState(new RenderStateShard.TextureStateShard(TiedUpRigConstants.identifier("textures/entity/overlay/glint_white.png"), true, false)) .setWriteMaskState(COLOR_WRITE) .setCullState(NO_CULL) .setDepthTestState(EQUAL_DEPTH_TEST) @@ -654,7 +654,7 @@ public final class EpicFightRenderTypes extends RenderType { } //Util class - private EpicFightRenderTypes() { + private TiedUpRenderTypes() { super(null, null, null, -1, false, false, null, null); } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/util/ParseUtil.java b/src/main/java/com/tiedup/remake/rig/util/ParseUtil.java index fae2c45..31aea3f 100644 --- a/src/main/java/com/tiedup/remake/rig/util/ParseUtil.java +++ b/src/main/java/com/tiedup/remake/rig/util/ParseUtil.java @@ -369,4 +369,4 @@ public class ParseUtil { } private ParseUtil() {} -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/util/datastruct/ClearableIdMapper.java b/src/main/java/com/tiedup/remake/rig/util/datastruct/ClearableIdMapper.java index eec76ac..34f8dc7 100644 --- a/src/main/java/com/tiedup/remake/rig/util/datastruct/ClearableIdMapper.java +++ b/src/main/java/com/tiedup/remake/rig/util/datastruct/ClearableIdMapper.java @@ -22,4 +22,4 @@ public class ClearableIdMapper extends IdMapper { this.idToT.clear(); this.nextId = 0; } -} \ No newline at end of file +} diff --git a/src/main/java/com/tiedup/remake/rig/util/datastruct/TypeFlexibleHashMap.java b/src/main/java/com/tiedup/remake/rig/util/datastruct/TypeFlexibleHashMap.java index 2699e26..83fc35c 100644 --- a/src/main/java/com/tiedup/remake/rig/util/datastruct/TypeFlexibleHashMap.java +++ b/src/main/java/com/tiedup/remake/rig/util/datastruct/TypeFlexibleHashMap.java @@ -40,4 +40,4 @@ public class TypeFlexibleHashMap> extends HashMap { T defaultValue(); } -} \ No newline at end of file +}