Update to MC 1.9

This commit is contained in:
Bernhard Bonigl committed 2016-03-18 17:47:53 +01:00
1 parent 21c453525a
commit ddea705e83
29 files changed
+199 -233

No files matched your search

@@ -1,64 +1,50 @@
package slimeknights.mantle.client.model;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.block.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.client.resources.model.IBakedModel;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.client.model.IFlexibleBakedModel;
import net.minecraftforge.client.model.IPerspectiveAwareModel;
import net.minecraftforge.client.model.TRSRTransformation;
import org.apache.commons.lang3.tuple.Pair;
import java.util.List;
import javax.vecmath.Matrix4f;
import javax.vecmath.Vector3f;
import slimeknights.mantle.client.ModelHelper;
/**
* Takes a blockmodel and applies the standard-block-perspective for third_person to it
*/
public class BlockItemModelWrapper implements IPerspectiveAwareModel, IFlexibleBakedModel {
public class BlockItemModelWrapper implements IPerspectiveAwareModel, IBakedModel {
// copied from the forge variants V1 default-block transform
public static final Matrix4f THIRD_PERSON_BLOCK_TRANSFORM = new TRSRTransformation(
new Vector3f(0, 1.5f / 16, -2.75f / 16), // translation
TRSRTransformation.quatFromYXZDegrees(new Vector3f(10, -45, 170)), // rotation
new Vector3f(0.375f, 0.375f, 0.375f), // scale
null).getMatrix();
private final IBakedModel parent;
private final IFlexibleBakedModel parent;
public BlockItemModelWrapper(IFlexibleBakedModel parent) {
public BlockItemModelWrapper(IBakedModel parent) {
this.parent = parent;
}
@Override
public Pair<? extends IFlexibleBakedModel, Matrix4f> handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) {
public Pair<? extends IBakedModel, Matrix4f> handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) {
Matrix4f matrix = null;
// fix transformation in hand
if(cameraTransformType == ItemCameraTransforms.TransformType.THIRD_PERSON) {
matrix = THIRD_PERSON_BLOCK_TRANSFORM;
if(cameraTransformType == ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND) {
matrix = ModelHelper.BLOCK_THIRD_PERSON_RIGHT.getMatrix();
}
else if(cameraTransformType == ItemCameraTransforms.TransformType.THIRD_PERSON_LEFT_HAND) {
matrix = ModelHelper.BLOCK_THIRD_PERSON_LEFT.getMatrix();
}
return Pair.of(this, matrix);
}
@Override
public List<BakedQuad> getFaceQuads(EnumFacing p_177551_1_) {
return parent.getFaceQuads(p_177551_1_);
}
@Override
public List<BakedQuad> getGeneralQuads() {
return parent.getGeneralQuads();
}
@Override
public VertexFormat getFormat() {
return parent.getFormat();
public List<BakedQuad> getQuads(IBlockState state, EnumFacing side, long rand) {
return null;
}
@Override
@@ -85,4 +71,9 @@ public class BlockItemModelWrapper implements IPerspectiveAwareModel, IFlexibleB
public ItemCameraTransforms getItemCameraTransforms() {
return parent.getItemCameraTransforms();
}
@Override
public ItemOverrideList getOverrides() {
return null;
}
}