Fix some block entity being lost on 1.21.1 update

Patbox · Aug 9, 2024 · 58ff0d2 · 58ff0d2
1 parent 4386b22
commit 58ff0d2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ org.gradle.parallel=true
 	loader_version=0.15.11
 
 # Mod Properties
-	mod_version = 0.4.0-pre.5
+	mod_version = 0.4.0-pre.5.1
 	maven_group = eu.pb4
 	archives_base_name = polyfactory
 

diff --git a/src/main/java/eu/pb4/polyfactory/block/FactoryBlockEntities.java b/src/main/java/eu/pb4/polyfactory/block/FactoryBlockEntities.java
@@ -97,13 +97,13 @@ public class FactoryBlockEntities {
             FabricBlockEntityTypeBuilder.create(CreativeMotorBlockEntity::new).addBlock(FactoryBlocks.CREATIVE_MOTOR));
     public static final BlockEntityType<ChanneledDataBlockEntity> PROVIDER_DATA_CACHE = register("provider_data_cache", FabricBlockEntityTypeBuilder
             .create(ChanneledDataBlockEntity::new).addBlocks(FactoryBlocks.ITEM_COUNTER, FactoryBlocks.REDSTONE_INPUT, FactoryBlocks.REDSTONE_OUTPUT,
-                    FactoryBlocks.TACHOMETER, FactoryBlocks.STRESSOMETER));
+                    FactoryBlocks.TACHOMETER, FactoryBlocks.STRESSOMETER, FactoryBlocks.BLOCK_OBSERVER, FactoryBlocks.DATA_MEMORY));
 
     public static final BlockEntityType<HologramProjectorBlockEntity> HOLOGRAM_PROJECTOR = register("hologram_projector", FabricBlockEntityTypeBuilder
             .create(HologramProjectorBlockEntity::new).addBlocks(FactoryBlocks.HOLOGRAM_PROJECTOR));
 
     public static final BlockEntityType<WirelessRedstoneBlockEntity> WIRELESS_REDSTONE = register("wireless_redstone", FabricBlockEntityTypeBuilder
-            .create(WirelessRedstoneBlockEntity::new).addBlock(FactoryBlocks.WIRELESS_REDSTONE_RECEIVER));
+            .create(WirelessRedstoneBlockEntity::new).addBlocks(FactoryBlocks.WIRELESS_REDSTONE_RECEIVER, FactoryBlocks.WIRELESS_REDSTONE_TRANSMITTER));
     public static final BlockEntityType<CableBlockEntity> CABLE = register("cable", FabricBlockEntityTypeBuilder
             .create(CableBlockEntity::new).addBlock(FactoryBlocks.CABLE));
     public static final BlockEntityType<ItemReaderBlockEntity> ITEM_READER = register("item_reader", FabricBlockEntityTypeBuilder

diff --git a/src/main/java/eu/pb4/polyfactory/block/FactoryBlocks.java b/src/main/java/eu/pb4/polyfactory/block/FactoryBlocks.java
@@ -36,6 +36,7 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.state.property.Properties;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.math.BlockPos;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -127,6 +128,13 @@ private static void validateLootTables(MinecraftServer server) {
             if (lt == LootTable.EMPTY) {
                 ModInit.LOGGER.warn("Missing loot table? " + block.getLootTableKey().getValue());
             }
+
+            if (block instanceof BlockEntityProvider provider) {
+                var be = provider.createBlockEntity(BlockPos.ORIGIN, block.getDefaultState());
+                if (be != null && !be.getType().supports(block.getDefaultState())) {
+                    ModInit.LOGGER.warn("Unsupported BE!!!! {} | {}", Registries.BLOCK.getId(block), Registries.BLOCK_ENTITY_TYPE.getId(be.getType()));
+                }
+            }
         }
     }