Skip to content

Commit 54ce64e

Browse files
committed
Merge branch 'currydex'
2 parents c2cd183 + 0a0dae5 commit 54ce64e

File tree

1 file changed

+4
-3
lines changed
  • common/src/main/java/generations/gg/generations/core/generationscore/common/client/render

1 file changed

+4
-3
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import generations.gg.generations.core.generationscore.common.util.getRenderable
1717
import generations.gg.generations.core.generationscore.common.world.item.StatueSpawnerItem
1818
import generations.gg.generations.core.generationscore.common.world.item.TimeCapsule
1919
import net.minecraft.client.renderer.LightTexture
20+
import net.minecraft.client.renderer.LightTexture.FULL_BRIGHT
2021
import net.minecraft.client.renderer.MultiBufferSource
2122
import net.minecraft.client.renderer.texture.OverlayTexture
2223
import net.minecraft.world.item.ItemDisplayContext
@@ -43,7 +44,7 @@ object TimeCapsuleItemRenderer : CobblemonBuiltinItemRenderer {
4344
val renderLayer = model.getLayer(PokemonModelRepository.getTexture(species.resourceIdentifier, aspects, 0f), false, false)
4445
val transformations: PokemonItemRenderer.Transformations = (if(isSprite) positionsSprite[mode] else positions[mode]) ?: return
4546

46-
Lighting.setupFor3DItems()
47+
Lighting.setupForFlatItems()
4748
matrices.scale(transformations.scale.x, transformations.scale.y, transformations.scale.z)
4849
matrices.translate(transformations.translation.x, transformations.translation.y, transformations.translation.z
4950
)
@@ -63,9 +64,9 @@ object TimeCapsuleItemRenderer : CobblemonBuiltinItemRenderer {
6364
val tint: Vector4f = if (stack.item is PokemonItem) (stack.item as PokemonItem).tint(stack) else Vector4f(1f, 1f, 1f, 1f)
6465

6566
if(isSprite) {
66-
Lighting.setupForFlatItems()
67+
Lighting.setupForEntityInInventory()
6768

68-
val packedLight = if (mode == ItemDisplayContext.GUI) LightTexture.pack(13, 13) else light
69+
val packedLight = if (mode == ItemDisplayContext.GUI) FULL_BRIGHT else light
6970
RenderSystem.disableCull()
7071
(model.rootPart as RareCandyBone).renderSprite(context, matrices, packedLight, OverlayTexture.NO_OVERLAY, tint.x, tint.y, tint.z, tint.w, isSprite)
7172
RenderSystem.disableCull()

0 commit comments

Comments
 (0)