Merge branch '1.19.3' into 1.19.4

* 1.19.3: Bumped version, keep default mooblom variant # Conflicts: # gradle.properties
Faboslav · Dec 17, 2023 · f16ce17 · f16ce17
2 parents f124a86 + 08cbb70
commit f16ce17
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/common/src/main/java/com/faboslav/friendsandfoes/api/MoobloomVariantManager.java b/common/src/main/java/com/faboslav/friendsandfoes/api/MoobloomVariantManager.java
@@ -33,15 +33,19 @@ public final class MoobloomVariantManager extends JsonDataLoader
 	private static final MoobloomVariant DEFAULT_MOOBLOOM_VARIANT = new MoobloomVariant("buttercup", FriendsAndFoesBlocks.BUTTERCUP.get(), FriendsAndFoesTags.HAS_MOOBLOOMS);
 	public static final MoobloomVariantManager MOOBLOOM_VARIANT_MANAGER = new MoobloomVariantManager();
 
-	private List<MoobloomVariant> moobloomVariants = new ArrayList<>();
+	private List<MoobloomVariant> moobloomVariants = new ArrayList<>()
+	{
+		{
+			add(DEFAULT_MOOBLOOM_VARIANT);
+		}
+	};
 
 	private MoobloomVariantManager() {
 		super(GSON, "moobloom_variants");
 	}
 
 	@Override
 	protected void apply(Map<Identifier, JsonElement> loader, ResourceManager manager, Profiler profiler) {
-		moobloomVariants.clear();
 		List<MoobloomVariant> parsedMoobloomVariants = new ArrayList<>();
 		parsedMoobloomVariants.add(DEFAULT_MOOBLOOM_VARIANT);
 

diff --git a/common/src/main/java/com/faboslav/friendsandfoes/entity/PlayerIllusionEntity.java b/common/src/main/java/com/faboslav/friendsandfoes/entity/PlayerIllusionEntity.java
@@ -1,7 +1,7 @@
 package com.faboslav.friendsandfoes.entity;
 
 import com.faboslav.friendsandfoes.init.FriendsAndFoesSoundEvents;
-import net.minecraft.client.MinecraftClient;
+import com.faboslav.friendsandfoes.util.client.PlayerProvider;
 import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.client.render.entity.PlayerModelPart;
 import net.minecraft.client.util.DefaultSkinHelper;
@@ -174,7 +174,7 @@ private PlayerListEntry getPlayerListEntry() {
 				uuid = this.getUuid();
 			}
 
-			this.playerListEntry = MinecraftClient.getInstance().getNetworkHandler().getPlayerListEntry(uuid);
+			this.playerListEntry = PlayerProvider.getClientPlayerListEntry(uuid);
 		}
 
 		return this.playerListEntry;

diff --git a/common/src/main/java/com/faboslav/friendsandfoes/util/client/PlayerProvider.java b/common/src/main/java/com/faboslav/friendsandfoes/util/client/PlayerProvider.java
@@ -1,14 +1,21 @@
 package com.faboslav.friendsandfoes.util.client;
 
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.entity.player.PlayerEntity;
 
+import java.util.UUID;
+
 public final class PlayerProvider
 {
 	public static PlayerEntity getClientPlayer() {
 		return MinecraftClient.getInstance().player;
 	}
 
+	public static PlayerListEntry getClientPlayerListEntry(UUID uuid) {
+		return MinecraftClient.getInstance().getNetworkHandler().getPlayerListEntry(uuid);
+	}
+
 	private PlayerProvider() {
 	}
 }
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.4
+mod_version=2.0.5
 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
@@ -30,7 +30,7 @@ cca_version=5.2.0
 devauth_version=1.1.2
 
 # Fabric https://fabricmc.net/versions.html
-fabric_loader_version=0.15.1
+fabric_loader_version=0.14.21
 fabric_api_version=0.87.2+1.19.4
 
 # Forge https://files.minecraftforge.net/net/minecraftforge/forge