From 654a0019906eea0f24c178007ff6af9c7f22a6b9 Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Sun, 21 Nov 2021 14:45:33 -0600 Subject: [PATCH] Tweaks --- .../de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java | 5 ++--- .../actuallyadditions/mod/blocks/ActuallyBlocks.java | 6 ++++++ .../ellpeck/actuallyadditions/mod/items/ActuallyItems.java | 5 +++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java index 742b9b846..775c906dd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java @@ -92,9 +92,8 @@ public class ActuallyAdditions { public ActuallyAdditions() { IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus(); - ActuallyBlocks.BLOCKS.register(eventBus); - ActuallyItems.ITEMS.register(eventBus); - ActuallyBlocks.TILES.register(eventBus); + ActuallyBlocks.init(eventBus); + ActuallyItems.init(eventBus); ActuallyRecipes.init(eventBus); ActuallyContainers.CONTAINERS.register(eventBus); ENTITIES.register(eventBus); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java index c82ceb03f..770b67e5b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java @@ -21,6 +21,7 @@ import net.minecraft.block.material.Material; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntityType; import net.minecraftforge.common.ToolType; +import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; @@ -278,4 +279,9 @@ public final class ActuallyBlocks { public static AbstractBlock.Properties defaultPickProps(int harvestLevel) { return AbstractBlock.Properties.of(Material.STONE).harvestLevel(harvestLevel).harvestTool(ToolType.PICKAXE).strength(1.5F, 10.0F).sound(SoundType.STONE); } + + public static void init(IEventBus evt) { + BLOCKS.register(evt); + TILES.register(evt); + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java index 5edb64c7a..626bb40fd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java @@ -23,6 +23,7 @@ import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTier; +import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.RegistryObject; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; @@ -257,4 +258,8 @@ public final class ActuallyItems { public static Item.Properties defaultNonStacking() { return defaultProps().stacksTo(1); } + + public static void init(IEventBus evt) { + ITEMS.register(evt); + } }