mirror of
https://github.com/barkeser2002/CatServer.git
synced 2026-09-25 08:39:58 +03:00
44 lines
2.1 KiB
Diff
44 lines
2.1 KiB
Diff
--- ../src-base/minecraft/net/minecraft/client/renderer/entity/RenderItemFrame.java
|
|
+++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderItemFrame.java
|
|
@@ -49,7 +49,7 @@
|
|
ModelManager modelmanager = blockrendererdispatcher.getBlockModelShapes().getModelManager();
|
|
IBakedModel ibakedmodel;
|
|
|
|
- if (entity.getDisplayedItem().getItem() == Items.FILLED_MAP)
|
|
+ if (entity.getDisplayedItem().getItem() instanceof net.minecraft.item.ItemMap)
|
|
{
|
|
ibakedmodel = modelmanager.getModel(this.mapModel);
|
|
}
|
|
@@ -96,10 +96,13 @@
|
|
{
|
|
GlStateManager.pushMatrix();
|
|
GlStateManager.disableLighting();
|
|
- boolean flag = itemstack.getItem() == Items.FILLED_MAP;
|
|
+ boolean flag = itemstack.getItem() instanceof net.minecraft.item.ItemMap;
|
|
int i = flag ? itemFrame.getRotation() % 4 * 2 : itemFrame.getRotation();
|
|
GlStateManager.rotate((float)i * 360.0F / 8.0F, 0.0F, 0.0F, 1.0F);
|
|
|
|
+ net.minecraftforge.client.event.RenderItemInFrameEvent event = new net.minecraftforge.client.event.RenderItemInFrameEvent(itemFrame, this);
|
|
+ if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event))
|
|
+ {
|
|
if (flag)
|
|
{
|
|
this.renderManager.renderEngine.bindTexture(MAP_BACKGROUND_TEXTURES);
|
|
@@ -107,7 +110,7 @@
|
|
float f = 0.0078125F;
|
|
GlStateManager.scale(0.0078125F, 0.0078125F, 0.0078125F);
|
|
GlStateManager.translate(-64.0F, -64.0F, 0.0F);
|
|
- MapData mapdata = Items.FILLED_MAP.getMapData(itemstack, itemFrame.world);
|
|
+ MapData mapdata = ((net.minecraft.item.ItemMap) itemstack.getItem()).getMapData(itemstack, itemFrame.world);
|
|
GlStateManager.translate(0.0F, 0.0F, -1.0F);
|
|
|
|
if (mapdata != null)
|
|
@@ -124,6 +127,7 @@
|
|
RenderHelper.disableStandardItemLighting();
|
|
GlStateManager.popAttrib();
|
|
}
|
|
+ }
|
|
|
|
GlStateManager.enableLighting();
|
|
GlStateManager.popMatrix();
|