diff --git a/src/generated/resources/assets/malum/lang/en_us.json b/src/generated/resources/assets/malum/lang/en_us.json index c633c6121..bd72dd935 100644 --- a/src/generated/resources/assets/malum/lang/en_us.json +++ b/src/generated/resources/assets/malum/lang/en_us.json @@ -1106,8 +1106,8 @@ "malum.gui.curio.effect.extend_positive_effect": "Extends Positive Effects", "malum.gui.curio.effect.friendly_enemies": "Reduces Enemy Aggression", "malum.gui.curio.effect.full_health_fake_collection": "Striking Full Health Targets Triggers Spirit Collection Effects", - "malum.gui.curio.effect.gluttony": "Eating Rotten Foods Extends Gluttony", "malum.gui.curio.effect.gluttony_magic_proficiency": "Gluttony Exchanges Hunger for Magic Proficiency", + "malum.gui.curio.effect.growing_gluttony": "Eating Rotten Foods Extends Gluttony", "malum.gui.curio.effect.haste": "Increased Mining Speed", "malum.gui.curio.effect.hunger_drain": "Actively Drains Hunger", "malum.gui.curio.effect.low_health_speed": "Speed at Low Health", @@ -1287,6 +1287,7 @@ "malum.subtitle.ritual_evolves": "Ritual evolves", "malum.subtitle.ritual_forms": "Ritual forms", "malum.subtitle.rotten_trinket_equipped": "Rotten trinket equipped", + "malum.subtitle.rune_trinket_equipped": "Rune trinket equipped", "malum.subtitle.runewood_break": "Block broken", "malum.subtitle.runewood_button_click_off": "Runewood button click off", "malum.subtitle.runewood_button_click_on": "Runewood button click on", diff --git a/src/main/java/com/sammy/malum/client/screen/codex/pages/EntrySelectorPage.java b/src/main/java/com/sammy/malum/client/screen/codex/pages/EntrySelectorPage.java index 1af3a9cdc..4badbae7e 100644 --- a/src/main/java/com/sammy/malum/client/screen/codex/pages/EntrySelectorPage.java +++ b/src/main/java/com/sammy/malum/client/screen/codex/pages/EntrySelectorPage.java @@ -19,10 +19,11 @@ public EntrySelectorPage(EntryChoice... entries) { public EntrySelectorPage(List> entries) { super(null); + boolean isWide = entries.size() > 4; for (int i = 0; i < entries.size(); i++) { var entry = entries.get(i); - int xOffset = i % 2 == 1 ? 88 : 24; - int yOffset = 12 + (i / 2) * 40; + int xOffset = isWide ? (i % 2 == 1 ? 88 : 24) : 66; + int yOffset = 12 + (isWide ? i / 2 : i) * 40; bookObjectHandler.add(new SelectableEntryObject<>(xOffset, yOffset, entry)); } } diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/brooches/CurioGluttonousBrooch.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/brooches/CurioGluttonousBrooch.java index a49f64268..5ff58b4bb 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/brooches/CurioGluttonousBrooch.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/brooches/CurioGluttonousBrooch.java @@ -23,7 +23,7 @@ public CurioGluttonousBrooch(Properties builder) { @Override public void addExtraTooltipLines(Consumer consumer) { - consumer.accept(negativeEffect("malum.gui.curio.effect.gluttonous_brooch")); + consumer.accept(negativeEffect("hunger_drain")); } @Override diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/sets/misc/CurioNarrowNecklace.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/sets/misc/CurioNarrowNecklace.java index 370c28e0b..d62f647f6 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/sets/misc/CurioNarrowNecklace.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/sets/misc/CurioNarrowNecklace.java @@ -18,7 +18,7 @@ public CurioNarrowNecklace(Properties builder) { @Override public void addExtraTooltipLines(Consumer consumer) { - consumer.accept(negativeEffect("malum.gui.curio.effect.necklace_of_the_narrow_edge")); + consumer.accept(negativeEffect("no_sweep")); } @Override diff --git a/src/main/java/com/sammy/malum/common/item/curiosities/curios/sets/rotten/CurioVoraciousRing.java b/src/main/java/com/sammy/malum/common/item/curiosities/curios/sets/rotten/CurioVoraciousRing.java index ed17d6d8f..399c44123 100644 --- a/src/main/java/com/sammy/malum/common/item/curiosities/curios/sets/rotten/CurioVoraciousRing.java +++ b/src/main/java/com/sammy/malum/common/item/curiosities/curios/sets/rotten/CurioVoraciousRing.java @@ -34,6 +34,7 @@ public CurioVoraciousRing(Properties builder) { @Override public void addExtraTooltipLines(Consumer consumer) { consumer.accept(positiveEffect("eat_rotten")); + consumer.accept(positiveEffect("growing_gluttony")); } @Override diff --git a/src/main/java/com/sammy/malum/core/systems/spirit/MalumSpiritType.java b/src/main/java/com/sammy/malum/core/systems/spirit/MalumSpiritType.java index 31ce58e92..cbb7d57f5 100644 --- a/src/main/java/com/sammy/malum/core/systems/spirit/MalumSpiritType.java +++ b/src/main/java/com/sammy/malum/core/systems/spirit/MalumSpiritType.java @@ -102,8 +102,8 @@ public ColorParticleDataBuilder createBloomColorData(float coefficientMultiplier public Rarity getItemRarity() { if (itemRarity == null) { - TextColor textColor = TextColor.fromRgb(ColorHelper.brighter(primaryColor, 1, 0.85f).getRGB()); -// TextColor textColor = TextColor.fromRgb(INVERT_COLOR); +// TextColor textColor = TextColor.fromRgb(ColorHelper.brighter(primaryColor, 1, 0.85f).getRGB()); + TextColor textColor = TextColor.fromRgb(INVERT_COLOR); itemRarity = Rarity.create("malum$" + identifier, (style) -> style.withColor(textColor)); } return itemRarity; diff --git a/src/main/java/com/sammy/malum/data/MalumLang.java b/src/main/java/com/sammy/malum/data/MalumLang.java index 8f84a9d57..3ad31d212 100644 --- a/src/main/java/com/sammy/malum/data/MalumLang.java +++ b/src/main/java/com/sammy/malum/data/MalumLang.java @@ -200,7 +200,7 @@ protected void addTranslations() { add("malum.gui.curio.effect.spirits_add_health", "Spirit Collection Grants Extra Hearts"); add("malum.gui.curio.effect.hunger_drain", "Actively Drains Hunger"); add("malum.gui.curio.effect.eat_rotten", "Rotten Foods are Tastier"); - add("malum.gui.curio.effect.gluttony", "Eating Rotten Foods Extends Gluttony"); + add("malum.gui.curio.effect.growing_gluttony", "Eating Rotten Foods Extends Gluttony"); add("malum.gui.curio.effect.explosion_drops_collected", "Automatic Collection of Explosion Drops"); add("malum.gui.curio.effect.bigger_explosions", "Improves Explosions"); add("malum.gui.curio.effect.better_conduit_power", "Conduit Power Provides Numerous Benefits"); @@ -211,7 +211,6 @@ protected void addTranslations() { add("malum.gui.curio.effect.scythe_counterattack", "Powerful Scythe Counterattack When Struck"); add("malum.gui.curio.effect.full_health_fake_collection", "Striking Full Health Targets Triggers Spirit Collection Effects"); add("malum.gui.curio.effect.soul_ward_physical_absorption", "Soul Ward Absorbs Physical Damage Equally to Magic Damage"); - add("malum.gui.curio.effect.spirits_gluttony", "Spirit Collection Generates Gluttony"); add("malum.gui.curio.effect.gluttony_magic_proficiency", "Gluttony Exchanges Hunger for Magic Proficiency"); add("malum.gui.curio.effect.enchanted_explosions", "Explosions are Enchanted with %s"); diff --git a/src/main/resources/assets/malum/textures/block/blight/blighted_soulwood.png b/src/main/resources/assets/malum/textures/block/blight/blighted_soulwood.png index d9a9ed7b6..c9f86e369 100644 Binary files a/src/main/resources/assets/malum/textures/block/blight/blighted_soulwood.png and b/src/main/resources/assets/malum/textures/block/blight/blighted_soulwood.png differ diff --git a/src/main/resources/assets/malum/textures/block/storage_blocks/mass_of_blighted_gunk.png b/src/main/resources/assets/malum/textures/block/storage_blocks/mass_of_blighted_gunk.png index b4b749377..d00de80be 100644 Binary files a/src/main/resources/assets/malum/textures/block/storage_blocks/mass_of_blighted_gunk.png and b/src/main/resources/assets/malum/textures/block/storage_blocks/mass_of_blighted_gunk.png differ diff --git a/src/main/resources/assets/malum/textures/item/blighted_gunk.png b/src/main/resources/assets/malum/textures/item/blighted_gunk.png index 90e9f2061..94a959792 100644 Binary files a/src/main/resources/assets/malum/textures/item/blighted_gunk.png and b/src/main/resources/assets/malum/textures/item/blighted_gunk.png differ