Skip to content

Refresh item model if itemstack changes in ItemVisual, fix #300 #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 1.20.1/dev
Choose a base branch
from
+17 −8
Open

Refresh item model if itemstack changes in ItemVisual, fix #300 #301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions common/src/vanillin/java/dev/engine_room/vanillin/visuals/ItemVisual.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,17 @@ public class ItemVisual extends AbstractEntityVisual<ItemEntity> implements Simp
private static final ThreadLocal<RandomSource> RANDOM = ThreadLocal.withInitial(RandomSource::createNewThreadLocalInstance);

private final PoseStack pPoseStack = new PoseStack();
private final BakedModel bakedModel;
private BakedModel bakedModel;
private ItemStack currentStack;

private final InstanceRecycler<TransformedInstance> instances;
private InstanceRecycler<TransformedInstance> instances;

public ItemVisual(VisualizationContext ctx, ItemEntity entity, float partialTick) {
super(ctx, entity, partialTick);

var item = entity.getItem();
bakedModel = ItemModels.getModel(item);

var model = ItemModels.get(level, item, ItemDisplayContext.GROUND);

currentStack = entity.getItem();
bakedModel = ItemModels.getModel(currentStack);
var model = ItemModels.get(level, currentStack, ItemDisplayContext.GROUND);
instances = new InstanceRecycler<>(() -> ctx.instancerProvider()
.instancer(InstanceTypes.TRANSFORMED, model)
.createInstance());
Expand All @@ -63,8 +62,18 @@ private void animate(float partialTick) {
TransformStack.of(pPoseStack)
.translate(getVisualPosition(partialTick));

instances.resetCount();
ItemStack itemstack = entity.getItem();
if (!ItemStack.matches(itemstack, currentStack)) {
instances.delete();
currentStack = itemstack.copy();
bakedModel = ItemModels.getModel(currentStack);
var model = ItemModels.get(level, currentStack, ItemDisplayContext.GROUND);
instances = new InstanceRecycler<>(() -> visualizationContext.instancerProvider()
.instancer(InstanceTypes.TRANSFORMED, model)
.createInstance());
}
instances.resetCount();

int i = itemstack.isEmpty() ? 187 : Item.getId(itemstack.getItem()) + itemstack.getDamageValue();
var random = RANDOM.get();
random.setSeed(i);
Expand Down