Skip to content

Commit

Permalink
refactor(1.21.2): Use new Balm block/item registration methods
Browse files Browse the repository at this point in the history
  • Loading branch information
@BlayTheNinth
BlayTheNinth committed Oct 10, 2024
1 parent f08ba21 commit 181aa2f
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 35 deletions.
43 changes: 21 additions & 22 deletions common/src/main/java/net/blay09/mods/waystones/block/ModBlocks.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package net.blay09.mods.waystones.block;

import net.blay09.mods.balm.api.Balm;
import net.blay09.mods.balm.api.block.BalmBlocks;
import net.blay09.mods.waystones.Waystones;
import net.minecraft.core.registries.Registries;
Expand Down Expand Up @@ -64,51 +63,51 @@ public class ModBlocks {
public static final SharestoneBlock[] sharestones = new SharestoneBlock[sharestoneColors.length];

public static void initialize(BalmBlocks blocks) {
blocks.register(() -> waystone = new WaystoneBlock(defaultProperties("waystone")), () -> itemBlock(waystone, "waystone"), id("waystone"));
blocks.register(() -> mossyWaystone = new WaystoneBlock(defaultProperties("mossy_waystone")), () -> itemBlock(mossyWaystone, "mossy_waystone"), id("mossy_waystone"));
blocks.register(() -> sandyWaystone = new WaystoneBlock(defaultProperties("sandy_waystone")), () -> itemBlock(sandyWaystone, "sandy_waystone"), id("sandy_waystone"));
blocks.register(() -> deepslateWaystone = new WaystoneBlock(defaultProperties("deepslate_waystone").sound(SoundType.DEEPSLATE)),
() -> itemBlock(deepslateWaystone, "deepslate_waystone"),
blocks.register((identifier) -> waystone = new WaystoneBlock(defaultProperties(identifier)), ModBlocks::itemBlock, id("waystone"));
blocks.register((identifier) -> mossyWaystone = new WaystoneBlock(defaultProperties(identifier)), ModBlocks::itemBlock, id("mossy_waystone"));
blocks.register((identifier) -> sandyWaystone = new WaystoneBlock(defaultProperties(identifier)), ModBlocks::itemBlock, id("sandy_waystone"));
blocks.register((identifier) -> deepslateWaystone = new WaystoneBlock(defaultProperties(identifier).sound(SoundType.DEEPSLATE)),
ModBlocks::itemBlock,
id("deepslate_waystone"));
blocks.register(() -> blackstoneWaystone = new WaystoneBlock(defaultProperties("blackstone_waystone")), () -> itemBlock(blackstoneWaystone, "blackstone_waystone"), id("blackstone_waystone"));
blocks.register(() -> endStoneWaystone = new WaystoneBlock(defaultProperties("end_stone_waystone")), () -> itemBlock(endStoneWaystone, "end_stone_waystone"), id("end_stone_waystone"));
blocks.register(() -> warpPlate = new WarpPlateBlock(defaultProperties("warp_plate")), () -> itemBlock(warpPlate, "warp_plate"), id("warp_plate"));
blocks.register((identifier) -> blackstoneWaystone = new WaystoneBlock(defaultProperties(identifier)), ModBlocks::itemBlock, id("blackstone_waystone"));
blocks.register((identifier) -> endStoneWaystone = new WaystoneBlock(defaultProperties(identifier)), ModBlocks::itemBlock, id("end_stone_waystone"));
blocks.register((identifier) -> warpPlate = new WarpPlateBlock(defaultProperties(identifier)), ModBlocks::itemBlock, id("warp_plate"));

for (final var color : portstoneColors) {
blocks.register(() -> portstones[color.ordinal()] = new PortstoneBlock(color, defaultProperties(color.getSerializedName() + "_portstone")),
() -> itemBlock(portstones[color.ordinal()], color.getSerializedName() + "_portstone"),
blocks.register((identifier) -> portstones[color.ordinal()] = new PortstoneBlock(color, defaultProperties(identifier)),
ModBlocks::itemBlock,
id(color.getSerializedName() + "_portstone"));
}

for (final var color : sharestoneColors) {
blocks.register(() -> sharestones[color.ordinal() - 1] = new SharestoneBlock(color, defaultProperties(color.getSerializedName() + "_sharestone")),
() -> itemBlock(sharestones[color.ordinal() - 1], color.getSerializedName() + "_sharestone"),
blocks.register((identifier) -> sharestones[color.ordinal() - 1] = new SharestoneBlock(color, defaultProperties(identifier)),
ModBlocks::itemBlock,
id(color.getSerializedName() + "_sharestone"));
}
}

private static BlockItem itemBlock(Block block, String name) {
private static BlockItem itemBlock(Block block, ResourceLocation name) {
return new BlockItem(block, defaultItemProperties(name));
}

private static ResourceLocation id(String name) {
return ResourceLocation.fromNamespaceAndPath(Waystones.MOD_ID, name);
}

private static ResourceKey<Block> blockId(String name) {
return ResourceKey.create(Registries.BLOCK, id(name));
private static ResourceKey<Block> blockId(ResourceLocation identifier) {
return ResourceKey.create(Registries.BLOCK, identifier);
}

private static ResourceKey<Item> itemId(String name) {
return ResourceKey.create(Registries.ITEM, id(name));
private static ResourceKey<Item> itemId(ResourceLocation identifier) {
return ResourceKey.create(Registries.ITEM, identifier);
}

private static BlockBehaviour.Properties defaultProperties(String name) {
return Balm.getBlocks().blockProperties().setId(blockId(name)).sound(SoundType.STONE).strength(5f, 2000f);
private static BlockBehaviour.Properties defaultProperties(ResourceLocation identifier) {
return BlockBehaviour.Properties.of().setId(blockId(identifier)).sound(SoundType.STONE).strength(5f, 2000f);
}

private static Item.Properties defaultItemProperties(String name) {
return Balm.getItems().itemProperties().setId(itemId(name));
private static Item.Properties defaultItemProperties(ResourceLocation identifier) {
return new Item.Properties().setId(itemId(identifier));
}

@Nullable
Expand Down
26 changes: 13 additions & 13 deletions common/src/main/java/net/blay09/mods/waystones/item/ModItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ public class ModItems {
public static Item crumblingAttunedShard;

public static void initialize(BalmItems items) {
items.registerItem(() -> returnScroll = new ReturnScrollItem(defaultProperties("return_scroll")), id("return_scroll"));
items.registerItem(() -> boundScroll = new BoundScrollItem(defaultProperties("bound_scroll")), id("bound_scroll"), null);
items.registerItem(() -> warpScroll = new WarpScrollItem(defaultProperties("warp_scroll")), id("warp_scroll"));
items.registerItem(() -> warpStone = new WarpStoneItem(defaultProperties("warp_stone")), id("warp_stone"));
items.registerItem(() -> warpDust = new WarpDustItem(defaultProperties("warp_dust")), id("warp_dust"));
items.registerItem(() -> dormantShard = new ShardItem(defaultProperties("dormant_shard")), id("dormant_shard"));
items.registerItem(() -> attunedShard = new AttunedShardItem(defaultProperties("attuned_shard")), id("attuned_shard"), null);
items.registerItem(() -> deepslateShard = new ShardItem(defaultProperties("deepslate_shard")), id("deepslate_shard"));
items.registerItem(() -> crumblingAttunedShard = new CrumblingAttunedShardItem(defaultProperties("crumbling_attuned_shard")), id("crumbling_attuned_shard"), null);
items.registerItem((identifier) -> returnScroll = new ReturnScrollItem(defaultProperties(identifier)), id("return_scroll"));
items.registerItem((identifier) -> boundScroll = new BoundScrollItem(defaultProperties(identifier)), id("bound_scroll"), null);
items.registerItem((identifier) -> warpScroll = new WarpScrollItem(defaultProperties(identifier)), id("warp_scroll"));
items.registerItem((identifier) -> warpStone = new WarpStoneItem(defaultProperties(identifier)), id("warp_stone"));
items.registerItem((identifier) -> warpDust = new WarpDustItem(defaultProperties(identifier)), id("warp_dust"));
items.registerItem((identifier) -> dormantShard = new ShardItem(defaultProperties(identifier)), id("dormant_shard"));
items.registerItem((identifier) -> attunedShard = new AttunedShardItem(defaultProperties(identifier)), id("attuned_shard"), null);
items.registerItem((identifier) -> deepslateShard = new ShardItem(defaultProperties(identifier)), id("deepslate_shard"));
items.registerItem((identifier) -> crumblingAttunedShard = new CrumblingAttunedShardItem(defaultProperties(identifier)), id("crumbling_attuned_shard"), null);

creativeModeTab = items.registerCreativeModeTab(() -> new ItemStack(ModBlocks.waystone), id("waystones"));

Expand Down Expand Up @@ -114,15 +114,15 @@ public int compare(ItemLike o1, ItemLike o2) {
});
}

private static Item.Properties defaultProperties(String name) {
return Balm.getItems().itemProperties().setId(itemId(name));
private static Item.Properties defaultProperties(ResourceLocation identifier) {
return new Item.Properties().setId(itemId(identifier));
}

private static ResourceLocation id(String name) {
return ResourceLocation.fromNamespaceAndPath(Waystones.MOD_ID, name);
}

private static ResourceKey<Item> itemId(String name) {
return ResourceKey.create(Registries.ITEM, id(name));
private static ResourceKey<Item> itemId(ResourceLocation identifier) {
return ResourceKey.create(Registries.ITEM, identifier);
}
}

0 comments on commit 181aa2f

Please sign in to comment.