Merge branch 'master' into physics

# Conflicts:
#	BUILD.bazel
#	MODULE.bazel
#	README.md
#	blazerod/render/src/main/kotlin/top/fifthlight/blazerod/model/ModelInstance.kt
#	maven_install.json

Author: fifth-light

.github/workflows/build.yml

@@ -29,6 +29,7 @@ jobs:
             @//blazerod/model/model-pmd \
             @//blazerod/model/model-pmx \
             @//blazerod/model/model-vmd \
+            @//blazerod/model/model-assimp:model-assimp-merged \
             @//blazerod/example/ball_block
       - name: test
         run: |
@@ -50,4 +51,5 @@ jobs:
             bazel-bin/blazerod/model/model-pmd/model-pmd.jar
             bazel-bin/blazerod/model/model-pmx/model-pmx.jar
             bazel-bin/blazerod/model/model-vmd/model-vmd.jar
+            bazel-bin/blazerod/model/model-assimp/model-assimp-merged.jar
             bazel-bin/blazerod/example/ball_block/ball_block.jar

BUILD.bazel

@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
 load("@//rule:extract_update_log.bzl", "extract_update_log")
 load("//:properties.bzl", "mod_version")
 load("@rules_java//java:defs.bzl", "java_plugin")
+load("@rules_java//java:defs.bzl", "java_library")
 
 kt_compiler_plugin(
     name = "serialization_plugin",
@@ -142,3 +143,15 @@ platform(
         "@platforms//cpu:aarch64",
     ]
 )
+
+alias(
+    name = "license",
+    visibility = ["//visibility:public"],
+    actual = "LICENSE",
+)
+
+java_library(
+    name = "license_jar",
+    visibility = ["//visibility:public"],
+    resources = [":license"],
+)

MODULE.bazel

@@ -25,7 +25,7 @@ git_override(
     commit = "22b643d23414379b760fced29f36e766dde5fd2a",
     patch_strip = 1,
     patches = [
-        "@//external/rules_jni/patches:armv7-cpu.patch",
+        "@//third_party/rules_jni/patches:armv7-cpu.patch",
     ],
 )
 
@@ -80,6 +80,18 @@ maven.install(
         "io.github.douira:glsl-transformer:2.0.1",
         "org.anarres:jcpp:1.4.14",
         "com.illposed.osc:javaosc-core:0.9",
+        "org.lwjgl:lwjgl:3.3.3",
+        "org.lwjgl:lwjgl-assimp:3.3.3",
+        "org.lwjgl:lwjgl-assimp:jar:natives-windows:3.3.3",
+        "org.lwjgl:lwjgl-assimp:jar:natives-windows-x86:3.3.3",
+        "org.lwjgl:lwjgl-assimp:jar:natives-windows-arm64:3.3.3",
+        "org.lwjgl:lwjgl-assimp:jar:natives-linux-arm32:3.3.3",
+        "org.lwjgl:lwjgl-assimp:jar:natives-linux-arm64:3.3.3",
+        "org.lwjgl:lwjgl-assimp:jar:natives-linux:3.3.3",
+        "org.lwjgl:lwjgl-assimp:jar:natives-macos:3.3.3",
+        "org.lwjgl:lwjgl-assimp:jar:natives-macos-arm64:3.3.3",
+        "team.unnamed:mocha:3.0.0",
+        "org.javassist:javassist:3.30.2-GA",
 
         # test dependencies
         "org.jetbrains.kotlin:kotlin-test-junit5:2.1.10",
@@ -106,14 +118,14 @@ git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "g
 git_repository(
     name = "libbulletjme",
     commit = "ea117c17501001bd96db05e0fc479420efb3d79e",
-    build_file = "@//external/libbulletjme:BUILD.libbulletjme.bazel",
+    build_file = "@//third_party/libbulletjme:BUILD.libbulletjme.bazel",
     remote = "https://github.com/stephengold/Libbulletjme.git",
     patch_strip = 1,
     patches = [
-        "@//external/libbulletjme/patches:vhacd-mutex.patch",
-        "@//external/libbulletjme/patches:winsock2-case.patch",
-        "@//external/libbulletjme/patches:remove-collision-group-one-bit-assert.patch",
-        "@//external/libbulletjme/patches:add-ground-object.patch",
+        "@//third_party/libbulletjme/patches:vhacd-mutex.patch",
+        "@//third_party/libbulletjme/patches:winsock2-case.patch",
+        "@//third_party/libbulletjme/patches:remove-collision-group-one-bit-assert.patch",
+        "@//third_party/libbulletjme/patches:add-ground-object.patch",
     ],
 )
 
@@ -130,7 +142,14 @@ http_jar(
     sha256 = "0e6bd470311cc938b992e9065e0f94a3f603b68b5dfcde25102c64b8733b69bd",
     downloaded_file_name = "iris.jar",
 )
-
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+# Download YSM for its bundled model
+http_archive(
+    name = "yes_steve_model",
+    url = "https://cdn.modrinth.com/data/86xjpqqS/versions/1cHRrrpZ/yesstevemodel-fabric-1.21.1-2.4.1-release.jar",
+    sha256 = "ec51cfae84d219a45fac5098a31bfe980bcb7c2d8b413e8fffbd05a411a85680",
+    build_file = "@//third_party/ysm:BUILD.ysm.bazel",
+)
 http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 http_file(
     name = "makeup_ultra_fast",

blazerod/BUILD.bazel

@@ -31,6 +31,7 @@ kt_jvm_library(
     resource_strip_prefix = "blazerod/src/main/resources",
     resource_jars = [
         ":fabric_mod_json",
+        "//:license_jar"
     ],
     exports = [
         "//blazerod/model/model-formats",
@@ -49,6 +50,7 @@ merge_jij(
         "//blazerod/model/model-pmd": "blazerod-model-formats-pmd:=",
         "//blazerod/model/model-pmx": "blazerod-model-formats-pmx:=",
         "//blazerod/model/model-vmd": "blazerod-model-formats-vmd:=",
+        "//blazerod/model/model-bedrock": "blazerod-model-formats-bedrock:=",
         "//blazerod/render": "blazerod-render:=",
         "@libbulletjme//:libbulletjme": "libbulletjme_blazerod:22.0.1+patch1",
         "@libbulletjme//:libbulletjme_natives": "libbulletjme_natives_blazerod:22.0.1+patch1",

blazerod/example/ball_block/src/main/java/top/fifthlight/blazerod/example/ballblock/BallBlockEntityRenderer.java

@@ -7,7 +7,6 @@
 import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.math.Vec3d;
-import org.joml.Matrix4f;
 
 import java.util.Objects;
 
@@ -16,16 +15,12 @@ public class BallBlockEntityRenderer implements BlockEntityRenderer<BallBlockEnt
     public BallBlockEntityRenderer(BlockEntityRendererFactory.Context context) {
     }
 
-    private final Matrix4f matrix = new Matrix4f();
-
     @Override
     public void render(BallBlockEntity entity, float tickProgress, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, Vec3d cameraPos) {
         var instance = BallBlockMod.getBallInstance();
         if (instance == null) {
             return;
         }
-        matrix.set(matrices.peek().getPositionMatrix());
-        matrix.mulLocal(RenderSystem.getModelViewStack());
         var client = MinecraftClient.getInstance();
         var frameBuffer = client.getFramebuffer();
         var colorFrameBuffer = RenderSystem.outputColorTextureOverride != null
@@ -35,6 +30,6 @@ public void render(BallBlockEntity entity, float tickProgress, MatrixStack matri
                 ? (RenderSystem.outputDepthTextureOverride != null ? RenderSystem.outputDepthTextureOverride : frameBuffer.getDepthAttachmentView())
                 : null;
         var renderer = BallBlockMod.getRenderer();
-        renderer.render(Objects.requireNonNull(colorFrameBuffer), depthFrameBuffer, instance.createRenderTask(matrix, light), instance.getScene());
+        renderer.render(Objects.requireNonNull(colorFrameBuffer), depthFrameBuffer, instance.createRenderTask(matrices.peek().getPositionMatrix(), light), instance.getScene());
     }
 }

blazerod/example/ball_block/src/main/java/top/fifthlight/blazerod/example/ballblock/BallBlockMod.java

@@ -86,6 +86,7 @@ public static ModelInstance getBallInstance() {
     @Override
     public void onInitializeClient() {
         ModBlocks.initialize();
+        ModelFileLoaders.initialize();
         BlockEntityRendererFactories.register(ModBlockEntities.BALL_BLOCK_ENTITY, BallBlockEntityRenderer::new);
         ClientLifecycleEvents.CLIENT_STARTED.register(client -> loadModel());
         ClientLifecycleEvents.CLIENT_STOPPING.register(client -> {

blazerod/model/model-assimp/BUILD.bazel

@@ -0,0 +1,61 @@
+load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("//:properties.bzl", "blazerod_version")
+load("//rule:fabric_mod_json_jar.bzl", "fabric_mod_json_jar")
+load("//rule:merge_jij.bzl", "merge_jij")
+
+fabric_mod_json_jar(
+    name = "fabric_mod_json",
+    src = "src/main/resources/fabric.mod.json",
+    resource_strip_prefix = "blazerod/model/model-assimp",
+    substitutions = {
+        "${version}": blazerod_version,
+    },
+)
+
+kt_jvm_library(
+    name = "model-assimp",
+    srcs = glob(["src/main/kotlin/**/*.kt"]),
+    resource_jars = [
+        ":fabric_mod_json",
+        "//blazerod:icon",
+    ],
+    resources = glob(
+        include = ["src/main/resources/**"],
+        exclude = ["src/main/resources/fabric.mod.json"],
+    ),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//blazerod/model/model-base",
+        "@maven//:org_lwjgl_lwjgl",
+        "@maven//:org_lwjgl_lwjgl_assimp",
+    ],
+    runtime_deps = [
+        "@maven//:org_slf4j_slf4j_api",
+        "@maven//:org_lwjgl_lwjgl_assimp_natives_windows",
+        "@maven//:org_lwjgl_lwjgl_assimp_natives_windows_x86",
+        "@maven//:org_lwjgl_lwjgl_assimp_natives_windows_arm64",
+        "@maven//:org_lwjgl_lwjgl_assimp_natives_linux_arm32",
+        "@maven//:org_lwjgl_lwjgl_assimp_natives_linux_arm64",
+        "@maven//:org_lwjgl_lwjgl_assimp_natives_linux",
+        "@maven//:org_lwjgl_lwjgl_assimp_natives_macos",
+        "@maven//:org_lwjgl_lwjgl_assimp_natives_macos_arm64",
+    ],
+)
+
+
+merge_jij(
+    name = "model-assimp-merged",
+    input = ":model-assimp",
+    visibility = ["//visibility:public"],
+    deps = {
+        "@maven//:org_lwjgl_lwjgl_assimp": "org_lwjgl_lwjgl_assimp:3.3.3",
+        "@maven//:org_lwjgl_lwjgl_assimp_natives_windows": "org_lwjgl_lwjgl_assimp_natives_windows:3.3.3",
+        "@maven//:org_lwjgl_lwjgl_assimp_natives_windows_x86": "org_lwjgl_lwjgl_assimp_natives_windows_x86:3.3.3",
+        "@maven//:org_lwjgl_lwjgl_assimp_natives_windows_arm64": "org_lwjgl_lwjgl_assimp_natives_windows_arm64:3.3.3",
+        "@maven//:org_lwjgl_lwjgl_assimp_natives_linux_arm32": "org_lwjgl_lwjgl_assimp_natives_linux_arm32:3.3.3",
+        "@maven//:org_lwjgl_lwjgl_assimp_natives_linux_arm64": "org_lwjgl_lwjgl_assimp_natives_linux_arm64:3.3.3",
+        "@maven//:org_lwjgl_lwjgl_assimp_natives_linux": "org_lwjgl_lwjgl_assimp_natives_linux:3.3.3",
+        "@maven//:org_lwjgl_lwjgl_assimp_natives_macos": "org_lwjgl_lwjgl_assimp_natives_macos:3.3.3",
+        "@maven//:org_lwjgl_lwjgl_assimp_natives_macos_arm64": "org_lwjgl_lwjgl_assimp_natives_macos_arm64:3.3.3",
+    },
+)