From 9e3ba00db83c83af6a5be12b7d8f01771f17ddb0 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 13 Jul 2022 00:12:16 +0200 Subject: [PATCH] Removed Property Dependencies --- .../betterx/bclib/blocks/BaseAnvilBlock.java | 7 +++--- .../betterx/bclib/blocks/BaseBarrelBlock.java | 3 +-- .../bclib/blocks/BaseBookshelfBlock.java | 3 +-- .../betterx/bclib/blocks/BaseChainBlock.java | 3 +-- .../betterx/bclib/blocks/BaseChestBlock.java | 3 +-- .../bclib/blocks/BaseComposterBlock.java | 2 +- .../bclib/blocks/BaseCraftingTableBlock.java | 3 +-- .../betterx/bclib/blocks/BaseDoorBlock.java | 3 +-- .../betterx/bclib/blocks/BaseFenceBlock.java | 3 +-- .../bclib/blocks/BaseFurnaceBlock.java | 3 +-- .../betterx/bclib/blocks/BaseGateBlock.java | 3 +-- .../betterx/bclib/blocks/BaseGlassBlock.java | 7 +++--- .../betterx/bclib/blocks/BaseLadderBlock.java | 3 +-- .../bclib/blocks/BaseMetalBarsBlock.java | 3 +-- .../betterx/bclib/blocks/BaseOreBlock.java | 6 ++--- .../betterx/bclib/blocks/BasePathBlock.java | 3 +-- .../bclib/blocks/BasePressurePlateBlock.java | 3 +-- .../bclib/blocks/BaseRotatedPillarBlock.java | 3 +-- .../betterx/bclib/blocks/BaseSignBlock.java | 7 +++--- .../betterx/bclib/blocks/BaseSlabBlock.java | 9 ++++--- .../betterx/bclib/blocks/BaseStairsBlock.java | 9 ++++--- .../bclib/blocks/BaseStoneButtonBlock.java | 3 +-- .../bclib/blocks/BaseStripableLogBlock.java | 3 +-- .../bclib/blocks/BaseTerrainBlock.java | 7 +++--- .../bclib/blocks/BaseTrapdoorBlock.java | 3 +-- .../betterx/bclib/blocks/BaseVineBlock.java | 4 +--- .../betterx/bclib/blocks/BaseWallBlock.java | 3 +-- .../bclib/blocks/BaseWeightedPlateBlock.java | 3 +-- .../bclib/blocks/BaseWoodenButtonBlock.java | 3 +-- .../bclib/blocks/SimpleLeavesBlock.java | 8 +++---- .../betterx/bclib/blocks/StalactiteBlock.java | 3 +-- .../bclib/blocks/StripableBarkBlock.java | 3 +-- .../bclib/blocks/UpDownPlantBlock.java | 3 +-- .../complexmaterials/ComplexMaterial.java | 24 +++++++++---------- .../complexmaterials/entry/BlockEntry.java | 11 ++++----- .../complexmaterials/entry/ItemEntry.java | 8 +++---- .../bclib/interfaces/CustomItemProvider.java | 5 ++-- .../betterx/bclib/items/BaseBucketItem.java | 5 ++-- .../betterx/bclib/registry/BaseRegistry.java | 8 +++---- src/main/java/org/betterx/ui/ColorUtil.java | 18 ++++++++++++-- 40 files changed, 93 insertions(+), 121 deletions(-) diff --git a/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java index c2acdd63..442293bb 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java @@ -12,6 +12,7 @@ import net.minecraft.client.resources.model.UnbakedModel; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.RandomSource; import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.PickaxeItem; import net.minecraft.world.level.block.AnvilBlock; @@ -27,8 +28,6 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; 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 com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -44,7 +43,7 @@ public abstract class BaseAnvilBlock extends AnvilBlock implements BlockModelPro public IntegerProperty durability; public BaseAnvilBlock(MaterialColor color) { - this(FabricBlockSettings.copyOf(Blocks.ANVIL).color(color)); + this(Properties.copy(Blocks.ANVIL).color(color)); } public BaseAnvilBlock(BlockBehaviour.Properties properties) { @@ -97,7 +96,7 @@ public abstract class BaseAnvilBlock extends AnvilBlock implements BlockModelPro } @Override - public BlockItem getCustomItem(ResourceLocation blockID, FabricItemSettings settings) { + public BlockItem getCustomItem(ResourceLocation blockID, Item.Properties settings) { return new BaseAnvilItem(this, settings); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java index 58c0e23b..5da62bd3 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java @@ -34,7 +34,6 @@ import net.minecraft.world.phys.BlockHitResult; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.List; import java.util.Map; @@ -43,7 +42,7 @@ import org.jetbrains.annotations.Nullable; public class BaseBarrelBlock extends BarrelBlock implements BlockModelProvider { public BaseBarrelBlock(Block source) { - this(FabricBlockSettings.copyOf(source).noOcclusion()); + this(Properties.copy(source).noOcclusion()); } public BaseBarrelBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java index 6288e387..32067e76 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java @@ -18,7 +18,6 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; @@ -43,7 +42,7 @@ public class BaseBookshelfBlock extends BaseBlock { } public BaseBookshelfBlock(Block source) { - this(FabricBlockSettings.copyOf(source)); + this(Properties.copy(source)); } public BaseBookshelfBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java index 5f644679..89ea9d46 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java @@ -21,7 +21,6 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; @@ -31,7 +30,7 @@ import org.jetbrains.annotations.Nullable; public class BaseChainBlock extends ChainBlock implements BlockModelProvider, RenderLayerProvider { public BaseChainBlock(MaterialColor color) { - this(FabricBlockSettings.copyOf(Blocks.CHAIN).color(color)); + this(Properties.copy(Blocks.CHAIN).color(color)); } public BaseChainBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java index 63d3901d..577bcad9 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java @@ -19,7 +19,6 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.List; import java.util.Optional; @@ -29,7 +28,7 @@ public class BaseChestBlock extends ChestBlock implements BlockModelProvider { private final Block parent; public BaseChestBlock(Block source) { - super(FabricBlockSettings.copyOf(source).noOcclusion(), () -> BaseBlockEntities.CHEST); + super(Properties.copy(source).noOcclusion(), () -> BaseBlockEntities.CHEST); this.parent = source; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java index 07143bb1..6072e984 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable; public class BaseComposterBlock extends ComposterBlock implements BlockModelProvider { public BaseComposterBlock(Block source) { - super(Properties.of(source.defaultBlockState().getMaterial())); + super(Properties.copy(source)); } @Override diff --git a/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java index 6335bd87..c5ca01ab 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java @@ -16,7 +16,6 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.HashMap; @@ -26,7 +25,7 @@ import org.jetbrains.annotations.Nullable; public class BaseCraftingTableBlock extends CraftingTableBlock implements BlockModelProvider { public BaseCraftingTableBlock(Block source) { - this(FabricBlockSettings.copyOf(source)); + this(Properties.copy(source)); } public BaseCraftingTableBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java index c0b0b036..ce346b18 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java @@ -29,7 +29,6 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; @@ -39,7 +38,7 @@ import org.jetbrains.annotations.Nullable; public class BaseDoorBlock extends DoorBlock implements RenderLayerProvider, BlockModelProvider, TagProvider { public BaseDoorBlock(Block source) { - this(FabricBlockSettings.copyOf(source).strength(3F, 3F).noOcclusion()); + this(Properties.copy(source).strength(3F, 3F).noOcclusion()); } public BaseDoorBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java index 548a4ed5..7b987c17 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java @@ -18,7 +18,6 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; @@ -30,7 +29,7 @@ public class BaseFenceBlock extends FenceBlock implements BlockModelProvider { private final Block parent; public BaseFenceBlock(Block source) { - super(FabricBlockSettings.copyOf(source).noOcclusion()); + super(Properties.copy(source).noOcclusion()); this.parent = source; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java index 9922bf67..ba784476 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java @@ -31,7 +31,6 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -43,7 +42,7 @@ import org.jetbrains.annotations.Nullable; public class BaseFurnaceBlock extends FurnaceBlock implements BlockModelProvider, RenderLayerProvider { public BaseFurnaceBlock(Block source) { - this(FabricBlockSettings.copyOf(source).luminance(state -> state.getValue(LIT) ? 13 : 0)); + this(Properties.copy(source).lightLevel(state -> state.getValue(LIT) ? 13 : 0)); } public BaseFurnaceBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java index fd6b62d2..2ad552c0 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java @@ -17,7 +17,6 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; @@ -29,7 +28,7 @@ public class BaseGateBlock extends FenceGateBlock implements BlockModelProvider private final Block parent; public BaseGateBlock(Block source) { - super(FabricBlockSettings.copyOf(source).noOcclusion()); + super(Properties.copy(source).noOcclusion()); this.parent = source; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java index 4a22d0f4..751e9684 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java @@ -17,7 +17,6 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; @@ -28,9 +27,9 @@ public class BaseGlassBlock extends BaseBlockNotFull implements AddMineablePicka } public BaseGlassBlock(Block block, float resistance) { - super(FabricBlockSettings.copyOf(block) - .resistance(resistance) - .nonOpaque() + super(Properties.copy(block) + .explosionResistance(resistance) + .noOcclusion() .isSuffocating((arg1, arg2, arg3) -> false) .isViewBlocking((arg1, arg2, arg3) -> false)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java index 0aebadb7..6db903be 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java @@ -19,7 +19,6 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; @@ -29,7 +28,7 @@ import org.jetbrains.annotations.Nullable; public class BaseLadderBlock extends LadderBlock implements RenderLayerProvider, BlockModelProvider { public BaseLadderBlock(Block block) { - this(FabricBlockSettings.copyOf(block).noOcclusion()); + this(Properties.copy(block).noOcclusion()); } public BaseLadderBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java index 1405a7da..fd201df5 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java @@ -22,7 +22,6 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; @@ -32,7 +31,7 @@ import org.jetbrains.annotations.Nullable; public class BaseMetalBarsBlock extends IronBarsBlock implements BlockModelProvider, RenderLayerProvider { public BaseMetalBarsBlock(Block source) { - this(FabricBlockSettings.copyOf(source).strength(5.0F, 6.0F).noOcclusion()); + this(Properties.copy(source).strength(5.0F, 6.0F).noOcclusion()); } public BaseMetalBarsBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java index ea2c0506..57cd86ee 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java @@ -28,8 +28,6 @@ import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; - import java.util.Collections; import java.util.List; import java.util.function.Supplier; @@ -46,9 +44,9 @@ public class BaseOreBlock extends DropExperienceBlock implements BlockModelProvi public BaseOreBlock(Supplier drop, int minCount, int maxCount, int experience, int miningLevel) { this( - FabricBlockSettings + Properties .of(Material.STONE, MaterialColor.SAND) - .requiresTool() + .requiresCorrectToolForDrops() .destroyTime(3F) .explosionResistance(9F) .sound(SoundType.STONE), diff --git a/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java b/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java index 5bc1940b..409b78ea 100644 --- a/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java @@ -23,7 +23,6 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import com.google.common.collect.Maps; @@ -39,7 +38,7 @@ public class BasePathBlock extends BaseBlockNotFull { private Block baseBlock; public BasePathBlock(Block source) { - super(FabricBlockSettings.copyOf(source).isValidSpawn((state, world, pos, type) -> false)); + super(Properties.copy(source).isValidSpawn((state, world, pos, type) -> false)); this.baseBlock = Blocks.DIRT; if (source instanceof BaseTerrainBlock) { BaseTerrainBlock terrain = (BaseTerrainBlock) source; diff --git a/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java b/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java index c45f58e5..8f851e52 100644 --- a/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java @@ -17,7 +17,6 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; @@ -29,7 +28,7 @@ public class BasePressurePlateBlock extends PressurePlateBlock implements BlockM private final Block parent; public BasePressurePlateBlock(Sensitivity rule, Block source) { - super(rule, FabricBlockSettings.copyOf(source).noCollission().noOcclusion().strength(0.5F)); + super(rule, Properties.copy(source).noCollission().noOcclusion().strength(0.5F)); this.parent = source; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java index 08e673d8..7731088d 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java @@ -15,7 +15,6 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; @@ -29,7 +28,7 @@ public class BaseRotatedPillarBlock extends RotatedPillarBlock implements BlockM } public BaseRotatedPillarBlock(Block block) { - this(FabricBlockSettings.copyOf(block)); + this(Properties.copy(block)); } @Override diff --git a/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java index 086223ac..57a3a1bd 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java @@ -17,6 +17,7 @@ import net.minecraft.util.Mth; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; @@ -40,8 +41,6 @@ import net.minecraft.world.phys.shapes.VoxelShape; 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 java.util.Collections; import java.util.List; @@ -61,7 +60,7 @@ public class BaseSignBlock extends SignBlock implements BlockModelProvider, Cust private final Block parent; public BaseSignBlock(Block source) { - super(FabricBlockSettings.copyOf(source).strength(1.0F, 1.0F).noCollission().noOcclusion(), WoodType.OAK); + super(Properties.copy(source).strength(1.0F, 1.0F).noCollission().noOcclusion(), WoodType.OAK); this.registerDefaultState(this.stateDefinition.any() .setValue(ROTATION, 0) .setValue(FLOOR, false) @@ -194,7 +193,7 @@ public class BaseSignBlock extends SignBlock implements BlockModelProvider, Cust } @Override - public BlockItem getCustomItem(ResourceLocation blockID, FabricItemSettings settings) { + public BlockItem getCustomItem(ResourceLocation blockID, Item.Properties settings) { return new BlockItem(this, settings.stacksTo(16)); } } \ No newline at end of file diff --git a/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java index 21dae2a7..96631d99 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java @@ -12,6 +12,7 @@ import net.minecraft.client.resources.model.UnbakedModel; import net.minecraft.core.Registry; 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.level.block.Block; import net.minecraft.world.level.block.SlabBlock; @@ -21,8 +22,6 @@ import net.minecraft.world.level.storage.loot.LootContext; 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 java.util.Collections; import java.util.List; @@ -39,7 +38,7 @@ public class BaseSlabBlock extends SlabBlock implements BlockModelProvider, Cust } public BaseSlabBlock(Block source, boolean fireproof) { - super(FabricBlockSettings.copyOf(source)); + super(Properties.copy(source)); this.parent = source; this.fireproof = fireproof; } @@ -90,8 +89,8 @@ public class BaseSlabBlock extends SlabBlock implements BlockModelProvider, Cust } @Override - public BlockItem getCustomItem(ResourceLocation blockID, FabricItemSettings settings) { - if (fireproof) settings = settings.fireproof(); + public BlockItem getCustomItem(ResourceLocation blockID, Item.Properties settings) { + if (fireproof) settings = settings.fireResistant(); return new BlockItem(this, settings); } } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java index 8fa521d3..06342f76 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java @@ -12,6 +12,7 @@ import net.minecraft.client.resources.model.UnbakedModel; import net.minecraft.core.Registry; 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.level.block.Block; import net.minecraft.world.level.block.StairBlock; @@ -22,8 +23,6 @@ import net.minecraft.world.level.storage.loot.LootContext; 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 java.util.Collections; import java.util.List; @@ -40,7 +39,7 @@ public class BaseStairsBlock extends StairBlock implements BlockModelProvider, C } public BaseStairsBlock(Block source, boolean fireproof) { - super(source.defaultBlockState(), FabricBlockSettings.copyOf(source)); + super(source.defaultBlockState(), Properties.copy(source)); this.parent = source; this.fireproof = fireproof; } @@ -114,8 +113,8 @@ public class BaseStairsBlock extends StairBlock implements BlockModelProvider, C } @Override - public BlockItem getCustomItem(ResourceLocation blockID, FabricItemSettings settings) { - if (fireproof) settings = settings.fireproof(); + public BlockItem getCustomItem(ResourceLocation blockID, Item.Properties settings) { + if (fireproof) settings = settings.fireResistant(); return new BlockItem(this, settings); } } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseStoneButtonBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseStoneButtonBlock.java index c1ffc89e..901f4469 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseStoneButtonBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseStoneButtonBlock.java @@ -4,11 +4,10 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.level.block.Block; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; public class BaseStoneButtonBlock extends BaseButtonBlock { public BaseStoneButtonBlock(Block source) { - super(source, FabricBlockSettings.copyOf(source).noOcclusion(), false); + super(source, Properties.copy(source).noOcclusion(), false); } @Override diff --git a/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java index 4e5c2719..46863349 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java @@ -17,13 +17,12 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.phys.BlockHitResult; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; public class BaseStripableLogBlock extends BaseRotatedPillarBlock { private final Block striped; public BaseStripableLogBlock(MaterialColor color, Block striped) { - super(FabricBlockSettings.copyOf(striped).color(color)); + super(Properties.copy(striped).color(color)); this.striped = striped; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java index e085b85c..912fd404 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java @@ -38,7 +38,6 @@ import net.minecraft.world.phys.BlockHitResult; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import com.google.common.collect.Maps; @@ -54,9 +53,9 @@ public class BaseTerrainBlock extends BaseBlock { private Block pathBlock; public BaseTerrainBlock(Block baseBlock, MaterialColor color) { - super(FabricBlockSettings - .copyOf(baseBlock) - .materialColor(color) + super(Properties + .copy(baseBlock) + .color(color) .sound(BlockSounds.TERRAIN_SOUND) .randomTicks() ); diff --git a/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java index b7b7c486..a105cc81 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java @@ -21,14 +21,13 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.*; import org.jetbrains.annotations.Nullable; public class BaseTrapdoorBlock extends TrapDoorBlock implements RenderLayerProvider, BlockModelProvider { public BaseTrapdoorBlock(Block source) { - this(FabricBlockSettings.copyOf(source).strength(3.0F, 3.0F).noOcclusion()); + this(Properties.copy(source).strength(3.0F, 3.0F).noOcclusion()); } public BaseTrapdoorBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java index fc335b22..88755554 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java @@ -33,8 +33,6 @@ import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; - import com.google.common.collect.Lists; import java.util.List; @@ -59,7 +57,7 @@ public class BaseVineBlock extends BaseBlockNotFull implements RenderLayerProvid public BaseVineBlock(int light, boolean bottomOnly, Function propMod) { this( - propMod.apply(FabricBlockSettings + propMod.apply(Properties .of(Material.PLANT) .sound(SoundType.GRASS) .lightLevel((state) -> bottomOnly ? state.getValue(SHAPE) == TripleShape.BOTTOM diff --git a/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java index 675502c9..f3d25754 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java @@ -19,7 +19,6 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; @@ -31,7 +30,7 @@ public class BaseWallBlock extends WallBlock implements BlockModelProvider { private final Block parent; public BaseWallBlock(Block source) { - super(FabricBlockSettings.copyOf(source).noOcclusion()); + super(Properties.copy(source).noOcclusion()); this.parent = source; } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java index 367ef3e0..3bc48542 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java @@ -17,7 +17,6 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; @@ -31,7 +30,7 @@ public class BaseWeightedPlateBlock extends WeightedPressurePlateBlock implement public BaseWeightedPlateBlock(Block source) { super( 15, - FabricBlockSettings.copyOf(source) + Properties.copy(source) .noCollission() .noOcclusion() .requiresCorrectToolForDrops() diff --git a/src/main/java/org/betterx/bclib/blocks/BaseWoodenButtonBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseWoodenButtonBlock.java index 96ef1246..73569534 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseWoodenButtonBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseWoodenButtonBlock.java @@ -4,11 +4,10 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.level.block.Block; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; public class BaseWoodenButtonBlock extends BaseButtonBlock { public BaseWoodenButtonBlock(Block source) { - super(source, FabricBlockSettings.copyOf(source).strength(0.5F, 0.5F).noOcclusion(), true); + super(source, Properties.copy(source).strength(0.5F, 0.5F).noOcclusion(), true); } @Override diff --git a/src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java b/src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java index 4c5bf41a..81441e7e 100644 --- a/src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java @@ -16,14 +16,12 @@ import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; - import java.util.List; public class SimpleLeavesBlock extends BaseBlockNotFull implements RenderLayerProvider, TagProvider, AddMineableShears, AddMineableHoe { public SimpleLeavesBlock(MaterialColor color) { this( - FabricBlockSettings + Properties .of(Material.LEAVES) .strength(0.2F) .color(color) @@ -37,9 +35,9 @@ public class SimpleLeavesBlock extends BaseBlockNotFull implements RenderLayerPr public SimpleLeavesBlock(MaterialColor color, int light) { this( - FabricBlockSettings + Properties .of(Material.LEAVES) - .luminance(light) + .lightLevel(ignored->light) .color(color) .strength(0.2F) .sound(SoundType.GRASS) diff --git a/src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java b/src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java index 18d793e3..9e524f52 100644 --- a/src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java @@ -39,7 +39,6 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Map; import java.util.Optional; @@ -53,7 +52,7 @@ public class StalactiteBlock extends BaseBlockNotFull implements SimpleWaterlogg private static final VoxelShape[] SHAPES; public StalactiteBlock(Block source) { - this(FabricBlockSettings.copy(source).noOcclusion()); + this(Properties.copy(source).noOcclusion()); } public StalactiteBlock(BlockBehaviour.Properties properties) { diff --git a/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java b/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java index 52b37775..2b0f8b84 100644 --- a/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java @@ -16,13 +16,12 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.phys.BlockHitResult; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; public class StripableBarkBlock extends BaseBarkBlock { private final Block striped; public StripableBarkBlock(MaterialColor color, Block striped) { - super(FabricBlockSettings.copyOf(striped).color(color)); + super(Properties.copy(striped).color(color)); this.striped = striped; } diff --git a/src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java b/src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java index e7529873..67f759ca 100644 --- a/src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java @@ -27,7 +27,6 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import com.google.common.collect.Lists; @@ -37,7 +36,7 @@ public abstract class UpDownPlantBlock extends BaseBlockNotFull implements Rende private static final VoxelShape SHAPE = box(4, 0, 4, 12, 16, 12); public UpDownPlantBlock() { - this(FabricBlockSettings + this(Properties .of(Material.PLANT) .sound(SoundType.GRASS) .noCollission() diff --git a/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java b/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java index 88b05575..f622f428 100644 --- a/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java +++ b/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java @@ -12,9 +12,9 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; + -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import com.google.common.collect.Lists; @@ -62,8 +62,8 @@ public abstract class ComplexMaterial { public ComplexMaterial init(BlockRegistry blocksRegistry, ItemRegistry itemsRegistry, PathConfig recipeConfig) { initTags(); - final FabricBlockSettings blockSettings = getBlockSettings(); - final FabricItemSettings itemSettings = getItemSettings(itemsRegistry); + final BlockBehaviour.Properties blockSettings = getBlockSettings(); + final Item.Properties itemSettings = getItemSettings(itemsRegistry); initDefault(blockSettings, itemSettings); getBlockEntries().forEach(entry -> { @@ -88,10 +88,11 @@ public abstract class ComplexMaterial { /** * Init default content for {@link ComplexMaterial} - blocks and items. * - * @param blockSettings {@link FabricBlockSettings} default block settings for this material; - * @param itemSettings {@link FabricItemSettings} default item settings for this material. + * @param blockSettings {@link BlockBehaviour.Properties} default block settings for this material; + * @param itemSettings {@link Item.Properties} default item settings for this material. */ - protected abstract void initDefault(FabricBlockSettings blockSettings, FabricItemSettings itemSettings); + + protected abstract void initDefault(BlockBehaviour.Properties blockSettings, Item.Properties itemSettings); /** * Init custom tags for this {@link ComplexMaterial}, not required. @@ -178,16 +179,15 @@ public abstract class ComplexMaterial { /** * Get default block settings for this material. * - * @return {@link FabricBlockSettings} + * @return {@link BlockBehaviour.Properties} */ - protected abstract FabricBlockSettings getBlockSettings(); - + protected abstract BlockBehaviour.Properties getBlockSettings(); /** * Get default item settings for this material. * - * @return {@link FabricItemSettings} + * @return {@link Item.Properties} */ - protected FabricItemSettings getItemSettings(ItemRegistry registry) { + protected Item.Properties getItemSettings(ItemRegistry registry) { return registry.makeItemSettings(); } diff --git a/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java b/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java index 043143a6..bf5ccb41 100644 --- a/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java +++ b/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java @@ -8,26 +8,25 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; - -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.world.level.block.state.BlockBehaviour; import java.util.function.BiFunction; public class BlockEntry extends ComplexMaterialEntry { - final BiFunction initFunction; + final BiFunction initFunction; final boolean hasItem; TagKey[] blockTags; TagKey[] itemTags; - public BlockEntry(String suffix, BiFunction initFunction) { + public BlockEntry(String suffix, BiFunction initFunction) { this(suffix, true, initFunction); } public BlockEntry( String suffix, boolean hasItem, - BiFunction initFunction + BiFunction initFunction ) { super(suffix); this.initFunction = initFunction; @@ -46,7 +45,7 @@ public class BlockEntry extends ComplexMaterialEntry { return this; } - public Block init(ComplexMaterial material, FabricBlockSettings blockSettings, BlockRegistry registry) { + public Block init(ComplexMaterial material, BlockBehaviour.Properties blockSettings, BlockRegistry registry) { ResourceLocation location = getLocation(material.getModID(), material.getBaseName()); Block block = initFunction.apply(material, blockSettings); if (hasItem) { diff --git a/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java b/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java index 433e56bf..37d91f27 100644 --- a/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java +++ b/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java @@ -8,16 +8,14 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; - import java.util.function.BiFunction; public class ItemEntry extends ComplexMaterialEntry { - final BiFunction initFunction; + final BiFunction initFunction; TagKey[] itemTags; - public ItemEntry(String suffix, BiFunction initFunction) { + public ItemEntry(String suffix, BiFunction initFunction) { super(suffix); this.initFunction = initFunction; } @@ -27,7 +25,7 @@ public class ItemEntry extends ComplexMaterialEntry { return this; } - public Item init(ComplexMaterial material, FabricItemSettings itemSettings, ItemRegistry registry) { + public Item init(ComplexMaterial material, Item.Properties itemSettings, ItemRegistry registry) { ResourceLocation location = getLocation(material.getModID(), material.getBaseName()); Item item = initFunction.apply(material, itemSettings); registry.register(location, item); diff --git a/src/main/java/org/betterx/bclib/interfaces/CustomItemProvider.java b/src/main/java/org/betterx/bclib/interfaces/CustomItemProvider.java index ccd59262..0c2e261f 100644 --- a/src/main/java/org/betterx/bclib/interfaces/CustomItemProvider.java +++ b/src/main/java/org/betterx/bclib/interfaces/CustomItemProvider.java @@ -2,8 +2,7 @@ package org.betterx.bclib.interfaces; 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 interface CustomItemProvider { /** @@ -11,5 +10,5 @@ public interface CustomItemProvider { * * @return {@link BlockItem} */ - BlockItem getCustomItem(ResourceLocation blockID, FabricItemSettings settings); + BlockItem getCustomItem(ResourceLocation blockID, Item.Properties settings); } diff --git a/src/main/java/org/betterx/bclib/items/BaseBucketItem.java b/src/main/java/org/betterx/bclib/items/BaseBucketItem.java index 0b2378b1..283273c9 100644 --- a/src/main/java/org/betterx/bclib/items/BaseBucketItem.java +++ b/src/main/java/org/betterx/bclib/items/BaseBucketItem.java @@ -4,13 +4,12 @@ import org.betterx.bclib.interfaces.ItemModelProvider; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; +import net.minecraft.world.item.Item; import net.minecraft.world.item.MobBucketItem; import net.minecraft.world.level.material.Fluids; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; - public class BaseBucketItem extends MobBucketItem implements ItemModelProvider { - public BaseBucketItem(EntityType type, FabricItemSettings settings) { + public BaseBucketItem(EntityType type, Item.Properties settings) { super(type, Fluids.WATER, SoundEvents.BUCKET_EMPTY_FISH, settings.stacksTo(1)); } } diff --git a/src/main/java/org/betterx/bclib/registry/BaseRegistry.java b/src/main/java/org/betterx/bclib/registry/BaseRegistry.java index 361de24f..eb8961a4 100644 --- a/src/main/java/org/betterx/bclib/registry/BaseRegistry.java +++ b/src/main/java/org/betterx/bclib/registry/BaseRegistry.java @@ -7,8 +7,6 @@ import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -34,9 +32,9 @@ public abstract class BaseRegistry { public abstract void registerItem(ResourceLocation id, Item item); - public FabricItemSettings makeItemSettings() { - FabricItemSettings properties = new FabricItemSettings(); - return (FabricItemSettings) properties.tab(creativeTab); + public Item.Properties makeItemSettings() { + Item.Properties properties = new Item.Properties(); + return properties.tab(creativeTab); } private void registerInternal() { diff --git a/src/main/java/org/betterx/ui/ColorUtil.java b/src/main/java/org/betterx/ui/ColorUtil.java index 0050239f..e218412b 100644 --- a/src/main/java/org/betterx/ui/ColorUtil.java +++ b/src/main/java/org/betterx/ui/ColorUtil.java @@ -16,7 +16,6 @@ import net.minecraft.world.item.Item; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.impl.client.indigo.renderer.helper.ColorHelper; import com.google.common.collect.Maps; @@ -267,8 +266,23 @@ public class ColorUtil { return HSBtoRGB(FLOAT_BUFFER[0], FLOAT_BUFFER[1], FLOAT_BUFFER[2]); } + public static int multiplyColor(int color1, int color2) { + if (color1 == -1) { + return color2; + } else if (color2 == -1) { + return color1; + } + + final int alpha = ((color1 >> 24) & 0xFF) * ((color2 >> 24) & 0xFF) / 0xFF; + final int red = ((color1 >> 16) & 0xFF) * ((color2 >> 16) & 0xFF) / 0xFF; + final int green = ((color1 >> 8) & 0xFF) * ((color2 >> 8) & 0xFF) / 0xFF; + final int blue = (color1 & 0xFF) * (color2 & 0xFF) / 0xFF; + + return (alpha << 24) | (red << 16) | (green << 8) | blue; + } + public static int applyTint(int color, int tint) { - return colorBrigtness(ColorHelper.multiplyColor(color, tint), 1.5F); + return colorBrigtness(multiplyColor(color, tint), 1.5F); } public static int colorDistance(int color1, int color2) {