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

Made OBJModel.java compile.

This commit is contained in:
RainWarrior 2016-03-06 03:00:08 +03:00
parent 3e22a2b90d
commit ee82341312
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/minecraftforge/client/model/obj/OBJModel.java
View File

@ -24,6 +24,7 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
import net.minecraft.client.renderer.block.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.client.resources.IResource; import net.minecraft.client.resources.IResource;
@ -1324,8 +1325,9 @@ public class OBJModel implements IRetexturableModel, IModelCustomData
// FIXME: merge with getQuads // FIXME: merge with getQuads
@Override @Override
public List<BakedQuad> getGeneralQuads() public List<BakedQuad> func_188616_a(IBlockState blockState, EnumFacing side, long rand)
{ {
if(side != null) return ImmutableList.of();
if (quads == null) if (quads == null)
{ {
quads = Collections.synchronizedSet(new LinkedHashSet<BakedQuad>()); quads = Collections.synchronizedSet(new LinkedHashSet<BakedQuad>());
@ -1491,7 +1493,7 @@ public class OBJModel implements IRetexturableModel, IModelCustomData
} }
// FIXME: merge with getQuads // FIXME: merge with getQuads
@Override /* @Override
public OBJBakedModel handleBlockState(IBlockState state) public OBJBakedModel handleBlockState(IBlockState state)
{ {
if (state instanceof IExtendedBlockState) if (state instanceof IExtendedBlockState)
@ -1511,7 +1513,7 @@ public class OBJModel implements IRetexturableModel, IModelCustomData
} }
} }
return this; return this;
} }*/
private void updateStateVisibilityMap(OBJState state) private void updateStateVisibilityMap(OBJState state)
{ {
@ -1584,6 +1586,12 @@ public class OBJModel implements IRetexturableModel, IModelCustomData
{ {
return this.model.modelLocation.toString(); return this.model.modelLocation.toString();
} }
@Override
public ItemOverrideList func_188617_f()
{
return ItemOverrideList.field_188022_a;
}
} }
@SuppressWarnings("serial") @SuppressWarnings("serial")