keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fixed BakedModelWrapper not delegating new methods (#5761)

Browse source
This commit is contained in:
ichttt 2019-07-09 04:45:27 +02:00 committed by LexManos
parent 5f0fd4b706
commit 0463949ac3
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/net/minecraftforge/client/model/BakedModelWrapper.java
View file

@ -19,6 +19,7 @@
package net.minecraftforge.client.model; package net.minecraftforge.client.model;
import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.vecmath.Matrix4f; import javax.vecmath.Matrix4f;
import java.util.List; 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.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.Direction; 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; import org.apache.commons.lang3.tuple.Pair;
public abstract class BakedModelWrapper<T extends IBakedModel> implements IBakedModel public abstract class BakedModelWrapper<T extends IBakedModel> implements IBakedModel
@ -95,4 +100,18 @@ public abstract class BakedModelWrapper<T extends IBakedModel> implements IBaked
{ {
return originalModel.handlePerspective(cameraTransformType); return originalModel.handlePerspective(cameraTransformType);
} }
@Nonnull
@Override
public List<BakedQuad> 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);
}
} }