package info.u_team.u_team_test.init;

import info.u_team.u_team_core.containertype.UContainerType;
import info.u_team.u_team_core.util.registry.BaseRegistryUtil;
import info.u_team.u_team_test.TestMod;
import info.u_team.u_team_test.container.*;
import net.minecraft.inventory.container.ContainerType;
import net.minecraftforge.event.RegistryEvent.Register;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;

@EventBusSubscriber(modid = TestMod.MODID, bus = Bus.MOD)
public class TestContainers {
	
	public static final ContainerType<BasicTileEntityContainer> BASIC = new UContainerType<>("basic", BasicTileEntityContainer::new);
	
	public static final ContainerType<BasicEnergyCreatorContainer> BASIC_ENERGY_CREATOR = new UContainerType<>("energy_creator", BasicEnergyCreatorContainer::new);
	
	public static final ContainerType<BasicFluidInventoryContainer> BASIC_FLUID_INVENTORY = new UContainerType<>("fluid_inventory", BasicFluidInventoryContainer::new);
	
	@SubscribeEvent
	public static void register(Register<ContainerType<?>> event) {
		BaseRegistryUtil.getAllGenericRegistryEntriesAndApplyNames(TestMod.MODID, ContainerType.class).forEach(event.getRegistry()::register);
	}
}

@@ -97,71 +97,8 @@
 pe;%0A
-import info.u_team.u_team_core.util.registry.BaseRegistryUtil;%0A
 impo
@@ -133,16 +133,16 @@
 estMod;%0A
+
 import i
@@ -237,64 +237,8 @@
 pe;%0A
-import net.minecraftforge.event.RegistryEvent.Register;%0A
 impo
@@ -272,30 +272,25 @@
 bus.api.
-Subscribe
+I
 Event
+Bus
 ;%0Aimport
@@ -408,16 +408,56 @@
 ber.Bus;
+%0Aimport net.minecraftforge.registries.*;
 %0A%0A@Event
@@ -540,16 +540,160 @@
 ers %7B%0A%09%0A
+%09public static final DeferredRegister%3CContainerType%3C?%3E%3E CONTAINER_TYPES = DeferredRegister.create(ForgeRegistries.CONTAINERS, TestMod.MODID);%0A%09%0A
 %09public 
@@ -1151,25 +1151,8 @@
 ;%0A%09%0A
-%09@SubscribeEvent%0A
 %09pub
@@ -1180,178 +1180,55 @@
 ter(
-Register%3CContainerType%3C?%3E%3E event) %7B%0A%09%09BaseRegistryUtil.getAllGenericRegistryEntriesAndApplyNames(TestMod.MODID, ContainerType.class).forEach(event.getRegistry()::register
+IEventBus bus) %7B%0A%09%09CONTAINER_TYPES.register(bus
 );%0A%09

Add some methods to the container for migration