Update for 23w16a.

- Updated Material.WOOD to Material.GENERIC for 23w16a
TerraformersMC · Apr 20, 2023 · e055291 · e055291
1 parent e5be5c3
commit e055291
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,11 +2,11 @@ org.gradle.jvmargs=-Xmx2G
 fabric.loom.multiProjectOptimisation=true
 
 maven_group=com.terraformersmc.terraform-api
-version=7.0.0-alpha.2
+version=7.0.0-alpha.3
 
-minecraft_version=23w14a
-yarn_mappings=23w14a+build.6
+minecraft_version=23w16a
+yarn_mappings=23w16a+build.4
 loader_version=0.14.19
-fabric_version=0.78.0+1.20
+fabric_version=0.78.1+1.20
 
 mixin_extras_version=0.2.0-beta.5
diff --git a/...-wood-api-v1/src/main/java/com/terraformersmc/terraform/wood/block/BareSmallLogBlock.java b/...-wood-api-v1/src/main/java/com/terraformersmc/terraform/wood/block/BareSmallLogBlock.java
@@ -106,7 +106,7 @@ public BareSmallLogBlock(Supplier<Block> stripped, Block.Settings settings) {
 	public static BareSmallLogBlock of(MapColor color) {
 		return new BareSmallLogBlock(
 				Block.Settings.of(
-						Material.WOOD,
+						Material.GENERIC,
 						color
 				).strength(2.0F).sounds(BlockSoundGroup.WOOD)
 		);
@@ -123,7 +123,7 @@ public static BareSmallLogBlock of(MapColor color) {
 	public static BareSmallLogBlock of(MapColor wood, MapColor bark) {
 		return new BareSmallLogBlock(
 				Block.Settings.of(
-						Material.WOOD,
+						Material.GENERIC,
 						(state) -> state.get(UP) ? wood : bark
 				).strength(2.0F).sounds(BlockSoundGroup.WOOD)
 		);

diff --git a/...rm-wood-api-v1/src/main/java/com/terraformersmc/terraform/wood/block/PillarLogHelper.java b/...rm-wood-api-v1/src/main/java/com/terraformersmc/terraform/wood/block/PillarLogHelper.java
@@ -16,7 +16,7 @@ public class PillarLogHelper {
 	public static PillarBlock of(MapColor color) {
 		return new PillarBlock(
 				Block.Settings.of(
-						Material.WOOD,
+						Material.GENERIC,
 						color
 				).strength(2.0F).sounds(BlockSoundGroup.WOOD)
 		);
@@ -33,7 +33,7 @@ public static PillarBlock of(MapColor color) {
 	public static PillarBlock of(MapColor wood, MapColor bark) {
 		return new PillarBlock(
 				Block.Settings.of(
-						Material.WOOD,
+						Material.GENERIC,
 						(state) -> Direction.Axis.Y.equals(state.get(PillarBlock.AXIS)) ? wood : bark
 				).strength(2.0F).sounds(BlockSoundGroup.WOOD)
 		);
@@ -49,7 +49,7 @@ public static PillarBlock of(MapColor wood, MapColor bark) {
 	public static PillarBlock ofNether(MapColor color) {
 		return new PillarBlock(
 				Block.Settings.of(
-						Material.WOOD,
+						Material.GENERIC,
 						color
 				).strength(2.0F).sounds(BlockSoundGroup.NETHER_STEM)
 		);
@@ -66,7 +66,7 @@ public static PillarBlock ofNether(MapColor color) {
 	public static PillarBlock ofNether(MapColor wood, MapColor bark) {
 		return new PillarBlock(
 				Block.Settings.of(
-						Material.WOOD,
+						Material.GENERIC,
 						(state) -> Direction.Axis.Y.equals(state.get(PillarBlock.AXIS)) ? wood : bark
 				).strength(2.0F).sounds(BlockSoundGroup.NETHER_STEM)
 		);

diff --git a/...rm-wood-api-v1/src/main/java/com/terraformersmc/terraform/wood/block/QuarterLogBlock.java b/...rm-wood-api-v1/src/main/java/com/terraformersmc/terraform/wood/block/QuarterLogBlock.java
@@ -61,7 +61,7 @@ public QuarterLogBlock(Supplier<Block> stripped, MapColor color, Block.Settings
 	public static QuarterLogBlock of(MapColor color) {
 		return new QuarterLogBlock(
 				Block.Settings.of(
-						Material.WOOD,
+						Material.GENERIC,
 						color
 				).strength(2.0F).sounds(BlockSoundGroup.WOOD)
 		);
@@ -78,7 +78,7 @@ public static QuarterLogBlock of(MapColor color) {
 	public static QuarterLogBlock of(MapColor wood, MapColor bark) {
 		return new QuarterLogBlock(
 				Block.Settings.of(
-						Material.WOOD,
+						Material.GENERIC,
 						(state) ->
 							switch (state.get(PillarBlock.AXIS)) {
 								case Y -> wood;

diff --git a/...form-wood-api-v1/src/main/java/com/terraformersmc/terraform/wood/block/SmallLogBlock.java b/...form-wood-api-v1/src/main/java/com/terraformersmc/terraform/wood/block/SmallLogBlock.java
@@ -90,7 +90,7 @@ public SmallLogBlock(Block leaves, Supplier<Block> stripped, Settings settings)
 	public static SmallLogBlock of(Block leaves, MapColor color) {
 		return new SmallLogBlock(leaves,
 				Block.Settings.of(
-						Material.WOOD,
+						Material.GENERIC,
 						(state) -> state.get(HAS_LEAVES) ? leaves.getDefaultMapColor() : color
 				).strength(2.0F).sounds(BlockSoundGroup.WOOD)
 		);
@@ -108,7 +108,7 @@ public static SmallLogBlock of(Block leaves, MapColor color) {
 	public static SmallLogBlock of(Block leaves, MapColor wood, MapColor bark) {
 		return new SmallLogBlock(leaves,
 				Block.Settings.of(
-						Material.WOOD,
+						Material.GENERIC,
 						(state) -> state.get(HAS_LEAVES) ? leaves.getDefaultMapColor() :
 								state.get(UP) ? wood : bark
 				).strength(2.0F).sounds(BlockSoundGroup.WOOD)

diff --git a/...wood-api-v1/src/main/java/com/terraformersmc/terraform/wood/block/StrippableLogBlock.java b/...wood-api-v1/src/main/java/com/terraformersmc/terraform/wood/block/StrippableLogBlock.java
@@ -53,7 +53,7 @@ public StrippableLogBlock(Supplier<Block> stripped, MapColor top, Settings setti
 	public static PillarBlock of(MapColor color) {
 		return new PillarBlock(
 				Block.Settings.of(
-						Material.WOOD,
+						Material.GENERIC,
 						color
 				).strength(2.0F).sounds(BlockSoundGroup.WOOD)
 		);
@@ -69,7 +69,7 @@ public static PillarBlock of(MapColor color) {
 	public static PillarBlock of(MapColor wood, MapColor bark) {
 		return new PillarBlock(
 				Block.Settings.of(
-						Material.WOOD,
+						Material.GENERIC,
 						(state) -> Direction.Axis.Y.equals(state.get(PillarBlock.AXIS)) ? wood : bark
 				).strength(2.0F).sounds(BlockSoundGroup.WOOD)
 		);