From 9993d92afa38d1a2bd7b1a42803123a28d3cb069 Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Mon, 3 Aug 2026 02:05:46 +0800 Subject: [PATCH] v1.6.1 --- .../client/event/ManaHudRenderer.java | 27 ++++++++++--------- .../dynamic_lights/MEntityLuminance.java | 4 ++- .../loot_modifiers/global_loot_modifiers.json | 6 +++++ .../natures_gift_simple_dungeon.json | 10 +++++++ .../loot_table/chests/natures_gift.json | 21 +++++++++++++++ 5 files changed, 55 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/data/lzxnoneterraria/loot_modifiers/global_loot_modifiers.json create mode 100644 src/main/resources/data/lzxnoneterraria/loot_modifiers/natures_gift_simple_dungeon.json create mode 100644 src/main/resources/data/lzxnoneterraria/loot_table/chests/natures_gift.json diff --git a/src/main/java/com/lzxnone/terraria/client/event/ManaHudRenderer.java b/src/main/java/com/lzxnone/terraria/client/event/ManaHudRenderer.java index dde8b67..325cadf 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/ManaHudRenderer.java +++ b/src/main/java/com/lzxnone/terraria/client/event/ManaHudRenderer.java @@ -19,7 +19,9 @@ public class ManaHudRenderer { ); private static final int TEXTURE_WIDTH = 22; private static final int TEXTURE_HEIGHT = 24; - private static final int MAX_SEGMENT_COUNT = 10; + private static final int MANA_PER_STAR = 20; + private static final int MAX_SEGMENT_COUNT = 20; + private static final int SEGMENTS_PER_COLUMN = 10; private static final int SLOT_WIDTH = 8; private static final int SLOT_HEIGHT = 9; private static final int SLOT_GAP = 1; @@ -31,23 +33,21 @@ public class ManaHudRenderer { int maxMana = Math.max(0, mana.getMaxMana()); if(maxMana <= 0) return; - int segmentCount = Math.min(MAX_SEGMENT_COUNT, maxMana); - float segmentMana = maxMana < MAX_SEGMENT_COUNT ? 1.0F : maxMana / (float)MAX_SEGMENT_COUNT; + int segmentCount = Mth.clamp(Mth.ceil(maxMana / (float)MANA_PER_STAR), 0, MAX_SEGMENT_COUNT); int currentMana = Mth.clamp(mana.getMana(), 0, maxMana); - if(currentMana >= maxMana) return; manaBarX = RenderConfigs.MANA_BAR_X.get(); manaBarY = RenderConfigs.MANA_BAR_Y.get(); RenderSystem.enableBlend(); RenderSystem.defaultBlendFunc(); - float missingMana = maxMana - currentMana; for(int i = 0; i < segmentCount; i++) { - int bottomIndex = segmentCount - 1 - i; - float drained = Mth.clamp(missingMana - bottomIndex * segmentMana, 0.0F, segmentMana); - float fill = 1.0F - drained / segmentMana; - int slotY = manaBarY + i * (SLOT_HEIGHT + SLOT_GAP); - renderSegment(guiGraphics, manaBarX, slotY, fill); + float fill = Mth.clamp((currentMana - i * MANA_PER_STAR) / (float)MANA_PER_STAR, 0.0F, 1.0F); + int column = i / SEGMENTS_PER_COLUMN; + int row = i % SEGMENTS_PER_COLUMN; + int slotX = manaBarX + column * (SLOT_WIDTH + SLOT_GAP); + int slotY = manaBarY + row * (SLOT_HEIGHT + SLOT_GAP); + renderSegment(guiGraphics, slotX, slotY, fill); } guiGraphics.setColor(1.0F, 1.0F, 1.0F, 1.0F); renderManaText(guiGraphics, currentMana, maxMana, segmentCount); @@ -87,9 +87,12 @@ public class ManaHudRenderer { Font font = Minecraft.getInstance().font; String text = currentMana + "/" + maxMana; int textWidth = font.width(text); - int barCenterX = manaBarX + SLOT_WIDTH / 2; + int columnCount = Mth.ceil(segmentCount / (float)SEGMENTS_PER_COLUMN); + int rowCount = Math.min(segmentCount, SEGMENTS_PER_COLUMN); + int barWidth = columnCount * SLOT_WIDTH + Math.max(0, columnCount - 1) * SLOT_GAP; + int barCenterX = manaBarX + barWidth / 2; int textX = Mth.clamp(barCenterX - textWidth / 2, 2, guiGraphics.guiWidth() - textWidth - 2); - int textY = manaBarY + segmentCount * SLOT_HEIGHT + (segmentCount - 1) * SLOT_GAP + 2; + int textY = manaBarY + rowCount * SLOT_HEIGHT + Math.max(0, rowCount - 1) * SLOT_GAP + 2; guiGraphics.drawString(font, text, textX, textY, 0x66CCFF, true); } diff --git a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java index 8791cd5..c18fc1d 100644 --- a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java +++ b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java @@ -63,7 +63,9 @@ public class MEntityLuminance implements EntityLuminance { StaticSummonBehaviors.TERRAPRISMA, StaticSummonBehaviors.FLAMETHROWER_FLAME, StaticSummonBehaviors.ELF_MELTER_FLAME, - StaticSummonBehaviors.STARDUST_DRAGON -> { + StaticSummonBehaviors.STARDUST_DRAGON, + StaticSummonBehaviors.FALLEN_STAR, + StaticSummonBehaviors.FALLEN_STAR_SUPER -> { return 15; } case StaticSummonBehaviors.CHLOROPHYTE_BULLET, diff --git a/src/main/resources/data/lzxnoneterraria/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/lzxnoneterraria/loot_modifiers/global_loot_modifiers.json new file mode 100644 index 0000000..2a1b288 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/loot_modifiers/global_loot_modifiers.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "entries": [ + "lzxnoneterraria:natures_gift_simple_dungeon" + ] +} diff --git a/src/main/resources/data/lzxnoneterraria/loot_modifiers/natures_gift_simple_dungeon.json b/src/main/resources/data/lzxnoneterraria/loot_modifiers/natures_gift_simple_dungeon.json new file mode 100644 index 0000000..eee0605 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/loot_modifiers/natures_gift_simple_dungeon.json @@ -0,0 +1,10 @@ +{ + "type": "neoforge:add_table", + "conditions": [ + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/simple_dungeon" + } + ], + "table": "lzxnoneterraria:chests/natures_gift" +} diff --git a/src/main/resources/data/lzxnoneterraria/loot_table/chests/natures_gift.json b/src/main/resources/data/lzxnoneterraria/loot_table/chests/natures_gift.json new file mode 100644 index 0000000..4b47428 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/loot_table/chests/natures_gift.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.12 + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "lzxnoneterraria:natures_gift" + } + ], + "rolls": 1.0 + } + ] +}