合并

.github/workflows/build_all.yml

@@ -0,0 +1,78 @@
+name: Build All Minecraft Versions
+
+on:
+  workflow_dispatch:  # 手动触发
+    inputs:
+      version:
+        description: 'VulkanMod 版本号（如 0.6.2）'
+        required: true
+        default: '0.6.2'
+
+permissions:
+  contents: write
+
+jobs:
+  build-all:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        mc_version:
+          - 1.18.2
+          - 1.19.2
+          - 1.19.4
+          - 1.20.x
+          - 1.21
+      fail-fast: false  # 一个失败不影响其他版本
+
+    steps:
+      - name: 检出 ${{ matrix.mc_version }} 分支
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ matrix.mc_version }}
+
+      - name: 设置 JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+
+      - name: 修改版本号为 ${{ github.event.inputs.version }}
+        run: |
+          # 修改 gradle.properties 中的版本号
+          sed -i 's/^mod_version=.*/mod_version=${{ github.event.inputs.version }}/' gradle.properties 2>/dev/null || \
+          sed -i 's/^version=.*/version=${{ github.event.inputs.version }}/' gradle.properties 2>/dev/null || \
+          echo "未找到版本号字段，请检查 gradle.properties"
+          cat gradle.properties | grep -E "mod_version|version" || echo "警告：未找到版本号定义"
+
+      - name: 赋予 gradlew 执行权限
+        run: chmod +x gradlew
+
+      - name: 构建 Mod JAR
+        run: ./gradlew build
+
+      - name: 查找生成的 JAR
+        id: find_jar
+        run: |
+          JAR_PATH=$(find build/libs -name "*.jar" ! -name "*-sources.jar" ! -name "*-dev.jar" | head -n 1)
+          if [ -z "$JAR_PATH" ]; then
+            # 如果没有排除 sources/dev，就取第一个 jar
+            JAR_PATH=$(find build/libs -name "*.jar" | head -n 1)
+          fi
+          echo "jar_path=$JAR_PATH" >> $GITHUB_OUTPUT
+          echo "找到 JAR: $JAR_PATH"
+
+      - name: 上传到 GitHub Release（每个 MC 版本单独 Release）
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: v${{ github.event.inputs.version }}-${{ matrix.mc_version }}
+          name: VulkanMod ${{ github.event.inputs.version }} (MC ${{ matrix.mc_version }})
+          body: |
+            🚀 VulkanMod ${{ github.event.inputs.version }} for Minecraft ${{ matrix.mc_version }}
+
+            - 基于分支: ${{ matrix.mc_version }}
+            - 自动构建时间: ${{ github.server_time }}
+          files: ${{ steps.find_jar.outputs.jar_path }}
+          draft: false
+          prerelease: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build_release.yml

@@ -0,0 +1,38 @@
+name: Build Specific MC Version
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: '分支名（如 1.21.4）'
+        required: true
+        default: '1.21.4'
+      mc_version:
+        description: 'Minecraft 版本（用于 Release 名称）'
+        required: true
+        default: '1.21.4'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.branch }}
+
+      - name: 设置 JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+
+      - name: 构建
+        run: |
+          chmod +x gradlew
+          ./gradlew build
+
+      - name: 上传 JAR
+        uses: actions/upload-artifact@v4
+        with:
+          name: VulkanMod-${{ github.event.inputs.mc_version }}
+          path: build/libs/*.jar

.github/workflows/buildvk11.yml

@@ -0,0 +1,33 @@
+name: Build Mod for Multiple Versions
+
+on:
+  push:
+    branches: [ main ]  # 或指定 0.6.2 对应的分支
+  workflow_dispatch:    # 支持手动触发
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        mc_version: [1.20.1, 1.21, 1.21.1]  # 修改为你需要的版本列表
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
+      with:
+        java-version: '21'
+        distribution: 'temurin'
+    - name: Build with Gradle
+      run: |
+        # 尝试通过命令行参数覆盖 Minecraft 版本
+        # 具体参数需要根据 build.gradle 的逻辑来定，通常需修改 gradle.properties
+        sed -i "s/minecraft_version=.*/minecraft_version=${{ matrix.mc_version }}/" gradle.properties
+        chmod +x gradlew
+        ./gradlew build
+    - name: Upload JAR
+      uses: actions/upload-artifact@v4
+      with:
+        name: VulkanMod-${{ matrix.mc_version }}
+        path: build/libs/*.jar

README.md

@@ -1,77 +1,3 @@
-# <a href="https://github.com/xCollateral/VulkanMod"> <img src="./src/main/resources/assets/vulkanmod/Vlogo.png" width="30" height="30"/> </a> VulkanMod
-
-This is a fabric mod that introduces a brand new **Vulkan** based voxel rendering engine to **Minecraft java** in order to both replace the default OpenGL renderer and bring performance improvements.
-
-### Why?
-- Highly experimental project that overhauls and modernizes the internal renderer for Minecraft. <br>
-- Updates the renderer from OpenGL 3.2 to Vulkan 1.2.  <br>
-- Provides a potential reference for a future-proof Vulkan codebase for Minecraft Java. <br>
-- Utilizes the VulkanAPI to allow for capabilities not always possible with OpenGL. <br>
-- Including reduced CPU Overhead and use of newer, modern hardware capabilities. <br>
-
-### Demonstration Video:
-
-[![Demostration Video](http://img.youtube.com/vi/sbr7UxcAmOE/0.jpg)](https://youtu.be/sbr7UxcAmOE)
-
-## FAQ
-- Remember to check the [Wiki](https://github.com/xCollateral/VulkanMod/wiki) we wrote before asking for support!
-
-## Installation
-
-### Download Links:
-
-- [![CurseForge](https://cf.way2muchnoise.eu/full_635429_downloads.svg?badge_style=flat)](https://www.curseforge.com/minecraft/mc-mods/vulkanmod)
-
-- [![Modrinth Downloads](https://img.shields.io/modrinth/dt/JYQhtZtO?logo=modrinth&label=Modrinth%20Downloads)](https://modrinth.com/mod/vulkanmod/versions)
-
-- [![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/xCollateral/VulkanMod/total?style=flat-square&logo=github&label=Github%20Downloads)](https://github.com/xCollateral/VulkanMod/releases)
-
-### Install guide:
->1) Install the [fabric modloader](https://fabricmc.net).
->1) Download and put the `Vulkanmod.jar` file into `.minecraft/mods`
->1) Enjoy !
-
-## Useful links
-<table>
-    <tr>
-      <th> Discord server</th>
-      <th> Ko-Fi</th>
-    </tr>
-  <tr>
-    <td style="text-align:center"> 
-        <a href="https://discord.gg/FVXg7AYR2Q"> 
-            <img alt="Discord" align="top" src="https://img.shields.io/discord/963180553547419670?style=flat-square&logo=discord&logoColor=%23FFFFFF&label=Vulkanmod%20official%20discord%20server&labelColor=%235865F2&color=%235865F2">
-        </a>
-     </td>
-    <td>
-        <a href="https://ko-fi.com/V7V7CHHJV">
-            <img alt="Static Badge" align="top" src="https://img.shields.io/badge/KoFi-%23ff5e5b?logo=ko-fi&logoColor=%23FFFFFF&link=https%3A%2F%2Fko-fi.com%2FV7V7CHHJV">
-        </a>
-    </td>
-  </tr>
-</table>
-
-
-## Features
-
-### Optimizations:
->- [x] Multiple chunk culling algorithms
->- [x] Reduced CPU overhead
->- [x] Improved GPU performance
->- [x] Indirect Draw mode (reduces CPU overhead)
->- [x] Chunk rendering optimizations
-
-### New changes:
->- [x] Native Wayland support
->- [x] GPU selector
->- [x] Windowed fullscreen mode
->- [x] Revamped graphic settings menu
->- [x] Resizable render frame queue
->- [ ] Shader support
->- [ ] Removed Herobrine
-
-
-## Notes
-- This mod is still in development, please report issues in the [issue tab](https://github.com/xCollateral/VulkanMod/issues) with logs attached!
-- This mode isn't just "minecraft on vulkan" (e.g: [zink](https://docs.mesa3d.org/drivers/zink.html) ), it is a full rewrite of the minecraft renderer.
+# <a href="https://github.com/xCollateral/VulkanMod"> <img src="./src/main/resources/assets/vulkanmod/vlogo.png" width="30" height="30"/> </a> VulkanMod
 
+这是一个专门用于给vulkan1.1做适配的版本

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.6.11'
+	id 'fabric-loom' version '1.12-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -20,10 +20,9 @@ dependencies {
 	mappings loom.officialMojangMappings()
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-	// Fabric API. This is technically optional, but you probably want it anyway.
+	// Fabric API.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-	// Needed in order to load mod namespace
 	ext.includeModule = { name ->
 		var module = fabricApi.module(name, project.fabric_version)
 		modImplementation(module)
@@ -32,8 +31,13 @@ dependencies {
 
 	includeModule("fabric-api-base")
 	includeModule("fabric-resource-loader-v0")
-	includeModule("fabric-rendering-fluids-v1")
+	includeModule("fabric-resource-loader-v1")
 	includeModule("fabric-rendering-v1")
+	includeModule("fabric-renderer-api-v1")
+	includeModule("fabric-rendering-fluids-v1")
+	includeModule("fabric-block-view-api-v2")
+	includeModule("fabric-lifecycle-events-v1")
+	includeModule("fabric-transitive-access-wideners-v1")
 }
 
 project.ext.lwjglVersion = "3.3.3"

gradle.properties

@@ -4,14 +4,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21
-yarn_mappings=1.21+build.1
-loader_version=0.16.5
+minecraft_version = 1.21.10
+yarn_mappings = 1.21.10+build.2
+loader_version = 0.17.3
 
 # Fabric API
-fabric_version=0.102.0+1.21
+fabric_version = 0.138.0+1.21.10
 
 # Mod Properties
-mod_version = 0.4.8_dev
+mod_version = 0.6.2
 maven_group = net.vulkanmod
-archives_base_name = VulkanMod_1.21
+archives_base_name = VulkanMod_1.21.10

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/net/vulkanmod/Initializer.java

@@ -1,10 +1,13 @@
 package net.vulkanmod;
 
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.renderer.v1.Renderer;
 import net.fabricmc.loader.api.FabricLoader;
 import net.vulkanmod.config.Config;
 import net.vulkanmod.config.Platform;
+import net.vulkanmod.config.UpdateChecker;
 import net.vulkanmod.config.video.VideoModeManager;
+import net.vulkanmod.render.chunk.build.frapi.VulkanModRenderer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -35,6 +38,10 @@ public void onInitializeClient() {
 				.resolve("vulkanmod_settings.json");
 
 		CONFIG = loadConfig(configPath);
+
+		Renderer.register(VulkanModRenderer.INSTANCE);
+
+		UpdateChecker.checkForUpdates();
 	}
 
 	private static Config loadConfig(Path path) {

src/main/java/net/vulkanmod/config/Config.java

@@ -13,19 +13,22 @@
 import java.util.Collections;
 
 public class Config {
-
-    public int frameQueueSize = 2;
     public VideoModeSet.VideoMode videoMode = VideoModeManager.getFirstAvailable().getVideoMode();
-    public boolean windowedFullscreen = false;
+    public int windowMode = 0;
 
     public int advCulling = 2;
-    public boolean indirectDraw = false;
+    public boolean indirectDraw = true;
 
     public boolean uniqueOpaqueLayer = true;
     public boolean entityCulling = true;
     public int device = -1;
 
     public int ambientOcclusion = 1;
+    public int frameQueueSize = 2;
+    public int builderThreads = 0;
+
+    public boolean backFaceCulling = true;
+    public boolean textureAnimations = true;
 
     public void write() {
 

src/main/java/net/vulkanmod/config/Platform.java

@@ -2,6 +2,7 @@
 
 import org.apache.commons.lang3.SystemUtils;
 import org.lwjgl.glfw.GLFW;
+import org.lwjgl.system.Configuration;
 
 import static net.vulkanmod.Initializer.LOGGER;
 import static org.lwjgl.glfw.GLFW.*;