From 0463949ac33f8ea69f0cb2ca4270a41f14975163 Mon Sep 17 00:00:00 2001 From: ichttt Date: Tue, 9 Jul 2019 04:45:27 +0200 Subject: [PATCH] Fixed BakedModelWrapper not delegating new methods (#5761) --- .../client/model/BakedModelWrapper.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/net/minecraftforge/client/model/BakedModelWrapper.java b/src/main/java/net/minecraftforge/client/model/BakedModelWrapper.java index 068cc68559..601e4b7534 100644 --- a/src/main/java/net/minecraftforge/client/model/BakedModelWrapper.java +++ b/src/main/java/net/minecraftforge/client/model/BakedModelWrapper.java @@ -19,6 +19,7 @@ package net.minecraftforge.client.model; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.vecmath.Matrix4f; import java.util.List; @@ -31,6 +32,10 @@ import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IEnviromentBlockReader; +import net.minecraft.world.IWorldReader; +import net.minecraftforge.client.model.data.IModelData; import org.apache.commons.lang3.tuple.Pair; public abstract class BakedModelWrapper implements IBakedModel @@ -95,4 +100,18 @@ public abstract class BakedModelWrapper implements IBaked { return originalModel.handlePerspective(cameraTransformType); } + + @Nonnull + @Override + public List getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand, @Nonnull IModelData extraData) + { + return originalModel.getQuads(state, side, rand, extraData); + } + + @Nonnull + @Override + public IModelData getModelData(@Nonnull IEnviromentBlockReader world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData tileData) + { + return originalModel.getModelData(world, pos, state, tileData); + } }