keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Merge pull request #1907 from johnjohn/master

Browse source 
Added ItemMap type check to item frames and ItemRenderer, enabling vanilla style rendering for custom ItemMaps
This commit is contained in:
LexManos 2015-06-09 12:37:33 -07:00
commit 8b50f9ab36
3 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch Normal file
View file

@ -0,0 +1,11 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/ItemRenderer.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/ItemRenderer.java
@@ -308,7 +308,7 @@
if (this.field_78453_b != null)
{
- if (this.field_78453_b.func_77973_b() == Items.field_151098_aY)
+ if (this.field_78453_b.func_77973_b() instanceof net.minecraft.item.ItemMap)
{
this.func_178097_a(entityplayersp, f3, f1, f2);
}

17
patches/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.java.patch
View file

@ -1,15 +1,26 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.java --- ../src-base/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.java +++ ../src-work/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.java
@@ -106,6 +106,9 @@ @@ -99,15 +99,18 @@
GlStateManager.func_179140_f();
int i = p_82402_1_.func_82333_j();
- if (item == Items.field_151098_aY)
+ if (item instanceof net.minecraft.item.ItemMap)
{
i = i % 4 * 2;
}
GlStateManager.func_179114_b((float)i * 360.0F / 8.0F, 0.0F, 0.0F, 1.0F); GlStateManager.func_179114_b((float)i * 360.0F / 8.0F, 0.0F, 0.0F, 1.0F);
- if (item == Items.field_151098_aY)
+ net.minecraftforge.client.event.RenderItemInFrameEvent event = new net.minecraftforge.client.event.RenderItemInFrameEvent(p_82402_1_, this); + net.minecraftforge.client.event.RenderItemInFrameEvent event = new net.minecraftforge.client.event.RenderItemInFrameEvent(p_82402_1_, this);
+ if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event)) + if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event))
+ {
if (item == Items.field_151098_aY)
{ {
+ if (item instanceof net.minecraft.item.ItemMap)
+ {
this.field_76990_c.field_78724_e.func_110577_a(field_110789_a); this.field_76990_c.field_78724_e.func_110577_a(field_110789_a);
GlStateManager.func_179114_b(180.0F, 0.0F, 0.0F, 1.0F);
float f = 0.0078125F;
@@ -165,6 +168,7 @@ @@ -165,6 +168,7 @@
textureatlassprite.func_94219_l(); textureatlassprite.func_94219_l();
} }

11
patches/minecraft/net/minecraft/entity/item/EntityItemFrame.java.patch Normal file
View file

@ -0,0 +1,11 @@
--- ../src-base/minecraft/net/minecraft/entity/item/EntityItemFrame.java
+++ ../src-work/minecraft/net/minecraft/entity/item/EntityItemFrame.java
@@ -123,7 +123,7 @@
{
if (p_110131_1_ != null)
{
- if (p_110131_1_.func_77973_b() == Items.field_151098_aY)
+ if (p_110131_1_.func_77973_b() instanceof net.minecraft.item.ItemMap)
{
MapData mapdata = ((ItemMap)p_110131_1_.func_77973_b()).func_77873_a(p_110131_1_, this.field_70170_p);
mapdata.field_76203_h.remove("frame-" + this.func_145782_y());