Skip to content

Commit 0460f39

Browse files
authored
Update item rarities (#860)
2 parents b193c5e + 1eccffc commit 0460f39

File tree

2 files changed

+22
-12
lines changed

2 files changed

+22
-12
lines changed

Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,36 +163,46 @@ private static BlockBehaviour.Properties quenched() {
163163
public static final BlockRightClickImpetus IMPETUS_RIGHTCLICK = blockItem("impetus/rightclick",
164164
new BlockRightClickImpetus(slateish()
165165
.pushReaction(PushReaction.BLOCK)
166-
.lightLevel(bs -> bs.getValue(BlockAbstractImpetus.ENERGIZED) ? 15 : 0)));
166+
.lightLevel(bs -> bs.getValue(BlockAbstractImpetus.ENERGIZED) ? 15 : 0)),
167+
HexItems.props().rarity(Rarity.UNCOMMON));
167168
public static final BlockLookingImpetus IMPETUS_LOOK = blockItem("impetus/look",
168169
new BlockLookingImpetus(slateish()
169170
.pushReaction(PushReaction.BLOCK)
170-
.lightLevel(bs -> bs.getValue(BlockAbstractImpetus.ENERGIZED) ? 15 : 0)));
171+
.lightLevel(bs -> bs.getValue(BlockAbstractImpetus.ENERGIZED) ? 15 : 0)),
172+
HexItems.props().rarity(Rarity.UNCOMMON));
171173
public static final BlockRedstoneImpetus IMPETUS_REDSTONE = blockItem("impetus/redstone",
172174
new BlockRedstoneImpetus(slateish()
173175
.pushReaction(PushReaction.BLOCK)
174-
.lightLevel(bs -> bs.getValue(BlockAbstractImpetus.ENERGIZED) ? 15 : 0)));
176+
.lightLevel(bs -> bs.getValue(BlockAbstractImpetus.ENERGIZED) ? 15 : 0)),
177+
HexItems.props().rarity(Rarity.UNCOMMON));
175178

176179

177180
public static final BlockEmptyDirectrix EMPTY_DIRECTRIX = blockItem("directrix/empty",
178181
new BlockEmptyDirectrix(slateish()
179182
.pushReaction(PushReaction.BLOCK)));
180183
public static final BlockRedstoneDirectrix DIRECTRIX_REDSTONE = blockItem("directrix/redstone",
181184
new BlockRedstoneDirectrix(slateish()
182-
.pushReaction(PushReaction.BLOCK)));
185+
.pushReaction(PushReaction.BLOCK)),
186+
HexItems.props().rarity(Rarity.UNCOMMON));
183187
public static final BlockBooleanDirectrix DIRECTRIX_BOOLEAN = blockItem("directrix/boolean",
184188
new BlockBooleanDirectrix(slateish()
185-
.pushReaction(PushReaction.BLOCK)));
189+
.pushReaction(PushReaction.BLOCK)),
190+
HexItems.props().rarity(Rarity.UNCOMMON));
186191

187192
public static final BlockAkashicRecord AKASHIC_RECORD = blockItem("akashic_record",
188-
new BlockAkashicRecord(akashicWoodyHard().lightLevel(bs -> 15)));
193+
new BlockAkashicRecord(akashicWoodyHard().lightLevel(bs -> 15)),
194+
HexItems.props().rarity(Rarity.RARE)
195+
);
189196
public static final BlockAkashicBookshelf AKASHIC_BOOKSHELF = blockItem("akashic_bookshelf",
190197
new BlockAkashicBookshelf(akashicWoodyHard()
191198
.lightLevel(bs -> (bs.getValue(BlockAkashicBookshelf.HAS_BOOKS)) ? 4 : 0)));
192199
public static final BlockAkashicLigature AKASHIC_LIGATURE = blockItem("akashic_connector",
193200
new BlockAkashicLigature(akashicWoodyHard().lightLevel(bs -> 4)));
194201

195-
public static final BlockQuenchedAllay QUENCHED_ALLAY = blockItem("quenched_allay", new BlockQuenchedAllay(quenched()));
202+
public static final BlockQuenchedAllay QUENCHED_ALLAY = blockItem("quenched_allay",
203+
new BlockQuenchedAllay(quenched()),
204+
HexItems.props().rarity(Rarity.UNCOMMON)
205+
);
196206

197207
// Decoration?!
198208
public static final BlockQuenchedAllay QUENCHED_ALLAY_TILES = blockItem("quenched_allay_tiles", new BlockQuenchedAllay(quenched()));
@@ -233,8 +243,8 @@ private static BlockBehaviour.Properties quenched() {
233243
.mapColor(MapColor.COLOR_PURPLE)
234244
.sound(SoundType.AMETHYST)
235245
.strength(1f)
236-
.lightLevel($ -> 15)),
237-
HexItems.props().rarity(Rarity.RARE));
246+
.lightLevel($ -> 15))
247+
);
238248

239249
public static final BlockAkashicLog EDIFIED_LOG = blockItem("edified_log",
240250
new BlockAkashicLog(edifiedWoody()));

Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static void registerItemCreativeTab(CreativeModeTab.Output r, CreativeMod
5353
public static final Item AMETHYST_DUST = make("amethyst_dust", new Item(props()));
5454
public static final Item CHARGED_AMETHYST = make("charged_amethyst", new Item(props()));
5555

56-
public static final Item QUENCHED_SHARD = make("quenched_allay_shard", new Item(props()));
56+
public static final Item QUENCHED_SHARD = make("quenched_allay_shard", new Item(props().rarity(Rarity.UNCOMMON)));
5757

5858
public static final ItemStaff STAFF_OAK = make("staff/oak", new ItemStaff(unstackable()));
5959
public static final ItemStaff STAFF_SPRUCE = make("staff/spruce", new ItemStaff(unstackable()));
@@ -67,9 +67,9 @@ public static void registerItemCreativeTab(CreativeModeTab.Output r, CreativeMod
6767
public static final ItemStaff STAFF_CHERRY = make("staff/cherry", new ItemStaff(unstackable()));
6868
public static final ItemStaff STAFF_BAMBOO = make("staff/bamboo", new ItemStaff(unstackable()));
6969
public static final ItemStaff STAFF_EDIFIED = make("staff/edified", new ItemStaff(unstackable()));
70-
public static final ItemStaff STAFF_QUENCHED = make("staff/quenched", new ItemStaff(unstackable()));
70+
public static final ItemStaff STAFF_QUENCHED = make("staff/quenched", new ItemStaff(unstackable().rarity(Rarity.UNCOMMON)));
7171
// mindsplice staffaratus
72-
public static final ItemStaff STAFF_MINDSPLICE = make("staff/mindsplice", new ItemStaff(unstackable()));
72+
public static final ItemStaff STAFF_MINDSPLICE = make("staff/mindsplice", new ItemStaff(unstackable().rarity(Rarity.UNCOMMON)));
7373

7474
public static final ItemLens SCRYING_LENS = make("lens", new ItemLens(
7575
IXplatAbstractions.INSTANCE.addEquipSlotFabric(EquipmentSlot.HEAD)

0 commit comments

Comments
 (0)