yanwah/cobblemon
1
0
Fork 0
forked from mirrors/cobblemon
Code Pull Requests Activity

Merge branch 'fix/neoforge-shader-init' into 'main'

Browse Source 
Fix Neoforge shader initialization

See merge request cable-mc/cobblemon!2270
This commit is contained in:
Polymeta
2026-05-16 17:37:47 +00:00
parent 0e1b59fb25 432b350d98
commit d44126179a
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/client/CobblemonNeoForgeClient.kt
+4 -7
View File
@@ -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.particle.CobblemonParticles
import com.cobblemon.mod.common.particle.SnowstormParticleType
import com.cobblemon.mod.common.util.cobblemonResource
import com.cobblemon.mod.common.util.isUsingPokedex
import com.mojang.blaze3d.vertex.DefaultVertexFormat
import java.util.concurrent.CompletableFuture
import java.util.function.Supplier
import net.minecraft.client.Minecraft
@@ -128,11 +126,10 @@ object CobblemonNeoForgeClient : CobblemonClientImplementation {
}
private fun onShaderRegistration(event: RegisterShadersEvent) {
event.registerShader(ShaderInstance(event.resourceProvider, cobblemonResource("particle_add"), DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP)) {
CobblemonShaders.PARTICLE_BLEND = it
}
event.registerShader(ShaderInstance(event.resourceProvider, cobblemonResource("particle_cutout"), DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP)) {
CobblemonShaders.PARTICLE_CUTOUT = it
CobblemonShaders.init()
CobblemonShaders.SHADERS_TO_REGISTER.forEach { (factory, callback) ->
val data = factory(event.resourceProvider)
event.registerShader(ShaderInstance(data.resourceFactory, data.shaderName, data.vertexFormat), callback)
}
}