diff --git a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch index 0370138d0..29529bb59 100644 --- a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch @@ -23,7 +23,7 @@ this.func_229114_a_(p_229111_8_, p_229111_1_, p_229111_6_, p_229111_7_, p_229111_4_, ivertexbuilder); } else { - ItemStackTileEntityRenderer.field_147719_a.func_228364_a_(p_229111_1_, p_229111_4_, p_229111_5_, p_229111_6_, p_229111_7_); -+ p_229111_1_.func_77973_b().getTileEntityItemStackRenderer().func_228364_a_(p_229111_1_, p_229111_4_, p_229111_5_, p_229111_6_, p_229111_7_); ++ p_229111_1_.func_77973_b().getItemStackTileEntityRenderer().func_228364_a_(p_229111_1_, p_229111_4_, p_229111_5_, p_229111_6_, p_229111_7_); } p_229111_4_.func_227865_b_(); diff --git a/patches/minecraft/net/minecraft/item/Item.java.patch b/patches/minecraft/net/minecraft/item/Item.java.patch index f00f3c81b..e9c94f3a9 100644 --- a/patches/minecraft/net/minecraft/item/Item.java.patch +++ b/patches/minecraft/net/minecraft/item/Item.java.patch @@ -17,8 +17,8 @@ } + this.canRepair = p_i48487_1_.canRepair; + this.toolClasses.putAll(p_i48487_1_.toolClasses); -+ Object tmp = p_i48487_1_.teisr == null ? null : net.minecraftforge.fml.DistExecutor.callWhenOn(Dist.CLIENT, p_i48487_1_.teisr); -+ this.teisr = tmp == null ? null : () -> (net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer) tmp; ++ Object tmp = p_i48487_1_.ister == null ? null : net.minecraftforge.fml.DistExecutor.callWhenOn(Dist.CLIENT, p_i48487_1_.ister); ++ this.ister = tmp == null ? null : () -> (net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer) tmp; } @@ -86,7 +86,7 @@ } + @Nullable -+ private final java.util.function.Supplier teisr; ++ private final java.util.function.Supplier ister; + private final java.util.Map toolClasses = Maps.newHashMap(); + private final net.minecraftforge.common.util.ReverseTagWrapper reverseTags = new net.minecraftforge.common.util.ReverseTagWrapper<>(this, net.minecraft.tags.ItemTags::getGeneration, net.minecraft.tags.ItemTags::func_199903_a); + protected final boolean canRepair; @@ -108,8 +108,8 @@ + + @OnlyIn(Dist.CLIENT) + @Override -+ public final net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer getTileEntityItemStackRenderer() { -+ net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer renderer = teisr != null ? teisr.get() : null; ++ public final net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer getItemStackTileEntityRenderer() { ++ net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer renderer = ister != null ? ister.get() : null; + return renderer != null ? renderer : net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer.field_147719_a; + } + @@ -127,7 +127,7 @@ private Food field_221541_f; + private boolean canRepair = true; + private java.util.Map toolClasses = Maps.newHashMap(); -+ private java.util.function.Supplier> teisr; ++ private java.util.function.Supplier> ister; public Item.Properties func_221540_a(Food p_221540_1_) { this.field_221541_f = p_221540_1_; @@ -146,8 +146,8 @@ + return this; + } + -+ public Item.Properties setTEISR(java.util.function.Supplier> teisr) { -+ this.teisr = teisr; ++ public Item.Properties setISTER(java.util.function.Supplier> teisr) { ++ this.ister = ister; + return this; + } } diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java b/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java index 10d52d99a..560626c6e 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java @@ -763,7 +763,7 @@ public interface IForgeItem * one. */ @OnlyIn(Dist.CLIENT) - ItemStackTileEntityRenderer getTileEntityItemStackRenderer(); + ItemStackTileEntityRenderer getItemStackTileEntityRenderer(); /** * Retrieves a list of tags names this is known to be associated with.