fix registry freezing crash

bump version
St-ructure-Mods · Mar 9, 2022 · 857cd79 · 857cd79
1 parent 81e4da6
commit 857cd79
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ minecraft_version   = 1.18.2
 loader_version      = 0.13.3
 
 # Mod properties
-mod_version         = 1.0.20
+mod_version         = 1.0.21
 maven_group         = io.github.projectet.buildinggadgets-fabric
 archives_base_name  = structure-tools
 

diff --git a/src/main/java/com/direwolf20/buildinggadgets/common/BuildingGadgets.java b/src/main/java/com/direwolf20/buildinggadgets/common/BuildingGadgets.java
@@ -9,17 +9,21 @@
 import com.direwolf20.buildinggadgets.common.compat.FTBChunksCompat;
 import com.direwolf20.buildinggadgets.common.compat.GOMLCompat;
 import com.direwolf20.buildinggadgets.common.config.Config;
+import com.direwolf20.buildinggadgets.common.containers.OurContainers;
+import com.direwolf20.buildinggadgets.common.containers.TemplateManagerContainer;
 import com.direwolf20.buildinggadgets.common.enchants.GadgetSilkTouch;
 import com.direwolf20.buildinggadgets.common.items.GadgetExchanger;
 import com.direwolf20.buildinggadgets.common.items.OurItems;
 import com.direwolf20.buildinggadgets.common.network.PacketHandler;
 import com.direwolf20.buildinggadgets.common.tainted.registry.Registries;
+import com.direwolf20.buildinggadgets.common.tileentities.OurTileEntities;
 import com.direwolf20.buildinggadgets.common.util.ref.Reference;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
+import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.commands.Commands;
 import net.minecraft.core.Registry;
@@ -74,6 +78,8 @@ public void onInitialize() {
         Registries.registerTileDataSerializers();
         PacketHandler.registerMessages();
         OurSounds.initSounds();
+        OurTileEntities.initBE();
+        OurContainers.TEMPLATE_MANAGER_CONTAINER_TYPE = ScreenHandlerRegistry.registerExtended(BuildingGadgets.id("template_manager_container"), TemplateManagerContainer::new);
 
         Registry.register(Registry.ENCHANTMENT, id("silk_touch"), GadgetSilkTouch.GADGET_SILKTOUCH);
 

diff --git a/src/main/java/com/direwolf20/buildinggadgets/common/containers/OurContainers.java b/src/main/java/com/direwolf20/buildinggadgets/common/containers/OurContainers.java
@@ -5,5 +5,5 @@
 import net.minecraft.world.inventory.MenuType;
 
 public final class OurContainers {
-    public static final MenuType<TemplateManagerContainer> TEMPLATE_MANAGER_CONTAINER_TYPE = ScreenHandlerRegistry.registerExtended(BuildingGadgets.id("template_manager_container"), TemplateManagerContainer::new);
+    public static MenuType<TemplateManagerContainer> TEMPLATE_MANAGER_CONTAINER_TYPE;
 }
diff --git a/src/main/java/com/direwolf20/buildinggadgets/common/items/AbstractGadget.java b/src/main/java/com/direwolf20/buildinggadgets/common/items/AbstractGadget.java
@@ -20,7 +20,6 @@
 import com.direwolf20.buildinggadgets.common.util.ref.NBTKeys;
 import com.google.common.collect.ImmutableSortedSet;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Holder;
 import net.minecraft.core.NonNullList;
 import net.minecraft.core.Registry;
 import net.minecraft.nbt.CompoundTag;

diff --git a/src/main/java/com/direwolf20/buildinggadgets/common/tileentities/OurTileEntities.java b/src/main/java/com/direwolf20/buildinggadgets/common/tileentities/OurTileEntities.java
@@ -7,6 +7,11 @@
 import net.minecraft.world.level.block.entity.BlockEntityType;
 
 public final class OurTileEntities {
-    public static final BlockEntityType<EffectBlockTileEntity> EFFECT_BLOCK_TILE_ENTITY = Registry.register(Registry.BLOCK_ENTITY_TYPE, BuildingGadgets.id("effect_block_tile"), FabricBlockEntityTypeBuilder.create(EffectBlockTileEntity::new, OurBlocks.EFFECT_BLOCK).build());
-    public static final BlockEntityType<TemplateManagerTileEntity> TEMPLATE_MANAGER_TILE_ENTITY = Registry.register(Registry.BLOCK_ENTITY_TYPE, BuildingGadgets.id("template_manager_tile"), FabricBlockEntityTypeBuilder.create(TemplateManagerTileEntity::new, OurBlocks.TEMPLATE_MANGER_BLOCK).build());
+    public static BlockEntityType<EffectBlockTileEntity> EFFECT_BLOCK_TILE_ENTITY;
+    public static BlockEntityType<TemplateManagerTileEntity> TEMPLATE_MANAGER_TILE_ENTITY;
+
+    public static void initBE() {
+        EFFECT_BLOCK_TILE_ENTITY = Registry.register(Registry.BLOCK_ENTITY_TYPE, BuildingGadgets.id("effect_block_tile"), FabricBlockEntityTypeBuilder.create(EffectBlockTileEntity::new, OurBlocks.EFFECT_BLOCK).build());
+        TEMPLATE_MANAGER_TILE_ENTITY = Registry.register(Registry.BLOCK_ENTITY_TYPE, BuildingGadgets.id("template_manager_tile"), FabricBlockEntityTypeBuilder.create(TemplateManagerTileEntity::new, OurBlocks.TEMPLATE_MANGER_BLOCK).build());
+    }
 }