Files
CatServer/patches/net/minecraft/client/renderer/entity/RenderEntityItem.java.patch
2019-02-24 22:29:41 +08:00

87 lines
4.1 KiB
Diff

--- ../src-base/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.java
@@ -44,7 +44,7 @@
boolean flag = p_177077_9_.isGui3d();
int i = this.getModelCount(itemstack);
float f = 0.25F;
- float f1 = MathHelper.sin(((float)itemIn.getAge() + p_177077_8_) / 10.0F + itemIn.hoverStart) * 0.1F + 0.1F;
+ float f1 = shouldBob() ? MathHelper.sin(((float)itemIn.getAge() + p_177077_8_) / 10.0F + itemIn.hoverStart) * 0.1F + 0.1F : 0;
float f2 = p_177077_9_.getItemCameraTransforms().getTransform(ItemCameraTransforms.TransformType.GROUND).scale.y;
GlStateManager.translate((float)p_177077_2_, (float)p_177077_4_ + f1 + 0.25F * f2, (float)p_177077_6_);
@@ -104,16 +104,13 @@
GlStateManager.pushMatrix();
IBakedModel ibakedmodel = this.itemRenderer.getItemModelWithOverrides(itemstack, entity.world, (EntityLivingBase)null);
int j = this.transformModelCount(entity, x, y, z, partialTicks, ibakedmodel);
- float f = ibakedmodel.getItemCameraTransforms().ground.scale.x;
- float f1 = ibakedmodel.getItemCameraTransforms().ground.scale.y;
- float f2 = ibakedmodel.getItemCameraTransforms().ground.scale.z;
boolean flag1 = ibakedmodel.isGui3d();
if (!flag1)
{
- float f3 = -0.0F * (float)(j - 1) * 0.5F * f;
- float f4 = -0.0F * (float)(j - 1) * 0.5F * f1;
- float f5 = -0.09375F * (float)(j - 1) * 0.5F * f2;
+ float f3 = -0.0F * (float)(j - 1) * 0.5F;
+ float f4 = -0.0F * (float)(j - 1) * 0.5F;
+ float f5 = -0.09375F * (float)(j - 1) * 0.5F;
GlStateManager.translate(f3, f4, f5);
}
@@ -134,11 +131,11 @@
float f7 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.15F;
float f9 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.15F;
float f6 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.15F;
- GlStateManager.translate(f7, f9, f6);
+ GlStateManager.translate(shouldSpreadItems() ? f7 : 0, shouldSpreadItems() ? f9 : 0, f6);
}
- ibakedmodel.getItemCameraTransforms().applyTransform(ItemCameraTransforms.TransformType.GROUND);
- this.itemRenderer.renderItem(itemstack, ibakedmodel);
+ IBakedModel transformedModel = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(ibakedmodel, ItemCameraTransforms.TransformType.GROUND, false);
+ this.itemRenderer.renderItem(itemstack, transformedModel);
GlStateManager.popMatrix();
}
else
@@ -152,10 +149,10 @@
GlStateManager.translate(f8, f10, 0.0F);
}
- ibakedmodel.getItemCameraTransforms().applyTransform(ItemCameraTransforms.TransformType.GROUND);
- this.itemRenderer.renderItem(itemstack, ibakedmodel);
+ IBakedModel transformedModel = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(ibakedmodel, ItemCameraTransforms.TransformType.GROUND, false);
+ this.itemRenderer.renderItem(itemstack, transformedModel);
GlStateManager.popMatrix();
- GlStateManager.translate(0.0F * f, 0.0F * f1, 0.09375F * f2);
+ GlStateManager.translate(0.0F, 0.0F, 0.09375F);
}
}
@@ -182,4 +179,25 @@
{
return TextureMap.LOCATION_BLOCKS_TEXTURE;
}
+
+ /*==================================== FORGE START ===========================================*/
+
+ /**
+ * Items should spread out when rendered in 3d?
+ * @return
+ */
+ public boolean shouldSpreadItems()
+ {
+ return true;
+ }
+
+ /**
+ * Items should have a bob effect
+ * @return
+ */
+ public boolean shouldBob()
+ {
+ return true;
+ }
+ /*==================================== FORGE END =============================================*/
}