From 03d19f2e70e21c15c24eb54140afa70dc1fd6152 Mon Sep 17 00:00:00 2001 From: cpw Date: Sun, 16 Sep 2018 22:27:08 -0400 Subject: [PATCH] Tweak to remove javac compile errors related to generics on registries. Also remove the recipes registry call - they're gone from registries completely. --- patches/minecraft/net/minecraft/entity/EntityType.java.patch | 4 ++-- .../net/minecraft/tileentity/TileEntityType.java.patch | 4 ++-- src/main/java/net/minecraftforge/fml/ModLoader.java | 1 - .../java/net/minecraftforge/registries/ForgeRegistries.java | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/patches/minecraft/net/minecraft/entity/EntityType.java.patch b/patches/minecraft/net/minecraft/entity/EntityType.java.patch index 72c9964563..503cea7e13 100644 --- a/patches/minecraft/net/minecraft/entity/EntityType.java.patch +++ b/patches/minecraft/net/minecraft/entity/EntityType.java.patch @@ -13,10 +13,10 @@ import org.apache.logging.log4j.Logger; -public class EntityType { -+public class EntityType extends net.minecraftforge.registries.ForgeRegistryEntry> { ++public class EntityType extends net.minecraftforge.registries.ForgeRegistryEntry> { private static final Logger field_200731_aJ = LogManager.getLogger(); - public static final RegistryNamespaced> field_200787_a = new RegistryNamespaced>(); -+ public static final RegistryNamespaced> field_200787_a = net.minecraftforge.registries.GameData.getWrapper(EntityType.class); ++ public static final RegistryNamespaced> field_200787_a = (RegistryNamespaced)net.minecraftforge.registries.GameData.getWrapper(EntityType.class); public static final EntityType field_200788_b = func_200712_a("area_effect_cloud", EntityType.Builder.func_201757_a(EntityAreaEffectCloud.class, EntityAreaEffectCloud::new)); public static final EntityType field_200789_c = func_200712_a("armor_stand", EntityType.Builder.func_201757_a(EntityArmorStand.class, EntityArmorStand::new)); public static final EntityType field_200790_d = func_200712_a("arrow", EntityType.Builder.func_201757_a(EntityTippedArrow.class, EntityTippedArrow::new)); diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityType.java.patch b/patches/minecraft/net/minecraft/tileentity/TileEntityType.java.patch index 761d0df6e8..08a57d959f 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityType.java.patch +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityType.java.patch @@ -5,10 +5,10 @@ import org.apache.logging.log4j.Logger; -public class TileEntityType { -+public class TileEntityType extends net.minecraftforge.registries.ForgeRegistryEntry> { ++public class TileEntityType extends net.minecraftforge.registries.ForgeRegistryEntry> { private static final Logger field_206866_A = LogManager.getLogger(); - public static final RegistryNamespaced> field_200970_a = new RegistryNamespaced>(); -+ public static final RegistryNamespaced> field_200970_a = net.minecraftforge.registries.GameData.getWrapper(TileEntityType.class); ++ public static final RegistryNamespaced> field_200970_a = (RegistryNamespaced)net.minecraftforge.registries.GameData.getWrapper(TileEntityType.class); public static final TileEntityType field_200971_b = func_200966_a("furnace", TileEntityType.Builder.func_200963_a(TileEntityFurnace::new)); public static final TileEntityType field_200972_c = func_200966_a("chest", TileEntityType.Builder.func_200963_a(TileEntityChest::new)); public static final TileEntityType field_200973_d = func_200966_a("trapped_chest", TileEntityType.Builder.func_200963_a(TileEntityTrappedChest::new)); diff --git a/src/main/java/net/minecraftforge/fml/ModLoader.java b/src/main/java/net/minecraftforge/fml/ModLoader.java index 01a837e4b7..a8fbb99f3d 100644 --- a/src/main/java/net/minecraftforge/fml/ModLoader.java +++ b/src/main/java/net/minecraftforge/fml/ModLoader.java @@ -96,7 +96,6 @@ public class ModLoader GameData.fireCreateRegistryEvents(); CapabilityManager.INSTANCE.injectCapabilities(modList.getAllScanData()); LifecycleEventProvider.PREINIT.dispatch(); - GameData.fireRegistryEvents(rl -> !Objects.equals(rl, GameData.RECIPES)); Boolean result = DistExecutor.callWhenOn(Dist.CLIENT, ModLoader::fireClientEvents); LifecycleEventProvider.SIDEDINIT.dispatch(); } diff --git a/src/main/java/net/minecraftforge/registries/ForgeRegistries.java b/src/main/java/net/minecraftforge/registries/ForgeRegistries.java index 3dbe325b2b..c7601cdd57 100644 --- a/src/main/java/net/minecraftforge/registries/ForgeRegistries.java +++ b/src/main/java/net/minecraftforge/registries/ForgeRegistries.java @@ -52,8 +52,8 @@ public class ForgeRegistries public static final IForgeRegistry POTION_TYPES = RegistryManager.ACTIVE.getRegistry(PotionType.class); public static final IForgeRegistry ENCHANTMENTS = RegistryManager.ACTIVE.getRegistry(Enchantment.class); public static final IForgeRegistry VILLAGER_PROFESSIONS = RegistryManager.ACTIVE.getRegistry(VillagerProfession.class); - public static final IForgeRegistry> ENTITIES = RegistryManager.ACTIVE.getRegistry(EntityType.class); - public static final IForgeRegistry> TILE_ENTITIES = RegistryManager.ACTIVE.getRegistry(TileEntityType.class); + public static final IForgeRegistry> ENTITIES = (IForgeRegistry)RegistryManager.ACTIVE.getRegistry(EntityType.class); + public static final IForgeRegistry> TILE_ENTITIES = (IForgeRegistry)RegistryManager.ACTIVE.getRegistry(TileEntityType.class); /** * This function is just to make sure static inializers in other classes have run and setup their registries before we query them. */