dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix portable grid not rendering

Browse Source
This commit is contained in:
raoulvdberge
2020-01-17 15:14:12 +01:00
parent 3f3904eeb3
commit 25a2a4feb6
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/raoulvdberge/refinedstorage/render/model/PortableGridBakedModel.java
View File

@@ -39,23 +39,23 @@ public class PortableGridBakedModel extends DelegateBakedModel {
List<BakedQuad> quads = new ArrayList<>(); List<BakedQuad> quads = new ArrayList<>();
if (key.active) { 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 { } 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) { switch (key.diskState) {
case NORMAL: 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; break;
case NEAR_CAPACITY: 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; break;
case FULL: 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; break;
case DISCONNECTED: 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; break;
case NONE: case NONE:
break; break;

5
src/main/java/com/raoulvdberge/refinedstorage/render/model/TRSRBakedModel.java
View File

@@ -10,6 +10,9 @@ 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.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.BakedQuadBuilder;
import net.minecraftforge.client.model.pipeline.TRSRTransformer; import net.minecraftforge.client.model.pipeline.TRSRTransformer;
import net.minecraftforge.common.model.TransformationHelper; import net.minecraftforge.common.model.TransformationHelper;
@@ -65,7 +68,7 @@ public class TRSRBakedModel implements IBakedModel {
side = Direction.byHorizontalIndex((side.getHorizontalIndex() + this.faceOffset) % 4); 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()); BakedQuadBuilder builder = new BakedQuadBuilder(quad.getSprite());
TRSRTransformer transformer = new TRSRTransformer(builder, transformation.blockCenterToCorner()); TRSRTransformer transformer = new TRSRTransformer(builder, transformation.blockCenterToCorner());