更新mdbook和仓库规则

Author: fifth-light

MODULE.bazel

@@ -14,10 +14,19 @@ bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "rules_rust", version = "0.67.0")
 bazel_dep(name = "rules_rust_mdbook", version = "0.67.0")
 
+include("//module:rust.MODULE.bazel")
+include("//module:mdbook.MODULE.bazel")
+
 include("//module:minecraft.MODULE.bazel")
+include("//module:rules.MODULE.bazel")
+
 include("//module:neoforge.MODULE.bazel")
 include("//module:fabric.MODULE.bazel")
-include("//module:rules.MODULE.bazel")
+
+include("//module:sodium.MODULE.bazel")
+include("//module:iris.MODULE.bazel")
+include("//module:modrinth.MODULE.bazel")
+
 include("//module:blazerod.MODULE.bazel")
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
@@ -37,15 +46,18 @@ maven.install(
 
         # Graphics
         "org.joml:joml:1.10.5",
+        "it.unimi.dsi:fastutil:8.5.15",
 
         # Swing
         "org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.10.1",
 
-        # Build dependencies
-        "com.fasterxml.jackson.core:jackson-core:2.9.6",
-        "com.fasterxml.jackson.core:jackson-annotations:2.9.6",
-        "com.fasterxml.jackson.core:jackson-databind:2.9.6",
-        "com.squareup:kotlinpoet:2.2.0",
+        # Testing
+        "org.jetbrains.kotlin:kotlin-test-junit5:2.1.10",
+        "org.junit.jupiter:junit-jupiter-api:5.12.2",
+        "org.junit.jupiter:junit-jupiter-engine:5.12.2",
+        "org.junit.platform:junit-platform-suite-api:1.12.2",
+        "org.junit.platform:junit-platform-suite-engine:1.12.2",
+        "org.junit.platform:junit-platform-console:1.12.2",
     ],
     fetch_sources = True,
     lock_file = "//:maven_install.json",

MODULE.bazel.lock

@@ -72,7 +72,7 @@ kt_merge_library(
         "//mod/src/game:remapped_client_access_widened_named",
         "@maven//:net_fabricmc_fabric_loader",
         "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm",
-        "@minecraft//:1.21.8_client_libraries",
+        "@minecraft//1.21.8:client_libraries",
     ],
 )
 

armorstand/fabric_client/BUILD.bazel

@@ -46,6 +46,6 @@ kt_merge_library(
         "//game/1.21.8:game_client_named",
         "@maven//:net_fabricmc_fabric_loader",
         "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm",
-        "@minecraft//:1.21.8_client_libraries",
+        "@minecraft//1.21.8:client_libraries",
     ],
 )

armorstand/fabric_main/BUILD.bazel

@@ -55,7 +55,7 @@ kt_merge_library(
         "//game/1.21.8:neoforge_named",
         "//game/1.21.8:sodium_neoforge",
         "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm",
-        "@minecraft//:1.21.8_client_libraries",
+        "@minecraft//1.21.8:client_libraries",
         "@neoforge_1_21_8//:neoforge_deps",
     ],
 )

armorstand/neoforge_client/BUILD.bazel

@@ -72,7 +72,7 @@ kt_jvm_library(
     srcs = ["src/Dummy.kt"],
     resource_jars = [
         ":neoforge_mod_toml",
-        "//:license_jar",
+        ":license_jar",
     ],
     resource_strip_prefix = "blazerod/resources",
     resources = glob(

blazerod/BUILD.bazel

@@ -12,7 +12,7 @@ remap_jar(
         "//game/1.21.8:game_client_intermediary",
     ],
     from_namespace = "intermediary",
-    inputs = ["@maven//:net_fabricmc_fabric_api_fabric_api"],
+    inputs = ["@maven_fabric_1_21_8//:net_fabricmc_fabric_api_fabric_api"],
     mapping = "//game/1.21.8:game_merged_mapping",
     mixin = True,
     remap_transitive_deps = True,
@@ -79,48 +79,3 @@ fabric_merge_jij(
         "//blazerod/render:render_fabric_merged": "blazerod-render:=",
     },
 )
-
-generate_remap_classpath(
-    name = "remap_classpath",
-    prefix = "../../../../../../",
-    deps = [
-        ":remapped_deps",
-        "//game/1.21.8:game_client_intermediary",
-    ],
-)
-
-java_binary(
-    name = "client",
-    srcs = [],
-    data = [
-        ":remap_classpath",
-        "@minecraft_assets//:assets",
-        "@minecraft_assets//:assets_1.21.8",
-    ],
-    jvm_flags = [
-        "-Dfabric.development=true",
-        "-Dfabric.remapClasspathFile=$(rlocationpath :remap_classpath)",
-        "-Ddev.launch.version=1.21.8",
-        "-Ddev.launch.type=client",
-        "-Ddev.launch.assetsPath=$(rlocationpath @minecraft_assets//:assets)",
-        "-Ddev.launch.mainClass=net.fabricmc.loader.impl.launch.knot.KnotClient",
-        "-Ddev.launch.expandRunfileProperties=fabric.remapClasspathFile",
-        "-Dblazerod.debug=true",
-        "-Dblazerod.debug.gui=true",
-        "-Xmx4G",
-    ],
-    main_class = "top.fifthlight.fabazel.devlaunchwrapper.DevLaunchWrapper",
-    runtime_deps = [
-        ":ball_block_unmapped",
-        ":remapped_deps",
-        "//blazerod:blazerod_fabric_without_jij",
-        "//game/1.21.8:game_client_named",
-        "//rule/dev_launch_wrapper",
-        "@maven//:io_github_llamalad7_mixinextras_fabric",
-        "@maven//:net_fabricmc_fabric_language_kotlin",
-        "@maven//:net_fabricmc_fabric_loader",
-        "@maven//:net_fabricmc_sponge_mixin",
-        "@maven//:net_fabricmc_yarn_v2",
-        "@minecraft//1.21.8:client_libraries",
-    ],
-)

blazerod/example/ball_block/BUILD.bazel

@@ -7,7 +7,7 @@ remap_jar(
     name = "remapped_deps",
     classpath = ["//game/1.21.8:game_client_intermediary"],
     from_namespace = "intermediary",
-    inputs = ["@maven//:net_fabricmc_fabric_api_fabric_api"],
+    inputs = ["@maven_fabric_1_21_8//:net_fabricmc_fabric_api_fabric_api"],
     mapping = "//game/1.21.8:game_merged_mapping",
     mixin = True,
     remap_transitive_deps = True,
@@ -56,8 +56,8 @@ kt_merge_library(
     deps = [
         ":remapped_deps",
         "//blazerod/render/game:remapped_client_access_widened_named",
-        "//game/1.21.8:iris_fabric",
-        "//game/1.21.8:sodium_fabric",
+        "//game/1.21.8:game_client_neoforge",
+        "//game/1.21.8:game_iris_named",
         "@maven//:net_fabricmc_fabric_language_kotlin",
         "@maven//:net_fabricmc_fabric_loader",
         "@maven//:org_slf4j_slf4j_api",

blazerod/render/fabric/BUILD.bazel

@@ -2,17 +2,17 @@ load("//rule:merge_library.bzl", "kt_merge_library")
 
 kt_merge_library(
     name = "extension",
-    visibility = ["//blazerod/render:__subpackages__"],
     srcs = glob([
         "**/*.kt",
         "**/*.java",
     ]),
+    merge_deps = [
+        "//blazerod/render/main/systems",
+    ],
+    visibility = ["//blazerod/render:__subpackages__"],
     deps = [
-        "//blazerod/render/game:remapped_client_access_widened_named",
         "//blazerod/model/model-base",
-        "@minecraft//:1.21.8_client_libraries",
+        "//blazerod/render/game:remapped_client_access_widened_named",
+        "@minecraft//1.21.8:client_libraries",
     ],
-    merge_deps = [
-        "//blazerod/render/main/systems",
-    ]
-)
+)

blazerod/render/main/extension/BUILD.bazel

@@ -13,9 +13,9 @@ java_merge_library(
     visibility = ["//blazerod/render:__subpackages__"],
     deps = [
         "//blazerod/render/game:remapped_client_access_widened_named",
-        "@maven//:io_github_llamalad7_mixinextras_fabric",
-        "@maven//:net_fabricmc_sponge_mixin",
         "@maven//:org_jetbrains_annotations",
-        "@minecraft//:1.21.8_client_libraries",
+        "@maven_fabric_1_21_8//:io_github_llamalad7_mixinextras_fabric",
+        "@maven_fabric_1_21_8//:net_fabricmc_sponge_mixin",
+        "@minecraft//1.21.8:client_libraries",
     ],
 )