Allow specifying wood types for Terraform signs

Fixes #75
TerraformersMC · Aug 2, 2024 · 4c2d3ed · 4c2d3ed
1 parent 0d569eb
commit 4c2d3ed
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/.../src/main/java/com/terraformersmc/terraform/sign/api/block/TerraformHangingSignBlock.java b/.../src/main/java/com/terraformersmc/terraform/sign/api/block/TerraformHangingSignBlock.java
@@ -11,12 +11,16 @@ public class TerraformHangingSignBlock extends HangingSignBlock implements Terra
 	private final Identifier texture;
 	private final Identifier guiTexture;
 
-	public TerraformHangingSignBlock(Identifier texture, Identifier guiTexture, Settings settings) {
-		super(WoodType.OAK, BlockSettingsLock.lock(settings));
+	public TerraformHangingSignBlock(Identifier texture, Identifier guiTexture, WoodType woodType, Settings settings) {
+		super(woodType, BlockSettingsLock.lock(settings));
 		this.texture = texture;
 		this.guiTexture = guiTexture;
 	}
 
+	public TerraformHangingSignBlock(Identifier texture, Identifier guiTexture, Settings settings) {
+		this(texture, guiTexture, WoodType.OAK, settings);
+	}
+
 	@Override
 	public Identifier getTexture() {
 		return texture;

diff --git a/...-api-v1/src/main/java/com/terraformersmc/terraform/sign/api/block/TerraformSignBlock.java b/...-api-v1/src/main/java/com/terraformersmc/terraform/sign/api/block/TerraformSignBlock.java
@@ -10,11 +10,15 @@
 public class TerraformSignBlock extends SignBlock implements TerraformSign {
 	private final Identifier texture;
 
-	public TerraformSignBlock(Identifier texture, Settings settings) {
-		super(WoodType.OAK, BlockSettingsLock.lock(settings));
+	public TerraformSignBlock(Identifier texture, WoodType woodType, Settings settings) {
+		super(woodType, BlockSettingsLock.lock(settings));
 		this.texture = texture;
 	}
 
+	public TerraformSignBlock(Identifier texture, Settings settings) {
+		this(texture, WoodType.OAK, settings);
+	}
+
 	@Override
 	public Identifier getTexture() {
 		return texture;

diff --git a/.../main/java/com/terraformersmc/terraform/sign/api/block/TerraformWallHangingSignBlock.java b/.../main/java/com/terraformersmc/terraform/sign/api/block/TerraformWallHangingSignBlock.java
@@ -11,12 +11,16 @@ public class TerraformWallHangingSignBlock extends WallHangingSignBlock implemen
 	private final Identifier texture;
 	private final Identifier guiTexture;
 
-	public TerraformWallHangingSignBlock(Identifier texture, Identifier guiTexture, Settings settings) {
-		super(WoodType.OAK, BlockSettingsLock.lock(settings));
+	public TerraformWallHangingSignBlock(Identifier texture, Identifier guiTexture, WoodType woodType, Settings settings) {
+		super(woodType, BlockSettingsLock.lock(settings));
 		this.texture = texture;
 		this.guiTexture = guiTexture;
 	}
 
+	public TerraformWallHangingSignBlock(Identifier texture, Identifier guiTexture, Settings settings) {
+		this(texture, guiTexture, WoodType.OAK, settings);
+	}
+
 	@Override
 	public Identifier getTexture() {
 		return texture;

diff --git a/...-v1/src/main/java/com/terraformersmc/terraform/sign/api/block/TerraformWallSignBlock.java b/...-v1/src/main/java/com/terraformersmc/terraform/sign/api/block/TerraformWallSignBlock.java
@@ -10,11 +10,15 @@
 public class TerraformWallSignBlock extends WallSignBlock implements TerraformSign {
 	private final Identifier texture;
 
-	public TerraformWallSignBlock(Identifier texture, Settings settings) {
-		super(WoodType.OAK, BlockSettingsLock.lock(settings)); // TODO: take a look at this again
+	public TerraformWallSignBlock(Identifier texture, WoodType woodType, Settings settings) {
+		super(woodType, BlockSettingsLock.lock(settings));
 		this.texture = texture;
 	}
 
+	public TerraformWallSignBlock(Identifier texture, Settings settings) {
+		this(texture, WoodType.OAK, settings);
+	}
+
 	@Override
 	public Identifier getTexture() {
 		return texture;