From fa2469b034dca3c44494d1788080bfa181b936f3 Mon Sep 17 00:00:00 2001
From: drcrazy <hcb@wowhcb.ru>
Date: Sat, 19 Jun 2021 02:47:14 +0300
Subject: [PATCH] Fix crash with casing loading. Closes #2410

---
 .../java/reborncore/common/multiblock/IMultiblockPart.java   | 2 --
 .../common/multiblock/MultiblockBlockEntityBase.java         | 5 -----
 src/main/java/techreborn/init/TRContent.java                 | 4 +++-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/RebornCore/src/main/java/reborncore/common/multiblock/IMultiblockPart.java b/RebornCore/src/main/java/reborncore/common/multiblock/IMultiblockPart.java
index 7e81ab8cb..2a6c200c2 100644
--- a/RebornCore/src/main/java/reborncore/common/multiblock/IMultiblockPart.java
+++ b/RebornCore/src/main/java/reborncore/common/multiblock/IMultiblockPart.java
@@ -255,8 +255,6 @@ public abstract class IMultiblockPart extends BlockEntity {
 	 */
 	public abstract void onMultiblockDataAssimilated();
 
-	public abstract BlockState getCachedState();
-
 	public boolean isInvalid() {
 		return false;
 	}
diff --git a/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockBlockEntityBase.java b/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockBlockEntityBase.java
index f8c915121..80bd4b80a 100644
--- a/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockBlockEntityBase.java
+++ b/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockBlockEntityBase.java
@@ -361,9 +361,4 @@ public abstract class MultiblockBlockEntityBase extends IMultiblockPart implemen
 		// Clean part out of lists in the registry
 		MultiblockRegistry.onPartRemovedFromWorld(getWorld(), this);
 	}
-
-	@Override
-	public BlockState getCachedState() {
-		return world.getBlockState(pos);
-	}
 }
diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java
index 6d9694051..96cc5fe00 100644
--- a/src/main/java/techreborn/init/TRContent.java
+++ b/src/main/java/techreborn/init/TRContent.java
@@ -496,7 +496,9 @@ public class TRContent {
 		}
 
 		public static ItemConvertible[] getCasings() {
-			return Arrays.stream(MachineBlocks.values()).map((Function<MachineBlocks, ItemConvertible>) machineBlocks -> () -> Item.fromBlock(machineBlocks.casing)).toArray(ItemConvertible[]::new);
+			return Arrays.stream(MachineBlocks.values())
+					.map((Function<MachineBlocks, ItemConvertible>) machineBlocks -> () -> machineBlocks.casing.asItem())
+					.toArray(ItemConvertible[]::new);
 		}
 	}