From 05c6a07bc23bcb2dc33e57512c6c395ef07b249a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 4 Jun 2016 19:01:34 -0500 Subject: [PATCH] Clean up logging and log spam. #cleanloginitiative --- .../core/handler/ClientMethodHandles.java | 4 +- .../handler/ContributorFancinessHandler.java | 4 +- .../core/handler/MiscellaneousIcons.java | 6 +- .../client/core/handler/RenderLexicon.java | 5 +- .../client/core/helper/ShaderHelper.java | 7 +- .../client/core/proxy/ClientProxy.java | 5 +- .../client/model/FloatingFlowerModel.java | 4 +- .../client/model/SpecialFlowerModel.java | 4 +- .../java/vazkii/botania/common/Botania.java | 6 +- .../common/core/handler/MethodHandles.java | 4 +- .../common/core/proxy/CommonProxy.java | 4 +- .../common/crafting/ModCraftingRecipes.java | 4 +- .../corporea/WrappedDeepStorage.java | 5 +- .../assets/botania/models/block/pylon.obj | 74 +++++++++---------- 14 files changed, 66 insertions(+), 70 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java index dcf425788..8f4ccd30d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java @@ -3,8 +3,8 @@ package vazkii.botania.client.core.handler; import com.google.common.base.Throwables; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibObfuscation; import java.lang.invoke.MethodHandle; @@ -67,7 +67,7 @@ public final class ClientMethodHandles { // f.setAccessible(true); // equippedProgress_getter = MethodHandles.publicLookup().unreflectGetter(f); } catch (IllegalAccessException e) { - FMLLog.severe("[Botania]: Couldn't initialize client methodhandles! Things will be broken!"); + Botania.LOGGER.fatal("Couldn't initialize client methodhandles! Things will be broken!"); e.printStackTrace(); throw Throwables.propagate(e); } diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index acba63243..7c548c1db 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -21,13 +21,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EnumPlayerModelParts; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.FMLLog; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IBaubleRender.Helper; import vazkii.botania.api.subtile.signature.SubTileSignature; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.version.VersionChecker; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -208,7 +208,7 @@ public final class ContributorFancinessHandler implements LayerRenderer