Skip to content

Fix lamps' item models being invisible #4818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gustovafing merged 1 commit into from
May 1, 2026
+24 −9
Merged

Fix lamps' item models being invisible #4818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions src/main/java/com/gregtechceu/gtceu/client/model/item/CustomItemRendererWrapperModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.resources.model.Material;
import net.minecraft.client.resources.model.ModelBaker;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.*;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraftforge.client.extensions.common.IClientItemExtensions;
import net.minecraftforge.client.model.BakedModelWrapper;
import net.minecraftforge.client.model.generators.CustomLoaderBuilder;
Expand All @@ -19,6 +17,7 @@

import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import com.mojang.blaze3d.vertex.PoseStack;

import java.util.function.Function;

Expand All @@ -40,24 +39,29 @@ public class CustomItemRendererWrapperModel implements IUnbakedGeometry<CustomIt

public static final ResourceLocation ID = GTCEu.id("custom_item_renderer_wrapper");

private final BlockModel parent;
private final BlockModel baseModel;

public CustomItemRendererWrapperModel(BlockModel parent) {
this.parent = parent;
public CustomItemRendererWrapperModel(BlockModel baseModel) {
this.baseModel = baseModel;
}

@Override
public BakedModel bake(IGeometryBakingContext context, ModelBaker baker,
Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState,
ItemOverrides overrides, ResourceLocation modelLocation) {
BlockModel owner = parent;
BlockModel owner = baseModel;
if (context instanceof BlockGeometryBakingContext blockContext) owner = blockContext.owner;

BakedModel originalModel = parent.bake(baker, owner, spriteGetter, modelState, modelLocation,
BakedModel originalModel = baseModel.bake(baker, owner, spriteGetter, modelState, modelLocation,
context.isGui3d());
return new Baked(originalModel);
}

@Override
public void resolveParents(Function<ResourceLocation, UnbakedModel> modelGetter, IGeometryBakingContext context) {
baseModel.resolveParents(modelGetter);
}

public static final class Baked extends BakedModelWrapper<BakedModel> {

public Baked(BakedModel originalModel) {
Expand All @@ -68,6 +72,13 @@ public Baked(BakedModel originalModel) {
public boolean isCustomRenderer() {
return true;
}

@Override
public BakedModel applyTransform(ItemDisplayContext cameraTransformType, PoseStack poseStack,
boolean applyLeftHandTransform) {
super.applyTransform(cameraTransformType, poseStack, applyLeftHandTransform);
return this;
}
}

public static final class Loader implements IGeometryLoader<CustomItemRendererWrapperModel> {
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/client/model/item/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@NotNullByDefault
package com.gregtechceu.gtceu.client.model.item;

import org.jetbrains.annotations.NotNullByDefault;
Loading