Merge remote-tracking branch 'origin/1.19/dev' into 1.19/fabric/dev

Conflicts:
	build.gradle
	gradle.properties
	src/main/java/com/jozufozu/flywheel/core/model/BakedModelBuilder.java
	src/main/java/com/jozufozu/flywheel/core/model/ModelUtil.java
	src/main/java/com/jozufozu/flywheel/core/model/WorldModelBuilder.java
This commit is contained in:
PepperCode1 2023-07-07 14:53:51 -06:00
commit 20e23aff8f
2 changed files with 4 additions and 2 deletions

View file

@ -12,7 +12,7 @@ fabric_version = 0.76.0+1.19.2
# build dependency versions # build dependency versions
loom_version = 1.1-SNAPSHOT loom_version = 1.1-SNAPSHOT
cursegradle_version = 1.4.0 cursegradle_version = 1.4.0
parchment_version = 2022.11.06 parchment_version = 2022.11.27
use_parchment = true use_parchment = true

View file

@ -33,7 +33,9 @@ public class ModelUtil {
unshadedBuffer.release(); unshadedBuffer.release();
} }
RenderedBuffer buffer = shadedBuilder.end(); RenderedBuffer buffer = shadedBuilder.end();
return new ShadeSeparatedBufferedData.NativeImpl(buffer.vertexBuffer(), buffer.indexBuffer(), buffer.drawState(), unshadedStartVertex); ShadeSeparatedBufferedData bufferedData = new ShadeSeparatedBufferedData.NativeImpl(buffer.vertexBuffer(), buffer.indexBuffer(), buffer.drawState(), unshadedStartVertex);
buffer.release();
return bufferedData;
} }
public static ShadeSeparatedBufferedData getBufferedData(Bufferable bufferable) { public static ShadeSeparatedBufferedData getBufferedData(Bufferable bufferable) {