From 8ab30293bbff1f5eac3f268d5a269865c17f2aca Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 1 Aug 2022 01:31:38 +0200 Subject: [PATCH] [Change] Removed FabricItem-/FabricBlockSettings dependency --- .../java/org/betterx/betterend/blocks/AeterniumAnvil.java | 7 +++---- .../java/org/betterx/betterend/blocks/AeterniumBlock.java | 6 +++--- .../java/org/betterx/betterend/blocks/FlamaeaBlock.java | 7 +++---- .../java/org/betterx/betterend/item/ArmoredElytra.java | 4 ++-- .../java/org/betterx/betterend/item/CrystaliteElytra.java | 4 ++-- .../java/org/betterx/betterend/registry/EndBlocks.java | 4 +--- src/main/java/org/betterx/betterend/registry/EndItems.java | 4 +--- 7 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/betterx/betterend/blocks/AeterniumAnvil.java b/src/main/java/org/betterx/betterend/blocks/AeterniumAnvil.java index a4b8118a..a72e800c 100644 --- a/src/main/java/org/betterx/betterend/blocks/AeterniumAnvil.java +++ b/src/main/java/org/betterx/betterend/blocks/AeterniumAnvil.java @@ -7,8 +7,7 @@ import org.betterx.betterend.registry.EndBlocks; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.BlockItem; - -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.world.item.Item; public class AeterniumAnvil extends EndAnvilBlock { public AeterniumAnvil() { @@ -21,7 +20,7 @@ public class AeterniumAnvil extends EndAnvilBlock { } @Override - public BlockItem getCustomItem(ResourceLocation blockID, FabricItemSettings settings) { - return new BaseAnvilItem(this, settings.fireproof()); + public BlockItem getCustomItem(ResourceLocation blockID, Item.Properties settings) { + return new BaseAnvilItem(this, settings.fireResistant()); } } diff --git a/src/main/java/org/betterx/betterend/blocks/AeterniumBlock.java b/src/main/java/org/betterx/betterend/blocks/AeterniumBlock.java index 78332bbb..265e1ced 100644 --- a/src/main/java/org/betterx/betterend/blocks/AeterniumBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/AeterniumBlock.java @@ -5,11 +5,11 @@ import org.betterx.bclib.interfaces.CustomItemProvider; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; public class AeterniumBlock extends BaseBlock implements CustomItemProvider { @@ -24,7 +24,7 @@ public class AeterniumBlock extends BaseBlock implements CustomItemProvider { } @Override - public BlockItem getCustomItem(ResourceLocation blockID, FabricItemSettings settings) { - return new BlockItem(this, settings.fireproof()); + public BlockItem getCustomItem(ResourceLocation blockID, Item.Properties settings) { + return new BlockItem(this, settings.fireResistant()); } } diff --git a/src/main/java/org/betterx/betterend/blocks/FlamaeaBlock.java b/src/main/java/org/betterx/betterend/blocks/FlamaeaBlock.java index 922b5eb0..761a49ae 100644 --- a/src/main/java/org/betterx/betterend/blocks/FlamaeaBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/FlamaeaBlock.java @@ -7,6 +7,7 @@ import org.betterx.betterend.blocks.basis.EndPlantBlock; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.PlaceOnWaterBlockItem; import net.minecraft.world.level.BlockGetter; @@ -19,8 +20,6 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; - import com.google.common.collect.Lists; import java.util.List; @@ -56,7 +55,7 @@ public class FlamaeaBlock extends EndPlantBlock implements CustomItemProvider, A } @Override - public BlockItem getCustomItem(ResourceLocation resourceLocation, FabricItemSettings fabricItemSettings) { - return new PlaceOnWaterBlockItem(this, fabricItemSettings); + public BlockItem getCustomItem(ResourceLocation resourceLocation, Item.Properties itemSettings) { + return new PlaceOnWaterBlockItem(this, itemSettings); } } diff --git a/src/main/java/org/betterx/betterend/item/ArmoredElytra.java b/src/main/java/org/betterx/betterend/item/ArmoredElytra.java index ca942491..cf917ae7 100644 --- a/src/main/java/org/betterx/betterend/item/ArmoredElytra.java +++ b/src/main/java/org/betterx/betterend/item/ArmoredElytra.java @@ -6,6 +6,7 @@ import org.betterx.betterend.interfaces.BetterEndElytra; import org.betterx.betterend.interfaces.MultiModelItem; import org.betterx.betterend.registry.EndItems; +import net.minecraft.client.renderer.item.ItemProperties; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.ai.attributes.AttributeModifier; @@ -14,7 +15,6 @@ import net.minecraft.world.item.*; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry; public class ArmoredElytra extends BaseArmorItem implements MultiModelItem, BetterEndElytra { private final ResourceLocation wingTexture; @@ -94,7 +94,7 @@ public class ArmoredElytra extends BaseArmorItem implements MultiModelItem, Bett @Override @Environment(EnvType.CLIENT) public void registerModelPredicate() { - FabricModelPredicateProviderRegistry.register( + ItemProperties.register( this, new ResourceLocation("broken"), (itemStack, clientLevel, livingEntity, id) -> ElytraItem.isFlyEnabled(itemStack) ? 0.0F : 1.0F diff --git a/src/main/java/org/betterx/betterend/item/CrystaliteElytra.java b/src/main/java/org/betterx/betterend/item/CrystaliteElytra.java index f16063bf..7cecbaa0 100644 --- a/src/main/java/org/betterx/betterend/item/CrystaliteElytra.java +++ b/src/main/java/org/betterx/betterend/item/CrystaliteElytra.java @@ -5,6 +5,7 @@ import org.betterx.betterend.interfaces.BetterEndElytra; import org.betterx.betterend.interfaces.MultiModelItem; import org.betterx.betterend.registry.EndItems; +import net.minecraft.client.renderer.item.ItemProperties; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.ai.attributes.AttributeModifier; @@ -15,7 +16,6 @@ import net.minecraft.world.item.Rarity; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry; public class CrystaliteElytra extends CrystaliteArmor implements MultiModelItem, BetterEndElytra { @@ -78,7 +78,7 @@ public class CrystaliteElytra extends CrystaliteArmor implements MultiModelItem, @Override public void registerModelPredicate() { - FabricModelPredicateProviderRegistry.register( + ItemProperties.register( this, new ResourceLocation("broken"), (itemStack, clientLevel, livingEntity, i) -> ElytraItem.isFlyEnabled(itemStack) ? 0.0F : 1.0F diff --git a/src/main/java/org/betterx/betterend/registry/EndBlocks.java b/src/main/java/org/betterx/betterend/registry/EndBlocks.java index 023572de..46387888 100644 --- a/src/main/java/org/betterx/betterend/registry/EndBlocks.java +++ b/src/main/java/org/betterx/betterend/registry/EndBlocks.java @@ -17,8 +17,6 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.material.MaterialColor; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; - import java.util.List; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -653,7 +651,7 @@ public class EndBlocks { return getBlockRegistry().registerBlockOnly(BetterEnd.makeID(name), block); } - public static FabricItemSettings makeBlockItemSettings() { + public static Item.Properties makeBlockItemSettings() { return getBlockRegistry().makeItemSettings(); } diff --git a/src/main/java/org/betterx/betterend/registry/EndItems.java b/src/main/java/org/betterx/betterend/registry/EndItems.java index 0a4def72..3104d525 100644 --- a/src/main/java/org/betterx/betterend/registry/EndItems.java +++ b/src/main/java/org/betterx/betterend/registry/EndItems.java @@ -30,8 +30,6 @@ import net.minecraft.world.item.Items; import net.minecraft.world.item.TieredItem; import net.minecraft.world.item.Tiers; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; - import java.util.List; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -342,7 +340,7 @@ public class EndItems { return getItemRegistry().registerDrink(BetterEnd.makeID(name), hunger, saturation); } - public static FabricItemSettings makeEndItemSettings() { + public static Item.Properties makeEndItemSettings() { return getItemRegistry().makeItemSettings(); }