From e67ed69cc92b9cbb76d15170c7475b00f41c3d18 Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Tue, 1 Apr 2025 16:10:21 +1000 Subject: [PATCH] 1.21.5 partial --- .../java/me/cortex/voxy/client/core/model/ModelFactory.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java b/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java index 6be643f0..5ca01f73 100644 --- a/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java +++ b/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java @@ -5,6 +5,7 @@ import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; import it.unimi.dsi.fastutil.objects.ObjectSet; import me.cortex.voxy.client.core.gl.Capabilities; +import me.cortex.voxy.client.core.model.bakery.ModelTextureBakery2; import me.cortex.voxy.client.core.rendering.util.RawDownloadStream; import me.cortex.voxy.client.core.rendering.util.UploadStream; import me.cortex.voxy.common.Logger; @@ -65,7 +66,7 @@ public class ModelFactory { private final Biome DEFAULT_BIOME = MinecraftClient.getInstance().world.getRegistryManager().getOrThrow(RegistryKeys.BIOME).get(BiomeKeys.PLAINS); - public final ModelTextureBakery bakery; + public final ModelTextureBakery2 bakery; //Model data might also contain a constant colour if the colour resolver produces a constant colour, this saves space in the @@ -122,7 +123,7 @@ public class ModelFactory { this.mapper = mapper; this.storage = storage; this.downstream = downstream; - this.bakery = new ModelTextureBakery(MODEL_TEXTURE_SIZE, MODEL_TEXTURE_SIZE); + this.bakery = new ModelTextureBakery2(MODEL_TEXTURE_SIZE, MODEL_TEXTURE_SIZE); this.metadataCache = new long[1<<16]; this.fluidStateLUT = new int[1<<16];