Use baubles fix

Author: DarkShadow44

src/main/java/vazkii/botania/common/core/handler/ItemBaubleHandlerClient.java

@@ -50,7 +50,6 @@
 import vazkii.botania.common.core.handler.CommonTickHandler;
 import vazkii.botania.common.core.handler.ConfigHandler;
 import vazkii.botania.common.core.handler.InternalMethodHandler;
-import vazkii.botania.common.core.handler.ItemBaubleHandlerServer;
 import vazkii.botania.common.core.handler.ManaNetworkHandler;
 import vazkii.botania.common.core.handler.PixieHandler;
 import vazkii.botania.common.core.handler.SheddingHandler;
@@ -146,7 +145,6 @@ public void init(FMLInitializationEvent event) {
 			MinecraftForge.EVENT_BUS.register(new SkyblockWorldEvents());
 
 		FMLCommonHandler.instance().bus().register(new CommonTickHandler());
-		FMLCommonHandler.instance().bus().register(new ItemBaubleHandlerServer());
 
 		FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName());
 

src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java

@@ -129,6 +129,11 @@ public void onWornTick(ItemStack stack, EntityLivingBase player) {
 		// NO-OP
 	}
 
+	@Override
+	public void onPlayerLoad(ItemStack stack, EntityLivingBase player) {
+		onEquippedOrLoadedIntoWorld(stack, player);
+	}
+
 	@Override
 	public void onEquipped(ItemStack stack, EntityLivingBase player) {
 		if(player != null) {
@@ -151,16 +156,6 @@ public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player
 		// NO-OP
 	}
 
-	public static void playerLoggedIn(EntityPlayer player) {
-		IInventory baubles = BaublesApi.getBaubles(player);
-		for (int i = 0; i < baubles.getSizeInventory(); i++) {
-			ItemStack stack = baubles.getStackInSlot(i);
-			if (stack != null && stack.getItem() instanceof ItemBauble itemBauble) {
-				itemBauble.onEquippedOrLoadedIntoWorld(stack, player);
-			}
-		}
-	}
-
 	@Override
 	public ItemStack getCosmeticItem(ItemStack stack) {
 		NBTTagCompound cmp = ItemNBTHelper.getCompound(stack, TAG_COSMETIC_ITEM, true);