MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Change] Removed FabricItem-/FabricBlockSettings dependency

Browse source
This commit is contained in:
Frank 2022-08-01 01:31:38 +02:00
parent e5407e7e46
commit 8ab30293bb
7 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/org/betterx/betterend/blocks/AeterniumAnvil.java
View file

@ -7,8 +7,7 @@ import org.betterx.betterend.registry.EndBlocks;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
public class AeterniumAnvil extends EndAnvilBlock { public class AeterniumAnvil extends EndAnvilBlock {
public AeterniumAnvil() { public AeterniumAnvil() {
@ -21,7 +20,7 @@ public class AeterniumAnvil extends EndAnvilBlock {
} }
@Override @Override
public BlockItem getCustomItem(ResourceLocation blockID, FabricItemSettings settings) { public BlockItem getCustomItem(ResourceLocation blockID, Item.Properties settings) {
return new BaseAnvilItem(this, settings.fireproof()); return new BaseAnvilItem(this, settings.fireResistant());
} }
} }

6
src/main/java/org/betterx/betterend/blocks/AeterniumBlock.java
View file

@ -5,11 +5,11 @@ import org.betterx.bclib.interfaces.CustomItemProvider;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor; 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; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
public class AeterniumBlock extends BaseBlock implements CustomItemProvider { public class AeterniumBlock extends BaseBlock implements CustomItemProvider {
@ -24,7 +24,7 @@ public class AeterniumBlock extends BaseBlock implements CustomItemProvider {
} }
@Override @Override
public BlockItem getCustomItem(ResourceLocation blockID, FabricItemSettings settings) { public BlockItem getCustomItem(ResourceLocation blockID, Item.Properties settings) {
return new BlockItem(this, settings.fireproof()); return new BlockItem(this, settings.fireResistant());
} }
} }

7
src/main/java/org/betterx/betterend/blocks/FlamaeaBlock.java
View file

@ -7,6 +7,7 @@ import org.betterx.betterend.blocks.basis.EndPlantBlock;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.PlaceOnWaterBlockItem; import net.minecraft.world.item.PlaceOnWaterBlockItem;
import net.minecraft.world.level.BlockGetter; 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.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.phys.shapes.VoxelShape;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import java.util.List; import java.util.List;
@ -56,7 +55,7 @@ public class FlamaeaBlock extends EndPlantBlock implements CustomItemProvider, A
} }
@Override @Override
public BlockItem getCustomItem(ResourceLocation resourceLocation, FabricItemSettings fabricItemSettings) { public BlockItem getCustomItem(ResourceLocation resourceLocation, Item.Properties itemSettings) {
return new PlaceOnWaterBlockItem(this, fabricItemSettings); return new PlaceOnWaterBlockItem(this, itemSettings);
} }
} }

4
src/main/java/org/betterx/betterend/item/ArmoredElytra.java
View file

@ -6,6 +6,7 @@ import org.betterx.betterend.interfaces.BetterEndElytra;
import org.betterx.betterend.interfaces.MultiModelItem; import org.betterx.betterend.interfaces.MultiModelItem;
import org.betterx.betterend.registry.EndItems; import org.betterx.betterend.registry.EndItems;
import net.minecraft.client.renderer.item.ItemProperties;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.ai.attributes.AttributeModifier; 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.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
public class ArmoredElytra extends BaseArmorItem implements MultiModelItem, BetterEndElytra { public class ArmoredElytra extends BaseArmorItem implements MultiModelItem, BetterEndElytra {
private final ResourceLocation wingTexture; private final ResourceLocation wingTexture;
@ -94,7 +94,7 @@ public class ArmoredElytra extends BaseArmorItem implements MultiModelItem, Bett
@Override @Override
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
public void registerModelPredicate() { public void registerModelPredicate() {
FabricModelPredicateProviderRegistry.register( ItemProperties.register(
this, this,
new ResourceLocation("broken"), new ResourceLocation("broken"),
(itemStack, clientLevel, livingEntity, id) -> ElytraItem.isFlyEnabled(itemStack) ? 0.0F : 1.0F (itemStack, clientLevel, livingEntity, id) -> ElytraItem.isFlyEnabled(itemStack) ? 0.0F : 1.0F

4
src/main/java/org/betterx/betterend/item/CrystaliteElytra.java
View file

@ -5,6 +5,7 @@ import org.betterx.betterend.interfaces.BetterEndElytra;
import org.betterx.betterend.interfaces.MultiModelItem; import org.betterx.betterend.interfaces.MultiModelItem;
import org.betterx.betterend.registry.EndItems; import org.betterx.betterend.registry.EndItems;
import net.minecraft.client.renderer.item.ItemProperties;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.ai.attributes.AttributeModifier; 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.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
public class CrystaliteElytra extends CrystaliteArmor implements MultiModelItem, BetterEndElytra { public class CrystaliteElytra extends CrystaliteArmor implements MultiModelItem, BetterEndElytra {
@ -78,7 +78,7 @@ public class CrystaliteElytra extends CrystaliteArmor implements MultiModelItem,
@Override @Override
public void registerModelPredicate() { public void registerModelPredicate() {
FabricModelPredicateProviderRegistry.register( ItemProperties.register(
this, this,
new ResourceLocation("broken"), new ResourceLocation("broken"),
(itemStack, clientLevel, livingEntity, i) -> ElytraItem.isFlyEnabled(itemStack) ? 0.0F : 1.0F (itemStack, clientLevel, livingEntity, i) -> ElytraItem.isFlyEnabled(itemStack) ? 0.0F : 1.0F

4
src/main/java/org/betterx/betterend/registry/EndBlocks.java
View file

@ -17,8 +17,6 @@ import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.level.material.MaterialColor;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import java.util.List; import java.util.List;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -653,7 +651,7 @@ public class EndBlocks {
return getBlockRegistry().registerBlockOnly(BetterEnd.makeID(name), block); return getBlockRegistry().registerBlockOnly(BetterEnd.makeID(name), block);
} }
public static FabricItemSettings makeBlockItemSettings() { public static Item.Properties makeBlockItemSettings() {
return getBlockRegistry().makeItemSettings(); return getBlockRegistry().makeItemSettings();
} }

4
src/main/java/org/betterx/betterend/registry/EndItems.java
View file

@ -30,8 +30,6 @@ import net.minecraft.world.item.Items;
import net.minecraft.world.item.TieredItem; import net.minecraft.world.item.TieredItem;
import net.minecraft.world.item.Tiers; import net.minecraft.world.item.Tiers;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import java.util.List; import java.util.List;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -342,7 +340,7 @@ public class EndItems {
return getItemRegistry().registerDrink(BetterEnd.makeID(name), hunger, saturation); return getItemRegistry().registerDrink(BetterEnd.makeID(name), hunger, saturation);
} }
public static FabricItemSettings makeEndItemSettings() { public static Item.Properties makeEndItemSettings() {
return getItemRegistry().makeItemSettings(); return getItemRegistry().makeItemSettings();
} }