diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/PortableGridBakedModel.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/PortableGridBakedModel.java index 22f9f9364..aa1f1fdde 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/PortableGridBakedModel.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/PortableGridBakedModel.java @@ -39,23 +39,23 @@ public class PortableGridBakedModel extends DelegateBakedModel { List quads = new ArrayList<>(); if (key.active) { - quads.addAll(new TRSRBakedModel(baseConnected, key.direction).getQuads(key.state, key.side, key.random)); + quads.addAll(new TRSRBakedModel(baseConnected, key.direction).getQuads(key.state, null, key.random)); } else { - quads.addAll(new TRSRBakedModel(baseDisconnected, key.direction).getQuads(key.state, key.side, key.random)); + quads.addAll(new TRSRBakedModel(baseDisconnected, key.direction).getQuads(key.state, null, key.random)); } switch (key.diskState) { case NORMAL: - quads.addAll(new TRSRBakedModel(disk, key.direction).getQuads(key.state, key.side, key.random)); + quads.addAll(new TRSRBakedModel(disk, key.direction).getQuads(key.state, null, key.random)); break; case NEAR_CAPACITY: - quads.addAll(new TRSRBakedModel(diskNearCapacity, key.direction).getQuads(key.state, key.side, key.random)); + quads.addAll(new TRSRBakedModel(diskNearCapacity, key.direction).getQuads(key.state, null, key.random)); break; case FULL: - quads.addAll(new TRSRBakedModel(diskFull, key.direction).getQuads(key.state, key.side, key.random)); + quads.addAll(new TRSRBakedModel(diskFull, key.direction).getQuads(key.state, null, key.random)); break; case DISCONNECTED: - quads.addAll(new TRSRBakedModel(diskDisconnected, key.direction).getQuads(key.state, key.side, key.random)); + quads.addAll(new TRSRBakedModel(diskDisconnected, key.direction).getQuads(key.state, null, key.random)); break; case NONE: break; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/TRSRBakedModel.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/TRSRBakedModel.java index 1918c2649..e3cd52915 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/TRSRBakedModel.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/TRSRBakedModel.java @@ -10,6 +10,9 @@ 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.minecraftforge.client.model.ModelDataManager; +import net.minecraftforge.client.model.data.EmptyModelData; +import net.minecraftforge.client.model.data.ModelDataMap; import net.minecraftforge.client.model.pipeline.BakedQuadBuilder; import net.minecraftforge.client.model.pipeline.TRSRTransformer; import net.minecraftforge.common.model.TransformationHelper; @@ -65,7 +68,7 @@ public class TRSRBakedModel implements IBakedModel { side = Direction.byHorizontalIndex((side.getHorizontalIndex() + this.faceOffset) % 4); } - for (BakedQuad quad : original.getQuads(state, side, rand)) { + for (BakedQuad quad : original.getQuads(state, side, rand, EmptyModelData.INSTANCE)) { BakedQuadBuilder builder = new BakedQuadBuilder(quad.getSprite()); TRSRTransformer transformer = new TRSRTransformer(builder, transformation.blockCenterToCorner());