From 913516d35b306c013b6a291fbf8867d8310d9179 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Tue, 26 Apr 2022 05:29:15 +0300 Subject: [PATCH] Make all Aeternium items fire-resistant (#458) --- .../ru/betterend/blocks/AeterniumAnvil.java | 9 ++++++ .../ru/betterend/blocks/AeterniumBlock.java | 30 +++++++++---------- .../java/ru/betterend/registry/EndItems.java | 19 ++++++------ 3 files changed, 34 insertions(+), 24 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/AeterniumAnvil.java b/src/main/java/ru/betterend/blocks/AeterniumAnvil.java index 49763514..c0655fe4 100644 --- a/src/main/java/ru/betterend/blocks/AeterniumAnvil.java +++ b/src/main/java/ru/betterend/blocks/AeterniumAnvil.java @@ -1,5 +1,9 @@ package ru.betterend.blocks; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.BlockItem; +import ru.bclib.items.BaseAnvilItem; import ru.betterend.blocks.basis.EndAnvilBlock; import ru.betterend.item.material.EndToolMaterial; import ru.betterend.registry.EndBlocks; @@ -13,4 +17,9 @@ public class AeterniumAnvil extends EndAnvilBlock { public int getMaxDurability() { return 8; } + + @Override + public BlockItem getCustomItem(ResourceLocation blockID, FabricItemSettings settings) { + return new BaseAnvilItem(this, settings.fireproof()); + } } diff --git a/src/main/java/ru/betterend/blocks/AeterniumBlock.java b/src/main/java/ru/betterend/blocks/AeterniumBlock.java index 2541214c..21727368 100644 --- a/src/main/java/ru/betterend/blocks/AeterniumBlock.java +++ b/src/main/java/ru/betterend/blocks/AeterniumBlock.java @@ -1,28 +1,28 @@ package ru.betterend.blocks; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.BlockGetter; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.BlockItem; import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; import ru.bclib.blocks.BaseBlock; +import ru.bclib.interfaces.CustomItemProvider; -public class AeterniumBlock extends BaseBlock { - +public class AeterniumBlock extends BaseBlock implements CustomItemProvider { public AeterniumBlock() { - super(FabricBlockSettings.of(Material.METAL, MaterialColor.COLOR_GRAY) - .hardness(65F) - .resistance(1200F) - .requiresCorrectToolForDrops() - .sound(SoundType.NETHERITE_BLOCK)); + super(FabricBlockSettings + .of(Material.METAL, MaterialColor.COLOR_GRAY) + .hardness(65F) + .resistance(1200F) + .requiresCorrectToolForDrops() + .sound(SoundType.NETHERITE_BLOCK) + ); } - @Environment(EnvType.CLIENT) - public int getColor(BlockState state, BlockGetter world, BlockPos pos) { - return 0xFF657A7A; + @Override + public BlockItem getCustomItem(ResourceLocation blockID, FabricItemSettings settings) { + return new BlockItem(this, settings.fireproof()); } } diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java index 13ed5bfb..1bcdb454 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -15,6 +15,7 @@ import net.minecraft.world.item.TieredItem; import net.minecraft.world.item.Tiers; import org.jetbrains.annotations.NotNull; import ru.bclib.items.BaseArmorItem; +import ru.bclib.items.ModelProviderItem; import ru.bclib.items.tool.BaseAxeItem; import ru.bclib.items.tool.BaseHoeItem; import ru.bclib.items.tool.BaseShovelItem; @@ -46,8 +47,8 @@ public class EndItems { // Materials // public final static Item ENDER_DUST = registerEndItem("ender_dust"); public final static Item ENDER_SHARD = registerEndItem("ender_shard"); - public final static Item AETERNIUM_INGOT = registerEndItem("aeternium_ingot"); - public final static Item AETERNIUM_FORGED_PLATE = registerEndItem("aeternium_forged_plate"); + public final static Item AETERNIUM_INGOT = registerEndItem("aeternium_ingot", new ModelProviderItem(makeEndItemSettings().fireResistant())); + public final static Item AETERNIUM_FORGED_PLATE = registerEndItem("aeternium_forged_plate", new ModelProviderItem(makeEndItemSettings().fireResistant())); public final static Item END_LILY_LEAF = registerEndItem("end_lily_leaf"); public final static Item END_LILY_LEAF_DRIED = registerEndItem("end_lily_leaf_dried"); public final static Item CRYSTAL_SHARDS = registerEndItem("crystal_shards"); @@ -112,13 +113,13 @@ public class EndItems { public static final TieredItem AETERNIUM_HAMMER = registerEndTool("aeternium_hammer", new EndHammerItem(EndToolMaterial.AETERNIUM, 6.0F, -3.0F, 0.3D, makeEndItemSettings().fireResistant())); // Toolparts // - public final static Item AETERNIUM_SHOVEL_HEAD = registerEndItem("aeternium_shovel_head"); - public final static Item AETERNIUM_PICKAXE_HEAD = registerEndItem("aeternium_pickaxe_head"); - public final static Item AETERNIUM_AXE_HEAD = registerEndItem("aeternium_axe_head"); - public final static Item AETERNIUM_HOE_HEAD = registerEndItem("aeternium_hoe_head"); - public final static Item AETERNIUM_HAMMER_HEAD = registerEndItem("aeternium_hammer_head"); - public final static Item AETERNIUM_SWORD_BLADE = registerEndItem("aeternium_sword_blade"); - public final static Item AETERNIUM_SWORD_HANDLE = registerEndItem("aeternium_sword_handle"); + public final static Item AETERNIUM_SHOVEL_HEAD = registerEndItem("aeternium_shovel_head", new ModelProviderItem(makeEndItemSettings().fireResistant())); + public final static Item AETERNIUM_PICKAXE_HEAD = registerEndItem("aeternium_pickaxe_head", new ModelProviderItem(makeEndItemSettings().fireResistant())); + public final static Item AETERNIUM_AXE_HEAD = registerEndItem("aeternium_axe_head", new ModelProviderItem(makeEndItemSettings().fireResistant())); + public final static Item AETERNIUM_HOE_HEAD = registerEndItem("aeternium_hoe_head", new ModelProviderItem(makeEndItemSettings().fireResistant())); + public final static Item AETERNIUM_HAMMER_HEAD = registerEndItem("aeternium_hammer_head", new ModelProviderItem(makeEndItemSettings().fireResistant())); + public final static Item AETERNIUM_SWORD_BLADE = registerEndItem("aeternium_sword_blade", new ModelProviderItem(makeEndItemSettings().fireResistant())); + public final static Item AETERNIUM_SWORD_HANDLE = registerEndItem("aeternium_sword_handle", new ModelProviderItem(makeEndItemSettings().fireResistant())); // ITEM_HAMMERS // public static final TieredItem IRON_HAMMER = registerEndTool("iron_hammer", new EndHammerItem(Tiers.IRON, 5.0F, -3.2F, 0.2D, makeEndItemSettings()));