mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 19:59:42 +00:00
Fix render_type in block models not being used. Fixes #10294
This commit is contained in:
1 parent
f63813d929
commit
ec5ac91389
16 files changed
+306
-77
No files matched your search
@@ -213,7 +213,7 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel> {
|
||||
}
|
||||
|
||||
private void addLayer(RenderTypeGroup renderTypes, List<BakedQuad> quads) {
|
||||
var modelBuilder = IModelBuilder.of(isAmbientOcclusion, isSideLit, isGui3d, transforms, particle/*, renderTypes*/);
|
||||
var modelBuilder = IModelBuilder.of(isAmbientOcclusion, isSideLit, isGui3d, transforms, particle, renderTypes);
|
||||
quads.forEach(modelBuilder::addUnculledFace);
|
||||
children.add(modelBuilder.build());
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.resources.model.BakedModel;
|
||||
import net.minecraft.client.resources.model.SimpleBakedModel;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraftforge.client.RenderTypeGroup;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -30,7 +32,18 @@ public interface IModelBuilder<T extends IModelBuilder<T>> {
|
||||
ItemTransforms transforms,
|
||||
TextureAtlasSprite particle
|
||||
){
|
||||
return new Simple(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, particle);
|
||||
return of(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, particle, RenderTypeGroup.EMPTY);
|
||||
}
|
||||
|
||||
static IModelBuilder<?> of(
|
||||
boolean hasAmbientOcclusion,
|
||||
boolean usesBlockLight,
|
||||
boolean isGui3d,
|
||||
ItemTransforms transforms,
|
||||
TextureAtlasSprite particle,
|
||||
RenderTypeGroup renderTypes
|
||||
){
|
||||
return new Simple(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, particle, renderTypes);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -52,9 +65,10 @@ public interface IModelBuilder<T extends IModelBuilder<T>> {
|
||||
|
||||
private Simple(
|
||||
boolean hasAmbientOcclusion, boolean usesBlockLight, boolean isGui3d,
|
||||
ItemTransforms transforms, TextureAtlasSprite particle
|
||||
ItemTransforms transforms, TextureAtlasSprite particle, RenderTypeGroup renderTypes
|
||||
) {
|
||||
this.builder = new SimpleBakedModel.Builder(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms).particle(particle);
|
||||
this.builder.renderTypes(renderTypes);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -69,7 +83,6 @@ public interface IModelBuilder<T extends IModelBuilder<T>> {
|
||||
return this;
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@Override
|
||||
public BakedModel build() {
|
||||
return builder.build();
|
||||
|
||||
@@ -11,31 +11,8 @@ import net.minecraft.client.resources.model.ModelState;
|
||||
/**
|
||||
* Simple implementation of {@link ModelState}.
|
||||
*/
|
||||
public final class SimpleModelState implements ModelState
|
||||
{
|
||||
private final Transformation transformation;
|
||||
private final boolean uvLocked;
|
||||
|
||||
public SimpleModelState(Transformation transformation, boolean uvLocked)
|
||||
{
|
||||
this.transformation = transformation;
|
||||
this.uvLocked = uvLocked;
|
||||
}
|
||||
|
||||
public SimpleModelState(Transformation transformation)
|
||||
{
|
||||
public record SimpleModelState(Transformation getRotation, boolean isUvLocked) implements ModelState {
|
||||
public SimpleModelState(Transformation transformation) {
|
||||
this(transformation, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Transformation getRotation()
|
||||
{
|
||||
return transformation;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isUvLocked()
|
||||
{
|
||||
return uvLocked;
|
||||
}
|
||||
}
|
||||
@@ -68,4 +68,12 @@ public interface IGeometryBakingContext {
|
||||
default RenderTypeGroup getRenderType(ResourceLocation name) {
|
||||
return NamedRenderTypeManager.get(name);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@return a {@link RenderTypeGroup} from the {@link #getRenderTypeHint()}, or the empty group if not found.}
|
||||
*/
|
||||
default RenderTypeGroup getRenderType() {
|
||||
var hint = getRenderTypeHint();
|
||||
return hint == null ? RenderTypeGroup.EMPTY : getRenderType(hint);
|
||||
}
|
||||
}
|
||||
@@ -10,6 +10,7 @@ import net.minecraft.client.renderer.block.model.TextureSlots;
|
||||
import net.minecraft.client.resources.model.BakedModel;
|
||||
import net.minecraft.client.resources.model.ModelBaker;
|
||||
import net.minecraft.client.resources.model.ModelState;
|
||||
import net.minecraftforge.client.RenderTypeGroup;
|
||||
import net.minecraftforge.client.model.IModelBuilder;
|
||||
|
||||
/**
|
||||
@@ -21,10 +22,8 @@ public abstract class SimpleUnbakedGeometry<T extends SimpleUnbakedGeometry<T>>
|
||||
public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, TextureSlots textures, ModelState modelState) {
|
||||
var particle = baker.sprites().maybeMissing(textures, "particle");
|
||||
|
||||
//var renderTypeHint = context.getRenderTypeHint();
|
||||
//var renderTypes = renderTypeHint != null ? context.getRenderType(renderTypeHint) : RenderTypeGroup.EMPTY;
|
||||
IModelBuilder<?> builder = IModelBuilder.of(context.useAmbientOcclusion(), context.useBlockLight(), context.isGui3d(),
|
||||
context.getTransforms(), particle/*, renderTypes*/);
|
||||
context.getTransforms(), particle, context.getRenderType());
|
||||
|
||||
addQuads(context, builder, baker, textures, modelState);
|
||||
|
||||
|
||||
Reference in new issue
Block a user