Resolve Quilt compatibility issue.

- Quilt does not have FabricBlockSettings.instrument() yet; switch to AbstractBlock.Settings.instrument()
TerraformersMC · May 28, 2023 · 878eb69 · 878eb69
1 parent 3bc1987
commit 878eb69
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/block/CrystiniumBlock.java b/common/src/main/java/com/terraformersmc/cinderscapes/block/CrystiniumBlock.java
@@ -14,7 +14,7 @@
 
 public class CrystiniumBlock extends CinderscapesNetherPlantBlock {
     public CrystiniumBlock() {
-        super(FabricBlockSettings.copy(Blocks.WARPED_ROOTS).mapColor(MapColor.YELLOW), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0));
+        super(FabricBlockSettings.copyOf(Blocks.WARPED_ROOTS).mapColor(MapColor.YELLOW), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0));
     }
 
     @Override

diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/block/PhotofernBlock.java b/common/src/main/java/com/terraformersmc/cinderscapes/block/PhotofernBlock.java
@@ -12,7 +12,7 @@
 public class PhotofernBlock extends CinderscapesNetherPlantBlock implements Fertilizable {
 
 	public PhotofernBlock() {
-		super(FabricBlockSettings.copy(Blocks.WARPED_ROOTS).mapColor(MapColor.PURPLE), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0));
+		super(FabricBlockSettings.copyOf(Blocks.WARPED_ROOTS).mapColor(MapColor.PURPLE), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0));
 	}
 
 	@Override

diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/block/PyracinthBlock.java b/common/src/main/java/com/terraformersmc/cinderscapes/block/PyracinthBlock.java
@@ -14,7 +14,7 @@
 
 public class PyracinthBlock extends CinderscapesNetherPlantBlock {
     public PyracinthBlock() {
-        super(FabricBlockSettings.copy(Blocks.WARPED_ROOTS).mapColor(MapColor.ORANGE), (state) -> Block.createCuboidShape(5.0, 0.0, 5.0, 11.0, 16.0, 11.0));
+        super(FabricBlockSettings.copyOf(Blocks.WARPED_ROOTS).mapColor(MapColor.ORANGE), (state) -> Block.createCuboidShape(5.0, 0.0, 5.0, 11.0, 16.0, 11.0));
     }
 
     @Override

diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesBlocks.java b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesBlocks.java
@@ -129,7 +129,7 @@ public class CinderscapesBlocks {
 
     // Other
 
-    public static final Block TWILIGHT_VINE_BLOCK = withItem("twilight_vine_block", new Block(FabricBlockSettings.of().mapColor(MapColor.DARK_AQUA).instrument(Instrument.BASS).strength(1.0F).sounds(BlockSoundGroup.NETHER_STEM)));
+    public static final Block TWILIGHT_VINE_BLOCK = withItem("twilight_vine_block", new Block(AbstractBlock.Settings.create().mapColor(MapColor.DARK_AQUA).instrument(Instrument.BASS).strength(1.0F).sounds(BlockSoundGroup.NETHER_STEM)));
     public static final Block TWILIGHT_TENDRILS = withItem("twilight_tendrils", new CinderscapesNetherPlantBlock(FabricBlockSettings.copyOf(Blocks.WARPED_ROOTS).mapColor(MapColor.PALE_PURPLE).luminance((state) -> 15), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0)));
     public static final Block POTTED_TWILIGHT_TENDRILS = add("potted_twilight_tendrils", new FlowerPotBlock(TWILIGHT_TENDRILS, FabricBlockSettings.copyOf(Blocks.POTTED_WARPED_ROOTS).luminance((state) -> 15)));
     public static final Block TWILIGHT_FESCUES = withItem("twilight_fescues", new CinderscapesNetherPlantBlock(FabricBlockSettings.copyOf(Blocks.NETHER_SPROUTS).mapColor(MapColor.PURPLE), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 5.0, 14.0)));
@@ -147,7 +147,7 @@ public class CinderscapesBlocks {
     // Other //
     ///////////
 
-    public static final Block SULFUR_BLOCK = withItem("sulfur_block", new Block(FabricBlockSettings.of().mapColor(MapColor.YELLOW).instrument(Instrument.SNARE).strength(0.5F, 0.5f).sounds(BlockSoundGroup.GRAVEL)));
+    public static final Block SULFUR_BLOCK = withItem("sulfur_block", new Block(AbstractBlock.Settings.create().mapColor(MapColor.YELLOW).instrument(Instrument.SNARE).strength(0.5F, 0.5f).sounds(BlockSoundGroup.GRAVEL)));
     public static final Block SULFUR_ORE = addOre("sulfur_ore", 2, MapColor.YELLOW);
 
     public static final Block BRAMBLE_BERRY_BUSH = add("bramble_berry_bush", new BrambleBerryBushBlock(FabricBlockSettings.copyOf(Blocks.SWEET_BERRY_BUSH).mapColor(MapColor.TERRACOTTA_BLACK)));