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

Removed Property Dependencies

Browse source
This commit is contained in:
Frank 2022-07-13 00:12:16 +02:00
parent 93a0be3c8b
commit acd5ce5d65
43 changed files with 119 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java
View file

@ -12,6 +12,7 @@ import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.RandomSource; import net.minecraft.util.RandomSource;
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.PickaxeItem; import net.minecraft.world.item.PickaxeItem;
import net.minecraft.world.level.block.AnvilBlock; 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.EnvType;
import net.fabricmc.api.Environment; 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.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@ -44,7 +43,7 @@ public abstract class BaseAnvilBlock extends AnvilBlock implements BlockModelPro
public IntegerProperty durability; public IntegerProperty durability;
public BaseAnvilBlock(MaterialColor color) { public BaseAnvilBlock(MaterialColor color) {
this(FabricBlockSettings.copyOf(Blocks.ANVIL).color(color)); this(Properties.copy(Blocks.ANVIL).color(color));
} }
public BaseAnvilBlock(BlockBehaviour.Properties properties) { public BaseAnvilBlock(BlockBehaviour.Properties properties) {
@ -97,7 +96,7 @@ public abstract class BaseAnvilBlock extends AnvilBlock implements BlockModelPro
} }
@Override @Override
public BlockItem getCustomItem(ResourceLocation blockID, FabricItemSettings settings) { public BlockItem getCustomItem(ResourceLocation blockID, Item.Properties settings) {
return new BaseAnvilItem(this, settings); return new BaseAnvilItem(this, settings);
} }

3
src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java
View file

@ -34,7 +34,6 @@ import net.minecraft.world.phys.BlockHitResult;
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.block.FabricBlockSettings;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -43,7 +42,7 @@ import org.jetbrains.annotations.Nullable;
public class BaseBarrelBlock extends BarrelBlock implements BlockModelProvider { public class BaseBarrelBlock extends BarrelBlock implements BlockModelProvider {
public BaseBarrelBlock(Block source) { public BaseBarrelBlock(Block source) {
this(FabricBlockSettings.copyOf(source).noOcclusion()); this(Properties.copy(source).noOcclusion());
} }
public BaseBarrelBlock(BlockBehaviour.Properties properties) { public BaseBarrelBlock(BlockBehaviour.Properties properties) {

3
src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java
View file

@ -18,7 +18,6 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
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.block.FabricBlockSettings;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -27,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
public class BaseBookshelfBlock extends BaseBlock { public class BaseBookshelfBlock extends BaseBlock {
public BaseBookshelfBlock(Block source) { public BaseBookshelfBlock(Block source) {
this(FabricBlockSettings.copyOf(source)); this(Properties.copy(source));
} }
public BaseBookshelfBlock(BlockBehaviour.Properties properties) { public BaseBookshelfBlock(BlockBehaviour.Properties properties) {

3
src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java
View file

@ -21,7 +21,6 @@ import net.minecraft.world.level.storage.loot.LootContext;
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.block.FabricBlockSettings;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -31,7 +30,7 @@ import org.jetbrains.annotations.Nullable;
public class BaseChainBlock extends ChainBlock implements BlockModelProvider, RenderLayerProvider { public class BaseChainBlock extends ChainBlock implements BlockModelProvider, RenderLayerProvider {
public BaseChainBlock(MaterialColor color) { public BaseChainBlock(MaterialColor color) {
this(FabricBlockSettings.copyOf(Blocks.CHAIN).color(color)); this(Properties.copy(Blocks.CHAIN).color(color));
} }
public BaseChainBlock(BlockBehaviour.Properties properties) { public BaseChainBlock(BlockBehaviour.Properties properties) {

3
src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java
View file

@ -19,7 +19,6 @@ import net.minecraft.world.level.storage.loot.LootContext;
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.block.FabricBlockSettings;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@ -29,7 +28,7 @@ public class BaseChestBlock extends ChestBlock implements BlockModelProvider {
private final Block parent; private final Block parent;
public BaseChestBlock(Block source) { public BaseChestBlock(Block source) {
super(FabricBlockSettings.copyOf(source).noOcclusion(), () -> BaseBlockEntities.CHEST); super(Properties.copy(source).noOcclusion(), () -> BaseBlockEntities.CHEST);
this.parent = source; this.parent = source;
} }

2
src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java
View file

@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
public class BaseComposterBlock extends ComposterBlock implements BlockModelProvider { public class BaseComposterBlock extends ComposterBlock implements BlockModelProvider {
public BaseComposterBlock(Block source) { public BaseComposterBlock(Block source) {
super(Properties.of(source.defaultBlockState().getMaterial())); super(Properties.copy(source));
} }
@Override @Override

3
src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java
View file

@ -16,7 +16,6 @@ import net.minecraft.world.level.storage.loot.LootContext;
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.block.FabricBlockSettings;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@ -26,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
public class BaseCraftingTableBlock extends CraftingTableBlock implements BlockModelProvider { public class BaseCraftingTableBlock extends CraftingTableBlock implements BlockModelProvider {
public BaseCraftingTableBlock(Block source) { public BaseCraftingTableBlock(Block source) {
this(FabricBlockSettings.copyOf(source)); this(Properties.copy(source));
} }
public BaseCraftingTableBlock(BlockBehaviour.Properties properties) { public BaseCraftingTableBlock(BlockBehaviour.Properties properties) {

3
src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java
View file

@ -29,7 +29,6 @@ import net.minecraft.world.level.storage.loot.LootContext;
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.block.FabricBlockSettings;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -39,7 +38,7 @@ import org.jetbrains.annotations.Nullable;
public class BaseDoorBlock extends DoorBlock implements RenderLayerProvider, BlockModelProvider, TagProvider { public class BaseDoorBlock extends DoorBlock implements RenderLayerProvider, BlockModelProvider, TagProvider {
public BaseDoorBlock(Block source) { 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) { public BaseDoorBlock(BlockBehaviour.Properties properties) {

3
src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java
View file

@ -18,7 +18,6 @@ import net.minecraft.world.level.storage.loot.LootContext;
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.block.FabricBlockSettings;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -30,7 +29,7 @@ public class BaseFenceBlock extends FenceBlock implements BlockModelProvider {
private final Block parent; private final Block parent;
public BaseFenceBlock(Block source) { public BaseFenceBlock(Block source) {
super(FabricBlockSettings.copyOf(source).noOcclusion()); super(Properties.copy(source).noOcclusion());
this.parent = source; this.parent = source;
} }

3
src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java
View file

@ -31,7 +31,6 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
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.block.FabricBlockSettings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@ -43,7 +42,7 @@ import org.jetbrains.annotations.Nullable;
public class BaseFurnaceBlock extends FurnaceBlock implements BlockModelProvider, RenderLayerProvider { public class BaseFurnaceBlock extends FurnaceBlock implements BlockModelProvider, RenderLayerProvider {
public BaseFurnaceBlock(Block source) { 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) { public BaseFurnaceBlock(BlockBehaviour.Properties properties) {

3
src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java
View file

@ -17,7 +17,6 @@ import net.minecraft.world.level.storage.loot.LootContext;
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.block.FabricBlockSettings;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -29,7 +28,7 @@ public class BaseGateBlock extends FenceGateBlock implements BlockModelProvider
private final Block parent; private final Block parent;
public BaseGateBlock(Block source) { public BaseGateBlock(Block source) {
super(FabricBlockSettings.copyOf(source).noOcclusion()); super(Properties.copy(source).noOcclusion());
this.parent = source; this.parent = source;
} }

7
src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java
View file

@ -17,7 +17,6 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
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.block.FabricBlockSettings;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -28,9 +27,9 @@ public class BaseGlassBlock extends BaseBlockNotFull implements AddMineablePicka
} }
public BaseGlassBlock(Block block, float resistance) { public BaseGlassBlock(Block block, float resistance) {
super(FabricBlockSettings.copyOf(block) super(Properties.copy(block)
.resistance(resistance) .explosionResistance(resistance)
.nonOpaque() .noOcclusion()
.isSuffocating((arg1, arg2, arg3) -> false) .isSuffocating((arg1, arg2, arg3) -> false)
.isViewBlocking((arg1, arg2, arg3) -> false)); .isViewBlocking((arg1, arg2, arg3) -> false));
} }

3
src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java
View file

@ -19,7 +19,6 @@ import net.minecraft.world.level.storage.loot.LootContext;
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.block.FabricBlockSettings;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -29,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
public class BaseLadderBlock extends LadderBlock implements RenderLayerProvider, BlockModelProvider { public class BaseLadderBlock extends LadderBlock implements RenderLayerProvider, BlockModelProvider {
public BaseLadderBlock(Block block) { public BaseLadderBlock(Block block) {
this(FabricBlockSettings.copyOf(block).noOcclusion()); this(Properties.copy(block).noOcclusion());
} }
public BaseLadderBlock(BlockBehaviour.Properties properties) { public BaseLadderBlock(BlockBehaviour.Properties properties) {

24
src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java
View file

@ -27,8 +27,6 @@ import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.LootContext;
import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import java.util.Collections; import java.util.Collections;
@ -38,17 +36,17 @@ import java.util.function.Consumer;
public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider, RenderLayerProvider, TagProvider, AddMineableShears, AddMineableHoe { public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider, RenderLayerProvider, TagProvider, AddMineableShears, AddMineableHoe {
protected final Block sapling; protected final Block sapling;
private static FabricBlockSettings makeLeaves(MaterialColor color) { private static Properties makeLeaves(MaterialColor color) {
return FabricBlockSettings return Properties
.copyOf(Blocks.OAK_LEAVES) .copy(Blocks.OAK_LEAVES)
.mapColor(color) .color(color)
//.requiresTool() //.requiresTool()
.allowsSpawning((state, world, pos, type) -> false) .isValidSpawn((state, world, pos, type) -> false)
.suffocates((state, world, pos) -> false) .isSuffocating((state, world, pos) -> false)
.blockVision((state, world, pos) -> false); .isViewBlocking((state, world, pos) -> false);
} }
public BaseLeavesBlock(Block sapling, MaterialColor color, Consumer<FabricBlockSettings> customizeProperties) { public BaseLeavesBlock(Block sapling, MaterialColor color, Consumer<Properties> customizeProperties) {
super(BaseBlock.acceptAndReturn(customizeProperties, makeLeaves(color))); super(BaseBlock.acceptAndReturn(customizeProperties, makeLeaves(color)));
this.sapling = sapling; this.sapling = sapling;
} }
@ -57,9 +55,9 @@ public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider,
Block sapling, Block sapling,
MaterialColor color, MaterialColor color,
int light, int light,
Consumer<FabricBlockSettings> customizeProperties Consumer<Properties> customizeProperties
) { ) {
super(BaseBlock.acceptAndReturn(customizeProperties, makeLeaves(color).luminance(light))); super(BaseBlock.acceptAndReturn(customizeProperties, makeLeaves(color).lightLevel(ignored->light)));
this.sapling = sapling; this.sapling = sapling;
} }
@ -69,7 +67,7 @@ public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider,
} }
public BaseLeavesBlock(Block sapling, MaterialColor color, int light) { public BaseLeavesBlock(Block sapling, MaterialColor color, int light) {
super(makeLeaves(color).luminance(light)); super(makeLeaves(color).lightLevel(ignored->light));
this.sapling = sapling; this.sapling = sapling;
} }

3
src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java
View file

@ -22,7 +22,6 @@ import net.minecraft.world.level.storage.loot.LootContext;
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.block.FabricBlockSettings;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -32,7 +31,7 @@ import org.jetbrains.annotations.Nullable;
public class BaseMetalBarsBlock extends IronBarsBlock implements BlockModelProvider, RenderLayerProvider { public class BaseMetalBarsBlock extends IronBarsBlock implements BlockModelProvider, RenderLayerProvider {
public BaseMetalBarsBlock(Block source) { 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) { public BaseMetalBarsBlock(BlockBehaviour.Properties properties) {

6
src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java
View file

@ -22,8 +22,6 @@ import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.LootContext;
import net.minecraft.world.level.storage.loot.parameters.LootContextParams; 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.Collections;
import java.util.List; import java.util.List;
import java.util.function.Supplier; import java.util.function.Supplier;
@ -40,9 +38,9 @@ public class BaseOreBlock extends DropExperienceBlock implements BlockModelProvi
public BaseOreBlock(Supplier<Item> drop, int minCount, int maxCount, int experience, int miningLevel) { public BaseOreBlock(Supplier<Item> drop, int minCount, int maxCount, int experience, int miningLevel) {
this( this(
FabricBlockSettings Properties
.of(Material.STONE, MaterialColor.SAND) .of(Material.STONE, MaterialColor.SAND)
.requiresTool() .requiresCorrectToolForDrops()
.destroyTime(3F) .destroyTime(3F)
.explosionResistance(9F) .explosionResistance(9F)
.sound(SoundType.STONE), .sound(SoundType.STONE),

3
src/main/java/org/betterx/bclib/blocks/BasePathBlock.java
View file

@ -23,7 +23,6 @@ import net.minecraft.world.phys.shapes.VoxelShape;
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.block.FabricBlockSettings;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@ -39,7 +38,7 @@ public class BasePathBlock extends BaseBlockNotFull {
private Block baseBlock; private Block baseBlock;
public BasePathBlock(Block source) { 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; this.baseBlock = Blocks.DIRT;
if (source instanceof BaseTerrainBlock) { if (source instanceof BaseTerrainBlock) {
BaseTerrainBlock terrain = (BaseTerrainBlock) source; BaseTerrainBlock terrain = (BaseTerrainBlock) source;

3
src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java
View file

@ -17,7 +17,6 @@ import net.minecraft.world.level.storage.loot.LootContext;
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.block.FabricBlockSettings;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -29,7 +28,7 @@ public class BasePressurePlateBlock extends PressurePlateBlock implements BlockM
private final Block parent; private final Block parent;
public BasePressurePlateBlock(Sensitivity rule, Block source) { 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; this.parent = source;
} }

3
src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java
View file

@ -15,7 +15,6 @@ import net.minecraft.world.level.storage.loot.LootContext;
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.block.FabricBlockSettings;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -29,7 +28,7 @@ public class BaseRotatedPillarBlock extends RotatedPillarBlock implements BlockM
} }
public BaseRotatedPillarBlock(Block block) { public BaseRotatedPillarBlock(Block block) {
this(FabricBlockSettings.copyOf(block)); this(Properties.copy(block));
} }
@Override @Override

7
src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java
View file

@ -17,6 +17,7 @@ import net.minecraft.util.Mth;
import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
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.context.BlockPlaceContext; import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.BlockGetter; 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.EnvType;
import net.fabricmc.api.Environment; 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.Collections;
import java.util.List; import java.util.List;
@ -61,7 +60,7 @@ public class BaseSignBlock extends SignBlock implements BlockModelProvider, Cust
private final Block parent; private final Block parent;
public BaseSignBlock(Block source) { 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() this.registerDefaultState(this.stateDefinition.any()
.setValue(ROTATION, 0) .setValue(ROTATION, 0)
.setValue(FLOOR, false) .setValue(FLOOR, false)
@ -194,7 +193,7 @@ public class BaseSignBlock extends SignBlock implements BlockModelProvider, Cust
} }
@Override @Override
public BlockItem getCustomItem(ResourceLocation blockID, FabricItemSettings settings) { public BlockItem getCustomItem(ResourceLocation blockID, Item.Properties settings) {
return new BlockItem(this, settings.stacksTo(16)); return new BlockItem(this, settings.stacksTo(16));
} }
} }

9
src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java
View file

@ -12,6 +12,7 @@ import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.core.Registry; import net.minecraft.core.Registry;
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.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.SlabBlock; 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.EnvType;
import net.fabricmc.api.Environment; 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.Collections;
import java.util.List; import java.util.List;
@ -39,7 +38,7 @@ public class BaseSlabBlock extends SlabBlock implements BlockModelProvider, Cust
} }
public BaseSlabBlock(Block source, boolean fireproof) { public BaseSlabBlock(Block source, boolean fireproof) {
super(FabricBlockSettings.copyOf(source)); super(Properties.copy(source));
this.parent = source; this.parent = source;
this.fireproof = fireproof; this.fireproof = fireproof;
} }
@ -90,8 +89,8 @@ public class BaseSlabBlock extends SlabBlock implements BlockModelProvider, Cust
} }
@Override @Override
public BlockItem getCustomItem(ResourceLocation blockID, FabricItemSettings settings) { public BlockItem getCustomItem(ResourceLocation blockID, Item.Properties settings) {
if (fireproof) settings = settings.fireproof(); if (fireproof) settings = settings.fireResistant();
return new BlockItem(this, settings); return new BlockItem(this, settings);
} }
} }

9
src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java
View file

@ -12,6 +12,7 @@ import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.core.Registry; import net.minecraft.core.Registry;
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.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.StairBlock; 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.EnvType;
import net.fabricmc.api.Environment; 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.Collections;
import java.util.List; import java.util.List;
@ -40,7 +39,7 @@ public class BaseStairsBlock extends StairBlock implements BlockModelProvider, C
} }
public BaseStairsBlock(Block source, boolean fireproof) { public BaseStairsBlock(Block source, boolean fireproof) {
super(source.defaultBlockState(), FabricBlockSettings.copyOf(source)); super(source.defaultBlockState(), Properties.copy(source));
this.parent = source; this.parent = source;
this.fireproof = fireproof; this.fireproof = fireproof;
} }
@ -114,8 +113,8 @@ public class BaseStairsBlock extends StairBlock implements BlockModelProvider, C
} }
@Override @Override
public BlockItem getCustomItem(ResourceLocation blockID, FabricItemSettings settings) { public BlockItem getCustomItem(ResourceLocation blockID, Item.Properties settings) {
if (fireproof) settings = settings.fireproof(); if (fireproof) settings = settings.fireResistant();
return new BlockItem(this, settings); return new BlockItem(this, settings);
} }
} }

3
src/main/java/org/betterx/bclib/blocks/BaseStoneButtonBlock.java
View file

@ -4,11 +4,10 @@ import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundEvents;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
public class BaseStoneButtonBlock extends BaseButtonBlock { public class BaseStoneButtonBlock extends BaseButtonBlock {
public BaseStoneButtonBlock(Block source) { public BaseStoneButtonBlock(Block source) {
super(source, FabricBlockSettings.copyOf(source).noOcclusion(), false); super(source, Properties.copy(source).noOcclusion(), false);
} }
@Override @Override

3
src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java
View file

@ -17,13 +17,12 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.BlockHitResult;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
public class BaseStripableLogBlock extends BaseRotatedPillarBlock { public class BaseStripableLogBlock extends BaseRotatedPillarBlock {
private final Block striped; private final Block striped;
public BaseStripableLogBlock(MaterialColor color, Block striped) { public BaseStripableLogBlock(MaterialColor color, Block striped) {
super(FabricBlockSettings.copyOf(striped).color(color)); super(Properties.copy(striped).color(color));
this.striped = striped; this.striped = striped;
} }

7
src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java
View file

@ -38,7 +38,6 @@ import net.minecraft.world.phys.BlockHitResult;
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.block.FabricBlockSettings;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@ -54,9 +53,9 @@ public class BaseTerrainBlock extends BaseBlock {
private Block pathBlock; private Block pathBlock;
public BaseTerrainBlock(Block baseBlock, MaterialColor color) { public BaseTerrainBlock(Block baseBlock, MaterialColor color) {
super(FabricBlockSettings super(Properties
.copyOf(baseBlock) .copy(baseBlock)
.materialColor(color) .color(color)
.sound(BlockSounds.TERRAIN_SOUND) .sound(BlockSounds.TERRAIN_SOUND)
.randomTicks() .randomTicks()
); );

3
src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java
View file

@ -21,14 +21,13 @@ import net.minecraft.world.level.storage.loot.LootContext;
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.block.FabricBlockSettings;
import java.util.*; import java.util.*;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
public class BaseTrapdoorBlock extends TrapDoorBlock implements RenderLayerProvider, BlockModelProvider { public class BaseTrapdoorBlock extends TrapDoorBlock implements RenderLayerProvider, BlockModelProvider {
public BaseTrapdoorBlock(Block source) { 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) { public BaseTrapdoorBlock(BlockBehaviour.Properties properties) {

4
src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java
View file

@ -33,8 +33,6 @@ import net.minecraft.world.phys.Vec3;
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.object.builder.v1.block.FabricBlockSettings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import java.util.List; import java.util.List;
@ -59,7 +57,7 @@ public class BaseVineBlock extends BaseBlockNotFull implements RenderLayerProvid
public BaseVineBlock(int light, boolean bottomOnly, Function<Properties, Properties> propMod) { public BaseVineBlock(int light, boolean bottomOnly, Function<Properties, Properties> propMod) {
this( this(
propMod.apply(FabricBlockSettings propMod.apply(Properties
.of(Material.PLANT) .of(Material.PLANT)
.sound(SoundType.GRASS) .sound(SoundType.GRASS)
.lightLevel((state) -> bottomOnly ? state.getValue(SHAPE) == TripleShape.BOTTOM .lightLevel((state) -> bottomOnly ? state.getValue(SHAPE) == TripleShape.BOTTOM

3
src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java
View file

@ -19,7 +19,6 @@ import net.minecraft.world.level.storage.loot.LootContext;
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.block.FabricBlockSettings;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -31,7 +30,7 @@ public class BaseWallBlock extends WallBlock implements BlockModelProvider {
private final Block parent; private final Block parent;
public BaseWallBlock(Block source) { public BaseWallBlock(Block source) {
super(FabricBlockSettings.copyOf(source).noOcclusion()); super(Properties.copy(source).noOcclusion());
this.parent = source; this.parent = source;
} }

3
src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java
View file

@ -17,7 +17,6 @@ import net.minecraft.world.level.storage.loot.LootContext;
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.block.FabricBlockSettings;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -31,7 +30,7 @@ public class BaseWeightedPlateBlock extends WeightedPressurePlateBlock implement
public BaseWeightedPlateBlock(Block source) { public BaseWeightedPlateBlock(Block source) {
super( super(
15, 15,
FabricBlockSettings.copyOf(source) Properties.copy(source)
.noCollission() .noCollission()
.noOcclusion() .noOcclusion()
.requiresCorrectToolForDrops() .requiresCorrectToolForDrops()

3
src/main/java/org/betterx/bclib/blocks/BaseWoodenButtonBlock.java
View file

@ -4,11 +4,10 @@ import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundEvents;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
public class BaseWoodenButtonBlock extends BaseButtonBlock { public class BaseWoodenButtonBlock extends BaseButtonBlock {
public BaseWoodenButtonBlock(Block source) { 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 @Override

12
src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java
View file

@ -55,7 +55,7 @@ public class FeatureSaplingBlock<F extends Feature<FC>, FC extends FeatureConfig
public FeatureSaplingBlock(FeatureSupplier<F, FC> featureSupplier) { public FeatureSaplingBlock(FeatureSupplier<F, FC> featureSupplier) {
this( this(
Properties.of(Material.PLANT) Properties.of(Material.PLANT)
.collidable(false) .noCollission()
.instabreak() .instabreak()
.sound(SoundType.GRASS) .sound(SoundType.GRASS)
.randomTicks(), .randomTicks(),
@ -66,8 +66,8 @@ public class FeatureSaplingBlock<F extends Feature<FC>, FC extends FeatureConfig
public FeatureSaplingBlock(int light, FeatureSupplier<F, FC> featureSupplier) { public FeatureSaplingBlock(int light, FeatureSupplier<F, FC> featureSupplier) {
this( this(
Properties.of(Material.PLANT) Properties.of(Material.PLANT)
.collidable(false) .noCollission()
.luminance(light) .lightLevel(ignored->light)
.instabreak() .instabreak()
.sound(SoundType.GRASS) .sound(SoundType.GRASS)
.randomTicks(), .randomTicks(),
@ -87,7 +87,7 @@ public class FeatureSaplingBlock<F extends Feature<FC>, FC extends FeatureConfig
public FeatureSaplingBlock(Function<BlockState, org.betterx.bclib.api.v2.levelgen.features.BCLFeature> featureSupplier) { public FeatureSaplingBlock(Function<BlockState, org.betterx.bclib.api.v2.levelgen.features.BCLFeature> featureSupplier) {
this( this(
Properties.of(Material.PLANT) Properties.of(Material.PLANT)
.collidable(false) .noCollission()
.instabreak() .instabreak()
.sound(SoundType.GRASS) .sound(SoundType.GRASS)
.randomTicks(), .randomTicks(),
@ -102,8 +102,8 @@ public class FeatureSaplingBlock<F extends Feature<FC>, FC extends FeatureConfig
) { ) {
this( this(
Properties.of(Material.PLANT) Properties.of(Material.PLANT)
.collidable(false) .noCollission()
.luminance(light) .lightLevel(ignored->light)
.instabreak() .instabreak()
.sound(SoundType.GRASS) .sound(SoundType.GRASS)
.randomTicks(), .randomTicks(),

8
src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java
View file

@ -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.Material;
import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.level.material.MaterialColor;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import java.util.List; import java.util.List;
public class SimpleLeavesBlock extends BaseBlockNotFull implements RenderLayerProvider, TagProvider, AddMineableShears, AddMineableHoe { public class SimpleLeavesBlock extends BaseBlockNotFull implements RenderLayerProvider, TagProvider, AddMineableShears, AddMineableHoe {
public SimpleLeavesBlock(MaterialColor color) { public SimpleLeavesBlock(MaterialColor color) {
this( this(
FabricBlockSettings Properties
.of(Material.LEAVES) .of(Material.LEAVES)
.strength(0.2F) .strength(0.2F)
.color(color) .color(color)
@ -37,9 +35,9 @@ public class SimpleLeavesBlock extends BaseBlockNotFull implements RenderLayerPr
public SimpleLeavesBlock(MaterialColor color, int light) { public SimpleLeavesBlock(MaterialColor color, int light) {
this( this(
FabricBlockSettings Properties
.of(Material.LEAVES) .of(Material.LEAVES)
.luminance(light) .lightLevel(ignored->light)
.color(color) .color(color)
.strength(0.2F) .strength(0.2F)
.sound(SoundType.GRASS) .sound(SoundType.GRASS)

3
src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java
View file

@ -39,7 +39,6 @@ import net.minecraft.world.phys.shapes.VoxelShape;
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.block.FabricBlockSettings;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
@ -53,7 +52,7 @@ public class StalactiteBlock extends BaseBlockNotFull implements SimpleWaterlogg
private static final VoxelShape[] SHAPES; private static final VoxelShape[] SHAPES;
public StalactiteBlock(Block source) { public StalactiteBlock(Block source) {
this(FabricBlockSettings.copy(source).noOcclusion()); this(Properties.copy(source).noOcclusion());
} }
public StalactiteBlock(BlockBehaviour.Properties properties) { public StalactiteBlock(BlockBehaviour.Properties properties) {

3
src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java
View file

@ -16,13 +16,12 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.BlockHitResult;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
public class StripableBarkBlock extends BaseBarkBlock { public class StripableBarkBlock extends BaseBarkBlock {
private final Block striped; private final Block striped;
public StripableBarkBlock(MaterialColor color, Block striped) { public StripableBarkBlock(MaterialColor color, Block striped) {
super(FabricBlockSettings.copyOf(striped).color(color)); super(Properties.copy(striped).color(color));
this.striped = striped; this.striped = striped;
} }

3
src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java
View file

@ -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.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.phys.shapes.VoxelShape;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import com.google.common.collect.Lists; 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); private static final VoxelShape SHAPE = box(4, 0, 4, 12, 16, 12);
public UpDownPlantBlock() { public UpDownPlantBlock() {
this(FabricBlockSettings this(Properties
.of(Material.PLANT) .of(Material.PLANT)
.sound(SoundType.GRASS) .sound(SoundType.GRASS)
.noCollission() .noCollission()

24
src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java
View file

@ -12,9 +12,9 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey; import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block; 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 net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
@ -62,8 +62,8 @@ public abstract class ComplexMaterial {
public ComplexMaterial init(BlockRegistry blocksRegistry, ItemRegistry itemsRegistry, PathConfig recipeConfig) { public ComplexMaterial init(BlockRegistry blocksRegistry, ItemRegistry itemsRegistry, PathConfig recipeConfig) {
initTags(); initTags();
final FabricBlockSettings blockSettings = getBlockSettings(); final BlockBehaviour.Properties blockSettings = getBlockSettings();
final FabricItemSettings itemSettings = getItemSettings(itemsRegistry); final Item.Properties itemSettings = getItemSettings(itemsRegistry);
initDefault(blockSettings, itemSettings); initDefault(blockSettings, itemSettings);
getBlockEntries().forEach(entry -> { getBlockEntries().forEach(entry -> {
@ -88,10 +88,11 @@ public abstract class ComplexMaterial {
/** /**
* Init default content for {@link ComplexMaterial} - blocks and items. * Init default content for {@link ComplexMaterial} - blocks and items.
* *
* @param blockSettings {@link FabricBlockSettings} default block settings for this material; * @param blockSettings {@link BlockBehaviour.Properties} default block settings for this material;
* @param itemSettings {@link FabricItemSettings} default item 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. * Init custom tags for this {@link ComplexMaterial}, not required.
@ -178,16 +179,15 @@ public abstract class ComplexMaterial {
/** /**
* Get default block settings for this material. * 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. * 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(); return registry.makeItemSettings();
} }

19
src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java
View file

@ -17,10 +17,8 @@ import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items; import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.Block; 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.block.state.BlockBehaviour;
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.registry.FlammableBlockRegistry; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
public class WoodenComplexMaterial extends ComplexMaterial { public class WoodenComplexMaterial extends ComplexMaterial {
@ -64,10 +62,11 @@ public class WoodenComplexMaterial extends ComplexMaterial {
this.woodColor = woodColor; this.woodColor = woodColor;
} }
@Override @Override
protected FabricBlockSettings getBlockSettings() { protected BlockBehaviour.Properties getBlockSettings() {
return FabricBlockSettings.copyOf(Blocks.OAK_PLANKS) return BlockBehaviour.Properties.copy(Blocks.OAK_PLANKS)
.mapColor(planksColor); .color(planksColor);
} }
@Override @Override
@ -82,13 +81,13 @@ public class WoodenComplexMaterial extends ComplexMaterial {
} }
@Override @Override
protected void initDefault(FabricBlockSettings blockSettings, FabricItemSettings itemSettings) { protected void initDefault(BlockBehaviour.Properties blockSettings, Item.Properties itemSettings) {
initBase(blockSettings, itemSettings); initBase(blockSettings, itemSettings);
initStorage(blockSettings, itemSettings); initStorage(blockSettings, itemSettings);
initDecorations(blockSettings, itemSettings); initDecorations(blockSettings, itemSettings);
} }
final protected void initBase(FabricBlockSettings blockSettings, FabricItemSettings itemSettings) { final protected void initBase(BlockBehaviour.Properties blockSettings, Item.Properties itemSettings) {
TagKey<Block> tagBlockLog = getBlockTag(TAG_LOGS); TagKey<Block> tagBlockLog = getBlockTag(TAG_LOGS);
TagKey<Item> tagItemLog = getItemTag(TAG_LOGS); TagKey<Item> tagItemLog = getItemTag(TAG_LOGS);
@ -198,7 +197,7 @@ public class WoodenComplexMaterial extends ComplexMaterial {
.setItemTags(ItemTags.SIGNS)); .setItemTags(ItemTags.SIGNS));
} }
final protected void initStorage(FabricBlockSettings blockSettings, FabricItemSettings itemSettings) { final protected void initStorage(BlockBehaviour.Properties blockSettings, Item.Properties itemSettings) {
addBlockEntry(new BlockEntry( addBlockEntry(new BlockEntry(
BLOCK_CHEST, BLOCK_CHEST,
(complexMaterial, settings) -> new BaseChestBlock(getBlock(BLOCK_PLANKS)) (complexMaterial, settings) -> new BaseChestBlock(getBlock(BLOCK_PLANKS))
@ -214,7 +213,7 @@ public class WoodenComplexMaterial extends ComplexMaterial {
.setItemTags(CommonItemTags.BARREL, CommonItemTags.WOODEN_BARREL)); .setItemTags(CommonItemTags.BARREL, CommonItemTags.WOODEN_BARREL));
} }
final protected void initDecorations(FabricBlockSettings blockSettings, FabricItemSettings itemSettings) { final protected void initDecorations(BlockBehaviour.Properties blockSettings, Item.Properties itemSettings) {
addBlockEntry(new BlockEntry( addBlockEntry(new BlockEntry(
BLOCK_CRAFTING_TABLE, BLOCK_CRAFTING_TABLE,
(complexMaterial, settings) -> new BaseCraftingTableBlock(getBlock(BLOCK_PLANKS)) (complexMaterial, settings) -> new BaseCraftingTableBlock(getBlock(BLOCK_PLANKS))

11
src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java
View file

@ -8,26 +8,25 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey; import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import java.util.function.BiFunction; import java.util.function.BiFunction;
public class BlockEntry extends ComplexMaterialEntry { public class BlockEntry extends ComplexMaterialEntry {
final BiFunction<ComplexMaterial, FabricBlockSettings, Block> initFunction; final BiFunction<ComplexMaterial, BlockBehaviour.Properties, Block> initFunction;
final boolean hasItem; final boolean hasItem;
TagKey<Block>[] blockTags; TagKey<Block>[] blockTags;
TagKey<Item>[] itemTags; TagKey<Item>[] itemTags;
public BlockEntry(String suffix, BiFunction<ComplexMaterial, FabricBlockSettings, Block> initFunction) { public BlockEntry(String suffix, BiFunction<ComplexMaterial, BlockBehaviour.Properties, Block> initFunction) {
this(suffix, true, initFunction); this(suffix, true, initFunction);
} }
public BlockEntry( public BlockEntry(
String suffix, String suffix,
boolean hasItem, boolean hasItem,
BiFunction<ComplexMaterial, FabricBlockSettings, Block> initFunction BiFunction<ComplexMaterial, BlockBehaviour.Properties, Block> initFunction
) { ) {
super(suffix); super(suffix);
this.initFunction = initFunction; this.initFunction = initFunction;
@ -44,7 +43,7 @@ public class BlockEntry extends ComplexMaterialEntry {
return this; 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()); ResourceLocation location = getLocation(material.getModID(), material.getBaseName());
Block block = initFunction.apply(material, blockSettings); Block block = initFunction.apply(material, blockSettings);
if (hasItem) { if (hasItem) {

8
src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java
View file

@ -8,16 +8,14 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey; import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import java.util.function.BiFunction; import java.util.function.BiFunction;
public class ItemEntry extends ComplexMaterialEntry { public class ItemEntry extends ComplexMaterialEntry {
final BiFunction<ComplexMaterial, FabricItemSettings, Item> initFunction; final BiFunction<ComplexMaterial, Item.Properties, Item> initFunction;
TagKey<Item>[] itemTags; TagKey<Item>[] itemTags;
public ItemEntry(String suffix, BiFunction<ComplexMaterial, FabricItemSettings, Item> initFunction) { public ItemEntry(String suffix, BiFunction<ComplexMaterial, Item.Properties, Item> initFunction) {
super(suffix); super(suffix);
this.initFunction = initFunction; this.initFunction = initFunction;
} }
@ -27,7 +25,7 @@ public class ItemEntry extends ComplexMaterialEntry {
return this; 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()); ResourceLocation location = getLocation(material.getModID(), material.getBaseName());
Item item = initFunction.apply(material, itemSettings); Item item = initFunction.apply(material, itemSettings);
registry.register(location, item); registry.register(location, item);

5
src/main/java/org/betterx/bclib/interfaces/CustomItemProvider.java
View file

@ -2,8 +2,7 @@ package org.betterx.bclib.interfaces;
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 interface CustomItemProvider { public interface CustomItemProvider {
/** /**
@ -11,5 +10,5 @@ public interface CustomItemProvider {
* *
* @return {@link BlockItem} * @return {@link BlockItem}
*/ */
BlockItem getCustomItem(ResourceLocation blockID, FabricItemSettings settings); BlockItem getCustomItem(ResourceLocation blockID, Item.Properties settings);
} }

5
src/main/java/org/betterx/bclib/items/BaseBucketItem.java
View file

@ -4,13 +4,12 @@ import org.betterx.bclib.interfaces.ItemModelProvider;
import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundEvents;
import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.EntityType;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.MobBucketItem; import net.minecraft.world.item.MobBucketItem;
import net.minecraft.world.level.material.Fluids; import net.minecraft.world.level.material.Fluids;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
public class BaseBucketItem extends MobBucketItem implements ItemModelProvider { 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)); super(type, Fluids.WATER, SoundEvents.BUCKET_EMPTY_FISH, settings.stacksTo(1));
} }
} }

8
src/main/java/org/betterx/bclib/registry/BaseRegistry.java
View file

@ -7,8 +7,6 @@ import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block; 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.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@ -34,9 +32,9 @@ public abstract class BaseRegistry<T> {
public abstract void registerItem(ResourceLocation id, Item item); public abstract void registerItem(ResourceLocation id, Item item);
public FabricItemSettings makeItemSettings() { public Item.Properties makeItemSettings() {
FabricItemSettings properties = new FabricItemSettings(); Item.Properties properties = new Item.Properties();
return (FabricItemSettings) properties.tab(creativeTab); return properties.tab(creativeTab);
} }
private void registerInternal() { private void registerInternal() {

18
src/main/java/org/betterx/bclib/util/ColorUtil.java
View file

@ -13,7 +13,6 @@ import net.minecraft.world.item.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.impl.client.indigo.renderer.helper.ColorHelper;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@ -177,8 +176,23 @@ public class ColorUtil {
return HSBtoRGB(FLOAT_BUFFER[0], FLOAT_BUFFER[1], FLOAT_BUFFER[2]); 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) { 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) { public static int colorDistance(int color1, int color2) {