From ca4e7732ebd1acd911821ae44f7feb22b9cd183e Mon Sep 17 00:00:00 2001 From: "Arthur (fuj1n) Uzulin" Date: Sun, 27 Jun 2021 06:33:56 +1000 Subject: [PATCH] Fixed the item cycle in books cycling faster on faster machines with unlocked FPS --- .../client/screen/book/element/ItemElement.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/slimeknights/mantle/client/screen/book/element/ItemElement.java b/src/main/java/slimeknights/mantle/client/screen/book/element/ItemElement.java index 4619bef..0604130 100644 --- a/src/main/java/slimeknights/mantle/client/screen/book/element/ItemElement.java +++ b/src/main/java/slimeknights/mantle/client/screen/book/element/ItemElement.java @@ -8,6 +8,7 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import net.minecraft.util.Util; import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; @@ -22,7 +23,7 @@ import java.util.List; public class ItemElement extends SizedBookElement { public static final int ITEM_SIZE_HARDCODED = 16; - public static final int ITEM_SWITCH_TICKS = 175; + public static final long ITEM_SWITCH_TIME = 3000000000L; // 3 seconds public NonNullList itemCycle; public float scale; @@ -30,7 +31,7 @@ public class ItemElement extends SizedBookElement { public String action; public List tooltip; - public int renderTick = 0; + public long lastTime; public int currentItem = 0; public ItemElement(int x, int y, float scale, Item item) { @@ -60,6 +61,8 @@ public class ItemElement extends SizedBookElement { public ItemElement(int x, int y, float scale, ItemStack[] itemCycle, @Nullable String action) { super(x, y, MathHelper.floor(ITEM_SIZE_HARDCODED * scale), MathHelper.floor(ITEM_SIZE_HARDCODED * scale)); + lastTime = Util.nanoTime(); + NonNullList nonNullStacks = NonNullList.withSize(itemCycle.length, ItemStack.EMPTY); for (int i = 0; i < itemCycle.length; i++) { if (!itemCycle[i].isEmpty()) { @@ -74,10 +77,10 @@ public class ItemElement extends SizedBookElement { @Override public void draw(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) { - this.renderTick++; + long nano = Util.nanoTime(); - if (this.renderTick > ITEM_SWITCH_TICKS) { - this.renderTick = 0; + if(nano > lastTime + ITEM_SWITCH_TIME) { + this.lastTime = nano; this.currentItem++; if (this.currentItem >= this.itemCycle.size()) {