From a9ada9f0896d58b8dbca4ae39324c064a4c36076 Mon Sep 17 00:00:00 2001 From: Shinare Date: Fri, 2 Aug 2024 18:24:09 +0300 Subject: [PATCH] WHY DOESN'T GIT MERGE?! --- src/main/java/com/zivilon/cinder_loe/items/WarDart.java | 3 --- src/main/java/com/zivilon/cinder_loe/recipes.java | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/zivilon/cinder_loe/items/WarDart.java b/src/main/java/com/zivilon/cinder_loe/items/WarDart.java index 2f5a593..16a9421 100644 --- a/src/main/java/com/zivilon/cinder_loe/items/WarDart.java +++ b/src/main/java/com/zivilon/cinder_loe/items/WarDart.java @@ -144,9 +144,6 @@ public class WarDart extends Item { @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) { int damageMeta = stack.getItemDamage(); - double damagePercent = getDamageFromMeta(damageMeta) * (1.0 / 8) * 100.0; - double roundedDamagePercent = 5 * Math.round(damagePercent / 5.0); - list.add(EnumChatFormatting.DARK_GREEN + "Ranged damage: " + roundedDamagePercent + "%"); if (damageMeta > 0) { double damagePercent = getDamageFromMeta(damageMeta) * (1.0 / 8) * 100.0; double roundedDamagePercent = 5 * Math.round(damagePercent / 5.0); diff --git a/src/main/java/com/zivilon/cinder_loe/recipes.java b/src/main/java/com/zivilon/cinder_loe/recipes.java index 9109ae3..3dc590c 100644 --- a/src/main/java/com/zivilon/cinder_loe/recipes.java +++ b/src/main/java/com/zivilon/cinder_loe/recipes.java @@ -9,6 +9,7 @@ import com.zivilon.cinder_loe.recipe.*; import lotr.common.item.LOTRItemFood; import net.minecraft.init.Blocks; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary;