From 42f09fad22ce20b90df68eab623df6ebc99881f0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 6 Mar 2019 01:41:42 -0600 Subject: [PATCH] start trying to clean up main mod class --- .../client/core/handler/ModelHandler.java | 96 ++++++++++++++++++- .../client/core/proxy/ClientProxy.java | 64 ++----------- .../java/vazkii/botania/common/Botania.java | 44 ++++----- 3 files changed, 119 insertions(+), 85 deletions(-) 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 27804636b..e7ac665d5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -10,20 +10,38 @@ package vazkii.botania.client.core.handler; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.RenderSprite; import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; +import net.minecraftforge.client.model.animation.TileEntityRendererAnimation; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.registries.IRegistryDelegate; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IFloatingFlower; +import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; +import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.model.SpecialFlowerModel; -import vazkii.botania.client.render.IModelRegister; +import vazkii.botania.client.render.entity.RenderBabylonWeapon; +import vazkii.botania.client.render.entity.RenderCorporeaSpark; +import vazkii.botania.client.render.entity.RenderDoppleganger; +import vazkii.botania.client.render.entity.RenderManaStorm; +import vazkii.botania.client.render.entity.RenderPinkWither; +import vazkii.botania.client.render.entity.RenderPixie; +import vazkii.botania.client.render.entity.RenderPoolMinecart; +import vazkii.botania.client.render.entity.RenderSnowballStack; +import vazkii.botania.client.render.entity.RenderSpark; +import vazkii.botania.client.render.tile.*; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.subtile.SubTileManastar; import vazkii.botania.common.block.subtile.SubTilePureDaisy; import vazkii.botania.common.block.subtile.functional.*; @@ -40,13 +58,30 @@ import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; import vazkii.botania.common.block.subtile.generating.SubTileShulkMeNot; import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; +import vazkii.botania.common.block.tile.*; +import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; +import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; +import vazkii.botania.common.block.tile.mana.TileBellows; +import vazkii.botania.common.block.tile.mana.TilePool; +import vazkii.botania.common.block.tile.mana.TilePrism; +import vazkii.botania.common.block.tile.mana.TilePump; +import vazkii.botania.common.block.tile.mana.TileSpreader; +import vazkii.botania.common.block.tile.string.TileRedString; +import vazkii.botania.common.entity.EntityBabylonWeapon; +import vazkii.botania.common.entity.EntityCorporeaSpark; +import vazkii.botania.common.entity.EntityDoppleganger; +import vazkii.botania.common.entity.EntityEnderAirBottle; +import vazkii.botania.common.entity.EntityManaStorm; +import vazkii.botania.common.entity.EntityPinkWither; +import vazkii.botania.common.entity.EntityPixie; +import vazkii.botania.common.entity.EntityPoolMinecart; +import vazkii.botania.common.entity.EntitySpark; +import vazkii.botania.common.entity.EntityThornChakram; +import vazkii.botania.common.entity.EntityVineBall; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -import java.util.Locale; -import java.util.Map; -import java.util.function.IntFunction; - @Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public final class ModelHandler { @SubscribeEvent @@ -54,6 +89,57 @@ public final class ModelHandler { ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); registerSubtiles(); + + RenderTileFloatingFlower renderTileFloatingFlower = new RenderTileFloatingFlower(); + RenderTilePylon renderTilePylon = new RenderTilePylon(); + ClientRegistry.bindTileEntitySpecialRenderer(TileAltar.class, new RenderTileAltar()); + ClientRegistry.bindTileEntitySpecialRenderer(TileSpreader.class, new RenderTileSpreader()); + ClientRegistry.bindTileEntitySpecialRenderer(TilePool.class, new RenderTilePool()); + ClientRegistry.bindTileEntitySpecialRenderer(TileRuneAltar.class, new RenderTileRuneAltar()); + ClientRegistry.bindTileEntitySpecialRenderer(TilePylon.class, renderTilePylon); + ClientRegistry.bindTileEntitySpecialRenderer(TileEnchanter.class, new RenderTileEnchanter()); + ClientRegistry.bindTileEntitySpecialRenderer(TileAlfPortal.class, new RenderTileAlfPortal()); + ClientRegistry.bindTileEntitySpecialRenderer(TileFloatingFlower.class, renderTileFloatingFlower); + ClientRegistry.bindTileEntitySpecialRenderer(TileFloatingSpecialFlower.class, renderTileFloatingFlower); + ClientRegistry.bindTileEntitySpecialRenderer(TileTinyPotato.class, new RenderTileTinyPotato()); + ClientRegistry.bindTileEntitySpecialRenderer(TileStarfield.class, new RenderTileStarfield()); + ClientRegistry.bindTileEntitySpecialRenderer(TileBrewery.class, new RenderTileBrewery()); + ClientRegistry.bindTileEntitySpecialRenderer(TileTerraPlate.class, new RenderTileTerraPlate()); + ClientRegistry.bindTileEntitySpecialRenderer(TileRedString.class, new RenderTileRedString()); + ClientRegistry.bindTileEntitySpecialRenderer(TilePrism.class, new RenderTilePrism()); + ClientRegistry.bindTileEntitySpecialRenderer(TileCorporeaIndex.class, new RenderTileCorporeaIndex()); + ClientRegistry.bindTileEntitySpecialRenderer(TilePump.class, new TileEntityRendererAnimation<>()); + ClientRegistry.bindTileEntitySpecialRenderer(TileCorporeaCrystalCube.class, new RenderTileCorporeaCrystalCube()); + ClientRegistry.bindTileEntitySpecialRenderer(TileIncensePlate.class, new RenderTileIncensePlate()); + ClientRegistry.bindTileEntitySpecialRenderer(TileHourglass.class, new RenderTileHourglass()); + ClientRegistry.bindTileEntitySpecialRenderer(TileSparkChanger.class, new RenderTileSparkChanger()); + ClientRegistry.bindTileEntitySpecialRenderer(TileCocoon.class, new RenderTileCocoon()); + ClientRegistry.bindTileEntitySpecialRenderer(TileLightRelay.class, new RenderTileLightRelay()); + ClientRegistry.bindTileEntitySpecialRenderer(TileBellows.class, new RenderTileBellows()); + ClientRegistry.bindTileEntitySpecialRenderer(TileGaiaHead.class, new RenderTileGaiaHead()); + ClientRegistry.bindTileEntitySpecialRenderer(TileTeruTeruBozu.class, new RenderTileTeruTeruBozu()); + ClientRegistry.bindTileEntitySpecialRenderer(TileAvatar.class, new RenderTileAvatar()); + ClientRegistry.bindTileEntitySpecialRenderer(TileAnimatedTorch.class, new RenderTileAnimatedTorch()); + + RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, RenderPixie::new); + RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, RenderDoppleganger::new); + RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, RenderSpark::new); + RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, RenderCorporeaSpark::new); + RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, RenderPoolMinecart::new); + RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, RenderPinkWither::new); + RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, RenderManaStorm::new); + RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, RenderBabylonWeapon::new); + + RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, renderManager -> new RenderSnowballStack<>(renderManager, ModItems.thornChakram, Minecraft.getInstance().getItemRenderer(), + entity -> entity.isFire() ? new ItemStack(ModItems.flareChakram) : new ItemStack(ModItems.thornChakram))); + RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, renderManager -> new RenderSprite<>(renderManager, ModItems.vineBall, Minecraft.getInstance().getItemRenderer())); + RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSprite<>(renderManager, ModItems.enderAirBottle, Minecraft.getInstance().getItemRenderer())); + + ShaderHelper.initShaders(); + + IMultiblockRenderHook.renderHooks.put(ModBlocks.manaPylon, renderTilePylon); + IMultiblockRenderHook.renderHooks.put(ModBlocks.naturaPylon, renderTilePylon); + IMultiblockRenderHook.renderHooks.put(ModBlocks.gaiaPylon, renderTilePylon); } private static void registerSubtiles() { 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 6f349445b..e0ccb173d 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderSnowball; +import net.minecraft.client.renderer.entity.RenderSprite; import net.minecraft.client.renderer.entity.model.ModelBiped; import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -36,6 +37,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.fml.common.thread.SidedThreadGroups; import org.lwjgl.input.Keyboard; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.lexicon.LexiconEntry; @@ -149,7 +151,6 @@ public class ClientProxy implements IProxy { } MinecraftForge.EVENT_BUS.register(MiscellaneousIcons.INSTANCE); - initRenderers(); } @Override @@ -185,59 +186,6 @@ public class ClientProxy implements IProxy { CorporeaAutoCompleteHandler.updateItemList(); } - private void initRenderers() { - RenderTileFloatingFlower renderTileFloatingFlower = new RenderTileFloatingFlower(); - RenderTilePylon renderTilePylon = new RenderTilePylon(); - ClientRegistry.bindTileEntitySpecialRenderer(TileAltar.class, new RenderTileAltar()); - ClientRegistry.bindTileEntitySpecialRenderer(TileSpreader.class, new RenderTileSpreader()); - ClientRegistry.bindTileEntitySpecialRenderer(TilePool.class, new RenderTilePool()); - ClientRegistry.bindTileEntitySpecialRenderer(TileRuneAltar.class, new RenderTileRuneAltar()); - ClientRegistry.bindTileEntitySpecialRenderer(TilePylon.class, renderTilePylon); - ClientRegistry.bindTileEntitySpecialRenderer(TileEnchanter.class, new RenderTileEnchanter()); - ClientRegistry.bindTileEntitySpecialRenderer(TileAlfPortal.class, new RenderTileAlfPortal()); - ClientRegistry.bindTileEntitySpecialRenderer(TileFloatingFlower.class, renderTileFloatingFlower); - ClientRegistry.bindTileEntitySpecialRenderer(TileFloatingSpecialFlower.class, renderTileFloatingFlower); - ClientRegistry.bindTileEntitySpecialRenderer(TileTinyPotato.class, new RenderTileTinyPotato()); - ClientRegistry.bindTileEntitySpecialRenderer(TileStarfield.class, new RenderTileStarfield()); - ClientRegistry.bindTileEntitySpecialRenderer(TileBrewery.class, new RenderTileBrewery()); - ClientRegistry.bindTileEntitySpecialRenderer(TileTerraPlate.class, new RenderTileTerraPlate()); - ClientRegistry.bindTileEntitySpecialRenderer(TileRedString.class, new RenderTileRedString()); - ClientRegistry.bindTileEntitySpecialRenderer(TilePrism.class, new RenderTilePrism()); - ClientRegistry.bindTileEntitySpecialRenderer(TileCorporeaIndex.class, new RenderTileCorporeaIndex()); - ClientRegistry.bindTileEntitySpecialRenderer(TilePump.class, new AnimationTESR<>()); - ClientRegistry.bindTileEntitySpecialRenderer(TileCorporeaCrystalCube.class, new RenderTileCorporeaCrystalCube()); - ClientRegistry.bindTileEntitySpecialRenderer(TileIncensePlate.class, new RenderTileIncensePlate()); - ClientRegistry.bindTileEntitySpecialRenderer(TileHourglass.class, new RenderTileHourglass()); - ClientRegistry.bindTileEntitySpecialRenderer(TileSparkChanger.class, new RenderTileSparkChanger()); - ClientRegistry.bindTileEntitySpecialRenderer(TileCocoon.class, new RenderTileCocoon()); - ClientRegistry.bindTileEntitySpecialRenderer(TileLightRelay.class, new RenderTileLightRelay()); - ClientRegistry.bindTileEntitySpecialRenderer(TileBellows.class, new RenderTileBellows()); - ClientRegistry.bindTileEntitySpecialRenderer(TileGaiaHead.class, new RenderTileGaiaHead()); - ClientRegistry.bindTileEntitySpecialRenderer(TileTeruTeruBozu.class, new RenderTileTeruTeruBozu()); - ClientRegistry.bindTileEntitySpecialRenderer(TileAvatar.class, new RenderTileAvatar()); - ClientRegistry.bindTileEntitySpecialRenderer(TileAnimatedTorch.class, new RenderTileAnimatedTorch()); - - RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, RenderPixie::new); - RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, RenderDoppleganger::new); - RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, RenderSpark::new); - RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, RenderCorporeaSpark::new); - RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, RenderPoolMinecart::new); - RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, RenderPinkWither::new); - RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, RenderManaStorm::new); - RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, RenderBabylonWeapon::new); - - RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, renderManager -> new RenderSnowballStack<>(renderManager, ModItems.thornChakram, Minecraft.getInstance().getItemRenderer(), - entity -> entity.isFire() ? new ItemStack(ModItems.flareChakram) : new ItemStack(ModItems.thornChakram))); - RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, renderManager -> new RenderSnowball<>(renderManager, ModItems.vineBall, Minecraft.getInstance().getItemRenderer())); - RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSnowball<>(renderManager, ModItems.enderAirBottle, Minecraft.getInstance().getItemRenderer())); - - ShaderHelper.initShaders(); - - IMultiblockRenderHook.renderHooks.put(ModBlocks.manaPylon, renderTilePylon); - IMultiblockRenderHook.renderHooks.put(ModBlocks.naturaPylon, renderTilePylon); - IMultiblockRenderHook.renderHooks.put(ModBlocks.gaiaPylon, renderTilePylon); - } - private void initAuxiliaryRender() { Map skinMap = Minecraft.getInstance().getRenderManager().getSkinMap(); RenderPlayer render; @@ -372,7 +320,7 @@ public class ClientProxy implements IProxy { sparkle.setCanCollide(false); if(corruptSparkle) sparkle.corrupt = true; - Minecraft.getInstance().effectRenderer.addEffect(sparkle); + Minecraft.getInstance().particles.addEffect(sparkle); } private static boolean distanceLimit = true; @@ -395,11 +343,11 @@ public class ClientProxy implements IProxy { FXWisp wisp = new FXWisp(Minecraft.getInstance().world, x, y, z, size, r, g, b, distanceLimit, depthTest, maxAgeMul); wisp.setSpeed(motionx, motiony, motionz); - Minecraft.getInstance().effectRenderer.addEffect(wisp); + Minecraft.getInstance().particles.addEffect(wisp); } private boolean doParticle() { - if(FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) + if(Thread.currentThread().getThreadGroup() == SidedThreadGroups.SERVER) return false; if(!ConfigHandler.useVanillaParticleLimiter) @@ -416,7 +364,7 @@ public class ClientProxy implements IProxy { @Override public void lightningFX(Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) { - Minecraft.getInstance().effectRenderer.addEffect(new FXLightning(Minecraft.getInstance().world, vectorStart, vectorEnd, ticksPerMeter, seed, colorOuter, colorInner)); + Minecraft.getInstance().particles.addEffect(new FXLightning(Minecraft.getInstance().world, vectorStart, vectorEnd, ticksPerMeter, seed, colorOuter, colorInner)); } @Override diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 9d0b52858..5d169ebc4 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -101,7 +101,6 @@ public class Botania { public static boolean bcApiLoaded = false; public static boolean bloodMagicLoaded = false; public static boolean coloredLightsLoaded = false; - public static boolean etFuturumLoaded = false; public static Botania instance; public static IProxy proxy; @@ -121,7 +120,6 @@ public class Botania { bcApiLoaded = ModList.get().isLoaded("buildcraftlib"); bloodMagicLoaded = ModList.get().isLoaded("bloodmagic"); // Psh, noob coloredLightsLoaded = ModList.get().isLoaded("easycoloredlights"); - etFuturumLoaded = ModList.get().isLoaded("etfuturum"); BotaniaAPI.internalHandler = new InternalMethodHandler(); @@ -130,13 +128,31 @@ public class Botania { PacketHandler.init(); ModBrews.init(); ModMultiblocks.init(); - - if(Botania.gardenOfGlassLoaded) - new WorldTypeSkyblock(); + ModBanners.init(); + ModPetalRecipes.init(); + ModPureDaisyRecipes.init(); + ModRuneRecipes.init(); + ModManaAlchemyRecipes.init(); + ModManaConjurationRecipes.init(); + ModManaInfusionRecipes.init(); + ModElvenTradeRecipes.init(); + ModBrewRecipes.init(); + ModCraftingRecipes.init(); + LexiconData.init(); proxy.preInit(event); + MinecraftForge.EVENT_BUS.register(ManaNetworkHandler.instance); + MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.getInputHandler()); + MinecraftForge.EVENT_BUS.register(new LootHandler()); + + if(Botania.gardenOfGlassLoaded) + MinecraftForge.EVENT_BUS.register(SkyblockWorldEvents.class); + DeferredWorkQueue.runLater(() -> { + if(Botania.gardenOfGlassLoaded) + new WorldTypeSkyblock(); + CriteriaTriggers.register(AlfPortalTrigger.INSTANCE); CriteriaTriggers.register(CorporeaRequestTrigger.INSTANCE); CriteriaTriggers.register(DopplegangerNoArmorTrigger.INSTANCE); @@ -162,27 +178,11 @@ public class Botania { @EventHandler public void init(FMLInitializationEvent event) { - ModBanners.init(); - ModPetalRecipes.init(); - ModPureDaisyRecipes.init(); - ModRuneRecipes.init(); - ModManaAlchemyRecipes.init(); - ModManaConjurationRecipes.init(); - ModManaInfusionRecipes.init(); - ModElvenTradeRecipes.init(); - ModBrewRecipes.init(); - ModCraftingRecipes.init(); - LexiconData.init(); + NetworkRegistry.INSTANCE.registerGuiHandler(Botania.instance, new GuiHandler()); MinecraftForge.TERRAIN_GEN_BUS.register(BiomeDecorationHandler.class); - MinecraftForge.EVENT_BUS.register(ManaNetworkHandler.instance); - MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.getInputHandler()); - MinecraftForge.EVENT_BUS.register(new LootHandler()); - - if(Botania.gardenOfGlassLoaded) - MinecraftForge.EVENT_BUS.register(SkyblockWorldEvents.class); FMLInterModComms.sendMessage("projecte", "interdictionblacklist", EntityManaBurst.class.getCanonicalName());