From d1e62b2fedc01ef103c4be9512fb3be3027a9c5b Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 11 May 2023 20:48:39 +0100 Subject: [PATCH] More rubber block settings --- .../java/techreborn/events/ModRegistry.java | 18 +++++----- .../java/techreborn/init/TRBlockSettings.java | 36 +++++++++++++++++-- 2 files changed, 41 insertions(+), 13 deletions(-) diff --git a/src/main/java/techreborn/events/ModRegistry.java b/src/main/java/techreborn/events/ModRegistry.java index bf6bdd852..59a097b2c 100644 --- a/src/main/java/techreborn/events/ModRegistry.java +++ b/src/main/java/techreborn/events/ModRegistry.java @@ -24,14 +24,12 @@ package techreborn.events; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage; import net.minecraft.block.*; import net.minecraft.item.ArmorItem; import net.minecraft.item.Item; import net.minecraft.item.Item.Settings; import net.minecraft.item.Items; -import net.minecraft.sound.BlockSoundGroup; import reborncore.RebornRegistry; import reborncore.common.powerSystem.RcEnergyTier; import team.reborn.energy.api.EnergyStorage; @@ -97,21 +95,21 @@ public class ModRegistry { RebornRegistry.registerBlock(TRContent.REINFORCED_GLASS = InitUtils.setup(new BlockReinforcedGlass(), "reinforced_glass"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_LEAVES = InitUtils.setup(new BlockRubberLeaves(), "rubber_leaves"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_LOG = InitUtils.setup(new BlockRubberLog(), "rubber_log"), itemGroup); - RebornRegistry.registerBlock(TRContent.RUBBER_LOG_STRIPPED = InitUtils.setup(new PillarBlock(InitUtils.setupRubberBlockSettings(2.0F, 15.0F)), "rubber_log_stripped"), itemGroup); - RebornRegistry.registerBlock(TRContent.RUBBER_WOOD = InitUtils.setup(new PillarBlock(InitUtils.setupRubberBlockSettings(2.0F, 15.0F)), "rubber_wood"), itemGroup); - RebornRegistry.registerBlock(TRContent.STRIPPED_RUBBER_WOOD = InitUtils.setup(new PillarBlock(InitUtils.setupRubberBlockSettings(2.0F, 15.0F)), "stripped_rubber_wood"), itemGroup); + RebornRegistry.registerBlock(TRContent.RUBBER_LOG_STRIPPED = InitUtils.setup(new PillarBlock(TRBlockSettings.rubberLogStripped()), "rubber_log_stripped"), itemGroup); + RebornRegistry.registerBlock(TRContent.RUBBER_WOOD = InitUtils.setup(new PillarBlock(TRBlockSettings.rubberWoodStripped()), "rubber_wood"), itemGroup); + RebornRegistry.registerBlock(TRContent.STRIPPED_RUBBER_WOOD = InitUtils.setup(new PillarBlock(TRBlockSettings.rubberWoodStripped()), "stripped_rubber_wood"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_PLANKS = InitUtils.setup(new BlockRubberPlank(), "rubber_planks"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_SAPLING = InitUtils.setup(new BlockRubberSapling(), "rubber_sapling"), itemGroup); - RebornRegistry.registerBlock(TRContent.RUBBER_SLAB = InitUtils.setup(new SlabBlock(InitUtils.setupRubberBlockSettings(2.0F, 15.0F)), "rubber_slab"), itemGroup); - RebornRegistry.registerBlock(TRContent.RUBBER_FENCE = InitUtils.setup(new FenceBlock(InitUtils.setupRubberBlockSettings(2.0F, 15.0F)), "rubber_fence"), itemGroup); - RebornRegistry.registerBlock(TRContent.RUBBER_FENCE_GATE = InitUtils.setup(new FenceGateBlock(InitUtils.setupRubberBlockSettings(2.0F, 15.0F), TRContent.RUBBER_WOOD_TYPE), "rubber_fence_gate"), itemGroup); + RebornRegistry.registerBlock(TRContent.RUBBER_SLAB = InitUtils.setup(new SlabBlock(TRBlockSettings.rubberSlab()), "rubber_slab"), itemGroup); + RebornRegistry.registerBlock(TRContent.RUBBER_FENCE = InitUtils.setup(new FenceBlock(TRBlockSettings.rubberFence()), "rubber_fence"), itemGroup); + RebornRegistry.registerBlock(TRContent.RUBBER_FENCE_GATE = InitUtils.setup(new FenceGateBlock(TRBlockSettings.rubberFenceGate(), TRContent.RUBBER_WOOD_TYPE), "rubber_fence_gate"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_STAIR = InitUtils.setup(new BlockRubberPlankStair(), "rubber_stair"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_TRAPDOOR = InitUtils.setup(new RubberTrapdoorBlock(), "rubber_trapdoor"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_BUTTON = InitUtils.setup(new RubberButtonBlock(), "rubber_button"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_PRESSURE_PLATE = InitUtils.setup(new RubberPressurePlateBlock(), "rubber_pressure_plate"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_DOOR = InitUtils.setup(new RubberDoorBlock(), "rubber_door"), itemGroup); - RebornRegistry.registerBlockNoItem(TRContent.POTTED_RUBBER_SAPLING = InitUtils.setup(new FlowerPotBlock(TRContent.RUBBER_SAPLING, AbstractBlock.Settings.of(Material.DECORATION).breakInstantly().nonOpaque()), "potted_rubber_sapling")); - RebornRegistry.registerBlock(TRContent.COPPER_WALL = InitUtils.setup(new WallBlock(FabricBlockSettings.of(Material.METAL).strength(2f, 2f).sounds(BlockSoundGroup.METAL)), "copper_wall"), itemGroup); + RebornRegistry.registerBlockNoItem(TRContent.POTTED_RUBBER_SAPLING = InitUtils.setup(new FlowerPotBlock(TRContent.RUBBER_SAPLING, TRBlockSettings.pottedRubberSapling()), "potted_rubber_sapling")); + RebornRegistry.registerBlock(TRContent.COPPER_WALL = InitUtils.setup(new WallBlock(TRBlockSettings.copperWall()), "copper_wall"), itemGroup); TechReborn.LOGGER.debug("TechReborn's Blocks Loaded"); } diff --git a/src/main/java/techreborn/init/TRBlockSettings.java b/src/main/java/techreborn/init/TRBlockSettings.java index d01ed983b..f15eabfcd 100644 --- a/src/main/java/techreborn/init/TRBlockSettings.java +++ b/src/main/java/techreborn/init/TRBlockSettings.java @@ -51,21 +51,51 @@ public class TRBlockSettings { .burnable(); } + public static FabricBlockSettings rubberWoodStripped() { + return rubberWood() + .strength(2.0F, 15.0F); + } + public static FabricBlockSettings rubberLeaves() { - return FabricBlockSettings.copyOf(Blocks.OAK_LEAVES) + return FabricBlockSettings.copyOf(Blocks.SPRUCE_LEAVES) .mapColor(MapColor.SPRUCE_BROWN); } public static FabricBlockSettings rubberSapling() { - return FabricBlockSettings.copyOf(Blocks.OAK_SAPLING) + return FabricBlockSettings.copyOf(Blocks.SPRUCE_SAPLING) .mapColor(MapColor.SPRUCE_BROWN); } public static FabricBlockSettings rubberLog() { - return FabricBlockSettings.copyOf(Blocks.OAK_LOG) + return FabricBlockSettings.copyOf(Blocks.SPRUCE_LOG) .mapColor(MapColor.SPRUCE_BROWN); } + public static FabricBlockSettings rubberLogStripped() { + return rubberLog().strength(2.0F, 15.0F); + } + + public static FabricBlockSettings rubberSlab() { + return rubberLog(); + } + + public static FabricBlockSettings rubberFence() { + return rubberLog(); + } + + public static FabricBlockSettings rubberFenceGate() { + return rubberLog(); + } + + public static FabricBlockSettings pottedRubberSapling() { + return FabricBlockSettings.copyOf(Blocks.POTTED_SPRUCE_SAPLING); + } + + public static FabricBlockSettings copperWall() { + return FabricBlockSettings.copyOf(Blocks.COPPER_BLOCK) + .strength(2f, 2f); + } + public static FabricBlockSettings rubberTrapdoor() { return rubber(3.0F, 3.0F); }