fixes some issues with advancements

Pokecube-Development · Aug 21, 2022 · cee6f0f · cee6f0f
1 parent 9f2ea88
commit cee6f0f
Show file tree

Hide file tree

Showing 19 changed files with 107 additions and 46 deletions.
diff --git a/src/main/java/pokecube/adventures/advancements/triggers/BeatLeaderTrigger.java b/src/main/java/pokecube/adventures/advancements/triggers/BeatLeaderTrigger.java
@@ -1,5 +1,7 @@
 package pokecube.adventures.advancements.triggers;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -64,8 +66,10 @@ public void remove(final CriterionTrigger.Listener<Instance> listener)
 
         public void trigger(final ServerPlayer player, final TrainerBase defeated)
         {
+            List<Listener<Instance>> toTrigger = new ArrayList<>();
             for (var listener : this.listeners)
-                if (listener.getTriggerInstance().test(player, defeated)) listener.run(this.playerAdvancements);
+                if (listener.getTriggerInstance().test(player, defeated)) toTrigger.add(listener);
+            toTrigger.forEach(l -> l.run(playerAdvancements));
         }
     }
 

diff --git a/src/main/java/pokecube/adventures/advancements/triggers/BeatTrainerTrigger.java b/src/main/java/pokecube/adventures/advancements/triggers/BeatTrainerTrigger.java
@@ -1,5 +1,7 @@
 package pokecube.adventures.advancements.triggers;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -64,8 +66,10 @@ public void remove(final CriterionTrigger.Listener<Instance> listener)
 
         public void trigger(final ServerPlayer player, final TrainerBase defeated)
         {
+            List<Listener<Instance>> toTrigger = new ArrayList<>();
             for (var listener : this.listeners)
-                if (listener.getTriggerInstance().test(player, defeated)) listener.run(this.playerAdvancements);
+                if (listener.getTriggerInstance().test(player, defeated)) toTrigger.add(listener);
+            toTrigger.forEach(l -> l.run(playerAdvancements));
         }
     }
 

diff --git a/...ain/java/pokecube/core/handlers/playerdata/advancements/triggers/BreedPokemobTrigger.java b/...ain/java/pokecube/core/handlers/playerdata/advancements/triggers/BreedPokemobTrigger.java
@@ -1,5 +1,7 @@
 package pokecube.core.handlers.playerdata.advancements.triggers;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -86,8 +88,10 @@ public void remove(final CriterionTrigger.Listener<Instance> listener)
 
         public void trigger(final ServerPlayer player, final IPokemob first, final IPokemob second)
         {
-            for (final var listener : this.listeners)
-                if (listener.getTriggerInstance().test(player, first, second)) listener.run(this.playerAdvancements);
+            List<Listener<Instance>> toTrigger = new ArrayList<>();
+            for (var listener : this.listeners)
+                if (listener.getTriggerInstance().test(player, first, second)) toTrigger.add(listener);
+            toTrigger.forEach(l -> l.run(playerAdvancements));
         }
     }
 

diff --git a/...ain/java/pokecube/core/handlers/playerdata/advancements/triggers/CatchPokemobTrigger.java b/...ain/java/pokecube/core/handlers/playerdata/advancements/triggers/CatchPokemobTrigger.java
@@ -1,5 +1,7 @@
 package pokecube.core.handlers.playerdata.advancements.triggers;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -91,9 +93,10 @@ public void remove(final CriterionTrigger.Listener<Instance> listener)
 
         public void trigger(final ServerPlayer player, final IPokemob pokemob)
         {
+            List<Listener<Instance>> toTrigger = new ArrayList<>();
             for (var listener : this.listeners)
-                if (listener.getTriggerInstance().test(player, pokemob)) listener.run(this.playerAdvancements);
-
+                if (listener.getTriggerInstance().test(player, pokemob)) toTrigger.add(listener);
+            toTrigger.forEach(l -> l.run(playerAdvancements));
         }
     }
 

diff --git a/...in/java/pokecube/core/handlers/playerdata/advancements/triggers/EvolvePokemobTrigger.java b/...in/java/pokecube/core/handlers/playerdata/advancements/triggers/EvolvePokemobTrigger.java
@@ -1,5 +1,7 @@
 package pokecube.core.handlers.playerdata.advancements.triggers;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -67,8 +69,10 @@ public void remove(final CriterionTrigger.Listener<Instance> listener)
 
         public void trigger(final ServerPlayer player, final IPokemob pokemob)
         {
+            List<Listener<Instance>> toTrigger = new ArrayList<>();
             for (var listener : this.listeners)
-                if (listener.getTriggerInstance().test(player, pokemob)) listener.run(this.playerAdvancements);
+                if (listener.getTriggerInstance().test(player, pokemob)) toTrigger.add(listener);
+            toTrigger.forEach(l -> l.run(playerAdvancements));
         }
     }
 

diff --git a/...ain/java/pokecube/core/handlers/playerdata/advancements/triggers/FirstPokemobTrigger.java b/...ain/java/pokecube/core/handlers/playerdata/advancements/triggers/FirstPokemobTrigger.java
@@ -1,5 +1,7 @@
 package pokecube.core.handlers.playerdata.advancements.triggers;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -60,8 +62,10 @@ public void remove(final CriterionTrigger.Listener<Instance> listener)
 
         public void trigger(final ServerPlayer player)
         {
+            List<Listener<Instance>> toTrigger = new ArrayList<>();
             for (var listener : this.listeners)
-                if (listener.getTriggerInstance().test()) listener.run(this.playerAdvancements);
+                if (listener.getTriggerInstance().test()) toTrigger.add(listener);
+            toTrigger.forEach(l -> l.run(playerAdvancements));
         }
     }
 

diff --git a/...ain/java/pokecube/core/handlers/playerdata/advancements/triggers/HatchPokemobTrigger.java b/...ain/java/pokecube/core/handlers/playerdata/advancements/triggers/HatchPokemobTrigger.java
@@ -1,5 +1,7 @@
 package pokecube.core.handlers.playerdata.advancements.triggers;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -67,8 +69,10 @@ public void remove(final CriterionTrigger.Listener<Instance> listener)
 
         public void trigger(final ServerPlayer player, final IPokemob pokemob)
         {
+            List<Listener<Instance>> toTrigger = new ArrayList<>();
             for (var listener : this.listeners)
-                if (listener.getTriggerInstance().test(player, pokemob)) listener.run(this.playerAdvancements);
+                if (listener.getTriggerInstance().test(player, pokemob)) toTrigger.add(listener);
+            toTrigger.forEach(l -> l.run(playerAdvancements));
         }
     }
 

diff --git a/...n/java/pokecube/core/handlers/playerdata/advancements/triggers/InspectPokemobTrigger.java b/...n/java/pokecube/core/handlers/playerdata/advancements/triggers/InspectPokemobTrigger.java
@@ -1,5 +1,7 @@
 package pokecube.core.handlers.playerdata.advancements.triggers;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -67,9 +69,10 @@ public void remove(final CriterionTrigger.Listener<Instance> listener)
 
         public void trigger(final ServerPlayer player, final IPokemob pokemob)
         {
+            List<Listener<Instance>> toTrigger = new ArrayList<>();
             for (var listener : this.listeners)
-                if (listener.getTriggerInstance().test(player, pokemob)) listener.run(this.playerAdvancements);
-
+                if (listener.getTriggerInstance().test(player, pokemob)) toTrigger.add(listener);
+            toTrigger.forEach(l -> l.run(playerAdvancements));
         }
     }
 

diff --git a/...main/java/pokecube/core/handlers/playerdata/advancements/triggers/KillPokemobTrigger.java b/...main/java/pokecube/core/handlers/playerdata/advancements/triggers/KillPokemobTrigger.java
@@ -1,5 +1,7 @@
 package pokecube.core.handlers.playerdata.advancements.triggers;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -66,8 +68,10 @@ public void remove(final CriterionTrigger.Listener<Instance> listener)
 
         public void trigger(final ServerPlayer player, final IPokemob pokemob)
         {
+            List<Listener<Instance>> toTrigger = new ArrayList<>();
             for (var listener : this.listeners)
-                if (listener.getTriggerInstance().test(player, pokemob)) listener.run(this.playerAdvancements);
+                if (listener.getTriggerInstance().test(player, pokemob)) toTrigger.add(listener);
+            toTrigger.forEach(l -> l.run(playerAdvancements));
         }
     }
 

diff --git a/...ava/pokecube/core/handlers/playerdata/advancements/triggers/MegaEvolvePokemobTrigger.java b/...ava/pokecube/core/handlers/playerdata/advancements/triggers/MegaEvolvePokemobTrigger.java
@@ -1,5 +1,7 @@
 package pokecube.core.handlers.playerdata.advancements.triggers;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -67,8 +69,10 @@ public void remove(final CriterionTrigger.Listener<Instance> listener)
 
         public void trigger(final ServerPlayer player, final IPokemob pokemob)
         {
+            List<Listener<Instance>> toTrigger = new ArrayList<>();
             for (var listener : this.listeners)
-                if (listener.getTriggerInstance().test(player, pokemob)) listener.run(this.playerAdvancements);
+                if (listener.getTriggerInstance().test(player, pokemob)) toTrigger.add(listener);
+            toTrigger.forEach(l -> l.run(playerAdvancements));
         }
     }
 

diff --git a/src/main/java/pokecube/core/handlers/playerdata/advancements/triggers/UseMoveTrigger.java b/src/main/java/pokecube/core/handlers/playerdata/advancements/triggers/UseMoveTrigger.java
@@ -1,5 +1,7 @@
 package pokecube.core.handlers.playerdata.advancements.triggers;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -70,8 +72,10 @@ public void remove(final CriterionTrigger.Listener<Instance> listener)
 
         public void trigger(final ServerPlayer player, final MovePacket packet)
         {
+            List<Listener<Instance>> toTrigger = new ArrayList<>();
             for (var listener : this.listeners)
-                if (listener.getTriggerInstance().test(player, packet)) listener.run(this.playerAdvancements);
+                if (listener.getTriggerInstance().test(player, packet)) toTrigger.add(listener);
+            toTrigger.forEach(l -> l.run(playerAdvancements));
         }
     }
 

diff --git a/src/main/java/pokecube/core/impl/capabilities/impl/PokemobHungry.java b/src/main/java/pokecube/core/impl/capabilities/impl/PokemobHungry.java
@@ -4,6 +4,7 @@
 import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.item.ItemStack;
+import pokecube.api.data.PokedexEntry;
 import pokecube.api.entity.pokemob.Nature;
 import pokecube.api.entity.pokemob.ai.CombatStates;
 import pokecube.api.entity.pokemob.ai.GeneralStates;
@@ -104,12 +105,20 @@ public int getHungerTime()
         return this.dataSync().get(this.params.HUNGERDW);
     }
 
+    private float _last_size = 0;
+
     @Override
     public Vector3 getMobSizes()
     {
-        return this.sizes
-                .set(this.getPokedexEntry().width, this.getPokedexEntry().height, this.getPokedexEntry().length)
-                .scalarMult(this.getSize());
+        float size = this.getSize();
+        if (size != _last_size)
+        {
+            _last_size = size;
+            PokedexEntry entry = this.getPokedexEntry();
+            this.sizes.set(entry.width, entry.height, entry.length);
+            this.sizes.scalarMultBy(size);
+        }
+        return this.sizes;
     }
 
     /** @return does this pokemon hunt for food */

diff --git a/src/main/java/pokecube/core/moves/Battle.java b/src/main/java/pokecube/core/moves/Battle.java
@@ -169,8 +169,8 @@ private void addToSide(final Map<UUID, LivingEntity> side, final Set<String> tea
         if (this.valid)
         {
             final IPokemob poke = PokemobCaps.getPokemobFor(mob);
-            if (!(mob instanceof Mob)) return;
-            BrainUtils.initiateCombat((Mob) mob, target);
+            if (!(mob instanceof Mob mob2)) return;
+            BrainUtils.initiateCombat(mob2, target);
             if (poke != null && poke.getAbility() != null) poke.getAbility().startCombat(poke);
         }
     }

diff --git a/src/main/java/pokecube/core/moves/templates/Move_Basic.java b/src/main/java/pokecube/core/moves/templates/Move_Basic.java
@@ -64,10 +64,6 @@ public static void silkHarvest(final BlockState state, final BlockPos pos, final
         worldIn.destroyBlock(pos, false);
     }
 
-    Vector3 v = new Vector3();
-
-    Vector3 v1 = new Vector3();
-
     /**
      * Constructor for a Pokemob move. <br/>
      * The attack category defines the way the mob will move in order to make

diff --git a/src/main/java/pokecube/core/moves/templates/Move_Explode.java b/src/main/java/pokecube/core/moves/templates/Move_Explode.java
@@ -160,20 +160,20 @@ public void attack(final IPokemob attacker, final Entity attacked)
         if (!evt.isCanceled())
         {
             final boolean explodeDamage = mob.getLevel() instanceof ServerLevel level && Config.Rules.doBoom(level);
-            final boolean damagePerms = MoveEventsHandler.canAffectBlock(pokemob, this.v.set(mob), this.getName());
+            final boolean damagePerms = MoveEventsHandler.canAffectBlock(pokemob, new Vector3().set(mob),
+                    this.getName());
             // If these, we let the explosion handle the damage.
             if (explodeDamage && damagePerms) boom.doExplosion();
             else
             {
                 // Otherwise spawn in some effects
-                mob.getLevel().playSound((Player) null, mob.getX(), mob.getY(), mob.getZ(),
-                        SoundEvents.GENERIC_EXPLODE, SoundSource.BLOCKS, 4.0F,
-                        (1.0F + (mob.getLevel().random.nextFloat()
-                                - mob.getLevel().random.nextFloat()) * 0.2F) * 0.7F);
-                if (this.getPWR() > 200) mob.getLevel().addParticle(ParticleTypes.EXPLOSION, mob.getX(),
-                        mob.getY(), mob.getZ(), 1.0D, 0.0D, 0.0D);
-                else mob.getLevel().addParticle(ParticleTypes.EXPLOSION, mob.getX(), mob.getY(),
+                mob.getLevel().playSound((Player) null, mob.getX(), mob.getY(), mob.getZ(), SoundEvents.GENERIC_EXPLODE,
+                        SoundSource.BLOCKS, 4.0F,
+                        (1.0F + (mob.getLevel().random.nextFloat() - mob.getLevel().random.nextFloat()) * 0.2F) * 0.7F);
+                if (this.getPWR() > 200) mob.getLevel().addParticle(ParticleTypes.EXPLOSION, mob.getX(), mob.getY(),
                         mob.getZ(), 1.0D, 0.0D, 0.0D);
+                else mob.getLevel().addParticle(ParticleTypes.EXPLOSION, mob.getX(), mob.getY(), mob.getZ(), 1.0D, 0.0D,
+                        0.0D);
                 // and hit nearby targets normally.
                 this.actualAttack(pokemob, new Vector3().set(pokemob.getEntity()).add(0,
                         pokemob.getSize() * pokemob.getPokedexEntry().height / 2, 0));

diff --git a/src/main/java/thut/api/entity/animation/Animation.java b/src/main/java/thut/api/entity/animation/Animation.java
@@ -10,6 +10,7 @@
 
 import com.google.common.collect.Ordering;
 
+import thut.api.maths.Vector3;
 import thut.core.client.render.animation.AnimationXML.Phase;
 
 public class Animation
@@ -28,20 +29,22 @@ public static interface IPartRenamer
 
     public UUID _uuid = UUID.randomUUID();
 
-    public String name       = "";
+    public String name = "";
     public String identifier = "";
-    public int    length     = -1;
+    public int length = -1;
     /**
      * This is used for sorting animations for determining which components
      * should take priority when multiple animations are specified for a single
      * part.
      */
-    public int    priority   = 10;
+    public int priority = 10;
 
     public boolean loops = true;
 
     public boolean hasLimbBased = false;
 
+    public Vector3 _shift = new Vector3();
+
     public TreeMap<String, ArrayList<AnimationComponent>> sets = new TreeMap<>(Ordering.natural());
 
     public ArrayList<AnimationComponent> getComponents(final String key)
@@ -76,10 +79,10 @@ public void initLength()
         this.hasLimbBased = false;
         for (final Entry<String, ArrayList<AnimationComponent>> entry : this.sets.entrySet())
             for (final AnimationComponent component : entry.getValue())
-            {
-                this.length = Math.max(this.length, component.startKey + component.length);
-                this.hasLimbBased = this.hasLimbBased || component.limbBased;
-            }
+        {
+            this.length = Math.max(this.length, component.startKey + component.length);
+            this.hasLimbBased = this.hasLimbBased || component.limbBased;
+        }
     }
 
     @Override

diff --git a/src/main/java/thut/api/maths/Vector4.java b/src/main/java/thut/api/maths/Vector4.java
@@ -35,6 +35,14 @@ public Vector4(final Quaternion quat)
         this.quat = quat;
     }
 
+    @OnlyIn(value = Dist.CLIENT)
+    public Vector4 set(final Quaternion quat)
+    {
+        this.set(quat.i(), quat.j(), quat.k(), quat.r());
+        this.quat = quat;
+        return this;
+    }
+
     public Vector4(final CompoundTag nbt)
     {
         this();