Skip to content

Commit 2239428

Browse files
authored
Remove now-unused BakedModel return from applyTransform (#1769)
1 parent 14f126a commit 2239428

File tree

4 files changed

+4
-11
lines changed

4 files changed

+4
-11
lines changed

patches/net/minecraft/client/renderer/item/ItemStackRenderState.java.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
void render(PoseStack p_387607_, MultiBufferSource p_386763_, int p_387589_, int p_388775_) {
1515
p_387607_.pushPose();
1616
+ if (model != null)
17-
+ net.neoforged.neoforge.client.ClientHooks.handleCameraTransforms(p_387607_, model, displayContext, ItemStackRenderState.this.isLeftHand);
17+
+ model.applyTransform(displayContext, p_387607_, ItemStackRenderState.this.isLeftHand);
1818
+ else
1919
this.transform().apply(ItemStackRenderState.this.isLeftHand, p_387607_);
2020
p_387607_.translate(-0.5F, -0.5F, -0.5F);

patches/net/minecraft/client/resources/model/DelegateBakedModel.java.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
+ }
5050
+
5151
+ @Override
52-
+ public BakedModel applyTransform(net.minecraft.world.item.ItemDisplayContext transformType, com.mojang.blaze3d.vertex.PoseStack poseStack, boolean applyLeftHandTransform) {
53-
+ return this.parent.applyTransform(transformType, poseStack, applyLeftHandTransform);
52+
+ public void applyTransform(net.minecraft.world.item.ItemDisplayContext transformType, com.mojang.blaze3d.vertex.PoseStack poseStack, boolean applyLeftHandTransform) {
53+
+ this.parent.applyTransform(transformType, poseStack, applyLeftHandTransform);
5454
+ }
5555
+
5656
+ @Override

src/main/java/net/neoforged/neoforge/client/ClientHooks.java

-6
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
import net.minecraft.world.entity.player.Player;
115115
import net.minecraft.world.inventory.RecipeBookType;
116116
import net.minecraft.world.inventory.tooltip.TooltipComponent;
117-
import net.minecraft.world.item.ItemDisplayContext;
118117
import net.minecraft.world.item.ItemStack;
119118
import net.minecraft.world.level.BlockAndTintGetter;
120119
import net.minecraft.world.level.GameType;
@@ -462,11 +461,6 @@ public static void onModelBake(ModelManager modelManager, ModelBakery.BakingResu
462461
ModLoader.postEvent(new ModelEvent.BakingCompleted(modelManager, bakingResult, modelBakery));
463462
}
464463

465-
public static BakedModel handleCameraTransforms(PoseStack poseStack, @Nullable BakedModel model, ItemDisplayContext cameraTransformType, boolean applyLeftHandTransform) {
466-
model = model.applyTransform(cameraTransformType, poseStack, applyLeftHandTransform);
467-
return model;
468-
}
469-
470464
@SuppressWarnings("deprecation")
471465
public static Material getBlockMaterial(ResourceLocation loc) {
472466
return new Material(TextureAtlas.LOCATION_BLOCKS, loc);

src/main/java/net/neoforged/neoforge/client/extensions/IBakedModelExtension.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,8 @@ default TriState useAmbientOcclusion(BlockState state, ModelData data, RenderTyp
6363
* Applies a transform for the given {@link ItemTransforms.TransformType} and {@code applyLeftHandTransform}, and
6464
* returns the model to be rendered.
6565
*/
66-
default BakedModel applyTransform(ItemDisplayContext transformType, PoseStack poseStack, boolean applyLeftHandTransform) {
66+
default void applyTransform(ItemDisplayContext transformType, PoseStack poseStack, boolean applyLeftHandTransform) {
6767
self().getTransforms().getTransform(transformType).apply(applyLeftHandTransform, poseStack);
68-
return self();
6968
}
7069

7170
default ModelData getModelData(BlockAndTintGetter level, BlockPos pos, BlockState state, ModelData modelData) {

0 commit comments

Comments
 (0)