mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 19:39:22 +00:00
Tweak to remove javac compile errors related to generics on registries.
Also remove the recipes registry call - they're gone from registries completely.
This commit is contained in:
1 parent
abacf8e141
commit
03d19f2e70
4 files changed
+6
-7
No files matched your search
@@ -13,10 +13,10 @@
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
-public class EntityType<T extends Entity> {
|
||||
+public class EntityType<T extends Entity> extends net.minecraftforge.registries.ForgeRegistryEntry<EntityType<T>> {
|
||||
+public class EntityType<T extends Entity> extends net.minecraftforge.registries.ForgeRegistryEntry<EntityType<?>> {
|
||||
private static final Logger field_200731_aJ = LogManager.getLogger();
|
||||
- public static final RegistryNamespaced<ResourceLocation, EntityType<?>> field_200787_a = new RegistryNamespaced<ResourceLocation, EntityType<?>>();
|
||||
+ public static final RegistryNamespaced<ResourceLocation, EntityType<?>> field_200787_a = net.minecraftforge.registries.GameData.getWrapper(EntityType.class);
|
||||
+ public static final RegistryNamespaced<ResourceLocation, EntityType<?>> field_200787_a = (RegistryNamespaced)net.minecraftforge.registries.GameData.getWrapper(EntityType.class);
|
||||
public static final EntityType<EntityAreaEffectCloud> field_200788_b = func_200712_a("area_effect_cloud", EntityType.Builder.func_201757_a(EntityAreaEffectCloud.class, EntityAreaEffectCloud::new));
|
||||
public static final EntityType<EntityArmorStand> field_200789_c = func_200712_a("armor_stand", EntityType.Builder.func_201757_a(EntityArmorStand.class, EntityArmorStand::new));
|
||||
public static final EntityType<EntityTippedArrow> field_200790_d = func_200712_a("arrow", EntityType.Builder.func_201757_a(EntityTippedArrow.class, EntityTippedArrow::new));
|
||||
@@ -5,10 +5,10 @@
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
-public class TileEntityType<T extends TileEntity> {
|
||||
+public class TileEntityType<T extends TileEntity> extends net.minecraftforge.registries.ForgeRegistryEntry<TileEntityType<T>> {
|
||||
+public class TileEntityType<T extends TileEntity> extends net.minecraftforge.registries.ForgeRegistryEntry<TileEntityType<?>> {
|
||||
private static final Logger field_206866_A = LogManager.getLogger();
|
||||
- public static final RegistryNamespaced<ResourceLocation, TileEntityType<?>> field_200970_a = new RegistryNamespaced<ResourceLocation, TileEntityType<?>>();
|
||||
+ public static final RegistryNamespaced<ResourceLocation, TileEntityType<?>> field_200970_a = net.minecraftforge.registries.GameData.getWrapper(TileEntityType.class);
|
||||
+ public static final RegistryNamespaced<ResourceLocation, TileEntityType<?>> field_200970_a = (RegistryNamespaced)net.minecraftforge.registries.GameData.getWrapper(TileEntityType.class);
|
||||
public static final TileEntityType<TileEntityFurnace> field_200971_b = func_200966_a("furnace", TileEntityType.Builder.func_200963_a(TileEntityFurnace::new));
|
||||
public static final TileEntityType<TileEntityChest> field_200972_c = func_200966_a("chest", TileEntityType.Builder.func_200963_a(TileEntityChest::new));
|
||||
public static final TileEntityType<TileEntityTrappedChest> field_200973_d = func_200966_a("trapped_chest", TileEntityType.Builder.func_200963_a(TileEntityTrappedChest::new));
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -52,8 +52,8 @@ public class ForgeRegistries
|
||||
public static final IForgeRegistry<PotionType> POTION_TYPES = RegistryManager.ACTIVE.getRegistry(PotionType.class);
|
||||
public static final IForgeRegistry<Enchantment> ENCHANTMENTS = RegistryManager.ACTIVE.getRegistry(Enchantment.class);
|
||||
public static final IForgeRegistry<VillagerProfession> VILLAGER_PROFESSIONS = RegistryManager.ACTIVE.getRegistry(VillagerProfession.class);
|
||||
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<EntityType<?>> ENTITIES = (IForgeRegistry)RegistryManager.ACTIVE.getRegistry(EntityType.class);
|
||||
public static final IForgeRegistry<TileEntityType<?>> 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.
|
||||
*/
|
||||
|
||||
Reference in new issue
Block a user