NotEvil/TiedUp-
3
1
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 e4dd32fe05
commit 0891edffac
70 changed files with 320 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/tiedup/remake/rig/asset/JsonAssetLoader.java
View File

@@ -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
}
}
}