Skip to content

Commit 52f5f92

Browse files
committed
Reworked how shaders work to make them more centralized and expandable/fixable
Fix statues spamming model when pokemon properties is malformed. Fixed masked rare candy materials being purely white if a statue or cobblemon
1 parent e828c66 commit 52f5f92

File tree

19 files changed

+527
-855
lines changed

19 files changed

+527
-855
lines changed

common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/entity/StatueEntityRenderer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class StatueEntityRenderer(arg: EntityRendererProvider.Context) : EntityRenderer
5757
buffer: MultiBufferSource,
5858
light: Int,
5959
) {
60-
val renderable = entity.renderablePokemon()
60+
val renderable = entity.renderablePokemon() ?: return
6161

6262
PokemonModelRepository.variations.getOrDefault(renderable.species.resourceIdentifier, null) ?: return
6363
stack.pushPose()
@@ -219,7 +219,7 @@ class StatueEntityRenderer(arg: EntityRendererProvider.Context) : EntityRenderer
219219
if (texture != null) return texture
220220
}
221221

222-
val renderable = entity.renderablePokemon()
222+
val renderable = entity.renderablePokemon() ?: return MissingTextureAtlasSprite.getLocation()
223223

224224
return PokemonModelRepository.getTexture(renderable.species.resourceIdentifier, renderable.aspects, 0f)
225225
}

common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/rarecandy/CobblemonInstance.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.joml.Matrix4f;
99
import org.joml.Vector3f;
1010

11-
public class CobblemonInstance extends AnimatedObjectInstance implements BlockLightValueProvider, ModelContextProviders.TintProvider {
11+
public class CobblemonInstance extends AnimatedObjectInstance implements BlockLightValueProvider {
1212

1313
public Matrix4f[] matrixTransforms;
1414
public Transform offsets;
@@ -48,7 +48,6 @@ public void setLight(int light) {
4848
this.light = light;
4949
}
5050

51-
@Override
5251
public Vector3f getTint() {
5352
return tint;
5453
}

common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/rarecandy/ModelRegistry.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import generations.gg.generations.core.generationscore.common.util.TimedCache
1111
import generations.gg.generations.core.generationscore.common.world.level.block.entities.ModelProvidingBlockEntity
1212
import generations.gg.generations.core.generationscore.common.world.level.block.generic.GenericRotatableModelBlock
1313
import gg.generations.rarecandy.renderer.animation.Animation
14+
import gg.generations.rarecandy.renderer.rendering.ObjectInstance
1415
import gg.generations.rarecandy.renderer.rendering.RareCandy
1516
import gg.generations.rarecandy.shaded.caffeine.cache.CacheLoader
1617
import gg.generations.rarecandy.shaded.caffeine.cache.Caffeine
@@ -115,4 +116,4 @@ object ModelRegistry {
115116
if (s == "gfb") animation.ticksPerSecond = 60000f // 60 fps. 1000 ticks per frame?
116117
}
117118
}
118-
}
119+
}

common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/rarecandy/Pipelines.java

Lines changed: 0 additions & 432 deletions
This file was deleted.

0 commit comments

Comments
 (0)