Skip to content
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

dont show 1 #26

Open
wants to merge 9 commits into
base: oneconfig
Choose a base branch
from
Open

dont show 1 #26

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
47cb993
fixed bug
Waffles3438 Jun 25, 2024
52d5215
Merge branch 'main' into oneconfig
Waffles3438 Jun 25, 2024
eeec9b0
Update Armour.kt
Waffles3438 Jun 26, 2024
22490f0
Merge remote-tracking branch 'upstream/oneconfig' into oneconfig
Waffles3438 Jul 5, 2024
a19a19f
Update Armour.kt
Waffles3438 Jul 5, 2024
91b507a
Update Armour.kt
Waffles3438 Jul 28, 2024
d0ce103
Merge remote-tracking branch 'upstream/oneconfig' into oneconfig
Waffles3438 Jul 28, 2024
10cf3cd
Update Armour.kt
Waffles3438 Jul 28, 2024
f47cd3f
Merge remote-tracking branch 'upstream/oneconfig' into oneconfig
Waffles3438 Aug 4, 2024
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: 23 additions & 2 deletions src/main/kotlin/org/polyfrost/evergreenhud/hud/Armour.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,17 @@ import net.minecraft.client.renderer.GlStateManager
import net.minecraft.client.renderer.RenderHelper
import net.minecraft.init.Items
import net.minecraft.item.Item
import net.minecraft.item.ItemAxe
import net.minecraft.item.ItemBow
import net.minecraft.item.ItemFishingRod
import net.minecraft.item.ItemFlintAndSteel
import net.minecraft.item.ItemHoe
import net.minecraft.item.ItemPickaxe
import net.minecraft.item.ItemShears
import net.minecraft.item.ItemSpade
import net.minecraft.item.ItemStack
import net.minecraft.item.ItemSword
import net.minecraft.item.ItemTool
import org.polyfrost.evergreenhud.config.HudConfig
import kotlin.math.ceil

Expand Down Expand Up @@ -145,7 +154,7 @@ class Armour : HudConfig("ArmourHud", "evergreenhud/armour.json", false) {
25 to "c",
40 to "6",
60 to "e",
80 to "7",
80 to "a",
100 to "f"
)

Expand Down Expand Up @@ -254,8 +263,20 @@ class Armour : HudConfig("ArmourHud", "evergreenhud/armour.json", false) {
if (!type && i > 0) translation += offset + texts[i - 1].second + if (texts[i - 1].second > 0) iconPadding else 0

val amount = getItemAmount(if (stack.item is ItemBow) ItemStack(Items.arrow) else stack).let {
if (it != 0) it.toString() else null

if (it != 0 && it != 1 &&
!(stack.item is ItemHoe) &&
!(stack.item is ItemPickaxe) &&
!(stack.item is ItemShears) &&
!(stack.item is ItemSword) &&
!(stack.item is ItemAxe) &&
!(stack.item is ItemFishingRod) &&
!(stack.item is ItemFlintAndSteel) &&
!(stack.item is ItemSpade))
it.toString()
else null
}

RenderHelper.enableGUIStandardItemLighting()
mc.renderItem.zLevel = 200f
mc.renderItem.renderItemAndEffectIntoGUI(stack, itemX.toInt() + translation.toInt(), itemY.toInt())
Expand Down