migrate to uv

Also ran formatters isort and black

Author: BPR02

.gitignore

@@ -7,6 +7,8 @@
 __pycache__/
 *.py[cod]
 *$py.class
+.venv
 
 ### Beet ###
+.beet_cache
 out/

poetry.lock

@@ -1,22 +1,23 @@
-[tool.poetry]
-name = "src"
+[project]
+name = "skyvoid"
 version = "1.0.0"
 description = "SkyBlock Data Packs"
-authors = ["BPR"]
-license = "MIT"
 readme = "README.md"
+requires-python = ">=3.10"
+dependencies = [
+    "beet >= 0.110.1",
+    "mecha >=0.98.0",
+    "bolt >=0.49.1",
+    "requests >= 2.32.3",
+    "beet-observer >= 0.7.1"
+]
 
-[tool.poetry.dependencies]
-python = "^3.10"
-beet = "^0.110.1"
-mecha = ">=0.98.0"
-bolt = ">=0.49.1"
-requests = "^2.32.3"
-beet-observer = "^0.7.1"
-
-[tool.poetry.dev-dependencies]
-black = "^22.6.0"
-isort = "^5.10.1"
+[tool.uv]
+dev-dependencies = [
+    "black >= 22.6.0, < 23.0.0",
+    "isort >= 5.10.1, < 6.0.0",
+    "uv >= 0.5.4",
+]
 
 [tool.beet]
 
@@ -25,7 +26,3 @@ typeCheckingMode = "strict"
 
 [tool.isort]
 profile = "black"
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"

pyproject.toml

@@ -3,24 +3,24 @@
 radius = 3
 height = 4
 
+
 def generate_predicate():
-  predicate = []
+    predicate = []
+
+    for x in range(-radius, radius + 1):
+        for z in range(-radius, radius + 1):
+            for y in range(height):
+                new = {
+                    "condition": "minecraft:location_check",
+                    "offsetX": x,
+                    "offsetY": y,
+                    "offsetZ": z,
+                    "predicate": {"biomes": "minecraft:snowy_taiga"},
+                }
+                predicate.append(new)
 
-  for x in range(-radius,radius+1):
-    for z in range(-radius,radius+1):
-      for y in range(height):
-        new = {
-          "condition": "minecraft:location_check",
-          "offsetX": x,
-          "offsetY": y,
-          "offsetZ": z,
-          "predicate": {
-            "biomes": "minecraft:snowy_taiga"
-          }
-        }
-        predicate.append(new)
+    return predicate
 
-  return predicate
 
 def beet_default(ctx: Context):
-  ctx.data["skyvoid_only_dirt:in_snowy_taiga"] = Predicate(generate_predicate())
+    ctx.data["skyvoid_only_dirt:in_snowy_taiga"] = Predicate(generate_predicate())

src/packs/starter_islands/skyvoid_only_dirt/generate_predicate.py

@@ -3,24 +3,26 @@
 radius = 2
 height = 2
 
+
 def generate_predicate():
-  predicate = []
+    predicate = []
+
+    for x in range(-radius, radius + 1):
+        for z in range(-radius, radius + 1):
+            for y in range(height):
+                new = {
+                    "condition": "minecraft:location_check",
+                    "offsetX": x,
+                    "offsetY": y,
+                    "offsetZ": z,
+                    "predicate": {"biomes": "minecraft:snowy_taiga"},
+                }
+                predicate.append(new)
 
-  for x in range(-radius,radius+1):
-    for z in range(-radius,radius+1):
-      for y in range(height):
-        new = {
-          "condition": "minecraft:location_check",
-          "offsetX": x,
-          "offsetY": y,
-          "offsetZ": z,
-          "predicate": {
-            "biomes": "minecraft:snowy_taiga"
-          }
-        }
-        predicate.append(new)
+    return predicate
 
-  return predicate
 
 def beet_default(ctx: Context):
-  ctx.data["skyvoid_vanilla_oneblock:in_snowy_taiga"] = Predicate(generate_predicate())
+    ctx.data["skyvoid_vanilla_oneblock:in_snowy_taiga"] = Predicate(
+        generate_predicate()
+    )

src/packs/starter_islands/skyvoid_vanilla_oneblock/generate_predicate.py

@@ -1,89 +1,92 @@
-from beet import Context, DataPack
-from beet.contrib.worldgen import * # type: ignore
 import os
 
+from beet import Context, DataPack
+from beet.contrib.worldgen import *  # type: ignore
+
 all_worldgen = [
-  Dimension,
-  DimensionType,
-  WorldgenBiome,
-  WorldgenConfiguredCarver,
-  WorldgenConfiguredFeature,
-  WorldgenDensityFunction,
-  WorldgenNoise,
-  WorldgenNoiseSettings,
-  WorldgenPlacedFeature,
-  WorldgenProcessorList,
-  WorldgenStructure,
-  WorldgenStructureSet,
-  WorldgenConfiguredSurfaceBuilder,
-  WorldgenTemplatePool,
-  WorldgenWorldPreset,
-  WorldgenFlatLevelGeneratorPreset,
-  WorldgenBiomeTag,
-  WorldgenStructureSetTag,
-  WorldgenStructureTag,
-  WorldgenConfiguredCarverTag,
-  WorldgenPlacedFeatureTag,
+    Dimension,
+    DimensionType,
+    WorldgenBiome,
+    WorldgenConfiguredCarver,
+    WorldgenConfiguredFeature,
+    WorldgenDensityFunction,
+    WorldgenNoise,
+    WorldgenNoiseSettings,
+    WorldgenPlacedFeature,
+    WorldgenProcessorList,
+    WorldgenStructure,
+    WorldgenStructureSet,
+    WorldgenConfiguredSurfaceBuilder,
+    WorldgenTemplatePool,
+    WorldgenWorldPreset,
+    WorldgenFlatLevelGeneratorPreset,
+    WorldgenBiomeTag,
+    WorldgenStructureSetTag,
+    WorldgenStructureTag,
+    WorldgenConfiguredCarverTag,
+    WorldgenPlacedFeatureTag,
 ]
 
+
 def standard_skyblock(ctx: Context):
-  island_path = ""
-  generation_path = ""
-  extra_path = ""
-  for filename in os.listdir("build"):
-    f = os.path.join("build", filename)
-    # checking if it is a file
-    if "skyvoid_island_standard_v" in f:
-      island_path = f
-    elif "skyvoid_worldgen_v" in f:
-      generation_path = f
-    elif "skyvoid_sand_island_v" in f:
-      extra_path = f
+    island_path = ""
+    generation_path = ""
+    extra_path = ""
+    for filename in os.listdir("build"):
+        f = os.path.join("build", filename)
+        # checking if it is a file
+        if "skyvoid_island_standard_v" in f:
+            island_path = f
+        elif "skyvoid_worldgen_v" in f:
+            generation_path = f
+        elif "skyvoid_sand_island_v" in f:
+            extra_path = f
+
+    island = DataPack(path=island_path, extend_namespace=all_worldgen)
+    generation = DataPack(path=generation_path, extend_namespace=all_worldgen)
+    extra = DataPack(path=extra_path, extend_namespace=all_worldgen)
 
-  island = DataPack(path=island_path,extend_namespace=all_worldgen)
-  generation = DataPack(path=generation_path,extend_namespace=all_worldgen)
-  extra = DataPack(path=extra_path,extend_namespace=all_worldgen)
+    ctx.data.merge(generation)
+    ctx.data.merge(extra)
+    ctx.data.merge(island)
 
-  ctx.data.merge(generation)
-  ctx.data.merge(extra)
-  ctx.data.merge(island)
 
 def vanilla_oneblock(ctx: Context):
-  island_path = ""
-  generation_path = ""
-  extra_path = ""
-  for filename in os.listdir("build"):
-    f = os.path.join("build", filename)
-    # checking if it is a file
-    if "skyvoid_island_oneblock_v" in f:
-      island_path = f
-    elif "skyvoid_worldgen_single_lava_v" in f:
-      generation_path = f
-    elif "skyvoid_vanilla_oneblock_starter_v" in f:
-      extra_path = f
+    island_path = ""
+    generation_path = ""
+    extra_path = ""
+    for filename in os.listdir("build"):
+        f = os.path.join("build", filename)
+        # checking if it is a file
+        if "skyvoid_island_oneblock_v" in f:
+            island_path = f
+        elif "skyvoid_worldgen_single_lava_v" in f:
+            generation_path = f
+        elif "skyvoid_vanilla_oneblock_starter_v" in f:
+            extra_path = f
 
-  island = DataPack(path=island_path,extend_namespace=all_worldgen)
-  generation = DataPack(path=generation_path,extend_namespace=all_worldgen)
-  extra = DataPack(path=extra_path,extend_namespace=all_worldgen)
+    island = DataPack(path=island_path, extend_namespace=all_worldgen)
+    generation = DataPack(path=generation_path, extend_namespace=all_worldgen)
+    extra = DataPack(path=extra_path, extend_namespace=all_worldgen)
 
-  ctx.data.merge(generation)
-  ctx.data.merge(extra)
-  ctx.data.merge(island)
+    ctx.data.merge(generation)
+    ctx.data.merge(extra)
+    ctx.data.merge(island)
 
 
 def skyblock_dirt(ctx: Context):
-  island_path = ""
-  generation_path = ""
-  for filename in os.listdir("build"):
-    f = os.path.join("build", filename)
-    # checking if it is a file
-    if "skyvoid_island_only_dirt_v" in f:
-      island_path = f
-    elif "skyvoid_worldgen_normal_end_v" in f:
-      generation_path = f
+    island_path = ""
+    generation_path = ""
+    for filename in os.listdir("build"):
+        f = os.path.join("build", filename)
+        # checking if it is a file
+        if "skyvoid_island_only_dirt_v" in f:
+            island_path = f
+        elif "skyvoid_worldgen_normal_end_v" in f:
+            generation_path = f
 
-  island = DataPack(path=island_path,extend_namespace=all_worldgen)
-  generation = DataPack(path=generation_path,extend_namespace=all_worldgen)
+    island = DataPack(path=island_path, extend_namespace=all_worldgen)
+    generation = DataPack(path=generation_path, extend_namespace=all_worldgen)
 
-  ctx.data.merge(generation)
-  ctx.data.merge(island)
+    ctx.data.merge(generation)
+    ctx.data.merge(island)