Merge pull request #933 from Evoloxi/1.21.1

Fixed the Liquid Blaze Burner not correctly displaying its heat state or providing heat to basins above it

Author: mrh0

src/main/java/com/mrh0/createaddition/CreateAddition.java

@@ -159,7 +159,7 @@ public void postInit(FMLLoadCompleteEvent evt) {
         //Network.registerMessage(1, EnergyNetworkPacket.class, EnergyNetworkPacket::encode, EnergyNetworkPacket::decode, EnergyNetworkPacket::handle);
 
         BoilerHeater.REGISTRY.register(CABlocks.LIQUID_BLAZE_BURNER.get(), (level, pos, state) -> {
-            BlazeBurnerBlock.HeatLevel value = state.getValue(LiquidBlazeBurnerBlock.HEAT_LEVEL);
+            BlazeBurnerBlock.HeatLevel value = state.getValue(BlazeBurnerBlock.HEAT_LEVEL);
             if (value == BlazeBurnerBlock.HeatLevel.NONE) return -1;
             if (value == BlazeBurnerBlock.HeatLevel.SEETHING) return 2;
             if (value.isAtLeast(BlazeBurnerBlock.HeatLevel.FADING)) return 1;

src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlock.java

@@ -41,9 +41,9 @@
 import net.neoforged.api.distmarker.OnlyIn;
 import net.neoforged.neoforge.common.util.FakePlayer;
 
-public class LiquidBlazeBurnerBlock extends HorizontalDirectionalBlock implements IBE<LiquidBlazeBurnerBlockEntity>, IWrenchable {
+import static com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HEAT_LEVEL;
 
-	public static final EnumProperty<BlazeBurnerBlock.HeatLevel> HEAT_LEVEL = EnumProperty.create("blaze", BlazeBurnerBlock.HeatLevel.class);
+public class LiquidBlazeBurnerBlock extends HorizontalDirectionalBlock implements IBE<LiquidBlazeBurnerBlockEntity>, IWrenchable {
 
 	public LiquidBlazeBurnerBlock(Properties properties) {
 		super(properties);

src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java

@@ -51,6 +51,8 @@
 import net.neoforged.neoforge.fluids.capability.templates.FluidTank;
 import org.jetbrains.annotations.Nullable;
 
+import static com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HEAT_LEVEL;
+
 public class LiquidBlazeBurnerBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation, IObserveTileEntity {
 	public static final int MAX_HEAT_CAPACITY = 10000;
 
@@ -288,7 +290,7 @@ protected void read(CompoundTag tag, HolderLookup.Provider registries, boolean c
 	}
 
 	public BlazeBurnerBlock.HeatLevel getHeatLevelFromBlock() {
-		return BlazeBurnerBlock.getHeatLevelOf(getBlockState());
+		return LiquidBlazeBurnerBlock.getHeatLevelOf(getBlockState());
 	}
 
 	public void updateBlockState() {
@@ -299,7 +301,7 @@ protected void setBlockHeat(BlazeBurnerBlock.HeatLevel heat) {
 		if (level == null) return;
 		BlazeBurnerBlock.HeatLevel inBlockState = getHeatLevelFromBlock();
 		if (inBlockState == heat) return;
-		level.setBlockAndUpdate(worldPosition, getBlockState().setValue(LiquidBlazeBurnerBlock.HEAT_LEVEL, heat));
+		level.setBlockAndUpdate(worldPosition, getBlockState().setValue(HEAT_LEVEL, heat));
 		notifyUpdate();
 	}
 

src/main/java/com/mrh0/createaddition/event/GameEvents.java

@@ -66,7 +66,7 @@ public static void interact(PlayerInteractEvent.RightClickBlock evt) {
 			if(evt.getItemStack().getItem() == CAItems.STRAW.get() && evt.getLevel().getBlockEntity(evt.getPos()) instanceof BlazeBurnerBlockEntity) {
 				if(state.is(AllBlocks.BLAZE_BURNER.get())) {
 					BlockState newState = CABlocks.LIQUID_BLAZE_BURNER.getDefaultState()
-							.setValue(LiquidBlazeBurnerBlock.HEAT_LEVEL, BlazeBurnerBlock.HeatLevel.SMOULDERING/*state.getValue(BlazeBurnerBlock.HEAT_LEVEL)*/)
+							.setValue(BlazeBurnerBlock.HEAT_LEVEL, BlazeBurnerBlock.HeatLevel.SMOULDERING/*state.getValue(BlazeBurnerBlock.HEAT_LEVEL)*/)
 							.setValue(LiquidBlazeBurnerBlock.FACING, state.getValue(BlazeBurnerBlock.FACING));
 					evt.getLevel().setBlockAndUpdate(evt.getPos(), newState);
 					if(!evt.getEntity().isCreative())

src/main/java/com/mrh0/createaddition/ponder/PonderScenes.java

@@ -2,7 +2,6 @@
 
 import com.mrh0.createaddition.blocks.connector.base.AbstractConnectorBlock;
 import com.mrh0.createaddition.blocks.connector.base.ConnectorMode;
-import com.mrh0.createaddition.blocks.liquid_blaze_burner.LiquidBlazeBurnerBlock;
 import com.mrh0.createaddition.blocks.portable_energy_interface.PortableEnergyInterfaceBlockEntity;
 import com.mrh0.createaddition.blocks.tesla_coil.TeslaCoilBlock;
 import com.mrh0.createaddition.index.CABlocks;
@@ -345,7 +344,7 @@ public static void liquidBlazeBurner(SceneBuilder builder, SceneBuildingUtil uti
 		scene.overlay().showControls(util.vector().topOf(burner), Pointing.DOWN, 40)
 				.rightClick()
 				.withItem(new ItemStack(CAItems.STRAW.get()));
-		scene.world().setBlock(burner, CABlocks.LIQUID_BLAZE_BURNER.getDefaultState().setValue(LiquidBlazeBurnerBlock.HEAT_LEVEL, BlazeBurnerBlock.HeatLevel.SMOULDERING), false);
+		scene.world().setBlock(burner, CABlocks.LIQUID_BLAZE_BURNER.getDefaultState().setValue(BlazeBurnerBlock.HEAT_LEVEL, BlazeBurnerBlock.HeatLevel.SMOULDERING), false);
 		scene.idle(60);
 		scene.overlay().showText(50)
 			.attachKeyFrame()