Merge branch 'master' into 1.21.2

FrozenBlock · Sep 17, 2024 · 1fea55f · 1fea55f
2 parents ec40009 + ae1f5cb
commit 1fea55f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/src/main/java/net/frozenblock/lib/cape/api/CapeUtil.java b/src/main/java/net/frozenblock/lib/cape/api/CapeUtil.java
@@ -54,6 +54,10 @@ public static boolean canPlayerUserCape(UUID uuid, @NotNull Cape cape) {
 		return Registry.register(FrozenRegistry.CAPE, id, new Cape(id, buildCapeTextureLocation(id), Optional.of(allowedPlayers)));
 	}
 
+	public static @NotNull Cape registerCapeWithWhitelist(ResourceLocation id, UUID... uuids) {
+		return Registry.register(FrozenRegistry.CAPE, id, new Cape(id, buildCapeTextureLocation(id), Optional.of(ImmutableList.copyOf(uuids))));
+	}
+
 	private static ResourceLocation buildCapeTextureLocation(@NotNull ResourceLocation cape) {
 		return ResourceLocation.tryBuild(cape.getNamespace(), "textures/cape/" + cape.getPath() + ".png");
 	}

diff --git a/src/main/java/net/frozenblock/lib/cape/impl/ServerCapeData.java b/src/main/java/net/frozenblock/lib/cape/impl/ServerCapeData.java
@@ -77,5 +77,6 @@ public static void init() {
 		allArray.addAll(composers);
 
 		CapeUtil.registerCapeWithWhitelist(FrozenSharedConstants.id("frozenblock"), allArray);
+		CapeUtil.registerCapeWithWhitelist(FrozenSharedConstants.id("very_blue_cape"), UUID.fromString("ccaa0664-8fd4-4176-96b4-eab6f8c75083")); // Alex
 	}
 }
diff --git a/src/main/resources/assets/frozenlib/lang/en_us.json b/src/main/resources/assets/frozenlib/lang/en_us.json
@@ -51,6 +51,7 @@
   "cape.frozenlib.none": "§cMissing value!",
   "cape.frozenlib.dummy": "§cNone",
   "cape.frozenlib.frozenblock": "FrozenBlock",
+  "cape.frozenlib.very_blue_cape": "Very Blue Cape",
 
   "commands.wind.display.global.success": "The global wind is currently: %s, %s, %s.",
   "commands.wind.display.pos.success": "The wind at %s, %s, %s currently: %s, %s, %s.",

diff --git a/src/main/resources/assets/frozenlib/textures/cape/very_blue_cape.png b/src/main/resources/assets/frozenlib/textures/cape/very_blue_cape.png