From d46ea090123ba101102af5d7307e8eeba3108b01 Mon Sep 17 00:00:00 2001 From: Robotgiggle Date: Thu, 20 Feb 2025 15:25:13 -0500 Subject: [PATCH] Update item rarities --- .../hexcasting/common/lib/HexBlocks.java | 24 ++++++++++++------- .../hexcasting/common/lib/HexItems.java | 6 ++--- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java index 97e58a75e..9bb5e2807 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java @@ -163,15 +163,18 @@ private static BlockBehaviour.Properties quenched() { public static final BlockRightClickImpetus IMPETUS_RIGHTCLICK = blockItem("impetus/rightclick", new BlockRightClickImpetus(slateish() .pushReaction(PushReaction.BLOCK) - .lightLevel(bs -> bs.getValue(BlockAbstractImpetus.ENERGIZED) ? 15 : 0))); + .lightLevel(bs -> bs.getValue(BlockAbstractImpetus.ENERGIZED) ? 15 : 0)), + HexItems.props().rarity(Rarity.UNCOMMON)); public static final BlockLookingImpetus IMPETUS_LOOK = blockItem("impetus/look", new BlockLookingImpetus(slateish() .pushReaction(PushReaction.BLOCK) - .lightLevel(bs -> bs.getValue(BlockAbstractImpetus.ENERGIZED) ? 15 : 0))); + .lightLevel(bs -> bs.getValue(BlockAbstractImpetus.ENERGIZED) ? 15 : 0)), + HexItems.props().rarity(Rarity.UNCOMMON)); public static final BlockRedstoneImpetus IMPETUS_REDSTONE = blockItem("impetus/redstone", new BlockRedstoneImpetus(slateish() .pushReaction(PushReaction.BLOCK) - .lightLevel(bs -> bs.getValue(BlockAbstractImpetus.ENERGIZED) ? 15 : 0))); + .lightLevel(bs -> bs.getValue(BlockAbstractImpetus.ENERGIZED) ? 15 : 0)), + HexItems.props().rarity(Rarity.UNCOMMON)); public static final BlockEmptyDirectrix EMPTY_DIRECTRIX = blockItem("directrix/empty", @@ -179,10 +182,12 @@ private static BlockBehaviour.Properties quenched() { .pushReaction(PushReaction.BLOCK))); public static final BlockRedstoneDirectrix DIRECTRIX_REDSTONE = blockItem("directrix/redstone", new BlockRedstoneDirectrix(slateish() - .pushReaction(PushReaction.BLOCK))); + .pushReaction(PushReaction.BLOCK)), + HexItems.props().rarity(Rarity.UNCOMMON)); public static final BlockBooleanDirectrix DIRECTRIX_BOOLEAN = blockItem("directrix/boolean", new BlockBooleanDirectrix(slateish() - .pushReaction(PushReaction.BLOCK))); + .pushReaction(PushReaction.BLOCK)), + HexItems.props().rarity(Rarity.UNCOMMON)); public static final BlockAkashicRecord AKASHIC_RECORD = blockItem("akashic_record", new BlockAkashicRecord(akashicWoodyHard().lightLevel(bs -> 15))); @@ -192,7 +197,10 @@ private static BlockBehaviour.Properties quenched() { public static final BlockAkashicLigature AKASHIC_LIGATURE = blockItem("akashic_connector", new BlockAkashicLigature(akashicWoodyHard().lightLevel(bs -> 4))); - public static final BlockQuenchedAllay QUENCHED_ALLAY = blockItem("quenched_allay", new BlockQuenchedAllay(quenched())); + public static final BlockQuenchedAllay QUENCHED_ALLAY = blockItem("quenched_allay", + new BlockQuenchedAllay(quenched()), + HexItems.props().rarity(Rarity.RARE) + ); // Decoration?! public static final BlockQuenchedAllay QUENCHED_ALLAY_TILES = blockItem("quenched_allay_tiles", new BlockQuenchedAllay(quenched())); @@ -233,8 +241,8 @@ private static BlockBehaviour.Properties quenched() { .mapColor(MapColor.COLOR_PURPLE) .sound(SoundType.AMETHYST) .strength(1f) - .lightLevel($ -> 15)), - HexItems.props().rarity(Rarity.RARE)); + .lightLevel($ -> 15)) + ); public static final BlockAkashicLog EDIFIED_LOG = blockItem("edified_log", new BlockAkashicLog(edifiedWoody())); diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java index aa05c96c8..73988b4b2 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java @@ -53,7 +53,7 @@ public static void registerItemCreativeTab(CreativeModeTab.Output r, CreativeMod public static final Item AMETHYST_DUST = make("amethyst_dust", new Item(props())); public static final Item CHARGED_AMETHYST = make("charged_amethyst", new Item(props())); - public static final Item QUENCHED_SHARD = make("quenched_allay_shard", new Item(props())); + public static final Item QUENCHED_SHARD = make("quenched_allay_shard", new Item(props().rarity(Rarity.UNCOMMON))); public static final ItemStaff STAFF_OAK = make("staff/oak", new ItemStaff(unstackable())); public static final ItemStaff STAFF_SPRUCE = make("staff/spruce", new ItemStaff(unstackable())); @@ -67,9 +67,9 @@ public static void registerItemCreativeTab(CreativeModeTab.Output r, CreativeMod public static final ItemStaff STAFF_CHERRY = make("staff/cherry", new ItemStaff(unstackable())); public static final ItemStaff STAFF_BAMBOO = make("staff/bamboo", new ItemStaff(unstackable())); public static final ItemStaff STAFF_EDIFIED = make("staff/edified", new ItemStaff(unstackable())); - public static final ItemStaff STAFF_QUENCHED = make("staff/quenched", new ItemStaff(unstackable())); + public static final ItemStaff STAFF_QUENCHED = make("staff/quenched", new ItemStaff(unstackable().rarity(Rarity.UNCOMMON))); // mindsplice staffaratus - public static final ItemStaff STAFF_MINDSPLICE = make("staff/mindsplice", new ItemStaff(unstackable())); + public static final ItemStaff STAFF_MINDSPLICE = make("staff/mindsplice", new ItemStaff(unstackable().rarity(Rarity.UNCOMMON))); public static final ItemLens SCRYING_LENS = make("lens", new ItemLens( IXplatAbstractions.INSTANCE.addEquipSlotFabric(EquipmentSlot.HEAD)