From 80a05bf3183d8b9281e1f39d0579a0344ca5d456 Mon Sep 17 00:00:00 2001 From: IMS212 Date: Wed, 18 Sep 2024 11:38:38 -0700 Subject: [PATCH] 24w38a --- build.gradle.kts | 4 ++-- .../render/AbstractBlockRenderContext.java | 24 ------------------- .../frapi/render/ItemRenderContext.java | 24 ------------------- .../render/immediate/CloudRenderer.java | 3 ++- .../model/MultiPartBakedModelMixin.java | 8 +++---- 5 files changed, 8 insertions(+), 55 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2b484d47ba..6e27a62bd4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,10 +3,10 @@ plugins { id("fabric-loom") version ("1.7.3") apply (false) } -val MINECRAFT_VERSION by extra { "24w37a" } +val MINECRAFT_VERSION by extra { "24w38a" } val NEOFORGE_VERSION by extra { "21.0.163" } val FABRIC_LOADER_VERSION by extra { "0.16.5" } -val FABRIC_API_VERSION by extra { "0.104.1+1.21.2" } +val FABRIC_API_VERSION by extra { "0.104.2+1.21.2" } // This value can be set to null to disable Parchment. val PARCHMENT_VERSION by extra { null } diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/AbstractBlockRenderContext.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/AbstractBlockRenderContext.java index 828e2663ae..df370b5697 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/AbstractBlockRenderContext.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/AbstractBlockRenderContext.java @@ -73,9 +73,6 @@ public void emitDirectly() { } }; - @Deprecated - private final BakedModelConsumerImpl vanillaModelConsumer = new BakedModelConsumerImpl(); - /** * The world which the block is being rendered in. */ @@ -158,13 +155,6 @@ public ItemDisplayContext itemTransformationMode() { throw new UnsupportedOperationException("itemTransformationMode can only be called on an item render context."); } - @SuppressWarnings("removal") - @Deprecated - @Override - public BakedModelConsumer bakedModelConsumer() { - return this.vanillaModelConsumer; - } - /** * Pipeline entrypoint - handles transform and culling checks. */ @@ -260,18 +250,4 @@ public void bufferDefaultModel(BakedModel model, @Nullable BlockState state) { editorQuad.clear(); } - - @SuppressWarnings("removal") - @Deprecated - private class BakedModelConsumerImpl implements BakedModelConsumer { - @Override - public void accept(BakedModel model) { - accept(model, AbstractBlockRenderContext.this.state); - } - - @Override - public void accept(BakedModel model, @Nullable BlockState state) { - AbstractBlockRenderContext.this.bufferDefaultModel(model, state); - } - } } diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/ItemRenderContext.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/ItemRenderContext.java index 67625e094e..bcc6b42d00 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/ItemRenderContext.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/ItemRenderContext.java @@ -69,9 +69,6 @@ public void emitDirectly() { } }; - @Deprecated - private final BakedModelConsumerImpl vanillaModelConsumer = new BakedModelConsumerImpl(); - private final ItemColors colorMap; private final VanillaModelBufferer vanillaBufferer; @@ -123,13 +120,6 @@ public ItemDisplayContext itemTransformationMode() { return transformMode; } - @SuppressWarnings("removal") - @Deprecated - @Override - public BakedModelConsumer bakedModelConsumer() { - return vanillaModelConsumer; - } - public void renderModel(ItemStack itemStack, ItemDisplayContext transformMode, boolean invert, PoseStack poseStack, MultiBufferSource bufferSource, int lightmap, int overlay, BakedModel model) { this.itemStack = itemStack; this.transformMode = transformMode; @@ -285,20 +275,6 @@ public void bufferDefaultModel(BakedModel model, @Nullable BlockState state) { } } - @SuppressWarnings("removal") - @Deprecated - private class BakedModelConsumerImpl implements BakedModelConsumer { - @Override - public void accept(BakedModel model) { - accept(model, null); - } - - @Override - public void accept(BakedModel model, @Nullable BlockState state) { - bufferDefaultModel(model, state); - } - } - /** used to accept a method reference from the ItemRenderer. */ @FunctionalInterface public interface VanillaModelBufferer { diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/immediate/CloudRenderer.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/immediate/CloudRenderer.java index 63cc32fdc8..bd857854c3 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/immediate/CloudRenderer.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/immediate/CloudRenderer.java @@ -1,5 +1,6 @@ package net.caffeinemc.mods.sodium.client.render.immediate; +import com.mojang.blaze3d.buffers.BufferUsage; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.platform.NativeImage; import com.mojang.blaze3d.systems.RenderSystem; @@ -204,7 +205,7 @@ private FogParameters copyFog(FogParameters shaderFog) { vertexBuffer = existingGeometry.vertexBuffer(); } if (vertexBuffer == null) { - vertexBuffer = new VertexBuffer(VertexBuffer.Usage.DYNAMIC); + vertexBuffer = new VertexBuffer(BufferUsage.DYNAMIC_WRITE); } uploadToVertexBuffer(vertexBuffer, builtBuffer); diff --git a/fabric/src/main/java/net/caffeinemc/mods/sodium/mixin/fabric/features/model/MultiPartBakedModelMixin.java b/fabric/src/main/java/net/caffeinemc/mods/sodium/mixin/fabric/features/model/MultiPartBakedModelMixin.java index af83f38319..671012e00e 100644 --- a/fabric/src/main/java/net/caffeinemc/mods/sodium/mixin/fabric/features/model/MultiPartBakedModelMixin.java +++ b/fabric/src/main/java/net/caffeinemc/mods/sodium/mixin/fabric/features/model/MultiPartBakedModelMixin.java @@ -26,7 +26,7 @@ public class MultiPartBakedModelMixin { @Shadow @Final - private List, BakedModel>> selectors; + private List selectors; /** * @author JellySquid @@ -52,9 +52,9 @@ public List getQuads(BlockState state, Direction face, RandomSource r try { List modelList = new ArrayList<>(this.selectors.size()); - for (Pair, BakedModel> pair : this.selectors) { - if (pair.getLeft().test(state)) { - modelList.add(pair.getRight()); + for (MultiPartBakedModel.Selector selector : this.selectors) { + if (selector.condition().test(state)) { + modelList.add(selector.model()); } }