diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseBlock.java index ddea5ed0..5482a865 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseBlock.java @@ -10,7 +10,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.level.storage.loot.LootContext; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; @@ -68,9 +67,9 @@ public class BaseBlock extends Block implements BlockModelProvider { * @param settings The properties as created by the Block * @return The reconfigured {@code settings} */ - static FabricBlockSettings acceptAndReturn( - Consumer customizeProperties, - FabricBlockSettings settings + static Properties acceptAndReturn( + Consumer customizeProperties, + Properties settings ) { customizeProperties.accept(settings); return settings; diff --git a/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java index a019f4f5..07143bb1 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.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.List; @@ -26,7 +25,7 @@ import org.jetbrains.annotations.Nullable; public class BaseComposterBlock extends ComposterBlock implements BlockModelProvider { public BaseComposterBlock(Block source) { - super(FabricBlockSettings.copyOf(source)); + super(Properties.of(source.defaultBlockState().getMaterial())); } @Override diff --git a/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java index 8930ec6c..1646c093 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java @@ -34,8 +34,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; @@ -47,7 +45,7 @@ public abstract class BaseDoublePlantBlock extends BaseBlockNotFull implements R public BaseDoublePlantBlock() { this( - FabricBlockSettings.of(Material.PLANT) + Properties.of(Material.PLANT) .sound(SoundType.GRASS) .noCollission() .offsetType(BlockBehaviour.OffsetType.NONE) @@ -56,7 +54,7 @@ public abstract class BaseDoublePlantBlock extends BaseBlockNotFull implements R public BaseDoublePlantBlock(int light) { this( - FabricBlockSettings.of(Material.PLANT) + Properties.of(Material.PLANT) .sound(SoundType.GRASS) .lightLevel((state) -> state.getValue(TOP) ? light : 0) .noCollission() diff --git a/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java b/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java index c0173ee1..fdcc3cc4 100644 --- a/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java @@ -36,7 +36,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.Lists; @@ -62,10 +61,10 @@ public abstract class BasePlantBlock extends BaseBlockNotFull implements RenderL } public static Properties basePlantSettings(Material mat, int light) { - Properties props = FabricBlockSettings + Properties props = Properties .of(mat) - .sounds(SoundType.GRASS) - .noCollision() + .sound(SoundType.GRASS) + .noCollission() .offsetType(BlockBehaviour.OffsetType.XZ); if (light > 0) props.lightLevel(s -> light); return props; @@ -103,9 +102,9 @@ public abstract class BasePlantBlock extends BaseBlockNotFull implements RenderL @Deprecated(forRemoval = true) public BasePlantBlock(boolean replaceable, int light, SettingsExtender propMod) { this( - propMod.amend(FabricBlockSettings + propMod.amend(Properties .of(replaceable ? Material.REPLACEABLE_PLANT : Material.PLANT) - .luminance(light) + .lightLevel((state)->light) .sound(SoundType.GRASS) .noCollission() .offsetType(BlockBehaviour.OffsetType.XZ) diff --git a/src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java b/src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java index 067310c4..6526a38d 100644 --- a/src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java @@ -35,7 +35,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.Collections; import java.util.List; @@ -55,7 +54,7 @@ public class FeatureSaplingBlock, FC extends FeatureConfig public FeatureSaplingBlock(FeatureSupplier featureSupplier) { this( - FabricBlockSettings.of(Material.PLANT) + Properties.of(Material.PLANT) .collidable(false) .instabreak() .sound(SoundType.GRASS) @@ -66,7 +65,7 @@ public class FeatureSaplingBlock, FC extends FeatureConfig public FeatureSaplingBlock(int light, FeatureSupplier featureSupplier) { this( - FabricBlockSettings.of(Material.PLANT) + Properties.of(Material.PLANT) .collidable(false) .luminance(light) .instabreak() @@ -87,7 +86,7 @@ public class FeatureSaplingBlock, FC extends FeatureConfig @Deprecated(forRemoval = true) public FeatureSaplingBlock(Function featureSupplier) { this( - FabricBlockSettings.of(Material.PLANT) + Properties.of(Material.PLANT) .collidable(false) .instabreak() .sound(SoundType.GRASS) @@ -102,7 +101,7 @@ public class FeatureSaplingBlock, FC extends FeatureConfig Function featureSupplier ) { this( - FabricBlockSettings.of(Material.PLANT) + Properties.of(Material.PLANT) .collidable(false) .luminance(light) .instabreak() diff --git a/src/main/java/org/betterx/bclib/mixin/client/PresetEditorMixin.java b/src/main/java/org/betterx/bclib/mixin/client/PresetEditorMixin.java index 694741e8..165247ac 100644 --- a/src/main/java/org/betterx/bclib/mixin/client/PresetEditorMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/client/PresetEditorMixin.java @@ -14,12 +14,12 @@ import java.util.Map; interface PresetEditorMixin { //Make Sure the PresetEditor.EDITORS Field is a mutable List. Allows us to add new Custom WorldPreset UIs in //WorldPresetsUI - @Redirect(method = "", at = @At(value = "INVOKE", target = "Ljava/util/Map;of(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;")) - private static Map bcl_foo(K k1, V v1, K k2, V v2) { - Map a = Maps.newHashMap(); - a.put(k1, v1); - a.put(k2, v2); - return a; - } +// @Redirect(method = "", at = @At(value = "INVOKE", target = "Ljava/util/Map;of(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;")) +// private static Map bcl_foo(K k1, V v1, K k2, V v2) { +// Map a = Maps.newHashMap(); +// a.put(k1, v1); +// a.put(k2, v2); +// return a; +// } } \ No newline at end of file