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

Update item rarities #860

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update item rarities #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 16 additions & 8 deletions Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,26 +163,31 @@ 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",
new BlockEmptyDirectrix(slateish()
.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)));
Expand All @@ -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()));
Expand Down Expand Up @@ -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()));
Expand Down
6 changes: 3 additions & 3 deletions Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand All @@ -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)
Expand Down
Loading