Fix Neoforge shader initialization

This commit is contained in:
terrainwax
2026-05-16 18:45:48 +02:00
parent a59573073f
commit 432b350d98
@@ -24,9 +24,7 @@ import com.cobblemon.mod.common.client.render.shader.CobblemonShaders
import com.cobblemon.mod.common.item.PokedexItem import com.cobblemon.mod.common.item.PokedexItem
import com.cobblemon.mod.common.particle.CobblemonParticles import com.cobblemon.mod.common.particle.CobblemonParticles
import com.cobblemon.mod.common.particle.SnowstormParticleType import com.cobblemon.mod.common.particle.SnowstormParticleType
import com.cobblemon.mod.common.util.cobblemonResource
import com.cobblemon.mod.common.util.isUsingPokedex import com.cobblemon.mod.common.util.isUsingPokedex
import com.mojang.blaze3d.vertex.DefaultVertexFormat
import java.util.concurrent.CompletableFuture import java.util.concurrent.CompletableFuture
import java.util.function.Supplier import java.util.function.Supplier
import net.minecraft.client.Minecraft import net.minecraft.client.Minecraft
@@ -128,11 +126,10 @@ object CobblemonNeoForgeClient : CobblemonClientImplementation {
} }
private fun onShaderRegistration(event: RegisterShadersEvent) { private fun onShaderRegistration(event: RegisterShadersEvent) {
event.registerShader(ShaderInstance(event.resourceProvider, cobblemonResource("particle_add"), DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP)) { CobblemonShaders.init()
CobblemonShaders.PARTICLE_BLEND = it CobblemonShaders.SHADERS_TO_REGISTER.forEach { (factory, callback) ->
} val data = factory(event.resourceProvider)
event.registerShader(ShaderInstance(event.resourceProvider, cobblemonResource("particle_cutout"), DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP)) { event.registerShader(ShaderInstance(data.resourceFactory, data.shaderName, data.vertexFormat), callback)
CobblemonShaders.PARTICLE_CUTOUT = it
} }
} }