Split particle stuff from SEffe

Legend-of-Dragoon-Modding · Dec 4, 2023 · 5a4d961 · 5a4d961
1 parent 9cceb04
commit 5a4d961
Show file tree

Hide file tree

Showing 10 changed files with 2,163 additions and 2,085 deletions.
diff --git a/src/main/java/legend/game/combat/SEffe.java b/src/main/java/legend/game/combat/SEffe.java
diff --git a/.../combat/effects/ParticleEffectData98.java → ...ombat/particles/ParticleEffectData98.java b/.../combat/effects/ParticleEffectData98.java → ...ombat/particles/ParticleEffectData98.java
@@ -1,8 +1,11 @@
-package legend.game.combat.effects;
+package legend.game.combat.particles;
 
 import legend.core.gte.TmdObjTable1c;
 import legend.core.memory.types.QuadConsumer;
 import legend.core.memory.types.TriConsumer;
+import legend.game.combat.effects.Effect;
+import legend.game.combat.effects.EffectManagerData6c;
+import legend.game.combat.effects.EffectManagerData6cInner;
 import legend.game.scripting.ScriptState;
 import org.joml.Vector3f;
 
@@ -52,8 +55,8 @@ public class ParticleEffectData98 implements Effect {
   public int scaleParticleAcceleration_80;
   public TriConsumer<EffectManagerData6c<EffectManagerData6cInner.ParticleType>, ParticleEffectData98, ParticleEffectInstance94> particleInstancePrerenderCallback_84;
   public QuadConsumer<ScriptState<EffectManagerData6c<EffectManagerData6cInner.ParticleType>>, EffectManagerData6c<EffectManagerData6cInner.ParticleType>, ParticleEffectData98, ParticleEffectInstance94> particleInstanceTickCallback_88;
-  public QuadConsumer<EffectManagerData6c<EffectManagerData6cInner.ParticleType>, ParticleEffectData98, ParticleEffectInstance94, ParticleEffectData98Inner24> initializerCallback_8c;
-  public QuadConsumer<ScriptState<EffectManagerData6c<EffectManagerData6cInner.ParticleType>>, EffectManagerData6c<EffectManagerData6cInner.ParticleType>, ParticleEffectData98, ParticleEffectInstance94> particleInstanceReconstructorCallback_90;
+  public TriConsumer<ParticleEffectData98, ParticleEffectInstance94, ParticleEffectData98Inner24> initializerCallback_8c;
+  public TriConsumer<EffectManagerData6c<EffectManagerData6cInner.ParticleType>, ParticleEffectData98, ParticleEffectInstance94> particleInstanceReconstructorCallback_90;
   public ParticleEffectData98 next_94;
 
   public ParticleEffectData98(final int count) {

diff --git a/.../effects/ParticleEffectData98Inner24.java → ...articles/ParticleEffectData98Inner24.java b/.../effects/ParticleEffectData98Inner24.java → ...articles/ParticleEffectData98Inner24.java
@@ -1,4 +1,4 @@
-package legend.game.combat.effects;
+package legend.game.combat.particles;
 
 public class ParticleEffectData98Inner24 {
   public int scriptIndex_00; // unused

diff --git a/...bat/effects/ParticleEffectInstance94.java → ...t/particles/ParticleEffectInstance94.java b/...bat/effects/ParticleEffectInstance94.java → ...t/particles/ParticleEffectInstance94.java
@@ -1,4 +1,4 @@
-package legend.game.combat.effects;
+package legend.game.combat.particles;
 
 import org.joml.Vector3f;
 

diff --git a/...ffects/ParticleEffectInstance94Sub10.java → ...ticles/ParticleEffectInstance94Sub10.java b/...ffects/ParticleEffectInstance94Sub10.java → ...ticles/ParticleEffectInstance94Sub10.java
@@ -1,4 +1,4 @@
-package legend.game.combat.effects;
+package legend.game.combat.particles;
 
 public class ParticleEffectInstance94Sub10 {
   public int x0_00;

diff --git a/...rticleInitialTransformationMetrics10.java → ...rticleInitialTransformationMetrics10.java b/...rticleInitialTransformationMetrics10.java → ...rticleInitialTransformationMetrics10.java
@@ -1,4 +1,4 @@
-package legend.game.combat.effects;
+package legend.game.combat.particles;
 
 import legend.core.memory.Value;
 import legend.core.memory.types.ByteRef;

diff --git a/.../combat/effects/ParticleInnerStuff04.java → ...ombat/particles/ParticleInnerStuff04.java b/.../combat/effects/ParticleInnerStuff04.java → ...ombat/particles/ParticleInnerStuff04.java
@@ -1,4 +1,4 @@
-package legend.game.combat.effects;
+package legend.game.combat.particles;
 
 import legend.core.memory.Value;
 import legend.core.memory.types.ByteRef;

diff --git a/src/main/java/legend/game/combat/particles/ParticleManager.java b/src/main/java/legend/game/combat/particles/ParticleManager.java
diff --git a/...ame/combat/effects/ParticleMetrics48.java → ...e/combat/particles/ParticleMetrics48.java b/...ame/combat/effects/ParticleMetrics48.java → ...e/combat/particles/ParticleMetrics48.java
@@ -1,4 +1,4 @@
-package legend.game.combat.effects;
+package legend.game.combat.particles;
 
 import org.joml.Vector3f;
 

diff --git a/src/main/java/legend/game/combat/particles/package-info.java b/src/main/java/legend/game/combat/particles/package-info.java
@@ -0,0 +1,4 @@
+@ParametersAreNonnullByDefault
+package legend.game.combat.particles;
+
+import javax.annotation.ParametersAreNonnullByDefault;