From 83d9ae0057b20ffcd3b896257cee7538a41e52f3 Mon Sep 17 00:00:00 2001
From: arcnmx <git@git.arcn.mx>
Date: Mon, 6 May 2024 11:48:31 -0700
Subject: [PATCH] feat(minecraft): beta apis

---
 nixos/minecraft/bedrock.nix           | 11 ++--
 packages/minecraft-bedrock/addons.nix | 86 ++++++++++++++-------------
 2 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/nixos/minecraft/bedrock.nix b/nixos/minecraft/bedrock.nix
index 8a9e0e2d..66f6d571 100644
--- a/nixos/minecraft/bedrock.nix
+++ b/nixos/minecraft/bedrock.nix
@@ -8,16 +8,17 @@ in {
       server-name = "Kat's Server";
       online-mode = true;
       #allow-cheats = true;
-      level-name = "KatBedrock";
+      #level-name = "KatBedrock";
+      level-name = "KatBedrockBeta";
       default-player-permission-level = "visitor";
     };
     packs = let
       addons = pkgs.minecraft-bedrock-addons;
     in {
-      #tree-capitator-bp.package = addons.true-tree-capitator-bp;
-      #tree-capitator-rp.package = addons.true-tree-capitator-rp;
-      tree-capitator-bh.package = addons.definitive-tree-capitator-bh;
-      tree-capitator-rs.package = addons.definitive-tree-capitator-rs;
+      tree-capitator-bp.package = addons.true-tree-capitator-bp;
+      tree-capitator-rp.package = addons.true-tree-capitator-rp;
+      #tree-capitator-bh.package = addons.definitive-tree-capitator-bh;
+      #tree-capitator-rs.package = addons.definitive-tree-capitator-rs;
     };
     allowPlayers = let
       base = 2535420000000000;
diff --git a/packages/minecraft-bedrock/addons.nix b/packages/minecraft-bedrock/addons.nix
index c712b12c..8f8e814c 100644
--- a/packages/minecraft-bedrock/addons.nix
+++ b/packages/minecraft-bedrock/addons.nix
@@ -1,9 +1,44 @@
-{ mkMinecraftBedrockServerAddon, fetchurl }: {
-  definitive-tree-capitator-bh = mkMinecraftBedrockServerAddon {
-    pname = "definitive-tree-capitator-bh";
-    version = "1.0.0";
-    mcpackId = "b3538a6c-3e42-400a-9ed0-5ec1670b796c";
+{ lib, mkMinecraftBedrockServerAddon, fetchurl }: let
+  inherit (lib.attrsets) mapAttrs;
+  true-tree-capitator = {
+    version = "1.2";
     mcpackVersion = "1.0.0";
+    mcVersion = "1.20.71";
+    sourceRoot = ".";
+    meta.homepage = "https://www.curseforge.com/minecraft-bedrock/addons/tree-capitator";
+  };
+  true-tree-capitator-bp = true-tree-capitator // {
+    pname = "true-tree-capitator-bp";
+    mcpackId = "4d0f6078-f2f9-415f-9848-b36b008127b4";
+    mcpackType = "behavior_packs";
+    src = fetchurl {
+      name = "Tree-capitator-BP-v1.2.mcpack";
+      url = "https://mediafilez.forgecdn.net/files/5237/589/Tree%20capitator%20%5BBP%5D%20v1.2.mcpack";
+      sha256 = "c4b702be4dd45707b66ef3cfda578695347caa6a43ead30c06dc17cd14a00040";
+    };
+    postPatch = ''
+      substituteInPlace manifest.json \
+        --replace "1.10.0-beta" "1.11.0-beta"
+    '';
+  };
+  true-tree-capitator-rp = true-tree-capitator // {
+    pname = "true-tree-capitator-rp";
+    mcpackId = "811af5f4-929b-4d77-aed4-119486b6c0a0";
+    mcpackType = "resource_packs";
+    src = fetchurl {
+      name = "Tree-capitator-RP-v1.2.mcpack";
+      url = "https://mediafilez.forgecdn.net/files/5237/590/Tree%20capitator%20%5BRP%5D%20v1.2.mcpack";
+      sha256 = "66c850106c7fa1764b32f20c555c1bb5e7e6905f3cbea4b429ca076e7a4cc31f";
+    };
+  };
+  definitive-tree-capitator = {
+    version = "1.0.0";
+    mcpackVersion = "1.0.0";
+    meta.homepage = "https://www.curseforge.com/minecraft-bedrock/addons/definitive-tree-capitator-addon";
+  };
+  definitive-tree-capitator-bh = definitive-tree-capitator // {
+    pname = "definitive-tree-capitator-bh";
+    mcpackId = "b3538a6c-3e42-400a-9ed0-5ec1670b796c";
     mcpackType = "behavior_packs";
     mcVersion = "1.20.20";
     src = fetchurl {
@@ -14,11 +49,9 @@
       ./definitive-tree-capitator-bh.patch
     ];
   };
-  definitive-tree-capitator-rs = mkMinecraftBedrockServerAddon {
+  definitive-tree-capitator-rs = definitive-tree-capitator // {
     pname = "definitive-tree-capitator-rs";
-    version = "1.0.0";
     mcpackId = "e01dd561-a1d9-45d0-b6ad-cd3858b93fe7";
-    mcpackVersion = "1.0.0";
     mcpackType = "resource_packs";
     mcVersion = "1.13.0";
     src = fetchurl {
@@ -26,36 +59,9 @@
       sha256 = "22c8ff1c85720052d9f2a0af1c205b5457a9bb806d65125cff3751fdbe22b864";
     };
   };
-  true-tree-capitator-bp = mkMinecraftBedrockServerAddon {
-    pname = "true-tree-capitator-bp";
-    version = "1.2";
-    mcpackVersion = "1.0.0";
-    mcpackId = "4d0f6078-f2f9-415f-9848-b36b008127b4";
-    mcpackType = "behavior_packs";
-    mcVersion = "1.20.71";
-    src = fetchurl {
-      name = "Tree-capitator-BP-v1.2.mcpack";
-      url = "https://mediafilez.forgecdn.net/files/5237/589/Tree%20capitator%20%5BBP%5D%20v1.2.mcpack";
-      sha256 = "c4b702be4dd45707b66ef3cfda578695347caa6a43ead30c06dc17cd14a00040";
-    };
-    sourceRoot = ".";
-    postPatch = ''
-      substituteInPlace manifest.json \
-        --replace "1.10.0-beta" "1.10.0"
-    '';
-  };
-  true-tree-capitator-rp = mkMinecraftBedrockServerAddon {
-    pname = "true-tree-capitator-rp";
-    version = "1.2";
-    mcpackVersion = "1.0.0";
-    mcpackId = "811af5f4-929b-4d77-aed4-119486b6c0a0";
-    mcpackType = "resource_packs";
-    mcVersion = "1.20.71";
-    src = fetchurl {
-      name = "Tree-capitator-RP-v1.2.mcpack";
-      url = "https://mediafilez.forgecdn.net/files/5237/590/Tree%20capitator%20%5BRP%5D%20v1.2.mcpack";
-      sha256 = "66c850106c7fa1764b32f20c555c1bb5e7e6905f3cbea4b429ca076e7a4cc31f";
-    };
-    sourceRoot = ".";
-  };
+in mapAttrs (_: mkMinecraftBedrockServerAddon) {
+  inherit
+    true-tree-capitator-bp true-tree-capitator-rp
+    definitive-tree-capitator-bh definitive-tree-capitator-rs
+  ;
 }