mirror of
https://github.com/GTNewHorizons/Mantle.git
synced 2026-11-21 04:22:22 +00:00
Update Mantle to 1.15.1!
This commit is contained in:
1 parent
bd078d694a
commit
3f8e34648e
34 files changed
+339
-341
No files matched your search
@@ -3,67 +3,66 @@ package slimeknights.mantle.client;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.TransformationMatrix;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.model.IModelTransform;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.MissingTextureSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.vertex.VertexFormat;
|
||||
import net.minecraft.client.renderer.vertex.VertexFormatElement;
|
||||
import net.minecraftforge.client.model.SimpleModelState;
|
||||
import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad;
|
||||
import net.minecraftforge.client.model.SimpleModelTransform;
|
||||
import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
|
||||
import net.minecraftforge.client.model.pipeline.VertexTransformer;
|
||||
import net.minecraftforge.common.model.IModelPart;
|
||||
import net.minecraftforge.common.model.IModelState;
|
||||
import net.minecraftforge.common.model.TRSRTransformation;
|
||||
|
||||
import javax.vecmath.Vector3f;
|
||||
import net.minecraftforge.common.model.TransformationHelper;
|
||||
|
||||
public class ModelHelper {
|
||||
|
||||
public static final IModelState DEFAULT_ITEM_STATE;
|
||||
public static final IModelState DEFAULT_TOOL_STATE;
|
||||
public static final TRSRTransformation BLOCK_THIRD_PERSON_RIGHT;
|
||||
public static final TRSRTransformation BLOCK_THIRD_PERSON_LEFT;
|
||||
public static final IModelTransform DEFAULT_ITEM_STATE;
|
||||
public static final IModelTransform DEFAULT_TOOL_STATE;
|
||||
public static final TransformationMatrix BLOCK_THIRD_PERSON_RIGHT;
|
||||
public static final TransformationMatrix BLOCK_THIRD_PERSON_LEFT;
|
||||
|
||||
public static TextureAtlasSprite getTextureFromBlockstate(BlockState state) {
|
||||
return Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getTexture(state);
|
||||
}
|
||||
|
||||
public static BakedQuad colorQuad(int color, BakedQuad quad) {
|
||||
ColorTransformer transformer = new ColorTransformer(color, quad.getFormat());
|
||||
ColorTransformer transformer = new ColorTransformer(color, quad);
|
||||
quad.pipe(transformer);
|
||||
return transformer.build();
|
||||
}
|
||||
|
||||
private static TRSRTransformation get(float tx, float ty, float tz, float ax, float ay, float az, float s) {
|
||||
return TRSRTransformation.blockCenterToCorner(new TRSRTransformation(
|
||||
private static TransformationMatrix get(float tx, float ty, float tz, float ax, float ay, float az, float s) {
|
||||
return new TransformationMatrix(
|
||||
new Vector3f(tx / 16, ty / 16, tz / 16),
|
||||
TRSRTransformation.quatFromXYZDegrees(new Vector3f(ax, ay, az)),
|
||||
TransformationHelper.quatFromXYZ(new Vector3f(ax, ay, az), true),
|
||||
new Vector3f(s, s, s),
|
||||
null));
|
||||
null).blockCenterToCorner();
|
||||
}
|
||||
|
||||
static {
|
||||
{
|
||||
// equals forge:default-item
|
||||
ImmutableMap.Builder<IModelPart, TRSRTransformation> builder = ImmutableMap.builder();
|
||||
ImmutableMap.Builder<ItemCameraTransforms.TransformType, TransformationMatrix> builder = ImmutableMap.builder();
|
||||
builder.put(ItemCameraTransforms.TransformType.GROUND, get(0, 2, 0, 0, 0, 0, 0.5f));
|
||||
builder.put(ItemCameraTransforms.TransformType.HEAD, get(0, 13, 7, 0, 180, 0, 1));
|
||||
builder.put(ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, get(0, 3, 1, 0, 0, 0, 0.55f));
|
||||
builder.put(ItemCameraTransforms.TransformType.THIRD_PERSON_LEFT_HAND, get(0, 3, 1, 0, 0, 0, 0.55f));
|
||||
builder.put(ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND, get(1.13f, 3.2f, 1.13f, 0, -90, 25, 0.68f));
|
||||
builder.put(ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, get(1.13f, 3.2f, 1.13f, 0, 90, -25, 0.68f));
|
||||
DEFAULT_ITEM_STATE = new SimpleModelState(builder.build());
|
||||
DEFAULT_ITEM_STATE = new SimpleModelTransform(builder.build());
|
||||
}
|
||||
{
|
||||
// equals forge:default-tool
|
||||
ImmutableMap.Builder<IModelPart, TRSRTransformation> builder = ImmutableMap.builder();
|
||||
ImmutableMap.Builder<ItemCameraTransforms.TransformType, TransformationMatrix> builder = ImmutableMap.builder();
|
||||
builder.put(ItemCameraTransforms.TransformType.GROUND, get(0, 2, 0, 0, 0, 0, 0.5f));
|
||||
builder.put(ItemCameraTransforms.TransformType.HEAD, get(0, 13, 7, 0, 180, 0, 1));
|
||||
builder.put(ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, get(0, 4, 0.5f, 0, -90, 55, 0.85f));
|
||||
builder.put(ItemCameraTransforms.TransformType.THIRD_PERSON_LEFT_HAND, get(0, 4, 0.5f, 0, 90, -55, 0.85f));
|
||||
builder.put(ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND, get(1.13f, 3.2f, 1.13f, 0, -90, 25, 0.68f));
|
||||
builder.put(ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, get(1.13f, 3.2f, 1.13f, 0, 90, -25, 0.68f));
|
||||
DEFAULT_TOOL_STATE = new SimpleModelState(builder.build());
|
||||
DEFAULT_TOOL_STATE = new SimpleModelTransform(builder.build());
|
||||
|
||||
}
|
||||
{
|
||||
@@ -76,8 +75,8 @@ public class ModelHelper {
|
||||
|
||||
private final float r, g, b, a;
|
||||
|
||||
public ColorTransformer(int color, VertexFormat format) {
|
||||
super(new UnpackedBakedQuad.Builder(format));
|
||||
public ColorTransformer(int color, BakedQuad quad) {
|
||||
super(new BakedQuadBuilder(quad.getSprite()));
|
||||
|
||||
int a = (color >> 24);
|
||||
if (a == 0) {
|
||||
@@ -95,7 +94,7 @@ public class ModelHelper {
|
||||
|
||||
@Override
|
||||
public void put(int element, float... data) {
|
||||
VertexFormatElement.Usage usage = this.parent.getVertexFormat().getElement(element).getUsage();
|
||||
VertexFormatElement.Usage usage = this.parent.getVertexFormat().func_227894_c_().get(element).getUsage();
|
||||
|
||||
// transform normals and position
|
||||
if (usage == VertexFormatElement.Usage.COLOR && data.length >= 4) {
|
||||
@@ -107,8 +106,8 @@ public class ModelHelper {
|
||||
super.put(element, data);
|
||||
}
|
||||
|
||||
public UnpackedBakedQuad build() {
|
||||
return ((UnpackedBakedQuad.Builder) this.parent).build();
|
||||
public BakedQuad build() {
|
||||
return ((BakedQuadBuilder) this.parent).build();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user