Update ItemShouLamp.java

TeamGensouSpark · Oct 19, 2023 · e56c921 · e56c921
1 parent c0d5953
commit e56c921
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/main/java/arekkuusu/grimoireofalice/common/item/ItemShouLamp.java b/src/main/java/arekkuusu/grimoireofalice/common/item/ItemShouLamp.java
@@ -70,18 +70,24 @@ public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player
 		player.setActiveHand(hand);
 		return new ActionResult<>(EnumActionResult.SUCCESS, stack);
 	}
-
+	
 	@Override
-	public void onUsingTick(ItemStack stack, EntityLivingBase player, int count) {
-		if(JEWELS.get(stack) < 500 && player instanceof EntityPlayer) {
+	public void onPlayerStoppedUsing(ItemStack stack, World world, EntityLivingBase entityLiving, int timeLeft) {
+		if(entityLiving instanceof EntityPlayer) {
+			EntityPlayer player = ((EntityPlayer) entityLiving);
+			int timeUsed = getMaxItemUseDuration(stack) - timeLeft;
+			if(timeUsed > 500) {
+				timeUsed = 500;
+			}
+			addJewels(stack, (short) timeUsed);
 			player.addPotionEffect(new PotionEffect(MobEffects.LUCK, 10, 5));
-			if(count % 4 == 0) {
-				player.playSound(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, 0.1F, 1F);
+			player.playSound(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, 0.1F, 1F);
+			if(JEWELS.get(stack) > 500){
+				JEWELS.set((short) 500);
 			}
-			addJewels(stack, (short) 1);
 		}
 	}
-
+	
 	@Override
 	public void onPlayerStoppedUsing(ItemStack stack, World world, EntityLivingBase entityLiving, int timeLeft) {
 		if(entityLiving instanceof EntityPlayer) {