mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-11-14 06:24:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash with Rubidium when using batching

Browse Source 
- Backport fix from 1.18/next
- Downgrade and lock ForgeGradle version to fix build
- Update Forge to match 1.18/next
- Bump version
This commit is contained in:
PepperCode1 2022-08-13 13:54:52 -07:00
parent 2323e770d2
commit 527d91b8ae
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/ISSUE_TEMPLATE/bug_report.yml vendored
View File

@ -59,6 +59,7 @@ body:
label: Mod Version label: Mod Version
description: The version of the mod you were using when the bug occured description: The version of the mod you were using when the bug occured
options: options:
- "0.6.5"
- "0.6.4" - "0.6.4"
- "0.6.3" - "0.6.3"
- "0.6.2" - "0.6.2"

2
build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
maven { url = 'https://maven.parchmentmc.org' } maven { url = 'https://maven.parchmentmc.org' }
} }
dependencies { dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: "${forgegradle_version}", changing: true classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: "${forgegradle_version}", changing: false
classpath "org.spongepowered:mixingradle:${mixingradle_version}" classpath "org.spongepowered:mixingradle:${mixingradle_version}"
classpath "org.parchmentmc:librarian:${librarian_version}" classpath "org.parchmentmc:librarian:${librarian_version}"
} }

6
gradle.properties
View File

@ -2,14 +2,14 @@ org.gradle.jvmargs = -Xmx3G
org.gradle.daemon = false org.gradle.daemon = false
# mod version info # mod version info
mod_version = 0.6.4 mod_version = 0.6.5
artifact_minecraft_version = 1.18.2 artifact_minecraft_version = 1.18.2
minecraft_version = 1.18.2 minecraft_version = 1.18.2
forge_version = 40.1.60 forge_version = 40.1.68
# build dependency versions # build dependency versions
forgegradle_version = 5.1.+ forgegradle_version = 5.1.53
mixingradle_version = 0.7-SNAPSHOT mixingradle_version = 0.7-SNAPSHOT
mixin_version = 0.8.5 mixin_version = 0.8.5
librarian_version = 1.+ librarian_version = 1.+

5
src/main/java/com/jozufozu/flywheel/backend/instancing/DrawBuffer.java
View File

@ -39,7 +39,10 @@ public class DrawBuffer {
VertexFormat format = parent.format(); VertexFormat format = parent.format();
int byteSize = format.getVertexSize() * vertexCount; // Add one extra vertex to uphold the vanilla assumption that BufferBuilders have at least
// enough buffer space for one more vertex. Rubidium checks for this extra space when popNextBuffer
// is called and reallocates the buffer if there is not space for one more vertex.
int byteSize = format.getVertexSize() * (vertexCount + 1);
if (backingBuffer == null) { if (backingBuffer == null) {
backingBuffer = MemoryTracker.create(byteSize); backingBuffer = MemoryTracker.create(byteSize);