From daefcc4dbfa7957245e92388eae89ec6f540aae2 Mon Sep 17 00:00:00 2001
From: Aleksey <bulldog.seregin@gmail.com>
Date: Sun, 27 Jun 2021 17:30:15 +0300
Subject: [PATCH] Fix #216 and #217

---
 build.gradle                                                | 6 +++++-
 gradle.properties                                           | 2 +-
 src/main/java/ru/betterend/blocks/EndStoneSmelter.java      | 4 ++--
 .../blocks/entities/EndStoneSmelterBlockEntity.java         | 6 +++---
 src/main/resources/fabric.mod.json                          | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 83414897..4411ad02 100644
--- a/build.gradle
+++ b/build.gradle
@@ -70,12 +70,16 @@ def useApi(String dep) {
 
 processResources {
 	inputs.property "version", project.version
-	duplicatesStrategy = 'WARN'
+	duplicatesStrategy = 'EXCLUDE'
 
 	from(sourceSets.main.resources.srcDirs) {
 		include "fabric.mod.json"
 		expand "version": project.version
 	}
+
+	from(sourceSets.main.resources.srcDirs) {
+		exclude "fabric.mod.json"
+	}
 }
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is
diff --git a/gradle.properties b/gradle.properties
index 7c15972e..5f798ac2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,5 +17,5 @@ archives_base_name = better-end
 patchouli_version = 50-FABRIC
 fabric_version = 0.32.9+1.16
 canvas_version = 1.0.+
-bclib_version = 0.1.42
+bclib_version = 0.1.44
 rei_version = 5.8.10
\ No newline at end of file
diff --git a/src/main/java/ru/betterend/blocks/EndStoneSmelter.java b/src/main/java/ru/betterend/blocks/EndStoneSmelter.java
index 46e17878..2cf18798 100644
--- a/src/main/java/ru/betterend/blocks/EndStoneSmelter.java
+++ b/src/main/java/ru/betterend/blocks/EndStoneSmelter.java
@@ -52,7 +52,7 @@ public class EndStoneSmelter extends BaseBlockWithEntity {
 				.resistance(100F)
 				.requiresCorrectToolForDrops()
 				.sound(SoundType.STONE));
-		this.registerDefaultState(this.stateDefinition.any()
+		registerDefaultState(this.stateDefinition.any()
 											  .setValue(FACING, Direction.NORTH)
 											  .setValue(LIT, false));
 	}
@@ -75,7 +75,7 @@ public class EndStoneSmelter extends BaseBlockWithEntity {
 	
 	@Override
 	public BlockState getStateForPlacement(BlockPlaceContext ctx) {
-		return this.defaultBlockState().setValue(FACING, ctx.getHorizontalDirection().getOpposite());
+		return defaultBlockState().setValue(FACING, ctx.getHorizontalDirection().getOpposite());
 	}
 	
 	@Override
diff --git a/src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java b/src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java
index 49516b35..27c54ef4 100644
--- a/src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java
+++ b/src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java
@@ -246,7 +246,7 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 				if (recipe == null) {
 					recipe = level.getRecipeManager().getRecipeFor(RecipeType.BLASTING, this, level).orElse(null);
 				}
-				boolean accepted = this.canAcceptRecipeOutput(recipe);
+				boolean accepted = canAcceptRecipeOutput(recipe);
 				if (!burning && accepted) {
 					burnTime = getFuelTime(fuel);
 					fuelTime = burnTime;
@@ -265,7 +265,7 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 				}
 
 				if (burning && accepted) {
-					this.smeltTime++;
+					smeltTime++;
 					if (smeltTime == smeltTimeTotal) {
 						smeltTime = 0;
 						smeltTimeTotal = getSmeltTime();
@@ -276,7 +276,7 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 					smeltTime = 0;
 				}
 			}
-
+			burning = isBurning();
 			if (initialBurning != burning) {
 				level.setBlock(worldPosition, level.getBlockState(worldPosition).setValue(EndStoneSmelter.LIT, burning), 3);
 				setChanged();
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 90a89ea6..6e5c72a4 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -46,7 +46,7 @@
 		"fabricloader": ">=0.11.0",
 		"fabric": ">=0.32.0",
 		"minecraft": ">=1.16.4",
-	  	"bclib": ">=0.1.42"
+	  	"bclib": ">=0.1.44"
 	},
 	"suggests": {
 		"byg": ">=1.1.3",