WIP: fork patch/collider/codec stubs, 464->135 compile errors
Phase 0 compile progress (70% reduction). Core data model compile :
Refs yesman.epicfight strippées (hors 4 javadocs) :
- AnimationProperty : combat properties EXTRA_DAMAGE, STUN_TYPE, PARTICLE
- ClientAnimator : playAnimationAt(..., AnimatorControlPacket.Layer, Priority)
- ClothSimulator : OBBCollider -> fork geometry-only dans rig/collider/
- InstantiateInvoker : Collider, ColliderPreset, Armatures, DatapackEditScreen
- MoveCoordFunctions : GrapplingAttackAnimation
- SimulationTypes : InverseKinematicsSimulator (path rewrite)
Stubs patch/ :
- EntityPatch<T> abstract — getOriginal, isLogicalClient, getMatrix, getAngleTo
- LivingEntityPatch<T> abstract — getAnimator, getArmature, getTarget, getYRot*
- MobPatch<T extends Mob> — instanceof check only
- item/CapabilityItem — type marker
Forks utilitaires :
- rig/collider/OBBCollider — geometry only (strip Entity collision, drawInternal)
- anim/types/StateSpectrum — identique EF, imports rewrités
- util/PacketBufferCodec — StreamCodec backport
- util/TimePairList — identique EF
- util/HitEntityList — shell pour Priority enum uniquement
- util/ExtendableEnum + ExtendableEnumManager — register/assign enum
Fix package declarations :
- armature/Joint.java + JointTransform.java : package rig.anim -> rig.armature
- Imports JointTransform ajoutés dans anim/{Pose,Keyframe,TransformSheet}
Residu 135 errors = cluster rendering (Phase 2) :
- render/TiedUpRenderTypes (17) : CompositeState package-private MC
- event/PatchedRenderersEvent (11) : missing PatchedEntityRenderer
- mesh/SkinnedMesh (13) : VanillaMeshPartDefinition, compute shader fields
- asset/JsonAssetLoader (6), anim/LivingMotion (5)
This commit is contained in:
@@ -15,10 +15,10 @@ import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
|
||||
import yesman.epicfight.api.physics.PhysicsSimulator;
|
||||
import yesman.epicfight.api.physics.SimulationObject;
|
||||
import yesman.epicfight.api.physics.SimulationObject.SimulationObjectBuilder;
|
||||
import yesman.epicfight.api.physics.SimulationProvider;
|
||||
import com.tiedup.remake.rig.physics.PhysicsSimulator;
|
||||
import com.tiedup.remake.rig.physics.SimulationObject;
|
||||
import com.tiedup.remake.rig.physics.SimulationObject.SimulationObjectBuilder;
|
||||
import com.tiedup.remake.rig.physics.SimulationProvider;
|
||||
|
||||
public abstract class AbstractSimulator<KEY, B extends SimulationObjectBuilder, PV extends SimulationProvider<O, SO, B, PV>, O, SO extends SimulationObject<B, PV, O>> implements PhysicsSimulator<KEY, B, PV, O, SO> {
|
||||
protected Map<KEY, ObjectWrapper> simulationObjects = Maps.newHashMap();
|
||||
|
||||
@@ -11,7 +11,7 @@ import javax.annotation.Nullable;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import com.tiedup.remake.rig.anim.Animator;
|
||||
import com.tiedup.remake.rig.armature.Armature;
|
||||
import yesman.epicfight.api.physics.SimulatableObject;
|
||||
import com.tiedup.remake.rig.physics.SimulatableObject;
|
||||
|
||||
public interface ClothSimulatable extends SimulatableObject {
|
||||
@Nullable
|
||||
|
||||
@@ -48,9 +48,9 @@ import com.tiedup.remake.rig.mesh.SoftBodyTranslatable;
|
||||
import com.tiedup.remake.rig.mesh.VertexBuilder;
|
||||
import com.tiedup.remake.rig.cloth.AbstractSimulator;
|
||||
import com.tiedup.remake.rig.cloth.ClothSimulator.ClothObjectBuilder;
|
||||
import yesman.epicfight.api.collider.OBBCollider;
|
||||
import com.tiedup.remake.rig.collider.OBBCollider;
|
||||
import com.tiedup.remake.rig.armature.Armature;
|
||||
import yesman.epicfight.api.physics.SimulationObject;
|
||||
import com.tiedup.remake.rig.physics.SimulationObject;
|
||||
import com.tiedup.remake.rig.math.MathUtils;
|
||||
import com.tiedup.remake.rig.math.OpenMatrix4f;
|
||||
import com.tiedup.remake.rig.math.Vec3f;
|
||||
|
||||
Reference in New Issue
Block a user