diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index f31195787..1c0079d16 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -56,7 +56,7 @@ import vazkii.botania.common.entity.EntityVineBall; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) +@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class ModelHandler { @SubscribeEvent public static void registerModels(ModelRegistryEvent evt) { diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 03289383c..743988a9f 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -108,6 +108,7 @@ public class ClientProxy implements IProxy { public void registerHandlers() { FMLJavaModLoadingContext.get().getModEventBus().addListener(this::clientSetup); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::loadComplete); + FMLJavaModLoadingContext.get().getModEventBus().register(MiscellaneousIcons.INSTANCE); } private void clientSetup(FMLClientSetupEvent event) { @@ -119,8 +120,6 @@ public class ClientProxy implements IProxy { Botania.LOGGER.fatal("Persistent Variables couldn't load!!"); } - MinecraftForge.EVENT_BUS.register(MiscellaneousIcons.INSTANCE); - ModChallenges.init(); if(ConfigHandler.CLIENT.boundBlockWireframe.get()) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 031db05d3..d9d1e69ae 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -122,6 +122,7 @@ public class Botania { public static Botania instance; public static IProxy proxy; + public static boolean finishedLoading = false; public static final Logger LOGGER = LogManager.getLogger(LibMisc.MOD_ID); @@ -238,6 +239,7 @@ public class Botania { Botania.LOGGER.info("The Lexica Botania has {} words.", words); registerDefaultEntityBlacklist(); + finishedLoading = true; } // Overriding the internal method handler will break everything as it changes regularly. diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index c06b0f649..6b4fced73 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -826,58 +826,61 @@ public final class ModBlocks { @SubscribeEvent public static void initTileEntities(RegistryEvent.Register> evt) { IForgeRegistry> r = evt.getRegistry(); - r.register(TileEntityType.Builder.create(TileAltar::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ALTAR)); - r.register(TileEntityType.Builder.create(TileSpreader::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPREADER)); - r.register(TileEntityType.Builder.create(TilePool::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.POOL)); - r.register(TileEntityType.Builder.create(TileRuneAltar::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RUNE_ALTAR)); - r.register(TileEntityType.Builder.create(TilePylon::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PYLON)); - r.register(TileEntityType.Builder.create(TileDistributor::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.DISTRIBUTOR)); - r.register(TileEntityType.Builder.create(TileManaVoid::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MANA_VOID)); - r.register(TileEntityType.Builder.create(TileManaDetector::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MANA_DETECTOR)); - r.register(TileEntityType.Builder.create(TileEnchanter::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ENCHANTER)); - r.register(TileEntityType.Builder.create(TileTurntable::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TURNTABLE)); - r.register(TileEntityType.Builder.create(TileTinyPlanet::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TINY_PLANET)); - r.register(TileEntityType.Builder.create(TileOpenCrate::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.OPEN_CRATE)); - r.register(TileEntityType.Builder.create(TileCraftCrate::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CRAFT_CRATE)); - r.register(TileEntityType.Builder.create(TileForestEye::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.FOREST_EYE)); - r.register(TileEntityType.Builder.create(TilePlatform::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PLATFORM)); - r.register(TileEntityType.Builder.create(TileAlfPortal::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ALF_PORTAL)); - r.register(TileEntityType.Builder.create(TileBifrost::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.BIFROST)); + r.register(TileEntityType.Builder.create(TileAltar::new, + defaultAltar, forestAltar, plainsAltar, mountainAltar, fungalAltar, + swampAltar, desertAltar, taigaAltar, mesaAltar, mossyAltar + ).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ALTAR)); + r.register(TileEntityType.Builder.create(TileSpreader::new, manaSpreader, redstoneSpreader, elvenSpreader, gaiaSpreader).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPREADER)); + r.register(TileEntityType.Builder.create(TilePool::new, manaPool, dilutedPool, fabulousPool, creativePool).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.POOL)); + r.register(TileEntityType.Builder.create(TileRuneAltar::new, runeAltar).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RUNE_ALTAR)); + r.register(TileEntityType.Builder.create(TilePylon::new, manaPylon, naturaPylon, gaiaPylon).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PYLON)); + r.register(TileEntityType.Builder.create(TileDistributor::new, distributor).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.DISTRIBUTOR)); + r.register(TileEntityType.Builder.create(TileManaVoid::new, manaVoid).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MANA_VOID)); + r.register(TileEntityType.Builder.create(TileManaDetector::new, manaDetector).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MANA_DETECTOR)); + r.register(TileEntityType.Builder.create(TileEnchanter::new, enchanter).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ENCHANTER)); + r.register(TileEntityType.Builder.create(TileTurntable::new, turntable).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TURNTABLE)); + r.register(TileEntityType.Builder.create(TileTinyPlanet::new, tinyPlanet).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TINY_PLANET)); + r.register(TileEntityType.Builder.create(TileOpenCrate::new, openCrate).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.OPEN_CRATE)); + r.register(TileEntityType.Builder.create(TileCraftCrate::new, craftCrate).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CRAFT_CRATE)); + r.register(TileEntityType.Builder.create(TileForestEye::new, forestEye).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.FOREST_EYE)); + r.register(TileEntityType.Builder.create(TilePlatform::new, abstrusePlatform, spectralPlatform, infrangiblePlatform).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PLATFORM)); + r.register(TileEntityType.Builder.create(TileAlfPortal::new, alfPortal).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ALF_PORTAL)); + r.register(TileEntityType.Builder.create(TileBifrost::new, bifrost).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.BIFROST)); r.register(TileEntityType.Builder.create(TileFloatingFlower::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MINI_ISLAND)); - r.register(TileEntityType.Builder.create(TileTinyPotato::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TINY_POTATO)); - r.register(TileEntityType.Builder.create(TileSpawnerClaw::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPAWNER_CLAW)); - r.register(TileEntityType.Builder.create(TileEnderEye::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ENDER_EYE_BLOCK)); - r.register(TileEntityType.Builder.create(TileStarfield::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.STARFIELD)); - r.register(TileEntityType.Builder.create(TileRFGenerator::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.FLUXFIELD)); - r.register(TileEntityType.Builder.create(TileBrewery::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.BREWERY)); - r.register(TileEntityType.Builder.create(TileTerraPlate::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TERRA_PLATE)); - r.register(TileEntityType.Builder.create(TileRedStringContainer::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_CONTAINER)); - r.register(TileEntityType.Builder.create(TileRedStringDispenser::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_DISPENSER)); - r.register(TileEntityType.Builder.create(TileRedStringFertilizer::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_FERTILIZER)); - r.register(TileEntityType.Builder.create(TileRedStringComparator::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_COMPARATOR)); - r.register(TileEntityType.Builder.create(TileRedStringRelay::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_RELAY)); - r.register(TileEntityType.Builder.create(TileManaFlame::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MANA_FLAME)); - r.register(TileEntityType.Builder.create(TilePrism::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PRISM)); - r.register(TileEntityType.Builder.create(TileCorporeaIndex::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_INDEX)); - r.register(TileEntityType.Builder.create(TileCorporeaFunnel::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_FUNNEL)); - r.register(TileEntityType.Builder.create(TilePump::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PUMP)); - r.register(TileEntityType.Builder.create(TileFakeAir::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.FAKE_AIR)); - r.register(TileEntityType.Builder.create(TileCorporeaInterceptor::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_INTERCEPTOR)); - r.register(TileEntityType.Builder.create(TileCorporeaCrystalCube::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_CRYSTAL_CUBE)); - r.register(TileEntityType.Builder.create(TileIncensePlate::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.INCENSE_PLATE)); - r.register(TileEntityType.Builder.create(TileHourglass::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.HOURGLASS)); - r.register(TileEntityType.Builder.create(TileSparkChanger::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPARK_CHANGER)); + r.register(TileEntityType.Builder.create(TileTinyPotato::new, tinyPotato).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TINY_POTATO)); + r.register(TileEntityType.Builder.create(TileSpawnerClaw::new, spawnerClaw).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPAWNER_CLAW)); + r.register(TileEntityType.Builder.create(TileEnderEye::new, enderEye).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ENDER_EYE_BLOCK)); + r.register(TileEntityType.Builder.create(TileStarfield::new, starfield).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.STARFIELD)); + r.register(TileEntityType.Builder.create(TileRFGenerator::new, rfGenerator).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.FLUXFIELD)); + r.register(TileEntityType.Builder.create(TileBrewery::new, brewery).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.BREWERY)); + r.register(TileEntityType.Builder.create(TileTerraPlate::new, terraPlate).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TERRA_PLATE)); + r.register(TileEntityType.Builder.create(TileRedStringContainer::new, redStringContainer).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_CONTAINER)); + r.register(TileEntityType.Builder.create(TileRedStringDispenser::new, redStringDispenser).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_DISPENSER)); + r.register(TileEntityType.Builder.create(TileRedStringFertilizer::new, redStringFertilizer).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_FERTILIZER)); + r.register(TileEntityType.Builder.create(TileRedStringComparator::new, redStringComparator).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_COMPARATOR)); + r.register(TileEntityType.Builder.create(TileRedStringRelay::new, redStringRelay).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_RELAY)); + r.register(TileEntityType.Builder.create(TileManaFlame::new, manaFlame).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MANA_FLAME)); + r.register(TileEntityType.Builder.create(TilePrism::new, prism).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PRISM)); + r.register(TileEntityType.Builder.create(TileCorporeaIndex::new, corporeaIndex).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_INDEX)); + r.register(TileEntityType.Builder.create(TileCorporeaFunnel::new, corporeaFunnel).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_FUNNEL)); + r.register(TileEntityType.Builder.create(TilePump::new, pump).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PUMP)); + r.register(TileEntityType.Builder.create(TileFakeAir::new, fakeAir).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.FAKE_AIR)); + r.register(TileEntityType.Builder.create(TileCorporeaInterceptor::new, corporeaInterceptor).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_INTERCEPTOR)); + r.register(TileEntityType.Builder.create(TileCorporeaCrystalCube::new, corporeaCrystalCube).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_CRYSTAL_CUBE)); + r.register(TileEntityType.Builder.create(TileIncensePlate::new, incensePlate).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.INCENSE_PLATE)); + r.register(TileEntityType.Builder.create(TileHourglass::new, hourglass).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.HOURGLASS)); + r.register(TileEntityType.Builder.create(TileSparkChanger::new, sparkChanger).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPARK_CHANGER)); r.register(TileEntityType.Builder.create(TileCocoon::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.COCOON)); - r.register(TileEntityType.Builder.create(TileLightRelay::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.LIGHT_RELAY)); - r.register(TileEntityType.Builder.create(TileCacophonium::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CACOPHONIUM)); - r.register(TileEntityType.Builder.create(TileBellows::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.BELLOWS)); - r.register(TileEntityType.Builder.create(TileCell::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CELL_BLOCK)); - r.register(TileEntityType.Builder.create(TileRedStringInterceptor::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_INTERCEPTOR)); - r.register(TileEntityType.Builder.create(TileGaiaHead::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.GAIA_HEAD)); - r.register(TileEntityType.Builder.create(TileCorporeaRetainer::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_RETAINER)); - r.register(TileEntityType.Builder.create(TileTeruTeruBozu::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TERU_TERU_BOZU)); - r.register(TileEntityType.Builder.create(TileAvatar::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.AVATAR)); - r.register(TileEntityType.Builder.create(TileAnimatedTorch::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ANIMATED_TORCH)); + r.register(TileEntityType.Builder.create(TileLightRelay::new, lightRelayDefault, lightRelayDetector, lightRelayToggle, lightRelayFork).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.LIGHT_RELAY)); + r.register(TileEntityType.Builder.create(TileCacophonium::new, cacophonium).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CACOPHONIUM)); + r.register(TileEntityType.Builder.create(TileBellows::new, bellows).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.BELLOWS)); + r.register(TileEntityType.Builder.create(TileCell::new, cellBlock).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CELL_BLOCK)); + r.register(TileEntityType.Builder.create(TileRedStringInterceptor::new, redStringInterceptor).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_INTERCEPTOR)); + r.register(TileEntityType.Builder.create(TileGaiaHead::new, gaiaHead, gaiaHeadWall).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.GAIA_HEAD)); + r.register(TileEntityType.Builder.create(TileCorporeaRetainer::new, corporeaRetainer).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_RETAINER)); + r.register(TileEntityType.Builder.create(TileTeruTeruBozu::new, teruTeruBozu).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TERU_TERU_BOZU)); + r.register(TileEntityType.Builder.create(TileAvatar::new, avatar).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.AVATAR)); + r.register(TileEntityType.Builder.create(TileAnimatedTorch::new, animatedTorch).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ANIMATED_TORCH)); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 401711f97..db33075e8 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -34,6 +34,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.IRecipeKeyProvider; import vazkii.botania.api.subtile.TileEntitySpecialFlower; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -64,7 +65,8 @@ public class ItemBlockSpecialFlower extends ItemBlockMod { tooltip.add(new TranslationTextComponent("botania.flowerType.misc").applyTextStyles(TextFormatting.ITALIC, TextFormatting.BLUE)); } - if(ConfigHandler.CLIENT.referencesEnabled.get()) { + // Prevent crash when tooltips queried before configs load + if(Botania.finishedLoading && ConfigHandler.CLIENT.referencesEnabled.get()) { String key = getTranslationKey() + ".reference"; ITextComponent lore = new TranslationTextComponent(key); if(!lore.getString().equals(key))