Apoli: Fix EdwinMindcraft/origins-architectury#391

src/main/java/io/github/edwinmindcraft/apoli/common/action/bientity/SimpleBiEntityAction.java

@@ -2,24 +2,23 @@
 
 import io.github.edwinmindcraft.apoli.api.configuration.NoConfiguration;
 import io.github.edwinmindcraft.apoli.api.power.factory.BiEntityAction;
-import io.github.edwinmindcraft.apoli.common.ApoliCommon;
-import io.github.edwinmindcraft.apoli.common.network.S2CPlayerMount;
-import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.TamableAnimal;
 import net.minecraft.world.entity.animal.Animal;
 import net.minecraft.world.entity.player.Player;
-import net.minecraftforge.network.PacketDistributor;
 
 import java.util.function.BiConsumer;
 
 public class SimpleBiEntityAction extends BiEntityAction<NoConfiguration> {
 
  public static void mount(Entity actor, Entity target) {
  actor.startRiding(target, true);
- if (!actor.level.isClientSide() && target instanceof ServerPlayer player) {
+ // The below is unnecessary as the client will execute the above before the server.
+ /*
+ if (!actor.level().isClientSide() && target instanceof ServerPlayer player) {
  ApoliCommon.CHANNEL.send(PacketDistributor.PLAYER.with(() -> player), new S2CPlayerMount(actor.getId(), target.getId()));
  }
+ */
  }
 
  public static void setInLove(Entity actor, Entity target) {

src/test/resources/data/apoliforge/powers/dismount.json

@@ -0,0 +1,32 @@
+{
+ "type": "apoli:active_self",
+ "cooldown": 1,
+ "key": {
+ "key": "key.use",
+ "continuous": false
+ },
+ "entity_action": {
+ "type": "apoli:passenger_action",
+ "bientity_action": {
+ "type": "apoli:and",
+ "actions": [
+ {
+ "type": "apoli:actor_action",
+ "action": {
+ "type": "apoli:dismount"
+ }
+ },
+ {
+ "type": "apoli:target_action",
+ "action": {
+ "type": "apoli:swing_hand",
+ "hand": "MAIN_HAND"
+ }
+ }
+ ]
+ }
+ },
+ "condition": {
+ "type": "apoli:sneaking"
+ }
+}

src/test/resources/data/apoliforge/powers/pick_up.json

@@ -0,0 +1,19 @@
+{
+ "type": "apoli:action_on_entity_use",
+ "bientity_action": {
+ "type": "apoli:invert",
+ "action": {
+ "type": "apoli:mount"
+ }
+ },
+ "item_condition": {
+ "type": "apoli:empty"
+ },
+ "hands": [
+ "main_hand"
+ ],
+ "condition": {
+ "type": "apoli:sneaking",
+ "inverted": true
+ }
+}