mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 12:20:11 +00:00
67 lines
3.1 KiB
Diff
67 lines
3.1 KiB
Diff
--- ../src-base/minecraft/net/minecraft/client/renderer/entity/RenderItem.java
|
|
+++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderItem.java
|
|
@@ -73,7 +73,7 @@
|
|
public RenderItem(TextureManager textureManager, ModelManager modelManager)
|
|
{
|
|
this.textureManager = textureManager;
|
|
- this.itemModelMesher = new ItemModelMesher(modelManager);
|
|
+ this.itemModelMesher = new net.minecraftforge.client.ItemModelMesherForge(modelManager);
|
|
this.registerItems();
|
|
}
|
|
|
|
@@ -227,7 +227,7 @@
|
|
k = k | -16777216;
|
|
}
|
|
|
|
- this.renderQuad(renderer, bakedquad, k);
|
|
+ net.minecraftforge.client.model.pipeline.LightUtil.renderQuadColor(renderer, bakedquad, k);
|
|
}
|
|
}
|
|
|
|
@@ -297,6 +297,11 @@
|
|
modelresourcelocation = new ModelResourceLocation("bow_pulling_0", "inventory");
|
|
}
|
|
}
|
|
+ else
|
|
+ {
|
|
+ // TODO: add back getModel; maybe switch to the smart player model / normal smart item model?
|
|
+ modelresourcelocation = item.getModel(stack, entityplayer, entityplayer.getItemInUseCount());
|
|
+ }
|
|
|
|
if (modelresourcelocation != null)
|
|
{
|
|
@@ -318,14 +323,9 @@
|
|
GlStateManager.enableBlend();
|
|
GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
|
|
GlStateManager.pushMatrix();
|
|
- ItemCameraTransforms itemcameratransforms = model.getItemCameraTransforms();
|
|
- itemcameratransforms.func_181689_a(cameraTransformType);
|
|
+ // TODO: check if negative scale is a thing
|
|
+ model = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(model, cameraTransformType);
|
|
|
|
- if (this.func_183005_a(itemcameratransforms.func_181688_b(cameraTransformType)))
|
|
- {
|
|
- GlStateManager.cullFace(1028);
|
|
- }
|
|
-
|
|
this.renderItem(stack, model);
|
|
GlStateManager.cullFace(1029);
|
|
GlStateManager.popMatrix();
|
|
@@ -353,7 +353,7 @@
|
|
GlStateManager.blendFunc(770, 771);
|
|
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
|
|
this.setupGuiTransform(x, y, ibakedmodel.isGui3d());
|
|
- ibakedmodel.getItemCameraTransforms().func_181689_a(ItemCameraTransforms.TransformType.GUI);
|
|
+ ibakedmodel = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(ibakedmodel, ItemCameraTransforms.TransformType.GUI);
|
|
this.renderItem(stack, ibakedmodel);
|
|
GlStateManager.disableAlpha();
|
|
GlStateManager.disableRescaleNormal();
|
|
@@ -1048,6 +1048,7 @@
|
|
this.registerBlock(Blocks.brown_mushroom_block, BlockHugeMushroom.EnumType.ALL_INSIDE.getMetadata(), "brown_mushroom_block");
|
|
this.registerBlock(Blocks.red_mushroom_block, BlockHugeMushroom.EnumType.ALL_INSIDE.getMetadata(), "red_mushroom_block");
|
|
this.registerBlock(Blocks.dragon_egg, "dragon_egg");
|
|
+ net.minecraftforge.client.model.ModelLoader.onRegisterItems(this.itemModelMesher);
|
|
}
|
|
|
|
public void onResourceManagerReload(IResourceManager resourceManager)
|