From 3edc578e9bd28977eb0783bc90cf864ca7788763 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 10 Mar 2024 09:59:17 +0100 Subject: [PATCH] chore: remove deprecations --- .../platform/api/PlatformApiProxy.java | 3 ++- .../common/grid/screen/CraftingGridScreen.java | 11 ++++++++--- .../ExternalStorageBlockEntity.java | 1 + .../ItemStorageMonitorExtractionStrategy.java | 1 + .../storagemonitor/StorageMonitorBlock.java | 1 + .../common/support/AbstractBaseBlock.java | 1 + ...eractingNetworkNodeContainerBlockEntity.java | 1 + .../common/support/resource/ItemResource.java | 1 + .../storage/diskdrive/DiskDriveBakedModel.java | 9 +++------ .../DiskDriveBlockEntityRendererImpl.java | 2 +- .../diskdrive/FabricDiskDriveBlockEntity.java | 5 ++--- .../FabricPortableGridBlockEntity.java | 6 ++---- .../portablegrid/PortableGridBakedModel.java | 9 +++------ .../PortableGridBlockEntityRendererImpl.java | 2 +- .../storage/diskdrive/DiskDriveBakedModel.java | 9 +++------ .../portablegrid/PortableGridBakedModel.java | 13 +++++++------ .../render/RotationTranslationModelBaker.java | 17 ++++++++++++++--- 17 files changed, 52 insertions(+), 40 deletions(-) diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApiProxy.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApiProxy.java index 1980886df..4edd95bab 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApiProxy.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApiProxy.java @@ -35,6 +35,7 @@ import com.refinedmods.refinedstorage2.platform.api.support.registry.PlatformRegistry; import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceFactory; import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceRendering; +import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; import com.refinedmods.refinedstorage2.platform.api.upgrade.BuiltinUpgradeDestinations; import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry; import com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; @@ -81,7 +82,7 @@ public StorageContainerItemHelper getStorageContainerItemHelper() { } @Override - public PlatformRegistry getResourceTypeRegistry() { + public PlatformRegistry getResourceTypeRegistry() { return ensureLoaded().getResourceTypeRegistry(); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/CraftingGridScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/CraftingGridScreen.java index f2221282a..5627f5f0b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/CraftingGridScreen.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/CraftingGridScreen.java @@ -3,6 +3,7 @@ import com.refinedmods.refinedstorage2.platform.common.Platform; import com.refinedmods.refinedstorage2.platform.common.content.KeyMappings; import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridMatrixCloseBehavior; import com.refinedmods.refinedstorage2.platform.common.support.widget.HoveredImageButton; import javax.annotation.Nullable; @@ -166,9 +167,13 @@ public boolean keyPressed(final int key, final int scanCode, final int modifiers @Override public void onClose() { - switch (Platform.INSTANCE.getConfig().getCraftingGrid().getCraftingMatrixCloseBehavior()) { - case CLEAR_TO_NETWORK -> getMenu().clear(false); - case CLEAR_TO_INVENTORY -> getMenu().clear(true); + final CraftingGridMatrixCloseBehavior behavior = Platform.INSTANCE.getConfig() + .getCraftingGrid() + .getCraftingMatrixCloseBehavior(); + if (behavior == CraftingGridMatrixCloseBehavior.CLEAR_TO_NETWORK) { + getMenu().clear(false); + } else if (behavior == CraftingGridMatrixCloseBehavior.CLEAR_TO_INVENTORY) { + getMenu().clear(true); } super.onClose(); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java index 52af23de1..b0fc937b0 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java @@ -64,6 +64,7 @@ public ExternalStorageBlockEntity(final BlockPos pos, final BlockState state) { } @Override + @SuppressWarnings("deprecation") public void setBlockState(final BlockState newBlockState) { super.setBlockState(newBlockState); if (level instanceof ServerLevel serverLevel) { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java index 3c3a48991..915d9ce36 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java @@ -13,6 +13,7 @@ public class ItemStorageMonitorExtractionStrategy implements StorageMonitorExtractionStrategy { @Override + @SuppressWarnings("deprecation") public boolean extract(final ResourceKey resource, final boolean fullStack, final Player player, diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlock.java index 27a390a44..0dbe62d15 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlock.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlock.java @@ -53,6 +53,7 @@ public BlockEntityTicker getTicker(final Level level, } @Override + @SuppressWarnings("deprecation") public InteractionResult use(final BlockState state, final Level level, final BlockPos pos, diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseBlock.java index 30ba76a33..dcfed8e26 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseBlock.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseBlock.java @@ -171,6 +171,7 @@ private boolean rotate(final BlockState state, final Level level, final BlockPos return !state.equals(rotated); } + @SuppressWarnings("deprecation") protected BlockState getRotatedBlockState(final BlockState state, final Level level, final BlockPos pos) { return state.rotate(Rotation.CLOCKWISE_90); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java index fb8f6e7f2..1890368bd 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java @@ -28,6 +28,7 @@ protected AbstractLevelInteractingNetworkNodeContainerBlockEntity( // used to handle rotations @Override + @SuppressWarnings("deprecation") public void setBlockState(final BlockState newBlockState) { super.setBlockState(newBlockState); if (!(level instanceof ServerLevel serverLevel)) { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResource.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResource.java index 261c97128..122254f2f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResource.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResource.java @@ -69,6 +69,7 @@ public void toBuffer(final FriendlyByteBuf buf) { } @Override + @SuppressWarnings("deprecation") public long getInterfaceExportLimit() { return item.getMaxStackSize(); } diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveBakedModel.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveBakedModel.java index c88e9823a..0be51b0f9 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveBakedModel.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveBakedModel.java @@ -14,7 +14,6 @@ import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; -import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachedBlockView; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; @@ -86,11 +85,9 @@ public void emitBlockQuads(final BlockAndTintGetter blockView, } context.pushTransform(quadRotators.forDirection(direction)); super.emitBlockQuads(blockView, state, pos, randomSupplier, context); - if (blockView instanceof RenderAttachedBlockView renderAttachedBlockView) { - final Object renderAttachment = renderAttachedBlockView.getBlockEntityRenderAttachment(pos); - if (renderAttachment instanceof Disk[] disks) { - emitDiskQuads(blockView, state, pos, randomSupplier, context, disks); - } + final Object renderAttachment = blockView.getBlockEntityRenderData(pos); + if (renderAttachment instanceof Disk[] disks) { + emitDiskQuads(blockView, state, pos, randomSupplier, context, disks); } context.popTransform(); } diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java index 9590df8f8..62b658e3a 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java @@ -16,7 +16,7 @@ protected Disk[] getDisks(final AbstractDiskDriveBlockEntity blockEntity) { if (!(blockEntity instanceof FabricDiskDriveBlockEntity fabricDiskDriveBlockEntity)) { return null; } - if (fabricDiskDriveBlockEntity.getRenderAttachmentData() instanceof Disk[] disks) { + if (fabricDiskDriveBlockEntity.getRenderData() instanceof Disk[] disks) { return disks; } return null; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java index fbbcddcd2..2cce4ceff 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java @@ -4,18 +4,17 @@ import javax.annotation.Nullable; -import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachmentBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; -public class FabricDiskDriveBlockEntity extends AbstractDiskDriveBlockEntity implements RenderAttachmentBlockEntity { +public class FabricDiskDriveBlockEntity extends AbstractDiskDriveBlockEntity { public FabricDiskDriveBlockEntity(final BlockPos pos, final BlockState state) { super(pos, state); } @Override @Nullable - public Object getRenderAttachmentData() { + public Object getRenderData() { return disks; } } diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java index 07e40a0d0..ece20d700 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java @@ -5,19 +5,17 @@ import javax.annotation.Nullable; -import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachmentBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; -public class FabricPortableGridBlockEntity extends AbstractPortableGridBlockEntity - implements RenderAttachmentBlockEntity { +public class FabricPortableGridBlockEntity extends AbstractPortableGridBlockEntity { public FabricPortableGridBlockEntity(final PortableGridType type, final BlockPos pos, final BlockState state) { super(type, pos, state); } @Override @Nullable - public Object getRenderAttachmentData() { + public Object getRenderData() { return disk; } } diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridBakedModel.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridBakedModel.java index 3db00da0a..68a79b3d2 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridBakedModel.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridBakedModel.java @@ -14,7 +14,6 @@ import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; -import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachedBlockView; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.resources.model.BakedModel; @@ -96,11 +95,9 @@ public void emitBlockQuads(final BlockAndTintGetter blockView, return; } context.pushTransform(quadRotators.forDirection(direction)); - if (blockView instanceof RenderAttachedBlockView renderAttachedBlockView) { - final Object renderAttachment = renderAttachedBlockView.getBlockEntityRenderAttachment(pos); - if (renderAttachment instanceof Disk disk) { - emitDiskQuads(blockView, state, pos, randomSupplier, context, disk); - } + final Object renderAttachment = blockView.getBlockEntityRenderData(pos); + if (renderAttachment instanceof Disk disk) { + emitDiskQuads(blockView, state, pos, randomSupplier, context, disk); } final boolean active = state.getValue(PortableGridBlock.ACTIVE); (active ? activeModel : inactiveModel).emitBlockQuads(blockView, state, pos, randomSupplier, context); diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java index 9fb9e6bad..5908fd04a 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java @@ -19,7 +19,7 @@ protected Disk getDisk(final T blockEntity) { if (!(blockEntity instanceof FabricPortableGridBlockEntity fabricDiskDriveBlockEntity)) { return null; } - if (fabricDiskDriveBlockEntity.getRenderAttachmentData() instanceof Disk disk) { + if (fabricDiskDriveBlockEntity.getRenderData() instanceof Disk disk) { return disk; } return null; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveBakedModel.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveBakedModel.java index 4e3445e3f..9b5f8e191 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveBakedModel.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveBakedModel.java @@ -10,7 +10,6 @@ import com.refinedmods.refinedstorage2.platform.forge.support.render.RotationTranslationModelBaker; import com.refinedmods.refinedstorage2.platform.forge.support.render.TransformationBuilder; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -58,9 +57,7 @@ class DiskDriveBakedModel extends BakedModelWrapper { this.cache = CacheBuilder.newBuilder().build(CacheLoader.from(cacheKey -> { final Transformation rotation = TransformationBuilder.create().rotate(cacheKey.direction).build(); final RandomSource rand = RandomSource.create(); - final List quads = new ArrayList<>( - baseModelBaker.bake(rotation).getQuads(null, cacheKey.side, rand) - ); + final List quads = baseModelBaker.bake(rotation, cacheKey.side, rand); for (int j = 0; j < diskTranslations.length; ++j) { final Disk disk = cacheKey.disks[j]; quads.addAll(getDiskQuads(diskModelBaker, cacheKey, disk, j)); @@ -70,7 +67,7 @@ class DiskDriveBakedModel extends BakedModelWrapper { .rotate(cacheKey.direction) .translate(diskTranslations[j]) .build(); - quads.addAll(ledInactiveModelBaker.bake(ledTransform).getQuads(null, cacheKey.side, rand)); + quads.addAll(ledInactiveModelBaker.bake(ledTransform, cacheKey.side, rand)); } } return quads; @@ -117,7 +114,7 @@ private List getDiskQuads(final DiskModelBaker diskBakers, .rotate(cacheKey.direction) .translate(diskTranslations[index]) .build(); - return diskBaker.bake(diskTransform).getQuads(null, cacheKey.side, RandomSource.create()); + return diskBaker.bake(diskTransform, cacheKey.side, RandomSource.create()); } private static Vector3f getDiskTranslation(final int x, final int y) { diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridBakedModel.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridBakedModel.java index 2299919f3..5c259bb6e 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridBakedModel.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridBakedModel.java @@ -11,7 +11,6 @@ import com.refinedmods.refinedstorage2.platform.forge.support.render.RotationTranslationModelBaker; import com.refinedmods.refinedstorage2.platform.forge.support.render.TransformationBuilder; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import javax.annotation.Nullable; @@ -50,9 +49,11 @@ class PortableGridBakedModel extends BakedModelWrapper { final RotationTranslationModelBaker baseModelBaker = cacheKey.active ? activeModelBaker : inactiveModelBaker; - final List quads = new ArrayList<>(baseModelBaker.bake(TransformationBuilder.create() - .rotate(cacheKey.direction) - .build()).getQuads(null, cacheKey.side(), RandomSource.create())); + final List quads = baseModelBaker.bake( + TransformationBuilder.create().rotate(cacheKey.direction).build(), + cacheKey.side(), + RandomSource.create() + ); if (cacheKey.disk.item() == null) { return quads; } @@ -62,13 +63,13 @@ class PortableGridBakedModel extends BakedModelWrapper { .rotate(cacheKey.direction) .translate(MOVE_TO_DISK_LOCATION) .rotate(BiDirection.WEST) - .build()).getQuads(null, cacheKey.side(), RandomSource.create())); + .build(), cacheKey.side(), RandomSource.create())); } if (cacheKey.includeLed && cacheKey.disk.state() != StorageState.NONE) { quads.addAll(diskLedBakers.forState(cacheKey.disk.state()).bake(TransformationBuilder.create() .translate(MOVE_TO_DISK_LED_LOCATION) .rotate(BiDirection.WEST) - .build()).getQuads(null, cacheKey.side(), RandomSource.create())); + .build(), cacheKey.side(), RandomSource.create())); } return quads; })); diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/RotationTranslationModelBaker.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/RotationTranslationModelBaker.java index 763d1e87a..abf422b50 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/RotationTranslationModelBaker.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/RotationTranslationModelBaker.java @@ -1,15 +1,20 @@ package com.refinedmods.refinedstorage2.platform.forge.support.render; +import java.util.ArrayList; +import java.util.List; import java.util.function.Function; import javax.annotation.Nullable; import com.mojang.math.Transformation; +import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.resources.model.Material; import net.minecraft.client.resources.model.ModelBaker; import net.minecraft.client.resources.model.ModelState; +import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.RandomSource; import net.neoforged.neoforge.client.model.SimpleModelState; public class RotationTranslationModelBaker { @@ -28,9 +33,15 @@ public RotationTranslationModelBaker(final ModelState state, this.model = model; } - @Nullable - public BakedModel bake(final Transformation transformation) { + @SuppressWarnings("deprecation") + public List bake(final Transformation transformation, + @Nullable final Direction side, + final RandomSource rand) { final ModelState wrappedState = new SimpleModelState(transformation, state.isUvLocked()); - return baker.bake(model, wrappedState, spriterGetter); + final BakedModel bakedModel = baker.bake(model, wrappedState, spriterGetter); + if (bakedModel == null) { + return new ArrayList<>(); + } + return new ArrayList<>(bakedModel.getQuads(null, side, rand)); } }