Author:
Committer:
Parent: 728b4857c3fd432ffc136fcc3febb8b54f1ccdc2 (Fix misobfed methods due to mapping conflict.)
Branch:
Follows:
Precedes:

    Local uncommitted changes, not checked in to index

------ patches/minecraft/net/minecraft/util/registry/Registry.java.patch ------
index 29159a6c9..75078f912 100644
@@ -69,6 +69,15 @@
        return DimensionType.OVERWORLD;
     });
     public static final DefaultedRegistry<PaintingType> field_212620_i = func_222933_a("motive", "kebab", () -> {
+@@ -148,7 +152,7 @@
+    public static final Registry<IJigsawDeserializer> field_218365_F = func_222935_a("structure_pool_element", () -> {
+       return IJigsawDeserializer.field_214931_e;
+    });
+-   public static final Registry<ContainerType<?>> field_218366_G = func_222935_a("menu", () -> {
++   public static final Registry<ContainerType<?>> field_218366_G = forge("menu", ContainerType.class, () -> {
+       return ContainerType.field_221514_h;
+    });
+    public static final Registry<IRecipeType<?>> field_218367_H = func_222935_a("recipe_type", () -> {
 @@ -230,6 +234,14 @@
        return ((MutableRegistry<T>)p_218343_0_).func_218382_a(p_218343_1_, new ResourceLocation(p_218343_2_), p_218343_3_);
     }

------- src/main/java/net/minecraftforge/registries/ForgeRegistries.java -------
index 76d4ab3b4..12d378669 100644
@@ -22,6 +22,7 @@ package net.minecraftforge.registries;
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.EntityType;
+import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.util.registry.Bootstrap;
 import net.minecraft.item.Item;
 import net.minecraft.potion.Effect;
@@ -48,8 +49,9 @@ public class ForgeRegistries
     public static final IForgeRegistry<SoundEvent>          SOUND_EVENTS = RegistryManager.ACTIVE.getRegistry(SoundEvent.class);
     public static final IForgeRegistry<Potion>              POTION_TYPES = RegistryManager.ACTIVE.getRegistry(Potion.class);
     public static final IForgeRegistry<Enchantment>         ENCHANTMENTS = RegistryManager.ACTIVE.getRegistry(Enchantment.class);
-    public static final IForgeRegistry<EntityType<?>>       ENTITIES       = RegistryManager.ACTIVE.getRegistry(EntityType.class); //Untyped casys needed to fix javac issues.
+    public static final IForgeRegistry<EntityType<?>>       ENTITIES       = RegistryManager.ACTIVE.getRegistry(EntityType.class);
     public static final IForgeRegistry<TileEntityType<?>>   TILE_ENTITIES  = RegistryManager.ACTIVE.getRegistry(TileEntityType.class);
+    public static final IForgeRegistry<ContainerType<?>>    CONTAINERS     = RegistryManager.ACTIVE.getRegistry(ContainerType.class);
     public static final IForgeRegistry<ModDimension>        MOD_DIMENSIONS = RegistryManager.ACTIVE.getRegistry(ModDimension.class);
     public static final IForgeRegistry<DataSerializerEntry> DATA_SERIALIZERS = RegistryManager.ACTIVE.getRegistry(DataSerializerEntry.class);


---------- src/main/java/net/minecraftforge/registries/GameData.java ----------
index be281df25..524ac0a24 100644
@@ -26,6 +26,7 @@ import net.minecraft.block.material.Material;
 import net.minecraft.block.BlockState;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.EntityType;
+import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.item.Item;
 import net.minecraft.item.BlockItem;
 import net.minecraft.network.datasync.IDataSerializer;
@@ -88,6 +89,7 @@ public class GameData
     public static final ResourceLocation ENCHANTMENTS = new ResourceLocation("minecraft:enchantments");
     public static final ResourceLocation ENTITIES     = new ResourceLocation("minecraft:entities");
     public static final ResourceLocation TILEENTITIES = new ResourceLocation("minecraft:tileentities");
+    public static final ResourceLocation CONTAINERS   = new ResourceLocation("minecraft:containers");
     public static final ResourceLocation PROFESSIONS  = new ResourceLocation("minecraft:villagerprofessions");
     public static final ResourceLocation MODDIMENSIONS = new ResourceLocation("forge:moddimensions");
     public static final ResourceLocation SERIALIZERS  = new ResourceLocation("minecraft:dataserializers");
@@ -126,6 +128,7 @@ public class GameData
         makeRegistry(ENCHANTMENTS, Enchantment.class   ).create();
         makeRegistry(ENTITIES,     EntityType.class,   new ResourceLocation("pig")).create();
         makeRegistry(TILEENTITIES, TileEntityType.class).disableSaving().create();
+        makeRegistry(CONTAINERS,   ContainerType.class).disableSaving().create();
         makeRegistry(MODDIMENSIONS, ModDimension.class ).disableSaving().create();
         makeRegistry(SERIALIZERS,  DataSerializerEntry.class, 256 /*vanilla space*/, MAX_VARINT).disableSaving().disableOverrides().addCallback(SerializerCallbacks.INSTANCE).create();
     }