Merge branch '1.19.4' into 1.20.1

* 1.19.4:
  Added missing translation
  Lowered fabric api version requirement
  Fixed forge networking issue

# Conflicts:
#	common/src/main/resources/assets/friendsandfoes/lang/en_us.json

common/src/main/java/com/faboslav/friendsandfoes/platform/PacketChannelManager.java

@@ -49,6 +49,4 @@ public static <T extends Packet<T>> void sendToServer(Identifier channel, T pack
 	public static <T extends Packet<T>> void sendToPlayer(Identifier channel, T packet, PlayerEntity player) {
 		throw new NotImplementedException();
 	}
-
-
 }

common/src/main/resources/assets/friendsandfoes/lang/en_us.json

@@ -127,5 +127,6 @@
 	"subtitle.entity.friendsandfoes.wildfire.shockwave": "Wilsfire shockwaves",
 	"subtitle.entity.friendsandfoes.wildfire.shoot": "Wildfire shoots",
 	"subtitle.entity.friendsandfoes.wildfire.step": "Footsteps",
-	"subtitle.entity.friendsandfoes.wildfire.summon_blaze": "Wildfire summons blazes"
-}
+	"subtitle.entity.friendsandfoes.wildfire.summon_blaze": "Wildfire summons blazes",
+	"trinkets.slot.charm.charm": "Charm"
+}

forge/src/main/java/com/faboslav/friendsandfoes/forge/FriendsAndFoesForge.java

@@ -140,10 +140,12 @@ private static void onSetup(FMLCommonSetupEvent event) {
 	}
 
 	private static void onDatapackSync(OnDatapackSyncEvent event) {
-		if (event.getPlayer() != null) {
-			DatapackSyncEvent.EVENT.invoke(new DatapackSyncEvent(event.getPlayer()));
-		} else {
-			event.getPlayerList().getPlayerList().forEach(player -> DatapackSyncEvent.EVENT.invoke(new DatapackSyncEvent(player)));
+		if (FMLEnvironment.dist.isDedicatedServer()) {
+			if (event.getPlayer() != null) {
+				DatapackSyncEvent.EVENT.invoke(new DatapackSyncEvent(event.getPlayer()));
+			} else {
+				event.getPlayerList().getPlayerList().forEach(player -> DatapackSyncEvent.EVENT.invoke(new DatapackSyncEvent(player)));
+			}
 		}
 	}
 

forge/src/main/java/com/faboslav/friendsandfoes/platform/forge/PacketChannelManagerImpl.java

@@ -45,15 +45,19 @@ public static <T extends Packet<T>> void registerS2CPacket(
 		}
 		channel.channel.registerMessage(++channel.packets, packetClass, handler::encode, handler::decode, (msg, ctx) -> {
 			NetworkEvent.Context context = ctx.get();
-			PlayerEntity player = null;
-			if (context.getSender() == null) {
-				player = PlayerProvider.getClientPlayer();
-			}
+
+			context.enqueueWork(() -> {
+				PlayerEntity player = null;
+				if (context.getSender() == null) {
+					player = PlayerProvider.getClientPlayer();
+				}
+
+				if (player != null) {
+					PlayerEntity finalPlayer = player;
+					handler.handle(msg).apply(finalPlayer, finalPlayer.getWorld());
+				}
+			});
 
-			if (player != null) {
-				PlayerEntity finalPlayer = player;
-				context.enqueueWork(() -> handler.handle(msg).apply(finalPlayer, finalPlayer.getWorld()));
-			}
 			context.setPacketHandled(true);
 		});
 	}

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.configureondemand=false
 # Mod
 mod_name=Friends&Foes
 mod_id=friendsandfoes
-mod_version=2.0.5
+mod_version=2.0.6
 mod_author=Faboslav
 mod_description=Adds outvoted and forgotten mobs from the mob votes in a believable vanilla plus style.
 maven_group=com.faboslav.friendsandfoes