Merge branch '1.20.1'

* 1.20.1: Added missing translation Lowered fabric api version requirement Fixed forge networking issue # Conflicts: # forge/src/main/java/com/faboslav/friendsandfoes/platform/forge/PacketChannelManagerImpl.java
Faboslav · Dec 18, 2023 · ad387b5 · ad387b5
2 parents f9bc96a + fdc31c7
commit ad387b5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/common/src/main/java/com/faboslav/friendsandfoes/platform/PacketChannelManager.java b/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();
 	}
-
-
 }
diff --git a/common/src/main/resources/assets/friendsandfoes/lang/en_us.json b/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"
+}
diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/forge/FriendsAndFoesForge.java b/forge/src/main/java/com/faboslav/friendsandfoes/forge/FriendsAndFoesForge.java
@@ -139,10 +139,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)));
+			}
 		}
 	}
 

diff --git a/gradle.properties b/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
-Original file line number
+Diff line change
@@ Expand Up @@
     	public static <T extends Packet<T>> void sendToPlayer(Identifier channel, T packet, PlayerEntity player) {
     		throw new NotImplementedException();
     	}
     }