diff --git a/src/main/java/dev/dubhe/anvilcraft/entity/CauldronOutletEntity.java b/src/main/java/dev/dubhe/anvilcraft/entity/CauldronOutletEntity.java index b6ff3bca9..676e7ae0c 100644 --- a/src/main/java/dev/dubhe/anvilcraft/entity/CauldronOutletEntity.java +++ b/src/main/java/dev/dubhe/anvilcraft/entity/CauldronOutletEntity.java @@ -244,6 +244,11 @@ public boolean isAttackable() { return false; } + @Override + public boolean fireImmune() { + return true; + } + @Override protected void defineSynchedData(SynchedEntityData.Builder builder) { builder.define(DATA_CAULDRON_POS, BlockPos.ZERO) diff --git a/src/main/java/dev/dubhe/anvilcraft/entity/MagnetizedNodeEntity.java b/src/main/java/dev/dubhe/anvilcraft/entity/MagnetizedNodeEntity.java index 909e304b9..c27dbda2a 100644 --- a/src/main/java/dev/dubhe/anvilcraft/entity/MagnetizedNodeEntity.java +++ b/src/main/java/dev/dubhe/anvilcraft/entity/MagnetizedNodeEntity.java @@ -83,6 +83,11 @@ public boolean isAttackable() { return false; } + @Override + public boolean fireImmune() { + return true; + } + @Override protected void defineSynchedData(SynchedEntityData.Builder builder) { builder.define(DATA_BLOCK_POS, BlockPos.ZERO).define(DATA_BLOCK_STATE, Blocks.AIR.defaultBlockState()); diff --git a/src/main/java/dev/dubhe/anvilcraft/init/block/ModBlocks.java b/src/main/java/dev/dubhe/anvilcraft/init/block/ModBlocks.java index 74afe6d94..9bcd7fcfb 100644 --- a/src/main/java/dev/dubhe/anvilcraft/init/block/ModBlocks.java +++ b/src/main/java/dev/dubhe/anvilcraft/init/block/ModBlocks.java @@ -3953,6 +3953,7 @@ public class ModBlocks { DangerUtil.genConfiguredModel("block/multiphase_matter_block").get() )) .item(MultiphaseMatterBlockItem::new) + .initialProperties(() -> new Item.Properties().fireResistant()) .tag(Tags.Items.STORAGE_BLOCKS, ModItemTags.STORAGE_BLOCKS_MULTIPHASE_MATTER) .build() .tag( diff --git a/src/main/java/dev/dubhe/anvilcraft/init/item/ModItems.java b/src/main/java/dev/dubhe/anvilcraft/init/item/ModItems.java index 50054f82d..1e61e3f6a 100644 --- a/src/main/java/dev/dubhe/anvilcraft/init/item/ModItems.java +++ b/src/main/java/dev/dubhe/anvilcraft/init/item/ModItems.java @@ -726,7 +726,8 @@ public class ModItems { ItemTags.MINING_ENCHANTABLE, ItemTags.FISHING_ENCHANTABLE, ItemTags.STRIDER_TEMPT_ITEMS - ).properties((properties) -> properties.durability(2031)).model(DataGenUtil::noExtraModelOrState).register(); + ).properties((properties) -> properties.durability(2031).fireResistant()) + .model(DataGenUtil::noExtraModelOrState).register(); public static final ItemEntry SPECTRAL_SLINGSHOT = REGISTRATE .item("spectral_slingshot", SpectralSlingshotItem::new) diff --git a/src/main/java/dev/dubhe/anvilcraft/integration/jei/category/TranscendiumRecipeCategory.java b/src/main/java/dev/dubhe/anvilcraft/integration/jei/category/TranscendiumRecipeCategory.java index 2805fa3b9..91b6ea0de 100644 --- a/src/main/java/dev/dubhe/anvilcraft/integration/jei/category/TranscendiumRecipeCategory.java +++ b/src/main/java/dev/dubhe/anvilcraft/integration/jei/category/TranscendiumRecipeCategory.java @@ -218,7 +218,6 @@ public static void registerRecipes(IRecipeRegistration registration) { } public static void registerRecipeCatalysts(IRecipeCatalystRegistration registration) { - registration.addRecipeCatalyst(ModBlocks.CURSED_GOLD_BLOCK.asStack(), AnvilCraftJeiPlugin.TRANSCENDIUM_RECIPE); registration.addRecipeCatalyst(new ItemStack(Items.ANVIL), AnvilCraftJeiPlugin.TRANSCENDIUM_RECIPE); registration.addRecipeCatalyst(new ItemStack(ModBlocks.ROYAL_ANVIL), AnvilCraftJeiPlugin.TRANSCENDIUM_RECIPE); registration.addRecipeCatalyst(new ItemStack(ModBlocks.EMBER_ANVIL), AnvilCraftJeiPlugin.TRANSCENDIUM_RECIPE); diff --git a/src/main/java/dev/dubhe/anvilcraft/item/EmberMetalResonatorItem.java b/src/main/java/dev/dubhe/anvilcraft/item/EmberMetalResonatorItem.java index 77216af17..2209c4bc5 100644 --- a/src/main/java/dev/dubhe/anvilcraft/item/EmberMetalResonatorItem.java +++ b/src/main/java/dev/dubhe/anvilcraft/item/EmberMetalResonatorItem.java @@ -7,7 +7,7 @@ public class EmberMetalResonatorItem extends ResonatorItem { public EmberMetalResonatorItem(Properties properties) { super( ModTiers.EMBER_METAL, - properties + properties.fireResistant() .attributes(ResonatorItem.createAttributes(ModTiers.EMBER_METAL, 10, -3f)) .component(ModComponents.FIRE_REFORGING, Unit.INSTANCE) ); diff --git a/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalAxeItem.java b/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalAxeItem.java index 54d287906..c3881965f 100644 --- a/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalAxeItem.java +++ b/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalAxeItem.java @@ -8,8 +8,7 @@ public class FrostMetalAxeItem extends AxeItem { public FrostMetalAxeItem(Properties properties) { super( ModTiers.FROST_METAL, - properties.fireResistant() - .attributes(AxeItem.createAttributes(ModTiers.FROST_METAL, 9, -3f)) + properties.attributes(AxeItem.createAttributes(ModTiers.FROST_METAL, 9, -3f)) .component(ModComponents.MERCILESS, Merciless.DEFAULT) ); } diff --git a/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalHoeItem.java b/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalHoeItem.java index 4aece1347..92d261cc2 100644 --- a/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalHoeItem.java +++ b/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalHoeItem.java @@ -8,8 +8,7 @@ public class FrostMetalHoeItem extends HoeItem { public FrostMetalHoeItem(Properties properties) { super( ModTiers.FROST_METAL, - properties.fireResistant() - .attributes(HoeItem.createAttributes(ModTiers.FROST_METAL, 1, 0)) + properties.attributes(HoeItem.createAttributes(ModTiers.FROST_METAL, 1, 0)) .component(ModComponents.MERCILESS, Merciless.DEFAULT) ); } diff --git a/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalPickaxeItem.java b/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalPickaxeItem.java index ced16af12..28d2f0213 100644 --- a/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalPickaxeItem.java +++ b/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalPickaxeItem.java @@ -8,8 +8,7 @@ public class FrostMetalPickaxeItem extends PickaxeItem { public FrostMetalPickaxeItem(Properties properties) { super( ModTiers.FROST_METAL, - properties.fireResistant() - .attributes(PickaxeItem.createAttributes(ModTiers.FROST_METAL, 4, -2.8f)) + properties.attributes(PickaxeItem.createAttributes(ModTiers.FROST_METAL, 4, -2.8f)) .component(ModComponents.MERCILESS, Merciless.DEFAULT) ); } diff --git a/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalShovelItem.java b/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalShovelItem.java index 1129bccab..fccbe2890 100644 --- a/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalShovelItem.java +++ b/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalShovelItem.java @@ -8,8 +8,7 @@ public class FrostMetalShovelItem extends ShovelItem { public FrostMetalShovelItem(Properties properties) { super( ModTiers.FROST_METAL, - properties.fireResistant() - .attributes(ShovelItem.createAttributes(ModTiers.FROST_METAL, 5, -3f)) + properties.attributes(ShovelItem.createAttributes(ModTiers.FROST_METAL, 5, -3f)) .component(ModComponents.MERCILESS, Merciless.DEFAULT) ); } diff --git a/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalSwordItem.java b/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalSwordItem.java index 36cd11037..cfe6c5901 100644 --- a/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalSwordItem.java +++ b/src/main/java/dev/dubhe/anvilcraft/item/FrostMetalSwordItem.java @@ -8,8 +8,7 @@ public class FrostMetalSwordItem extends SwordItem { public FrostMetalSwordItem(Properties properties) { super( ModTiers.FROST_METAL, - properties.fireResistant() - .attributes(SwordItem.createAttributes(ModTiers.FROST_METAL, 7, -2.4f)) + properties.attributes(SwordItem.createAttributes(ModTiers.FROST_METAL, 7, -2.4f)) .component(ModComponents.MERCILESS, Merciless.DEFAULT) ); } diff --git a/src/main/java/dev/dubhe/anvilcraft/item/ResonatorItem.java b/src/main/java/dev/dubhe/anvilcraft/item/ResonatorItem.java index ec32b8582..ad22538a1 100644 --- a/src/main/java/dev/dubhe/anvilcraft/item/ResonatorItem.java +++ b/src/main/java/dev/dubhe/anvilcraft/item/ResonatorItem.java @@ -70,9 +70,7 @@ public abstract class ResonatorItem extends TieredItem { public ResonatorItem(Tier tier, Properties properties) { super( tier, - properties - .component(DataComponents.TOOL, createToolProperties(tier)) - .fireResistant() + properties.component(DataComponents.TOOL, createToolProperties(tier)) ); } diff --git a/src/main/java/dev/dubhe/anvilcraft/item/TranscendenceResonatorItem.java b/src/main/java/dev/dubhe/anvilcraft/item/TranscendenceResonatorItem.java index a24e553ab..5aabe4a19 100644 --- a/src/main/java/dev/dubhe/anvilcraft/item/TranscendenceResonatorItem.java +++ b/src/main/java/dev/dubhe/anvilcraft/item/TranscendenceResonatorItem.java @@ -16,7 +16,7 @@ public class TranscendenceResonatorItem extends ResonatorItem { public TranscendenceResonatorItem(Properties properties) { super( ModTiers.TRANSCENDIUM, - properties + properties.fireResistant() .attributes(ResonatorItem.createAttributes(ModTiers.TRANSCENDIUM, 17, -3f)) .component(ModComponents.MULTIPHASE, new MultiphaseRef()) .component(DataComponents.ITEM_NAME, Multiphase.firstPhaseName(NAME))