Fix Abacus getting glitchy af when you walk really far with it

VazkiiMods · Dec 7, 2023 · 91a6332 · 91a6332
1 parent 8ec2273
commit 91a6332
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/org/violetmoon/quark/content/tools/item/AbacusItem.java b/src/main/java/org/violetmoon/quark/content/tools/item/AbacusItem.java
@@ -1,5 +1,7 @@
 package org.violetmoon.quark.content.tools.item;
 
+import net.minecraft.client.renderer.item.ClampedItemPropertyFunction;
+import net.minecraft.util.Mth;
 import net.minecraft.world.item.CreativeModeTabs;
 import org.jetbrains.annotations.NotNull;
 
@@ -71,7 +73,7 @@ public static int getCount(ItemStack stack, BlockPos target, Level world) {
 		BlockPos pos = getBlockPos(stack);
 
 		if(pos != null && !world.isEmptyBlock(target))
-			return target.distManhattan(pos);
+			return Mth.clamp(target.distManhattan(pos), 0, MAX_COUNT);
 
 		return -1;
 	}
@@ -93,12 +95,12 @@ public static int getCount(ItemStack stack, LivingEntity entityIn) {
 			return count;
 		}
 
-		public static float count(ItemStack stack, ClientLevel world, LivingEntity entityIn, int id) {
+		public static final ClampedItemPropertyFunction ITEM_PROPERTY_FUNCTION = (stack, level, entityIn, id) -> {
 			int count = getCount(stack, entityIn);
 			if(count == -1)
-				return 9999;
+				return 1F;
 
 			return 0.01F * count + 0.005F;
-		}
+		};
 	}
 }
diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/AbacusModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/AbacusModule.java
@@ -53,7 +53,7 @@ public static class Client extends AbacusModule {
 
 		@LoadEvent
 		public void clientSetup(ZClientSetup e) {
-			e.enqueueWork(() -> ItemProperties.register(abacus, new ResourceLocation("count"), AbacusItem.Client::count));
+			e.enqueueWork(() -> ItemProperties.register(abacus, new ResourceLocation("count"), AbacusItem.Client.ITEM_PROPERTY_FUNCTION));
 		}
 
 		@PlayEvent